考勤补卡逻辑完善

common/src/main/java/com/jpsoft/smart/modules/base/dto/WorkDTO.java

@@ -16,6 +16,11 @@ public class WorkDTO {
 
     private String id;
 
+    /**
+     * 补卡记录id
+     */
+    private String fillAttendanceId;
+
     private String status;
 
     private String statusN;

web/src/main/java/com/jpsoft/smart/modules/mobile/controller/WorkAttendanceApiController.java

@@ -98,6 +98,7 @@ public class WorkAttendanceApiController {
                     FillAttendance fillAttendance = fillAttendanceService.findByBusinessWorkAttendanceId(workDTO.getId());
                     if (workDTO.getResult().equals("0")){
                         if (fillAttendance !=null){
+                            workDTO.setFillAttendanceId(fillAttendance.getId());
                             workDTO.setStatus(fillAttendance.getStatus());
                             if (fillAttendance.getStatus().equals("0")){
                                 workDTO.setStatusN("审核中");
@@ -114,6 +115,7 @@ public class WorkAttendanceApiController {
                         if (fillAttendance != null && fillAttendance.getStatus().equals("1")){
                             workDTO.setStatus("1");
                             workDTO.setStatusN("审核通过");
+                            workDTO.setFillAttendanceId(fillAttendance.getId());
                         }
 
                     }
@@ -129,11 +131,7 @@ public class WorkAttendanceApiController {
 
 
 
-     //       searchParams.put("personId", personInfo.getId());
 
-     //       Page<WorkAttendance> page = workAttendanceService.pageSearch(searchParams, pageIndex, pageSize, true, sortList);
-
-     //       Map<String, Object> dataMap = PojoUtils.pageWrapper(page);
 
             msgResult.setData(dataMap);
             msgResult.setResult(true);