签卡管理，去除缺卡状态签卡时间

duty-service/src/main/java/cn/com/taiji/duty/task/TimeTask.java

@@ -73,7 +73,7 @@ public class TimeTask {
             sign.setDeptId(dutyUnit.getDeptId());
             sign.setUnitName(dutyUnit.getName());
             sign.setUnitAbbreviation(dutyUnit.getAbbreviation());
-            sign.setTime(date);
+            // sign.setTime(date);
             sign.setType("1");
             sign.setStatus("0");
             sign.setSignTime(time + " " + signBeginTime);
@@ -85,7 +85,7 @@ public class TimeTask {
             sign.setDeptId(dutyUnit.getDeptId());
             sign.setUnitName(dutyUnit.getName());
             sign.setUnitAbbreviation(dutyUnit.getAbbreviation());
-            sign.setTime(date);
+            // sign.setTime(date);
             sign.setType("2");
             sign.setStatus("0");
             sign.setSignTime(time + " " + signEndTime);
@@ -115,7 +115,7 @@ public class TimeTask {
         //     sign.setDeptId(dutyUnit.getDeptId());
         //     sign.setUnitName(dutyUnit.getName());
         //     sign.setUnitAbbreviation(dutyUnit.getAbbreviation());
-        //     sign.setTime(date);
+        //     // sign.setTime(date);
         //     sign.setType("2");
         //     sign.setStatus("0");
         //     sign.setSignTime(signEndTime);

duty-service/src/main/resources/mapper/DutySeatDutyUnitMapper.xml

@@ -92,8 +92,8 @@
                                             </foreach>
                                         </if>
                               ) up on u.id = up.unit_id
-                          LEFT JOIN duty_sign_in_record si on si.dept_id = u.dept_id and si.type = '1' and date_format(si.time,'%Y-%m-%d') = date_format(sysdate(),'%Y-%m-%d')
-                          LEFT JOIN duty_sign_in_record so on so.dept_id = u.dept_id and so.type = '2' and date_format(so.time,'%Y-%m-%d') = date_format(sysdate(),'%Y-%m-%d')
+                          LEFT JOIN duty_sign_in_record si on si.dept_id = u.dept_id and si.type = '1' and date_format(si.sign_time,'%Y-%m-%d') = date_format(sysdate(),'%Y-%m-%d')
+                          LEFT JOIN duty_sign_in_record so on so.dept_id = u.dept_id and so.type = '2' and date_format(so.sign_time,'%Y-%m-%d') = date_format(sysdate(),'%Y-%m-%d')
                           LEFT JOIN duty_daily_report_record d on u.dept_id = d.dept_id and date_format(d.duty_time,'%Y-%m-%d') = date_format(sysdate(),'%Y-%m-%d')
                           LEFT JOIN duty_week_report_record w on u.dept_id = w.dept_id and date_format(w.submit_time,'%Y-%m-%d') = date_format(sysdate(),'%Y-%m-%d')
                  WHERE u.dept_id is not null

duty-service/src/main/resources/mapper/DutySignInRecordMapper.xml

@@ -92,7 +92,7 @@
                 and dept_id = #{deptId}
             </if>
             <if test="time != null">
-                and date_format(time, '%Y-%m-%d') = date_format(#{time}, '%Y-%m-%d')
+                and date_format(sign_time, '%Y-%m-%d') = date_format(#{time}, '%Y-%m-%d')
             </if>
         </where>
     </select>
@@ -102,8 +102,8 @@
             SELECT *
             FROM duty_sign_in_record
             WHERE dept_id = #{deptId}
-              AND date_format( time, '%Y-%m-%d' ) BETWEEN date_format(#{startTime}, '%Y-%m-%d' ) AND date_format(#{endTime}, '%Y-%m-%d' )
-            GROUP BY date_format(time, '%Y-%m-%d')
+              AND date_format(sign_time, '%Y-%m-%d' ) BETWEEN date_format(#{startTime}, '%Y-%m-%d' ) AND date_format(#{endTime}, '%Y-%m-%d' )
+            GROUP BY date_format(sign_time, '%Y-%m-%d')
             ) t
     </select>
     <select id="queryStatusCount" resultType="java.lang.Long">
@@ -111,7 +111,7 @@
         FROM duty_sign_in_record
         WHERE dept_id = #{deptId}
           AND `status` = #{status}
-          AND date_format(time, '%Y-%m-%d') BETWEEN date_format(#{startTime}, '%Y-%m-%d') AND date_format(#{endTime}, '%Y-%m-%d')
+          AND date_format(sign_time, '%Y-%m-%d') BETWEEN date_format(#{startTime}, '%Y-%m-%d') AND date_format(#{endTime}, '%Y-%m-%d')
     </select>
     <select id="queryDaysSignInRecord" resultType="DutySignInRecord">
         select date_format(time, '%Y-%m-%d') as time, type, status
@@ -127,7 +127,7 @@
                 and dept_id = #{deptId}
             </if>
             <if test="time != null">
-                and date_format(time, '%Y-%m-%d') = date_format(#{time}, '%Y-%m-%d')
+                and date_format(sign_time, '%Y-%m-%d') = date_format(#{time}, '%Y-%m-%d')
             </if>
         </where>
     </select>
@@ -139,16 +139,16 @@
             and dept_id = #{deptId}
         </if>
         <if test="time != null">
-            and date_format(time, '%Y-%m-%d') = date_format(#{time}, '%Y-%m-%d')
+            and date_format(sign_time, '%Y-%m-%d') = date_format(#{time}, '%Y-%m-%d')
         </if>
     </select>
     <select id="queryAdminCheck" resultType="AdminCheck">
         select t.unit_name as name,t.unit_abbreviation as abbreviation,'缺勤' as status,COUNT(1) as number
         from (
-                 select unit_name,unit_abbreviation,DATE_FORMAT(time,'%Y-%m-%d'),dept_id,count(*) as num from duty_sign_in_record
+                 select unit_name,unit_abbreviation,DATE_FORMAT(sign_time,'%Y-%m-%d'),dept_id,count(*) as num from duty_sign_in_record
                  where `status` = '4'
                     <if test="startTime != null and endTime != null">
-                        and (DATE_FORMAT(time,'%Y-%m-%d') between #{startTime} and #{endTime})
+                        and (DATE_FORMAT(sign_time,'%Y-%m-%d') between #{startTime} and #{endTime})
                     </if>
                  GROUP BY `status`,dept_id,unit_name,DATE_FORMAT(time,'%Y-%m-%d')
                  HAVING num = 2
@@ -157,10 +157,10 @@
         UNION
         select t.unit_name as name,t.unit_abbreviation as abbreviation,'缺卡' as status,COUNT(1) as number
         from (
-                 select unit_name,unit_abbreviation,DATE_FORMAT(time,'%Y-%m-%d'),dept_id,count(*) as num from duty_sign_in_record
+                 select unit_name,unit_abbreviation,DATE_FORMAT(sign_time,'%Y-%m-%d'),dept_id,count(*) as num from duty_sign_in_record
                  where `status` = '4'
                     <if test="startTime != null and endTime != null">
-                        and (DATE_FORMAT(time,'%Y-%m-%d') between #{startTime} and #{endTime})
+                        and (DATE_FORMAT(sign_time,'%Y-%m-%d') between #{startTime} and #{endTime})
                     </if>
                  GROUP BY `status`,dept_id,unit_name,DATE_FORMAT(time,'%Y-%m-%d')
                  HAVING num = 1
@@ -171,7 +171,7 @@
         from duty_sign_in_record
         where `status` != '4'
         <if test="startTime != null and endTime != null">
-            and (DATE_FORMAT(time,'%Y-%m-%d') between #{startTime} and #{endTime})
+            and (DATE_FORMAT(sign_time,'%Y-%m-%d') between #{startTime} and #{endTime})
         </if>
         GROUP BY `status`,dept_id
         ORDER BY  case status when '缺勤' then 1 when '迟到' then 2 when '早退' then 3 when '缺卡' then 4 else 5 end ASC,CONVERT(name USING GBK) ASC,number DESC
@@ -186,34 +186,34 @@
         from (
                  select '5' as type,COUNT(1) as number
                  from (
-                          select unit_name,DATE_FORMAT(time,'%Y-%m-%d'),dept_id,count(*) as num from duty_sign_in_record
+                          select unit_name,DATE_FORMAT(sign_time,'%Y-%m-%d'),dept_id,count(*) as num from duty_sign_in_record
                           where `status` = '4'
                             <if test="startTime != null and endTime != null">
-                                and (DATE_FORMAT(time,'%Y-%m-%d') between #{startTime} and #{endTime})
+                                and (DATE_FORMAT(sign_time,'%Y-%m-%d') between #{startTime} and #{endTime})
                             </if>
-                          GROUP BY `status`,dept_id,unit_name,DATE_FORMAT(time,'%Y-%m-%d')
+                          GROUP BY `status`,dept_id,unit_name,DATE_FORMAT(sign_time,'%Y-%m-%d')
                           HAVING num = 2
                       ) t
                  UNION
                  select '4' as type,COUNT(1) as number
                  from (
-                          select unit_name,DATE_FORMAT(time,'%Y-%m-%d'),dept_id,count(*) as num from duty_sign_in_record
+                          select unit_name,DATE_FORMAT(sign_time,'%Y-%m-%d'),dept_id,count(*) as num from duty_sign_in_record
                           where `status` = '4'
                             <if test="startTime != null and endTime != null">
-                                and (DATE_FORMAT(time,'%Y-%m-%d') between #{startTime} and #{endTime})
+                                and (DATE_FORMAT(sign_time,'%Y-%m-%d') between #{startTime} and #{endTime})
                             </if>
-                          GROUP BY `status`,dept_id,unit_name,DATE_FORMAT(time,'%Y-%m-%d')
+                          GROUP BY `status`,dept_id,unit_name,DATE_FORMAT(sign_time,'%Y-%m-%d')
                           HAVING num = 1
                       ) t
                  UNION
                  select '1' as type,COUNT(1) as number
                  from (
-                          select unit_name,DATE_FORMAT(time,'%Y-%m-%d'),dept_id,count(*) as num from duty_sign_in_record
+                          select unit_name,DATE_FORMAT(sign_time,'%Y-%m-%d'),dept_id,count(*) as num from duty_sign_in_record
                           where `status` = '1'
                             <if test="startTime != null and endTime != null">
-                                and (DATE_FORMAT(time,'%Y-%m-%d') between #{startTime} and #{endTime})
+                                and (DATE_FORMAT(sign_time,'%Y-%m-%d') between #{startTime} and #{endTime})
                             </if>
-                          GROUP BY `status`,dept_id,unit_name,DATE_FORMAT(time,'%Y-%m-%d')
+                          GROUP BY `status`,dept_id,unit_name,DATE_FORMAT(sign_time,'%Y-%m-%d')
                           HAVING num = 2
                       ) t
                  UNION
@@ -221,14 +221,14 @@
                  from duty_sign_in_record
                  where `status` != '4' and `status` != '1'
                     <if test="startTime != null and endTime != null">
-                        and (DATE_FORMAT(time,'%Y-%m-%d') between #{startTime} and #{endTime})
+                        and (DATE_FORMAT(sign_time,'%Y-%m-%d') between #{startTime} and #{endTime})
                     </if>
              ) t
     </select>
     <select id="search" resultType="DutySignInRecord">
         select *
         from duty_sign_in_record
-        where id = (select max(id) from duty_sign_in_record where status != 0 and dept_id = #{deptId} and date_format(time, '%Y-%m-%d') = date_format(sysdate(), '%Y-%m-%d'))
+        where id = (select max(id) from duty_sign_in_record where status != 0 and dept_id = #{deptId} and date_format(sign_time, '%Y-%m-%d') = date_format(sysdate(), '%Y-%m-%d'))
     </select>
 
 </mapper>