Merge branch 'master' of http://gitlab.scsmile.cn/zxf/attendance-performance-platform

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

@@ -470,6 +470,7 @@ export default {
             formatter: this.formatterDateOnly,
           },
           { label: "员工姓名", prop: "staffName" },
+          { label: "员工工号", prop: "workNum" },
           {
             label: "考勤组",
             prop: "attendanceGroupName",

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

@@ -4,7 +4,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 /**
-* 评价来源(窗口评价系统,导视系统,自助服务系统,微官网,其它)枚举类
+* 核查结果(1.加分或扣分,2.不扣分)枚举类
 *
 * @author zxfei
 */
@@ -31,9 +31,9 @@ public enum ReviewSourceEnum {
     }
 
     public static ReviewSourceEnum getByValue(String value) {
-        for (ReviewSourceEnum reviewSourceEnum : ReviewSourceEnum.values()) {
-            if (reviewSourceEnum.getValue() == value) {
-                return reviewSourceEnum;
+        for (ReviewSourceEnum checkResultEnum : ReviewSourceEnum.values()) {
+            if (checkResultEnum.getValue() == value) {
+                return checkResultEnum;
             }
         }
         return null;

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

@@ -53,6 +53,7 @@ public class CheckComplainRecordController extends BaseCRUDJsonBodyMappingContro
         this.addDict(model, "checkResult", CheckResultEnum.getEnumMap());
         this.addDict(model, "checkResultAdd", CheckResultAddEnum.getEnumMap());
         this.addDict(model, "checkResultSub", CheckResultSubEnum.getEnumMap());
+        this.addDict(model, "complainSource", ReviewSourceEnum.getEnumMap());
     }
 
     @Override

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

@@ -65,6 +65,8 @@ public class CheckReviewRecordController extends BaseCRUDJsonBodyMappingControll
         this.addDict(model, "checkResult", CheckResultEnum.getEnumMap());
         this.addDict(model, "checkResultAdd", CheckResultAddEnum.getEnumMap());
         this.addDict(model, "checkResultSub", CheckResultSubEnum.getEnumMap());
+
+        this.addDict(model, "reviewSource", ReviewSourceEnum.getEnumMap());
     }
 
     @Override

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformRulesVo.java

@@ -3,6 +3,8 @@ import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.perform.model.PerformRulesEntity;
 import java.util.ArrayList;
 import java.util.List;
+
+import com.mortals.xhx.module.perform.model.PerformRulesQuery;
 import lombok.Data;
 /**
 * 绩效规则信息视图对象
@@ -15,4 +17,13 @@ public class PerformRulesVo extends BaseEntityLong {
     /** 类型名称 **/
     private String typeName;
 
+    /** 规则编码，唯一,默认规则类型内容简称拼音首字母。排除列表 */
+    private List <String> ruleCodeNotList;
+    /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
+    private List<PerformRulesQuery> orConditionList;
+
+    /** AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
+    private List<PerformRulesQuery> andConditionList;
+
+
 }
\ No newline at end of file

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;
-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.perform.model.PerformComplainRecordEntity;
 import com.mortals.xhx.module.perform.service.PerformComplainRecordService;
-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("perform/complain/record")
-public class PerformComplainRecordController extends BaseCRUDJsonBodyMappingController<PerformComplainRecordService,PerformComplainRecordEntity,Long> {
+public class PerformComplainRecordController extends BaseCRUDJsonBodyMappingController<PerformComplainRecordService, PerformComplainRecordEntity, Long> {
 
     @Autowired
     private ParamService paramService;
 
-    public PerformComplainRecordController(){
-        super.setModuleDesc( "评价绩效投诉记录信息");
+    public PerformComplainRecordController() {
+        super.setModuleDesc("评价绩效投诉记录信息");
     }
 
     @Override
     protected void init(Map<String, Object> model, Context context) {
-       this.addDict(model, "processStatus", ProcessStatusEnum.getEnumMap());
+        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());
 
+        this.addDict(model, "complainSource", ReviewSourceEnum.getEnumMap());
+
+
         super.init(model, context);
     }
 

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

@@ -54,6 +54,8 @@ public class PerformReviewRecordController extends BaseCRUDJsonBodyMappingContro
         this.addDict(model, "subAddType", SubAddTypeEnum.getEnumMap());
         this.addDict(model, "checkType", CheckTypeEnum.getEnumMap());
 
+        this.addDict(model, "reviewSource", ReviewSourceEnum.getEnumMap());
+
         super.init(model, context);
     }