修改考勤汇总

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

+package com.mortals.xhx.common.code;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+* 核查结果(1.加分或扣分,2.不扣分)枚举类
+*
+* @author zxfei
+*/
+public enum CheckResultAddEnum {
+    核查加分("核查加分", "核查加分"),
+    核查不加分("核查不加分", "核查不加分");
+    private String value;
+    private String desc;
+
+    CheckResultAddEnum(String value, String desc) {
+        this.value = value;
+        this.desc = desc;
+    }
+
+    public String getValue() {
+        return this.value;
+    }
+
+    public String getDesc() {
+        return this.desc;
+    }
+
+    public static CheckResultAddEnum getByValue(String value) {
+        for (CheckResultAddEnum checkResultEnum : CheckResultAddEnum.values()) {
+            if (checkResultEnum.getValue() == value) {
+                return checkResultEnum;
+            }
+        }
+        return null;
+    }
+
+    /**
+    * 获取Map集合
+    *
+    * @param eItem 不包含项
+    * @return
+    */
+    public static Map<String, String> getEnumMap(String... eItem) {
+        Map<String, String> resultMap = new LinkedHashMap<>();
+        for (CheckResultAddEnum item : CheckResultAddEnum.values()) {
+            try {
+                boolean hasE = false;
+                for (String e : eItem) {
+                    if (item.getValue() == e) {
+                        hasE = true;
+                        break;
+                    }
+                }
+                if (!hasE) {
+                    resultMap.put(item.getValue() + "", item.getDesc());
+                }
+            } catch (Exception ex) {
+
+            }
+        }
+        return resultMap;
+    }
+}
\ No newline at end of file

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

+package com.mortals.xhx.common.code;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+* 核查结果(1.加分或扣分,2.不扣分)枚举类
+*
+* @author zxfei
+*/
+public enum CheckResultSubEnum {
+    核查扣分("核查扣分", "核查扣分"),
+    核查不扣分("核查不扣分", "核查不扣分");
+    private String value;
+    private String desc;
+
+    CheckResultSubEnum(String value, String desc) {
+        this.value = value;
+        this.desc = desc;
+    }
+
+    public String getValue() {
+        return this.value;
+    }
+
+    public String getDesc() {
+        return this.desc;
+    }
+
+    public static CheckResultSubEnum getByValue(String value) {
+        for (CheckResultSubEnum checkResultEnum : CheckResultSubEnum.values()) {
+            if (checkResultEnum.getValue() == value) {
+                return checkResultEnum;
+            }
+        }
+        return null;
+    }
+
+    /**
+    * 获取Map集合
+    *
+    * @param eItem 不包含项
+    * @return
+    */
+    public static Map<String, String> getEnumMap(String... eItem) {
+        Map<String, String> resultMap = new LinkedHashMap<>();
+        for (CheckResultSubEnum item : CheckResultSubEnum.values()) {
+            try {
+                boolean hasE = false;
+                for (String e : eItem) {
+                    if (item.getValue() == e) {
+                        hasE = true;
+                        break;
+                    }
+                }
+                if (!hasE) {
+                    resultMap.put(item.getValue() + "", item.getDesc());
+                }
+            } catch (Exception ex) {
+
+            }
+        }
+        return resultMap;
+    }
+}
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckAttendRecordController.java

@@ -59,6 +59,8 @@ public class CheckAttendRecordController extends BaseCRUDJsonBodyMappingControll
         this.addDict(model, "subAddType", SubAddTypeEnum.getEnumMap());
         this.addDict(model, "checkType", CheckTypeEnum.getEnumMap());
         this.addDict(model, "checkResult", CheckResultEnum.getEnumMap());
+        this.addDict(model, "checkResultAdd", CheckResultAddEnum.getEnumMap());
+        this.addDict(model, "checkResultSub", CheckResultSubEnum.getEnumMap());
 
         super.init(model, context);
     }

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckComplainRecordController.java

@@ -51,6 +51,8 @@ public class CheckComplainRecordController extends BaseCRUDJsonBodyMappingContro
         this.addDict(model, "subAddType", SubAddTypeEnum.getEnumMap());
         this.addDict(model, "checkType", CheckTypeEnum.getEnumMap());
         this.addDict(model, "checkResult", CheckResultEnum.getEnumMap());
+        this.addDict(model, "checkResultAdd", CheckResultAddEnum.getEnumMap());
+        this.addDict(model, "checkResultSub", CheckResultSubEnum.getEnumMap());
     }
 
     @Override

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckEffectRecordController.java

@@ -52,6 +52,8 @@ public class CheckEffectRecordController extends BaseCRUDJsonBodyMappingControll
         this.addDict(model, "subAddType", SubAddTypeEnum.getEnumMap());
         this.addDict(model, "checkType", CheckTypeEnum.getEnumMap());
         this.addDict(model, "checkResult", CheckResultEnum.getEnumMap());
+        this.addDict(model, "checkResultAdd", CheckResultAddEnum.getEnumMap());
+        this.addDict(model, "checkResultSub", CheckResultSubEnum.getEnumMap());
     }
 
     @Override

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckGoworkRecordController.java

@@ -52,6 +52,8 @@ public class CheckGoworkRecordController extends BaseCRUDJsonBodyMappingControll
         this.addDict(model, "subAddType", SubAddTypeEnum.getEnumMap());
         this.addDict(model, "checkType", CheckTypeEnum.getEnumMap());
         this.addDict(model, "checkResult", CheckResultEnum.getEnumMap());
+        this.addDict(model, "checkResultAdd", CheckResultAddEnum.getEnumMap());
+        this.addDict(model, "checkResultSub", CheckResultSubEnum.getEnumMap());
     }
 
     @Override

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckOtherRecordController.java

@@ -52,6 +52,8 @@ public class CheckOtherRecordController extends BaseCRUDJsonBodyMappingControlle
         this.addDict(model, "subAddType", SubAddTypeEnum.getEnumMap());
         this.addDict(model, "checkType", CheckTypeEnum.getEnumMap());
         this.addDict(model, "checkResult", CheckResultEnum.getEnumMap());
+        this.addDict(model, "checkResultAdd", CheckResultAddEnum.getEnumMap());
+        this.addDict(model, "checkResultSub", CheckResultSubEnum.getEnumMap());
     }
 
     @Override

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckReviewRecordController.java

 package com.mortals.xhx.module.check.web;
+
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.OrderCol;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
@@ -10,44 +11,51 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.*;
 import com.mortals.framework.model.Context;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.module.check.model.CheckReviewRecordEntity;
 import com.mortals.xhx.module.check.service.CheckReviewRecordService;
 import org.apache.commons.lang3.ArrayUtils;
 import com.mortals.framework.util.StringUtils;
+
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
+
 import com.alibaba.fastjson.JSONObject;
+
 import java.util.Arrays;
+
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
+
 import static com.mortals.framework.ap.SysConstains.*;
+
 /**
-*
-* 评价差评绩效核查信息
-*
-* @author zxfei
-* @date 2023-07-11
-*/
+ * 评价差评绩效核查信息
+ *
+ * @author zxfei
+ * @date 2023-07-11
+ */
 @RestController
 @RequestMapping("check/review/record")
-public class CheckReviewRecordController extends BaseCRUDJsonBodyMappingController<CheckReviewRecordService,CheckReviewRecordEntity,Long> {
+public class CheckReviewRecordController extends BaseCRUDJsonBodyMappingController<CheckReviewRecordService, CheckReviewRecordEntity, Long> {
 
     @Autowired
     private ParamService paramService;
 
-    public CheckReviewRecordController(){
-        super.setModuleDesc( "评价差评绩效核查信息");
+    public CheckReviewRecordController() {
+        super.setModuleDesc("评价差评绩效核查信息");
     }
 
     @Override
     protected void init(Map<String, Object> model, Context context) {
-        this.addDict(model, "reviewResult", paramService.getParamBySecondOrganize("CheckReviewRecord","reviewResult"));
-        this.addDict(model, "reviewSource", paramService.getParamBySecondOrganize("CheckReviewRecord","reviewSource"));
+        this.addDict(model, "reviewResult", paramService.getParamBySecondOrganize("CheckReviewRecord", "reviewResult"));
+        this.addDict(model, "reviewSource", paramService.getParamBySecondOrganize("CheckReviewRecord", "reviewSource"));
 
         this.addDict(model, "checkStatus", CheckStatusEnum.getEnumMap());
         this.addDict(model, "subMethod", SubMethodEnum.getEnumMap());
@@ -55,6 +63,8 @@ public class CheckReviewRecordController extends BaseCRUDJsonBodyMappingControll
         this.addDict(model, "checkType", CheckTypeEnum.getEnumMap());
 
         this.addDict(model, "checkResult", CheckResultEnum.getEnumMap());
+        this.addDict(model, "checkResultAdd", CheckResultAddEnum.getEnumMap());
+        this.addDict(model, "checkResultSub", CheckResultSubEnum.getEnumMap());
     }
 
     @Override
@@ -69,6 +79,7 @@ public class CheckReviewRecordController extends BaseCRUDJsonBodyMappingControll
 
     /**
      * 审核
+     *
      * @param entity
      * @return
      */