Merge remote-tracking branch 'origin/master'

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

@@ -7,10 +7,10 @@ import java.util.Map;
  * 考核等级
  */
 public enum ExamineLevelEnum {
-    好(1, "通过"),
-    较好(2, "不通过"),
-    一般(3, "通过"),
-    较差(4, "不通过");
+    好(1, "好"),
+    较好(2, "较好"),
+    一般(3, "一般"),
+    较差(4, "较差");
     private Integer value;
     private String desc;
 

attendance-performance-manager/src/main/java/com/mortals/xhx/module/window/web/WindowWorkmanPerformController.java

@@ -2,8 +2,10 @@ package com.mortals.xhx.module.window.web;
 
 import com.mortals.framework.model.Context;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.xhx.common.code.CheckStatusEnum;
 import com.mortals.xhx.common.code.ExamineLevelEnum;
 import com.mortals.xhx.common.code.FillStatusEnum;
+import com.mortals.xhx.common.code.WindowCheckResultEnum;
 import com.mortals.xhx.module.window.model.WindowWorkmanPerformEntity;
 import com.mortals.xhx.module.window.service.WindowWorkmanPerformService;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -30,6 +32,8 @@ public class WindowWorkmanPerformController extends BaseCRUDJsonBodyMappingContr
     protected void init(Map<String, Object> model, Context context) {
         this.addDict(model, "examineLevel", ExamineLevelEnum.getEnumMap());
         this.addDict(model, "fillStatus", FillStatusEnum.getEnumMap());
+        this.addDict(model, "manageCheckResult", WindowCheckResultEnum.getEnumMap());
+        this.addDict(model, "checkStatus", CheckStatusEnum.getEnumMap());
         super.init(model, context);
     }