修改考勤汇总

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

@@ -19,6 +19,7 @@ import com.mortals.xhx.module.hik.face.model.req.img.ImgReq;
 import com.mortals.xhx.module.hik.face.service.IHikFaceService;
 import com.mortals.xhx.module.perform.model.PerformPerposeStaffEntity;
 import com.mortals.xhx.module.perform.model.PerformPerposeStaffStatEntity;
+import com.mortals.xhx.module.perform.service.PerformPerposeDeptStatService;
 import com.mortals.xhx.module.perform.service.PerformPerposeStaffService;
 import com.mortals.xhx.module.perform.service.PerformPerposeStaffStatService;
 import com.mortals.xhx.module.staff.model.StaffEntity;
@@ -67,6 +68,8 @@ public class MockDataController {
     @Autowired
     private PerformPerposeStaffStatService perposeStaffStatService;
 
+    private PerformPerposeDeptStatService perposeDeptStatService;
+
 
     /**
      * 生成模拟数据

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

@@ -10,7 +10,7 @@ import com.mortals.framework.model.PageInfo;
 import com.mortals.framework.model.Result;
 import com.mortals.xhx.busiz.h5.req.FeedbackReq;
 import com.mortals.xhx.busiz.h5.req.FeedbackSaveReq;
-import com.mortals.xhx.common.code.YesNoEnum;
+import com.mortals.xhx.common.code.*;
 import com.mortals.xhx.module.feedback.model.*;
 import com.mortals.xhx.module.feedback.service.FeedbackAnswerService;
 import com.mortals.xhx.module.feedback.service.FeedbackService;
@@ -48,6 +48,12 @@ public class FeedbackApiController extends AbstractBaseController<FeedbackReq> {
     @Autowired
     private FeedbackAnswerService answerService;
 
+
+
+    protected void init(Map<String, Object> model, Context context) {
+        this.addDict(model, "processStatus", FeedProcessStatusEnum.getEnumMap());
+    }
+
     /**
      * 反馈列表
      */
@@ -137,6 +143,7 @@ public class FeedbackApiController extends AbstractBaseController<FeedbackReq> {
                     }
                 }
             }
+            this.init(model, context);
             rest.setData(model);
             recordSysLog(request, busiDesc + " 【成功】");
         } catch (Exception e) {

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

+package com.mortals.xhx.common.code;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+* 处理状态(1.未处理,2.已处理)枚举类
+*
+* @author zxfei
+*/
+public enum FeedProcessStatusEnum {
+    未开始(0, "未开始"),
+    进行中(1, "进行中"),
+    已完成(2, "已完成");
+    private Integer value;
+    private String desc;
+
+    FeedProcessStatusEnum(Integer value, String desc) {
+        this.value = value;
+        this.desc = desc;
+    }
+
+    public Integer getValue() {
+        return this.value;
+    }
+
+    public String getDesc() {
+        return this.desc;
+    }
+
+    public static FeedProcessStatusEnum getByValue(Integer value) {
+        for (FeedProcessStatusEnum checkStatusEnum : FeedProcessStatusEnum.values()) {
+            if (checkStatusEnum.getValue() == value) {
+                return checkStatusEnum;
+            }
+        }
+        return null;
+    }
+
+    /**
+    * 获取Map集合
+    *
+    * @param eItem 不包含项
+    * @return
+    */
+    public static Map<String, String> getEnumMap(Integer... eItem) {
+        Map<String, String> resultMap = new LinkedHashMap<>();
+        for (FeedProcessStatusEnum item : FeedProcessStatusEnum.values()) {
+            try {
+                boolean hasE = false;
+                for (Integer 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