优化考勤提示内容

java110-bean/src/main/java/com/java110/dto/attendanceClasses/AttendanceLogDto.java

@@ -30,6 +30,8 @@ public class AttendanceLogDto extends PageDto implements Serializable {
 
     private String facePath;
 
+    private String remark;
+
 
     public String getDepartmentName() {
         return departmentName;
@@ -111,4 +113,12 @@ public class AttendanceLogDto extends PageDto implements Serializable {
     public void setFacePath(String facePath) {
         this.facePath = facePath;
     }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
 }

java110-bean/src/main/java/com/java110/po/attendanceLog/AttendanceLogPo.java

@@ -16,6 +16,8 @@ public class AttendanceLogPo implements Serializable {
 
     private String facePath;
 
+    private String remark;
+
     public String getDepartmentName() {
         return departmentName;
     }
@@ -87,4 +89,12 @@ public class AttendanceLogPo implements Serializable {
     public void setFacePath(String facePath) {
         this.facePath = facePath;
     }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
 }

java110-db/src/main/resources/mapper/common/AttendanceLogServiceDaoImplMapper.xml

@@ -20,7 +20,7 @@
         select t.department_name,t.department_name departmentName,t.department_id,t.department_id
         departmentId,t.staff_name,t.staff_name staffName,t.log_id,t.log_id logId,t.status_cd,t.status_cd
         statusCd,t.store_id,t.store_id storeId,t.staff_id,t.staff_id staffId,t.clock_time,t.clock_time clockTime,
-        t.face_path facePath
+        t.face_path facePath,t.remark
         from attendance_log t
         where 1 =1
         <if test="departmentName !=null and departmentName != ''">
@@ -64,6 +64,9 @@
         <if test="departmentName !=null and departmentName != ''">
             , t.department_name= #{departmentName}
         </if>
+        <if test="remark !=null and remark != ''">
+            , t.remark= #{remark}
+        </if>
         <if test="departmentId !=null and departmentId != ''">
             , t.department_id= #{departmentId}
         </if>

service-common/src/main/java/com/java110/common/cmd/attendanceClasses/CheckInCmd.java

@@ -193,9 +193,11 @@ public class CheckInCmd extends Cmd {
             attendanceClassesTaskDetailDtos = attendanceClassesTaskDetailInnerServiceSMOImpl.queryAttendanceClassesTaskDetails(attendanceClassesTaskDetailDto);
 
             if (attendanceClassesTaskDetailDtos != null || attendanceClassesTaskDetailDtos.size() > 0) {
+                updateAttendanceLogRemark(attendanceLogPo.getLogId(),"重复打卡");
                 context.setResponseEntity(ResultVo.error("重复打卡"));
                 return;
             }
+            updateAttendanceLogRemark(attendanceLogPo.getLogId(),"未到时间");
             context.setResponseEntity(ResultVo.error("未到时间"));
             return;
         }
@@ -212,6 +214,7 @@ public class CheckInCmd extends Cmd {
         flag = attendanceClassesTaskDetailInnerServiceSMOImpl.updateAttendanceClassesTaskDetail(attendanceClassesTaskDetailPo);
 
         if (flag < 1) {
+            updateAttendanceLogRemark(attendanceLogPo.getLogId(),"考勤失败");
             throw new CmdException("考勤失败");
         }
 
@@ -231,6 +234,7 @@ public class CheckInCmd extends Cmd {
         flag = attendanceClassesTaskInnerServiceSMOImpl.updateAttendanceClassesTask(attendanceClassesTaskPo);
 
         if (flag < 1) {
+            updateAttendanceLogRemark(attendanceLogPo.getLogId(),"考勤失败");
             throw new CmdException("考勤失败");
         }
 
@@ -242,11 +246,19 @@ public class CheckInCmd extends Cmd {
         if (AttendanceClassesTaskDetailDto.STATE_LEAVE.equals(attendanceClassesTaskDetailPo.getState())) {
             msg = "打开早退";
         }
-
+        updateAttendanceLogRemark(attendanceLogPo.getLogId(),msg);
         context.setResponseEntity(ResultVo.createResponseEntity(ResultVo.CODE_OK, msg));
 
     }
 
+    private void updateAttendanceLogRemark(String logId, String remark) {
+
+        AttendanceLogPo attendanceLogPo = new AttendanceLogPo();
+        attendanceLogPo.setLogId(logId);
+        attendanceLogPo.setRemark(remark.length() > 1000?remark.substring(0,1000):remark);
+        attendanceLogInnerServiceSMOImpl.updateAttendanceLog(attendanceLogPo);
+    }
+
     /**
      * 考勤状态计算
      *