Merge remote-tracking branch 'origin/master'

attendance-performance-manager-ui/admin/src/views/feedback/addQuestion/list.vue

@@ -179,6 +179,15 @@ export default {
     },
     mounted() {
         this.getDeptData()
+        // let query = this.$route
+        // console.log(query.query)
+        // if (query.id) {
+        //     console.log(this.$route.query)
+        //     let editFeedback = JSON.parse(localStorage.getItem("editFeedback"))
+        //     console.log(editFeedback)
+        //     this.titleForm.title = editFeedback.title
+        //     this.titleForm.remark = editFeedback.remark
+        // }
     },
     methods: {
         subUser() {

attendance-performance-manager-ui/admin/src/views/feedback/list.vue

@@ -44,12 +44,14 @@ export default {
         },
         /** 重写编辑方法 */
         toEdit(row) {
-            this.$refs.drawerform.edit(row);
+            // this.$refs.drawerform.edit(row);
+            this.$router.push({ path: `/feedback/addQuestion/list?id =${row.id}` });
+            localStorage.setItem('editFeedback', JSON.stringify(row))
         },
         /** 重写查看方法 */
         toView(row) {
             console.log(row)
-            localStorage.setItem('checkFeedbackId',row.id)
+            localStorage.setItem('checkFeedbackId', row.id)
             // this.$refs.drawerform.view(row);
             this.$router.push('/feedback/questionnaire/list')
         },
@@ -86,7 +88,16 @@ export default {
 
                     { label: "反馈人数", prop: "feedbackNum", formatter: this.formatter },
 
-                    { label: "创建用户", prop: "createUserId", formatter: this.formatter },
+                    // { label: "创建用户", prop: "createUserId", formatter: this.formatter },
+                    {
+                        label: "状态", prop: "processStatus", formatter: (row) => {
+                            return (
+                                <el-tag type={row.processStatus ? row.processStatus = 1 ? 'success' : 'info' : 'danger'} size="small">
+                                    {row.processStatus ? row.processStatus = 1 ? '进行中' : '已结束' : '未开始'}
+                                </el-tag>
+                            )
+                        }
+                    },
                     // {
                     //     label: "绩效反馈问题",
                     //     width: 120,

attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/req/AppealReq.java

@@ -47,5 +47,6 @@ public class AppealReq extends BaseReq {
     private List<PerformAttendAppealFilesEntity> performAttendAppealFilesList = new ArrayList<>();
     ;
 
+    private  Long checkRecordId;
 
 }

attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/req/InspectSaveReq.java

@@ -151,4 +151,7 @@ public class InspectSaveReq extends BaseReq {
      */
     private String ruleDesc;
 
+
+
+
 }

attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/rsp/PerformDetailInfo.java

@@ -217,4 +217,8 @@ public class PerformDetailInfo {
     private Integer irregularOtherType;
 
 
+    /**
+     * 申诉状态(0.未申诉,1.申诉中,2.申诉拒绝,3.申诉通过)
+     */
+    private Integer appealStatus;
 }

attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/web/AppealApiController.java

@@ -121,8 +121,8 @@ public class AppealApiController extends AbstractBaseController<PerformReq> {
             }
             PageInfo pageInfo = buildPageInfo(appealReq);
             PerformAttendAppealQuery query = new PerformAttendAppealQuery();
-            query.setAppealTimeStart(appealReq.getApperalStartDate());
-            query.setAppealTimeEnd(appealReq.getAppealEndDate());
+            query.setCreateTimeStart(appealReq.getApperalStartDate());
+            query.setCreateTimeEnd(appealReq.getAppealEndDate());
             query.setStaffId(context.getUser().getCustomerId());
 
             Result<PerformAttendAppealEntity> result = appealService.find(query, pageInfo, context);
@@ -221,6 +221,10 @@ public class AppealApiController extends AbstractBaseController<PerformReq> {
             entity.setPerformAttendAppealFilesList(req.getPerformAttendAppealFilesList());
             entity.setProcessStatus(1);
             entity.setAppealDesc(req.getAppealDesc());
+            entity.setStaffId(context.getUser().getCustomerId());
+            entity.setCreateUserId(context.getUser().getId());
+            entity.setCheckRecordId(req.getId());
+
             PerformAttendAppealEntity saveEntity = appealService.save(entity, context);
             rest.setData(saveEntity);
             recordSysLog(request, busiDesc + " 【成功】");

attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/web/InspectApiController.java

@@ -143,7 +143,7 @@ public class InspectApiController extends AbstractBaseController<PerformReq> {
             CheckAllRecordQuery query = new CheckAllRecordQuery();
             query.setCheckTimeStart(performReq.getPerformStartDate());
             query.setCheckTimeEnd(performReq.getPerformEndDate());
-            query.setCreateUserId(context.getUser().getId());
+            query.setCreateUserId(context.getUser().getCustomerId());
             if (PerformTypeEnum.全部.getValue().equals(performReq.getPerformType())) {
                 List<CheckAllRecordVo> allCheckRecord = checkAllRecordService.getAllCheckRecord(query);
                 List<PerformInfo> collect = allCheckRecord.stream().map(item -> {
@@ -217,8 +217,6 @@ public class InspectApiController extends AbstractBaseController<PerformReq> {
         log.info("【{}】【请求体】--> {}", busiDesc, JSONObject.toJSONString(req));
         Rest<PerformAttendAppealEntity> rest = Rest.ok(busiDesc + " 【成功】");
         Context context = this.getContext();
-
-
        // req.setStaffId(context.getUser().getCustomerId());
         try {
             //根据状态 查询 当前是否已经存在正在进行的申诉

attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/web/PerformApiController.java

@@ -167,9 +167,11 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
                     performInfo.setPerformType(PerformTypeEnum.考勤绩效.getValue());
                     //判断是否存在申诉
                     PerformAttendAppealEntity entity = appealService.selectOne(new PerformAttendAppealQuery().checkRecordId(item.getId()));
-                    if(!ObjectUtils.isEmpty(entity)) {
+                    if (!ObjectUtils.isEmpty(entity)) {
                         Boolean bool = entity.newEntity();
                         updateAppealStatus(performInfo, bool, entity.getProcessStatus(), entity.getAppealResult());
+                    } else {
+                        performInfo.setAppealStatus(AppealStatusEnum.未申诉.getValue());
                     }
                     return performInfo;
                 }).collect(Collectors.toList());
@@ -195,8 +197,9 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
                     if (!ObjectUtils.isEmpty(entity)) {
                         Boolean bool = entity.newEntity();
                         updateAppealStatus(performInfo, bool, entity.getProcessStatus(), entity.getAppealResult());
+                    } else {
+                        performInfo.setAppealStatus(AppealStatusEnum.未申诉.getValue());
                     }
-
                     return performInfo;
                 }).collect(Collectors.toList());
                 model.put(KEY_RESULT_DATA, collect);
@@ -219,6 +222,8 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
                     if (!ObjectUtils.isEmpty(entity)) {
                         Boolean bool = entity.newEntity();
                         updateAppealStatus(performInfo, bool, entity.getProcessStatus(), entity.getAppealResult());
+                    } else {
+                        performInfo.setAppealStatus(AppealStatusEnum.未申诉.getValue());
                     }
                     return performInfo;
                 }).collect(Collectors.toList());
@@ -242,6 +247,8 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
                     if (!ObjectUtils.isEmpty(entity)) {
                         Boolean bool = entity.newEntity();
                         updateAppealStatus(performInfo, bool, entity.getProcessStatus(), entity.getAppealResult());
+                    } else {
+                        performInfo.setAppealStatus(AppealStatusEnum.未申诉.getValue());
                     }
 
                     return performInfo;
@@ -262,8 +269,12 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
                     performInfo.setPerformType(PerformTypeEnum.效能绩效.getValue());
                     //判断是否存在申诉
                     PerformAttendAppealEntity entity = appealService.selectOne(new PerformAttendAppealQuery().checkRecordId(item.getId()));
+                    if (!ObjectUtils.isEmpty(entity)) {
                         Boolean bool = entity.newEntity();
                         updateAppealStatus(performInfo, bool, entity.getProcessStatus(), entity.getAppealResult());
+                    } else {
+                        performInfo.setAppealStatus(AppealStatusEnum.未申诉.getValue());
+                    }
                     return performInfo;
                 }).collect(Collectors.toList());
                 model.put(KEY_RESULT_DATA, collect);
@@ -282,8 +293,13 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
                     performInfo.setPerformType(PerformTypeEnum.其它绩效.getValue());
                     //判断是否存在申诉
                     PerformAttendAppealEntity entity = appealService.selectOne(new PerformAttendAppealQuery().checkRecordId(item.getId()));
+
+                    if (!ObjectUtils.isEmpty(entity)) {
                         Boolean bool = entity.newEntity();
                         updateAppealStatus(performInfo, bool, entity.getProcessStatus(), entity.getAppealResult());
+                    } else {
+                        performInfo.setAppealStatus(AppealStatusEnum.未申诉.getValue());
+                    }
                     return performInfo;
                 }).collect(Collectors.toList());
                 model.put(KEY_RESULT_DATA, collect);
@@ -337,6 +353,7 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
             if (PerformTypeEnum.考勤绩效.getValue().equals(performReq.getPerformType())) {
                 CheckAttendRecordEntity checkEntity = checkAttendRecordService.get(performReq.getId(), context);
                 BeanUtils.copyProperties(checkEntity, performDetailInfo, BeanUtil.getNullPropertyNames(checkEntity));
+
             } else if (PerformTypeEnum.评价差评绩效.getValue().equals(performReq.getPerformType())) {
                 CheckReviewRecordEntity checkEntity = checkReviewRecordService.get(performReq.getId(), context);
                 BeanUtils.copyProperties(checkEntity, performDetailInfo, BeanUtil.getNullPropertyNames(checkEntity));
@@ -356,6 +373,21 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
                 throw new AppException("不支持当前绩效类型");
             }
 
+            PerformAttendAppealEntity appealEntity = appealService.selectOne(new PerformAttendAppealQuery().checkRecordId(performDetailInfo.getId()));
+            if (ObjectUtils.isEmpty(appealEntity)) {
+                performDetailInfo.setAppealStatus(AppealStatusEnum.未申诉.getValue());
+            } else {
+                if (ProcessStatusEnum.未处理.getValue() == appealEntity.getProcessStatus()) {
+                    performDetailInfo.setAppealStatus(AppealStatusEnum.申诉中.getValue());
+                } else {
+                    if (AppealResultEnum.通过.getValue() == appealEntity.getProcessStatus()) {
+                        performDetailInfo.setAppealStatus(AppealStatusEnum.申诉通过.getValue());
+                    } else if (AppealResultEnum.不通过.getValue() == appealEntity.getProcessStatus()) {
+                        performDetailInfo.setAppealStatus(AppealStatusEnum.申诉拒绝.getValue());
+                    }
+                }
+            }
+
             rest.setData(performDetailInfo);
             recordSysLog(request, busiDesc + " 【成功】");
         } catch (Exception e) {

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

@@ -4,6 +4,10 @@ import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.OrderCol;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.common.code.CheckStatusEnum;
+import com.mortals.xhx.common.code.CheckTypeEnum;
+import com.mortals.xhx.common.code.SubAddTypeEnum;
+import com.mortals.xhx.common.code.SubMethodEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -53,9 +57,11 @@ public class CheckAttendRecordController extends BaseCRUDJsonBodyMappingControll
 
     @Override
     protected void init(Map<String, Object> model, Context context) {
-        this.addDict(model, "subAddType", paramService.getParamBySecondOrganize("CheckAttendRecord", "subAddType"));
-        this.addDict(model, "checkStatus", paramService.getParamBySecondOrganize("CheckAttendRecord", "checkStatus"));
-        this.addDict(model, "subMethod", paramService.getParamBySecondOrganize("CheckAttendRecord", "subMethod"));
+       this.addDict(model, "checkStatus", CheckStatusEnum.getEnumMap());
+        this.addDict(model, "subMethod", SubMethodEnum.getEnumMap());
+        this.addDict(model, "subAddType", SubAddTypeEnum.getEnumMap());
+        this.addDict(model, "checkType", CheckTypeEnum.getEnumMap());
+
         super.init(model, context);
     }
 

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

@@ -3,6 +3,10 @@ import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.OrderCol;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.common.code.CheckStatusEnum;
+import com.mortals.xhx.common.code.CheckTypeEnum;
+import com.mortals.xhx.common.code.SubAddTypeEnum;
+import com.mortals.xhx.common.code.SubMethodEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -45,9 +49,11 @@ public class CheckComplainRecordController extends BaseCRUDJsonBodyMappingContro
 
     @Override
     protected void init(Map<String, Object> model, Context context) {
-        this.addDict(model, "subMethod", paramService.getParamBySecondOrganize("CheckComplainRecord","subMethod"));
-        this.addDict(model, "checkStatus", paramService.getParamBySecondOrganize("CheckComplainRecord","checkStatus"));
-        this.addDict(model, "subAddType", paramService.getParamBySecondOrganize("CheckComplainRecord","subAddType"));
+
+        this.addDict(model, "checkStatus", CheckStatusEnum.getEnumMap());
+        this.addDict(model, "subMethod", SubMethodEnum.getEnumMap());
+        this.addDict(model, "subAddType", SubAddTypeEnum.getEnumMap());
+        this.addDict(model, "checkType", CheckTypeEnum.getEnumMap());
         super.init(model, context);
     }
 

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

@@ -3,6 +3,10 @@ import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.OrderCol;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.common.code.CheckStatusEnum;
+import com.mortals.xhx.common.code.CheckTypeEnum;
+import com.mortals.xhx.common.code.SubAddTypeEnum;
+import com.mortals.xhx.common.code.SubMethodEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -46,9 +50,12 @@ public class CheckEffectRecordController extends BaseCRUDJsonBodyMappingControll
     @Override
     protected void init(Map<String, Object> model, Context context) {
         this.addDict(model, "irregularType", paramService.getParamBySecondOrganize("CheckEffectRecord","irregularType"));
-        this.addDict(model, "subMethod", paramService.getParamBySecondOrganize("CheckEffectRecord","subMethod"));
-        this.addDict(model, "checkStatus", paramService.getParamBySecondOrganize("CheckEffectRecord","checkStatus"));
-        this.addDict(model, "subAddType", paramService.getParamBySecondOrganize("CheckEffectRecord","subAddType"));
+        this.addDict(model, "checkStatus", CheckStatusEnum.getEnumMap());
+        this.addDict(model, "subMethod", SubMethodEnum.getEnumMap());
+        this.addDict(model, "subAddType", SubAddTypeEnum.getEnumMap());
+        this.addDict(model, "checkType", CheckTypeEnum.getEnumMap());
+
+
         super.init(model, context);
     }
 

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

@@ -3,6 +3,10 @@ import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.OrderCol;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.common.code.CheckStatusEnum;
+import com.mortals.xhx.common.code.CheckTypeEnum;
+import com.mortals.xhx.common.code.SubAddTypeEnum;
+import com.mortals.xhx.common.code.SubMethodEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -45,9 +49,11 @@ public class CheckGoworkRecordController extends BaseCRUDJsonBodyMappingControll
 
     @Override
     protected void init(Map<String, Object> model, Context context) {
-        this.addDict(model, "subMethod", paramService.getParamBySecondOrganize("CheckGoworkRecord","subMethod"));
-        this.addDict(model, "checkStatus", paramService.getParamBySecondOrganize("CheckGoworkRecord","checkStatus"));
-        this.addDict(model, "subAddType", paramService.getParamBySecondOrganize("CheckGoworkRecord","subAddType"));
+
+        this.addDict(model, "checkStatus", CheckStatusEnum.getEnumMap());
+        this.addDict(model, "subMethod", SubMethodEnum.getEnumMap());
+        this.addDict(model, "subAddType", SubAddTypeEnum.getEnumMap());
+        this.addDict(model, "checkType", CheckTypeEnum.getEnumMap());
         super.init(model, context);
     }
 

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

@@ -3,6 +3,10 @@ import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.OrderCol;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.common.code.CheckStatusEnum;
+import com.mortals.xhx.common.code.CheckTypeEnum;
+import com.mortals.xhx.common.code.SubAddTypeEnum;
+import com.mortals.xhx.common.code.SubMethodEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -46,9 +50,10 @@ public class CheckOtherRecordController extends BaseCRUDJsonBodyMappingControlle
     @Override
     protected void init(Map<String, Object> model, Context context) {
         this.addDict(model, "irregularOtherType", paramService.getParamBySecondOrganize("CheckOtherRecord","irregularOtherType"));
-        this.addDict(model, "subMethod", paramService.getParamBySecondOrganize("CheckOtherRecord","subMethod"));
-        this.addDict(model, "checkStatus", paramService.getParamBySecondOrganize("CheckOtherRecord","checkStatus"));
-        this.addDict(model, "subAddType", paramService.getParamBySecondOrganize("CheckOtherRecord","subAddType"));
+        this.addDict(model, "checkStatus", CheckStatusEnum.getEnumMap());
+        this.addDict(model, "subMethod", SubMethodEnum.getEnumMap());
+        this.addDict(model, "subAddType", SubAddTypeEnum.getEnumMap());
+        this.addDict(model, "checkType", CheckTypeEnum.getEnumMap());
         super.init(model, context);
     }
 

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

@@ -3,6 +3,10 @@ import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.OrderCol;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.common.code.CheckStatusEnum;
+import com.mortals.xhx.common.code.CheckTypeEnum;
+import com.mortals.xhx.common.code.SubAddTypeEnum;
+import com.mortals.xhx.common.code.SubMethodEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -47,9 +51,12 @@ public class CheckReviewRecordController extends BaseCRUDJsonBodyMappingControll
     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, "subMethod", paramService.getParamBySecondOrganize("CheckReviewRecord","subMethod"));
-        this.addDict(model, "checkStatus", paramService.getParamBySecondOrganize("CheckReviewRecord","checkStatus"));
-        this.addDict(model, "subAddType", paramService.getParamBySecondOrganize("CheckReviewRecord","subAddType"));
+
+        this.addDict(model, "checkStatus", CheckStatusEnum.getEnumMap());
+        this.addDict(model, "subMethod", SubMethodEnum.getEnumMap());
+        this.addDict(model, "subAddType", SubAddTypeEnum.getEnumMap());
+        this.addDict(model, "checkType", CheckTypeEnum.getEnumMap());
+
         super.init(model, context);
     }
 

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

@@ -3,6 +3,7 @@ import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.OrderCol;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.common.code.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -45,9 +46,12 @@ public class PerformAttendRecordController extends BaseCRUDJsonBodyMappingContro
 
     @Override
     protected void init(Map<String, Object> model, Context context) {
-        this.addDict(model, "subMethod", paramService.getParamBySecondOrganize("PerformAttendRecord","subMethod"));
-        this.addDict(model, "subAddType", paramService.getParamBySecondOrganize("PerformAttendRecord","subAddType"));
-        this.addDict(model, "processStatus", paramService.getParamBySecondOrganize("PerformAttendRecord","processStatus"));
+        this.addDict(model, "processStatus", ProcessStatusEnum.getEnumMap());
+        this.addDict(model, "checkStatus", CheckStatusEnum.getEnumMap());
+        this.addDict(model, "subMethod", SubMethodEnum.getEnumMap());
+        this.addDict(model, "subAddType", SubAddTypeEnum.getEnumMap());
+        this.addDict(model, "checkType", CheckTypeEnum.getEnumMap());
+
         super.init(model, context);
     }
 

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

 package com.mortals.xhx.module.perform.web;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.common.code.*;
+import org.apache.tomcat.jni.Proc;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -42,9 +44,12 @@ public class PerformComplainRecordController extends BaseCRUDJsonBodyMappingCont
 
     @Override
     protected void init(Map<String, Object> model, Context context) {
-        this.addDict(model, "subMethod", paramService.getParamBySecondOrganize("PerformComplainRecord","subMethod"));
-        this.addDict(model, "processStatus", paramService.getParamBySecondOrganize("PerformComplainRecord","processStatus"));
-        this.addDict(model, "subAddType", paramService.getParamBySecondOrganize("PerformComplainRecord","subAddType"));
+       this.addDict(model, "processStatus", ProcessStatusEnum.getEnumMap());
+        this.addDict(model, "checkStatus", CheckStatusEnum.getEnumMap());
+        this.addDict(model, "subMethod", SubMethodEnum.getEnumMap());
+        this.addDict(model, "subAddType", SubAddTypeEnum.getEnumMap());
+        this.addDict(model, "checkType", CheckTypeEnum.getEnumMap());
+
         super.init(model, context);
     }
 

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

@@ -3,6 +3,7 @@ import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.OrderCol;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.common.code.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -46,9 +47,12 @@ public class PerformEffectRecordController extends BaseCRUDJsonBodyMappingContro
     @Override
     protected void init(Map<String, Object> model, Context context) {
         this.addDict(model, "irregularType", paramService.getParamBySecondOrganize("PerformEffectRecord","irregularType"));
-        this.addDict(model, "subMethod", paramService.getParamBySecondOrganize("PerformEffectRecord","subMethod"));
-        this.addDict(model, "processStatus", paramService.getParamBySecondOrganize("PerformEffectRecord","processStatus"));
-        this.addDict(model, "subAddType", paramService.getParamBySecondOrganize("PerformEffectRecord","subAddType"));
+        this.addDict(model, "processStatus", ProcessStatusEnum.getEnumMap());
+        this.addDict(model, "checkStatus", CheckStatusEnum.getEnumMap());
+        this.addDict(model, "subMethod", SubMethodEnum.getEnumMap());
+        this.addDict(model, "subAddType", SubAddTypeEnum.getEnumMap());
+        this.addDict(model, "checkType", CheckTypeEnum.getEnumMap());
+
         super.init(model, context);
     }
 

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

@@ -3,6 +3,7 @@ import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.OrderCol;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.common.code.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -45,9 +46,13 @@ public class PerformGoworkRecordController extends BaseCRUDJsonBodyMappingContro
 
     @Override
     protected void init(Map<String, Object> model, Context context) {
-        this.addDict(model, "subMethod", paramService.getParamBySecondOrganize("PerformGoworkRecord","subMethod"));
-        this.addDict(model, "processStatus", paramService.getParamBySecondOrganize("PerformGoworkRecord","processStatus"));
-        this.addDict(model, "subAddType", paramService.getParamBySecondOrganize("PerformGoworkRecord","subAddType"));
+        this.addDict(model, "processStatus", ProcessStatusEnum.getEnumMap());
+        this.addDict(model, "checkStatus", CheckStatusEnum.getEnumMap());
+        this.addDict(model, "subMethod", SubMethodEnum.getEnumMap());
+        this.addDict(model, "subAddType", SubAddTypeEnum.getEnumMap());
+        this.addDict(model, "checkType", CheckTypeEnum.getEnumMap());
+
+
         super.init(model, context);
     }
 

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

@@ -3,6 +3,7 @@ import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.OrderCol;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.common.code.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -46,9 +47,13 @@ public class PerformOtherRecordController extends BaseCRUDJsonBodyMappingControl
     @Override
     protected void init(Map<String, Object> model, Context context) {
         this.addDict(model, "irregularOtherType", paramService.getParamBySecondOrganize("PerformOtherRecord","irregularOtherType"));
-        this.addDict(model, "subMethod", paramService.getParamBySecondOrganize("PerformOtherRecord","subMethod"));
-        this.addDict(model, "processStatus", paramService.getParamBySecondOrganize("PerformOtherRecord","processStatus"));
-        this.addDict(model, "subAddType", paramService.getParamBySecondOrganize("PerformOtherRecord","subAddType"));
+        this.addDict(model, "processStatus", ProcessStatusEnum.getEnumMap());
+        this.addDict(model, "checkStatus", CheckStatusEnum.getEnumMap());
+        this.addDict(model, "subMethod", SubMethodEnum.getEnumMap());
+        this.addDict(model, "subAddType", SubAddTypeEnum.getEnumMap());
+        this.addDict(model, "checkType", CheckTypeEnum.getEnumMap());
+
+
         super.init(model, context);
     }
 

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

@@ -3,6 +3,7 @@ import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.OrderCol;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.common.code.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -47,9 +48,12 @@ public class PerformReviewRecordController extends BaseCRUDJsonBodyMappingContro
     protected void init(Map<String, Object> model, Context context) {
         this.addDict(model, "reviewResult", paramService.getParamBySecondOrganize("PerformReviewRecord","reviewResult"));
         this.addDict(model, "reviewSource", paramService.getParamBySecondOrganize("PerformReviewRecord","reviewSource"));
-        this.addDict(model, "subMethod", paramService.getParamBySecondOrganize("PerformReviewRecord","subMethod"));
-        this.addDict(model, "processStatus", paramService.getParamBySecondOrganize("PerformReviewRecord","processStatus"));
-        this.addDict(model, "subAddType", paramService.getParamBySecondOrganize("PerformReviewRecord","subAddType"));
+        this.addDict(model, "processStatus", ProcessStatusEnum.getEnumMap());
+        this.addDict(model, "checkStatus", CheckStatusEnum.getEnumMap());
+        this.addDict(model, "subMethod", SubMethodEnum.getEnumMap());
+        this.addDict(model, "subAddType", SubAddTypeEnum.getEnumMap());
+        this.addDict(model, "checkType", CheckTypeEnum.getEnumMap());
+
         super.init(model, context);
     }