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

日报表，月报表加外勤类型

This commit is contained in:
fl 2025-02-26 14:33:33 +08:00
parent d5539692c5
commit d5e5eb3c9d
3 changed files with 143 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bonus-modules/bonus-system/src/main/java/com/bonus/system/att/entity/AttDayReportBean.java
View File

@ -34,6 +34,13 @@ public class AttDayReportBean {
*/ */
@Excel(name = "出入异常人数", sort = 10) @Excel(name = "出入异常人数", sort = 10)
private Long einErrorNum; private Long einErrorNum;
/**
* 出入异常人数
*/
@Excel(name = "外勤人数", sort = 11)
private Long outsideAttNum;
/** /**
* 迟到人数 * 迟到人数
*/ */
@ -65,6 +72,8 @@ public class AttDayReportBean {
@Excel(name = "旷工人数", sort = 5) @Excel(name = "旷工人数", sort = 5)
private Long skippingNum; private Long skippingNum;
/** /**
* 组织编号 * 组织编号
*/ */

6
bonus-modules/bonus-system/src/main/java/com/bonus/system/att/entity/AttMonthReportBean.java
View File

@ -96,6 +96,12 @@ public class AttMonthReportBean {
@Excel(name = "出差人数", sort = 13) @Excel(name = "出差人数", sort = 13)
private Double businessTripNum; private Double businessTripNum;
/**
* 出差人数
*/
@Excel(name = "外勤人数", sort = 15)
private Double outsideAttNum;
/** /**
* 月份 * 月份
*/ */

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

@ -10,7 +10,8 @@
att_current_time, att_type, att_address, province,is_outside_att, att_lon, att_lat, data_source, remark) att_current_time, att_type, att_address, province,is_outside_att, att_lon, att_lat, data_source, remark)
values (#{params.name}, #{params.idNumber}, #{params.orgId}, #{params.orgName}, values (#{params.name}, #{params.idNumber}, #{params.orgId}, #{params.orgName},
#{params.attCurrentDay}, #{params.attCurrentTime}, #{params.attType}, #{params.attCurrentDay}, #{params.attCurrentTime}, #{params.attType},
#{params.attAddress}, #{params.province},#{params.isOutsideAtt}, #{params.attLon}, #{params.attLat}, #{params.dataSource}, #{params.attAddress}, #{params.province},#{params.isOutsideAtt}, #{params.attLon}, #{params.attLat},
#{params.dataSource},
#{params.remark}) #{params.remark})
</foreach> </foreach>
</insert> </insert>
@ -23,10 +24,11 @@
<insert id="insertAttDayReport"> <insert id="insertAttDayReport">
<foreach collection="list" item="params" separator=";"> <foreach collection="list" item="params" separator=";">
replace into att_day_report(att_current_day, normal_num, late_num, early_num, skipping_num, replace into att_day_report(att_current_day, normal_num, late_num, early_num, skipping_num,
leave_num, address_error_num, ein_error_num, rest_num, out_num) leave_num, address_error_num, ein_error_num, rest_num, out_num,outside_att_num)
values (#{params.attCurrentDay}, #{params.normalNum}, #{params.lateNum}, values (#{params.attCurrentDay}, #{params.normalNum}, #{params.lateNum},
#{params.earlyNum}, #{params.skippingNum}, #{params.leaveNum}, #{params.earlyNum}, #{params.skippingNum}, #{params.leaveNum},
#{params.addressErrorNum}, #{params.einErrorNum}, #{params.restNum}, #{params.outNum}) #{params.addressErrorNum}, #{params.einErrorNum}, #{params.restNum}, #{params.outNum},
#{params.outsideAttNum})
</foreach> </foreach>
</insert> </insert>
@ -85,7 +87,7 @@
required_days) required_days)
values values
<foreach collection="list" item="params" separator=","> <foreach collection="list" item="params" separator=",">
(#{params.userId}, #{params.userName}, #{params.orgId}, #{params.orgName}, (#{params.userId}, #{params.userName}, #{params.orgId}, #{params.orgName},
#{params.attCurrentMonth}, #{params.requiredDays}) #{params.attCurrentMonth}, #{params.requiredDays})
</foreach> </foreach>
</insert> </insert>
@ -185,18 +187,24 @@
<update id="updateAttMonthReport"> <update id="updateAttMonthReport">
<foreach collection="list" item="v" separator=";"> <foreach collection="list" item="v" separator=";">
update att_month_report update att_month_report
set org_id = #{v.orgId}, set
org_name = #{v.orgName}, <if test='v.orgId != null'>
normal_num = #{v.normalNum}, org_id = #{v.orgId},
late_num = #{v.lateNum}, </if>
early_num = #{v.earlyNum}, <if test='v.orgName != null'>
skipping_num = #{v.skippingNum}, org_name = #{v.orgName},
leave_num = #{v.leaveNum}, </if>
normal_num = #{v.normalNum},
late_num = #{v.lateNum},
early_num = #{v.earlyNum},
skipping_num = #{v.skippingNum},
leave_num = #{v.leaveNum},
address_error_num = #{v.addressErrorNum}, address_error_num = #{v.addressErrorNum},
ein_error_num = #{v.einErrorNum}, ein_error_num = #{v.einErrorNum},
rest_num = #{v.restNum}, rest_num = #{v.restNum},
out_num = #{v.outNum}, out_num = #{v.outNum},
business_trip_num = #{v.businessTripNum} business_trip_num = #{v.businessTripNum},
outside_att_num = #{v.outsideAttNum}
where where
user_id = #{v.userId} user_id = #{v.userId}
and att_current_month = #{v.attCurrentMonth} and att_current_month = #{v.attCurrentMonth}
@ -260,7 +268,7 @@
'0' as attAddress, '0' as attAddress,
lon as attLon, lon as attLon,
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_test.fc_sup_attendance sup from gz_cloud_test.fc_sup_attendance sup
where sup.attendance_date = #{pushDate} where sup.attendance_date = #{pushDate}
@ -283,58 +291,74 @@
<select id="selectAttDayReport" resultType="com.bonus.system.att.entity.AttDayReportBean"> <select id="selectAttDayReport" resultType="com.bonus.system.att.entity.AttDayReportBean">
select att_current_day, select att_current_day,
IFNULL(sum(toWorkAttStatus = 1 and offWorkAttStatus = 1), 0) as normalNum, IFNULL(sum(toWorkAttStatus = 1 and offWorkAttStatus = 1), 0) as normalNum,
IFNULL(sum(toWorkAttStatus = 2 or offWorkAttStatus = 2), 0) as lateNum, IFNULL(sum(toWorkAttStatus = 2 or offWorkAttStatus = 2), 0) as lateNum,
IFNULL(sum(toWorkAttStatus = 3 or offWorkAttStatus = 3), 0) as skippingNum, IFNULL(sum(toWorkAttStatus = 3 or offWorkAttStatus = 3), 0) as skippingNum,
IFNULL(sum(toWorkAttStatus = 4 or offWorkAttStatus = 4), 0) as earlyNum, IFNULL(sum(toWorkAttStatus = 4 or offWorkAttStatus = 4), 0) as earlyNum,
IFNULL(sum(toWorkAttStatus = 5 or offWorkAttStatus = 5), 0) as restNum, IFNULL(sum(toWorkAttStatus = 5 or offWorkAttStatus = 5), 0) as restNum,
IFNULL(sum(toWorkAttStatus in (SELECT dict_value IFNULL(sum(toWorkAttStatus in (SELECT dict_value
FROM sys_dict_data FROM sys_dict_data
where dict_type = 'att_status' and is_leave = '1') or where dict_type = 'att_status'
offWorkAttStatus in (SELECT dict_value and is_leave = '1') or
FROM sys_dict_data offWorkAttStatus in (SELECT dict_value
where dict_type = 'att_status' and is_leave = '1')), 0) as leaveNum, FROM sys_dict_data
IFNULL(sum(toWorkAttStatus = 7 or offWorkAttStatus = 7), 0) as outNum, where dict_type = 'att_status'
IFNULL(sum(toWorkAttStatus = 8 or offWorkAttStatus = 8), 0) as einErrorNum, and is_leave = '1')), 0) as leaveNum,
IFNULL(sum(toWorkAttStatus = 9 or offWorkAttStatus = 9), 0) as addressErrorNum IFNULL(sum(toWorkAttStatus = 7 or offWorkAttStatus = 7), 0) as outNum,
IFNULL(sum(toWorkAttStatus = 8 or offWorkAttStatus = 8), 0) as einErrorNum,
IFNULL(sum(toWorkAttStatus = 9 or offWorkAttStatus = 9), 0) as addressErrorNum,
IFNULL(sum(toOutsideAtt = 1 or offOutsideAtt = 1), 0) -
IFNULL(sum(toWorkAttStatus = 9 or offWorkAttStatus = 9), 0) as outsideAttNum
from v_att_update_data from v_att_update_data
where att_current_day = #{pushDate} where att_current_day = #{pushDate}
GROUP BY att_current_day GROUP BY att_current_day
</select> </select>
<!--att_setting_history 的处理是为了获取当月最后一天在哪个考勤规则，去计算他的当月考勤天数 --> <!--att_setting_history 的处理是为了获取当月最后一天在哪个考勤规则，去计算他的当月考勤天数 -->
<select id="selectAttMonthReport" resultType="com.bonus.system.att.entity.AttMonthReportBean"> <select id="selectAttMonthReport" resultType="com.bonus.system.att.entity.AttMonthReportBean">
SELECT SELECT v.user_id,
v.user_id, su.user_name,
su.user_name, suo.org_id,
suo.org_id, so.org_name,
so.org_name, DATE_FORMAT(att_current_day, '%Y-%m') AS attCurrentMonth,
DATE_FORMAT( att_current_day, '%Y-%m' ) AS attCurrentMonth, IFNULL(sum(IF(toWorkAttStatus = 1, 0.5, 0)), 0) +
IFNULL( sum( IF ( toWorkAttStatus = 1, 0.5, 0 )), 0 ) + IFNULL( sum( IF ( offWorkAttStatus = 1, 0.5, 0 )), 0 ) AS normalNum, IFNULL(sum(IF(offWorkAttStatus = 1, 0.5, 0)), 0) AS normalNum,
IFNULL( sum( IF ( toWorkAttStatus = 2, 0.5, 0 )), 0 ) + IFNULL( sum( IF ( offWorkAttStatus = 2, 0.5, 0 )), 0 ) AS lateNum, IFNULL(sum(IF(toWorkAttStatus = 2, 0.5, 0)), 0) +
IFNULL( sum( IF ( toWorkAttStatus = 3, 0.5, 0 )), 0 ) + IFNULL( sum( IF ( offWorkAttStatus = 3, 0.5, 0 )), 0 ) AS skippingNum, IFNULL(sum(IF(offWorkAttStatus = 2, 0.5, 0)), 0) AS lateNum,
IFNULL( sum( IF ( toWorkAttStatus = 4, 0.5, 0 )), 0 ) + IFNULL( sum( IF ( offWorkAttStatus = 4, 0.5, 0 )), 0 ) AS earlyNum, IFNULL(sum(IF(toWorkAttStatus = 3, 0.5, 0)), 0) +
IFNULL( sum( IF ( toWorkAttStatus = 5, 0.5, 0 )), 0 ) + IFNULL( sum( IF ( offWorkAttStatus = 5, 0.5, 0 )), 0 ) AS restNum, IFNULL(sum(IF(offWorkAttStatus = 3, 0.5, 0)), 0) AS skippingNum,
sum( IFNULL(sum(IF(toWorkAttStatus = 4, 0.5, 0)), 0) +
IF IFNULL(sum(IF(offWorkAttStatus = 4, 0.5, 0)), 0) AS earlyNum,
( toWorkAttStatus IN ( SELECT dict_value FROM sys_dict_data WHERE dict_type = 'att_status' AND is_leave = '1' ), 0.5, 0 )) + sum( IFNULL(sum(IF(toWorkAttStatus = 5, 0.5, 0)), 0) +
IF IFNULL(sum(IF(offWorkAttStatus = 5, 0.5, 0)), 0) AS restNum,
( offWorkAttStatus IN ( SELECT dict_value FROM sys_dict_data WHERE dict_type = 'att_status' AND is_leave = '1' ), 0.5, 0 )) AS leaveNum, sum(
IFNULL( sum( IF ( toWorkAttStatus = 7, 0.5, 0 )), 0 ) + IFNULL( sum( IF ( offWorkAttStatus = 7, 0.5, 0 )), 0 ) AS outNum, IF
IFNULL( sum( IF ( toWorkAttStatus = 8, 0.5, 0 )), 0 ) + IFNULL( sum( IF ( offWorkAttStatus = 8, 0.5, 0 )), 0 ) AS einErrorNum, (toWorkAttStatus IN
IFNULL( sum( IF ( toWorkAttStatus = 9, 0.5, 0 )), 0 ) + IFNULL( sum( IF ( offWorkAttStatus = 9, 0.5, 0 )), 0 ) AS addressErrorNum, (SELECT dict_value FROM sys_dict_data WHERE dict_type = 'att_status' AND is_leave = '1'), 0.5,
IFNULL( sum( IF ( toWorkAttStatus = 10, 0.5, 0 )), 0 ) + IFNULL( sum( IF ( offWorkAttStatus = 10, 0.5, 0 )), 0 ) AS businessTripNum 0)) + sum(
FROM IF
v_att_update_data v (offWorkAttStatus IN
LEFT JOIN sys_user su ON su.user_id = v.user_id (SELECT dict_value FROM sys_dict_data WHERE dict_type = 'att_status' AND is_leave = '1'), 0.5,
LEFT JOIN sys_user_org suo ON suo.user_id = v.user_id 0)) AS leaveNum,
LEFT JOIN sys_organization so ON so.id = suo.org_id IFNULL(sum(IF(toWorkAttStatus = 7, 0.5, 0)), 0) +
WHERE IFNULL(sum(IF(offWorkAttStatus = 7, 0.5, 0)), 0) AS outNum,
DATE_FORMAT( att_current_day, '%Y-%m' ) = DATE_FORMAT( #{pushDate}, '%Y-%m' ) IFNULL(sum(IF(toWorkAttStatus = 8, 0.5, 0)), 0) +
GROUP BY IFNULL(sum(IF(offWorkAttStatus = 8, 0.5, 0)), 0) AS einErrorNum,
DATE_FORMAT( att_current_day, '%Y-%m' ), IFNULL(sum(IF(toWorkAttStatus = 9, 0.5, 0)), 0) +
v.user_id IFNULL(sum(IF(offWorkAttStatus = 9, 0.5, 0)), 0) AS addressErrorNum,
IFNULL(sum(IF(toWorkAttStatus = 10, 0.5, 0)), 0) +
IFNULL(sum(IF(offWorkAttStatus = 10, 0.5, 0)), 0) AS businessTripNum,
IFNULL(sum(IF(toOutsideAtt = 1, 0.5, 0)), 0) +
IFNULL(sum(IF(offOutsideAtt = 1, 0.5, 0)), 0) -
IFNULL(sum(IF(toWorkAttStatus = 9, 0.5, 0)), 0) -
IFNULL(sum(IF(offWorkAttStatus = 9, 0.5, 0)), 0) AS outsideAttNum
FROM v_att_update_data v
LEFT JOIN sys_user su ON su.user_id = v.user_id
LEFT JOIN sys_user_org suo ON suo.user_id = v.user_id
LEFT JOIN sys_organization so ON so.id = suo.org_id
WHERE DATE_FORMAT(att_current_day, '%Y-%m') = DATE_FORMAT(#{pushDate}, '%Y-%m')
GROUP BY DATE_FORMAT(att_current_day, '%Y-%m'),
v.user_id
</select> </select>
<select id="selectHolidayByMonth" resultType="com.bonus.system.att.entity.Holiday"> <select id="selectHolidayByMonth" resultType="com.bonus.system.att.entity.Holiday">
@ -480,24 +504,26 @@
SELECT ash.user_id, SELECT ash.user_id,
ash.group_id, ash.group_id,
suo.org_id, suo.org_id,
'1' AS attType, '1' AS attType,
#{pushDate} AS attCurrentDay, #{pushDate} AS attCurrentDay,
'0' AS attStatus '0' AS attStatus
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} and suo.org_id is not null WHERE ash.current_day = #{pushDate}
and suo.org_id is not null
UNION UNION
SELECT ash.user_id, SELECT ash.user_id,
ash.group_id, ash.group_id,
suo.org_id, suo.org_id,
'2' AS attType, '2' AS attType,
#{pushDate} AS attCurrentDay, #{pushDate} AS attCurrentDay,
'0' AS attStatus '0' AS attStatus
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} and suo.org_id is not null 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
@ -538,63 +564,49 @@
</select> </select>
<select id="selectAttMonthReportTemp" resultType="com.bonus.system.att.entity.AttMonthReportBean"> <select id="selectAttMonthReportTemp" resultType="com.bonus.system.att.entity.AttMonthReportBean">
SELECT SELECT su.user_id,
su.user_id, su.user_name,
su.user_name, suo.org_id,
suo.org_id, so.org_name,
so.org_name, ash.group_id,
ash.group_id, DATE_FORMAT(#{pushDate}, '%Y-%m') as attCurrentMonth
DATE_FORMAT( #{pushDate}, '%Y-%m' ) as attCurrentMonth FROM att_setting_history ash
FROM LEFT JOIN sys_user su ON su.user_id = ash.user_id
att_setting_history ash LEFT JOIN sys_user_org suo ON suo.user_id = su.user_id
LEFT JOIN sys_user su ON su.user_id = ash.user_id LEFT JOIN sys_organization so ON so.id = suo.org_id
LEFT JOIN sys_user_org suo ON suo.user_id = su.user_id WHERE DATE_FORMAT(ash.current_day, '%Y-%m') = DATE_FORMAT(#{pushDate}, '%Y-%m')
LEFT JOIN sys_organization so ON so.id = suo.org_id and suo.org_id is not null
WHERE GROUP BY DATE_FORMAT(#{pushDate}, '%Y-%m'),
DATE_FORMAT( ash.current_day, '%Y-%m' ) = DATE_FORMAT( #{pushDate}, '%Y-%m' ) su.user_id
and suo.org_id is not null
GROUP BY
DATE_FORMAT( #{pushDate}, '%Y-%m' ),
su.user_id
</select> </select>
<select id="getAttMonthReportPerson" resultType="java.lang.Long"> <select id="getAttMonthReportPerson" resultType="java.lang.Long">
SELECT SELECT user_id
user_id FROM att_month_report
FROM WHERE att_current_month = DATE_FORMAT(#{pushDate}, '%Y-%m')
att_month_report
WHERE
att_current_month = DATE_FORMAT( #{pushDate}, '%Y-%m' )
</select> </select>
<select id="getMonthReportTempDataIsExist" resultType="java.lang.Integer"> <select id="getMonthReportTempDataIsExist" resultType="java.lang.Integer">
SELECT SELECT count(1)
count(1) FROM att_month_report
FROM WHERE att_current_month = DATE_FORMAT(#{pushDate}, '%Y-%m')
att_month_report and user_id = #{userId}
WHERE
att_current_month = DATE_FORMAT( #{pushDate}, '%Y-%m' ) and user_id = #{userId}
</select> </select>
<select id="getAttSettingHistoryByUserAndDate" resultType="com.bonus.system.att.entity.AttGroupBean"> <select id="getAttSettingHistoryByUserAndDate" resultType="com.bonus.system.att.entity.AttGroupBean">
SELECT SELECT ash.group_id,
ash.group_id, ash.user_id,
ash.user_id, ash.current_day
ash.current_day from att_setting_history ash
from WHERE ash.user_id = #{userId}
att_setting_history ash and locate(DATE_FORMAT(#{nowDate}, '%Y-%m'), ash.current_day)
WHERE order by current_day ASC
ash.user_id = #{userId}
and locate(DATE_FORMAT( #{nowDate}, '%Y-%m' ),ash.current_day)
order by current_day ASC
</select> </select>
<select id="getOrgDataByUserId" resultType="com.bonus.system.att.entity.AttMonthReportBean"> <select id="getOrgDataByUserId" resultType="com.bonus.system.att.entity.AttMonthReportBean">
SELECT SELECT su.user_id,
su.user_id, su.user_name,
su.user_name, suo.org_id,
suo.org_id, so.org_name
so.org_name FROM sys_user su
FROM LEFT JOIN sys_user_org suo ON suo.user_id = su.user_id
sys_user su LEFT JOIN sys_organization so ON so.id = suo.org_id
LEFT JOIN sys_user_org suo ON suo.user_id = su.user_id
LEFT JOIN sys_organization so ON so.id = suo.org_id
where su.user_id = #{userId} where su.user_id = #{userId}
</select> </select>