修改考勤汇总

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformAttendAppealController.java

@@ -77,14 +77,15 @@ public class PerformAttendAppealController extends BaseCRUDJsonBodyMappingContro
         this.addDict(model, "updateUserId", userService.find(new UserQuery()).stream().collect(toMap(x -> x.getId().toString(), y -> y.getRealName(), (o, n) -> n)));
         this.addDict(model, "ruleId", rulesService.find(new PerformRulesQuery()).stream().collect(toMap(x -> x.getId().toString(), y -> y.getName(), (o, n) -> n)));
         this.addDict(model, "checkResult", CheckResultEnum.getEnumMap());
-        this.addDict(model, "subMethod", paramService.getParamBySecondOrganize("PerformAttendAppeal", "subMethod"));
-        this.addDict(model, "subAddType", paramService.getParamBySecondOrganize("PerformAttendAppeal", "subAddType"));
+        this.addDict(model, "subMethod", SubMethodEnum.getEnumMap());
+        this.addDict(model, "subAddType", SubAddTypeEnum.getEnumMap());
         this.addDict(model, "processStatus", ProcessStatusEnum.getEnumMap());
-        this.addDict(model, "appealResult", paramService.getParamBySecondOrganize("PerformAttendAppeal", "appealResult"));
+        this.addDict(model, "appealResult", AppealResultEnum.getEnumMap());
         this.addDict(model, "reviewResult", paramService.getParamBySecondOrganize("PerformAttendAppeal", "reviewResult"));
         this.addDict(model, "reviewSource", paramService.getParamBySecondOrganize("PerformAttendAppeal", "reviewSource"));
         this.addDict(model, "irregularType", IrregularTypeEnum.getEnumMap());
-        this.addDict(model, "irregularOtherType", paramService.getParamBySecondOrganize("PerformAttendAppeal", "irregularOtherType"));
+
+        this.addDict(model, "irregularOtherType", IrregularOtherTypeEnum.getEnumMap());
         super.init(model, context);
     }
 
@@ -96,7 +97,7 @@ public class PerformAttendAppealController extends BaseCRUDJsonBodyMappingContro
         } else {
             query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
         }
-        if(!ObjectUtils.isEmpty(query.getCreateTime())){
+        if (!ObjectUtils.isEmpty(query.getCreateTime())) {
             query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime()));
             query.setCreateTimeEnd(DateUtil.formatDate(query.getCreateTime()));
         }
@@ -132,7 +133,7 @@ public class PerformAttendAppealController extends BaseCRUDJsonBodyMappingContro
      */
     @PostMapping(value = "audit")
     public String appealAudit(@RequestBody PerformAttendAppealEntity appeal) {
-        log.info("appeal audit ==>{}",JSONObject.toJSONString(appeal));
+        log.info("appeal audit ==>{}", JSONObject.toJSONString(appeal));
         JSONObject jsonObject = new JSONObject();
         String busiDesc = this.getModuleDesc() + "审核";
         try {
@@ -142,7 +143,7 @@ public class PerformAttendAppealController extends BaseCRUDJsonBodyMappingContro
             }
             recordSysLog(request, busiDesc + " 【成功】");
             jsonObject.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
-            jsonObject.put(KEY_RESULT_MSG, busiDesc+ "成功!");
+            jsonObject.put(KEY_RESULT_MSG, busiDesc + "成功!");
         } catch (Exception e) {
             log.error("申诉审核", e);
             jsonObject.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
@@ -153,6 +154,7 @@ public class PerformAttendAppealController extends BaseCRUDJsonBodyMappingContro
 
     /**
      * 申述分布情况统计
+     *
      * @param query
      * @return
      */
@@ -166,15 +168,15 @@ public class PerformAttendAppealController extends BaseCRUDJsonBodyMappingContro
         int code = 1;
         try {
             List<PerformAttendAppealEntity> result = this.getService().getAppealSummaryList(query);
-            Map<String,String> dict = new HashMap<>();
+            Map<String, String> dict = new HashMap<>();
             //attend:考勤绩效,review:评价差评绩效,complain:评价投诉绩效,gowork:办件绩效,effect:效能绩效,other:其它绩效
-            dict.put("attend","考勤绩效");
-            dict.put("review","评价差评绩效");
-            dict.put("complain","评价投诉绩效");
-            dict.put("gowork","办件绩效");
-            dict.put("effect","效能绩效");
-            dict.put("other","其它绩效");
-            this.addDict(model,"performType",dict);
+            dict.put("attend", "考勤绩效");
+            dict.put("review", "评价差评绩效");
+            dict.put("complain", "评价投诉绩效");
+            dict.put("gowork", "办件绩效");
+            dict.put("effect", "效能绩效");
+            dict.put("other", "其它绩效");
+            this.addDict(model, "performType", dict);
             model.put("data", result);
             model.put("message_info", busiDesc + "成功");
             if (!ObjectUtils.isEmpty(context) && !ObjectUtils.isEmpty(context.getUser())) {