签卡管理，增加考勤时间

duty-service/src/main/java/cn/com/taiji/duty/controller/DutyWorkbenchController.java

@@ -62,7 +62,7 @@ public class DutyWorkbenchController {
         DutySignInRecordVo vo = new DutySignInRecordVo();
         vo.setDeptId(deptId);
         vo.setTime(date);
-        List<DutySignInRecord> list = signInRecordService.queryList(vo);
+        List<DutySignInRecord> list = signInRecordService.queryCheckDayList(vo);
         DutyDailyReportRecord dailyReportRecord = dailyReportRecordService.queryByDeptIdAndTime(deptId, date);
         DutyWeekReportRecord weekReportRecord = weekReportRecordService.queryByDeptIdAndTime(deptId, date);
         CheckDay checkDay = new CheckDay();

duty-service/src/main/java/cn/com/taiji/duty/model/DutySignInRecord.java

@@ -33,7 +33,7 @@ public class DutySignInRecord implements Serializable {
 	private Long id;
 
 	/** 席位序号 */
-	@ExcelProperty(value = "席位编号",index =0)
+	@ExcelProperty(value = "席位编号",index =1)
 	@ApiModelProperty("席位序号")
 	@TableField("seat_serial_number")
 	private String seatSerialNumber;
@@ -51,7 +51,7 @@ public class DutySignInRecord implements Serializable {
 	private Long deptId;
 
 	/** 单位名称 */
-	@ExcelProperty(value = "单位",index =1)
+	@ExcelProperty(value = "单位",index =0)
 	@ApiModelProperty("单位名称")
 	@TableField("unit_name")
 	private String unitName;
@@ -138,7 +138,7 @@ public class DutySignInRecord implements Serializable {
 	private Date updateTime;
 
 	/** 签卡配置时间 */
-	@ExcelIgnore
+	@ExcelProperty(value = "签卡时间",index =7)
 	@ApiModelProperty("签卡配置时间")
 	@TableField("sign_time")
 	private String signTime;

duty-service/src/main/java/cn/com/taiji/duty/service/IDutySignInRecordService.java

@@ -22,6 +22,8 @@ public interface IDutySignInRecordService extends IService<DutySignInRecord> {
 
     List<DutySignInRecord> queryList(DutySignInRecordVo signInRecordVo);
 
+    List<DutySignInRecord> queryCheckDayList(DutySignInRecordVo signInRecordVo);
+
     boolean addSignIn(DutySignInRecord signInRecord);
 
     long queryCount(Long deptId, String time);

duty-service/src/main/java/cn/com/taiji/duty/service/impl/DutySignInRecordServiceImpl.java

@@ -18,6 +18,7 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDate;
 import java.time.LocalTime;
 import java.time.format.DateTimeFormatter;
 import java.util.Date;
@@ -69,6 +70,20 @@ public class DutySignInRecordServiceImpl extends ServiceImpl<DutySignInRecordMap
     }
 
     @Override
+    public List<DutySignInRecord> queryCheckDayList(DutySignInRecordVo signInRecordVo) {
+        List<DutySignInRecord> list = signInRecordMapper.queryList(signInRecordVo);
+        if (list != null && list.size() > 0) {
+            list.forEach(signInRecord -> {
+                if ("0".equals(signInRecord.getStatus()) || "4".equals(signInRecord.getStatus())) {
+                    signInRecord.setTime(null);
+                }
+                signInRecord.setSignTime(signInRecord.getSignTime().substring(signInRecord.getSignTime().indexOf(" ") + 1));
+            });
+        }
+        return list;
+    }
+
+    @Override
     public boolean addSignIn(DutySignInRecord signInRecord) {
         // now()
         // LocalTime nowTime = LocalTime.now();
@@ -92,6 +107,9 @@ public class DutySignInRecordServiceImpl extends ServiceImpl<DutySignInRecordMap
         log.info("指定时间：{}",time);
         LocalTime nowTime = LocalTime.now();
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("HH:mm:ss");
+        DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+        LocalDate localDate = LocalDate.now();
+        String date = df.format(localDate);
         boolean before = nowTime.isAfter(time);
         if (before) {
             DutySignInRecord signOut = signInRecordMapper.queryByAccountId(signInRecord.getDeptId(),2,new Date());
@@ -100,7 +118,7 @@ public class DutySignInRecordServiceImpl extends ServiceImpl<DutySignInRecordMap
             LocalTime localTime = LocalTime.parse(signEndTime, formatter);
             boolean after = nowTime.isAfter(localTime);
             signInRecord.setStatus("1");
-            signInRecord.setSignTime(signEndTime);
+            signInRecord.setSignTime(date + " " + signEndTime);
             if (!after) {
                 signInRecord.setStatus("3");
             }
@@ -115,7 +133,7 @@ public class DutySignInRecordServiceImpl extends ServiceImpl<DutySignInRecordMap
             boolean after = nowTime.isAfter(localTime);
             if (sign == null) {
                 signInRecord.setType("1");
-                signInRecord.setSignTime(signBeginTime);
+                signInRecord.setSignTime(date + " " + signBeginTime);
                 signInRecord.setStatus("1");
                 if (after) {
                     signInRecord.setStatus("2");
@@ -123,7 +141,7 @@ public class DutySignInRecordServiceImpl extends ServiceImpl<DutySignInRecordMap
             } else {
                 if ("0".equals(sign.getStatus())) {
                     signInRecord.setType("1");
-                    signInRecord.setSignTime(signBeginTime);
+                    signInRecord.setSignTime(date + " " + signBeginTime);
                     signInRecord.setStatus("1");
                     if (after) {
                         signInRecord.setStatus("2");
@@ -131,10 +149,20 @@ public class DutySignInRecordServiceImpl extends ServiceImpl<DutySignInRecordMap
                     signInRecord.setId(sign.getId());
                     return this.updateById(signInRecord);
                 } else {
+                    DutySignInRecord signOut = signInRecordMapper.queryByAccountId(signInRecord.getDeptId(), 2, new Date());
                     signInRecord.setType("2");
                     String signEndTime = configService.selectConfigByKey("sign.end.time");
-                    signInRecord.setSignTime(signEndTime);
-                    signInRecord.setStatus("3");
+                    LocalTime localEndTime = LocalTime.parse(signEndTime, formatter);
+                    boolean afterEnd = nowTime.isAfter(localEndTime);
+                    signInRecord.setStatus("1");
+                    signInRecord.setSignTime(date + " " + signEndTime);
+                    if (!afterEnd) {
+                        signInRecord.setStatus("3");
+                    }
+                    if (signOut != null) {
+                        signInRecord.setId(signOut.getId());
+                        return this.updateById(signInRecord);
+                    }
                 }
             }
         }

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

@@ -65,6 +65,9 @@ public class TimeTask {
         List<DutySignInRecord> signInRecords = new ArrayList<>();
         Date date = new Date();
         String signBeginTime = configService.selectConfigByKey("sign.begin.time");
+        DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+        LocalDate localDate = LocalDate.now();
+        String time = df.format(localDate);
         dutyUnits.forEach(dutyUnit -> {
             DutySignInRecord sign = new DutySignInRecord();
             sign.setDeptId(dutyUnit.getDeptId());
@@ -72,7 +75,7 @@ public class TimeTask {
             sign.setTime(date);
             sign.setType("1");
             sign.setStatus("0");
-            sign.setSignTime(signBeginTime);
+            sign.setSignTime(time + " " + signBeginTime);
             signInRecords.add(sign);
         });
         String signEndTime = configService.selectConfigByKey("sign.end.time");
@@ -83,7 +86,7 @@ public class TimeTask {
             sign.setTime(date);
             sign.setType("2");
             sign.setStatus("0");
-            sign.setSignTime(signEndTime);
+            sign.setSignTime(time + " " + signEndTime);
             signInRecords.add(sign);
         });
         signInRecordService.saveBatch(signInRecords);