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

attendance-performance-manager-ui/admin/src/components/Header.vue

@@ -212,7 +212,7 @@ export default {
           height: 100%;
           color: #eee;
           cursor: pointer;
-          margin-right: 20px;
+          margin-right: 10px;
         }
         .active {
           color: #fff;

attendance-performance-manager/src/main/java/com/mortals/xhx/base/system/idgenerator/service/impl/IdgeneratorServiceImpl.java

@@ -56,6 +56,14 @@ public class IdgeneratorServiceImpl implements IdgeneratorService {
          */
         INFO_VERSION_KEY(50L, "getInfoVersion", null),
 
+
+        ATTEND_KEY(50L, "attend", null),
+        REVIEW_KEY(50L, "review", null),
+        COMPLAIN_KEY(50L, "complain", null),
+        GOWORK_KEY(50L, "gowork", null),
+        EFFECT_KEY(50L, "effect", null),
+        OTHER_KEY(50L, "other", null),
+
         /** 空，测试用 */
         DUMMY(DEFAULT_STEP, "", null),
         ;
@@ -125,6 +133,42 @@ public class IdgeneratorServiceImpl implements IdgeneratorService {
         }
     }
 
+    private Long attend() {
+        synchronized (IdGeneratorKey.ATTEND_KEY) {
+            return getNextSequenceId(IdGeneratorKey.ATTEND_KEY, null);
+        }
+    }
+
+    private Long review() {
+        synchronized (IdGeneratorKey.REVIEW_KEY) {
+            return getNextSequenceId(IdGeneratorKey.REVIEW_KEY, null);
+        }
+    }
+
+    private Long complain() {
+        synchronized (IdGeneratorKey.COMPLAIN_KEY) {
+            return getNextSequenceId(IdGeneratorKey.COMPLAIN_KEY, null);
+        }
+    }
+
+    private Long gowork() {
+        synchronized (IdGeneratorKey.GOWORK_KEY) {
+            return getNextSequenceId(IdGeneratorKey.GOWORK_KEY, null);
+        }
+    }
+
+    private Long effect() {
+        synchronized (IdGeneratorKey.EFFECT_KEY) {
+            return getNextSequenceId(IdGeneratorKey.EFFECT_KEY, null);
+        }
+    }
+
+    private Long other() {
+        synchronized (IdGeneratorKey.OTHER_KEY) {
+            return getNextSequenceId(IdGeneratorKey.OTHER_KEY, null);
+        }
+    }
+
     // *******************************************************************************
 
     /**

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

@@ -12,7 +12,7 @@ public class FeedbackReq extends BaseReq {
     //反馈结束时间
     private String feedBackEndDate;
 
-    //反馈状态（1.未反馈，2.已反馈）
+    //反馈状态（0.未反馈，1.已反馈）
     private Integer feedbackStatus;
     //详细
     private Long Id;

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

+package com.mortals.xhx.busiz.req;
+
+import com.mortals.xhx.busiz.BaseReq;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+
+@Data
+public class PerformSaveReq extends BaseReq {
+
+    /**
+     * 工号
+     */
+    private String workNum;
+
+    /**
+     * 标题
+     */
+    private String title;
+
+    /**
+     * 扣分时间
+     */
+    private Date happenTime;
+
+    /**
+     * 规则编码
+     */
+    private String ruleCode;
+
+
+    /**
+     * 类型
+     */
+    private String performType;
+
+}

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

+package com.mortals.xhx.busiz.web;
+
+import com.mortals.framework.model.PageInfo;
+import com.mortals.framework.web.BaseJsonBodyController;
+import com.mortals.xhx.busiz.BaseReq;
+import com.mortals.xhx.busiz.req.PerformReq;
+import org.springframework.util.ObjectUtils;
+
+import java.util.Map;
+
+import static com.mortals.framework.ap.SysConstains.*;
+
+public abstract class AbstractBaseController<T extends BaseReq> extends BaseJsonBodyController {
+
+
+
+    protected PageInfo buildPageInfo(T query) {
+        PageInfo pageInfo = new PageInfo();
+        if (!ObjectUtils.isEmpty(query) && !ObjectUtils.isEmpty(query.getPage())) {
+            pageInfo.setCurrPage(query.getPage());
+        }
+
+        if (!ObjectUtils.isEmpty(query) && !ObjectUtils.isEmpty(query.getSize())) {
+            pageInfo.setPrePageResult(query.getSize());
+        }
+
+        return pageInfo;
+    }
+
+
+    protected void parsePageInfo(Map<String, Object> model, PageInfo pageInfo) {
+        model.put(TOTAL, pageInfo.getTotalResult());
+        model.put(PER_PAGE, pageInfo.getPrePageResult());
+        model.put(CURRENT_PAGE, pageInfo.getCurrPage());
+        model.put(LAST_PAGE, pageInfo.getTotalPage());
+        model.put(PAGEINFO_KEY, pageInfo);
+    }
+
+}

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

+package com.mortals.xhx.busiz.web;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.mortals.framework.exception.AppException;
+import com.mortals.xhx.base.framework.annotation.ApiUserAuth;
+import com.mortals.xhx.busiz.req.PerformReq;
+import com.mortals.xhx.busiz.req.PerformSaveReq;
+import com.mortals.xhx.busiz.rsp.ApiResp;
+import com.mortals.xhx.common.code.ApiRespCodeEnum;
+import com.mortals.xhx.common.code.PerformTypeEnum;
+import com.mortals.xhx.module.perform.service.*;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+
+@RestController
+@Slf4j
+@RequestMapping("/api/v1/web/perform")
+public class ApiWebPerformController extends AbstractBaseController<PerformReq> {
+
+    @Autowired
+    private PerformAttendRecordService attendRecordService;
+    @Autowired
+    private PerformReviewRecordService reviewRecordService;
+    @Autowired
+    private PerformComplainRecordService complainRecordService;
+    @Autowired
+    private PerformGoworkRecordService performGoworkRecordService;
+    @Autowired
+    private PerformEffectRecordService effectRecordService;
+    @Autowired
+    private PerformOtherRecordService otherRecordService;
+    @Autowired
+    private PerformRulesService rulesService;
+
+
+
+
+    /**
+     * 绩效外部新增
+     *
+     * @param req
+     * @return
+     */
+    @PostMapping("save")
+    @ApiUserAuth
+    public String receive(HttpServletRequest request, @RequestBody PerformSaveReq req) {
+        ApiResp<String> rsp = new ApiResp<>();
+        rsp.setMsg(ApiRespCodeEnum.SUCCESS.getLabel());
+        rsp.setCode(ApiRespCodeEnum.SUCCESS.getValue());
+        StringBuilder message = new StringBuilder();
+        message.append(String.format("【外部请求】类型【%s】 内容:%s", PerformTypeEnum.getByValue(req.getPerformType()).getDesc(), JSONObject.toJSONString(req)));
+        recordSysLog(request, message.toString());
+        try {
+            switch (PerformTypeEnum.getByValue(req.getPerformType())) {
+                case 考勤绩效:
+                    attend(req);
+                    break;
+                case 评价差评绩效:
+                    review(req);
+                    break;
+                case 评价投诉绩效:
+                    complain(req);
+                    break;
+                case 办件绩效:
+                    gowork(req);
+                    break;
+                case 效能绩效:
+                    effect(req);
+                    break;
+                case 其它绩效:
+                    other(req);
+                    break;
+            }
+        } catch (AppException e) {
+            log.error("接收数据失败", e);
+            rsp.setCode(e.getCode());
+            rsp.setMsg(e.getMessage());
+            return JSON.toJSONString(rsp);
+        } catch (Exception e) {
+            log.error("接收数据失败", e);
+            rsp.setCode(ApiRespCodeEnum.FAILED.getValue());
+            rsp.setMsg(e.getMessage());
+            return JSON.toJSONString(rsp);
+        }
+        log.info("响应【设备接收】【响应体】-->  " + JSONObject.toJSONString(rsp));
+        return JSON.toJSONString(rsp);
+    }
+    private void attend(PerformSaveReq req) throws AppException {
+        //考勤保存
+    }
+
+    private void review(PerformSaveReq req) throws AppException {
+        //评价保存
+    }
+
+    private void complain(PerformSaveReq req) throws AppException {
+        //投诉保存
+    }
+
+    private void gowork(PerformSaveReq req) throws AppException {
+        //办件保存
+    }
+
+    private void effect(PerformSaveReq req) throws AppException {
+        //效能保存
+    }
+
+    private void other(PerformSaveReq req) throws AppException {
+        //其它保存
+    }
+
+
+    public static void main(String[] args) {
+
+    }
+
+}

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

@@ -4,9 +4,12 @@ import java.math.BigDecimal;
 
 
 import cn.hutool.core.date.DateUtil;
+import com.alibaba.fastjson.JSONObject;
 import com.mortals.framework.common.Rest;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
+import com.mortals.framework.model.PageInfo;
+import com.mortals.framework.model.Result;
 import com.mortals.framework.web.BaseJsonBodyController;
 import com.mortals.xhx.busiz.req.AppealReq;
 import com.mortals.xhx.busiz.req.PerformReq;
@@ -15,9 +18,15 @@ import com.mortals.xhx.busiz.rsp.PerformDetailInfo;
 import com.mortals.xhx.busiz.rsp.PerformInfo;
 import com.mortals.xhx.busiz.rsp.PerformStatInfo;
 import com.mortals.xhx.common.code.PerformTypeEnum;
+import com.mortals.xhx.common.utils.BeanUtil;
+import com.mortals.xhx.module.check.model.*;
 import com.mortals.xhx.module.check.service.*;
 import com.mortals.xhx.module.perform.model.PerformAttendAppealEntity;
+import com.mortals.xhx.module.perform.model.PerformAttendAppealQuery;
+import com.mortals.xhx.module.perform.service.PerformAttendAppealService;
 import lombok.extern.slf4j.Slf4j;
+import org.checkerframework.checker.units.qual.A;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -26,8 +35,12 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
+import static com.mortals.framework.ap.SysConstains.*;
 import static com.mortals.xhx.common.key.ErrorCode.ERROR_TOKEN_EXPIRED;
 import static com.mortals.xhx.common.key.ErrorCode.ERROR_TOKEN_EXPIRED_CONTENT;
 
@@ -40,21 +53,10 @@ import static com.mortals.xhx.common.key.ErrorCode.ERROR_TOKEN_EXPIRED_CONTENT;
 @RestController
 @Slf4j
 @RequestMapping("/api/v1/appeal")
-public class AppealApiController extends BaseJsonBodyController {
+public class AppealApiController extends AbstractBaseController<PerformReq> {
 
     @Autowired
-    private CheckAttendRecordService checkAttendRecordService;
-    @Autowired
-    private CheckReviewRecordService checkReviewRecordService;
-    @Autowired
-    private CheckComplainRecordService checkComplainRecordService;
-    @Autowired
-    private CheckEffectRecordService checkEffectRecordService;
-    @Autowired
-    private CheckGoworkRecordService checkGoworkRecordService;
-    @Autowired
-    private CheckOtherRecordService checkOtherRecordService;
-
+    private PerformAttendAppealService attendAppealService;
 
     /**
      * 个人申诉绩效统计
@@ -67,6 +69,7 @@ public class AppealApiController extends BaseJsonBodyController {
         if (ObjectUtils.isEmpty(context) || ObjectUtils.isEmpty(context.getUser())) {
             throw new AppException(ERROR_TOKEN_EXPIRED, ERROR_TOKEN_EXPIRED_CONTENT);
         }
+        log.info("【{}】【请求体】--> 用户:{}", busiDesc, context.getUser().getRealName());
         try {
             //todo 查询当前登录人的绩效分数
             AppealStatInfo appealStatInfo = new AppealStatInfo();
@@ -87,15 +90,32 @@ public class AppealApiController extends BaseJsonBodyController {
      * 申诉列表
      */
     @PostMapping(value = "list")
-    public Rest<List<PerformAttendAppealEntity>> performList(@RequestBody AppealReq appealReq) {
+    public Rest<Object> performList(@RequestBody AppealReq appealReq) {
         String busiDesc = "个人申诉列表";
-        Rest<List<PerformAttendAppealEntity>> rest = Rest.ok(busiDesc + " 【成功】");
+        log.info("【{}】【请求体】--> {}", busiDesc, JSONObject.toJSONString(appealReq));
+        Rest<Object> rest = Rest.ok();
+        Map<String, Object> model = new HashMap<>();
+        Context context = this.getContext();
+
+        if (ObjectUtils.isEmpty(context) || ObjectUtils.isEmpty(context.getUser())) {
+            throw new AppException(ERROR_TOKEN_EXPIRED, ERROR_TOKEN_EXPIRED_CONTENT);
+        }
         try {
             if (ObjectUtils.isEmpty(appealReq.getApperalStartDate())) {
                 //未设置时间的情况，默认为当月
                 appealReq.setApperalStartDate(DateUtil.beginOfMonth(new Date()).toDateStr());
                 appealReq.setAppealEndDate(DateUtil.today());
             }
+            PageInfo pageInfo = buildPageInfo(appealReq);
+            PerformAttendAppealQuery query = new PerformAttendAppealQuery();
+            query.setAppealTimeStart(appealReq.getApperalStartDate());
+            query.setAppealTimeEnd(appealReq.getAppealEndDate());
+            query.setStaffId(context.getUser().getCustomerId());
+
+            Result<PerformAttendAppealEntity> result = attendAppealService.find(query, pageInfo, context);
+            model.put(KEY_RESULT_DATA, result.getList());
+            model.put(PAGEINFO_KEY, result.getPageInfo());
+            parsePageInfo(model, result.getPageInfo());
 
             recordSysLog(request, busiDesc + " 【成功】");
         } catch (Exception e) {
@@ -110,13 +130,17 @@ public class AppealApiController extends BaseJsonBodyController {
      * 申诉详细
      */
     @PostMapping(value = "info")
-    public Rest<PerformAttendAppealEntity> performInfo(@RequestBody AppealReq appealReq) {
+    public Rest<PerformAttendAppealEntity> appealInfo(@RequestBody AppealReq appealReq) {
         String busiDesc = "个人申诉详细";
+        log.info("【{}】【请求体】--> {}", busiDesc, JSONObject.toJSONString(appealReq));
         Rest<PerformAttendAppealEntity> rest = Rest.ok(busiDesc + " 【成功】");
+        Context context = this.getContext();
         try {
             if (ObjectUtils.isEmpty(appealReq.getId())) {
                 throw new AppException("详细查询id不能为空!");
             }
+            PerformAttendAppealEntity performAttendAppealEntity = attendAppealService.get(appealReq.getId(), context);
+            rest.setData(performAttendAppealEntity);
 
             recordSysLog(request, busiDesc + " 【成功】");
         } catch (Exception e) {
@@ -131,20 +155,48 @@ public class AppealApiController extends BaseJsonBodyController {
      * 申诉新增
      */
     @PostMapping(value = "save")
-    public Rest<String> appealSave(@RequestBody PerformAttendAppealEntity appealEntity) {
+    public Rest<PerformAttendAppealEntity> appealSave(@RequestBody PerformAttendAppealEntity appealEntity) {
         String busiDesc = "个人申诉新增";
-        Rest<String> rest = Rest.ok(busiDesc + " 【成功】");
+        log.info("【{}】【请求体】--> {}", busiDesc, JSONObject.toJSONString(appealEntity));
+        Rest<PerformAttendAppealEntity> rest = Rest.ok(busiDesc + " 【成功】");
+        Context context = this.getContext();
         try {
-
+            //校验 去重
+            PerformAttendAppealEntity saveEntity = attendAppealService.save(appealEntity, context);
+            rest.setData(saveEntity);
             recordSysLog(request, busiDesc + " 【成功】");
         } catch (Exception e) {
             log.error(busiDesc, e);
             rest = Rest.fail(super.convertException(e));
         }
+        log.info("【{}】【响应体】--> {}", busiDesc, JSONObject.toJSONString(appealEntity));
         return rest;
     }
 
 
+    protected PageInfo buildPageInfo(AppealReq query) {
+        PageInfo pageInfo = new PageInfo();
+        if (!ObjectUtils.isEmpty(query) && !ObjectUtils.isEmpty(query.getPage())) {
+            pageInfo.setCurrPage(query.getPage());
+        }
+
+        if (!ObjectUtils.isEmpty(query) && !ObjectUtils.isEmpty(query.getSize())) {
+            pageInfo.setPrePageResult(query.getSize());
+        }
+
+        return pageInfo;
+    }
+
+
+    protected void parsePageInfo(Map<String, Object> model, PageInfo pageInfo) {
+        model.put(TOTAL, pageInfo.getTotalResult());
+        model.put(PER_PAGE, pageInfo.getPrePageResult());
+        model.put(CURRENT_PAGE, pageInfo.getCurrPage());
+        model.put(LAST_PAGE, pageInfo.getTotalPage());
+        model.put(PAGEINFO_KEY, pageInfo);
+    }
+
+
     public static void main(String[] args) {
 
     }

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

@@ -2,14 +2,24 @@ package com.mortals.xhx.busiz.web;
 
 
 import cn.hutool.core.date.DateUtil;
+import com.alibaba.fastjson.JSONObject;
 import com.mortals.framework.common.Rest;
 import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.Context;
+import com.mortals.framework.model.PageInfo;
+import com.mortals.framework.model.Result;
 import com.mortals.framework.web.BaseJsonBodyController;
 import com.mortals.xhx.busiz.req.AppealReq;
 import com.mortals.xhx.busiz.req.FeedbackReq;
+import com.mortals.xhx.busiz.req.PerformReq;
 import com.mortals.xhx.busiz.rsp.AppealStatInfo;
+import com.mortals.xhx.common.code.YesNoEnum;
 import com.mortals.xhx.module.check.service.*;
+import com.mortals.xhx.module.feedback.model.FeedbackEntity;
+import com.mortals.xhx.module.feedback.model.FeedbackStaffEntity;
+import com.mortals.xhx.module.feedback.service.FeedbackService;
 import com.mortals.xhx.module.perform.model.PerformAttendAppealEntity;
+import com.mortals.xhx.module.perform.model.PerformAttendAppealQuery;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
@@ -19,7 +29,13 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+
+import static com.mortals.framework.ap.SysConstains.*;
+import static com.mortals.xhx.common.key.ErrorCode.ERROR_TOKEN_EXPIRED;
+import static com.mortals.xhx.common.key.ErrorCode.ERROR_TOKEN_EXPIRED_CONTENT;
 
 /**
  * h5 申诉
@@ -30,55 +46,44 @@ import java.util.List;
 @RestController
 @Slf4j
 @RequestMapping("/api/v1/feedback")
-public class FeedbackApiController extends BaseJsonBodyController {
+public class FeedbackApiController extends AbstractBaseController<FeedbackReq> {
 
     @Autowired
-    private CheckAttendRecordService checkAttendRecordService;
-    @Autowired
-    private CheckReviewRecordService checkReviewRecordService;
-    @Autowired
-    private CheckComplainRecordService checkComplainRecordService;
-    @Autowired
-    private CheckEffectRecordService checkEffectRecordService;
-    @Autowired
-    private CheckGoworkRecordService checkGoworkRecordService;
-    @Autowired
-    private CheckOtherRecordService checkOtherRecordService;
+    private FeedbackService feedbackService;
 
     /**
      * 反馈列表
      */
     @PostMapping(value = "list")
-    public Rest<List<PerformAttendAppealEntity>> feedbackList(@RequestBody FeedbackReq feedbackReq) {
+    public Rest<Object> feedbackList(@RequestBody FeedbackReq feedbackReq) {
         String busiDesc = "个人反馈列表";
-        Rest<List<PerformAttendAppealEntity>> rest = Rest.ok(busiDesc + " 【成功】");
+        log.info("【{}】【请求体】--> {}", busiDesc, JSONObject.toJSONString(feedbackReq));
+        Rest<Object> rest = Rest.ok();
+        Map<String, Object> model = new HashMap<>();
+        Context context = this.getContext();
+
+        if (ObjectUtils.isEmpty(context) || ObjectUtils.isEmpty(context.getUser())) {
+            throw new AppException(ERROR_TOKEN_EXPIRED, ERROR_TOKEN_EXPIRED_CONTENT);
+        }
         try {
-            if (ObjectUtils.isEmpty(feedbackReq.getFeedbackStatus())) {
+            if (ObjectUtils.isEmpty(feedbackReq.getFeedBackStartDate())) {
                 //未设置时间的情况，默认为当月
                 feedbackReq.setFeedBackStartDate(DateUtil.beginOfMonth(new Date()).toDateStr());
                 feedbackReq.setFeedBackEndDate(DateUtil.today());
             }
+            PageInfo pageInfo = buildPageInfo(feedbackReq);
+            //todo
 
-            recordSysLog(request, busiDesc + " 【成功】");
-        } catch (Exception e) {
-            log.error(busiDesc, e);
-            rest = Rest.fail(super.convertException(e));
-        }
-        return rest;
+            if (YesNoEnum.YES.getValue() == feedbackReq.getFeedbackStatus()) {
+                //已反馈
+            } else {
+                //未反馈
             }
 
 
-    /**
-     * 反馈详细
-     */
-    @PostMapping(value = "question")
-    public Rest<PerformAttendAppealEntity> performDetail(@RequestBody AppealReq appealReq) {
-        String busiDesc = "个人申诉详细";
-        Rest<PerformAttendAppealEntity> rest = Rest.ok(busiDesc + " 【成功】");
-        try {
-            if (ObjectUtils.isEmpty(appealReq.getId())) {
-                throw new AppException("详细查询id不能为空!");
-            }
+//            model.put(KEY_RESULT_DATA, result.getList());
+//            model.put(PAGEINFO_KEY, result.getPageInfo());
+//            parsePageInfo(model, result.getPageInfo());
 
             recordSysLog(request, busiDesc + " 【成功】");
         } catch (Exception e) {
@@ -88,16 +93,23 @@ public class FeedbackApiController extends BaseJsonBodyController {
         return rest;
     }
 
-
     /**
-     * 申诉新增
+     * 反馈问卷新增
      */
     @PostMapping(value = "save")
-    public Rest<String> feedbackSave(@RequestBody PerformAttendAppealEntity appealEntity) {
+    public Rest<FeedbackEntity> feedbackSave(@RequestBody FeedbackEntity feedbackEntity) {
+        Context context = this.getContext();
         String busiDesc = "反馈回答";
-        Rest<String> rest = Rest.ok(busiDesc + " 【成功】");
+        Rest<FeedbackEntity> rest = Rest.ok(busiDesc + " 【成功】");
+
+        if (ObjectUtils.isEmpty(context) || ObjectUtils.isEmpty(context.getUser())) {
+            throw new AppException(ERROR_TOKEN_EXPIRED, ERROR_TOKEN_EXPIRED_CONTENT);
+        }
         try {
+            //todo
 
+            FeedbackEntity saveEntity = feedbackService.save(feedbackEntity, context);
+            rest.setData(saveEntity);
             recordSysLog(request, busiDesc + " 【成功】");
         } catch (Exception e) {
             log.error(busiDesc, e);
@@ -107,6 +119,29 @@ public class FeedbackApiController extends BaseJsonBodyController {
     }
 
 
+    protected PageInfo buildPageInfo(FeedbackReq query) {
+        PageInfo pageInfo = new PageInfo();
+        if (!ObjectUtils.isEmpty(query) && !ObjectUtils.isEmpty(query.getPage())) {
+            pageInfo.setCurrPage(query.getPage());
+        }
+
+        if (!ObjectUtils.isEmpty(query) && !ObjectUtils.isEmpty(query.getSize())) {
+            pageInfo.setPrePageResult(query.getSize());
+        }
+
+        return pageInfo;
+    }
+
+
+    protected void parsePageInfo(Map<String, Object> model, PageInfo pageInfo) {
+        model.put(TOTAL, pageInfo.getTotalResult());
+        model.put(PER_PAGE, pageInfo.getPrePageResult());
+        model.put(CURRENT_PAGE, pageInfo.getCurrPage());
+        model.put(LAST_PAGE, pageInfo.getTotalPage());
+        model.put(PAGEINFO_KEY, pageInfo);
+    }
+
+
     public static void main(String[] args) {
 
     }

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

@@ -4,6 +4,7 @@ import java.math.BigDecimal;
 
 
 import cn.hutool.core.date.DateUtil;
+import com.alibaba.fastjson.JSONObject;
 import com.mortals.framework.common.Rest;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
@@ -49,7 +50,7 @@ import static com.mortals.xhx.common.key.ErrorCode.ERROR_TOKEN_EXPIRED_CONTENT;
 @RestController
 @Slf4j
 @RequestMapping("/api/v1/perform")
-public class PerformApiController extends BaseJsonBodyController {
+public class PerformApiController extends AbstractBaseController<PerformReq> {
 
 
     @Autowired
@@ -78,6 +79,7 @@ public class PerformApiController extends BaseJsonBodyController {
         if (ObjectUtils.isEmpty(context) || ObjectUtils.isEmpty(context.getUser())) {
             throw new AppException(ERROR_TOKEN_EXPIRED, ERROR_TOKEN_EXPIRED_CONTENT);
         }
+        log.info("【{}】【请求体】--> 用户:{}", busiDesc, context.getUser().getRealName());
         try {
             //todo
             PerformStatInfo performStatInfo = new PerformStatInfo();
@@ -99,7 +101,8 @@ public class PerformApiController extends BaseJsonBodyController {
      */
     @PostMapping(value = "list")
     public Rest<Object> performList(@RequestBody PerformReq performReq) {
-
+        String busiDesc = "个人绩效列表";
+        log.info("【{}】【请求体】--> {}", busiDesc, JSONObject.toJSONString(performReq));
         Rest<Object> rest = Rest.ok();
         Map<String, Object> model = new HashMap<>();
         Context context = this.getContext();
@@ -107,7 +110,6 @@ public class PerformApiController extends BaseJsonBodyController {
         if (ObjectUtils.isEmpty(context) || ObjectUtils.isEmpty(context.getUser())) {
             throw new AppException(ERROR_TOKEN_EXPIRED, ERROR_TOKEN_EXPIRED_CONTENT);
         }
-        String busiDesc = "个人绩效列表";
         try {
             if (ObjectUtils.isEmpty(performReq.getPerformStartDate())) {
                 //未设置时间的情况，默认为当月
@@ -115,7 +117,6 @@ public class PerformApiController extends BaseJsonBodyController {
                 performReq.setPerformEndDate(DateUtil.today());
             }
             PageInfo pageInfo = buildPageInfo(performReq);
-
             //todo 查询全部扣分绩效
             if (PerformTypeEnum.全部.getValue().equals(performReq.getPerformType())) {
 
@@ -218,6 +219,9 @@ public class PerformApiController extends BaseJsonBodyController {
             } else {
                 throw new AppException("不支持当前绩效类型");
             }
+
+            rest.setData(model);
+
             recordSysLog(request, busiDesc + " 【成功】");
         } catch (Exception e) {
             log.error(busiDesc, e);
@@ -234,6 +238,7 @@ public class PerformApiController extends BaseJsonBodyController {
     public Rest<PerformDetailInfo> performInfo(@RequestBody PerformReq performReq) {
         Context context = this.getContext();
         String busiDesc = "个人绩效增减详细";
+        log.info("【{}】【请求体】--> {}", busiDesc, JSONObject.toJSONString(performReq));
         Rest<PerformDetailInfo> rest = Rest.ok(busiDesc + " 【成功】");
         try {
             if (ObjectUtils.isEmpty(performReq.getId())) {
@@ -273,27 +278,6 @@ public class PerformApiController extends BaseJsonBodyController {
     }
 
 
-    protected PageInfo buildPageInfo(PerformReq query) {
-        PageInfo pageInfo = new PageInfo();
-        if (!ObjectUtils.isEmpty(query) && !ObjectUtils.isEmpty(query.getPage())) {
-            pageInfo.setCurrPage(query.getPage());
-        }
-
-        if (!ObjectUtils.isEmpty(query) && !ObjectUtils.isEmpty(query.getSize())) {
-            pageInfo.setPrePageResult(query.getSize());
-        }
-
-        return pageInfo;
-    }
-
-
-    protected void parsePageInfo(Map<String, Object> model, PageInfo pageInfo) {
-        model.put(TOTAL, pageInfo.getTotalResult());
-        model.put(PER_PAGE, pageInfo.getPrePageResult());
-        model.put(CURRENT_PAGE, pageInfo.getCurrPage());
-        model.put(LAST_PAGE, pageInfo.getTotalPage());
-        model.put(PAGEINFO_KEY, pageInfo);
-    }
 
     public static void main(String[] args) {
 

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

 package com.mortals.xhx.busiz.web;
 
 
+import com.mortals.xhx.base.system.idgenerator.service.IdgeneratorService;
+import com.mortals.xhx.base.system.idgenerator.service.impl.IdgeneratorServiceImpl;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -17,6 +20,9 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/test")
 public class TestController {
 
+    @Autowired
+    private IdgeneratorService idgeneratorService;
+
     @GetMapping("webservice")
     public String webservice() {
         log.info("测试");
@@ -24,6 +30,16 @@ public class TestController {
         return "ok";
     }
 
+    @GetMapping("idGens")
+    public String idGens() {
+        log.info("测试id生成");
+
+        String stringId = idgeneratorService.getLongId(IdgeneratorServiceImpl.IdGeneratorKey.EFFECT).toString();
+
+
+        return stringId;
+    }
+
 
 
     public static void main(String[] args) {

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

+package com.mortals.xhx.common.code;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+* 核查结果(1.加分或扣分,2.不扣分)枚举类
+*
+* @author zxfei
+*/
+public enum CheckResultEnum {
+    加分或扣分("加分或扣分", "加分或扣分"),
+    不扣分("不扣分", "不扣分");
+    private String value;
+    private String desc;
+
+    CheckResultEnum(String value, String desc) {
+        this.value = value;
+        this.desc = desc;
+    }
+
+    public String getValue() {
+        return this.value;
+    }
+
+    public String getDesc() {
+        return this.desc;
+    }
+
+    public static CheckResultEnum getByValue(String value) {
+        for (CheckResultEnum checkResultEnum : CheckResultEnum.values()) {
+            if (checkResultEnum.getValue() == value) {
+                return checkResultEnum;
+            }
+        }
+        return null;
+    }
+
+    /**
+    * 获取Map集合
+    *
+    * @param eItem 不包含项
+    * @return
+    */
+    public static Map<String, String> getEnumMap(String... eItem) {
+        Map<String, String> resultMap = new LinkedHashMap<>();
+        for (CheckResultEnum item : CheckResultEnum.values()) {
+            try {
+                boolean hasE = false;
+                for (String 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

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

+package com.mortals.xhx.common.code;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+
+public enum PerformRulesTypeEnum {
+    考勤绩效(1, "attend"),
+    评价差评绩效(2, "review"),
+    评价投诉绩效(3, "complain"),
+    办件绩效(4, "gowork"),
+    效能绩效(5, "effect"),
+    其它绩效(1, "other");
+    private Integer value;
+    private String desc;
+
+    PerformRulesTypeEnum(Integer value, String desc) {
+        this.value = value;
+        this.desc = desc;
+    }
+
+    public Integer getValue() {
+        return this.value;
+    }
+
+    public String getDesc() {
+        return this.desc;
+    }
+
+    public static PerformRulesTypeEnum getByValue(Integer value) {
+        for (PerformRulesTypeEnum partAttendanceEnum : PerformRulesTypeEnum.values()) {
+            if (partAttendanceEnum.getValue() == value) {
+                return partAttendanceEnum;
+            }
+        }
+        return null;
+    }
+
+    /**
+    * 获取Map集合
+    *
+    * @param eItem 不包含项
+    * @return
+    */
+    public static Map<String, String> getEnumMap(Integer... eItem) {
+        Map<String, String> resultMap = new LinkedHashMap<>();
+        for (PerformRulesTypeEnum item : PerformRulesTypeEnum.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

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

@@ -4,14 +4,13 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 /**
-* 状态 (0.未开始,1.进行中,2.已结束)枚举类
+* 处理状态(1.未核查,2.已核查)枚举类
 *
 * @author zxfei
 */
 public enum ProcessStatusEnum {
-    未开始(0, "未开始"),
-    进行中(1, "进行中"),
-    已结束(2, "已结束");
+    未核查(1, "未核查"),
+    已核查(2, "已核查");
     private Integer value;
     private String desc;
 

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

@@ -4,14 +4,13 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 /**
-* 扣分方式(1.系统自动,2.人工添加,3.大厅巡查)枚举类
+* 扣分方式(1.系统自动,2.人工添加)枚举类
 *
 * @author zxfei
 */
 public enum SubMethodEnum {
     系统自动(1, "系统自动"),
-    人工添加(2, "人工添加"),
-    大厅巡查(3, "大厅巡查");
+    人工添加(2, "人工添加");
     private Integer value;
     private String desc;
 

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/dao/CheckAttendRecordDao.java

@@ -8,7 +8,7 @@ import java.util.List;
 * 考勤绩效记录核查信息 DAO接口
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-10
 */
 
 public interface  CheckAttendRecordDao extends ICRUDDao<CheckAttendRecordEntity,Long>{

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/dao/CheckComplainRecordDao.java

@@ -8,7 +8,7 @@ import java.util.List;
 * 评价绩效投诉核查信息 DAO接口
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-10
 */
 
 public interface  CheckComplainRecordDao extends ICRUDDao<CheckComplainRecordEntity,Long>{

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/dao/CheckEffectRecordDao.java

@@ -8,7 +8,7 @@ import java.util.List;
 * 效能绩效核查信息 DAO接口
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-10
 */
 
 public interface  CheckEffectRecordDao extends ICRUDDao<CheckEffectRecordEntity,Long>{

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/dao/CheckGoworkRecordDao.java

@@ -8,7 +8,7 @@ import java.util.List;
 * 办件绩效核查信息 DAO接口
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-10
 */
 
 public interface  CheckGoworkRecordDao extends ICRUDDao<CheckGoworkRecordEntity,Long>{

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/dao/CheckOtherRecordDao.java

@@ -8,7 +8,7 @@ import java.util.List;
 * 其它绩效核查信息 DAO接口
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-10
 */
 
 public interface  CheckOtherRecordDao extends ICRUDDao<CheckOtherRecordEntity,Long>{

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/dao/CheckReviewRecordDao.java

@@ -8,7 +8,7 @@ import java.util.List;
 * 评价差评绩效核查信息 DAO接口
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-10
 */
 
 public interface  CheckReviewRecordDao extends ICRUDDao<CheckReviewRecordEntity,Long>{

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/dao/ibatis/CheckAttendRecordDaoImpl.java

@@ -11,7 +11,7 @@ import java.util.List;
 * 考勤绩效记录核查信息DaoImpl DAO接口
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-10
 */
 @Repository("checkAttendRecordDao")
 public class CheckAttendRecordDaoImpl extends BaseCRUDDaoMybatis<CheckAttendRecordEntity,Long> implements CheckAttendRecordDao {

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/dao/ibatis/CheckComplainRecordDaoImpl.java

@@ -11,7 +11,7 @@ import java.util.List;
 * 评价绩效投诉核查信息DaoImpl DAO接口
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-10
 */
 @Repository("checkComplainRecordDao")
 public class CheckComplainRecordDaoImpl extends BaseCRUDDaoMybatis<CheckComplainRecordEntity,Long> implements CheckComplainRecordDao {

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/dao/ibatis/CheckEffectRecordDaoImpl.java

@@ -11,7 +11,7 @@ import java.util.List;
 * 效能绩效核查信息DaoImpl DAO接口
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-10
 */
 @Repository("checkEffectRecordDao")
 public class CheckEffectRecordDaoImpl extends BaseCRUDDaoMybatis<CheckEffectRecordEntity,Long> implements CheckEffectRecordDao {

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/dao/ibatis/CheckGoworkRecordDaoImpl.java

@@ -11,7 +11,7 @@ import java.util.List;
 * 办件绩效核查信息DaoImpl DAO接口
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-10
 */
 @Repository("checkGoworkRecordDao")
 public class CheckGoworkRecordDaoImpl extends BaseCRUDDaoMybatis<CheckGoworkRecordEntity,Long> implements CheckGoworkRecordDao {

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/dao/ibatis/CheckOtherRecordDaoImpl.java

@@ -11,7 +11,7 @@ import java.util.List;
 * 其它绩效核查信息DaoImpl DAO接口
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-10
 */
 @Repository("checkOtherRecordDao")
 public class CheckOtherRecordDaoImpl extends BaseCRUDDaoMybatis<CheckOtherRecordEntity,Long> implements CheckOtherRecordDao {

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/dao/ibatis/CheckReviewRecordDaoImpl.java

@@ -11,7 +11,7 @@ import java.util.List;
 * 评价差评绩效核查信息DaoImpl DAO接口
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-10
 */
 @Repository("checkReviewRecordDao")
 public class CheckReviewRecordDaoImpl extends BaseCRUDDaoMybatis<CheckReviewRecordEntity,Long> implements CheckReviewRecordDao {

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckAttendRecordEntity.java

@@ -12,7 +12,7 @@ import lombok.Data;
 * 考勤绩效记录核查信息实体对象
 *
 * @author zxfei
-* @date 2023-07-08
+* @date 2023-07-10
 */
 @Data
 public class CheckAttendRecordEntity extends CheckAttendRecordVo {
@@ -101,9 +101,9 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo {
     @Excel(name = "核查说明")
     private String checkDesc;
     /**
-    * 核查结果
+    * 核查结果(1.加分或扣分,2.不扣分)
     */
-    @Excel(name = "核查结果")
+    @Excel(name = "核查结果", readConverterExp = "1=加分或扣分,2.不扣分")
     private String checkResult;
     /**
     * 处理状态(1.未处理,2.已处理)
@@ -114,9 +114,9 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo {
     */
     private Integer subMethod;
     /**
-    * 说明
+    * 备注
     */
-    @Excel(name = "说明")
+    @Excel(name = "备注")
     private String remark;
     /**
     * 附件名称，多个逗号分割
@@ -128,6 +128,14 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo {
     */
     @Excel(name = "附件下载地址，多个逗号分割")
     private String filePaths;
+    /**
+    * 绩效规则分类id
+    */
+    private Long categoryId;
+    /**
+    * 规则名称
+    */
+    private String categoryName;
     @Override
     public int hashCode() {
          return this.getId().hashCode();
@@ -197,5 +205,9 @@ public class CheckAttendRecordEntity extends CheckAttendRecordVo {
             this.fileNames = "";
 
             this.filePaths = "";
+
+            this.categoryId = -1L;
+
+            this.categoryName = "";
     }
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckComplainRecordEntity.java

@@ -12,7 +12,7 @@ import lombok.Data;
 * 评价绩效投诉核查信息实体对象
 *
 * @author zxfei
-* @date 2023-07-08
+* @date 2023-07-10
 */
 @Data
 public class CheckComplainRecordEntity extends CheckComplainRecordVo {
@@ -143,6 +143,14 @@ public class CheckComplainRecordEntity extends CheckComplainRecordVo {
     */
     @Excel(name = "附件下载地址，多个逗号分割")
     private String filePaths;
+    /**
+    * 绩效规则分类id
+    */
+    private Long categoryId;
+    /**
+    * 规则名称
+    */
+    private String categoryName;
     @Override
     public int hashCode() {
          return this.getId().hashCode();
@@ -216,5 +224,9 @@ public class CheckComplainRecordEntity extends CheckComplainRecordVo {
             this.fileNames = "";
 
             this.filePaths = "";
+
+            this.categoryId = -1L;
+
+            this.categoryName = "";
     }
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckComplainRecordQuery.java

@@ -8,7 +8,7 @@ import com.mortals.xhx.module.check.model.CheckComplainRecordEntity;
 * 评价绩效投诉核查信息查询对象
 *
 * @author zxfei
-* @date 2023-07-08
+* @date 2023-07-10
 */
 public class CheckComplainRecordQuery extends CheckComplainRecordEntity {
     /** 开始 序号，主键，自增长 */
@@ -281,6 +281,26 @@ public class CheckComplainRecordQuery extends CheckComplainRecordEntity {
 
     /** 附件下载地址，多个逗号分割排除列表 */
     private List <String> filePathsNotList;
+    /** 开始 绩效规则分类id */
+    private Long categoryIdStart;
+
+    /** 结束 绩效规则分类id */
+    private Long categoryIdEnd;
+
+    /** 增加 绩效规则分类id */
+    private Long categoryIdIncrement;
+
+    /** 绩效规则分类id列表 */
+    private List <Long> categoryIdList;
+
+    /** 绩效规则分类id排除列表 */
+    private List <Long> categoryIdNotList;
+
+    /** 规则名称 */
+    private List<String> categoryNameList;
+
+    /** 规则名称排除列表 */
+    private List <String> categoryNameNotList;
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<CheckComplainRecordQuery> orConditionList;
 
@@ -1835,6 +1855,119 @@ public class CheckComplainRecordQuery extends CheckComplainRecordEntity {
         this.filePathsNotList = filePathsNotList;
     }
 
+    /**
+    * 获取 开始 绩效规则分类id
+    * @return categoryIdStart
+    */
+    public Long getCategoryIdStart(){
+        return this.categoryIdStart;
+    }
+
+    /**
+    * 设置 开始 绩效规则分类id
+    * @param categoryIdStart
+    */
+    public void setCategoryIdStart(Long categoryIdStart){
+        this.categoryIdStart = categoryIdStart;
+    }
+
+    /**
+    * 获取 结束 绩效规则分类id
+    * @return $categoryIdEnd
+    */
+    public Long getCategoryIdEnd(){
+        return this.categoryIdEnd;
+    }
+
+    /**
+    * 设置 结束 绩效规则分类id
+    * @param categoryIdEnd
+    */
+    public void setCategoryIdEnd(Long categoryIdEnd){
+        this.categoryIdEnd = categoryIdEnd;
+    }
+
+    /**
+    * 获取 增加 绩效规则分类id
+    * @return categoryIdIncrement
+    */
+    public Long getCategoryIdIncrement(){
+        return this.categoryIdIncrement;
+    }
+
+    /**
+    * 设置 增加 绩效规则分类id
+    * @param categoryIdIncrement
+    */
+    public void setCategoryIdIncrement(Long categoryIdIncrement){
+        this.categoryIdIncrement = categoryIdIncrement;
+    }
+
+    /**
+    * 获取 绩效规则分类id
+    * @return categoryIdList
+    */
+    public List<Long> getCategoryIdList(){
+        return this.categoryIdList;
+    }
+
+    /**
+    * 设置 绩效规则分类id
+    * @param categoryIdList
+    */
+    public void setCategoryIdList(List<Long> categoryIdList){
+        this.categoryIdList = categoryIdList;
+    }
+
+    /**
+    * 获取 绩效规则分类id
+    * @return categoryIdNotList
+    */
+    public List<Long> getCategoryIdNotList(){
+        return this.categoryIdNotList;
+    }
+
+    /**
+    * 设置 绩效规则分类id
+    * @param categoryIdNotList
+    */
+    public void setCategoryIdNotList(List<Long> categoryIdNotList){
+        this.categoryIdNotList = categoryIdNotList;
+    }
+
+
+    /**
+    * 获取 规则名称
+    * @return categoryNameList
+    */
+    public List<String> getCategoryNameList(){
+        return this.categoryNameList;
+    }
+
+    /**
+    * 设置 规则名称
+    * @param categoryNameList
+    */
+    public void setCategoryNameList(List<String> categoryNameList){
+        this.categoryNameList = categoryNameList;
+    }
+
+    /**
+    * 获取 规则名称
+    * @return categoryNameNotList
+    */
+    public List<String> getCategoryNameNotList(){
+        return this.categoryNameNotList;
+    }
+
+    /**
+    * 设置 规则名称
+    * @param categoryNameNotList
+    */
+    public void setCategoryNameNotList(List<String> categoryNameNotList){
+        this.categoryNameNotList = categoryNameNotList;
+    }
+
     /**
     * 设置  序号，主键，自增长
     * @param id
@@ -2722,6 +2855,79 @@ public class CheckComplainRecordQuery extends CheckComplainRecordEntity {
 		return this;
     }
 
+    /**
+    * 设置  绩效规则分类id
+    * @param categoryId
+    */
+    public CheckComplainRecordQuery categoryId(Long categoryId){
+	    setCategoryId(categoryId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 绩效规则分类id
+    * @param categoryIdStart
+    */
+    public CheckComplainRecordQuery categoryIdStart(Long categoryIdStart){
+		this.categoryIdStart = categoryIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 绩效规则分类id
+    * @param categoryIdEnd
+    */
+    public CheckComplainRecordQuery categoryIdEnd(Long categoryIdEnd){
+		this.categoryIdEnd = categoryIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 绩效规则分类id
+    * @param categoryIdIncrement
+    */
+    public CheckComplainRecordQuery categoryIdIncrement(Long categoryIdIncrement){
+		this.categoryIdIncrement = categoryIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 绩效规则分类id
+    * @param categoryIdList
+    */
+    public CheckComplainRecordQuery categoryIdList(List<Long> categoryIdList){
+        this.categoryIdList = categoryIdList;
+		return this;
+        }
+
+        /**
+        * 设置 绩效规则分类id
+        * @param categoryIdNotList
+        */
+        public CheckComplainRecordQuery categoryIdNotList(List<Long> categoryIdNotList){
+        this.categoryIdNotList = categoryIdNotList;
+        return this;
+        }
+
+
+	/**
+    * 设置 规则名称
+    * @param categoryName
+    */
+    public CheckComplainRecordQuery categoryName(String categoryName){
+        setCategoryName(categoryName);
+		return this;
+    }
+
+    /**
+    * 设置 规则名称
+    * @param categoryNameList
+    */
+    public CheckComplainRecordQuery categoryNameList(List<String> categoryNameList){
+        this.categoryNameList = categoryNameList;
+		return this;
+    }
+
     /**
     * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
     * @return orConditionList

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckEffectRecordEntity.java

@@ -12,7 +12,7 @@ import lombok.Data;
 * 效能绩效核查信息实体对象
 *
 * @author zxfei
-* @date 2023-07-08
+* @date 2023-07-10
 */
 @Data
 public class CheckEffectRecordEntity extends CheckEffectRecordVo {
@@ -134,6 +134,14 @@ public class CheckEffectRecordEntity extends CheckEffectRecordVo {
     */
     @Excel(name = "附件下载地址，多个逗号分割")
     private String filePaths;
+    /**
+    * 绩效规则分类id
+    */
+    private Long categoryId;
+    /**
+    * 规则名称
+    */
+    private String categoryName;
     @Override
     public int hashCode() {
          return this.getId().hashCode();
@@ -203,5 +211,9 @@ public class CheckEffectRecordEntity extends CheckEffectRecordVo {
             this.fileNames = "";
 
             this.filePaths = "";
+
+            this.categoryId = -1L;
+
+            this.categoryName = "";
     }
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckEffectRecordQuery.java

@@ -8,7 +8,7 @@ import com.mortals.xhx.module.check.model.CheckEffectRecordEntity;
 * 效能绩效核查信息查询对象
 *
 * @author zxfei
-* @date 2023-07-08
+* @date 2023-07-10
 */
 public class CheckEffectRecordQuery extends CheckEffectRecordEntity {
     /** 开始 序号，主键，自增长 */
@@ -292,6 +292,26 @@ public class CheckEffectRecordQuery extends CheckEffectRecordEntity {
 
     /** 附件下载地址，多个逗号分割排除列表 */
     private List <String> filePathsNotList;
+    /** 开始 绩效规则分类id */
+    private Long categoryIdStart;
+
+    /** 结束 绩效规则分类id */
+    private Long categoryIdEnd;
+
+    /** 增加 绩效规则分类id */
+    private Long categoryIdIncrement;
+
+    /** 绩效规则分类id列表 */
+    private List <Long> categoryIdList;
+
+    /** 绩效规则分类id排除列表 */
+    private List <Long> categoryIdNotList;
+
+    /** 规则名称 */
+    private List<String> categoryNameList;
+
+    /** 规则名称排除列表 */
+    private List <String> categoryNameNotList;
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<CheckEffectRecordQuery> orConditionList;
 
@@ -1880,6 +1900,119 @@ public class CheckEffectRecordQuery extends CheckEffectRecordEntity {
         this.filePathsNotList = filePathsNotList;
     }
 
+    /**
+    * 获取 开始 绩效规则分类id
+    * @return categoryIdStart
+    */
+    public Long getCategoryIdStart(){
+        return this.categoryIdStart;
+    }
+
+    /**
+    * 设置 开始 绩效规则分类id
+    * @param categoryIdStart
+    */
+    public void setCategoryIdStart(Long categoryIdStart){
+        this.categoryIdStart = categoryIdStart;
+    }
+
+    /**
+    * 获取 结束 绩效规则分类id
+    * @return $categoryIdEnd
+    */
+    public Long getCategoryIdEnd(){
+        return this.categoryIdEnd;
+    }
+
+    /**
+    * 设置 结束 绩效规则分类id
+    * @param categoryIdEnd
+    */
+    public void setCategoryIdEnd(Long categoryIdEnd){
+        this.categoryIdEnd = categoryIdEnd;
+    }
+
+    /**
+    * 获取 增加 绩效规则分类id
+    * @return categoryIdIncrement
+    */
+    public Long getCategoryIdIncrement(){
+        return this.categoryIdIncrement;
+    }
+
+    /**
+    * 设置 增加 绩效规则分类id
+    * @param categoryIdIncrement
+    */
+    public void setCategoryIdIncrement(Long categoryIdIncrement){
+        this.categoryIdIncrement = categoryIdIncrement;
+    }
+
+    /**
+    * 获取 绩效规则分类id
+    * @return categoryIdList
+    */
+    public List<Long> getCategoryIdList(){
+        return this.categoryIdList;
+    }
+
+    /**
+    * 设置 绩效规则分类id
+    * @param categoryIdList
+    */
+    public void setCategoryIdList(List<Long> categoryIdList){
+        this.categoryIdList = categoryIdList;
+    }
+
+    /**
+    * 获取 绩效规则分类id
+    * @return categoryIdNotList
+    */
+    public List<Long> getCategoryIdNotList(){
+        return this.categoryIdNotList;
+    }
+
+    /**
+    * 设置 绩效规则分类id
+    * @param categoryIdNotList
+    */
+    public void setCategoryIdNotList(List<Long> categoryIdNotList){
+        this.categoryIdNotList = categoryIdNotList;
+    }
+
+
+    /**
+    * 获取 规则名称
+    * @return categoryNameList
+    */
+    public List<String> getCategoryNameList(){
+        return this.categoryNameList;
+    }
+
+    /**
+    * 设置 规则名称
+    * @param categoryNameList
+    */
+    public void setCategoryNameList(List<String> categoryNameList){
+        this.categoryNameList = categoryNameList;
+    }
+
+    /**
+    * 获取 规则名称
+    * @return categoryNameNotList
+    */
+    public List<String> getCategoryNameNotList(){
+        return this.categoryNameNotList;
+    }
+
+    /**
+    * 设置 规则名称
+    * @param categoryNameNotList
+    */
+    public void setCategoryNameNotList(List<String> categoryNameNotList){
+        this.categoryNameNotList = categoryNameNotList;
+    }
+
     /**
     * 设置  序号，主键，自增长
     * @param id
@@ -2781,6 +2914,79 @@ public class CheckEffectRecordQuery extends CheckEffectRecordEntity {
 		return this;
     }
 
+    /**
+    * 设置  绩效规则分类id
+    * @param categoryId
+    */
+    public CheckEffectRecordQuery categoryId(Long categoryId){
+	    setCategoryId(categoryId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 绩效规则分类id
+    * @param categoryIdStart
+    */
+    public CheckEffectRecordQuery categoryIdStart(Long categoryIdStart){
+		this.categoryIdStart = categoryIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 绩效规则分类id
+    * @param categoryIdEnd
+    */
+    public CheckEffectRecordQuery categoryIdEnd(Long categoryIdEnd){
+		this.categoryIdEnd = categoryIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 绩效规则分类id
+    * @param categoryIdIncrement
+    */
+    public CheckEffectRecordQuery categoryIdIncrement(Long categoryIdIncrement){
+		this.categoryIdIncrement = categoryIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 绩效规则分类id
+    * @param categoryIdList
+    */
+    public CheckEffectRecordQuery categoryIdList(List<Long> categoryIdList){
+        this.categoryIdList = categoryIdList;
+		return this;
+        }
+
+        /**
+        * 设置 绩效规则分类id
+        * @param categoryIdNotList
+        */
+        public CheckEffectRecordQuery categoryIdNotList(List<Long> categoryIdNotList){
+        this.categoryIdNotList = categoryIdNotList;
+        return this;
+        }
+
+
+	/**
+    * 设置 规则名称
+    * @param categoryName
+    */
+    public CheckEffectRecordQuery categoryName(String categoryName){
+        setCategoryName(categoryName);
+		return this;
+    }
+
+    /**
+    * 设置 规则名称
+    * @param categoryNameList
+    */
+    public CheckEffectRecordQuery categoryNameList(List<String> categoryNameList){
+        this.categoryNameList = categoryNameList;
+		return this;
+    }
+
     /**
     * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
     * @return orConditionList

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckGoworkRecordEntity.java

@@ -12,7 +12,7 @@ import lombok.Data;
 * 办件绩效核查信息实体对象
 *
 * @author zxfei
-* @date 2023-07-08
+* @date 2023-07-10
 */
 @Data
 public class CheckGoworkRecordEntity extends CheckGoworkRecordVo {
@@ -133,6 +133,14 @@ public class CheckGoworkRecordEntity extends CheckGoworkRecordVo {
     */
     @Excel(name = "附件下载地址，多个逗号分割")
     private String filePaths;
+    /**
+    * 绩效规则分类id
+    */
+    private Long categoryId;
+    /**
+    * 规则名称
+    */
+    private String categoryName;
     @Override
     public int hashCode() {
          return this.getId().hashCode();
@@ -200,5 +208,9 @@ public class CheckGoworkRecordEntity extends CheckGoworkRecordVo {
             this.fileNames = "";
 
             this.filePaths = "";
+
+            this.categoryId = -1L;
+
+            this.categoryName = "";
     }
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckGoworkRecordQuery.java

@@ -8,7 +8,7 @@ import com.mortals.xhx.module.check.model.CheckGoworkRecordEntity;
 * 办件绩效核查信息查询对象
 *
 * @author zxfei
-* @date 2023-07-08
+* @date 2023-07-10
 */
 public class CheckGoworkRecordQuery extends CheckGoworkRecordEntity {
     /** 开始 序号，主键，自增长 */
@@ -266,6 +266,26 @@ public class CheckGoworkRecordQuery extends CheckGoworkRecordEntity {
 
     /** 附件下载地址，多个逗号分割排除列表 */
     private List <String> filePathsNotList;
+    /** 开始 绩效规则分类id */
+    private Long categoryIdStart;
+
+    /** 结束 绩效规则分类id */
+    private Long categoryIdEnd;
+
+    /** 增加 绩效规则分类id */
+    private Long categoryIdIncrement;
+
+    /** 绩效规则分类id列表 */
+    private List <Long> categoryIdList;
+
+    /** 绩效规则分类id排除列表 */
+    private List <Long> categoryIdNotList;
+
+    /** 规则名称 */
+    private List<String> categoryNameList;
+
+    /** 规则名称排除列表 */
+    private List <String> categoryNameNotList;
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<CheckGoworkRecordQuery> orConditionList;
 
@@ -1724,6 +1744,119 @@ public class CheckGoworkRecordQuery extends CheckGoworkRecordEntity {
         this.filePathsNotList = filePathsNotList;
     }
 
+    /**
+    * 获取 开始 绩效规则分类id
+    * @return categoryIdStart
+    */
+    public Long getCategoryIdStart(){
+        return this.categoryIdStart;
+    }
+
+    /**
+    * 设置 开始 绩效规则分类id
+    * @param categoryIdStart
+    */
+    public void setCategoryIdStart(Long categoryIdStart){
+        this.categoryIdStart = categoryIdStart;
+    }
+
+    /**
+    * 获取 结束 绩效规则分类id
+    * @return $categoryIdEnd
+    */
+    public Long getCategoryIdEnd(){
+        return this.categoryIdEnd;
+    }
+
+    /**
+    * 设置 结束 绩效规则分类id
+    * @param categoryIdEnd
+    */
+    public void setCategoryIdEnd(Long categoryIdEnd){
+        this.categoryIdEnd = categoryIdEnd;
+    }
+
+    /**
+    * 获取 增加 绩效规则分类id
+    * @return categoryIdIncrement
+    */
+    public Long getCategoryIdIncrement(){
+        return this.categoryIdIncrement;
+    }
+
+    /**
+    * 设置 增加 绩效规则分类id
+    * @param categoryIdIncrement
+    */
+    public void setCategoryIdIncrement(Long categoryIdIncrement){
+        this.categoryIdIncrement = categoryIdIncrement;
+    }
+
+    /**
+    * 获取 绩效规则分类id
+    * @return categoryIdList
+    */
+    public List<Long> getCategoryIdList(){
+        return this.categoryIdList;
+    }
+
+    /**
+    * 设置 绩效规则分类id
+    * @param categoryIdList
+    */
+    public void setCategoryIdList(List<Long> categoryIdList){
+        this.categoryIdList = categoryIdList;
+    }
+
+    /**
+    * 获取 绩效规则分类id
+    * @return categoryIdNotList
+    */
+    public List<Long> getCategoryIdNotList(){
+        return this.categoryIdNotList;
+    }
+
+    /**
+    * 设置 绩效规则分类id
+    * @param categoryIdNotList
+    */
+    public void setCategoryIdNotList(List<Long> categoryIdNotList){
+        this.categoryIdNotList = categoryIdNotList;
+    }
+
+
+    /**
+    * 获取 规则名称
+    * @return categoryNameList
+    */
+    public List<String> getCategoryNameList(){
+        return this.categoryNameList;
+    }
+
+    /**
+    * 设置 规则名称
+    * @param categoryNameList
+    */
+    public void setCategoryNameList(List<String> categoryNameList){
+        this.categoryNameList = categoryNameList;
+    }
+
+    /**
+    * 获取 规则名称
+    * @return categoryNameNotList
+    */
+    public List<String> getCategoryNameNotList(){
+        return this.categoryNameNotList;
+    }
+
+    /**
+    * 设置 规则名称
+    * @param categoryNameNotList
+    */
+    public void setCategoryNameNotList(List<String> categoryNameNotList){
+        this.categoryNameNotList = categoryNameNotList;
+    }
+
     /**
     * 设置  序号，主键，自增长
     * @param id
@@ -2554,6 +2687,79 @@ public class CheckGoworkRecordQuery extends CheckGoworkRecordEntity {
 		return this;
     }
 
+    /**
+    * 设置  绩效规则分类id
+    * @param categoryId
+    */
+    public CheckGoworkRecordQuery categoryId(Long categoryId){
+	    setCategoryId(categoryId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 绩效规则分类id
+    * @param categoryIdStart
+    */
+    public CheckGoworkRecordQuery categoryIdStart(Long categoryIdStart){
+		this.categoryIdStart = categoryIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 绩效规则分类id
+    * @param categoryIdEnd
+    */
+    public CheckGoworkRecordQuery categoryIdEnd(Long categoryIdEnd){
+		this.categoryIdEnd = categoryIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 绩效规则分类id
+    * @param categoryIdIncrement
+    */
+    public CheckGoworkRecordQuery categoryIdIncrement(Long categoryIdIncrement){
+		this.categoryIdIncrement = categoryIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 绩效规则分类id
+    * @param categoryIdList
+    */
+    public CheckGoworkRecordQuery categoryIdList(List<Long> categoryIdList){
+        this.categoryIdList = categoryIdList;
+		return this;
+        }
+
+        /**
+        * 设置 绩效规则分类id
+        * @param categoryIdNotList
+        */
+        public CheckGoworkRecordQuery categoryIdNotList(List<Long> categoryIdNotList){
+        this.categoryIdNotList = categoryIdNotList;
+        return this;
+        }
+
+
+	/**
+    * 设置 规则名称
+    * @param categoryName
+    */
+    public CheckGoworkRecordQuery categoryName(String categoryName){
+        setCategoryName(categoryName);
+		return this;
+    }
+
+    /**
+    * 设置 规则名称
+    * @param categoryNameList
+    */
+    public CheckGoworkRecordQuery categoryNameList(List<String> categoryNameList){
+        this.categoryNameList = categoryNameList;
+		return this;
+    }
+
     /**
     * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
     * @return orConditionList

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckOtherRecordEntity.java

@@ -12,7 +12,7 @@ import lombok.Data;
 * 其它绩效核查信息实体对象
 *
 * @author zxfei
-* @date 2023-07-08
+* @date 2023-07-10
 */
 @Data
 public class CheckOtherRecordEntity extends CheckOtherRecordVo {
@@ -123,6 +123,14 @@ public class CheckOtherRecordEntity extends CheckOtherRecordVo {
     */
     @Excel(name = "附件下载地址，多个逗号分割")
     private String filePaths;
+    /**
+    * 绩效规则分类id
+    */
+    private Long categoryId;
+    /**
+    * 规则名称
+    */
+    private String categoryName;
     @Override
     public int hashCode() {
          return this.getId().hashCode();
@@ -190,5 +198,9 @@ public class CheckOtherRecordEntity extends CheckOtherRecordVo {
             this.fileNames = "";
 
             this.filePaths = "";
+
+            this.categoryId = -1L;
+
+            this.categoryName = "";
     }
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckOtherRecordQuery.java

@@ -8,7 +8,7 @@ import com.mortals.xhx.module.check.model.CheckOtherRecordEntity;
 * 其它绩效核查信息查询对象
 *
 * @author zxfei
-* @date 2023-07-08
+* @date 2023-07-10
 */
 public class CheckOtherRecordQuery extends CheckOtherRecordEntity {
     /** 开始 序号，主键，自增长 */
@@ -286,6 +286,26 @@ public class CheckOtherRecordQuery extends CheckOtherRecordEntity {
 
     /** 附件下载地址，多个逗号分割排除列表 */
     private List <String> filePathsNotList;
+    /** 开始 绩效规则分类id */
+    private Long categoryIdStart;
+
+    /** 结束 绩效规则分类id */
+    private Long categoryIdEnd;
+
+    /** 增加 绩效规则分类id */
+    private Long categoryIdIncrement;
+
+    /** 绩效规则分类id列表 */
+    private List <Long> categoryIdList;
+
+    /** 绩效规则分类id排除列表 */
+    private List <Long> categoryIdNotList;
+
+    /** 规则名称 */
+    private List<String> categoryNameList;
+
+    /** 规则名称排除列表 */
+    private List <String> categoryNameNotList;
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<CheckOtherRecordQuery> orConditionList;
 
@@ -1842,6 +1862,119 @@ public class CheckOtherRecordQuery extends CheckOtherRecordEntity {
         this.filePathsNotList = filePathsNotList;
     }
 
+    /**
+    * 获取 开始 绩效规则分类id
+    * @return categoryIdStart
+    */
+    public Long getCategoryIdStart(){
+        return this.categoryIdStart;
+    }
+
+    /**
+    * 设置 开始 绩效规则分类id
+    * @param categoryIdStart
+    */
+    public void setCategoryIdStart(Long categoryIdStart){
+        this.categoryIdStart = categoryIdStart;
+    }
+
+    /**
+    * 获取 结束 绩效规则分类id
+    * @return $categoryIdEnd
+    */
+    public Long getCategoryIdEnd(){
+        return this.categoryIdEnd;
+    }
+
+    /**
+    * 设置 结束 绩效规则分类id
+    * @param categoryIdEnd
+    */
+    public void setCategoryIdEnd(Long categoryIdEnd){
+        this.categoryIdEnd = categoryIdEnd;
+    }
+
+    /**
+    * 获取 增加 绩效规则分类id
+    * @return categoryIdIncrement
+    */
+    public Long getCategoryIdIncrement(){
+        return this.categoryIdIncrement;
+    }
+
+    /**
+    * 设置 增加 绩效规则分类id
+    * @param categoryIdIncrement
+    */
+    public void setCategoryIdIncrement(Long categoryIdIncrement){
+        this.categoryIdIncrement = categoryIdIncrement;
+    }
+
+    /**
+    * 获取 绩效规则分类id
+    * @return categoryIdList
+    */
+    public List<Long> getCategoryIdList(){
+        return this.categoryIdList;
+    }
+
+    /**
+    * 设置 绩效规则分类id
+    * @param categoryIdList
+    */
+    public void setCategoryIdList(List<Long> categoryIdList){
+        this.categoryIdList = categoryIdList;
+    }
+
+    /**
+    * 获取 绩效规则分类id
+    * @return categoryIdNotList
+    */
+    public List<Long> getCategoryIdNotList(){
+        return this.categoryIdNotList;
+    }
+
+    /**
+    * 设置 绩效规则分类id
+    * @param categoryIdNotList
+    */
+    public void setCategoryIdNotList(List<Long> categoryIdNotList){
+        this.categoryIdNotList = categoryIdNotList;
+    }
+
+
+    /**
+    * 获取 规则名称
+    * @return categoryNameList
+    */
+    public List<String> getCategoryNameList(){
+        return this.categoryNameList;
+    }
+
+    /**
+    * 设置 规则名称
+    * @param categoryNameList
+    */
+    public void setCategoryNameList(List<String> categoryNameList){
+        this.categoryNameList = categoryNameList;
+    }
+
+    /**
+    * 获取 规则名称
+    * @return categoryNameNotList
+    */
+    public List<String> getCategoryNameNotList(){
+        return this.categoryNameNotList;
+    }
+
+    /**
+    * 设置 规则名称
+    * @param categoryNameNotList
+    */
+    public void setCategoryNameNotList(List<String> categoryNameNotList){
+        this.categoryNameNotList = categoryNameNotList;
+    }
+
     /**
     * 设置  序号，主键，自增长
     * @param id
@@ -2742,6 +2875,79 @@ public class CheckOtherRecordQuery extends CheckOtherRecordEntity {
 		return this;
     }
 
+    /**
+    * 设置  绩效规则分类id
+    * @param categoryId
+    */
+    public CheckOtherRecordQuery categoryId(Long categoryId){
+	    setCategoryId(categoryId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 绩效规则分类id
+    * @param categoryIdStart
+    */
+    public CheckOtherRecordQuery categoryIdStart(Long categoryIdStart){
+		this.categoryIdStart = categoryIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 绩效规则分类id
+    * @param categoryIdEnd
+    */
+    public CheckOtherRecordQuery categoryIdEnd(Long categoryIdEnd){
+		this.categoryIdEnd = categoryIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 绩效规则分类id
+    * @param categoryIdIncrement
+    */
+    public CheckOtherRecordQuery categoryIdIncrement(Long categoryIdIncrement){
+		this.categoryIdIncrement = categoryIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 绩效规则分类id
+    * @param categoryIdList
+    */
+    public CheckOtherRecordQuery categoryIdList(List<Long> categoryIdList){
+        this.categoryIdList = categoryIdList;
+		return this;
+        }
+
+        /**
+        * 设置 绩效规则分类id
+        * @param categoryIdNotList
+        */
+        public CheckOtherRecordQuery categoryIdNotList(List<Long> categoryIdNotList){
+        this.categoryIdNotList = categoryIdNotList;
+        return this;
+        }
+
+
+	/**
+    * 设置 规则名称
+    * @param categoryName
+    */
+    public CheckOtherRecordQuery categoryName(String categoryName){
+        setCategoryName(categoryName);
+		return this;
+    }
+
+    /**
+    * 设置 规则名称
+    * @param categoryNameList
+    */
+    public CheckOtherRecordQuery categoryNameList(List<String> categoryNameList){
+        this.categoryNameList = categoryNameList;
+		return this;
+    }
+
     /**
     * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
     * @return orConditionList

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckReviewRecordEntity.java

@@ -12,7 +12,7 @@ import lombok.Data;
 * 评价差评绩效核查信息实体对象
 *
 * @author zxfei
-* @date 2023-07-08
+* @date 2023-07-10
 */
 @Data
 public class CheckReviewRecordEntity extends CheckReviewRecordVo {
@@ -130,6 +130,14 @@ public class CheckReviewRecordEntity extends CheckReviewRecordVo {
     */
     @Excel(name = "附件下载地址，多个逗号分割")
     private String filePaths;
+    /**
+    * 绩效规则分类id
+    */
+    private Long categoryId;
+    /**
+    * 规则名称
+    */
+    private String categoryName;
     @Override
     public int hashCode() {
          return this.getId().hashCode();
@@ -197,5 +205,9 @@ public class CheckReviewRecordEntity extends CheckReviewRecordVo {
             this.fileNames = "";
 
             this.filePaths = "";
+
+            this.categoryId = -1L;
+
+            this.categoryName = "";
     }
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/CheckReviewRecordQuery.java

@@ -8,7 +8,7 @@ import com.mortals.xhx.module.check.model.CheckReviewRecordEntity;
 * 评价差评绩效核查信息查询对象
 *
 * @author zxfei
-* @date 2023-07-08
+* @date 2023-07-10
 */
 public class CheckReviewRecordQuery extends CheckReviewRecordEntity {
     /** 开始 序号，主键，自增长 */
@@ -276,6 +276,26 @@ public class CheckReviewRecordQuery extends CheckReviewRecordEntity {
 
     /** 附件下载地址，多个逗号分割排除列表 */
     private List <String> filePathsNotList;
+    /** 开始 绩效规则分类id */
+    private Long categoryIdStart;
+
+    /** 结束 绩效规则分类id */
+    private Long categoryIdEnd;
+
+    /** 增加 绩效规则分类id */
+    private Long categoryIdIncrement;
+
+    /** 绩效规则分类id列表 */
+    private List <Long> categoryIdList;
+
+    /** 绩效规则分类id排除列表 */
+    private List <Long> categoryIdNotList;
+
+    /** 规则名称 */
+    private List<String> categoryNameList;
+
+    /** 规则名称排除列表 */
+    private List <String> categoryNameNotList;
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<CheckReviewRecordQuery> orConditionList;
 
@@ -1783,6 +1803,119 @@ public class CheckReviewRecordQuery extends CheckReviewRecordEntity {
         this.filePathsNotList = filePathsNotList;
     }
 
+    /**
+    * 获取 开始 绩效规则分类id
+    * @return categoryIdStart
+    */
+    public Long getCategoryIdStart(){
+        return this.categoryIdStart;
+    }
+
+    /**
+    * 设置 开始 绩效规则分类id
+    * @param categoryIdStart
+    */
+    public void setCategoryIdStart(Long categoryIdStart){
+        this.categoryIdStart = categoryIdStart;
+    }
+
+    /**
+    * 获取 结束 绩效规则分类id
+    * @return $categoryIdEnd
+    */
+    public Long getCategoryIdEnd(){
+        return this.categoryIdEnd;
+    }
+
+    /**
+    * 设置 结束 绩效规则分类id
+    * @param categoryIdEnd
+    */
+    public void setCategoryIdEnd(Long categoryIdEnd){
+        this.categoryIdEnd = categoryIdEnd;
+    }
+
+    /**
+    * 获取 增加 绩效规则分类id
+    * @return categoryIdIncrement
+    */
+    public Long getCategoryIdIncrement(){
+        return this.categoryIdIncrement;
+    }
+
+    /**
+    * 设置 增加 绩效规则分类id
+    * @param categoryIdIncrement
+    */
+    public void setCategoryIdIncrement(Long categoryIdIncrement){
+        this.categoryIdIncrement = categoryIdIncrement;
+    }
+
+    /**
+    * 获取 绩效规则分类id
+    * @return categoryIdList
+    */
+    public List<Long> getCategoryIdList(){
+        return this.categoryIdList;
+    }
+
+    /**
+    * 设置 绩效规则分类id
+    * @param categoryIdList
+    */
+    public void setCategoryIdList(List<Long> categoryIdList){
+        this.categoryIdList = categoryIdList;
+    }
+
+    /**
+    * 获取 绩效规则分类id
+    * @return categoryIdNotList
+    */
+    public List<Long> getCategoryIdNotList(){
+        return this.categoryIdNotList;
+    }
+
+    /**
+    * 设置 绩效规则分类id
+    * @param categoryIdNotList
+    */
+    public void setCategoryIdNotList(List<Long> categoryIdNotList){
+        this.categoryIdNotList = categoryIdNotList;
+    }
+
+
+    /**
+    * 获取 规则名称
+    * @return categoryNameList
+    */
+    public List<String> getCategoryNameList(){
+        return this.categoryNameList;
+    }
+
+    /**
+    * 设置 规则名称
+    * @param categoryNameList
+    */
+    public void setCategoryNameList(List<String> categoryNameList){
+        this.categoryNameList = categoryNameList;
+    }
+
+    /**
+    * 获取 规则名称
+    * @return categoryNameNotList
+    */
+    public List<String> getCategoryNameNotList(){
+        return this.categoryNameNotList;
+    }
+
+    /**
+    * 设置 规则名称
+    * @param categoryNameNotList
+    */
+    public void setCategoryNameNotList(List<String> categoryNameNotList){
+        this.categoryNameNotList = categoryNameNotList;
+    }
+
     /**
     * 设置  序号，主键，自增长
     * @param id
@@ -2648,6 +2781,79 @@ public class CheckReviewRecordQuery extends CheckReviewRecordEntity {
 		return this;
     }
 
+    /**
+    * 设置  绩效规则分类id
+    * @param categoryId
+    */
+    public CheckReviewRecordQuery categoryId(Long categoryId){
+	    setCategoryId(categoryId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 绩效规则分类id
+    * @param categoryIdStart
+    */
+    public CheckReviewRecordQuery categoryIdStart(Long categoryIdStart){
+		this.categoryIdStart = categoryIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 绩效规则分类id
+    * @param categoryIdEnd
+    */
+    public CheckReviewRecordQuery categoryIdEnd(Long categoryIdEnd){
+		this.categoryIdEnd = categoryIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 绩效规则分类id
+    * @param categoryIdIncrement
+    */
+    public CheckReviewRecordQuery categoryIdIncrement(Long categoryIdIncrement){
+		this.categoryIdIncrement = categoryIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 绩效规则分类id
+    * @param categoryIdList
+    */
+    public CheckReviewRecordQuery categoryIdList(List<Long> categoryIdList){
+        this.categoryIdList = categoryIdList;
+		return this;
+        }
+
+        /**
+        * 设置 绩效规则分类id
+        * @param categoryIdNotList
+        */
+        public CheckReviewRecordQuery categoryIdNotList(List<Long> categoryIdNotList){
+        this.categoryIdNotList = categoryIdNotList;
+        return this;
+        }
+
+
+	/**
+    * 设置 规则名称
+    * @param categoryName
+    */
+    public CheckReviewRecordQuery categoryName(String categoryName){
+        setCategoryName(categoryName);
+		return this;
+    }
+
+    /**
+    * 设置 规则名称
+    * @param categoryNameList
+    */
+    public CheckReviewRecordQuery categoryNameList(List<String> categoryNameList){
+        this.categoryNameList = categoryNameList;
+		return this;
+    }
+
     /**
     * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
     * @return orConditionList

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/vo/CheckAttendRecordVo.java

@@ -11,7 +11,7 @@ import java.util.Date;
 * 考勤绩效记录核查信息视图对象
 *
 * @author zxfei
-* @date 2023-07-08
+* @date 2023-07-10
 */
 @Data
 public class CheckAttendRecordVo extends BaseEntityLong {

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/vo/CheckComplainRecordVo.java

@@ -11,7 +11,7 @@ import java.util.Date;
 * 评价绩效投诉核查信息视图对象
 *
 * @author zxfei
-* @date 2023-07-08
+* @date 2023-07-10
 */
 @Data
 public class CheckComplainRecordVo extends BaseEntityLong {

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/vo/CheckEffectRecordVo.java

@@ -11,7 +11,7 @@ import java.util.Date;
 * 效能绩效核查信息视图对象
 *
 * @author zxfei
-* @date 2023-07-08
+* @date 2023-07-10
 */
 @Data
 public class CheckEffectRecordVo extends BaseEntityLong {

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/vo/CheckGoworkRecordVo.java

@@ -11,7 +11,7 @@ import java.util.Date;
 * 办件绩效核查信息视图对象
 *
 * @author zxfei
-* @date 2023-07-08
+* @date 2023-07-10
 */
 @Data
 public class CheckGoworkRecordVo extends BaseEntityLong {

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/vo/CheckOtherRecordVo.java

@@ -11,7 +11,7 @@ import java.util.Date;
 * 其它绩效核查信息视图对象
 *
 * @author zxfei
-* @date 2023-07-08
+* @date 2023-07-10
 */
 @Data
 public class CheckOtherRecordVo extends BaseEntityLong {

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/model/vo/CheckReviewRecordVo.java

@@ -11,7 +11,7 @@ import java.util.Date;
 * 评价差评绩效核查信息视图对象
 *
 * @author zxfei
-* @date 2023-07-08
+* @date 2023-07-10
 */
 @Data
 public class CheckReviewRecordVo extends BaseEntityLong {

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/CheckAttendRecordService.java

 package com.mortals.xhx.module.check.service;
-import com.mortals.framework.exception.AppException;
-import com.mortals.framework.model.Context;
 import com.mortals.framework.service.ICRUDService;
 import com.mortals.xhx.module.check.model.CheckAttendRecordEntity;
 import com.mortals.xhx.module.check.dao.CheckAttendRecordDao;
@@ -10,17 +8,9 @@ import com.mortals.xhx.module.check.dao.CheckAttendRecordDao;
 * 考勤绩效记录核查信息 service接口
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-10
 */
 public interface CheckAttendRecordService extends ICRUDService<CheckAttendRecordEntity,Long>{
 
     CheckAttendRecordDao getDao();
-
-    /**
-     * 核查人工审核
-     * @param entity
-     * @param context
-     * @throws AppException
-     */
-    void examine(CheckAttendRecordEntity entity, Context context) throws AppException;
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/CheckComplainRecordService.java

 package com.mortals.xhx.module.check.service;
-import com.mortals.framework.exception.AppException;
-import com.mortals.framework.model.Context;
 import com.mortals.framework.service.ICRUDService;
 import com.mortals.xhx.module.check.model.CheckComplainRecordEntity;
 import com.mortals.xhx.module.check.dao.CheckComplainRecordDao;
@@ -10,17 +8,9 @@ import com.mortals.xhx.module.check.dao.CheckComplainRecordDao;
 * 评价绩效投诉核查信息 service接口
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-10
 */
 public interface CheckComplainRecordService extends ICRUDService<CheckComplainRecordEntity,Long>{
 
     CheckComplainRecordDao getDao();
-
-    /**
-     * 核查人工审核
-     * @param entity
-     * @param context
-     * @throws AppException
-     */
-    void examine(CheckComplainRecordEntity entity, Context context) throws AppException;
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/CheckEffectRecordService.java

 package com.mortals.xhx.module.check.service;
-import com.mortals.framework.exception.AppException;
-import com.mortals.framework.model.Context;
 import com.mortals.framework.service.ICRUDService;
 import com.mortals.xhx.module.check.model.CheckEffectRecordEntity;
 import com.mortals.xhx.module.check.dao.CheckEffectRecordDao;
@@ -10,17 +8,9 @@ import com.mortals.xhx.module.check.dao.CheckEffectRecordDao;
 * 效能绩效核查信息 service接口
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-10
 */
 public interface CheckEffectRecordService extends ICRUDService<CheckEffectRecordEntity,Long>{
 
     CheckEffectRecordDao getDao();
-
-    /**
-     * 核查人工审核
-     * @param entity
-     * @param context
-     * @throws AppException
-     */
-    void examine(CheckEffectRecordEntity entity, Context context) throws AppException;
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/CheckGoworkRecordService.java

 package com.mortals.xhx.module.check.service;
-import com.mortals.framework.exception.AppException;
-import com.mortals.framework.model.Context;
 import com.mortals.framework.service.ICRUDService;
 import com.mortals.xhx.module.check.model.CheckGoworkRecordEntity;
 import com.mortals.xhx.module.check.dao.CheckGoworkRecordDao;
@@ -10,17 +8,9 @@ import com.mortals.xhx.module.check.dao.CheckGoworkRecordDao;
 * 办件绩效核查信息 service接口
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-10
 */
 public interface CheckGoworkRecordService extends ICRUDService<CheckGoworkRecordEntity,Long>{
 
     CheckGoworkRecordDao getDao();
-
-    /**
-     * 核查人工审核
-     * @param entity
-     * @param context
-     * @throws AppException
-     */
-    void examine(CheckGoworkRecordEntity entity, Context context) throws AppException;
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/CheckOtherRecordService.java

 package com.mortals.xhx.module.check.service;
-import com.mortals.framework.exception.AppException;
-import com.mortals.framework.model.Context;
 import com.mortals.framework.service.ICRUDService;
 import com.mortals.xhx.module.check.model.CheckOtherRecordEntity;
 import com.mortals.xhx.module.check.dao.CheckOtherRecordDao;
@@ -10,17 +8,9 @@ import com.mortals.xhx.module.check.dao.CheckOtherRecordDao;
 * 其它绩效核查信息 service接口
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-10
 */
 public interface CheckOtherRecordService extends ICRUDService<CheckOtherRecordEntity,Long>{
 
     CheckOtherRecordDao getDao();
-
-    /**
-     * 核查人工审核
-     * @param entity
-     * @param context
-     * @throws AppException
-     */
-    void examine(CheckOtherRecordEntity entity, Context context) throws AppException;
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/CheckReviewRecordService.java

 package com.mortals.xhx.module.check.service;
-import com.mortals.framework.exception.AppException;
-import com.mortals.framework.model.Context;
 import com.mortals.framework.service.ICRUDService;
 import com.mortals.xhx.module.check.model.CheckReviewRecordEntity;
 import com.mortals.xhx.module.check.dao.CheckReviewRecordDao;
@@ -10,17 +8,9 @@ import com.mortals.xhx.module.check.dao.CheckReviewRecordDao;
 * 评价差评绩效核查信息 service接口
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-10
 */
 public interface CheckReviewRecordService extends ICRUDService<CheckReviewRecordEntity,Long>{
 
     CheckReviewRecordDao getDao();
-
-    /**
-     * 核查人工审核
-     * @param entity
-     * @param context
-     * @throws AppException
-     */
-    void examine(CheckReviewRecordEntity entity, Context context) throws AppException;
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckAttendRecordServiceImpl.java

 package com.mortals.xhx.module.check.service.impl;
-import com.mortals.framework.service.IUser;
-import com.mortals.xhx.module.perform.service.PerformAttendRecordService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
 import com.mortals.framework.exception.AppException;
@@ -10,42 +7,15 @@ import com.mortals.xhx.module.check.dao.CheckAttendRecordDao;
 import com.mortals.xhx.module.check.model.CheckAttendRecordEntity;
 import com.mortals.xhx.module.check.service.CheckAttendRecordService;
 import lombok.extern.slf4j.Slf4j;
-
-import java.util.Date;
-
 /**
 * CheckAttendRecordService
 * 考勤绩效记录核查信息 service实现
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-10
 */
 @Service("checkAttendRecordService")
 @Slf4j
 public class CheckAttendRecordServiceImpl extends AbstractCRUDServiceImpl<CheckAttendRecordDao, CheckAttendRecordEntity, Long> implements CheckAttendRecordService {
     
-    @Autowired
-    private PerformAttendRecordService performAttendRecordService;
-
-    @Override
-    public void examine(CheckAttendRecordEntity entity, Context context) throws AppException {
-        if(entity.getId()==null){
-            throw new AppException("核查记录ID不能为空");
-        }
-        if (context != null && context.getUser()!=null) {
-            IUser user = context.getUser();
-            entity.setUpdateUserId(user.getId());
-            entity.setCheckPerson(user.getRealName());
-        }
-        entity.setCheckTime(new Date());
-        entity.setUpdateTime(entity.getCheckTime());
-        entity.setCheckStatus(2); //处理状态(1.未处理,2.已处理)
-        dao.update(entity);
-
-        try {
-            performAttendRecordService.updateProcessStatus(entity.getRecordId(),2);
-        }catch (Exception e){
-            log.error(e.getMessage());
-        }
-    }
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckComplainRecordServiceImpl.java

 package com.mortals.xhx.module.check.service.impl;
-import com.mortals.framework.service.IUser;
-import com.mortals.xhx.module.perform.service.PerformComplainRecordService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
 import com.mortals.framework.exception.AppException;
@@ -10,41 +7,15 @@ import com.mortals.xhx.module.check.dao.CheckComplainRecordDao;
 import com.mortals.xhx.module.check.model.CheckComplainRecordEntity;
 import com.mortals.xhx.module.check.service.CheckComplainRecordService;
 import lombok.extern.slf4j.Slf4j;
-
-import java.util.Date;
-
 /**
 * CheckComplainRecordService
 * 评价绩效投诉核查信息 service实现
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-10
 */
 @Service("checkComplainRecordService")
 @Slf4j
 public class CheckComplainRecordServiceImpl extends AbstractCRUDServiceImpl<CheckComplainRecordDao, CheckComplainRecordEntity, Long> implements CheckComplainRecordService {
     
-    @Autowired
-    private PerformComplainRecordService performComplainRecordService;
-
-    @Override
-    public void examine(CheckComplainRecordEntity entity, Context context) throws AppException {
-        if(entity.getId()==null){
-            throw new AppException("核查记录ID不能为空");
-        }
-        if (context != null && context.getUser()!=null) {
-            IUser user = context.getUser();
-            entity.setUpdateUserId(user.getId());
-            entity.setCheckPerson(user.getRealName());
-        }
-        entity.setCheckTime(new Date());
-        entity.setUpdateTime(entity.getCheckTime());
-        entity.setCheckStatus(2); //处理状态(1.未处理,2.已处理)
-        dao.update(entity);
-        try {
-            performComplainRecordService.updateProcessStatus(entity.getRecordId(),2);
-        }catch (Exception e){
-            log.error(e.getMessage());
-        }
-    }
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckEffectRecordServiceImpl.java

 package com.mortals.xhx.module.check.service.impl;
-import com.mortals.framework.service.IUser;
-import com.mortals.xhx.module.perform.service.PerformEffectRecordService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
 import com.mortals.framework.exception.AppException;
@@ -10,41 +7,15 @@ import com.mortals.xhx.module.check.dao.CheckEffectRecordDao;
 import com.mortals.xhx.module.check.model.CheckEffectRecordEntity;
 import com.mortals.xhx.module.check.service.CheckEffectRecordService;
 import lombok.extern.slf4j.Slf4j;
-
-import java.util.Date;
-
 /**
 * CheckEffectRecordService
 * 效能绩效核查信息 service实现
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-10
 */
 @Service("checkEffectRecordService")
 @Slf4j
 public class CheckEffectRecordServiceImpl extends AbstractCRUDServiceImpl<CheckEffectRecordDao, CheckEffectRecordEntity, Long> implements CheckEffectRecordService {
     
-    @Autowired
-    private PerformEffectRecordService performEffectRecordService;
-
-    @Override
-    public void examine(CheckEffectRecordEntity entity, Context context) throws AppException {
-        if(entity.getId()==null){
-            throw new AppException("核查记录ID不能为空");
-        }
-        if (context != null && context.getUser()!=null) {
-            IUser user = context.getUser();
-            entity.setUpdateUserId(user.getId());
-            entity.setCheckPerson(user.getRealName());
-        }
-        entity.setCheckTime(new Date());
-        entity.setUpdateTime(entity.getCheckTime());
-        entity.setCheckStatus(2); //处理状态(1.未处理,2.已处理)
-        dao.update(entity);
-        try {
-            performEffectRecordService.updateProcessStatus(entity.getRecordId(),2);
-        }catch (Exception e){
-            log.error(e.getMessage());
-        }
-    }
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckGoworkRecordServiceImpl.java

 package com.mortals.xhx.module.check.service.impl;
-import com.mortals.framework.service.IUser;
-import com.mortals.xhx.module.perform.service.PerformGoworkRecordService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
 import com.mortals.framework.exception.AppException;
@@ -10,41 +7,15 @@ import com.mortals.xhx.module.check.dao.CheckGoworkRecordDao;
 import com.mortals.xhx.module.check.model.CheckGoworkRecordEntity;
 import com.mortals.xhx.module.check.service.CheckGoworkRecordService;
 import lombok.extern.slf4j.Slf4j;
-
-import java.util.Date;
-
 /**
 * CheckGoworkRecordService
 * 办件绩效核查信息 service实现
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-10
 */
 @Service("checkGoworkRecordService")
 @Slf4j
 public class CheckGoworkRecordServiceImpl extends AbstractCRUDServiceImpl<CheckGoworkRecordDao, CheckGoworkRecordEntity, Long> implements CheckGoworkRecordService {
     
-    @Autowired
-    private PerformGoworkRecordService performGoworkRecordService;
-
-    @Override
-    public void examine(CheckGoworkRecordEntity entity, Context context) throws AppException {
-        if(entity.getId()==null){
-            throw new AppException("核查记录ID不能为空");
-        }
-        if (context != null && context.getUser()!=null) {
-            IUser user = context.getUser();
-            entity.setUpdateUserId(user.getId());
-            entity.setCheckPerson(user.getRealName());
-        }
-        entity.setCheckTime(new Date());
-        entity.setUpdateTime(entity.getCheckTime());
-        entity.setCheckStatus(2); //处理状态(1.未处理,2.已处理)
-        dao.update(entity);
-        try {
-            performGoworkRecordService.updateProcessStatus(entity.getRecordId(),2);
-        }catch (Exception e){
-            log.error(e.getMessage());
-        }
-    }
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckOtherRecordServiceImpl.java

 package com.mortals.xhx.module.check.service.impl;
-import com.mortals.framework.service.IUser;
-import com.mortals.xhx.module.perform.service.PerformOtherRecordService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
 import com.mortals.framework.exception.AppException;
@@ -10,41 +7,15 @@ import com.mortals.xhx.module.check.dao.CheckOtherRecordDao;
 import com.mortals.xhx.module.check.model.CheckOtherRecordEntity;
 import com.mortals.xhx.module.check.service.CheckOtherRecordService;
 import lombok.extern.slf4j.Slf4j;
-
-import java.util.Date;
-
 /**
 * CheckOtherRecordService
 * 其它绩效核查信息 service实现
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-10
 */
 @Service("checkOtherRecordService")
 @Slf4j
 public class CheckOtherRecordServiceImpl extends AbstractCRUDServiceImpl<CheckOtherRecordDao, CheckOtherRecordEntity, Long> implements CheckOtherRecordService {
     
-    @Autowired
-    private PerformOtherRecordService performOtherRecordService;
-
-    @Override
-    public void examine(CheckOtherRecordEntity entity, Context context) throws AppException {
-        if(entity.getId()==null){
-            throw new AppException("核查记录ID不能为空");
-        }
-        if (context != null && context.getUser()!=null) {
-            IUser user = context.getUser();
-            entity.setUpdateUserId(user.getId());
-            entity.setCheckPerson(user.getRealName());
-        }
-        entity.setCheckTime(new Date());
-        entity.setUpdateTime(entity.getCheckTime());
-        entity.setCheckStatus(2); //处理状态(1.未处理,2.已处理)
-        dao.update(entity);
-        try {
-            performOtherRecordService.updateProcessStatus(entity.getRecordId(),2);
-        }catch (Exception e){
-            log.error(e.getMessage());
-        }
-    }
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckReviewRecordServiceImpl.java

 package com.mortals.xhx.module.check.service.impl;
-import com.mortals.framework.service.IUser;
-import com.mortals.xhx.module.perform.service.PerformReviewRecordService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
 import com.mortals.framework.exception.AppException;
@@ -10,41 +7,15 @@ import com.mortals.xhx.module.check.dao.CheckReviewRecordDao;
 import com.mortals.xhx.module.check.model.CheckReviewRecordEntity;
 import com.mortals.xhx.module.check.service.CheckReviewRecordService;
 import lombok.extern.slf4j.Slf4j;
-
-import java.util.Date;
-
 /**
 * CheckReviewRecordService
 * 评价差评绩效核查信息 service实现
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-10
 */
 @Service("checkReviewRecordService")
 @Slf4j
 public class CheckReviewRecordServiceImpl extends AbstractCRUDServiceImpl<CheckReviewRecordDao, CheckReviewRecordEntity, Long> implements CheckReviewRecordService {
     
-    @Autowired
-    private PerformReviewRecordService performReviewRecordService;
-
-    @Override
-    public void examine(CheckReviewRecordEntity entity, Context context) throws AppException {
-        if(entity.getId()==null){
-            throw new AppException("核查记录ID不能为空");
-        }
-        if (context != null && context.getUser()!=null) {
-            IUser user = context.getUser();
-            entity.setUpdateUserId(user.getId());
-            entity.setCheckPerson(user.getRealName());
-        }
-        entity.setCheckTime(new Date());
-        entity.setUpdateTime(entity.getCheckTime());
-        entity.setCheckStatus(2); //处理状态(1.未处理,2.已处理)
-        dao.update(entity);
-        try {
-            performReviewRecordService.updateProcessStatus(entity.getRecordId(),2);
-        }catch (Exception e){
-            log.error(e.getMessage());
-        }
-    }
 }
\ No newline at end of file

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

 package com.mortals.xhx.module.check.web;
-import com.mortals.framework.annotation.RepeatSubmit;
-import com.mortals.framework.model.BaseEntity;
-import com.mortals.framework.service.IUser;
-import com.mortals.framework.utils.BeanUtil;
-import com.mortals.framework.utils.ReflectUtils;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -19,10 +13,12 @@ import com.mortals.xhx.module.check.model.CheckAttendRecordEntity;
 import com.mortals.xhx.module.check.service.CheckAttendRecordService;
 import org.apache.commons.lang3.ArrayUtils;
 import com.mortals.framework.util.StringUtils;
-
-import java.util.*;
+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.*;
@@ -31,7 +27,7 @@ import static com.mortals.framework.ap.SysConstains.*;
 * 考勤绩效记录核查信息
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-10
 */
 @RestController
 @RequestMapping("check/attend/record")
@@ -52,36 +48,5 @@ public class CheckAttendRecordController extends BaseCRUDJsonBodyMappingControll
         super.init(model, context);
     }
 
-    /**
-     * 审核
-     * @param entity
-     * @return
-     */
-    @PostMapping({"examine"})
-    public String examine(@RequestBody CheckAttendRecordEntity entity) {
-        Map<String, Object> model = new HashMap();
-        Context context = this.getContext();
-        int code = 1;
-        String busiDesc = "考勤绩效核查审核";
-        try {
-            this.service.examine(entity, context);
-            model.put("id", entity.getId());
-            model.put("entity", entity);
-            model.put("message_info", busiDesc + "成功");
-            this.recordSysLog(this.request, busiDesc + " 【成功】 [id:" + entity.getId() + "]");
-        } catch (Exception var9) {
-            this.doException(this.request, busiDesc, model, var9);
-            model.put("entity", entity);
-            this.init(model, context);
-            code = this.saveException(entity, model, context, var9);
-        }
-
-        this.init(model, context);
-        JSONObject ret = new JSONObject();
-        ret.put("code", code);
-        ret.put("msg", model.remove("message_info"));
-        ret.put("data", model);
-        return ret.toJSONString();
-    }
 
 }
\ No newline at end of file

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

@@ -27,7 +27,7 @@ import static com.mortals.framework.ap.SysConstains.*;
 * 评价绩效投诉核查信息
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-10
 */
 @RestController
 @RequestMapping("check/complain/record")
@@ -48,35 +48,4 @@ public class CheckComplainRecordController extends BaseCRUDJsonBodyMappingContro
     }
 
 
-    /**
-     * 审核
-     * @param entity
-     * @return
-     */
-    @PostMapping({"examine"})
-    public String examine(@RequestBody CheckComplainRecordEntity entity) {
-        Map<String, Object> model = new HashMap();
-        Context context = this.getContext();
-        int code = 1;
-        String busiDesc = "考勤绩效核查审核";
-        try {
-            this.service.examine(entity, context);
-            model.put("id", entity.getId());
-            model.put("entity", entity);
-            model.put("message_info", busiDesc + "成功");
-            this.recordSysLog(this.request, busiDesc + " 【成功】 [id:" + entity.getId() + "]");
-        } catch (Exception var9) {
-            this.doException(this.request, busiDesc, model, var9);
-            model.put("entity", entity);
-            this.init(model, context);
-            code = this.saveException(entity, model, context, var9);
-        }
-
-        this.init(model, context);
-        JSONObject ret = new JSONObject();
-        ret.put("code", code);
-        ret.put("msg", model.remove("message_info"));
-        ret.put("data", model);
-        return ret.toJSONString();
-    }
 }
\ No newline at end of file

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

@@ -27,7 +27,7 @@ import static com.mortals.framework.ap.SysConstains.*;
 * 效能绩效核查信息
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-10
 */
 @RestController
 @RequestMapping("check/effect/record")
@@ -47,36 +47,6 @@ public class CheckEffectRecordController extends BaseCRUDJsonBodyMappingControll
         this.addDict(model, "checkStatus", paramService.getParamBySecondOrganize("CheckEffectRecord","checkStatus"));
         super.init(model, context);
     }
-    /**
-     * 审核
-     * @param entity
-     * @return
-     */
-    @PostMapping({"examine"})
-    public String examine(@RequestBody CheckEffectRecordEntity entity) {
-        Map<String, Object> model = new HashMap();
-        Context context = this.getContext();
-        int code = 1;
-        String busiDesc = "考勤绩效核查审核";
-        try {
-            this.service.examine(entity, context);
-            model.put("id", entity.getId());
-            model.put("entity", entity);
-            model.put("message_info", busiDesc + "成功");
-            this.recordSysLog(this.request, busiDesc + " 【成功】 [id:" + entity.getId() + "]");
-        } catch (Exception var9) {
-            this.doException(this.request, busiDesc, model, var9);
-            model.put("entity", entity);
-            this.init(model, context);
-            code = this.saveException(entity, model, context, var9);
-        }
 
-        this.init(model, context);
-        JSONObject ret = new JSONObject();
-        ret.put("code", code);
-        ret.put("msg", model.remove("message_info"));
-        ret.put("data", model);
-        return ret.toJSONString();
-    }
 
 }
\ No newline at end of file

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

@@ -27,7 +27,7 @@ import static com.mortals.framework.ap.SysConstains.*;
 * 办件绩效核查信息
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-10
 */
 @RestController
 @RequestMapping("check/gowork/record")
@@ -47,35 +47,5 @@ public class CheckGoworkRecordController extends BaseCRUDJsonBodyMappingControll
         super.init(model, context);
     }
 
-    /**
-     * 审核
-     * @param entity
-     * @return
-     */
-    @PostMapping({"examine"})
-    public String examine(@RequestBody CheckGoworkRecordEntity entity) {
-        Map<String, Object> model = new HashMap();
-        Context context = this.getContext();
-        int code = 1;
-        String busiDesc = "考勤绩效核查审核";
-        try {
-            this.service.examine(entity, context);
-            model.put("id", entity.getId());
-            model.put("entity", entity);
-            model.put("message_info", busiDesc + "成功");
-            this.recordSysLog(this.request, busiDesc + " 【成功】 [id:" + entity.getId() + "]");
-        } catch (Exception var9) {
-            this.doException(this.request, busiDesc, model, var9);
-            model.put("entity", entity);
-            this.init(model, context);
-            code = this.saveException(entity, model, context, var9);
-        }
 
-        this.init(model, context);
-        JSONObject ret = new JSONObject();
-        ret.put("code", code);
-        ret.put("msg", model.remove("message_info"));
-        ret.put("data", model);
-        return ret.toJSONString();
-    }
 }
\ No newline at end of file

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

@@ -27,7 +27,7 @@ import static com.mortals.framework.ap.SysConstains.*;
 * 其它绩效核查信息
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-10
 */
 @RestController
 @RequestMapping("check/other/record")
@@ -47,36 +47,6 @@ public class CheckOtherRecordController extends BaseCRUDJsonBodyMappingControlle
         this.addDict(model, "checkStatus", paramService.getParamBySecondOrganize("CheckOtherRecord","checkStatus"));
         super.init(model, context);
     }
-    /**
-     * 审核
-     * @param entity
-     * @return
-     */
-    @PostMapping({"examine"})
-    public String examine(@RequestBody CheckOtherRecordEntity entity) {
-        Map<String, Object> model = new HashMap();
-        Context context = this.getContext();
-        int code = 1;
-        String busiDesc = "考勤绩效核查审核";
-        try {
-            this.service.examine(entity, context);
-            model.put("id", entity.getId());
-            model.put("entity", entity);
-            model.put("message_info", busiDesc + "成功");
-            this.recordSysLog(this.request, busiDesc + " 【成功】 [id:" + entity.getId() + "]");
-        } catch (Exception var9) {
-            this.doException(this.request, busiDesc, model, var9);
-            model.put("entity", entity);
-            this.init(model, context);
-            code = this.saveException(entity, model, context, var9);
-        }
 
-        this.init(model, context);
-        JSONObject ret = new JSONObject();
-        ret.put("code", code);
-        ret.put("msg", model.remove("message_info"));
-        ret.put("data", model);
-        return ret.toJSONString();
-    }
 
 }
\ No newline at end of file

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

@@ -27,7 +27,7 @@ import static com.mortals.framework.ap.SysConstains.*;
 * 评价差评绩效核查信息
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-10
 */
 @RestController
 @RequestMapping("check/review/record")
@@ -49,36 +49,5 @@ public class CheckReviewRecordController extends BaseCRUDJsonBodyMappingControll
         super.init(model, context);
     }
 
-    /**
-     * 审核
-     * @param entity
-     * @return
-     */
-    @PostMapping({"examine"})
-    public String examine(@RequestBody CheckReviewRecordEntity entity) {
-        Map<String, Object> model = new HashMap();
-        Context context = this.getContext();
-        int code = 1;
-        String busiDesc = "考勤绩效核查审核";
-        try {
-            this.service.examine(entity, context);
-            model.put("id", entity.getId());
-            model.put("entity", entity);
-            model.put("message_info", busiDesc + "成功");
-            this.recordSysLog(this.request, busiDesc + " 【成功】 [id:" + entity.getId() + "]");
-        } catch (Exception var9) {
-            this.doException(this.request, busiDesc, model, var9);
-            model.put("entity", entity);
-            this.init(model, context);
-            code = this.saveException(entity, model, context, var9);
-        }
-
-        this.init(model, context);
-        JSONObject ret = new JSONObject();
-        ret.put("code", code);
-        ret.put("msg", model.remove("message_info"));
-        ret.put("data", model);
-        return ret.toJSONString();
-    }
 
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/feedback/model/FeedbackEntity.java

@@ -13,7 +13,7 @@ import lombok.Data;
  * 绩效反馈记录信息实体对象
  *
  * @author zxfei
- * @date 2023-07-07
+ * @date 2023-07-10
  */
 @Data
 public class FeedbackEntity extends FeedbackVo {
@@ -59,6 +59,10 @@ public class FeedbackEntity extends FeedbackVo {
      * 表单内容
      */
     private String formContent;
+    /**
+     * 规则内容
+     */
+    private String ruleContent;
     /**
      * 绩效反馈问题信息
      */
@@ -107,5 +111,7 @@ public class FeedbackEntity extends FeedbackVo {
         this.remark = "";
 
         this.formContent = "";
+
+        this.ruleContent = "";
     }
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/feedback/model/FeedbackQuery.java

@@ -8,7 +8,7 @@ import com.mortals.xhx.module.feedback.model.FeedbackEntity;
  * 绩效反馈记录信息查询对象
  *
  * @author zxfei
- * @date 2023-07-07
+ * @date 2023-07-10
  */
 public class FeedbackQuery extends FeedbackEntity {
     /** 开始 序号，主键，自增长 */
@@ -160,6 +160,11 @@ public class FeedbackQuery extends FeedbackEntity {
 
     /** 表单内容排除列表 */
     private List <String> formContentNotList;
+    /** 规则内容 */
+    private List<String> ruleContentList;
+
+    /** 规则内容排除列表 */
+    private List <String> ruleContentNotList;
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<FeedbackQuery> orConditionList;
 
@@ -991,6 +996,38 @@ public class FeedbackQuery extends FeedbackEntity {
         this.formContentNotList = formContentNotList;
     }
 
+    /**
+     * 获取 规则内容
+     * @return ruleContentList
+     */
+    public List<String> getRuleContentList(){
+        return this.ruleContentList;
+    }
+
+    /**
+     * 设置 规则内容
+     * @param ruleContentList
+     */
+    public void setRuleContentList(List<String> ruleContentList){
+        this.ruleContentList = ruleContentList;
+    }
+
+    /**
+     * 获取 规则内容
+     * @return ruleContentNotList
+     */
+    public List<String> getRuleContentNotList(){
+        return this.ruleContentNotList;
+    }
+
+    /**
+     * 设置 规则内容
+     * @param ruleContentNotList
+     */
+    public void setRuleContentNotList(List<String> ruleContentNotList){
+        this.ruleContentNotList = ruleContentNotList;
+    }
+
     /**
      * 设置  序号，主键，自增长
      * @param id
@@ -1430,6 +1467,7 @@ public class FeedbackQuery extends FeedbackEntity {
     }
 
 
+
     /**
      * 设置 表单内容
      * @param formContent
@@ -1448,6 +1486,25 @@ public class FeedbackQuery extends FeedbackEntity {
         return this;
     }
 
+
+    /**
+     * 设置 规则内容
+     * @param ruleContent
+     */
+    public FeedbackQuery ruleContent(String ruleContent){
+        setRuleContent(ruleContent);
+        return this;
+    }
+
+    /**
+     * 设置 规则内容
+     * @param ruleContentList
+     */
+    public FeedbackQuery ruleContentList(List<String> ruleContentList){
+        this.ruleContentList = ruleContentList;
+        return this;
+    }
+
     /**
      * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
      * @return orConditionList

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/dao/PerformAttendRecordDao.java

@@ -8,7 +8,7 @@ import java.util.List;
 * 考勤绩效记录信息 DAO接口
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-10
 */
 
 public interface  PerformAttendRecordDao extends ICRUDDao<PerformAttendRecordEntity,Long>{

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/dao/PerformComplainRecordDao.java

@@ -8,7 +8,7 @@ import java.util.List;
 * 评价绩效投诉记录信息 DAO接口
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-10
 */
 
 public interface  PerformComplainRecordDao extends ICRUDDao<PerformComplainRecordEntity,Long>{

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/dao/PerformEffectRecordDao.java

@@ -8,7 +8,7 @@ import java.util.List;
 * 效能绩效记录信息 DAO接口
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-10
 */
 
 public interface  PerformEffectRecordDao extends ICRUDDao<PerformEffectRecordEntity,Long>{

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/dao/PerformGoworkRecordDao.java

@@ -8,7 +8,7 @@ import java.util.List;
 * 办件绩效记录信息 DAO接口
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-10
 */
 
 public interface  PerformGoworkRecordDao extends ICRUDDao<PerformGoworkRecordEntity,Long>{

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/dao/PerformOtherRecordDao.java

@@ -8,7 +8,7 @@ import java.util.List;
 * 其它绩效记录信息 DAO接口
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-10
 */
 
 public interface  PerformOtherRecordDao extends ICRUDDao<PerformOtherRecordEntity,Long>{

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/dao/PerformReviewRecordDao.java

@@ -8,7 +8,7 @@ import java.util.List;
 * 评价差评绩效记录信息 DAO接口
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-10
 */
 
 public interface  PerformReviewRecordDao extends ICRUDDao<PerformReviewRecordEntity,Long>{

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/dao/ibatis/PerformAttendRecordDaoImpl.java

@@ -11,7 +11,7 @@ import java.util.List;
 * 考勤绩效记录信息DaoImpl DAO接口
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-10
 */
 @Repository("performAttendRecordDao")
 public class PerformAttendRecordDaoImpl extends BaseCRUDDaoMybatis<PerformAttendRecordEntity,Long> implements PerformAttendRecordDao {

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/dao/ibatis/PerformComplainRecordDaoImpl.java

@@ -11,7 +11,7 @@ import java.util.List;
 * 评价绩效投诉记录信息DaoImpl DAO接口
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-10
 */
 @Repository("performComplainRecordDao")
 public class PerformComplainRecordDaoImpl extends BaseCRUDDaoMybatis<PerformComplainRecordEntity,Long> implements PerformComplainRecordDao {

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/dao/ibatis/PerformEffectRecordDaoImpl.java

@@ -11,7 +11,7 @@ import java.util.List;
 * 效能绩效记录信息DaoImpl DAO接口
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-10
 */
 @Repository("performEffectRecordDao")
 public class PerformEffectRecordDaoImpl extends BaseCRUDDaoMybatis<PerformEffectRecordEntity,Long> implements PerformEffectRecordDao {

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/dao/ibatis/PerformGoworkRecordDaoImpl.java

@@ -11,7 +11,7 @@ import java.util.List;
 * 办件绩效记录信息DaoImpl DAO接口
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-10
 */
 @Repository("performGoworkRecordDao")
 public class PerformGoworkRecordDaoImpl extends BaseCRUDDaoMybatis<PerformGoworkRecordEntity,Long> implements PerformGoworkRecordDao {

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/dao/ibatis/PerformOtherRecordDaoImpl.java

@@ -11,7 +11,7 @@ import java.util.List;
 * 其它绩效记录信息DaoImpl DAO接口
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-10
 */
 @Repository("performOtherRecordDao")
 public class PerformOtherRecordDaoImpl extends BaseCRUDDaoMybatis<PerformOtherRecordEntity,Long> implements PerformOtherRecordDao {

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/dao/ibatis/PerformReviewRecordDaoImpl.java

@@ -11,7 +11,7 @@ import java.util.List;
 * 评价差评绩效记录信息DaoImpl DAO接口
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-10
 */
 @Repository("performReviewRecordDao")
 public class PerformReviewRecordDaoImpl extends BaseCRUDDaoMybatis<PerformReviewRecordEntity,Long> implements PerformReviewRecordDao {

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

@@ -12,7 +12,7 @@ import lombok.Data;
 * 考勤绩效记录信息实体对象
 *
 * @author zxfei
-* @date 2023-07-08
+* @date 2023-07-10
 */
 @Data
 public class PerformAttendRecordEntity extends PerformAttendRecordVo {
@@ -113,6 +113,14 @@ public class PerformAttendRecordEntity extends PerformAttendRecordVo {
     */
     @Excel(name = "附件下载地址，多个逗号分割")
     private String filePaths;
+    /**
+    * 绩效规则分类id
+    */
+    private Long categoryId;
+    /**
+    * 规则名称
+    */
+    private String categoryName;
     @Override
     public int hashCode() {
          return this.getId().hashCode();
@@ -176,5 +184,9 @@ public class PerformAttendRecordEntity extends PerformAttendRecordVo {
             this.fileNames = "";
 
             this.filePaths = "";
+
+            this.categoryId = -1L;
+
+            this.categoryName = "";
     }
 }
\ No newline at end of file

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

@@ -8,7 +8,7 @@ import com.mortals.xhx.module.perform.model.PerformAttendRecordEntity;
 * 考勤绩效记录信息查询对象
 *
 * @author zxfei
-* @date 2023-07-08
+* @date 2023-07-10
 */
 public class PerformAttendRecordQuery extends PerformAttendRecordEntity {
     /** 开始 序号，主键，自增长 */
@@ -267,6 +267,26 @@ public class PerformAttendRecordQuery extends PerformAttendRecordEntity {
 
     /** 附件下载地址，多个逗号分割排除列表 */
     private List <String> filePathsNotList;
+    /** 开始 绩效规则分类id */
+    private Long categoryIdStart;
+
+    /** 结束 绩效规则分类id */
+    private Long categoryIdEnd;
+
+    /** 增加 绩效规则分类id */
+    private Long categoryIdIncrement;
+
+    /** 绩效规则分类id列表 */
+    private List <Long> categoryIdList;
+
+    /** 绩效规则分类id排除列表 */
+    private List <Long> categoryIdNotList;
+
+    /** 规则名称 */
+    private List<String> categoryNameList;
+
+    /** 规则名称排除列表 */
+    private List <String> categoryNameNotList;
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<PerformAttendRecordQuery> orConditionList;
 
@@ -1710,6 +1730,119 @@ public class PerformAttendRecordQuery extends PerformAttendRecordEntity {
         this.filePathsNotList = filePathsNotList;
     }
 
+    /**
+    * 获取 开始 绩效规则分类id
+    * @return categoryIdStart
+    */
+    public Long getCategoryIdStart(){
+        return this.categoryIdStart;
+    }
+
+    /**
+    * 设置 开始 绩效规则分类id
+    * @param categoryIdStart
+    */
+    public void setCategoryIdStart(Long categoryIdStart){
+        this.categoryIdStart = categoryIdStart;
+    }
+
+    /**
+    * 获取 结束 绩效规则分类id
+    * @return $categoryIdEnd
+    */
+    public Long getCategoryIdEnd(){
+        return this.categoryIdEnd;
+    }
+
+    /**
+    * 设置 结束 绩效规则分类id
+    * @param categoryIdEnd
+    */
+    public void setCategoryIdEnd(Long categoryIdEnd){
+        this.categoryIdEnd = categoryIdEnd;
+    }
+
+    /**
+    * 获取 增加 绩效规则分类id
+    * @return categoryIdIncrement
+    */
+    public Long getCategoryIdIncrement(){
+        return this.categoryIdIncrement;
+    }
+
+    /**
+    * 设置 增加 绩效规则分类id
+    * @param categoryIdIncrement
+    */
+    public void setCategoryIdIncrement(Long categoryIdIncrement){
+        this.categoryIdIncrement = categoryIdIncrement;
+    }
+
+    /**
+    * 获取 绩效规则分类id
+    * @return categoryIdList
+    */
+    public List<Long> getCategoryIdList(){
+        return this.categoryIdList;
+    }
+
+    /**
+    * 设置 绩效规则分类id
+    * @param categoryIdList
+    */
+    public void setCategoryIdList(List<Long> categoryIdList){
+        this.categoryIdList = categoryIdList;
+    }
+
+    /**
+    * 获取 绩效规则分类id
+    * @return categoryIdNotList
+    */
+    public List<Long> getCategoryIdNotList(){
+        return this.categoryIdNotList;
+    }
+
+    /**
+    * 设置 绩效规则分类id
+    * @param categoryIdNotList
+    */
+    public void setCategoryIdNotList(List<Long> categoryIdNotList){
+        this.categoryIdNotList = categoryIdNotList;
+    }
+
+
+    /**
+    * 获取 规则名称
+    * @return categoryNameList
+    */
+    public List<String> getCategoryNameList(){
+        return this.categoryNameList;
+    }
+
+    /**
+    * 设置 规则名称
+    * @param categoryNameList
+    */
+    public void setCategoryNameList(List<String> categoryNameList){
+        this.categoryNameList = categoryNameList;
+    }
+
+    /**
+    * 获取 规则名称
+    * @return categoryNameNotList
+    */
+    public List<String> getCategoryNameNotList(){
+        return this.categoryNameNotList;
+    }
+
+    /**
+    * 设置 规则名称
+    * @param categoryNameNotList
+    */
+    public void setCategoryNameNotList(List<String> categoryNameNotList){
+        this.categoryNameNotList = categoryNameNotList;
+    }
+
     /**
     * 设置  序号，主键，自增长
     * @param id
@@ -2519,6 +2652,79 @@ public class PerformAttendRecordQuery extends PerformAttendRecordEntity {
 		return this;
     }
 
+    /**
+    * 设置  绩效规则分类id
+    * @param categoryId
+    */
+    public PerformAttendRecordQuery categoryId(Long categoryId){
+	    setCategoryId(categoryId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 绩效规则分类id
+    * @param categoryIdStart
+    */
+    public PerformAttendRecordQuery categoryIdStart(Long categoryIdStart){
+		this.categoryIdStart = categoryIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 绩效规则分类id
+    * @param categoryIdEnd
+    */
+    public PerformAttendRecordQuery categoryIdEnd(Long categoryIdEnd){
+		this.categoryIdEnd = categoryIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 绩效规则分类id
+    * @param categoryIdIncrement
+    */
+    public PerformAttendRecordQuery categoryIdIncrement(Long categoryIdIncrement){
+		this.categoryIdIncrement = categoryIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 绩效规则分类id
+    * @param categoryIdList
+    */
+    public PerformAttendRecordQuery categoryIdList(List<Long> categoryIdList){
+        this.categoryIdList = categoryIdList;
+		return this;
+        }
+
+        /**
+        * 设置 绩效规则分类id
+        * @param categoryIdNotList
+        */
+        public PerformAttendRecordQuery categoryIdNotList(List<Long> categoryIdNotList){
+        this.categoryIdNotList = categoryIdNotList;
+        return this;
+        }
+
+
+	/**
+    * 设置 规则名称
+    * @param categoryName
+    */
+    public PerformAttendRecordQuery categoryName(String categoryName){
+        setCategoryName(categoryName);
+		return this;
+    }
+
+    /**
+    * 设置 规则名称
+    * @param categoryNameList
+    */
+    public PerformAttendRecordQuery categoryNameList(List<String> categoryNameList){
+        this.categoryNameList = categoryNameList;
+		return this;
+    }
+
     /**
     * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
     * @return orConditionList

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

@@ -12,7 +12,7 @@ import lombok.Data;
 * 评价绩效投诉记录信息实体对象
 *
 * @author zxfei
-* @date 2023-07-08
+* @date 2023-07-10
 */
 @Data
 public class PerformComplainRecordEntity extends PerformComplainRecordVo {
@@ -121,6 +121,14 @@ public class PerformComplainRecordEntity extends PerformComplainRecordVo {
     */
     @Excel(name = "附件下载地址，多个逗号分割")
     private String filePaths;
+    /**
+    * 绩效规则分类id
+    */
+    private Long categoryId;
+    /**
+    * 规则名称
+    */
+    private String categoryName;
     @Override
     public int hashCode() {
          return this.getId().hashCode();
@@ -184,5 +192,9 @@ public class PerformComplainRecordEntity extends PerformComplainRecordVo {
             this.fileNames = "";
 
             this.filePaths = "";
+
+            this.categoryId = -1L;
+
+            this.categoryName = "";
     }
 }
\ No newline at end of file

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

@@ -8,7 +8,7 @@ import com.mortals.xhx.module.perform.model.PerformComplainRecordEntity;
 * 评价绩效投诉记录信息查询对象
 *
 * @author zxfei
-* @date 2023-07-08
+* @date 2023-07-10
 */
 public class PerformComplainRecordQuery extends PerformComplainRecordEntity {
     /** 开始 序号，主键，自增长 */
@@ -245,6 +245,26 @@ public class PerformComplainRecordQuery extends PerformComplainRecordEntity {
 
     /** 附件下载地址，多个逗号分割排除列表 */
     private List <String> filePathsNotList;
+    /** 开始 绩效规则分类id */
+    private Long categoryIdStart;
+
+    /** 结束 绩效规则分类id */
+    private Long categoryIdEnd;
+
+    /** 增加 绩效规则分类id */
+    private Long categoryIdIncrement;
+
+    /** 绩效规则分类id列表 */
+    private List <Long> categoryIdList;
+
+    /** 绩效规则分类id排除列表 */
+    private List <Long> categoryIdNotList;
+
+    /** 规则名称 */
+    private List<String> categoryNameList;
+
+    /** 规则名称排除列表 */
+    private List <String> categoryNameNotList;
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<PerformComplainRecordQuery> orConditionList;
 
@@ -1590,6 +1610,119 @@ public class PerformComplainRecordQuery extends PerformComplainRecordEntity {
         this.filePathsNotList = filePathsNotList;
     }
 
+    /**
+    * 获取 开始 绩效规则分类id
+    * @return categoryIdStart
+    */
+    public Long getCategoryIdStart(){
+        return this.categoryIdStart;
+    }
+
+    /**
+    * 设置 开始 绩效规则分类id
+    * @param categoryIdStart
+    */
+    public void setCategoryIdStart(Long categoryIdStart){
+        this.categoryIdStart = categoryIdStart;
+    }
+
+    /**
+    * 获取 结束 绩效规则分类id
+    * @return $categoryIdEnd
+    */
+    public Long getCategoryIdEnd(){
+        return this.categoryIdEnd;
+    }
+
+    /**
+    * 设置 结束 绩效规则分类id
+    * @param categoryIdEnd
+    */
+    public void setCategoryIdEnd(Long categoryIdEnd){
+        this.categoryIdEnd = categoryIdEnd;
+    }
+
+    /**
+    * 获取 增加 绩效规则分类id
+    * @return categoryIdIncrement
+    */
+    public Long getCategoryIdIncrement(){
+        return this.categoryIdIncrement;
+    }
+
+    /**
+    * 设置 增加 绩效规则分类id
+    * @param categoryIdIncrement
+    */
+    public void setCategoryIdIncrement(Long categoryIdIncrement){
+        this.categoryIdIncrement = categoryIdIncrement;
+    }
+
+    /**
+    * 获取 绩效规则分类id
+    * @return categoryIdList
+    */
+    public List<Long> getCategoryIdList(){
+        return this.categoryIdList;
+    }
+
+    /**
+    * 设置 绩效规则分类id
+    * @param categoryIdList
+    */
+    public void setCategoryIdList(List<Long> categoryIdList){
+        this.categoryIdList = categoryIdList;
+    }
+
+    /**
+    * 获取 绩效规则分类id
+    * @return categoryIdNotList
+    */
+    public List<Long> getCategoryIdNotList(){
+        return this.categoryIdNotList;
+    }
+
+    /**
+    * 设置 绩效规则分类id
+    * @param categoryIdNotList
+    */
+    public void setCategoryIdNotList(List<Long> categoryIdNotList){
+        this.categoryIdNotList = categoryIdNotList;
+    }
+
+
+    /**
+    * 获取 规则名称
+    * @return categoryNameList
+    */
+    public List<String> getCategoryNameList(){
+        return this.categoryNameList;
+    }
+
+    /**
+    * 设置 规则名称
+    * @param categoryNameList
+    */
+    public void setCategoryNameList(List<String> categoryNameList){
+        this.categoryNameList = categoryNameList;
+    }
+
+    /**
+    * 获取 规则名称
+    * @return categoryNameNotList
+    */
+    public List<String> getCategoryNameNotList(){
+        return this.categoryNameNotList;
+    }
+
+    /**
+    * 设置 规则名称
+    * @param categoryNameNotList
+    */
+    public void setCategoryNameNotList(List<String> categoryNameNotList){
+        this.categoryNameNotList = categoryNameNotList;
+    }
+
     /**
     * 设置  序号，主键，自增长
     * @param id
@@ -2365,6 +2498,79 @@ public class PerformComplainRecordQuery extends PerformComplainRecordEntity {
 		return this;
     }
 
+    /**
+    * 设置  绩效规则分类id
+    * @param categoryId
+    */
+    public PerformComplainRecordQuery categoryId(Long categoryId){
+	    setCategoryId(categoryId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 绩效规则分类id
+    * @param categoryIdStart
+    */
+    public PerformComplainRecordQuery categoryIdStart(Long categoryIdStart){
+		this.categoryIdStart = categoryIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 绩效规则分类id
+    * @param categoryIdEnd
+    */
+    public PerformComplainRecordQuery categoryIdEnd(Long categoryIdEnd){
+		this.categoryIdEnd = categoryIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 绩效规则分类id
+    * @param categoryIdIncrement
+    */
+    public PerformComplainRecordQuery categoryIdIncrement(Long categoryIdIncrement){
+		this.categoryIdIncrement = categoryIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 绩效规则分类id
+    * @param categoryIdList
+    */
+    public PerformComplainRecordQuery categoryIdList(List<Long> categoryIdList){
+        this.categoryIdList = categoryIdList;
+		return this;
+        }
+
+        /**
+        * 设置 绩效规则分类id
+        * @param categoryIdNotList
+        */
+        public PerformComplainRecordQuery categoryIdNotList(List<Long> categoryIdNotList){
+        this.categoryIdNotList = categoryIdNotList;
+        return this;
+        }
+
+
+	/**
+    * 设置 规则名称
+    * @param categoryName
+    */
+    public PerformComplainRecordQuery categoryName(String categoryName){
+        setCategoryName(categoryName);
+		return this;
+    }
+
+    /**
+    * 设置 规则名称
+    * @param categoryNameList
+    */
+    public PerformComplainRecordQuery categoryNameList(List<String> categoryNameList){
+        this.categoryNameList = categoryNameList;
+		return this;
+    }
+
     /**
     * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
     * @return orConditionList

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

@@ -12,7 +12,7 @@ import lombok.Data;
 * 效能绩效记录信息实体对象
 *
 * @author zxfei
-* @date 2023-07-08
+* @date 2023-07-10
 */
 @Data
 public class PerformEffectRecordEntity extends PerformEffectRecordVo {
@@ -112,6 +112,14 @@ public class PerformEffectRecordEntity extends PerformEffectRecordVo {
     */
     @Excel(name = "附件下载地址，多个逗号分割")
     private String filePaths;
+    /**
+    * 绩效规则分类id
+    */
+    private Long categoryId;
+    /**
+    * 规则名称
+    */
+    private String categoryName;
     @Override
     public int hashCode() {
          return this.getId().hashCode();
@@ -171,5 +179,9 @@ public class PerformEffectRecordEntity extends PerformEffectRecordVo {
             this.fileNames = "";
 
             this.filePaths = "";
+
+            this.categoryId = -1L;
+
+            this.categoryName = "";
     }
 }
\ No newline at end of file

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

@@ -8,7 +8,7 @@ import com.mortals.xhx.module.perform.model.PerformEffectRecordEntity;
 * 效能绩效记录信息查询对象
 *
 * @author zxfei
-* @date 2023-07-08
+* @date 2023-07-10
 */
 public class PerformEffectRecordQuery extends PerformEffectRecordEntity {
     /** 开始 序号，主键，自增长 */
@@ -256,6 +256,26 @@ public class PerformEffectRecordQuery extends PerformEffectRecordEntity {
 
     /** 附件下载地址，多个逗号分割排除列表 */
     private List <String> filePathsNotList;
+    /** 开始 绩效规则分类id */
+    private Long categoryIdStart;
+
+    /** 结束 绩效规则分类id */
+    private Long categoryIdEnd;
+
+    /** 增加 绩效规则分类id */
+    private Long categoryIdIncrement;
+
+    /** 绩效规则分类id列表 */
+    private List <Long> categoryIdList;
+
+    /** 绩效规则分类id排除列表 */
+    private List <Long> categoryIdNotList;
+
+    /** 规则名称 */
+    private List<String> categoryNameList;
+
+    /** 规则名称排除列表 */
+    private List <String> categoryNameNotList;
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<PerformEffectRecordQuery> orConditionList;
 
@@ -1635,6 +1655,119 @@ public class PerformEffectRecordQuery extends PerformEffectRecordEntity {
         this.filePathsNotList = filePathsNotList;
     }
 
+    /**
+    * 获取 开始 绩效规则分类id
+    * @return categoryIdStart
+    */
+    public Long getCategoryIdStart(){
+        return this.categoryIdStart;
+    }
+
+    /**
+    * 设置 开始 绩效规则分类id
+    * @param categoryIdStart
+    */
+    public void setCategoryIdStart(Long categoryIdStart){
+        this.categoryIdStart = categoryIdStart;
+    }
+
+    /**
+    * 获取 结束 绩效规则分类id
+    * @return $categoryIdEnd
+    */
+    public Long getCategoryIdEnd(){
+        return this.categoryIdEnd;
+    }
+
+    /**
+    * 设置 结束 绩效规则分类id
+    * @param categoryIdEnd
+    */
+    public void setCategoryIdEnd(Long categoryIdEnd){
+        this.categoryIdEnd = categoryIdEnd;
+    }
+
+    /**
+    * 获取 增加 绩效规则分类id
+    * @return categoryIdIncrement
+    */
+    public Long getCategoryIdIncrement(){
+        return this.categoryIdIncrement;
+    }
+
+    /**
+    * 设置 增加 绩效规则分类id
+    * @param categoryIdIncrement
+    */
+    public void setCategoryIdIncrement(Long categoryIdIncrement){
+        this.categoryIdIncrement = categoryIdIncrement;
+    }
+
+    /**
+    * 获取 绩效规则分类id
+    * @return categoryIdList
+    */
+    public List<Long> getCategoryIdList(){
+        return this.categoryIdList;
+    }
+
+    /**
+    * 设置 绩效规则分类id
+    * @param categoryIdList
+    */
+    public void setCategoryIdList(List<Long> categoryIdList){
+        this.categoryIdList = categoryIdList;
+    }
+
+    /**
+    * 获取 绩效规则分类id
+    * @return categoryIdNotList
+    */
+    public List<Long> getCategoryIdNotList(){
+        return this.categoryIdNotList;
+    }
+
+    /**
+    * 设置 绩效规则分类id
+    * @param categoryIdNotList
+    */
+    public void setCategoryIdNotList(List<Long> categoryIdNotList){
+        this.categoryIdNotList = categoryIdNotList;
+    }
+
+
+    /**
+    * 获取 规则名称
+    * @return categoryNameList
+    */
+    public List<String> getCategoryNameList(){
+        return this.categoryNameList;
+    }
+
+    /**
+    * 设置 规则名称
+    * @param categoryNameList
+    */
+    public void setCategoryNameList(List<String> categoryNameList){
+        this.categoryNameList = categoryNameList;
+    }
+
+    /**
+    * 获取 规则名称
+    * @return categoryNameNotList
+    */
+    public List<String> getCategoryNameNotList(){
+        return this.categoryNameNotList;
+    }
+
+    /**
+    * 设置 规则名称
+    * @param categoryNameNotList
+    */
+    public void setCategoryNameNotList(List<String> categoryNameNotList){
+        this.categoryNameNotList = categoryNameNotList;
+    }
+
     /**
     * 设置  序号，主键，自增长
     * @param id
@@ -2424,6 +2557,79 @@ public class PerformEffectRecordQuery extends PerformEffectRecordEntity {
 		return this;
     }
 
+    /**
+    * 设置  绩效规则分类id
+    * @param categoryId
+    */
+    public PerformEffectRecordQuery categoryId(Long categoryId){
+	    setCategoryId(categoryId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 绩效规则分类id
+    * @param categoryIdStart
+    */
+    public PerformEffectRecordQuery categoryIdStart(Long categoryIdStart){
+		this.categoryIdStart = categoryIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 绩效规则分类id
+    * @param categoryIdEnd
+    */
+    public PerformEffectRecordQuery categoryIdEnd(Long categoryIdEnd){
+		this.categoryIdEnd = categoryIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 绩效规则分类id
+    * @param categoryIdIncrement
+    */
+    public PerformEffectRecordQuery categoryIdIncrement(Long categoryIdIncrement){
+		this.categoryIdIncrement = categoryIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 绩效规则分类id
+    * @param categoryIdList
+    */
+    public PerformEffectRecordQuery categoryIdList(List<Long> categoryIdList){
+        this.categoryIdList = categoryIdList;
+		return this;
+        }
+
+        /**
+        * 设置 绩效规则分类id
+        * @param categoryIdNotList
+        */
+        public PerformEffectRecordQuery categoryIdNotList(List<Long> categoryIdNotList){
+        this.categoryIdNotList = categoryIdNotList;
+        return this;
+        }
+
+
+	/**
+    * 设置 规则名称
+    * @param categoryName
+    */
+    public PerformEffectRecordQuery categoryName(String categoryName){
+        setCategoryName(categoryName);
+		return this;
+    }
+
+    /**
+    * 设置 规则名称
+    * @param categoryNameList
+    */
+    public PerformEffectRecordQuery categoryNameList(List<String> categoryNameList){
+        this.categoryNameList = categoryNameList;
+		return this;
+    }
+
     /**
     * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
     * @return orConditionList

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

@@ -12,7 +12,7 @@ import lombok.Data;
 * 办件绩效记录信息实体对象
 *
 * @author zxfei
-* @date 2023-07-08
+* @date 2023-07-10
 */
 @Data
 public class PerformGoworkRecordEntity extends PerformGoworkRecordVo {
@@ -111,6 +111,14 @@ public class PerformGoworkRecordEntity extends PerformGoworkRecordVo {
     */
     @Excel(name = "附件下载地址，多个逗号分割")
     private String filePaths;
+    /**
+    * 绩效规则分类id
+    */
+    private Long categoryId;
+    /**
+    * 规则名称
+    */
+    private String categoryName;
     @Override
     public int hashCode() {
          return this.getId().hashCode();
@@ -168,5 +176,9 @@ public class PerformGoworkRecordEntity extends PerformGoworkRecordVo {
             this.fileNames = "";
 
             this.filePaths = "";
+
+            this.categoryId = -1L;
+
+            this.categoryName = "";
     }
 }
\ No newline at end of file

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

@@ -12,7 +12,7 @@ import lombok.Data;
 * 其它绩效记录信息实体对象
 *
 * @author zxfei
-* @date 2023-07-08
+* @date 2023-07-10
 */
 @Data
 public class PerformOtherRecordEntity extends PerformOtherRecordVo {
@@ -100,6 +100,14 @@ public class PerformOtherRecordEntity extends PerformOtherRecordVo {
     */
     @Excel(name = "附件下载地址，多个逗号分割")
     private String filePaths;
+    /**
+    * 绩效规则分类id
+    */
+    private Long categoryId;
+    /**
+    * 规则名称
+    */
+    private String categoryName;
     @Override
     public int hashCode() {
          return this.getId().hashCode();
@@ -157,5 +165,9 @@ public class PerformOtherRecordEntity extends PerformOtherRecordVo {
             this.fileNames = "";
 
             this.filePaths = "";
+
+            this.categoryId = -1L;
+
+            this.categoryName = "";
     }
 }
\ No newline at end of file

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

@@ -12,7 +12,7 @@ import lombok.Data;
 * 评价差评绩效记录信息实体对象
 *
 * @author zxfei
-* @date 2023-07-08
+* @date 2023-07-10
 */
 @Data
 public class PerformReviewRecordEntity extends PerformReviewRecordVo {
@@ -107,6 +107,14 @@ public class PerformReviewRecordEntity extends PerformReviewRecordVo {
     */
     @Excel(name = "附件下载地址，多个逗号分割")
     private String filePaths;
+    /**
+    * 绩效规则分类id
+    */
+    private Long categoryId;
+    /**
+    * 规则名称
+    */
+    private String categoryName;
     @Override
     public int hashCode() {
          return this.getId().hashCode();
@@ -164,5 +172,9 @@ public class PerformReviewRecordEntity extends PerformReviewRecordVo {
             this.fileNames = "";
 
             this.filePaths = "";
+
+            this.categoryId = -1L;
+
+            this.categoryName = "";
     }
 }
\ No newline at end of file

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

@@ -8,11 +8,11 @@ import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.perform.model.vo.PerformRulesVo;
 import lombok.Data;
 /**
-* 绩效规则信息实体对象
-*
-* @author zxfei
-* @date 2023-05-16
-*/
+ * 绩效规则信息实体对象
+ *
+ * @author zxfei
+ * @date 2023-07-10
+ */
 @Data
 public class PerformRulesEntity extends PerformRulesVo {
     private static final long serialVersionUID = 1L;
@@ -57,6 +57,10 @@ public class PerformRulesEntity extends PerformRulesVo {
      * 规则类型(1.考勤绩效,2.评价绩效指标,3.办件绩效指标,4.效能绩效指标,5.其它绩效指标)
      */
     private Integer type;
+    /**
+     * 规则编码，唯一,默认规则类型内容简称拼音首字母。
+     */
+    private String ruleCode;
     @Override
     public int hashCode() {
         return this.getId().hashCode();
@@ -75,7 +79,7 @@ public class PerformRulesEntity extends PerformRulesVo {
 
     public void initAttrValue(){
 
-            this.categoryId = null;
+        this.categoryId = -1L;
 
         this.categoryName = "";
 
@@ -93,6 +97,8 @@ public class PerformRulesEntity extends PerformRulesVo {
 
         this.remark = "";
 
-            this.type = null;
+        this.type = 1;
+
+        this.ruleCode = "";
     }
 }
\ No newline at end of file

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

@@ -11,7 +11,7 @@ import java.util.Date;
 * 考勤绩效记录信息视图对象
 *
 * @author zxfei
-* @date 2023-07-08
+* @date 2023-07-10
 */
 @Data
 public class PerformAttendRecordVo extends BaseEntityLong {

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

@@ -11,7 +11,7 @@ import java.util.Date;
 * 评价绩效投诉记录信息视图对象
 *
 * @author zxfei
-* @date 2023-07-08
+* @date 2023-07-10
 */
 @Data
 public class PerformComplainRecordVo extends BaseEntityLong {

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

@@ -11,7 +11,7 @@ import java.util.Date;
 * 效能绩效记录信息视图对象
 *
 * @author zxfei
-* @date 2023-07-08
+* @date 2023-07-10
 */
 @Data
 public class PerformEffectRecordVo extends BaseEntityLong {

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

@@ -11,7 +11,7 @@ import java.util.Date;
 * 办件绩效记录信息视图对象
 *
 * @author zxfei
-* @date 2023-07-08
+* @date 2023-07-10
 */
 @Data
 public class PerformGoworkRecordVo extends BaseEntityLong {

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

@@ -11,7 +11,7 @@ import java.util.Date;
 * 其它绩效记录信息视图对象
 *
 * @author zxfei
-* @date 2023-07-08
+* @date 2023-07-10
 */
 @Data
 public class PerformOtherRecordVo extends BaseEntityLong {

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

@@ -11,7 +11,7 @@ import java.util.Date;
 * 评价差评绩效记录信息视图对象
 *
 * @author zxfei
-* @date 2023-07-08
+* @date 2023-07-10
 */
 @Data
 public class PerformReviewRecordVo extends BaseEntityLong {

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/service/PerformAttendRecordService.java

 package com.mortals.xhx.module.perform.service;
-import com.mortals.framework.exception.AppException;
 import com.mortals.framework.service.ICRUDService;
 import com.mortals.xhx.module.perform.model.PerformAttendRecordEntity;
 import com.mortals.xhx.module.perform.dao.PerformAttendRecordDao;
@@ -9,17 +8,9 @@ import com.mortals.xhx.module.perform.dao.PerformAttendRecordDao;
 * 考勤绩效记录信息 service接口
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-10
 */
 public interface PerformAttendRecordService extends ICRUDService<PerformAttendRecordEntity,Long>{
 
     PerformAttendRecordDao getDao();
-
-    /**
-     * 修改处理状态
-     * @param id
-     * @param status
-     * @throws AppException
-     */
-    void updateProcessStatus(Long id,Integer status) throws AppException;
 }
\ No newline at end of file