bonus
/
gz_att
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

过滤掉没有组织的人员

This commit is contained in:
fl 2025-02-21 16:24:49 +08:00
parent 24422301eb
commit 902a63dcf2
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/utils/encryption/AESCBCUtil.java
View File

@ -41,8 +41,8 @@ public class AESCBCUtil {
/** /**
* AES要求密钥长度为128位或192位或256位，java默认限制AES密钥长度最多128位 * AES要求密钥长度为128位或192位或256位，java默认限制AES密钥长度最多128位
*/ */
// public static String sKey = "zhst@bonus@zhst@bonus@1234567890"; public static String sKey = "zhst@bonus@zhst@bonus@1234567890";
public static String sKey = "zhst@bonus@zhst@"; // public static String sKey = "zhst@bonus@zhst@";
/** /**
* 编码格式 * 编码格式

1
bonus-modules/bonus-system/src/main/java/com/bonus/system/att/controller/AttHisPullController.java
View File

@ -11,7 +11,6 @@ import com.bonus.system.att.entity.AttDataDetailsBean;
import com.bonus.system.att.entity.OrgChangeBean; import com.bonus.system.att.entity.OrgChangeBean;
import com.bonus.system.att.service.AttCalService; import com.bonus.system.att.service.AttCalService;
import com.bonus.system.att.service.OrgChangeService; import com.bonus.system.att.service.OrgChangeService;
import com.bonus.system.att.tasks.AttTasks;
import com.bonus.system.att.tasks.NewAttTask; import com.bonus.system.att.tasks.NewAttTask;
import com.bonus.system.att.utils.AttTimeUtil; import com.bonus.system.att.utils.AttTimeUtil;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;

10
bonus-modules/bonus-system/src/main/resources/mapper/att/AttSourceDataMapper.xml
View File

@ -262,7 +262,7 @@
lat as attLat, lat as attLat,
IF(attendance_external = '外勤打卡',1,2) as isOutsideAtt, IF(attendance_external = '外勤打卡',1,2) as isOutsideAtt,
'1' as dataSource '1' as dataSource
from gz_cloud.fc_sup_attendance sup from gz_cloud_test.fc_sup_attendance sup
where sup.attendance_date = #{pushDate} where sup.attendance_date = #{pushDate}
and is_wechat != 1 and is_wechat != 1
</select> </select>
@ -477,7 +477,7 @@
GROUP BY user_id GROUP BY user_id
</select> </select>
<select id="getAttPerson" resultType="com.bonus.system.att.entity.AttDataBean"> <select id="getAttPerson" resultType="com.bonus.system.att.entity.AttDataBean">
SELECT su.user_id, SELECT ash.user_id,
ash.group_id, ash.group_id,
suo.org_id, suo.org_id,
'1' AS attType, '1' AS attType,
@ -486,9 +486,9 @@
FROM att_setting_history ash FROM att_setting_history ash
LEFT JOIN sys_user su ON ash.user_id = su.user_id LEFT JOIN sys_user su ON ash.user_id = su.user_id
left join sys_user_org suo ON su.user_id = suo.user_id left join sys_user_org suo ON su.user_id = suo.user_id
WHERE ash.current_day = #{pushDate} WHERE ash.current_day = #{pushDate} and suo.org_id is not null
UNION UNION
SELECT su.user_id, SELECT ash.user_id,
ash.group_id, ash.group_id,
suo.org_id, suo.org_id,
'2' AS attType, '2' AS attType,
@ -497,7 +497,7 @@
FROM att_setting_history ash FROM att_setting_history ash
LEFT JOIN sys_user su ON ash.user_id = su.user_id LEFT JOIN sys_user su ON ash.user_id = su.user_id
left join sys_user_org suo ON su.user_id = suo.user_id left join sys_user_org suo ON su.user_id = suo.user_id
WHERE ash.current_day = #{pushDate} WHERE ash.current_day = #{pushDate} and suo.org_id is not null
</select> </select>
<select id="getAttDataPerson" resultType="java.lang.Long"> <select id="getAttDataPerson" resultType="java.lang.Long">
SELECT distinct user_id SELECT distinct user_id