考勤报表 补卡添加补卡原因显示及导出

common/src/main/java/com/jpsoft/shinestar/modules/business/dto/PersonInfoDayWSADTO.java

@@ -3,6 +3,7 @@ package com.jpsoft.shinestar.modules.business.dto;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jpsoft.shinestar.modules.base.entity.PersonInfo;
 import com.jpsoft.shinestar.modules.base.entity.WorkStatus;
+import com.jpsoft.shinestar.modules.common.utils.StringUtils;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -149,7 +150,11 @@ public class PersonInfoDayWSADTO {
             text = "休息";
         }
         else if("11".equals(onWorkResult1)){
-            text = "补卡";
+            if(StringUtils.isNotEmpty(onSupplementWork1)) {
+                text = "补卡," + onSupplementWork1;
+            }else{
+                text = "补卡";
+            }
         }
         else if("12".equals(onWorkResult1)){
             text = "加班";
@@ -199,7 +204,11 @@ public class PersonInfoDayWSADTO {
             text = "休息";
         }
         else if("11".equals(offWorkResult1)){
-            text = "补卡";
+            if(StringUtils.isNotEmpty(offSupplementWork1)) {
+                text = "补卡," + offSupplementWork1;
+            }else{
+                text = "补卡";
+            }
         }
         else if("12".equals(offWorkResult1)){
             text = "加班";
@@ -225,6 +234,11 @@ public class PersonInfoDayWSADTO {
     @ApiModelProperty(value = "下班迟到,早退时长(分钟) 转时分")
     private String offLateLeaveMinute1N;
 
+    @ApiModelProperty(value = "上班补卡原因1")
+    private String onSupplementWork1;
+    @ApiModelProperty(value = "下班补卡原因1")
+    private String offSupplementWork1;
+
     /********************************************2********************/
     @ApiModelProperty(value = "上班打卡情况")
     private String onWorkResult2;
@@ -250,7 +264,11 @@ public class PersonInfoDayWSADTO {
             text = "休息";
         }
         else if("11".equals(onWorkResult2)){
-            text = "补卡";
+            if(StringUtils.isNotEmpty(onSupplementWork2)) {
+                text = "补卡," + onSupplementWork2;
+            }else{
+                text = "补卡";
+            }
         }
         else if("12".equals(onWorkResult2)){
             text = "加班";
@@ -300,7 +318,11 @@ public class PersonInfoDayWSADTO {
             text = "休息";
         }
         else if("11".equals(offWorkResult2)){
-            text = "补卡";
+            if(StringUtils.isNotEmpty(offSupplementWork2)) {
+                text = "补卡," + offSupplementWork2;
+            }else{
+                text = "补卡";
+            }
         }
         else if("12".equals(offWorkResult2)){
             text = "加班";
@@ -325,6 +347,10 @@ public class PersonInfoDayWSADTO {
     private BigDecimal offLateLeaveMinute2;
     @ApiModelProperty(value = "下班迟到,早退时长(分钟) 转时分")
     private String offLateLeaveMinute2N;
+    @ApiModelProperty(value = "上班补卡原因2")
+    private String onSupplementWork2;
+    @ApiModelProperty(value = "下班补卡原因2")
+    private String offSupplementWork2;
 
     /*********************************************3**********************/
     @ApiModelProperty(value = "上班打卡情况")
@@ -351,7 +377,11 @@ public class PersonInfoDayWSADTO {
             text = "休息";
         }
         else if("11".equals(onWorkResult3)){
-            text = "补卡";
+            if(StringUtils.isNotEmpty(onSupplementWork3)) {
+                text = "补卡," + onSupplementWork3;
+            }else{
+                text = "补卡";
+            }
         }
         else if("12".equals(onWorkResult3)){
             text = "加班";
@@ -401,7 +431,11 @@ public class PersonInfoDayWSADTO {
             text = "休息";
         }
         else if("11".equals(offWorkResult3)){
-            text = "补卡";
+            if(StringUtils.isNotEmpty(offSupplementWork3)) {
+                text = "补卡," + offSupplementWork3;
+            }else{
+                text = "补卡";
+            }
         }
         else if("12".equals(offWorkResult3)){
             text = "加班";
@@ -426,6 +460,10 @@ public class PersonInfoDayWSADTO {
     private BigDecimal offLateLeaveMinute3;
     @ApiModelProperty(value = "下班迟到,早退时长(分钟) 转时分")
     private String offLateLeaveMinute3N;
+    @ApiModelProperty(value = "上班补卡原因3")
+    private String onSupplementWork3;
+    @ApiModelProperty(value = "下班补卡原因3")
+    private String offSupplementWork3;
 
     @ApiModelProperty(value = "旷工天数")
     private BigDecimal absenteeismDays ;

web/src/main/java/com/jpsoft/shinestar/modules/business/controller/WorkScheduleAttendanceController.java

@@ -8,8 +8,12 @@ import com.jpsoft.shinestar.modules.base.entity.*;
 import com.jpsoft.shinestar.modules.base.service.*;
 import com.jpsoft.shinestar.modules.business.dto.PersonInfoDayWSADTO;
 import com.jpsoft.shinestar.modules.business.dto.PersonInfoMonthWSADTO;
+import com.jpsoft.shinestar.modules.business.entity.SupplementWork;
+import com.jpsoft.shinestar.modules.business.entity.SupplementWorkPerson;
 import com.jpsoft.shinestar.modules.business.entity.WorkScheduleAttendance;
 import com.jpsoft.shinestar.modules.business.service.RequestForLeaveInfoService;
+import com.jpsoft.shinestar.modules.business.service.SupplementWorkPersonService;
+import com.jpsoft.shinestar.modules.business.service.SupplementWorkService;
 import com.jpsoft.shinestar.modules.common.dto.MessageResult;
 import com.jpsoft.shinestar.modules.business.service.WorkScheduleAttendanceService;
 import com.jpsoft.shinestar.modules.common.utils.OSSUtil;
@@ -74,6 +78,10 @@ public class WorkScheduleAttendanceController {
     private RequestForLeaveInfoService requestForLeaveInfoService;
     @Autowired
     private HolidayInfoService holidayInfoService;
+    @Autowired
+    private SupplementWorkService supplementWorkService;
+    @Autowired
+    private SupplementWorkPersonService supplementWorkPersonService;
 
     @Autowired
     private OSSConfig ossConfig;
@@ -917,6 +925,7 @@ public class WorkScheduleAttendanceController {
                             Date onWorkRecordTime = null;
                             BigDecimal onLateLeaveMinute = BigDecimal.ZERO;
                             String onLateLeaveMinuteN = "";
+                            String onSupplementWork = "";
 
                             String offWorkResult = "50";
                             String offWorkStatus = "";
@@ -924,6 +933,7 @@ public class WorkScheduleAttendanceController {
                             Date offWorkRecordTime = null;
                             BigDecimal offLateLeaveMinute = BigDecimal.ZERO;
                             String offLateLeaveMinuteN = "";
+                            String offSupplementWork = "";
 
                             if ("0".equals(shiftNumber)) {
                                 //休息
@@ -952,6 +962,17 @@ public class WorkScheduleAttendanceController {
                                     if ("补卡".equals(wsa.getRemark())) {
                                         //补卡为11
                                         onWorkResult = "11";
+
+                                        //"补卡原因";
+                                        if (StringUtils.isNotEmpty(wsa.getSupplementWorkPersonId())) {
+                                            SupplementWorkPerson supplementWorkPerson = supplementWorkPersonService.get(wsa.getSupplementWorkPersonId());
+                                            if(supplementWorkPerson != null){
+                                                SupplementWork supplementWork = supplementWorkService.get(supplementWorkPerson.getSupplementWorkId());
+                                                if(supplementWork != null){
+                                                    onSupplementWork = supplementWork.getReason();
+                                                }
+                                            }
+                                        }
                                     } else if ("3".equals(wsa.getWorkStatus())) {
                                         //出差
                                         onWorkResult = "9";
@@ -978,6 +999,17 @@ public class WorkScheduleAttendanceController {
                                     if ("补卡".equals(wsa.getRemark())) {
                                         //补卡为11
                                         offWorkResult = "11";
+
+                                        //"补卡原因";
+                                        if (StringUtils.isNotEmpty(wsa.getSupplementWorkPersonId())) {
+                                            SupplementWorkPerson supplementWorkPerson = supplementWorkPersonService.get(wsa.getSupplementWorkPersonId());
+                                            if(supplementWorkPerson != null){
+                                                SupplementWork supplementWork = supplementWorkService.get(supplementWorkPerson.getSupplementWorkId());
+                                                if(supplementWork != null){
+                                                    offSupplementWork = supplementWork.getReason();
+                                                }
+                                            }
+                                        }
                                     } else if ("3".equals(wsa.getWorkStatus())) {
                                         //出差
                                         offWorkResult = "9";
@@ -1012,6 +1044,7 @@ public class WorkScheduleAttendanceController {
                                 wsaDayDTO.setOnWorkRecordTime1(onWorkRecordTime);
                                 wsaDayDTO.setOnLateLeaveMinute1(onLateLeaveMinute);
                                 wsaDayDTO.setOnLateLeaveMinute1N(onLateLeaveMinuteN);
+                                wsaDayDTO.setOffSupplementWork1(offSupplementWork);
 
                                 wsaDayDTO.setOffWorkResult1(offWorkResult);
                                 wsaDayDTO.setOffWorkStatus1(offWorkStatus);
@@ -1019,6 +1052,7 @@ public class WorkScheduleAttendanceController {
                                 wsaDayDTO.setOffWorkRecordTime1(offWorkRecordTime);
                                 wsaDayDTO.setOffLateLeaveMinute1(offLateLeaveMinute);
                                 wsaDayDTO.setOffLateLeaveMinute1N(offLateLeaveMinuteN);
+                                wsaDayDTO.setOnSupplementWork1(onSupplementWork);
                             } else if (i == 1) {
                                 wsaDayDTO.setOnWorkResult2(onWorkResult);
                                 wsaDayDTO.setOnWorkStatus2(onWorkStatus);
@@ -1026,6 +1060,7 @@ public class WorkScheduleAttendanceController {
                                 wsaDayDTO.setOnWorkRecordTime2(onWorkRecordTime);
                                 wsaDayDTO.setOnLateLeaveMinute2(onLateLeaveMinute);
                                 wsaDayDTO.setOnLateLeaveMinute2N(onLateLeaveMinuteN);
+                                wsaDayDTO.setOffSupplementWork2(offSupplementWork);
 
                                 wsaDayDTO.setOffWorkResult2(offWorkResult);
                                 wsaDayDTO.setOffWorkStatus2(offWorkStatus);
@@ -1033,6 +1068,7 @@ public class WorkScheduleAttendanceController {
                                 wsaDayDTO.setOffWorkRecordTime2(offWorkRecordTime);
                                 wsaDayDTO.setOffLateLeaveMinute2(offLateLeaveMinute);
                                 wsaDayDTO.setOffLateLeaveMinute2N(offLateLeaveMinuteN);
+                                wsaDayDTO.setOnSupplementWork2(onSupplementWork);
                             } else if (i == 2) {
                                 wsaDayDTO.setOnWorkResult3(onWorkResult);
                                 wsaDayDTO.setOnWorkStatus3(onWorkStatus);
@@ -1040,6 +1076,7 @@ public class WorkScheduleAttendanceController {
                                 wsaDayDTO.setOnWorkRecordTime3(onWorkRecordTime);
                                 wsaDayDTO.setOnLateLeaveMinute3(onLateLeaveMinute);
                                 wsaDayDTO.setOnLateLeaveMinute3N(onLateLeaveMinuteN);
+                                wsaDayDTO.setOffSupplementWork3(offSupplementWork);
 
                                 wsaDayDTO.setOffWorkResult3(offWorkResult);
                                 wsaDayDTO.setOffWorkStatus3(offWorkStatus);
@@ -1047,6 +1084,7 @@ public class WorkScheduleAttendanceController {
                                 wsaDayDTO.setOffWorkRecordTime3(offWorkRecordTime);
                                 wsaDayDTO.setOffLateLeaveMinute3(offLateLeaveMinute);
                                 wsaDayDTO.setOffLateLeaveMinute3N(offLateLeaveMinuteN);
+                                wsaDayDTO.setOnSupplementWork3(onSupplementWork);
                             }
                         }
 
@@ -1203,6 +1241,7 @@ public class WorkScheduleAttendanceController {
                             Date onWorkRecordTime = null;
                             BigDecimal onLateLeaveMinute = BigDecimal.ZERO;
                             String onLateLeaveMinuteN = "";
+                            String onSupplementWork = "";
 
                             String offWorkResult = "50";
                             String offWorkStatus = "";
@@ -1210,6 +1249,7 @@ public class WorkScheduleAttendanceController {
                             Date offWorkRecordTime = null;
                             BigDecimal offLateLeaveMinute = BigDecimal.ZERO;
                             String offLateLeaveMinuteN = "";
+                            String offSupplementWork = "";
 
                             if ("0".equals(shiftNumber)) {
                                 //休息
@@ -1238,6 +1278,16 @@ public class WorkScheduleAttendanceController {
                                     if ("补卡".equals(wsa.getRemark())) {
                                         //补卡为11
                                         onWorkResult = "11";
+                                        //"补卡原因";
+                                        if (StringUtils.isNotEmpty(wsa.getSupplementWorkPersonId())) {
+                                            SupplementWorkPerson supplementWorkPerson = supplementWorkPersonService.get(wsa.getSupplementWorkPersonId());
+                                            if(supplementWorkPerson != null){
+                                                SupplementWork supplementWork = supplementWorkService.get(supplementWorkPerson.getSupplementWorkId());
+                                                if(supplementWork != null){
+                                                    onSupplementWork = supplementWork.getReason();
+                                                }
+                                            }
+                                        }
                                     } else if ("3".equals(wsa.getWorkStatus())) {
                                         //出差
                                         onWorkResult = "9";
@@ -1266,6 +1316,17 @@ public class WorkScheduleAttendanceController {
                                     if ("补卡".equals(wsa.getRemark())) {
                                         //补卡为11
                                         offWorkResult = "11";
+
+                                        //"补卡原因";
+                                        if (StringUtils.isNotEmpty(wsa.getSupplementWorkPersonId())) {
+                                            SupplementWorkPerson supplementWorkPerson = supplementWorkPersonService.get(wsa.getSupplementWorkPersonId());
+                                            if(supplementWorkPerson != null){
+                                                SupplementWork supplementWork = supplementWorkService.get(supplementWorkPerson.getSupplementWorkId());
+                                                if(supplementWork != null){
+                                                    offSupplementWork = supplementWork.getReason();
+                                                }
+                                            }
+                                        }
                                     } else if ("3".equals(wsa.getWorkStatus())) {
                                         //出差
                                         offWorkResult = "9";
@@ -1300,6 +1361,7 @@ public class WorkScheduleAttendanceController {
                                 wsaDayDTO.setOnWorkRecordTime1(onWorkRecordTime);
                                 wsaDayDTO.setOnLateLeaveMinute1(onLateLeaveMinute);
                                 wsaDayDTO.setOnLateLeaveMinute1N(onLateLeaveMinuteN);
+                                wsaDayDTO.setOnSupplementWork1(onSupplementWork);
 
                                 wsaDayDTO.setOffWorkResult1(offWorkResult);
                                 wsaDayDTO.setOffWorkStatus1(offWorkStatus);
@@ -1307,6 +1369,7 @@ public class WorkScheduleAttendanceController {
                                 wsaDayDTO.setOffWorkRecordTime1(offWorkRecordTime);
                                 wsaDayDTO.setOffLateLeaveMinute1(offLateLeaveMinute);
                                 wsaDayDTO.setOffLateLeaveMinute1N(offLateLeaveMinuteN);
+                                wsaDayDTO.setOffSupplementWork1(offSupplementWork);
                             } else if (i == 1) {
                                 wsaDayDTO.setOnWorkResult2(onWorkResult);
                                 wsaDayDTO.setOnWorkStatus2(onWorkStatus);
@@ -1314,6 +1377,7 @@ public class WorkScheduleAttendanceController {
                                 wsaDayDTO.setOnWorkRecordTime2(onWorkRecordTime);
                                 wsaDayDTO.setOnLateLeaveMinute2(onLateLeaveMinute);
                                 wsaDayDTO.setOnLateLeaveMinute2N(onLateLeaveMinuteN);
+                                wsaDayDTO.setOnSupplementWork2(offSupplementWork);
 
                                 wsaDayDTO.setOffWorkResult2(offWorkResult);
                                 wsaDayDTO.setOffWorkStatus2(offWorkStatus);
@@ -1321,6 +1385,7 @@ public class WorkScheduleAttendanceController {
                                 wsaDayDTO.setOffWorkRecordTime2(offWorkRecordTime);
                                 wsaDayDTO.setOffLateLeaveMinute2(offLateLeaveMinute);
                                 wsaDayDTO.setOffLateLeaveMinute2N(offLateLeaveMinuteN);
+                                wsaDayDTO.setOffSupplementWork2(offSupplementWork);
                             } else if (i == 2) {
                                 wsaDayDTO.setOnWorkResult3(onWorkResult);
                                 wsaDayDTO.setOnWorkStatus3(onWorkStatus);
@@ -1328,6 +1393,7 @@ public class WorkScheduleAttendanceController {
                                 wsaDayDTO.setOnWorkRecordTime3(onWorkRecordTime);
                                 wsaDayDTO.setOnLateLeaveMinute3(onLateLeaveMinute);
                                 wsaDayDTO.setOnLateLeaveMinute3N(onLateLeaveMinuteN);
+                                wsaDayDTO.setOnSupplementWork3(offSupplementWork);
 
                                 wsaDayDTO.setOffWorkResult3(offWorkResult);
                                 wsaDayDTO.setOffWorkStatus3(offWorkStatus);
@@ -1335,6 +1401,7 @@ public class WorkScheduleAttendanceController {
                                 wsaDayDTO.setOffWorkRecordTime3(offWorkRecordTime);
                                 wsaDayDTO.setOffLateLeaveMinute3(offLateLeaveMinute);
                                 wsaDayDTO.setOffLateLeaveMinute3N(offLateLeaveMinuteN);
+                                wsaDayDTO.setOffSupplementWork3(offSupplementWork);
                             }
                         }
 
@@ -1504,7 +1571,6 @@ public class WorkScheduleAttendanceController {
 
                             List<WorkScheduleAttendance> wsaList = workScheduleAttendanceService.findByPersonIdAndShiftIdAndAttendanceDate(pi.getId(), shiftId, queryDate);
                             //单排班只有2条记录 1条上班1条下班
-
                             wsaDayDTO.setPersonInfo(pi);
                             wsaDayDTO.setAttendanceDate(sdf.parse(queryDate));
 
@@ -1514,6 +1580,8 @@ public class WorkScheduleAttendanceController {
                             Date onWorkRecordTime = null;
                             BigDecimal onLateLeaveMinute = BigDecimal.ZERO;
                             String onLateLeaveMinuteN = "";
+                            String onSupplementWork = "";
+
 
                             String offWorkResult = "50";
                             String offWorkStatus = "";
@@ -1521,6 +1589,7 @@ public class WorkScheduleAttendanceController {
                             Date offWorkRecordTime = null;
                             BigDecimal offLateLeaveMinute = BigDecimal.ZERO;
                             String offLateLeaveMinuteN = "";
+                            String offSupplementWork = "";
 
                             if ("0".equals(shiftNumber)) {
                                 //休息
@@ -1549,6 +1618,18 @@ public class WorkScheduleAttendanceController {
                                     if ("补卡".equals(wsa.getRemark())) {
                                         //补卡为11
                                         onWorkResult = "11";
+
+                                        //"补卡原因";
+                                        if (StringUtils.isNotEmpty(wsa.getSupplementWorkPersonId())) {
+                                            SupplementWorkPerson supplementWorkPerson = supplementWorkPersonService.get(wsa.getSupplementWorkPersonId());
+                                            if(supplementWorkPerson != null){
+                                                SupplementWork supplementWork = supplementWorkService.get(supplementWorkPerson.getSupplementWorkId());
+                                                if(supplementWork != null){
+                                                    onSupplementWork = supplementWork.getReason();
+                                                }
+                                            }
+                                        }
+
                                     } else if ("3".equals(wsa.getWorkStatus())) {
                                         //出差
                                         onWorkResult = "9";
@@ -1575,6 +1656,17 @@ public class WorkScheduleAttendanceController {
                                     if ("补卡".equals(wsa.getRemark())) {
                                         //补卡为11
                                         offWorkResult = "11";
+
+                                        //"补卡原因";
+                                        if (StringUtils.isNotEmpty(wsa.getSupplementWorkPersonId())) {
+                                            SupplementWorkPerson supplementWorkPerson = supplementWorkPersonService.get(wsa.getSupplementWorkPersonId());
+                                            if(supplementWorkPerson != null){
+                                                SupplementWork supplementWork = supplementWorkService.get(supplementWorkPerson.getSupplementWorkId());
+                                                if(supplementWork != null){
+                                                    offSupplementWork = supplementWork.getReason();
+                                                }
+                                            }
+                                        }
                                     } else if ("3".equals(wsa.getWorkStatus())) {
                                         //出差
                                         offWorkResult = "9";
@@ -1610,6 +1702,7 @@ public class WorkScheduleAttendanceController {
                                 wsaDayDTO.setOnWorkRecordTime1(onWorkRecordTime);
                                 wsaDayDTO.setOnLateLeaveMinute1(onLateLeaveMinute);
                                 wsaDayDTO.setOnLateLeaveMinute1N(onLateLeaveMinuteN);
+                                wsaDayDTO.setOnSupplementWork1(onSupplementWork);
 
                                 wsaDayDTO.setOffWorkResult1(offWorkResult);
                                 wsaDayDTO.setOffWorkStatus1(offWorkStatus);
@@ -1617,6 +1710,7 @@ public class WorkScheduleAttendanceController {
                                 wsaDayDTO.setOffWorkRecordTime1(offWorkRecordTime);
                                 wsaDayDTO.setOffLateLeaveMinute1(offLateLeaveMinute);
                                 wsaDayDTO.setOffLateLeaveMinute1N(offLateLeaveMinuteN);
+                                wsaDayDTO.setOffSupplementWork1(offSupplementWork);
                             } else if (i == 1) {
                                 wsaDayDTO.setOnWorkResult2(onWorkResult);
                                 wsaDayDTO.setOnWorkStatus2(onWorkStatus);
@@ -1624,6 +1718,7 @@ public class WorkScheduleAttendanceController {
                                 wsaDayDTO.setOnWorkRecordTime2(onWorkRecordTime);
                                 wsaDayDTO.setOnLateLeaveMinute2(onLateLeaveMinute);
                                 wsaDayDTO.setOnLateLeaveMinute2N(onLateLeaveMinuteN);
+                                wsaDayDTO.setOnSupplementWork2(offSupplementWork);
 
                                 wsaDayDTO.setOffWorkResult2(offWorkResult);
                                 wsaDayDTO.setOffWorkStatus2(offWorkStatus);
@@ -1631,6 +1726,7 @@ public class WorkScheduleAttendanceController {
                                 wsaDayDTO.setOffWorkRecordTime2(offWorkRecordTime);
                                 wsaDayDTO.setOffLateLeaveMinute2(offLateLeaveMinute);
                                 wsaDayDTO.setOffLateLeaveMinute2N(offLateLeaveMinuteN);
+                                wsaDayDTO.setOffSupplementWork2(offSupplementWork);
                             } else if (i == 2) {
                                 wsaDayDTO.setOnWorkResult3(onWorkResult);
                                 wsaDayDTO.setOnWorkStatus3(onWorkStatus);
@@ -1638,6 +1734,7 @@ public class WorkScheduleAttendanceController {
                                 wsaDayDTO.setOnWorkRecordTime3(onWorkRecordTime);
                                 wsaDayDTO.setOnLateLeaveMinute3(onLateLeaveMinute);
                                 wsaDayDTO.setOnLateLeaveMinute3N(onLateLeaveMinuteN);
+                                wsaDayDTO.setOnSupplementWork3(offSupplementWork);
 
                                 wsaDayDTO.setOffWorkResult3(offWorkResult);
                                 wsaDayDTO.setOffWorkStatus3(offWorkStatus);
@@ -1645,6 +1742,7 @@ public class WorkScheduleAttendanceController {
                                 wsaDayDTO.setOffWorkRecordTime3(offWorkRecordTime);
                                 wsaDayDTO.setOffLateLeaveMinute3(offLateLeaveMinute);
                                 wsaDayDTO.setOffLateLeaveMinute3N(offLateLeaveMinuteN);
+                                wsaDayDTO.setOffSupplementWork3(offSupplementWork);
                             }
                         }