Merge branch 'master' of http://gitlab.scsmile.cn/zxf/attendance-performance-platform

attendance-performance-manager/src/main/java/com/mortals/xhx/common/code/AppealResultEnum.java

@@ -9,9 +9,10 @@ import java.util.Map;
 * @author zxfei
 */
 public enum AppealResultEnum {
-    申诉中(0, "申诉中"),
+    审核中(0, "审核中"),
     通过(1, "通过"),
-    不通过(2, "不通过");
+    不通过(2, "不通过"),
+    撤销审批中(3, "撤销审批中");
     private Integer value;
     private String desc;
 

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/dingmsg/api/DingMessageController.java

@@ -14,6 +14,7 @@ import com.dingtalk.api.response.OapiGettokenResponse;
 import com.mortals.framework.annotation.UnAuth;
 import com.mortals.framework.common.Rest;
 import com.mortals.framework.exception.AppException;
+import com.mortals.xhx.common.code.AppealResultEnum;
 import com.mortals.xhx.common.code.LeaveRulesEnum;
 import com.mortals.xhx.common.pdu.ApiRespPdu;
 import com.mortals.xhx.module.attendance.dingmsg.DingCallbackCrypto;
@@ -290,18 +291,18 @@ public class DingMessageController {
 //                                            leaveRecordEntity.setAuditResult(1);
 //                                        }
 //                                    }
-                                    leaveRecordEntity.setAuditResult(1);
+                                    leaveRecordEntity.setAuditResult(AppealResultEnum.通过.getValue());
                                 }
                                 else if(result.equals("")){  //撤销假期审批中result会为空  撤销审批通过后result为AGREE
                                     if(result.getTasks().size() > 1){
                                         log.info("status"+result.getTasks().get(1).getStatus());
                                         if(result.getTasks().get(1).getStatus().compareToIgnoreCase("CANCELED") != 0){
-                                            leaveRecordEntity.setAuditResult(3);  //撤销审批中
+                                            leaveRecordEntity.setAuditResult(AppealResultEnum.撤销审批中.getValue());  //撤销审批中
                                         }
                                     }
                                 }
                                 else {
-                                    leaveRecordEntity.setAuditResult(2);  //请假审批中
+                                    leaveRecordEntity.setAuditResult(AppealResultEnum.审核中.getValue());  //请假审批中
                                 }
 
 

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/vo/AttendanceStatVo.java

@@ -17,11 +17,6 @@ import java.util.List;
 public class AttendanceStatVo extends BaseEntityLong {
 
 
-    @Excels({
-            @Excel(name = "汇总内容", width = 30,  targetAttr = "attendanceSummary", type = Excel.Type.EXPORT),
-            @Excel(name = "日期",  targetAttr = "day", type = Excel.Type.EXPORT),
-
-    })
     private List<AttendanceStaffStatEntity> attendanceStaffStatEntities;
 
 

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/vo/AttendanceSummaryQuery.java

@@ -3,12 +3,16 @@ package com.mortals.xhx.module.attendance.model.vo;
 import com.mortals.framework.annotation.Excel;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * 考勤汇总查询对象
  */
 @Data
 public class AttendanceSummaryQuery {
-    /** 汇总日期 yyyy-mm-dd */
+    /**
+     * 汇总日期 yyyy-mm-dd
+     */
     private String summaryTime;
 
     private String summaryTimeStart;
@@ -31,11 +35,14 @@ public class AttendanceSummaryQuery {
     private Integer page;
     private Integer size;
 
-    public AttendanceSummaryQuery(String summaryTime){
+
+    private List<String> properties;
+
+    public AttendanceSummaryQuery(String summaryTime) {
         this.summaryTime = summaryTime;
     }
 
-    public AttendanceSummaryQuery(){
+    public AttendanceSummaryQuery() {
 
     }
 }

db/add.sql

@@ -855,4 +855,4 @@ PRIMARY KEY  (`id`)
 
 
 
-ALTER TABLE mortals_xhx_attendance_leave_record ADD COLUMN  `sourceDingTime` varchar(64)      COMMENT '钉钉原始请假时间记录';
+ALTER TABLE mortals_xhx_attendance_leave_record ADD COLUMN  `sourceDingTime` varchar(64)   DEFAULT ''      COMMENT '钉钉原始请假时间记录';