修改考勤管理与考勤核查字段

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/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/AppealApiController.java

@@ -53,7 +53,7 @@ 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;

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

@@ -11,6 +11,7 @@ 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.*;
@@ -45,7 +46,7 @@ import static com.mortals.xhx.common.key.ErrorCode.ERROR_TOKEN_EXPIRED_CONTENT;
 @RestController
 @Slf4j
 @RequestMapping("/api/v1/feedback")
-public class FeedbackApiController extends BaseJsonBodyController {
+public class FeedbackApiController extends AbstractBaseController<FeedbackReq> {
 
     @Autowired
     private FeedbackService feedbackService;

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

@@ -50,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
@@ -278,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/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/CheckAttendRecordQuery.java

@@ -8,7 +8,7 @@ import com.mortals.xhx.module.check.model.CheckAttendRecordEntity;
 * 考勤绩效记录核查信息查询对象
 *
 * @author zxfei
-* @date 2023-07-08
+* @date 2023-07-10
 */
 public class CheckAttendRecordQuery extends CheckAttendRecordEntity {
     /** 开始 序号，主键，自增长 */
@@ -200,10 +200,10 @@ public class CheckAttendRecordQuery extends CheckAttendRecordEntity {
 
     /** 核查说明排除列表 */
     private List <String> checkDescNotList;
-    /** 核查结果 */
+    /** 核查结果(1.加分或扣分,2.不扣分) */
     private List<String> checkResultList;
 
-    /** 核查结果排除列表 */
+    /** 核查结果(1.加分或扣分,2.不扣分)排除列表 */
     private List <String> checkResultNotList;
     /** 开始 处理状态(1.未处理,2.已处理) */
     private Integer checkStatusStart;
@@ -277,10 +277,10 @@ public class CheckAttendRecordQuery extends CheckAttendRecordEntity {
     /** 扣分方式(1.系统自动,2.人工添加,3.大厅巡查)排除列表 */
     private List <Integer> subMethodNotList;
 
-    /** 说明 */
+    /** 备注 */
     private List<String> remarkList;
 
-    /** 说明排除列表 */
+    /** 备注排除列表 */
     private List <String> remarkNotList;
     /** 附件名称，多个逗号分割 */
     private List<String> fileNamesList;
@@ -292,6 +292,26 @@ public class CheckAttendRecordQuery extends CheckAttendRecordEntity {
 
     /** 附件下载地址，多个逗号分割排除列表 */
     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<CheckAttendRecordQuery> orConditionList;
 
@@ -1365,7 +1385,7 @@ public class CheckAttendRecordQuery extends CheckAttendRecordEntity {
     }
 
     /**
-    * 获取 核查结果
+    * 获取 核查结果(1.加分或扣分,2.不扣分)
     * @return checkResultList
     */
     public List<String> getCheckResultList(){
@@ -1373,7 +1393,7 @@ public class CheckAttendRecordQuery extends CheckAttendRecordEntity {
     }
 
     /**
-    * 设置 核查结果
+    * 设置 核查结果(1.加分或扣分,2.不扣分)
     * @param checkResultList
     */
     public void setCheckResultList(List<String> checkResultList){
@@ -1381,7 +1401,7 @@ public class CheckAttendRecordQuery extends CheckAttendRecordEntity {
     }
 
     /**
-    * 获取 核查结果
+    * 获取 核查结果(1.加分或扣分,2.不扣分)
     * @return checkResultNotList
     */
     public List<String> getCheckResultNotList(){
@@ -1389,7 +1409,7 @@ public class CheckAttendRecordQuery extends CheckAttendRecordEntity {
     }
 
     /**
-    * 设置 核查结果
+    * 设置 核查结果(1.加分或扣分,2.不扣分)
     * @param checkResultNotList
     */
     public void setCheckResultNotList(List<String> checkResultNotList){
@@ -1785,7 +1805,7 @@ public class CheckAttendRecordQuery extends CheckAttendRecordEntity {
 
 
     /**
-    * 获取 说明
+    * 获取 备注
     * @return remarkList
     */
     public List<String> getRemarkList(){
@@ -1793,7 +1813,7 @@ public class CheckAttendRecordQuery extends CheckAttendRecordEntity {
     }
 
     /**
-    * 设置 说明
+    * 设置 备注
     * @param remarkList
     */
     public void setRemarkList(List<String> remarkList){
@@ -1801,7 +1821,7 @@ public class CheckAttendRecordQuery extends CheckAttendRecordEntity {
     }
 
     /**
-    * 获取 说明
+    * 获取 备注
     * @return remarkNotList
     */
     public List<String> getRemarkNotList(){
@@ -1809,7 +1829,7 @@ public class CheckAttendRecordQuery extends CheckAttendRecordEntity {
     }
 
     /**
-    * 设置 说明
+    * 设置 备注
     * @param remarkNotList
     */
     public void setRemarkNotList(List<String> remarkNotList){
@@ -1880,6 +1900,119 @@ public class CheckAttendRecordQuery extends CheckAttendRecordEntity {
         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
@@ -2489,7 +2622,7 @@ public class CheckAttendRecordQuery extends CheckAttendRecordEntity {
 
 
 	/**
-    * 设置 核查结果
+    * 设置 核查结果(1.加分或扣分,2.不扣分)
     * @param checkResult
     */
     public CheckAttendRecordQuery checkResult(String checkResult){
@@ -2498,7 +2631,7 @@ public class CheckAttendRecordQuery extends CheckAttendRecordEntity {
     }
 
     /**
-    * 设置 核查结果
+    * 设置 核查结果(1.加分或扣分,2.不扣分)
     * @param checkResultList
     */
     public CheckAttendRecordQuery checkResultList(List<String> checkResultList){
@@ -2726,7 +2859,7 @@ public class CheckAttendRecordQuery extends CheckAttendRecordEntity {
 
 
 	/**
-    * 设置 说明
+    * 设置 备注
     * @param remark
     */
     public CheckAttendRecordQuery remark(String remark){
@@ -2735,7 +2868,7 @@ public class CheckAttendRecordQuery extends CheckAttendRecordEntity {
     }
 
     /**
-    * 设置 说明
+    * 设置 备注
     * @param remarkList
     */
     public CheckAttendRecordQuery remarkList(List<String> remarkList){
@@ -2781,6 +2914,79 @@ public class CheckAttendRecordQuery extends CheckAttendRecordEntity {
 		return this;
     }
 
+    /**
+    * 设置  绩效规则分类id
+    * @param categoryId
+    */
+    public CheckAttendRecordQuery categoryId(Long categoryId){
+	    setCategoryId(categoryId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 绩效规则分类id
+    * @param categoryIdStart
+    */
+    public CheckAttendRecordQuery categoryIdStart(Long categoryIdStart){
+		this.categoryIdStart = categoryIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 绩效规则分类id
+    * @param categoryIdEnd
+    */
+    public CheckAttendRecordQuery categoryIdEnd(Long categoryIdEnd){
+		this.categoryIdEnd = categoryIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 绩效规则分类id
+    * @param categoryIdIncrement
+    */
+    public CheckAttendRecordQuery categoryIdIncrement(Long categoryIdIncrement){
+		this.categoryIdIncrement = categoryIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 绩效规则分类id
+    * @param categoryIdList
+    */
+    public CheckAttendRecordQuery categoryIdList(List<Long> categoryIdList){
+        this.categoryIdList = categoryIdList;
+		return this;
+        }
+
+        /**
+        * 设置 绩效规则分类id
+        * @param categoryIdNotList
+        */
+        public CheckAttendRecordQuery categoryIdNotList(List<Long> categoryIdNotList){
+        this.categoryIdNotList = categoryIdNotList;
+        return this;
+        }
+
+
+	/**
+    * 设置 规则名称
+    * @param categoryName
+    */
+    public CheckAttendRecordQuery categoryName(String categoryName){
+        setCategoryName(categoryName);
+		return this;
+    }
+
+    /**
+    * 设置 规则名称
+    * @param categoryNameList
+    */
+    public CheckAttendRecordQuery 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/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/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/PerformGoworkRecordQuery.java

@@ -8,7 +8,7 @@ import com.mortals.xhx.module.perform.model.PerformGoworkRecordEntity;
 * 办件绩效记录信息查询对象
 *
 * @author zxfei
-* @date 2023-07-08
+* @date 2023-07-10
 */
 public class PerformGoworkRecordQuery extends PerformGoworkRecordEntity {
     /** 开始 序号，主键，自增长 */
@@ -230,6 +230,26 @@ public class PerformGoworkRecordQuery extends PerformGoworkRecordEntity {
 
     /** 附件下载地址，多个逗号分割排除列表 */
     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<PerformGoworkRecordQuery> orConditionList;
 
@@ -1479,6 +1499,119 @@ public class PerformGoworkRecordQuery extends PerformGoworkRecordEntity {
         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
@@ -2197,6 +2330,79 @@ public class PerformGoworkRecordQuery extends PerformGoworkRecordEntity {
 		return this;
     }
 
+    /**
+    * 设置  绩效规则分类id
+    * @param categoryId
+    */
+    public PerformGoworkRecordQuery categoryId(Long categoryId){
+	    setCategoryId(categoryId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 绩效规则分类id
+    * @param categoryIdStart
+    */
+    public PerformGoworkRecordQuery categoryIdStart(Long categoryIdStart){
+		this.categoryIdStart = categoryIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 绩效规则分类id
+    * @param categoryIdEnd
+    */
+    public PerformGoworkRecordQuery categoryIdEnd(Long categoryIdEnd){
+		this.categoryIdEnd = categoryIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 绩效规则分类id
+    * @param categoryIdIncrement
+    */
+    public PerformGoworkRecordQuery categoryIdIncrement(Long categoryIdIncrement){
+		this.categoryIdIncrement = categoryIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 绩效规则分类id
+    * @param categoryIdList
+    */
+    public PerformGoworkRecordQuery categoryIdList(List<Long> categoryIdList){
+        this.categoryIdList = categoryIdList;
+		return this;
+        }
+
+        /**
+        * 设置 绩效规则分类id
+        * @param categoryIdNotList
+        */
+        public PerformGoworkRecordQuery categoryIdNotList(List<Long> categoryIdNotList){
+        this.categoryIdNotList = categoryIdNotList;
+        return this;
+        }
+
+
+	/**
+    * 设置 规则名称
+    * @param categoryName
+    */
+    public PerformGoworkRecordQuery categoryName(String categoryName){
+        setCategoryName(categoryName);
+		return this;
+    }
+
+    /**
+    * 设置 规则名称
+    * @param categoryNameList
+    */
+    public PerformGoworkRecordQuery 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/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/PerformOtherRecordQuery.java

@@ -8,7 +8,7 @@ import com.mortals.xhx.module.perform.model.PerformOtherRecordEntity;
 * 其它绩效记录信息查询对象
 *
 * @author zxfei
-* @date 2023-07-08
+* @date 2023-07-10
 */
 public class PerformOtherRecordQuery extends PerformOtherRecordEntity {
     /** 开始 序号，主键，自增长 */
@@ -250,6 +250,26 @@ public class PerformOtherRecordQuery extends PerformOtherRecordEntity {
 
     /** 附件下载地址，多个逗号分割排除列表 */
     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<PerformOtherRecordQuery> orConditionList;
 
@@ -1597,6 +1617,119 @@ public class PerformOtherRecordQuery extends PerformOtherRecordEntity {
         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
@@ -2385,6 +2518,79 @@ public class PerformOtherRecordQuery extends PerformOtherRecordEntity {
 		return this;
     }
 
+    /**
+    * 设置  绩效规则分类id
+    * @param categoryId
+    */
+    public PerformOtherRecordQuery categoryId(Long categoryId){
+	    setCategoryId(categoryId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 绩效规则分类id
+    * @param categoryIdStart
+    */
+    public PerformOtherRecordQuery categoryIdStart(Long categoryIdStart){
+		this.categoryIdStart = categoryIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 绩效规则分类id
+    * @param categoryIdEnd
+    */
+    public PerformOtherRecordQuery categoryIdEnd(Long categoryIdEnd){
+		this.categoryIdEnd = categoryIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 绩效规则分类id
+    * @param categoryIdIncrement
+    */
+    public PerformOtherRecordQuery categoryIdIncrement(Long categoryIdIncrement){
+		this.categoryIdIncrement = categoryIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 绩效规则分类id
+    * @param categoryIdList
+    */
+    public PerformOtherRecordQuery categoryIdList(List<Long> categoryIdList){
+        this.categoryIdList = categoryIdList;
+		return this;
+        }
+
+        /**
+        * 设置 绩效规则分类id
+        * @param categoryIdNotList
+        */
+        public PerformOtherRecordQuery categoryIdNotList(List<Long> categoryIdNotList){
+        this.categoryIdNotList = categoryIdNotList;
+        return this;
+        }
+
+
+	/**
+    * 设置 规则名称
+    * @param categoryName
+    */
+    public PerformOtherRecordQuery categoryName(String categoryName){
+        setCategoryName(categoryName);
+		return this;
+    }
+
+    /**
+    * 设置 规则名称
+    * @param categoryNameList
+    */
+    public PerformOtherRecordQuery 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/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/PerformReviewRecordQuery.java

@@ -8,7 +8,7 @@ import com.mortals.xhx.module.perform.model.PerformReviewRecordEntity;
 * 评价差评绩效记录信息查询对象
 *
 * @author zxfei
-* @date 2023-07-08
+* @date 2023-07-10
 */
 public class PerformReviewRecordQuery extends PerformReviewRecordEntity {
     /** 开始 序号，主键，自增长 */
@@ -240,6 +240,26 @@ public class PerformReviewRecordQuery extends PerformReviewRecordEntity {
 
     /** 附件下载地址，多个逗号分割排除列表 */
     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<PerformReviewRecordQuery> orConditionList;
 
@@ -1538,6 +1558,119 @@ public class PerformReviewRecordQuery extends PerformReviewRecordEntity {
         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
@@ -2291,6 +2424,79 @@ public class PerformReviewRecordQuery extends PerformReviewRecordEntity {
 		return this;
     }
 
+    /**
+    * 设置  绩效规则分类id
+    * @param categoryId
+    */
+    public PerformReviewRecordQuery categoryId(Long categoryId){
+	    setCategoryId(categoryId);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 绩效规则分类id
+    * @param categoryIdStart
+    */
+    public PerformReviewRecordQuery categoryIdStart(Long categoryIdStart){
+		this.categoryIdStart = categoryIdStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 绩效规则分类id
+    * @param categoryIdEnd
+    */
+    public PerformReviewRecordQuery categoryIdEnd(Long categoryIdEnd){
+		this.categoryIdEnd = categoryIdEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 绩效规则分类id
+    * @param categoryIdIncrement
+    */
+    public PerformReviewRecordQuery categoryIdIncrement(Long categoryIdIncrement){
+		this.categoryIdIncrement = categoryIdIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 绩效规则分类id
+    * @param categoryIdList
+    */
+    public PerformReviewRecordQuery categoryIdList(List<Long> categoryIdList){
+        this.categoryIdList = categoryIdList;
+		return this;
+        }
+
+        /**
+        * 设置 绩效规则分类id
+        * @param categoryIdNotList
+        */
+        public PerformReviewRecordQuery categoryIdNotList(List<Long> categoryIdNotList){
+        this.categoryIdNotList = categoryIdNotList;
+        return this;
+        }
+
+
+	/**
+    * 设置 规则名称
+    * @param categoryName
+    */
+    public PerformReviewRecordQuery categoryName(String categoryName){
+        setCategoryName(categoryName);
+		return this;
+    }
+
+    /**
+    * 设置 规则名称
+    * @param categoryNameList
+    */
+    public PerformReviewRecordQuery 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/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

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/service/PerformComplainRecordService.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.PerformComplainRecordEntity;
 import com.mortals.xhx.module.perform.dao.PerformComplainRecordDao;
@@ -9,17 +8,9 @@ import com.mortals.xhx.module.perform.dao.PerformComplainRecordDao;
 * 评价绩效投诉记录信息 service接口
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-10
 */
 public interface PerformComplainRecordService extends ICRUDService<PerformComplainRecordEntity,Long>{
 
     PerformComplainRecordDao getDao();
-
-    /**
-     * 修改处理状态
-     * @param id
-     * @param status
-     * @throws AppException
-     */
-    void updateProcessStatus(Long id,Integer status) throws AppException;
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/service/PerformEffectRecordService.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.PerformEffectRecordEntity;
 import com.mortals.xhx.module.perform.dao.PerformEffectRecordDao;
@@ -9,17 +8,9 @@ import com.mortals.xhx.module.perform.dao.PerformEffectRecordDao;
 * 效能绩效记录信息 service接口
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-10
 */
 public interface PerformEffectRecordService extends ICRUDService<PerformEffectRecordEntity,Long>{
 
     PerformEffectRecordDao getDao();
-
-    /**
-     * 修改处理状态
-     * @param id
-     * @param status
-     * @throws AppException
-     */
-    void updateProcessStatus(Long id,Integer status) throws AppException;
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/service/PerformGoworkRecordService.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.PerformGoworkRecordEntity;
 import com.mortals.xhx.module.perform.dao.PerformGoworkRecordDao;
@@ -9,17 +8,9 @@ import com.mortals.xhx.module.perform.dao.PerformGoworkRecordDao;
 * 办件绩效记录信息 service接口
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-10
 */
 public interface PerformGoworkRecordService extends ICRUDService<PerformGoworkRecordEntity,Long>{
 
     PerformGoworkRecordDao getDao();
-
-    /**
-     * 修改处理状态
-     * @param id
-     * @param status
-     * @throws AppException
-     */
-    void updateProcessStatus(Long id,Integer status) throws AppException;
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/service/PerformOtherRecordService.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.PerformOtherRecordEntity;
 import com.mortals.xhx.module.perform.dao.PerformOtherRecordDao;
@@ -9,17 +8,9 @@ import com.mortals.xhx.module.perform.dao.PerformOtherRecordDao;
 * 其它绩效记录信息 service接口
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-10
 */
 public interface PerformOtherRecordService extends ICRUDService<PerformOtherRecordEntity,Long>{
 
     PerformOtherRecordDao getDao();
-
-    /**
-     * 修改处理状态
-     * @param id
-     * @param status
-     * @throws AppException
-     */
-    void updateProcessStatus(Long id,Integer status) throws AppException;
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/service/PerformReviewRecordService.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.PerformReviewRecordEntity;
 import com.mortals.xhx.module.perform.dao.PerformReviewRecordDao;
@@ -9,17 +8,9 @@ import com.mortals.xhx.module.perform.dao.PerformReviewRecordDao;
 * 评价差评绩效记录信息 service接口
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-10
 */
 public interface PerformReviewRecordService extends ICRUDService<PerformReviewRecordEntity,Long>{
 
     PerformReviewRecordDao getDao();
-
-    /**
-     * 修改处理状态
-     * @param id
-     * @param status
-     * @throws AppException
-     */
-    void updateProcessStatus(Long id,Integer status) throws AppException;
 }
\ No newline at end of file

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

 package com.mortals.xhx.module.perform.service.impl;
-import com.mortals.xhx.common.code.CheckStatusEnum;
-import com.mortals.xhx.common.code.SubMethodEnum;
-import com.mortals.xhx.common.utils.BeanUtil;
-import com.mortals.xhx.module.check.model.CheckAttendRecordEntity;
-import com.mortals.xhx.module.check.service.CheckAttendRecordService;
-import org.springframework.beans.BeanUtils;
-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;
@@ -14,54 +7,15 @@ import com.mortals.xhx.module.perform.dao.PerformAttendRecordDao;
 import com.mortals.xhx.module.perform.model.PerformAttendRecordEntity;
 import com.mortals.xhx.module.perform.service.PerformAttendRecordService;
 import lombok.extern.slf4j.Slf4j;
-
-import java.util.Date;
-
 /**
 * PerformAttendRecordService
 * 考勤绩效记录信息 service实现
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-10
 */
 @Service("performAttendRecordService")
 @Slf4j
 public class PerformAttendRecordServiceImpl extends AbstractCRUDServiceImpl<PerformAttendRecordDao, PerformAttendRecordEntity, Long> implements PerformAttendRecordService {
     
-    @Autowired
-    private CheckAttendRecordService checkAttendRecordService;
-
-    @Override
-    protected void saveAfter(PerformAttendRecordEntity entity, Context context) throws AppException {
-        CheckAttendRecordEntity checkAttendRecordEntity = new CheckAttendRecordEntity();
-        checkAttendRecordEntity.initAttrValue();
-        BeanUtils.copyProperties(entity,checkAttendRecordEntity, BeanUtil.getNullPropertyNames(entity));
-        checkAttendRecordEntity.setId(null);
-        checkAttendRecordEntity.setRecordId(entity.getId());
-        if(entity.getSubMethod()== SubMethodEnum.系统自动.getValue()){
-            checkAttendRecordEntity.setCheckStatus(CheckStatusEnum.已处理.getValue());     //自动扣分相设置为已处理
-        }else {
-            checkAttendRecordEntity.setCheckStatus(CheckStatusEnum.未处理.getValue());      //非自动扣分相设置为未处理
-        }
-        checkAttendRecordService.save(checkAttendRecordEntity,context);
-    }
-
-    @Override
-    public void updateProcessStatus(Long id, Integer status) throws AppException {
-        if(id==null){
-            throw new AppException("考勤绩效记录Id不能为空");
-        }
-        PerformAttendRecordEntity entity = this.get(id);
-        if(entity==null){
-            throw new AppException("无效的考勤绩效记录Id");
-        }
-        if(status==null){
-            status=1; //处理状态(1.未核查,2.已核查)
-        }
-        PerformAttendRecordEntity update = new PerformAttendRecordEntity();
-        update.setId(id);
-        update.setProcessStatus(status);
-        update.setUpdateTime(new Date());
-        dao.update(update);
-    }
 }
\ No newline at end of file

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

 package com.mortals.xhx.module.perform.service.impl;
-
+import org.springframework.stereotype.Service;
+import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
-import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
-import com.mortals.xhx.common.code.CheckStatusEnum;
-import com.mortals.xhx.common.code.SubMethodEnum;
-import com.mortals.xhx.common.utils.BeanUtil;
-import com.mortals.xhx.module.check.model.CheckComplainRecordEntity;
-import com.mortals.xhx.module.check.service.CheckComplainRecordService;
 import com.mortals.xhx.module.perform.dao.PerformComplainRecordDao;
 import com.mortals.xhx.module.perform.model.PerformComplainRecordEntity;
 import com.mortals.xhx.module.perform.service.PerformComplainRecordService;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.Date;
-
 /**
 * PerformComplainRecordService
 * 评价绩效投诉记录信息 service实现
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-10
 */
 @Service("performComplainRecordService")
 @Slf4j
 public class PerformComplainRecordServiceImpl extends AbstractCRUDServiceImpl<PerformComplainRecordDao, PerformComplainRecordEntity, Long> implements PerformComplainRecordService {
     
-    @Autowired
-    private CheckComplainRecordService checkComplainRecordService;
-
-    @Override
-    protected void saveAfter(PerformComplainRecordEntity entity, Context context) throws AppException {
-        CheckComplainRecordEntity checkComplainRecordEntity = new CheckComplainRecordEntity();
-        checkComplainRecordEntity.initAttrValue();
-        BeanUtils.copyProperties(entity,checkComplainRecordEntity, BeanUtil.getNullPropertyNames(entity));
-        checkComplainRecordEntity.setId(null);
-        checkComplainRecordEntity.setRecordId(entity.getId());
-        if(entity.getSubMethod()== SubMethodEnum.系统自动.getValue()){
-            checkComplainRecordEntity.setCheckStatus(CheckStatusEnum.已处理.getValue());     //自动扣分相设置为已处理
-        }else {
-            checkComplainRecordEntity.setCheckStatus(CheckStatusEnum.未处理.getValue());      //非自动扣分相设置为未处理
-        }
-        checkComplainRecordService.save(checkComplainRecordEntity,context);
-    }
-
-    @Override
-    public void updateProcessStatus(Long id, Integer status) throws AppException {
-        if(id==null){
-            throw new AppException("评价绩效投诉记录Id不能为空");
-        }
-        PerformComplainRecordEntity entity = this.get(id);
-        if(entity==null){
-            throw new AppException("无效的评价绩效投诉记录Id");
-        }
-        if(status==null){
-            status=1; //处理状态(1.未核查,2.已核查)
-        }
-        PerformComplainRecordEntity update = new PerformComplainRecordEntity();
-        update.setId(id);
-        update.setProcessStatus(status);
-        update.setUpdateTime(new Date());
-        dao.update(update);
-    }
 }
\ No newline at end of file

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

 package com.mortals.xhx.module.perform.service.impl;
-import com.mortals.xhx.common.code.CheckStatusEnum;
-import com.mortals.xhx.common.code.SubMethodEnum;
-import com.mortals.xhx.common.utils.BeanUtil;
-import com.mortals.xhx.module.check.model.CheckEffectRecordEntity;
-import com.mortals.xhx.module.check.service.CheckEffectRecordService;
-import org.springframework.beans.BeanUtils;
-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;
@@ -14,54 +7,15 @@ import com.mortals.xhx.module.perform.dao.PerformEffectRecordDao;
 import com.mortals.xhx.module.perform.model.PerformEffectRecordEntity;
 import com.mortals.xhx.module.perform.service.PerformEffectRecordService;
 import lombok.extern.slf4j.Slf4j;
-
-import java.util.Date;
-
 /**
 * PerformEffectRecordService
 * 效能绩效记录信息 service实现
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-10
 */
 @Service("performEffectRecordService")
 @Slf4j
 public class PerformEffectRecordServiceImpl extends AbstractCRUDServiceImpl<PerformEffectRecordDao, PerformEffectRecordEntity, Long> implements PerformEffectRecordService {
     
-    @Autowired
-    private CheckEffectRecordService checkEffectRecordService;
-
-    @Override
-    protected void saveAfter(PerformEffectRecordEntity entity, Context context) throws AppException {
-        CheckEffectRecordEntity checkEffectRecordEntity = new CheckEffectRecordEntity();
-        checkEffectRecordEntity.initAttrValue();
-        BeanUtils.copyProperties(entity,checkEffectRecordEntity, BeanUtil.getNullPropertyNames(entity));
-        checkEffectRecordEntity.setId(null);
-        checkEffectRecordEntity.setRecordId(entity.getId());
-        if(entity.getSubMethod()== SubMethodEnum.系统自动.getValue()){
-            checkEffectRecordEntity.setCheckStatus(CheckStatusEnum.已处理.getValue());     //自动扣分相设置为已处理
-        }else {
-            checkEffectRecordEntity.setCheckStatus(CheckStatusEnum.未处理.getValue());      //非自动扣分相设置为未处理
-        }
-        checkEffectRecordService.save(checkEffectRecordEntity,context);
-    }
-
-    @Override
-    public void updateProcessStatus(Long id, Integer status) throws AppException {
-        if(id==null){
-            throw new AppException("效能绩效记录Id不能为空");
-        }
-        PerformEffectRecordEntity entity = this.get(id);
-        if(entity==null){
-            throw new AppException("无效的效能绩效记录Id");
-        }
-        if(status==null){
-            status=1; //处理状态(1.未核查,2.已核查)
-        }
-        PerformEffectRecordEntity update = new PerformEffectRecordEntity();
-        update.setId(id);
-        update.setProcessStatus(status);
-        update.setUpdateTime(new Date());
-        dao.update(update);
-    }
 }
\ No newline at end of file

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

 package com.mortals.xhx.module.perform.service.impl;
-import com.mortals.xhx.common.code.CheckStatusEnum;
-import com.mortals.xhx.common.code.SubMethodEnum;
-import com.mortals.xhx.common.utils.BeanUtil;
-import com.mortals.xhx.module.check.model.CheckGoworkRecordEntity;
-import com.mortals.xhx.module.check.service.CheckGoworkRecordService;
-import org.springframework.beans.BeanUtils;
-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;
@@ -14,54 +7,15 @@ import com.mortals.xhx.module.perform.dao.PerformGoworkRecordDao;
 import com.mortals.xhx.module.perform.model.PerformGoworkRecordEntity;
 import com.mortals.xhx.module.perform.service.PerformGoworkRecordService;
 import lombok.extern.slf4j.Slf4j;
-
-import java.util.Date;
-
 /**
 * PerformGoworkRecordService
 * 办件绩效记录信息 service实现
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-10
 */
 @Service("performGoworkRecordService")
 @Slf4j
 public class PerformGoworkRecordServiceImpl extends AbstractCRUDServiceImpl<PerformGoworkRecordDao, PerformGoworkRecordEntity, Long> implements PerformGoworkRecordService {
     
-    @Autowired
-    private CheckGoworkRecordService checkGoworkRecordService;
-
-    @Override
-    protected void saveAfter(PerformGoworkRecordEntity entity, Context context) throws AppException {
-        CheckGoworkRecordEntity checkGoworkRecordEntity = new CheckGoworkRecordEntity();
-        checkGoworkRecordEntity.initAttrValue();
-        BeanUtils.copyProperties(entity,checkGoworkRecordEntity, BeanUtil.getNullPropertyNames(entity));
-        checkGoworkRecordEntity.setId(null);
-        checkGoworkRecordEntity.setRecordId(entity.getId());
-        if(entity.getSubMethod()== SubMethodEnum.系统自动.getValue()){
-            checkGoworkRecordEntity.setCheckStatus(CheckStatusEnum.已处理.getValue());     //自动扣分相设置为已处理
-        }else {
-            checkGoworkRecordEntity.setCheckStatus(CheckStatusEnum.未处理.getValue());      //非自动扣分相设置为未处理
-        }
-        checkGoworkRecordService.save(checkGoworkRecordEntity,context);
-    }
-
-    @Override
-    public void updateProcessStatus(Long id, Integer status) throws AppException {
-        if(id==null){
-            throw new AppException("办件绩效记录Id不能为空");
-        }
-        PerformGoworkRecordEntity entity = this.get(id);
-        if(entity==null){
-            throw new AppException("无效的办件绩效记录Id");
-        }
-        if(status==null){
-            status=1; //处理状态(1.未核查,2.已核查)
-        }
-        PerformGoworkRecordEntity update = new PerformGoworkRecordEntity();
-        update.setId(id);
-        update.setProcessStatus(status);
-        update.setUpdateTime(new Date());
-        dao.update(update);
-    }
 }
\ No newline at end of file

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

 package com.mortals.xhx.module.perform.service.impl;
-import com.mortals.xhx.common.code.CheckStatusEnum;
-import com.mortals.xhx.common.code.SubMethodEnum;
-import com.mortals.xhx.common.utils.BeanUtil;
-import com.mortals.xhx.module.check.model.CheckOtherRecordEntity;
-import com.mortals.xhx.module.check.service.CheckOtherRecordService;
-import org.springframework.beans.BeanUtils;
-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;
@@ -14,54 +7,15 @@ import com.mortals.xhx.module.perform.dao.PerformOtherRecordDao;
 import com.mortals.xhx.module.perform.model.PerformOtherRecordEntity;
 import com.mortals.xhx.module.perform.service.PerformOtherRecordService;
 import lombok.extern.slf4j.Slf4j;
-
-import java.util.Date;
-
 /**
 * PerformOtherRecordService
 * 其它绩效记录信息 service实现
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-10
 */
 @Service("performOtherRecordService")
 @Slf4j
 public class PerformOtherRecordServiceImpl extends AbstractCRUDServiceImpl<PerformOtherRecordDao, PerformOtherRecordEntity, Long> implements PerformOtherRecordService {
     
-    @Autowired
-    private CheckOtherRecordService checkOtherRecordService;
-
-    @Override
-    protected void saveAfter(PerformOtherRecordEntity entity, Context context) throws AppException {
-        CheckOtherRecordEntity checkOtherRecordEntity = new CheckOtherRecordEntity();
-        checkOtherRecordEntity.initAttrValue();
-        BeanUtils.copyProperties(entity,checkOtherRecordEntity, BeanUtil.getNullPropertyNames(entity));
-        checkOtherRecordEntity.setId(null);
-        checkOtherRecordEntity.setRecordId(entity.getId());
-        if(entity.getSubMethod()== SubMethodEnum.系统自动.getValue()){
-            checkOtherRecordEntity.setCheckStatus(CheckStatusEnum.已处理.getValue());     //自动扣分相设置为已处理
-        }else {
-            checkOtherRecordEntity.setCheckStatus(CheckStatusEnum.未处理.getValue());      //非自动扣分相设置为未处理
-        }
-        checkOtherRecordService.save(checkOtherRecordEntity,context);
-    }
-
-    @Override
-    public void updateProcessStatus(Long id, Integer status) throws AppException {
-        if(id==null){
-            throw new AppException("其它绩效记录Id不能为空");
-        }
-        PerformOtherRecordEntity entity = this.get(id);
-        if(entity==null){
-            throw new AppException("无效的其它绩效记录Id");
-        }
-        if(status==null){
-            status=1; //处理状态(1.未核查,2.已核查)
-        }
-        PerformOtherRecordEntity update = new PerformOtherRecordEntity();
-        update.setId(id);
-        update.setProcessStatus(status);
-        update.setUpdateTime(new Date());
-        dao.update(update);
-    }
 }
\ No newline at end of file

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

 package com.mortals.xhx.module.perform.service.impl;
-import com.mortals.xhx.common.code.CheckStatusEnum;
-import com.mortals.xhx.common.code.SubMethodEnum;
-import com.mortals.xhx.common.utils.BeanUtil;
-import com.mortals.xhx.module.check.model.CheckReviewRecordEntity;
-import com.mortals.xhx.module.check.service.CheckReviewRecordService;
-import org.springframework.beans.BeanUtils;
-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;
@@ -14,53 +7,15 @@ import com.mortals.xhx.module.perform.dao.PerformReviewRecordDao;
 import com.mortals.xhx.module.perform.model.PerformReviewRecordEntity;
 import com.mortals.xhx.module.perform.service.PerformReviewRecordService;
 import lombok.extern.slf4j.Slf4j;
-
-import java.util.Date;
-
 /**
 * PerformReviewRecordService
 * 评价差评绩效记录信息 service实现
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-10
 */
 @Service("performReviewRecordService")
 @Slf4j
 public class PerformReviewRecordServiceImpl extends AbstractCRUDServiceImpl<PerformReviewRecordDao, PerformReviewRecordEntity, Long> implements PerformReviewRecordService {
     
-    @Autowired
-    private CheckReviewRecordService checkReviewRecordService;
-
-    @Override
-    protected void saveAfter(PerformReviewRecordEntity entity, Context context) throws AppException {
-        CheckReviewRecordEntity checkReviewRecordEntity = new CheckReviewRecordEntity();
-        BeanUtils.copyProperties(entity,checkReviewRecordEntity, BeanUtil.getNullPropertyNames(entity));
-        checkReviewRecordEntity.setId(null);
-        checkReviewRecordEntity.setRecordId(entity.getId());
-        if(entity.getSubMethod()== SubMethodEnum.系统自动.getValue()){
-            checkReviewRecordEntity.setCheckStatus(CheckStatusEnum.已处理.getValue());     //自动扣分相设置为已处理
-        }else {
-            checkReviewRecordEntity.setCheckStatus(CheckStatusEnum.未处理.getValue());      //非自动扣分相设置为未处理
-        }
-        checkReviewRecordService.save(checkReviewRecordEntity,context);
-    }
-
-    @Override
-    public void updateProcessStatus(Long id, Integer status) throws AppException {
-        if(id==null){
-            throw new AppException("评价差评绩效记录Id不能为空");
-        }
-        PerformReviewRecordEntity entity = this.get(id);
-        if(entity==null){
-            throw new AppException("无效的评价差评绩效记录Id");
-        }
-        if(status==null){
-            status=1; //处理状态(1.未核查,2.已核查)
-        }
-        PerformReviewRecordEntity update = new PerformReviewRecordEntity();
-        update.setId(id);
-        update.setProcessStatus(status);
-        update.setUpdateTime(new Date());
-        dao.update(update);
-    }
 }
\ No newline at end of file

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

@@ -27,7 +27,7 @@ import static com.mortals.framework.ap.SysConstains.*;
 * 考勤绩效记录信息
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-10
 */
 @RestController
 @RequestMapping("perform/attend/record")

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

@@ -27,7 +27,7 @@ import static com.mortals.framework.ap.SysConstains.*;
 * 评价绩效投诉记录信息
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-10
 */
 @RestController
 @RequestMapping("perform/complain/record")

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

@@ -27,7 +27,7 @@ import static com.mortals.framework.ap.SysConstains.*;
 * 效能绩效记录信息
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-10
 */
 @RestController
 @RequestMapping("perform/effect/record")

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

@@ -27,7 +27,7 @@ import static com.mortals.framework.ap.SysConstains.*;
 * 办件绩效记录信息
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-10
 */
 @RestController
 @RequestMapping("perform/gowork/record")

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

@@ -27,7 +27,7 @@ import static com.mortals.framework.ap.SysConstains.*;
 * 其它绩效记录信息
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-10
 */
 @RestController
 @RequestMapping("perform/other/record")

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

@@ -27,7 +27,7 @@ import static com.mortals.framework.ap.SysConstains.*;
 * 评价差评绩效记录信息
 *
 * @author zxfei
-* @date 2023-05-18
+* @date 2023-07-10
 */
 @RestController
 @RequestMapping("perform/review/record")

attendance-performance-manager/src/main/resources/sqlmap/module/check/CheckAttendRecordMapper.xml

@@ -36,6 +36,8 @@
             <result property="remark" column="remark" />
             <result property="fileNames" column="fileNames" />
             <result property="filePaths" column="filePaths" />
+            <result property="categoryId" column="categoryId" />
+            <result property="categoryName" column="categoryName" />
             
     </resultMap>
 
@@ -136,23 +138,29 @@
                 <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('filePaths') or colPickMode == 1 and data.containsKey('filePaths')))">
                     a.filePaths,
                 </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('categoryId') or colPickMode == 1 and data.containsKey('categoryId')))">
+                    a.categoryId,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('categoryName') or colPickMode == 1 and data.containsKey('categoryName')))">
+                    a.categoryName,
+                </if>
         </trim>
     </sql>
     <!-- 新增 区分主键自增加还是业务插入 -->
     <insert id="insert" parameterType="CheckAttendRecordEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_xhx_check_attend_record
-        (recordId,staffId,staffName,workNum,deptId,deptName,attendanceGroupId,attendanceGroupName,attendanceDate,ruleId,ruleName,subAddType,score,goOffTimeStr,errorTime,actualAttendTime,errorResult,checkPerson,checkTime,checkDesc,checkResult,checkStatus,createUserId,createTime,updateUserId,updateTime,subMethod,remark,fileNames,filePaths)
+        (recordId,staffId,staffName,workNum,deptId,deptName,attendanceGroupId,attendanceGroupName,attendanceDate,ruleId,ruleName,subAddType,score,goOffTimeStr,errorTime,actualAttendTime,errorResult,checkPerson,checkTime,checkDesc,checkResult,checkStatus,createUserId,createTime,updateUserId,updateTime,subMethod,remark,fileNames,filePaths,categoryId,categoryName)
         VALUES
-        (#{recordId},#{staffId},#{staffName},#{workNum},#{deptId},#{deptName},#{attendanceGroupId},#{attendanceGroupName},#{attendanceDate},#{ruleId},#{ruleName},#{subAddType},#{score},#{goOffTimeStr},#{errorTime},#{actualAttendTime},#{errorResult},#{checkPerson},#{checkTime},#{checkDesc},#{checkResult},#{checkStatus},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{subMethod},#{remark},#{fileNames},#{filePaths})
+        (#{recordId},#{staffId},#{staffName},#{workNum},#{deptId},#{deptName},#{attendanceGroupId},#{attendanceGroupName},#{attendanceDate},#{ruleId},#{ruleName},#{subAddType},#{score},#{goOffTimeStr},#{errorTime},#{actualAttendTime},#{errorResult},#{checkPerson},#{checkTime},#{checkDesc},#{checkResult},#{checkStatus},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{subMethod},#{remark},#{fileNames},#{filePaths},#{categoryId},#{categoryName})
     </insert>
 
     <!-- 批量新增 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_xhx_check_attend_record
-        (recordId,staffId,staffName,workNum,deptId,deptName,attendanceGroupId,attendanceGroupName,attendanceDate,ruleId,ruleName,subAddType,score,goOffTimeStr,errorTime,actualAttendTime,errorResult,checkPerson,checkTime,checkDesc,checkResult,checkStatus,createUserId,createTime,updateUserId,updateTime,subMethod,remark,fileNames,filePaths)
+        (recordId,staffId,staffName,workNum,deptId,deptName,attendanceGroupId,attendanceGroupName,attendanceDate,ruleId,ruleName,subAddType,score,goOffTimeStr,errorTime,actualAttendTime,errorResult,checkPerson,checkTime,checkDesc,checkResult,checkStatus,createUserId,createTime,updateUserId,updateTime,subMethod,remark,fileNames,filePaths,categoryId,categoryName)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.recordId},#{item.staffId},#{item.staffName},#{item.workNum},#{item.deptId},#{item.deptName},#{item.attendanceGroupId},#{item.attendanceGroupName},#{item.attendanceDate},#{item.ruleId},#{item.ruleName},#{item.subAddType},#{item.score},#{item.goOffTimeStr},#{item.errorTime},#{item.actualAttendTime},#{item.errorResult},#{item.checkPerson},#{item.checkTime},#{item.checkDesc},#{item.checkResult},#{item.checkStatus},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.subMethod},#{item.remark},#{item.fileNames},#{item.filePaths})
+            (#{item.recordId},#{item.staffId},#{item.staffName},#{item.workNum},#{item.deptId},#{item.deptName},#{item.attendanceGroupId},#{item.attendanceGroupName},#{item.attendanceDate},#{item.ruleId},#{item.ruleName},#{item.subAddType},#{item.score},#{item.goOffTimeStr},#{item.errorTime},#{item.actualAttendTime},#{item.errorResult},#{item.checkPerson},#{item.checkTime},#{item.checkDesc},#{item.checkResult},#{item.checkStatus},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.subMethod},#{item.remark},#{item.fileNames},#{item.filePaths},#{item.categoryId},#{item.categoryName})
         </foreach>
     </insert>
 
@@ -285,6 +293,15 @@
             <if test="(colPickMode==0 and data.containsKey('filePaths')) or (colPickMode==1 and !data.containsKey('filePaths'))">
                 a.filePaths=#{data.filePaths},
             </if>
+            <if test="(colPickMode==0 and data.containsKey('categoryId')) or (colPickMode==1 and !data.containsKey('categoryId'))">
+                a.categoryId=#{data.categoryId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('categoryIdIncrement')) or (colPickMode==1 and !data.containsKey('categoryIdIncrement'))">
+                a.categoryId=ifnull(a.categoryId,0) + #{data.categoryIdIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('categoryName')) or (colPickMode==1 and !data.containsKey('categoryName'))">
+                a.categoryName=#{data.categoryName},
+            </if>
         </trim>
         <trim suffixOverrides="where" suffix="">
             where
@@ -562,6 +579,25 @@
                         </if>
                     </foreach>
                 </trim>
+                        <trim prefix="categoryId=(case" suffix="ELSE categoryId end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('categoryId')) or (colPickMode==1 and !item.containsKey('categoryId'))">
+                                        when a.id=#{item.id} then #{item.categoryId}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('categoryIdIncrement')) or (colPickMode==1 and !item.containsKey('categoryIdIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.categoryId,0) + #{item.categoryIdIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                <trim prefix="categoryName=(case" suffix="ELSE categoryName end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('categoryName')) or (colPickMode==1 and !item.containsKey('categoryName'))">
+                            when a.id=#{item.id} then #{item.categoryName}
+                        </if>
+                    </foreach>
+                </trim>
         </trim>
         where id in
         <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
@@ -1365,6 +1401,54 @@
                     #{item}
                 </foreach>
             </if>
+            <if test="conditionParamRef.containsKey('categoryId')">
+                <if test="conditionParamRef.categoryId != null ">
+                    ${_conditionType_} a.categoryId = #{${_conditionParam_}.categoryId}
+                </if>
+                <if test="conditionParamRef.categoryId == null">
+                    ${_conditionType_} a.categoryId is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('categoryIdList') and conditionParamRef.categoryIdList.size() > 0">
+                ${_conditionType_} a.categoryId in
+                <foreach collection="conditionParamRef.categoryIdList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('categoryIdNotList') and conditionParamRef.categoryIdNotList.size() > 0">
+                ${_conditionType_} a.categoryId not in
+                <foreach collection="conditionParamRef.categoryIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('categoryIdStart') and conditionParamRef.categoryIdStart != null">
+                ${_conditionType_} a.categoryId <![CDATA[ >= ]]> #{${_conditionParam_}.categoryIdStart}
+            </if>
+            <if test="conditionParamRef.containsKey('categoryIdEnd') and conditionParamRef.categoryIdEnd != null">
+                ${_conditionType_} a.categoryId <![CDATA[ <= ]]> #{${_conditionParam_}.categoryIdEnd}
+            </if>
+
+
+            <if test="conditionParamRef.containsKey('categoryName')">
+                <if test="conditionParamRef.categoryName != null and conditionParamRef.categoryName != ''">
+                    ${_conditionType_} a.categoryName like #{${_conditionParam_}.categoryName}
+                </if>
+                <if test="conditionParamRef.categoryName == null">
+                    ${_conditionType_} a.categoryName is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('categoryNameList') and conditionParamRef.categoryNameList.size() > 0">
+                ${_conditionType_} a.categoryName in
+                <foreach collection="conditionParamRef.categoryNameList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('categoryNameNotList') and conditionParamRef.categoryNameNotList.size() > 0">
+                ${_conditionType_} a.categoryName not in
+                <foreach collection="conditionParamRef.categoryNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
     </sql>
     <sql id="_orderCols_">
         <if test="orderColList != null and !orderColList.isEmpty()">
@@ -1533,6 +1617,16 @@
                         <if test='orderCol.filePaths != null and "DESC".equalsIgnoreCase(orderCol.filePaths)'>DESC</if>
                         ,
                     </if>
+                    <if test="orderCol.containsKey('categoryId')">
+                        a.categoryId
+                        <if test='orderCol.categoryId != null and "DESC".equalsIgnoreCase(orderCol.categoryId)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('categoryName')">
+                        a.categoryName
+                        <if test='orderCol.categoryName != null and "DESC".equalsIgnoreCase(orderCol.categoryName)'>DESC</if>
+                        ,
+                    </if>
             </trim>
         </if>
     </sql>

attendance-performance-manager/src/main/resources/sqlmap/module/check/CheckComplainRecordMapper.xml

@@ -38,6 +38,8 @@
             <result property="updateTime" column="updateTime" />
             <result property="fileNames" column="fileNames" />
             <result property="filePaths" column="filePaths" />
+            <result property="categoryId" column="categoryId" />
+            <result property="categoryName" column="categoryName" />
             
     </resultMap>
 
@@ -144,23 +146,29 @@
                 <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('filePaths') or colPickMode == 1 and data.containsKey('filePaths')))">
                     a.filePaths,
                 </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('categoryId') or colPickMode == 1 and data.containsKey('categoryId')))">
+                    a.categoryId,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('categoryName') or colPickMode == 1 and data.containsKey('categoryName')))">
+                    a.categoryName,
+                </if>
         </trim>
     </sql>
     <!-- 新增 区分主键自增加还是业务插入 -->
     <insert id="insert" parameterType="CheckComplainRecordEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_xhx_check_complain_record
-        (recordId,staffId,staffName,workNum,windowNum,deptId,deptName,complainTitle,complainContent,complainRealName,contact,complainTime,complainSource,complainDevice,ruleId,ruleName,subMethod,deductPerson,deductTime,score,checkPerson,checkTime,checkDesc,checkResult,checkStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths)
+        (recordId,staffId,staffName,workNum,windowNum,deptId,deptName,complainTitle,complainContent,complainRealName,contact,complainTime,complainSource,complainDevice,ruleId,ruleName,subMethod,deductPerson,deductTime,score,checkPerson,checkTime,checkDesc,checkResult,checkStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths,categoryId,categoryName)
         VALUES
-        (#{recordId},#{staffId},#{staffName},#{workNum},#{windowNum},#{deptId},#{deptName},#{complainTitle},#{complainContent},#{complainRealName},#{contact},#{complainTime},#{complainSource},#{complainDevice},#{ruleId},#{ruleName},#{subMethod},#{deductPerson},#{deductTime},#{score},#{checkPerson},#{checkTime},#{checkDesc},#{checkResult},#{checkStatus},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{fileNames},#{filePaths})
+        (#{recordId},#{staffId},#{staffName},#{workNum},#{windowNum},#{deptId},#{deptName},#{complainTitle},#{complainContent},#{complainRealName},#{contact},#{complainTime},#{complainSource},#{complainDevice},#{ruleId},#{ruleName},#{subMethod},#{deductPerson},#{deductTime},#{score},#{checkPerson},#{checkTime},#{checkDesc},#{checkResult},#{checkStatus},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{fileNames},#{filePaths},#{categoryId},#{categoryName})
     </insert>
 
     <!-- 批量新增 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_xhx_check_complain_record
-        (recordId,staffId,staffName,workNum,windowNum,deptId,deptName,complainTitle,complainContent,complainRealName,contact,complainTime,complainSource,complainDevice,ruleId,ruleName,subMethod,deductPerson,deductTime,score,checkPerson,checkTime,checkDesc,checkResult,checkStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths)
+        (recordId,staffId,staffName,workNum,windowNum,deptId,deptName,complainTitle,complainContent,complainRealName,contact,complainTime,complainSource,complainDevice,ruleId,ruleName,subMethod,deductPerson,deductTime,score,checkPerson,checkTime,checkDesc,checkResult,checkStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths,categoryId,categoryName)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.recordId},#{item.staffId},#{item.staffName},#{item.workNum},#{item.windowNum},#{item.deptId},#{item.deptName},#{item.complainTitle},#{item.complainContent},#{item.complainRealName},#{item.contact},#{item.complainTime},#{item.complainSource},#{item.complainDevice},#{item.ruleId},#{item.ruleName},#{item.subMethod},#{item.deductPerson},#{item.deductTime},#{item.score},#{item.checkPerson},#{item.checkTime},#{item.checkDesc},#{item.checkResult},#{item.checkStatus},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.fileNames},#{item.filePaths})
+            (#{item.recordId},#{item.staffId},#{item.staffName},#{item.workNum},#{item.windowNum},#{item.deptId},#{item.deptName},#{item.complainTitle},#{item.complainContent},#{item.complainRealName},#{item.contact},#{item.complainTime},#{item.complainSource},#{item.complainDevice},#{item.ruleId},#{item.ruleName},#{item.subMethod},#{item.deductPerson},#{item.deductTime},#{item.score},#{item.checkPerson},#{item.checkTime},#{item.checkDesc},#{item.checkResult},#{item.checkStatus},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.fileNames},#{item.filePaths},#{item.categoryId},#{item.categoryName})
         </foreach>
     </insert>
 
@@ -293,6 +301,15 @@
             <if test="(colPickMode==0 and data.containsKey('filePaths')) or (colPickMode==1 and !data.containsKey('filePaths'))">
                 a.filePaths=#{data.filePaths},
             </if>
+            <if test="(colPickMode==0 and data.containsKey('categoryId')) or (colPickMode==1 and !data.containsKey('categoryId'))">
+                a.categoryId=#{data.categoryId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('categoryIdIncrement')) or (colPickMode==1 and !data.containsKey('categoryIdIncrement'))">
+                a.categoryId=ifnull(a.categoryId,0) + #{data.categoryIdIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('categoryName')) or (colPickMode==1 and !data.containsKey('categoryName'))">
+                a.categoryName=#{data.categoryName},
+            </if>
         </trim>
         <trim suffixOverrides="where" suffix="">
             where
@@ -574,6 +591,25 @@
                         </if>
                     </foreach>
                 </trim>
+                        <trim prefix="categoryId=(case" suffix="ELSE categoryId end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('categoryId')) or (colPickMode==1 and !item.containsKey('categoryId'))">
+                                        when a.id=#{item.id} then #{item.categoryId}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('categoryIdIncrement')) or (colPickMode==1 and !item.containsKey('categoryIdIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.categoryId,0) + #{item.categoryIdIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                <trim prefix="categoryName=(case" suffix="ELSE categoryName end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('categoryName')) or (colPickMode==1 and !item.containsKey('categoryName'))">
+                            when a.id=#{item.id} then #{item.categoryName}
+                        </if>
+                    </foreach>
+                </trim>
         </trim>
         where id in
         <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
@@ -1413,6 +1449,54 @@
                     #{item}
                 </foreach>
             </if>
+            <if test="conditionParamRef.containsKey('categoryId')">
+                <if test="conditionParamRef.categoryId != null ">
+                    ${_conditionType_} a.categoryId = #{${_conditionParam_}.categoryId}
+                </if>
+                <if test="conditionParamRef.categoryId == null">
+                    ${_conditionType_} a.categoryId is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('categoryIdList') and conditionParamRef.categoryIdList.size() > 0">
+                ${_conditionType_} a.categoryId in
+                <foreach collection="conditionParamRef.categoryIdList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('categoryIdNotList') and conditionParamRef.categoryIdNotList.size() > 0">
+                ${_conditionType_} a.categoryId not in
+                <foreach collection="conditionParamRef.categoryIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('categoryIdStart') and conditionParamRef.categoryIdStart != null">
+                ${_conditionType_} a.categoryId <![CDATA[ >= ]]> #{${_conditionParam_}.categoryIdStart}
+            </if>
+            <if test="conditionParamRef.containsKey('categoryIdEnd') and conditionParamRef.categoryIdEnd != null">
+                ${_conditionType_} a.categoryId <![CDATA[ <= ]]> #{${_conditionParam_}.categoryIdEnd}
+            </if>
+
+
+            <if test="conditionParamRef.containsKey('categoryName')">
+                <if test="conditionParamRef.categoryName != null and conditionParamRef.categoryName != ''">
+                    ${_conditionType_} a.categoryName like #{${_conditionParam_}.categoryName}
+                </if>
+                <if test="conditionParamRef.categoryName == null">
+                    ${_conditionType_} a.categoryName is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('categoryNameList') and conditionParamRef.categoryNameList.size() > 0">
+                ${_conditionType_} a.categoryName in
+                <foreach collection="conditionParamRef.categoryNameList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('categoryNameNotList') and conditionParamRef.categoryNameNotList.size() > 0">
+                ${_conditionType_} a.categoryName not in
+                <foreach collection="conditionParamRef.categoryNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
     </sql>
     <sql id="_orderCols_">
         <if test="orderColList != null and !orderColList.isEmpty()">
@@ -1591,6 +1675,16 @@
                         <if test='orderCol.filePaths != null and "DESC".equalsIgnoreCase(orderCol.filePaths)'>DESC</if>
                         ,
                     </if>
+                    <if test="orderCol.containsKey('categoryId')">
+                        a.categoryId
+                        <if test='orderCol.categoryId != null and "DESC".equalsIgnoreCase(orderCol.categoryId)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('categoryName')">
+                        a.categoryName
+                        <if test='orderCol.categoryName != null and "DESC".equalsIgnoreCase(orderCol.categoryName)'>DESC</if>
+                        ,
+                    </if>
             </trim>
         </if>
     </sql>

attendance-performance-manager/src/main/resources/sqlmap/module/check/CheckEffectRecordMapper.xml

@@ -36,6 +36,8 @@
             <result property="updateTime" column="updateTime" />
             <result property="fileNames" column="fileNames" />
             <result property="filePaths" column="filePaths" />
+            <result property="categoryId" column="categoryId" />
+            <result property="categoryName" column="categoryName" />
             
     </resultMap>
 
@@ -136,23 +138,29 @@
                 <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('filePaths') or colPickMode == 1 and data.containsKey('filePaths')))">
                     a.filePaths,
                 </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('categoryId') or colPickMode == 1 and data.containsKey('categoryId')))">
+                    a.categoryId,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('categoryName') or colPickMode == 1 and data.containsKey('categoryName')))">
+                    a.categoryName,
+                </if>
         </trim>
     </sql>
     <!-- 新增 区分主键自增加还是业务插入 -->
     <insert id="insert" parameterType="CheckEffectRecordEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_xhx_check_effect_record
-        (recordId,staffId,staffName,workNum,windowNum,deptId,deptName,irregularType,happenTime,duration,alarmTime,snapPath,ruleId,ruleName,subMethod,deductPerson,deductTime,score,checkPerson,checkTime,checkDesc,checkResult,checkStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths)
+        (recordId,staffId,staffName,workNum,windowNum,deptId,deptName,irregularType,happenTime,duration,alarmTime,snapPath,ruleId,ruleName,subMethod,deductPerson,deductTime,score,checkPerson,checkTime,checkDesc,checkResult,checkStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths,categoryId,categoryName)
         VALUES
-        (#{recordId},#{staffId},#{staffName},#{workNum},#{windowNum},#{deptId},#{deptName},#{irregularType},#{happenTime},#{duration},#{alarmTime},#{snapPath},#{ruleId},#{ruleName},#{subMethod},#{deductPerson},#{deductTime},#{score},#{checkPerson},#{checkTime},#{checkDesc},#{checkResult},#{checkStatus},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{fileNames},#{filePaths})
+        (#{recordId},#{staffId},#{staffName},#{workNum},#{windowNum},#{deptId},#{deptName},#{irregularType},#{happenTime},#{duration},#{alarmTime},#{snapPath},#{ruleId},#{ruleName},#{subMethod},#{deductPerson},#{deductTime},#{score},#{checkPerson},#{checkTime},#{checkDesc},#{checkResult},#{checkStatus},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{fileNames},#{filePaths},#{categoryId},#{categoryName})
     </insert>
 
     <!-- 批量新增 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_xhx_check_effect_record
-        (recordId,staffId,staffName,workNum,windowNum,deptId,deptName,irregularType,happenTime,duration,alarmTime,snapPath,ruleId,ruleName,subMethod,deductPerson,deductTime,score,checkPerson,checkTime,checkDesc,checkResult,checkStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths)
+        (recordId,staffId,staffName,workNum,windowNum,deptId,deptName,irregularType,happenTime,duration,alarmTime,snapPath,ruleId,ruleName,subMethod,deductPerson,deductTime,score,checkPerson,checkTime,checkDesc,checkResult,checkStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths,categoryId,categoryName)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.recordId},#{item.staffId},#{item.staffName},#{item.workNum},#{item.windowNum},#{item.deptId},#{item.deptName},#{item.irregularType},#{item.happenTime},#{item.duration},#{item.alarmTime},#{item.snapPath},#{item.ruleId},#{item.ruleName},#{item.subMethod},#{item.deductPerson},#{item.deductTime},#{item.score},#{item.checkPerson},#{item.checkTime},#{item.checkDesc},#{item.checkResult},#{item.checkStatus},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.fileNames},#{item.filePaths})
+            (#{item.recordId},#{item.staffId},#{item.staffName},#{item.workNum},#{item.windowNum},#{item.deptId},#{item.deptName},#{item.irregularType},#{item.happenTime},#{item.duration},#{item.alarmTime},#{item.snapPath},#{item.ruleId},#{item.ruleName},#{item.subMethod},#{item.deductPerson},#{item.deductTime},#{item.score},#{item.checkPerson},#{item.checkTime},#{item.checkDesc},#{item.checkResult},#{item.checkStatus},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.fileNames},#{item.filePaths},#{item.categoryId},#{item.categoryName})
         </foreach>
     </insert>
 
@@ -285,6 +293,15 @@
             <if test="(colPickMode==0 and data.containsKey('filePaths')) or (colPickMode==1 and !data.containsKey('filePaths'))">
                 a.filePaths=#{data.filePaths},
             </if>
+            <if test="(colPickMode==0 and data.containsKey('categoryId')) or (colPickMode==1 and !data.containsKey('categoryId'))">
+                a.categoryId=#{data.categoryId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('categoryIdIncrement')) or (colPickMode==1 and !data.containsKey('categoryIdIncrement'))">
+                a.categoryId=ifnull(a.categoryId,0) + #{data.categoryIdIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('categoryName')) or (colPickMode==1 and !data.containsKey('categoryName'))">
+                a.categoryName=#{data.categoryName},
+            </if>
         </trim>
         <trim suffixOverrides="where" suffix="">
             where
@@ -562,6 +579,25 @@
                         </if>
                     </foreach>
                 </trim>
+                        <trim prefix="categoryId=(case" suffix="ELSE categoryId end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('categoryId')) or (colPickMode==1 and !item.containsKey('categoryId'))">
+                                        when a.id=#{item.id} then #{item.categoryId}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('categoryIdIncrement')) or (colPickMode==1 and !item.containsKey('categoryIdIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.categoryId,0) + #{item.categoryIdIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                <trim prefix="categoryName=(case" suffix="ELSE categoryName end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('categoryName')) or (colPickMode==1 and !item.containsKey('categoryName'))">
+                            when a.id=#{item.id} then #{item.categoryName}
+                        </if>
+                    </foreach>
+                </trim>
         </trim>
         where id in
         <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
@@ -1365,6 +1401,54 @@
                     #{item}
                 </foreach>
             </if>
+            <if test="conditionParamRef.containsKey('categoryId')">
+                <if test="conditionParamRef.categoryId != null ">
+                    ${_conditionType_} a.categoryId = #{${_conditionParam_}.categoryId}
+                </if>
+                <if test="conditionParamRef.categoryId == null">
+                    ${_conditionType_} a.categoryId is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('categoryIdList') and conditionParamRef.categoryIdList.size() > 0">
+                ${_conditionType_} a.categoryId in
+                <foreach collection="conditionParamRef.categoryIdList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('categoryIdNotList') and conditionParamRef.categoryIdNotList.size() > 0">
+                ${_conditionType_} a.categoryId not in
+                <foreach collection="conditionParamRef.categoryIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('categoryIdStart') and conditionParamRef.categoryIdStart != null">
+                ${_conditionType_} a.categoryId <![CDATA[ >= ]]> #{${_conditionParam_}.categoryIdStart}
+            </if>
+            <if test="conditionParamRef.containsKey('categoryIdEnd') and conditionParamRef.categoryIdEnd != null">
+                ${_conditionType_} a.categoryId <![CDATA[ <= ]]> #{${_conditionParam_}.categoryIdEnd}
+            </if>
+
+
+            <if test="conditionParamRef.containsKey('categoryName')">
+                <if test="conditionParamRef.categoryName != null and conditionParamRef.categoryName != ''">
+                    ${_conditionType_} a.categoryName like #{${_conditionParam_}.categoryName}
+                </if>
+                <if test="conditionParamRef.categoryName == null">
+                    ${_conditionType_} a.categoryName is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('categoryNameList') and conditionParamRef.categoryNameList.size() > 0">
+                ${_conditionType_} a.categoryName in
+                <foreach collection="conditionParamRef.categoryNameList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('categoryNameNotList') and conditionParamRef.categoryNameNotList.size() > 0">
+                ${_conditionType_} a.categoryName not in
+                <foreach collection="conditionParamRef.categoryNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
     </sql>
     <sql id="_orderCols_">
         <if test="orderColList != null and !orderColList.isEmpty()">
@@ -1533,6 +1617,16 @@
                         <if test='orderCol.filePaths != null and "DESC".equalsIgnoreCase(orderCol.filePaths)'>DESC</if>
                         ,
                     </if>
+                    <if test="orderCol.containsKey('categoryId')">
+                        a.categoryId
+                        <if test='orderCol.categoryId != null and "DESC".equalsIgnoreCase(orderCol.categoryId)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('categoryName')">
+                        a.categoryName
+                        <if test='orderCol.categoryName != null and "DESC".equalsIgnoreCase(orderCol.categoryName)'>DESC</if>
+                        ,
+                    </if>
             </trim>
         </if>
     </sql>

attendance-performance-manager/src/main/resources/sqlmap/module/check/CheckGoworkRecordMapper.xml

@@ -35,6 +35,8 @@
             <result property="updateTime" column="updateTime" />
             <result property="fileNames" column="fileNames" />
             <result property="filePaths" column="filePaths" />
+            <result property="categoryId" column="categoryId" />
+            <result property="categoryName" column="categoryName" />
             
     </resultMap>
 
@@ -132,23 +134,29 @@
                 <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('filePaths') or colPickMode == 1 and data.containsKey('filePaths')))">
                     a.filePaths,
                 </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('categoryId') or colPickMode == 1 and data.containsKey('categoryId')))">
+                    a.categoryId,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('categoryName') or colPickMode == 1 and data.containsKey('categoryName')))">
+                    a.categoryName,
+                </if>
         </trim>
     </sql>
     <!-- 新增 区分主键自增加还是业务插入 -->
     <insert id="insert" parameterType="CheckGoworkRecordEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_xhx_check_gowork_record
-        (recordId,staffId,staffName,workNum,windowNum,deptId,deptName,goworkCode,goworkDepts,matterlName,goworkTime,ruleId,ruleName,subMethod,deductPerson,deductTime,score,checkPerson,checkTime,checkDesc,checkResult,checkStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths)
+        (recordId,staffId,staffName,workNum,windowNum,deptId,deptName,goworkCode,goworkDepts,matterlName,goworkTime,ruleId,ruleName,subMethod,deductPerson,deductTime,score,checkPerson,checkTime,checkDesc,checkResult,checkStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths,categoryId,categoryName)
         VALUES
-        (#{recordId},#{staffId},#{staffName},#{workNum},#{windowNum},#{deptId},#{deptName},#{goworkCode},#{goworkDepts},#{matterlName},#{goworkTime},#{ruleId},#{ruleName},#{subMethod},#{deductPerson},#{deductTime},#{score},#{checkPerson},#{checkTime},#{checkDesc},#{checkResult},#{checkStatus},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{fileNames},#{filePaths})
+        (#{recordId},#{staffId},#{staffName},#{workNum},#{windowNum},#{deptId},#{deptName},#{goworkCode},#{goworkDepts},#{matterlName},#{goworkTime},#{ruleId},#{ruleName},#{subMethod},#{deductPerson},#{deductTime},#{score},#{checkPerson},#{checkTime},#{checkDesc},#{checkResult},#{checkStatus},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{fileNames},#{filePaths},#{categoryId},#{categoryName})
     </insert>
 
     <!-- 批量新增 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_xhx_check_gowork_record
-        (recordId,staffId,staffName,workNum,windowNum,deptId,deptName,goworkCode,goworkDepts,matterlName,goworkTime,ruleId,ruleName,subMethod,deductPerson,deductTime,score,checkPerson,checkTime,checkDesc,checkResult,checkStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths)
+        (recordId,staffId,staffName,workNum,windowNum,deptId,deptName,goworkCode,goworkDepts,matterlName,goworkTime,ruleId,ruleName,subMethod,deductPerson,deductTime,score,checkPerson,checkTime,checkDesc,checkResult,checkStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths,categoryId,categoryName)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.recordId},#{item.staffId},#{item.staffName},#{item.workNum},#{item.windowNum},#{item.deptId},#{item.deptName},#{item.goworkCode},#{item.goworkDepts},#{item.matterlName},#{item.goworkTime},#{item.ruleId},#{item.ruleName},#{item.subMethod},#{item.deductPerson},#{item.deductTime},#{item.score},#{item.checkPerson},#{item.checkTime},#{item.checkDesc},#{item.checkResult},#{item.checkStatus},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.fileNames},#{item.filePaths})
+            (#{item.recordId},#{item.staffId},#{item.staffName},#{item.workNum},#{item.windowNum},#{item.deptId},#{item.deptName},#{item.goworkCode},#{item.goworkDepts},#{item.matterlName},#{item.goworkTime},#{item.ruleId},#{item.ruleName},#{item.subMethod},#{item.deductPerson},#{item.deductTime},#{item.score},#{item.checkPerson},#{item.checkTime},#{item.checkDesc},#{item.checkResult},#{item.checkStatus},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.fileNames},#{item.filePaths},#{item.categoryId},#{item.categoryName})
         </foreach>
     </insert>
 
@@ -272,6 +280,15 @@
             <if test="(colPickMode==0 and data.containsKey('filePaths')) or (colPickMode==1 and !data.containsKey('filePaths'))">
                 a.filePaths=#{data.filePaths},
             </if>
+            <if test="(colPickMode==0 and data.containsKey('categoryId')) or (colPickMode==1 and !data.containsKey('categoryId'))">
+                a.categoryId=#{data.categoryId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('categoryIdIncrement')) or (colPickMode==1 and !data.containsKey('categoryIdIncrement'))">
+                a.categoryId=ifnull(a.categoryId,0) + #{data.categoryIdIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('categoryName')) or (colPickMode==1 and !data.containsKey('categoryName'))">
+                a.categoryName=#{data.categoryName},
+            </if>
         </trim>
         <trim suffixOverrides="where" suffix="">
             where
@@ -532,6 +549,25 @@
                         </if>
                     </foreach>
                 </trim>
+                        <trim prefix="categoryId=(case" suffix="ELSE categoryId end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('categoryId')) or (colPickMode==1 and !item.containsKey('categoryId'))">
+                                        when a.id=#{item.id} then #{item.categoryId}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('categoryIdIncrement')) or (colPickMode==1 and !item.containsKey('categoryIdIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.categoryId,0) + #{item.categoryIdIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                <trim prefix="categoryName=(case" suffix="ELSE categoryName end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('categoryName')) or (colPickMode==1 and !item.containsKey('categoryName'))">
+                            when a.id=#{item.id} then #{item.categoryName}
+                        </if>
+                    </foreach>
+                </trim>
         </trim>
         where id in
         <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
@@ -1308,6 +1344,54 @@
                     #{item}
                 </foreach>
             </if>
+            <if test="conditionParamRef.containsKey('categoryId')">
+                <if test="conditionParamRef.categoryId != null ">
+                    ${_conditionType_} a.categoryId = #{${_conditionParam_}.categoryId}
+                </if>
+                <if test="conditionParamRef.categoryId == null">
+                    ${_conditionType_} a.categoryId is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('categoryIdList') and conditionParamRef.categoryIdList.size() > 0">
+                ${_conditionType_} a.categoryId in
+                <foreach collection="conditionParamRef.categoryIdList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('categoryIdNotList') and conditionParamRef.categoryIdNotList.size() > 0">
+                ${_conditionType_} a.categoryId not in
+                <foreach collection="conditionParamRef.categoryIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('categoryIdStart') and conditionParamRef.categoryIdStart != null">
+                ${_conditionType_} a.categoryId <![CDATA[ >= ]]> #{${_conditionParam_}.categoryIdStart}
+            </if>
+            <if test="conditionParamRef.containsKey('categoryIdEnd') and conditionParamRef.categoryIdEnd != null">
+                ${_conditionType_} a.categoryId <![CDATA[ <= ]]> #{${_conditionParam_}.categoryIdEnd}
+            </if>
+
+
+            <if test="conditionParamRef.containsKey('categoryName')">
+                <if test="conditionParamRef.categoryName != null and conditionParamRef.categoryName != ''">
+                    ${_conditionType_} a.categoryName like #{${_conditionParam_}.categoryName}
+                </if>
+                <if test="conditionParamRef.categoryName == null">
+                    ${_conditionType_} a.categoryName is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('categoryNameList') and conditionParamRef.categoryNameList.size() > 0">
+                ${_conditionType_} a.categoryName in
+                <foreach collection="conditionParamRef.categoryNameList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('categoryNameNotList') and conditionParamRef.categoryNameNotList.size() > 0">
+                ${_conditionType_} a.categoryName not in
+                <foreach collection="conditionParamRef.categoryNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
     </sql>
     <sql id="_orderCols_">
         <if test="orderColList != null and !orderColList.isEmpty()">
@@ -1471,6 +1555,16 @@
                         <if test='orderCol.filePaths != null and "DESC".equalsIgnoreCase(orderCol.filePaths)'>DESC</if>
                         ,
                     </if>
+                    <if test="orderCol.containsKey('categoryId')">
+                        a.categoryId
+                        <if test='orderCol.categoryId != null and "DESC".equalsIgnoreCase(orderCol.categoryId)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('categoryName')">
+                        a.categoryName
+                        <if test='orderCol.categoryName != null and "DESC".equalsIgnoreCase(orderCol.categoryName)'>DESC</if>
+                        ,
+                    </if>
             </trim>
         </if>
     </sql>

attendance-performance-manager/src/main/resources/sqlmap/module/check/CheckOtherRecordMapper.xml

@@ -35,6 +35,8 @@
             <result property="updateTime" column="updateTime" />
             <result property="fileNames" column="fileNames" />
             <result property="filePaths" column="filePaths" />
+            <result property="categoryId" column="categoryId" />
+            <result property="categoryName" column="categoryName" />
             
     </resultMap>
 
@@ -132,23 +134,29 @@
                 <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('filePaths') or colPickMode == 1 and data.containsKey('filePaths')))">
                     a.filePaths,
                 </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('categoryId') or colPickMode == 1 and data.containsKey('categoryId')))">
+                    a.categoryId,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('categoryName') or colPickMode == 1 and data.containsKey('categoryName')))">
+                    a.categoryName,
+                </if>
         </trim>
     </sql>
     <!-- 新增 区分主键自增加还是业务插入 -->
     <insert id="insert" parameterType="CheckOtherRecordEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_xhx_check_other_record
-        (recordId,staffId,staffName,workNum,deptId,deptName,windowNum,irregularOtherType,happenTime,duration,ruleId,ruleName,ruleDesc,subMethod,deductPerson,deductTime,score,checkPerson,checkTime,checkDesc,checkResult,checkStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths)
+        (recordId,staffId,staffName,workNum,deptId,deptName,windowNum,irregularOtherType,happenTime,duration,ruleId,ruleName,ruleDesc,subMethod,deductPerson,deductTime,score,checkPerson,checkTime,checkDesc,checkResult,checkStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths,categoryId,categoryName)
         VALUES
-        (#{recordId},#{staffId},#{staffName},#{workNum},#{deptId},#{deptName},#{windowNum},#{irregularOtherType},#{happenTime},#{duration},#{ruleId},#{ruleName},#{ruleDesc},#{subMethod},#{deductPerson},#{deductTime},#{score},#{checkPerson},#{checkTime},#{checkDesc},#{checkResult},#{checkStatus},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{fileNames},#{filePaths})
+        (#{recordId},#{staffId},#{staffName},#{workNum},#{deptId},#{deptName},#{windowNum},#{irregularOtherType},#{happenTime},#{duration},#{ruleId},#{ruleName},#{ruleDesc},#{subMethod},#{deductPerson},#{deductTime},#{score},#{checkPerson},#{checkTime},#{checkDesc},#{checkResult},#{checkStatus},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{fileNames},#{filePaths},#{categoryId},#{categoryName})
     </insert>
 
     <!-- 批量新增 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_xhx_check_other_record
-        (recordId,staffId,staffName,workNum,deptId,deptName,windowNum,irregularOtherType,happenTime,duration,ruleId,ruleName,ruleDesc,subMethod,deductPerson,deductTime,score,checkPerson,checkTime,checkDesc,checkResult,checkStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths)
+        (recordId,staffId,staffName,workNum,deptId,deptName,windowNum,irregularOtherType,happenTime,duration,ruleId,ruleName,ruleDesc,subMethod,deductPerson,deductTime,score,checkPerson,checkTime,checkDesc,checkResult,checkStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths,categoryId,categoryName)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.recordId},#{item.staffId},#{item.staffName},#{item.workNum},#{item.deptId},#{item.deptName},#{item.windowNum},#{item.irregularOtherType},#{item.happenTime},#{item.duration},#{item.ruleId},#{item.ruleName},#{item.ruleDesc},#{item.subMethod},#{item.deductPerson},#{item.deductTime},#{item.score},#{item.checkPerson},#{item.checkTime},#{item.checkDesc},#{item.checkResult},#{item.checkStatus},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.fileNames},#{item.filePaths})
+            (#{item.recordId},#{item.staffId},#{item.staffName},#{item.workNum},#{item.deptId},#{item.deptName},#{item.windowNum},#{item.irregularOtherType},#{item.happenTime},#{item.duration},#{item.ruleId},#{item.ruleName},#{item.ruleDesc},#{item.subMethod},#{item.deductPerson},#{item.deductTime},#{item.score},#{item.checkPerson},#{item.checkTime},#{item.checkDesc},#{item.checkResult},#{item.checkStatus},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.fileNames},#{item.filePaths},#{item.categoryId},#{item.categoryName})
         </foreach>
     </insert>
 
@@ -278,6 +286,15 @@
             <if test="(colPickMode==0 and data.containsKey('filePaths')) or (colPickMode==1 and !data.containsKey('filePaths'))">
                 a.filePaths=#{data.filePaths},
             </if>
+            <if test="(colPickMode==0 and data.containsKey('categoryId')) or (colPickMode==1 and !data.containsKey('categoryId'))">
+                a.categoryId=#{data.categoryId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('categoryIdIncrement')) or (colPickMode==1 and !data.containsKey('categoryIdIncrement'))">
+                a.categoryId=ifnull(a.categoryId,0) + #{data.categoryIdIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('categoryName')) or (colPickMode==1 and !data.containsKey('categoryName'))">
+                a.categoryName=#{data.categoryName},
+            </if>
         </trim>
         <trim suffixOverrides="where" suffix="">
             where
@@ -548,6 +565,25 @@
                         </if>
                     </foreach>
                 </trim>
+                        <trim prefix="categoryId=(case" suffix="ELSE categoryId end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('categoryId')) or (colPickMode==1 and !item.containsKey('categoryId'))">
+                                        when a.id=#{item.id} then #{item.categoryId}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('categoryIdIncrement')) or (colPickMode==1 and !item.containsKey('categoryIdIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.categoryId,0) + #{item.categoryIdIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                <trim prefix="categoryName=(case" suffix="ELSE categoryName end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('categoryName')) or (colPickMode==1 and !item.containsKey('categoryName'))">
+                            when a.id=#{item.id} then #{item.categoryName}
+                        </if>
+                    </foreach>
+                </trim>
         </trim>
         where id in
         <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
@@ -1336,6 +1372,54 @@
                     #{item}
                 </foreach>
             </if>
+            <if test="conditionParamRef.containsKey('categoryId')">
+                <if test="conditionParamRef.categoryId != null ">
+                    ${_conditionType_} a.categoryId = #{${_conditionParam_}.categoryId}
+                </if>
+                <if test="conditionParamRef.categoryId == null">
+                    ${_conditionType_} a.categoryId is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('categoryIdList') and conditionParamRef.categoryIdList.size() > 0">
+                ${_conditionType_} a.categoryId in
+                <foreach collection="conditionParamRef.categoryIdList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('categoryIdNotList') and conditionParamRef.categoryIdNotList.size() > 0">
+                ${_conditionType_} a.categoryId not in
+                <foreach collection="conditionParamRef.categoryIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('categoryIdStart') and conditionParamRef.categoryIdStart != null">
+                ${_conditionType_} a.categoryId <![CDATA[ >= ]]> #{${_conditionParam_}.categoryIdStart}
+            </if>
+            <if test="conditionParamRef.containsKey('categoryIdEnd') and conditionParamRef.categoryIdEnd != null">
+                ${_conditionType_} a.categoryId <![CDATA[ <= ]]> #{${_conditionParam_}.categoryIdEnd}
+            </if>
+
+
+            <if test="conditionParamRef.containsKey('categoryName')">
+                <if test="conditionParamRef.categoryName != null and conditionParamRef.categoryName != ''">
+                    ${_conditionType_} a.categoryName like #{${_conditionParam_}.categoryName}
+                </if>
+                <if test="conditionParamRef.categoryName == null">
+                    ${_conditionType_} a.categoryName is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('categoryNameList') and conditionParamRef.categoryNameList.size() > 0">
+                ${_conditionType_} a.categoryName in
+                <foreach collection="conditionParamRef.categoryNameList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('categoryNameNotList') and conditionParamRef.categoryNameNotList.size() > 0">
+                ${_conditionType_} a.categoryName not in
+                <foreach collection="conditionParamRef.categoryNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
     </sql>
     <sql id="_orderCols_">
         <if test="orderColList != null and !orderColList.isEmpty()">
@@ -1499,6 +1583,16 @@
                         <if test='orderCol.filePaths != null and "DESC".equalsIgnoreCase(orderCol.filePaths)'>DESC</if>
                         ,
                     </if>
+                    <if test="orderCol.containsKey('categoryId')">
+                        a.categoryId
+                        <if test='orderCol.categoryId != null and "DESC".equalsIgnoreCase(orderCol.categoryId)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('categoryName')">
+                        a.categoryName
+                        <if test='orderCol.categoryName != null and "DESC".equalsIgnoreCase(orderCol.categoryName)'>DESC</if>
+                        ,
+                    </if>
             </trim>
         </if>
     </sql>

attendance-performance-manager/src/main/resources/sqlmap/module/check/CheckReviewRecordMapper.xml

@@ -35,6 +35,8 @@
             <result property="updateTime" column="updateTime" />
             <result property="fileNames" column="fileNames" />
             <result property="filePaths" column="filePaths" />
+            <result property="categoryId" column="categoryId" />
+            <result property="categoryName" column="categoryName" />
             
     </resultMap>
 
@@ -132,23 +134,29 @@
                 <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('filePaths') or colPickMode == 1 and data.containsKey('filePaths')))">
                     a.filePaths,
                 </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('categoryId') or colPickMode == 1 and data.containsKey('categoryId')))">
+                    a.categoryId,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('categoryName') or colPickMode == 1 and data.containsKey('categoryName')))">
+                    a.categoryName,
+                </if>
         </trim>
     </sql>
     <!-- 新增 区分主键自增加还是业务插入 -->
     <insert id="insert" parameterType="CheckReviewRecordEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_xhx_check_review_record
-        (recordId,staffId,staffName,workNum,windowNum,deptId,deptName,reviewResult,reviewTime,reviewSource,reviewDevice,ruleId,ruleName,subMethod,deductPerson,deductTime,score,checkPerson,checkTime,checkDesc,checkResult,checkStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths)
+        (recordId,staffId,staffName,workNum,windowNum,deptId,deptName,reviewResult,reviewTime,reviewSource,reviewDevice,ruleId,ruleName,subMethod,deductPerson,deductTime,score,checkPerson,checkTime,checkDesc,checkResult,checkStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths,categoryId,categoryName)
         VALUES
-        (#{recordId},#{staffId},#{staffName},#{workNum},#{windowNum},#{deptId},#{deptName},#{reviewResult},#{reviewTime},#{reviewSource},#{reviewDevice},#{ruleId},#{ruleName},#{subMethod},#{deductPerson},#{deductTime},#{score},#{checkPerson},#{checkTime},#{checkDesc},#{checkResult},#{checkStatus},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{fileNames},#{filePaths})
+        (#{recordId},#{staffId},#{staffName},#{workNum},#{windowNum},#{deptId},#{deptName},#{reviewResult},#{reviewTime},#{reviewSource},#{reviewDevice},#{ruleId},#{ruleName},#{subMethod},#{deductPerson},#{deductTime},#{score},#{checkPerson},#{checkTime},#{checkDesc},#{checkResult},#{checkStatus},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{fileNames},#{filePaths},#{categoryId},#{categoryName})
     </insert>
 
     <!-- 批量新增 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_xhx_check_review_record
-        (recordId,staffId,staffName,workNum,windowNum,deptId,deptName,reviewResult,reviewTime,reviewSource,reviewDevice,ruleId,ruleName,subMethod,deductPerson,deductTime,score,checkPerson,checkTime,checkDesc,checkResult,checkStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths)
+        (recordId,staffId,staffName,workNum,windowNum,deptId,deptName,reviewResult,reviewTime,reviewSource,reviewDevice,ruleId,ruleName,subMethod,deductPerson,deductTime,score,checkPerson,checkTime,checkDesc,checkResult,checkStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths,categoryId,categoryName)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.recordId},#{item.staffId},#{item.staffName},#{item.workNum},#{item.windowNum},#{item.deptId},#{item.deptName},#{item.reviewResult},#{item.reviewTime},#{item.reviewSource},#{item.reviewDevice},#{item.ruleId},#{item.ruleName},#{item.subMethod},#{item.deductPerson},#{item.deductTime},#{item.score},#{item.checkPerson},#{item.checkTime},#{item.checkDesc},#{item.checkResult},#{item.checkStatus},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.fileNames},#{item.filePaths})
+            (#{item.recordId},#{item.staffId},#{item.staffName},#{item.workNum},#{item.windowNum},#{item.deptId},#{item.deptName},#{item.reviewResult},#{item.reviewTime},#{item.reviewSource},#{item.reviewDevice},#{item.ruleId},#{item.ruleName},#{item.subMethod},#{item.deductPerson},#{item.deductTime},#{item.score},#{item.checkPerson},#{item.checkTime},#{item.checkDesc},#{item.checkResult},#{item.checkStatus},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.fileNames},#{item.filePaths},#{item.categoryId},#{item.categoryName})
         </foreach>
     </insert>
 
@@ -275,6 +283,15 @@
             <if test="(colPickMode==0 and data.containsKey('filePaths')) or (colPickMode==1 and !data.containsKey('filePaths'))">
                 a.filePaths=#{data.filePaths},
             </if>
+            <if test="(colPickMode==0 and data.containsKey('categoryId')) or (colPickMode==1 and !data.containsKey('categoryId'))">
+                a.categoryId=#{data.categoryId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('categoryIdIncrement')) or (colPickMode==1 and !data.containsKey('categoryIdIncrement'))">
+                a.categoryId=ifnull(a.categoryId,0) + #{data.categoryIdIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('categoryName')) or (colPickMode==1 and !data.containsKey('categoryName'))">
+                a.categoryName=#{data.categoryName},
+            </if>
         </trim>
         <trim suffixOverrides="where" suffix="">
             where
@@ -540,6 +557,25 @@
                         </if>
                     </foreach>
                 </trim>
+                        <trim prefix="categoryId=(case" suffix="ELSE categoryId end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('categoryId')) or (colPickMode==1 and !item.containsKey('categoryId'))">
+                                        when a.id=#{item.id} then #{item.categoryId}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('categoryIdIncrement')) or (colPickMode==1 and !item.containsKey('categoryIdIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.categoryId,0) + #{item.categoryIdIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                <trim prefix="categoryName=(case" suffix="ELSE categoryName end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('categoryName')) or (colPickMode==1 and !item.containsKey('categoryName'))">
+                            when a.id=#{item.id} then #{item.categoryName}
+                        </if>
+                    </foreach>
+                </trim>
         </trim>
         where id in
         <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
@@ -1322,6 +1358,54 @@
                     #{item}
                 </foreach>
             </if>
+            <if test="conditionParamRef.containsKey('categoryId')">
+                <if test="conditionParamRef.categoryId != null ">
+                    ${_conditionType_} a.categoryId = #{${_conditionParam_}.categoryId}
+                </if>
+                <if test="conditionParamRef.categoryId == null">
+                    ${_conditionType_} a.categoryId is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('categoryIdList') and conditionParamRef.categoryIdList.size() > 0">
+                ${_conditionType_} a.categoryId in
+                <foreach collection="conditionParamRef.categoryIdList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('categoryIdNotList') and conditionParamRef.categoryIdNotList.size() > 0">
+                ${_conditionType_} a.categoryId not in
+                <foreach collection="conditionParamRef.categoryIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('categoryIdStart') and conditionParamRef.categoryIdStart != null">
+                ${_conditionType_} a.categoryId <![CDATA[ >= ]]> #{${_conditionParam_}.categoryIdStart}
+            </if>
+            <if test="conditionParamRef.containsKey('categoryIdEnd') and conditionParamRef.categoryIdEnd != null">
+                ${_conditionType_} a.categoryId <![CDATA[ <= ]]> #{${_conditionParam_}.categoryIdEnd}
+            </if>
+
+
+            <if test="conditionParamRef.containsKey('categoryName')">
+                <if test="conditionParamRef.categoryName != null and conditionParamRef.categoryName != ''">
+                    ${_conditionType_} a.categoryName like #{${_conditionParam_}.categoryName}
+                </if>
+                <if test="conditionParamRef.categoryName == null">
+                    ${_conditionType_} a.categoryName is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('categoryNameList') and conditionParamRef.categoryNameList.size() > 0">
+                ${_conditionType_} a.categoryName in
+                <foreach collection="conditionParamRef.categoryNameList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('categoryNameNotList') and conditionParamRef.categoryNameNotList.size() > 0">
+                ${_conditionType_} a.categoryName not in
+                <foreach collection="conditionParamRef.categoryNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
     </sql>
     <sql id="_orderCols_">
         <if test="orderColList != null and !orderColList.isEmpty()">
@@ -1485,6 +1569,16 @@
                         <if test='orderCol.filePaths != null and "DESC".equalsIgnoreCase(orderCol.filePaths)'>DESC</if>
                         ,
                     </if>
+                    <if test="orderCol.containsKey('categoryId')">
+                        a.categoryId
+                        <if test='orderCol.categoryId != null and "DESC".equalsIgnoreCase(orderCol.categoryId)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('categoryName')">
+                        a.categoryName
+                        <if test='orderCol.categoryName != null and "DESC".equalsIgnoreCase(orderCol.categoryName)'>DESC</if>
+                        ,
+                    </if>
             </trim>
         </if>
     </sql>

attendance-performance-manager/src/main/resources/sqlmap/module/perform/PerformAttendRecordMapper.xml

@@ -33,6 +33,8 @@
             <result property="updateTime" column="updateTime" />
             <result property="fileNames" column="fileNames" />
             <result property="filePaths" column="filePaths" />
+            <result property="categoryId" column="categoryId" />
+            <result property="categoryName" column="categoryName" />
             
     </resultMap>
 
@@ -124,23 +126,29 @@
                 <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('filePaths') or colPickMode == 1 and data.containsKey('filePaths')))">
                     a.filePaths,
                 </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('categoryId') or colPickMode == 1 and data.containsKey('categoryId')))">
+                    a.categoryId,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('categoryName') or colPickMode == 1 and data.containsKey('categoryName')))">
+                    a.categoryName,
+                </if>
         </trim>
     </sql>
     <!-- 新增 区分主键自增加还是业务插入 -->
     <insert id="insert" parameterType="PerformAttendRecordEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_xhx_perform_attend_record
-        (staffId,staffName,workNum,deptId,deptName,attendanceGroupId,attendanceGroupName,attendanceDate,ruleId,ruleNme,errorTime,goOffTimeStr,actualAttendTime,errorResult,subMethod,deductPerson,deductTime,subAddType,score,processStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths)
+        (staffId,staffName,workNum,deptId,deptName,attendanceGroupId,attendanceGroupName,attendanceDate,ruleId,ruleNme,errorTime,goOffTimeStr,actualAttendTime,errorResult,subMethod,deductPerson,deductTime,subAddType,score,processStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths,categoryId,categoryName)
         VALUES
-        (#{staffId},#{staffName},#{workNum},#{deptId},#{deptName},#{attendanceGroupId},#{attendanceGroupName},#{attendanceDate},#{ruleId},#{ruleNme},#{errorTime},#{goOffTimeStr},#{actualAttendTime},#{errorResult},#{subMethod},#{deductPerson},#{deductTime},#{subAddType},#{score},#{processStatus},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{fileNames},#{filePaths})
+        (#{staffId},#{staffName},#{workNum},#{deptId},#{deptName},#{attendanceGroupId},#{attendanceGroupName},#{attendanceDate},#{ruleId},#{ruleNme},#{errorTime},#{goOffTimeStr},#{actualAttendTime},#{errorResult},#{subMethod},#{deductPerson},#{deductTime},#{subAddType},#{score},#{processStatus},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{fileNames},#{filePaths},#{categoryId},#{categoryName})
     </insert>
 
     <!-- 批量新增 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_xhx_perform_attend_record
-        (staffId,staffName,workNum,deptId,deptName,attendanceGroupId,attendanceGroupName,attendanceDate,ruleId,ruleNme,errorTime,goOffTimeStr,actualAttendTime,errorResult,subMethod,deductPerson,deductTime,subAddType,score,processStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths)
+        (staffId,staffName,workNum,deptId,deptName,attendanceGroupId,attendanceGroupName,attendanceDate,ruleId,ruleNme,errorTime,goOffTimeStr,actualAttendTime,errorResult,subMethod,deductPerson,deductTime,subAddType,score,processStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths,categoryId,categoryName)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.staffId},#{item.staffName},#{item.workNum},#{item.deptId},#{item.deptName},#{item.attendanceGroupId},#{item.attendanceGroupName},#{item.attendanceDate},#{item.ruleId},#{item.ruleNme},#{item.errorTime},#{item.goOffTimeStr},#{item.actualAttendTime},#{item.errorResult},#{item.subMethod},#{item.deductPerson},#{item.deductTime},#{item.subAddType},#{item.score},#{item.processStatus},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.fileNames},#{item.filePaths})
+            (#{item.staffId},#{item.staffName},#{item.workNum},#{item.deptId},#{item.deptName},#{item.attendanceGroupId},#{item.attendanceGroupName},#{item.attendanceDate},#{item.ruleId},#{item.ruleNme},#{item.errorTime},#{item.goOffTimeStr},#{item.actualAttendTime},#{item.errorResult},#{item.subMethod},#{item.deductPerson},#{item.deductTime},#{item.subAddType},#{item.score},#{item.processStatus},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.fileNames},#{item.filePaths},#{item.categoryId},#{item.categoryName})
         </foreach>
     </insert>
 
@@ -261,6 +269,15 @@
             <if test="(colPickMode==0 and data.containsKey('filePaths')) or (colPickMode==1 and !data.containsKey('filePaths'))">
                 a.filePaths=#{data.filePaths},
             </if>
+            <if test="(colPickMode==0 and data.containsKey('categoryId')) or (colPickMode==1 and !data.containsKey('categoryId'))">
+                a.categoryId=#{data.categoryId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('categoryIdIncrement')) or (colPickMode==1 and !data.containsKey('categoryIdIncrement'))">
+                a.categoryId=ifnull(a.categoryId,0) + #{data.categoryIdIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('categoryName')) or (colPickMode==1 and !data.containsKey('categoryName'))">
+                a.categoryName=#{data.categoryName},
+            </if>
         </trim>
         <trim suffixOverrides="where" suffix="">
             where
@@ -512,6 +529,25 @@
                         </if>
                     </foreach>
                 </trim>
+                        <trim prefix="categoryId=(case" suffix="ELSE categoryId end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('categoryId')) or (colPickMode==1 and !item.containsKey('categoryId'))">
+                                        when a.id=#{item.id} then #{item.categoryId}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('categoryIdIncrement')) or (colPickMode==1 and !item.containsKey('categoryIdIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.categoryId,0) + #{item.categoryIdIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                <trim prefix="categoryName=(case" suffix="ELSE categoryName end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('categoryName')) or (colPickMode==1 and !item.containsKey('categoryName'))">
+                            when a.id=#{item.id} then #{item.categoryName}
+                        </if>
+                    </foreach>
+                </trim>
         </trim>
         where id in
         <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
@@ -1246,6 +1282,54 @@
                     #{item}
                 </foreach>
             </if>
+            <if test="conditionParamRef.containsKey('categoryId')">
+                <if test="conditionParamRef.categoryId != null ">
+                    ${_conditionType_} a.categoryId = #{${_conditionParam_}.categoryId}
+                </if>
+                <if test="conditionParamRef.categoryId == null">
+                    ${_conditionType_} a.categoryId is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('categoryIdList') and conditionParamRef.categoryIdList.size() > 0">
+                ${_conditionType_} a.categoryId in
+                <foreach collection="conditionParamRef.categoryIdList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('categoryIdNotList') and conditionParamRef.categoryIdNotList.size() > 0">
+                ${_conditionType_} a.categoryId not in
+                <foreach collection="conditionParamRef.categoryIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('categoryIdStart') and conditionParamRef.categoryIdStart != null">
+                ${_conditionType_} a.categoryId <![CDATA[ >= ]]> #{${_conditionParam_}.categoryIdStart}
+            </if>
+            <if test="conditionParamRef.containsKey('categoryIdEnd') and conditionParamRef.categoryIdEnd != null">
+                ${_conditionType_} a.categoryId <![CDATA[ <= ]]> #{${_conditionParam_}.categoryIdEnd}
+            </if>
+
+
+            <if test="conditionParamRef.containsKey('categoryName')">
+                <if test="conditionParamRef.categoryName != null and conditionParamRef.categoryName != ''">
+                    ${_conditionType_} a.categoryName like #{${_conditionParam_}.categoryName}
+                </if>
+                <if test="conditionParamRef.categoryName == null">
+                    ${_conditionType_} a.categoryName is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('categoryNameList') and conditionParamRef.categoryNameList.size() > 0">
+                ${_conditionType_} a.categoryName in
+                <foreach collection="conditionParamRef.categoryNameList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('categoryNameNotList') and conditionParamRef.categoryNameNotList.size() > 0">
+                ${_conditionType_} a.categoryName not in
+                <foreach collection="conditionParamRef.categoryNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
     </sql>
     <sql id="_orderCols_">
         <if test="orderColList != null and !orderColList.isEmpty()">
@@ -1399,6 +1483,16 @@
                         <if test='orderCol.filePaths != null and "DESC".equalsIgnoreCase(orderCol.filePaths)'>DESC</if>
                         ,
                     </if>
+                    <if test="orderCol.containsKey('categoryId')">
+                        a.categoryId
+                        <if test='orderCol.categoryId != null and "DESC".equalsIgnoreCase(orderCol.categoryId)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('categoryName')">
+                        a.categoryName
+                        <if test='orderCol.categoryName != null and "DESC".equalsIgnoreCase(orderCol.categoryName)'>DESC</if>
+                        ,
+                    </if>
             </trim>
         </if>
     </sql>

attendance-performance-manager/src/main/resources/sqlmap/module/perform/PerformComplainRecordMapper.xml

@@ -33,6 +33,8 @@
             <result property="updateTime" column="updateTime" />
             <result property="fileNames" column="fileNames" />
             <result property="filePaths" column="filePaths" />
+            <result property="categoryId" column="categoryId" />
+            <result property="categoryName" column="categoryName" />
             
     </resultMap>
 
@@ -124,23 +126,29 @@
                 <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('filePaths') or colPickMode == 1 and data.containsKey('filePaths')))">
                     a.filePaths,
                 </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('categoryId') or colPickMode == 1 and data.containsKey('categoryId')))">
+                    a.categoryId,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('categoryName') or colPickMode == 1 and data.containsKey('categoryName')))">
+                    a.categoryName,
+                </if>
         </trim>
     </sql>
     <!-- 新增 区分主键自增加还是业务插入 -->
     <insert id="insert" parameterType="PerformComplainRecordEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_xhx_perform_complain_record
-        (staffId,staffName,workNum,windowNum,deptId,deptName,complainTitle,complainContent,complainRealName,contact,complainTime,complainSource,complainDevice,ruleId,ruleName,subMethod,deductPerson,deductTime,score,processStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths)
+        (staffId,staffName,workNum,windowNum,deptId,deptName,complainTitle,complainContent,complainRealName,contact,complainTime,complainSource,complainDevice,ruleId,ruleName,subMethod,deductPerson,deductTime,score,processStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths,categoryId,categoryName)
         VALUES
-        (#{staffId},#{staffName},#{workNum},#{windowNum},#{deptId},#{deptName},#{complainTitle},#{complainContent},#{complainRealName},#{contact},#{complainTime},#{complainSource},#{complainDevice},#{ruleId},#{ruleName},#{subMethod},#{deductPerson},#{deductTime},#{score},#{processStatus},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{fileNames},#{filePaths})
+        (#{staffId},#{staffName},#{workNum},#{windowNum},#{deptId},#{deptName},#{complainTitle},#{complainContent},#{complainRealName},#{contact},#{complainTime},#{complainSource},#{complainDevice},#{ruleId},#{ruleName},#{subMethod},#{deductPerson},#{deductTime},#{score},#{processStatus},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{fileNames},#{filePaths},#{categoryId},#{categoryName})
     </insert>
 
     <!-- 批量新增 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_xhx_perform_complain_record
-        (staffId,staffName,workNum,windowNum,deptId,deptName,complainTitle,complainContent,complainRealName,contact,complainTime,complainSource,complainDevice,ruleId,ruleName,subMethod,deductPerson,deductTime,score,processStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths)
+        (staffId,staffName,workNum,windowNum,deptId,deptName,complainTitle,complainContent,complainRealName,contact,complainTime,complainSource,complainDevice,ruleId,ruleName,subMethod,deductPerson,deductTime,score,processStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths,categoryId,categoryName)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.staffId},#{item.staffName},#{item.workNum},#{item.windowNum},#{item.deptId},#{item.deptName},#{item.complainTitle},#{item.complainContent},#{item.complainRealName},#{item.contact},#{item.complainTime},#{item.complainSource},#{item.complainDevice},#{item.ruleId},#{item.ruleName},#{item.subMethod},#{item.deductPerson},#{item.deductTime},#{item.score},#{item.processStatus},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.fileNames},#{item.filePaths})
+            (#{item.staffId},#{item.staffName},#{item.workNum},#{item.windowNum},#{item.deptId},#{item.deptName},#{item.complainTitle},#{item.complainContent},#{item.complainRealName},#{item.contact},#{item.complainTime},#{item.complainSource},#{item.complainDevice},#{item.ruleId},#{item.ruleName},#{item.subMethod},#{item.deductPerson},#{item.deductTime},#{item.score},#{item.processStatus},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.fileNames},#{item.filePaths},#{item.categoryId},#{item.categoryName})
         </foreach>
     </insert>
 
@@ -255,6 +263,15 @@
             <if test="(colPickMode==0 and data.containsKey('filePaths')) or (colPickMode==1 and !data.containsKey('filePaths'))">
                 a.filePaths=#{data.filePaths},
             </if>
+            <if test="(colPickMode==0 and data.containsKey('categoryId')) or (colPickMode==1 and !data.containsKey('categoryId'))">
+                a.categoryId=#{data.categoryId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('categoryIdIncrement')) or (colPickMode==1 and !data.containsKey('categoryIdIncrement'))">
+                a.categoryId=ifnull(a.categoryId,0) + #{data.categoryIdIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('categoryName')) or (colPickMode==1 and !data.containsKey('categoryName'))">
+                a.categoryName=#{data.categoryName},
+            </if>
         </trim>
         <trim suffixOverrides="where" suffix="">
             where
@@ -496,6 +513,25 @@
                         </if>
                     </foreach>
                 </trim>
+                        <trim prefix="categoryId=(case" suffix="ELSE categoryId end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('categoryId')) or (colPickMode==1 and !item.containsKey('categoryId'))">
+                                        when a.id=#{item.id} then #{item.categoryId}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('categoryIdIncrement')) or (colPickMode==1 and !item.containsKey('categoryIdIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.categoryId,0) + #{item.categoryIdIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                <trim prefix="categoryName=(case" suffix="ELSE categoryName end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('categoryName')) or (colPickMode==1 and !item.containsKey('categoryName'))">
+                            when a.id=#{item.id} then #{item.categoryName}
+                        </if>
+                    </foreach>
+                </trim>
         </trim>
         where id in
         <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
@@ -1230,6 +1266,54 @@
                     #{item}
                 </foreach>
             </if>
+            <if test="conditionParamRef.containsKey('categoryId')">
+                <if test="conditionParamRef.categoryId != null ">
+                    ${_conditionType_} a.categoryId = #{${_conditionParam_}.categoryId}
+                </if>
+                <if test="conditionParamRef.categoryId == null">
+                    ${_conditionType_} a.categoryId is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('categoryIdList') and conditionParamRef.categoryIdList.size() > 0">
+                ${_conditionType_} a.categoryId in
+                <foreach collection="conditionParamRef.categoryIdList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('categoryIdNotList') and conditionParamRef.categoryIdNotList.size() > 0">
+                ${_conditionType_} a.categoryId not in
+                <foreach collection="conditionParamRef.categoryIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('categoryIdStart') and conditionParamRef.categoryIdStart != null">
+                ${_conditionType_} a.categoryId <![CDATA[ >= ]]> #{${_conditionParam_}.categoryIdStart}
+            </if>
+            <if test="conditionParamRef.containsKey('categoryIdEnd') and conditionParamRef.categoryIdEnd != null">
+                ${_conditionType_} a.categoryId <![CDATA[ <= ]]> #{${_conditionParam_}.categoryIdEnd}
+            </if>
+
+
+            <if test="conditionParamRef.containsKey('categoryName')">
+                <if test="conditionParamRef.categoryName != null and conditionParamRef.categoryName != ''">
+                    ${_conditionType_} a.categoryName like #{${_conditionParam_}.categoryName}
+                </if>
+                <if test="conditionParamRef.categoryName == null">
+                    ${_conditionType_} a.categoryName is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('categoryNameList') and conditionParamRef.categoryNameList.size() > 0">
+                ${_conditionType_} a.categoryName in
+                <foreach collection="conditionParamRef.categoryNameList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('categoryNameNotList') and conditionParamRef.categoryNameNotList.size() > 0">
+                ${_conditionType_} a.categoryName not in
+                <foreach collection="conditionParamRef.categoryNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
     </sql>
     <sql id="_orderCols_">
         <if test="orderColList != null and !orderColList.isEmpty()">
@@ -1383,6 +1467,16 @@
                         <if test='orderCol.filePaths != null and "DESC".equalsIgnoreCase(orderCol.filePaths)'>DESC</if>
                         ,
                     </if>
+                    <if test="orderCol.containsKey('categoryId')">
+                        a.categoryId
+                        <if test='orderCol.categoryId != null and "DESC".equalsIgnoreCase(orderCol.categoryId)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('categoryName')">
+                        a.categoryName
+                        <if test='orderCol.categoryName != null and "DESC".equalsIgnoreCase(orderCol.categoryName)'>DESC</if>
+                        ,
+                    </if>
             </trim>
         </if>
     </sql>

attendance-performance-manager/src/main/resources/sqlmap/module/perform/PerformEffectRecordMapper.xml

@@ -31,6 +31,8 @@
             <result property="updateTime" column="updateTime" />
             <result property="fileNames" column="fileNames" />
             <result property="filePaths" column="filePaths" />
+            <result property="categoryId" column="categoryId" />
+            <result property="categoryName" column="categoryName" />
             
     </resultMap>
 
@@ -116,23 +118,29 @@
                 <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('filePaths') or colPickMode == 1 and data.containsKey('filePaths')))">
                     a.filePaths,
                 </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('categoryId') or colPickMode == 1 and data.containsKey('categoryId')))">
+                    a.categoryId,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('categoryName') or colPickMode == 1 and data.containsKey('categoryName')))">
+                    a.categoryName,
+                </if>
         </trim>
     </sql>
     <!-- 新增 区分主键自增加还是业务插入 -->
     <insert id="insert" parameterType="PerformEffectRecordEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_xhx_perform_effect_record
-        (staffId,staffName,workNum,windowNum,deptId,deptName,irregularType,happenTime,duration,alarmTime,snapPath,ruleId,ruleName,subMethod,deductPerson,deductTime,score,processStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths)
+        (staffId,staffName,workNum,windowNum,deptId,deptName,irregularType,happenTime,duration,alarmTime,snapPath,ruleId,ruleName,subMethod,deductPerson,deductTime,score,processStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths,categoryId,categoryName)
         VALUES
-        (#{staffId},#{staffName},#{workNum},#{windowNum},#{deptId},#{deptName},#{irregularType},#{happenTime},#{duration},#{alarmTime},#{snapPath},#{ruleId},#{ruleName},#{subMethod},#{deductPerson},#{deductTime},#{score},#{processStatus},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{fileNames},#{filePaths})
+        (#{staffId},#{staffName},#{workNum},#{windowNum},#{deptId},#{deptName},#{irregularType},#{happenTime},#{duration},#{alarmTime},#{snapPath},#{ruleId},#{ruleName},#{subMethod},#{deductPerson},#{deductTime},#{score},#{processStatus},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{fileNames},#{filePaths},#{categoryId},#{categoryName})
     </insert>
 
     <!-- 批量新增 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_xhx_perform_effect_record
-        (staffId,staffName,workNum,windowNum,deptId,deptName,irregularType,happenTime,duration,alarmTime,snapPath,ruleId,ruleName,subMethod,deductPerson,deductTime,score,processStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths)
+        (staffId,staffName,workNum,windowNum,deptId,deptName,irregularType,happenTime,duration,alarmTime,snapPath,ruleId,ruleName,subMethod,deductPerson,deductTime,score,processStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths,categoryId,categoryName)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.staffId},#{item.staffName},#{item.workNum},#{item.windowNum},#{item.deptId},#{item.deptName},#{item.irregularType},#{item.happenTime},#{item.duration},#{item.alarmTime},#{item.snapPath},#{item.ruleId},#{item.ruleName},#{item.subMethod},#{item.deductPerson},#{item.deductTime},#{item.score},#{item.processStatus},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.fileNames},#{item.filePaths})
+            (#{item.staffId},#{item.staffName},#{item.workNum},#{item.windowNum},#{item.deptId},#{item.deptName},#{item.irregularType},#{item.happenTime},#{item.duration},#{item.alarmTime},#{item.snapPath},#{item.ruleId},#{item.ruleName},#{item.subMethod},#{item.deductPerson},#{item.deductTime},#{item.score},#{item.processStatus},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.fileNames},#{item.filePaths},#{item.categoryId},#{item.categoryName})
         </foreach>
     </insert>
 
@@ -247,6 +255,15 @@
             <if test="(colPickMode==0 and data.containsKey('filePaths')) or (colPickMode==1 and !data.containsKey('filePaths'))">
                 a.filePaths=#{data.filePaths},
             </if>
+            <if test="(colPickMode==0 and data.containsKey('categoryId')) or (colPickMode==1 and !data.containsKey('categoryId'))">
+                a.categoryId=#{data.categoryId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('categoryIdIncrement')) or (colPickMode==1 and !data.containsKey('categoryIdIncrement'))">
+                a.categoryId=ifnull(a.categoryId,0) + #{data.categoryIdIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('categoryName')) or (colPickMode==1 and !data.containsKey('categoryName'))">
+                a.categoryName=#{data.categoryName},
+            </if>
         </trim>
         <trim suffixOverrides="where" suffix="">
             where
@@ -484,6 +501,25 @@
                         </if>
                     </foreach>
                 </trim>
+                        <trim prefix="categoryId=(case" suffix="ELSE categoryId end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('categoryId')) or (colPickMode==1 and !item.containsKey('categoryId'))">
+                                        when a.id=#{item.id} then #{item.categoryId}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('categoryIdIncrement')) or (colPickMode==1 and !item.containsKey('categoryIdIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.categoryId,0) + #{item.categoryIdIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                <trim prefix="categoryName=(case" suffix="ELSE categoryName end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('categoryName')) or (colPickMode==1 and !item.containsKey('categoryName'))">
+                            when a.id=#{item.id} then #{item.categoryName}
+                        </if>
+                    </foreach>
+                </trim>
         </trim>
         where id in
         <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
@@ -1182,6 +1218,54 @@
                     #{item}
                 </foreach>
             </if>
+            <if test="conditionParamRef.containsKey('categoryId')">
+                <if test="conditionParamRef.categoryId != null ">
+                    ${_conditionType_} a.categoryId = #{${_conditionParam_}.categoryId}
+                </if>
+                <if test="conditionParamRef.categoryId == null">
+                    ${_conditionType_} a.categoryId is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('categoryIdList') and conditionParamRef.categoryIdList.size() > 0">
+                ${_conditionType_} a.categoryId in
+                <foreach collection="conditionParamRef.categoryIdList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('categoryIdNotList') and conditionParamRef.categoryIdNotList.size() > 0">
+                ${_conditionType_} a.categoryId not in
+                <foreach collection="conditionParamRef.categoryIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('categoryIdStart') and conditionParamRef.categoryIdStart != null">
+                ${_conditionType_} a.categoryId <![CDATA[ >= ]]> #{${_conditionParam_}.categoryIdStart}
+            </if>
+            <if test="conditionParamRef.containsKey('categoryIdEnd') and conditionParamRef.categoryIdEnd != null">
+                ${_conditionType_} a.categoryId <![CDATA[ <= ]]> #{${_conditionParam_}.categoryIdEnd}
+            </if>
+
+
+            <if test="conditionParamRef.containsKey('categoryName')">
+                <if test="conditionParamRef.categoryName != null and conditionParamRef.categoryName != ''">
+                    ${_conditionType_} a.categoryName like #{${_conditionParam_}.categoryName}
+                </if>
+                <if test="conditionParamRef.categoryName == null">
+                    ${_conditionType_} a.categoryName is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('categoryNameList') and conditionParamRef.categoryNameList.size() > 0">
+                ${_conditionType_} a.categoryName in
+                <foreach collection="conditionParamRef.categoryNameList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('categoryNameNotList') and conditionParamRef.categoryNameNotList.size() > 0">
+                ${_conditionType_} a.categoryName not in
+                <foreach collection="conditionParamRef.categoryNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
     </sql>
     <sql id="_orderCols_">
         <if test="orderColList != null and !orderColList.isEmpty()">
@@ -1325,6 +1409,16 @@
                         <if test='orderCol.filePaths != null and "DESC".equalsIgnoreCase(orderCol.filePaths)'>DESC</if>
                         ,
                     </if>
+                    <if test="orderCol.containsKey('categoryId')">
+                        a.categoryId
+                        <if test='orderCol.categoryId != null and "DESC".equalsIgnoreCase(orderCol.categoryId)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('categoryName')">
+                        a.categoryName
+                        <if test='orderCol.categoryName != null and "DESC".equalsIgnoreCase(orderCol.categoryName)'>DESC</if>
+                        ,
+                    </if>
             </trim>
         </if>
     </sql>

attendance-performance-manager/src/main/resources/sqlmap/module/perform/PerformGoworkRecordMapper.xml

@@ -30,6 +30,8 @@
             <result property="updateTime" column="updateTime" />
             <result property="fileNames" column="fileNames" />
             <result property="filePaths" column="filePaths" />
+            <result property="categoryId" column="categoryId" />
+            <result property="categoryName" column="categoryName" />
             
     </resultMap>
 
@@ -112,23 +114,29 @@
                 <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('filePaths') or colPickMode == 1 and data.containsKey('filePaths')))">
                     a.filePaths,
                 </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('categoryId') or colPickMode == 1 and data.containsKey('categoryId')))">
+                    a.categoryId,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('categoryName') or colPickMode == 1 and data.containsKey('categoryName')))">
+                    a.categoryName,
+                </if>
         </trim>
     </sql>
     <!-- 新增 区分主键自增加还是业务插入 -->
     <insert id="insert" parameterType="PerformGoworkRecordEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_xhx_perform_gowork_record
-        (staffId,staffName,workNum,windowNum,deptId,deptName,goworkCode,goworkDepts,matterlName,goworkTime,ruleId,ruleName,subMethod,deductPerson,deductTime,score,processStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths)
+        (staffId,staffName,workNum,windowNum,deptId,deptName,goworkCode,goworkDepts,matterlName,goworkTime,ruleId,ruleName,subMethod,deductPerson,deductTime,score,processStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths,categoryId,categoryName)
         VALUES
-        (#{staffId},#{staffName},#{workNum},#{windowNum},#{deptId},#{deptName},#{goworkCode},#{goworkDepts},#{matterlName},#{goworkTime},#{ruleId},#{ruleName},#{subMethod},#{deductPerson},#{deductTime},#{score},#{processStatus},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{fileNames},#{filePaths})
+        (#{staffId},#{staffName},#{workNum},#{windowNum},#{deptId},#{deptName},#{goworkCode},#{goworkDepts},#{matterlName},#{goworkTime},#{ruleId},#{ruleName},#{subMethod},#{deductPerson},#{deductTime},#{score},#{processStatus},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{fileNames},#{filePaths},#{categoryId},#{categoryName})
     </insert>
 
     <!-- 批量新增 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_xhx_perform_gowork_record
-        (staffId,staffName,workNum,windowNum,deptId,deptName,goworkCode,goworkDepts,matterlName,goworkTime,ruleId,ruleName,subMethod,deductPerson,deductTime,score,processStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths)
+        (staffId,staffName,workNum,windowNum,deptId,deptName,goworkCode,goworkDepts,matterlName,goworkTime,ruleId,ruleName,subMethod,deductPerson,deductTime,score,processStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths,categoryId,categoryName)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.staffId},#{item.staffName},#{item.workNum},#{item.windowNum},#{item.deptId},#{item.deptName},#{item.goworkCode},#{item.goworkDepts},#{item.matterlName},#{item.goworkTime},#{item.ruleId},#{item.ruleName},#{item.subMethod},#{item.deductPerson},#{item.deductTime},#{item.score},#{item.processStatus},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.fileNames},#{item.filePaths})
+            (#{item.staffId},#{item.staffName},#{item.workNum},#{item.windowNum},#{item.deptId},#{item.deptName},#{item.goworkCode},#{item.goworkDepts},#{item.matterlName},#{item.goworkTime},#{item.ruleId},#{item.ruleName},#{item.subMethod},#{item.deductPerson},#{item.deductTime},#{item.score},#{item.processStatus},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.fileNames},#{item.filePaths},#{item.categoryId},#{item.categoryName})
         </foreach>
     </insert>
 
@@ -234,6 +242,15 @@
             <if test="(colPickMode==0 and data.containsKey('filePaths')) or (colPickMode==1 and !data.containsKey('filePaths'))">
                 a.filePaths=#{data.filePaths},
             </if>
+            <if test="(colPickMode==0 and data.containsKey('categoryId')) or (colPickMode==1 and !data.containsKey('categoryId'))">
+                a.categoryId=#{data.categoryId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('categoryIdIncrement')) or (colPickMode==1 and !data.containsKey('categoryIdIncrement'))">
+                a.categoryId=ifnull(a.categoryId,0) + #{data.categoryIdIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('categoryName')) or (colPickMode==1 and !data.containsKey('categoryName'))">
+                a.categoryName=#{data.categoryName},
+            </if>
         </trim>
         <trim suffixOverrides="where" suffix="">
             where
@@ -454,6 +471,25 @@
                         </if>
                     </foreach>
                 </trim>
+                        <trim prefix="categoryId=(case" suffix="ELSE categoryId end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('categoryId')) or (colPickMode==1 and !item.containsKey('categoryId'))">
+                                        when a.id=#{item.id} then #{item.categoryId}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('categoryIdIncrement')) or (colPickMode==1 and !item.containsKey('categoryIdIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.categoryId,0) + #{item.categoryIdIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                <trim prefix="categoryName=(case" suffix="ELSE categoryName end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('categoryName')) or (colPickMode==1 and !item.containsKey('categoryName'))">
+                            when a.id=#{item.id} then #{item.categoryName}
+                        </if>
+                    </foreach>
+                </trim>
         </trim>
         where id in
         <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
@@ -1125,6 +1161,54 @@
                     #{item}
                 </foreach>
             </if>
+            <if test="conditionParamRef.containsKey('categoryId')">
+                <if test="conditionParamRef.categoryId != null ">
+                    ${_conditionType_} a.categoryId = #{${_conditionParam_}.categoryId}
+                </if>
+                <if test="conditionParamRef.categoryId == null">
+                    ${_conditionType_} a.categoryId is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('categoryIdList') and conditionParamRef.categoryIdList.size() > 0">
+                ${_conditionType_} a.categoryId in
+                <foreach collection="conditionParamRef.categoryIdList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('categoryIdNotList') and conditionParamRef.categoryIdNotList.size() > 0">
+                ${_conditionType_} a.categoryId not in
+                <foreach collection="conditionParamRef.categoryIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('categoryIdStart') and conditionParamRef.categoryIdStart != null">
+                ${_conditionType_} a.categoryId <![CDATA[ >= ]]> #{${_conditionParam_}.categoryIdStart}
+            </if>
+            <if test="conditionParamRef.containsKey('categoryIdEnd') and conditionParamRef.categoryIdEnd != null">
+                ${_conditionType_} a.categoryId <![CDATA[ <= ]]> #{${_conditionParam_}.categoryIdEnd}
+            </if>
+
+
+            <if test="conditionParamRef.containsKey('categoryName')">
+                <if test="conditionParamRef.categoryName != null and conditionParamRef.categoryName != ''">
+                    ${_conditionType_} a.categoryName like #{${_conditionParam_}.categoryName}
+                </if>
+                <if test="conditionParamRef.categoryName == null">
+                    ${_conditionType_} a.categoryName is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('categoryNameList') and conditionParamRef.categoryNameList.size() > 0">
+                ${_conditionType_} a.categoryName in
+                <foreach collection="conditionParamRef.categoryNameList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('categoryNameNotList') and conditionParamRef.categoryNameNotList.size() > 0">
+                ${_conditionType_} a.categoryName not in
+                <foreach collection="conditionParamRef.categoryNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
     </sql>
     <sql id="_orderCols_">
         <if test="orderColList != null and !orderColList.isEmpty()">
@@ -1263,6 +1347,16 @@
                         <if test='orderCol.filePaths != null and "DESC".equalsIgnoreCase(orderCol.filePaths)'>DESC</if>
                         ,
                     </if>
+                    <if test="orderCol.containsKey('categoryId')">
+                        a.categoryId
+                        <if test='orderCol.categoryId != null and "DESC".equalsIgnoreCase(orderCol.categoryId)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('categoryName')">
+                        a.categoryName
+                        <if test='orderCol.categoryName != null and "DESC".equalsIgnoreCase(orderCol.categoryName)'>DESC</if>
+                        ,
+                    </if>
             </trim>
         </if>
     </sql>

attendance-performance-manager/src/main/resources/sqlmap/module/perform/PerformOtherRecordMapper.xml

@@ -30,6 +30,8 @@
             <result property="updateTime" column="updateTime" />
             <result property="fileNames" column="fileNames" />
             <result property="filePaths" column="filePaths" />
+            <result property="categoryId" column="categoryId" />
+            <result property="categoryName" column="categoryName" />
             
     </resultMap>
 
@@ -112,23 +114,29 @@
                 <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('filePaths') or colPickMode == 1 and data.containsKey('filePaths')))">
                     a.filePaths,
                 </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('categoryId') or colPickMode == 1 and data.containsKey('categoryId')))">
+                    a.categoryId,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('categoryName') or colPickMode == 1 and data.containsKey('categoryName')))">
+                    a.categoryName,
+                </if>
         </trim>
     </sql>
     <!-- 新增 区分主键自增加还是业务插入 -->
     <insert id="insert" parameterType="PerformOtherRecordEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_xhx_perform_other_record
-        (staffId,staffName,workNum,windowNum,deptId,deptName,irregularOtherType,happenTime,duration,ruleId,ruleName,ruleDesc,subMethod,deductPerson,deductTime,score,processStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths)
+        (staffId,staffName,workNum,windowNum,deptId,deptName,irregularOtherType,happenTime,duration,ruleId,ruleName,ruleDesc,subMethod,deductPerson,deductTime,score,processStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths,categoryId,categoryName)
         VALUES
-        (#{staffId},#{staffName},#{workNum},#{windowNum},#{deptId},#{deptName},#{irregularOtherType},#{happenTime},#{duration},#{ruleId},#{ruleName},#{ruleDesc},#{subMethod},#{deductPerson},#{deductTime},#{score},#{processStatus},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{fileNames},#{filePaths})
+        (#{staffId},#{staffName},#{workNum},#{windowNum},#{deptId},#{deptName},#{irregularOtherType},#{happenTime},#{duration},#{ruleId},#{ruleName},#{ruleDesc},#{subMethod},#{deductPerson},#{deductTime},#{score},#{processStatus},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{fileNames},#{filePaths},#{categoryId},#{categoryName})
     </insert>
 
     <!-- 批量新增 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_xhx_perform_other_record
-        (staffId,staffName,workNum,windowNum,deptId,deptName,irregularOtherType,happenTime,duration,ruleId,ruleName,ruleDesc,subMethod,deductPerson,deductTime,score,processStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths)
+        (staffId,staffName,workNum,windowNum,deptId,deptName,irregularOtherType,happenTime,duration,ruleId,ruleName,ruleDesc,subMethod,deductPerson,deductTime,score,processStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths,categoryId,categoryName)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.staffId},#{item.staffName},#{item.workNum},#{item.windowNum},#{item.deptId},#{item.deptName},#{item.irregularOtherType},#{item.happenTime},#{item.duration},#{item.ruleId},#{item.ruleName},#{item.ruleDesc},#{item.subMethod},#{item.deductPerson},#{item.deductTime},#{item.score},#{item.processStatus},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.fileNames},#{item.filePaths})
+            (#{item.staffId},#{item.staffName},#{item.workNum},#{item.windowNum},#{item.deptId},#{item.deptName},#{item.irregularOtherType},#{item.happenTime},#{item.duration},#{item.ruleId},#{item.ruleName},#{item.ruleDesc},#{item.subMethod},#{item.deductPerson},#{item.deductTime},#{item.score},#{item.processStatus},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.fileNames},#{item.filePaths},#{item.categoryId},#{item.categoryName})
         </foreach>
     </insert>
 
@@ -240,6 +248,15 @@
             <if test="(colPickMode==0 and data.containsKey('filePaths')) or (colPickMode==1 and !data.containsKey('filePaths'))">
                 a.filePaths=#{data.filePaths},
             </if>
+            <if test="(colPickMode==0 and data.containsKey('categoryId')) or (colPickMode==1 and !data.containsKey('categoryId'))">
+                a.categoryId=#{data.categoryId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('categoryIdIncrement')) or (colPickMode==1 and !data.containsKey('categoryIdIncrement'))">
+                a.categoryId=ifnull(a.categoryId,0) + #{data.categoryIdIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('categoryName')) or (colPickMode==1 and !data.containsKey('categoryName'))">
+                a.categoryName=#{data.categoryName},
+            </if>
         </trim>
         <trim suffixOverrides="where" suffix="">
             where
@@ -470,6 +487,25 @@
                         </if>
                     </foreach>
                 </trim>
+                        <trim prefix="categoryId=(case" suffix="ELSE categoryId end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('categoryId')) or (colPickMode==1 and !item.containsKey('categoryId'))">
+                                        when a.id=#{item.id} then #{item.categoryId}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('categoryIdIncrement')) or (colPickMode==1 and !item.containsKey('categoryIdIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.categoryId,0) + #{item.categoryIdIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                <trim prefix="categoryName=(case" suffix="ELSE categoryName end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('categoryName')) or (colPickMode==1 and !item.containsKey('categoryName'))">
+                            when a.id=#{item.id} then #{item.categoryName}
+                        </if>
+                    </foreach>
+                </trim>
         </trim>
         where id in
         <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
@@ -1153,6 +1189,54 @@
                     #{item}
                 </foreach>
             </if>
+            <if test="conditionParamRef.containsKey('categoryId')">
+                <if test="conditionParamRef.categoryId != null ">
+                    ${_conditionType_} a.categoryId = #{${_conditionParam_}.categoryId}
+                </if>
+                <if test="conditionParamRef.categoryId == null">
+                    ${_conditionType_} a.categoryId is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('categoryIdList') and conditionParamRef.categoryIdList.size() > 0">
+                ${_conditionType_} a.categoryId in
+                <foreach collection="conditionParamRef.categoryIdList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('categoryIdNotList') and conditionParamRef.categoryIdNotList.size() > 0">
+                ${_conditionType_} a.categoryId not in
+                <foreach collection="conditionParamRef.categoryIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('categoryIdStart') and conditionParamRef.categoryIdStart != null">
+                ${_conditionType_} a.categoryId <![CDATA[ >= ]]> #{${_conditionParam_}.categoryIdStart}
+            </if>
+            <if test="conditionParamRef.containsKey('categoryIdEnd') and conditionParamRef.categoryIdEnd != null">
+                ${_conditionType_} a.categoryId <![CDATA[ <= ]]> #{${_conditionParam_}.categoryIdEnd}
+            </if>
+
+
+            <if test="conditionParamRef.containsKey('categoryName')">
+                <if test="conditionParamRef.categoryName != null and conditionParamRef.categoryName != ''">
+                    ${_conditionType_} a.categoryName like #{${_conditionParam_}.categoryName}
+                </if>
+                <if test="conditionParamRef.categoryName == null">
+                    ${_conditionType_} a.categoryName is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('categoryNameList') and conditionParamRef.categoryNameList.size() > 0">
+                ${_conditionType_} a.categoryName in
+                <foreach collection="conditionParamRef.categoryNameList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('categoryNameNotList') and conditionParamRef.categoryNameNotList.size() > 0">
+                ${_conditionType_} a.categoryName not in
+                <foreach collection="conditionParamRef.categoryNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
     </sql>
     <sql id="_orderCols_">
         <if test="orderColList != null and !orderColList.isEmpty()">
@@ -1291,6 +1375,16 @@
                         <if test='orderCol.filePaths != null and "DESC".equalsIgnoreCase(orderCol.filePaths)'>DESC</if>
                         ,
                     </if>
+                    <if test="orderCol.containsKey('categoryId')">
+                        a.categoryId
+                        <if test='orderCol.categoryId != null and "DESC".equalsIgnoreCase(orderCol.categoryId)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('categoryName')">
+                        a.categoryName
+                        <if test='orderCol.categoryName != null and "DESC".equalsIgnoreCase(orderCol.categoryName)'>DESC</if>
+                        ,
+                    </if>
             </trim>
         </if>
     </sql>

attendance-performance-manager/src/main/resources/sqlmap/module/perform/PerformReviewRecordMapper.xml

@@ -30,6 +30,8 @@
             <result property="updateTime" column="updateTime" />
             <result property="fileNames" column="fileNames" />
             <result property="filePaths" column="filePaths" />
+            <result property="categoryId" column="categoryId" />
+            <result property="categoryName" column="categoryName" />
             
     </resultMap>
 
@@ -112,23 +114,29 @@
                 <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('filePaths') or colPickMode == 1 and data.containsKey('filePaths')))">
                     a.filePaths,
                 </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('categoryId') or colPickMode == 1 and data.containsKey('categoryId')))">
+                    a.categoryId,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('categoryName') or colPickMode == 1 and data.containsKey('categoryName')))">
+                    a.categoryName,
+                </if>
         </trim>
     </sql>
     <!-- 新增 区分主键自增加还是业务插入 -->
     <insert id="insert" parameterType="PerformReviewRecordEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_xhx_perform_review_record
-        (staffId,staffName,workNum,windowNum,deptId,deptName,reviewResult,reviewTime,reviewSource,reviewDevice,ruleId,ruleName,subMethod,deductPerson,deductTime,score,processStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths)
+        (staffId,staffName,workNum,windowNum,deptId,deptName,reviewResult,reviewTime,reviewSource,reviewDevice,ruleId,ruleName,subMethod,deductPerson,deductTime,score,processStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths,categoryId,categoryName)
         VALUES
-        (#{staffId},#{staffName},#{workNum},#{windowNum},#{deptId},#{deptName},#{reviewResult},#{reviewTime},#{reviewSource},#{reviewDevice},#{ruleId},#{ruleName},#{subMethod},#{deductPerson},#{deductTime},#{score},#{processStatus},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{fileNames},#{filePaths})
+        (#{staffId},#{staffName},#{workNum},#{windowNum},#{deptId},#{deptName},#{reviewResult},#{reviewTime},#{reviewSource},#{reviewDevice},#{ruleId},#{ruleName},#{subMethod},#{deductPerson},#{deductTime},#{score},#{processStatus},#{remark},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{fileNames},#{filePaths},#{categoryId},#{categoryName})
     </insert>
 
     <!-- 批量新增 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_xhx_perform_review_record
-        (staffId,staffName,workNum,windowNum,deptId,deptName,reviewResult,reviewTime,reviewSource,reviewDevice,ruleId,ruleName,subMethod,deductPerson,deductTime,score,processStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths)
+        (staffId,staffName,workNum,windowNum,deptId,deptName,reviewResult,reviewTime,reviewSource,reviewDevice,ruleId,ruleName,subMethod,deductPerson,deductTime,score,processStatus,remark,createUserId,createTime,updateUserId,updateTime,fileNames,filePaths,categoryId,categoryName)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.staffId},#{item.staffName},#{item.workNum},#{item.windowNum},#{item.deptId},#{item.deptName},#{item.reviewResult},#{item.reviewTime},#{item.reviewSource},#{item.reviewDevice},#{item.ruleId},#{item.ruleName},#{item.subMethod},#{item.deductPerson},#{item.deductTime},#{item.score},#{item.processStatus},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.fileNames},#{item.filePaths})
+            (#{item.staffId},#{item.staffName},#{item.workNum},#{item.windowNum},#{item.deptId},#{item.deptName},#{item.reviewResult},#{item.reviewTime},#{item.reviewSource},#{item.reviewDevice},#{item.ruleId},#{item.ruleName},#{item.subMethod},#{item.deductPerson},#{item.deductTime},#{item.score},#{item.processStatus},#{item.remark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.fileNames},#{item.filePaths},#{item.categoryId},#{item.categoryName})
         </foreach>
     </insert>
 
@@ -237,6 +245,15 @@
             <if test="(colPickMode==0 and data.containsKey('filePaths')) or (colPickMode==1 and !data.containsKey('filePaths'))">
                 a.filePaths=#{data.filePaths},
             </if>
+            <if test="(colPickMode==0 and data.containsKey('categoryId')) or (colPickMode==1 and !data.containsKey('categoryId'))">
+                a.categoryId=#{data.categoryId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('categoryIdIncrement')) or (colPickMode==1 and !data.containsKey('categoryIdIncrement'))">
+                a.categoryId=ifnull(a.categoryId,0) + #{data.categoryIdIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('categoryName')) or (colPickMode==1 and !data.containsKey('categoryName'))">
+                a.categoryName=#{data.categoryName},
+            </if>
         </trim>
         <trim suffixOverrides="where" suffix="">
             where
@@ -462,6 +479,25 @@
                         </if>
                     </foreach>
                 </trim>
+                        <trim prefix="categoryId=(case" suffix="ELSE categoryId end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('categoryId')) or (colPickMode==1 and !item.containsKey('categoryId'))">
+                                        when a.id=#{item.id} then #{item.categoryId}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('categoryIdIncrement')) or (colPickMode==1 and !item.containsKey('categoryIdIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.categoryId,0) + #{item.categoryIdIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                <trim prefix="categoryName=(case" suffix="ELSE categoryName end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('categoryName')) or (colPickMode==1 and !item.containsKey('categoryName'))">
+                            when a.id=#{item.id} then #{item.categoryName}
+                        </if>
+                    </foreach>
+                </trim>
         </trim>
         where id in
         <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
@@ -1139,6 +1175,54 @@
                     #{item}
                 </foreach>
             </if>
+            <if test="conditionParamRef.containsKey('categoryId')">
+                <if test="conditionParamRef.categoryId != null ">
+                    ${_conditionType_} a.categoryId = #{${_conditionParam_}.categoryId}
+                </if>
+                <if test="conditionParamRef.categoryId == null">
+                    ${_conditionType_} a.categoryId is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('categoryIdList') and conditionParamRef.categoryIdList.size() > 0">
+                ${_conditionType_} a.categoryId in
+                <foreach collection="conditionParamRef.categoryIdList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('categoryIdNotList') and conditionParamRef.categoryIdNotList.size() > 0">
+                ${_conditionType_} a.categoryId not in
+                <foreach collection="conditionParamRef.categoryIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('categoryIdStart') and conditionParamRef.categoryIdStart != null">
+                ${_conditionType_} a.categoryId <![CDATA[ >= ]]> #{${_conditionParam_}.categoryIdStart}
+            </if>
+            <if test="conditionParamRef.containsKey('categoryIdEnd') and conditionParamRef.categoryIdEnd != null">
+                ${_conditionType_} a.categoryId <![CDATA[ <= ]]> #{${_conditionParam_}.categoryIdEnd}
+            </if>
+
+
+            <if test="conditionParamRef.containsKey('categoryName')">
+                <if test="conditionParamRef.categoryName != null and conditionParamRef.categoryName != ''">
+                    ${_conditionType_} a.categoryName like #{${_conditionParam_}.categoryName}
+                </if>
+                <if test="conditionParamRef.categoryName == null">
+                    ${_conditionType_} a.categoryName is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('categoryNameList') and conditionParamRef.categoryNameList.size() > 0">
+                ${_conditionType_} a.categoryName in
+                <foreach collection="conditionParamRef.categoryNameList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('categoryNameNotList') and conditionParamRef.categoryNameNotList.size() > 0">
+                ${_conditionType_} a.categoryName not in
+                <foreach collection="conditionParamRef.categoryNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
     </sql>
     <sql id="_orderCols_">
         <if test="orderColList != null and !orderColList.isEmpty()">
@@ -1277,6 +1361,16 @@
                         <if test='orderCol.filePaths != null and "DESC".equalsIgnoreCase(orderCol.filePaths)'>DESC</if>
                         ,
                     </if>
+                    <if test="orderCol.containsKey('categoryId')">
+                        a.categoryId
+                        <if test='orderCol.categoryId != null and "DESC".equalsIgnoreCase(orderCol.categoryId)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('categoryName')">
+                        a.categoryName
+                        <if test='orderCol.categoryName != null and "DESC".equalsIgnoreCase(orderCol.categoryName)'>DESC</if>
+                        ,
+                    </if>
             </trim>
         </if>
     </sql>

attendance-performance-manager/src/test/java/com/mortals/httpclient/check/CheckAttendRecordController.http

@@ -15,7 +15,6 @@ client.global.set("authToken", JSON.parse(response.body).data.token);
 
 ###考勤绩效记录核查信息列表
 POST {{baseUrl}}/check/attend/record/list
-Authorization: {{authToken}}
 Content-Type: application/json
 
 {
@@ -30,28 +29,34 @@ Authorization: {{authToken}}
 Content-Type: application/json
 
 {
-        "recordId":266,
-        "staffId":567,
-        "staffName":"58ahp4",
-        "workNum":"7i8bvp",
-        "deptId":406,
-        "deptName":"y4dedd",
-        "attendanceGroupId":228,
-        "attendanceGroupName":"gbpetd",
-        "attendanceDate":"1684339200000",
-        "ruleId":132,
-        "ruleName":"wdcwjg",
+        "recordId":622,
+        "staffId":92,
+        "staffName":"63u3ho",
+        "workNum":"azf7em",
+        "deptId":540,
+        "deptName":"ia0wqu",
+        "attendanceGroupId":919,
+        "attendanceGroupName":"6rs96n",
+        "attendanceDate":"1688918400000",
+        "ruleId":528,
+        "ruleName":"xm9nw0",
         "subAddType":1,
         "score":0.00,
-        "goOffTimeStr":"7y29f4",
-        "errorTime":"1684339200000",
-        "actualAttendTime":"1684339200000",
-        "errorResult":"xfbqub",
-        "checkPerson":"sj8o6q",
-        "checkTime":"1684339200000",
-        "checkDesc":"q2bxzv",
-        "checkResult":"0qwt3f",
+        "goOffTimeStr":"velfnl",
+        "errorTime":"1688918400000",
+        "actualAttendTime":"1688918400000",
+        "errorResult":"cy1kbf",
+        "checkPerson":"isgpd5",
+        "checkTime":"1688918400000",
+        "checkDesc":"zwdoox",
+        "checkResult":"z4n3gy",
         "checkStatus":1,
+        "subMethod":1,
+        "remark":"oo31lk",
+        "fileNames":"577i8k",
+        "filePaths":"xdbwkw",
+        "categoryId":870,
+        "categoryName":"mxkks3"
 }
 
 > {%
@@ -60,12 +65,10 @@ client.global.set("CheckAttendRecord_id", JSON.parse(response.body).data.id);
 
 ###考勤绩效记录核查信息查看
 GET {{baseUrl}}/check/attend/record/info?id={{CheckAttendRecord_id}}
-Authorization: {{authToken}}
 Accept: application/json
 
 ###考勤绩效记录核查信息编辑
 GET {{baseUrl}}/check/attend/record/edit?id={{CheckAttendRecord_id}}
-Authorization: {{authToken}}
 Accept: application/json
 
 

attendance-performance-manager/src/test/java/com/mortals/httpclient/check/CheckComplainRecordController.http

@@ -15,7 +15,6 @@ client.global.set("authToken", JSON.parse(response.body).data.token);
 
 ###评价绩效投诉核查信息列表
 POST {{baseUrl}}/check/complain/record/list
-Authorization: {{authToken}}
 Content-Type: application/json
 
 {
@@ -30,32 +29,36 @@ Authorization: {{authToken}}
 Content-Type: application/json
 
 {
-        "recordId":918,
-        "staffId":138,
-        "staffName":"1ptmur",
-        "workNum":"iipy61",
-        "windowNum":"vbdo4o",
-        "deptId":768,
-        "deptName":"oycifa",
-        "complainTitle":"wzxlda",
-        "complainContent":"7qu2vq",
-        "complainRealName":"8ob573",
-        "contact":"5iuw6h",
-        "complainTime":"1684339200000",
-        "complainSource":"ucq8tr",
-        "complainDevice":"hs4rpe",
-        "ruleId":599,
-        "ruleName":"ahvb4g",
+        "recordId":19,
+        "staffId":566,
+        "staffName":"0lx7nf",
+        "workNum":"kvfd43",
+        "windowNum":"jp1oz9",
+        "deptId":506,
+        "deptName":"0cp13v",
+        "complainTitle":"5tw5zb",
+        "complainContent":"erhmrk",
+        "complainRealName":"wlxut0",
+        "contact":"on10l4",
+        "complainTime":"1688918400000",
+        "complainSource":"e7azc4",
+        "complainDevice":"vxuh8j",
+        "ruleId":532,
+        "ruleName":"h50xsu",
         "subMethod":1,
-        "deductPerson":"317m30",
-        "deductTime":"1684339200000",
+        "deductPerson":"2qi2dj",
+        "deductTime":"1688918400000",
         "score":0.00,
-        "checkPerson":"s2vaif",
-        "checkTime":"1684339200000",
-        "checkDesc":"mrv0r7",
-        "checkResult":"819itc",
+        "checkPerson":"qxt0sp",
+        "checkTime":"1688918400000",
+        "checkDesc":"5lvorm",
+        "checkResult":"wggasm",
         "checkStatus":1,
-        "remark":"3624oz",
+        "remark":"f0p2od",
+        "fileNames":"rb5qwo",
+        "filePaths":"7ny2nm",
+        "categoryId":330,
+        "categoryName":"wbqc9l"
 }
 
 > {%
@@ -64,12 +67,10 @@ client.global.set("CheckComplainRecord_id", JSON.parse(response.body).data.id);
 
 ###评价绩效投诉核查信息查看
 GET {{baseUrl}}/check/complain/record/info?id={{CheckComplainRecord_id}}
-Authorization: {{authToken}}
 Accept: application/json
 
 ###评价绩效投诉核查信息编辑
 GET {{baseUrl}}/check/complain/record/edit?id={{CheckComplainRecord_id}}
-Authorization: {{authToken}}
 Accept: application/json
 
 

attendance-performance-manager/src/test/java/com/mortals/httpclient/check/CheckEffectRecordController.http

@@ -15,7 +15,6 @@ client.global.set("authToken", JSON.parse(response.body).data.token);
 
 ###效能绩效核查信息列表
 POST {{baseUrl}}/check/effect/record/list
-Authorization: {{authToken}}
 Content-Type: application/json
 
 {
@@ -30,30 +29,34 @@ Authorization: {{authToken}}
 Content-Type: application/json
 
 {
-        "recordId":903,
-        "staffId":176,
-        "staffName":"rmmbhz",
-        "workNum":"5gdqeu",
-        "windowNum":"0s5qzc",
-        "deptId":62,
-        "deptName":"s2m96c",
-        "irregularType":14,
-        "happenTime":"1684339200000",
+        "recordId":504,
+        "staffId":191,
+        "staffName":"fjfwle",
+        "workNum":"tfd31m",
+        "windowNum":"7et301",
+        "deptId":823,
+        "deptName":"7qjf4h",
+        "irregularType":627,
+        "happenTime":"1688918400000",
         "duration":0,
-        "alarmTime":"1684339200000",
-        "snapPath":"ylu71h",
-        "ruleId":876,
-        "ruleName":"inwcig",
+        "alarmTime":"1688918400000",
+        "snapPath":"cm8v7i",
+        "ruleId":568,
+        "ruleName":"1yskzz",
         "subMethod":1,
-        "deductPerson":"mkkikm",
-        "deductTime":"1684339200000",
+        "deductPerson":"cbhmag",
+        "deductTime":"1688918400000",
         "score":0.00,
-        "checkPerson":"897mhd",
-        "checkTime":"1684339200000",
-        "checkDesc":"vw7jh7",
-        "checkResult":"401a43",
+        "checkPerson":"8xla4w",
+        "checkTime":"1688918400000",
+        "checkDesc":"ab5g5h",
+        "checkResult":"7fnm76",
         "checkStatus":1,
-        "remark":"zh4nso",
+        "remark":"y9jg98",
+        "fileNames":"nf99zd",
+        "filePaths":"78fshu",
+        "categoryId":613,
+        "categoryName":"cus1r8"
 }
 
 > {%
@@ -62,12 +65,10 @@ client.global.set("CheckEffectRecord_id", JSON.parse(response.body).data.id);
 
 ###效能绩效核查信息查看
 GET {{baseUrl}}/check/effect/record/info?id={{CheckEffectRecord_id}}
-Authorization: {{authToken}}
 Accept: application/json
 
 ###效能绩效核查信息编辑
 GET {{baseUrl}}/check/effect/record/edit?id={{CheckEffectRecord_id}}
-Authorization: {{authToken}}
 Accept: application/json
 
 

attendance-performance-manager/src/test/java/com/mortals/httpclient/check/CheckGoworkRecordController.http

@@ -15,7 +15,6 @@ client.global.set("authToken", JSON.parse(response.body).data.token);
 
 ###办件绩效核查信息列表
 POST {{baseUrl}}/check/gowork/record/list
-Authorization: {{authToken}}
 Content-Type: application/json
 
 {
@@ -30,29 +29,33 @@ Authorization: {{authToken}}
 Content-Type: application/json
 
 {
-        "recordId":442,
-        "staffId":887,
-        "staffName":"gtav21",
-        "workNum":"lrsc4u",
-        "windowNum":"fr78b7",
-        "deptId":782,
-        "deptName":"tup9t3",
-        "goworkCode":"rp955z",
-        "goworkDepts":"lonrir",
-        "matterlName":"7reeym",
-        "goworkTime":"1684339200000",
-        "ruleId":669,
-        "ruleName":"gde8o5",
+        "recordId":950,
+        "staffId":256,
+        "staffName":"b7ycn3",
+        "workNum":"z2qawd",
+        "windowNum":"yzkyoi",
+        "deptId":718,
+        "deptName":"qc4j3x",
+        "goworkCode":"hlumxr",
+        "goworkDepts":"vng52z",
+        "matterlName":"3wsmnr",
+        "goworkTime":"1688918400000",
+        "ruleId":453,
+        "ruleName":"ctgg9x",
         "subMethod":1,
-        "deductPerson":"e3lbcr",
-        "deductTime":"1684339200000",
+        "deductPerson":"27ge9v",
+        "deductTime":"1688918400000",
         "score":0.00,
-        "checkPerson":"xdlob1",
-        "checkTime":"1684339200000",
-        "checkDesc":"2y0gwc",
-        "checkResult":"jx6c7b",
+        "checkPerson":"9vz4xl",
+        "checkTime":"1688918400000",
+        "checkDesc":"p1tln0",
+        "checkResult":"qrj3e8",
         "checkStatus":1,
-        "remark":"6hb8pv",
+        "remark":"0ne6m7",
+        "fileNames":"a447yl",
+        "filePaths":"m9kvrw",
+        "categoryId":437,
+        "categoryName":"x6wpxl"
 }
 
 > {%
@@ -61,12 +64,10 @@ client.global.set("CheckGoworkRecord_id", JSON.parse(response.body).data.id);
 
 ###办件绩效核查信息查看
 GET {{baseUrl}}/check/gowork/record/info?id={{CheckGoworkRecord_id}}
-Authorization: {{authToken}}
 Accept: application/json
 
 ###办件绩效核查信息编辑
 GET {{baseUrl}}/check/gowork/record/edit?id={{CheckGoworkRecord_id}}
-Authorization: {{authToken}}
 Accept: application/json
 
 

attendance-performance-manager/src/test/java/com/mortals/httpclient/check/CheckOtherRecordController.http

@@ -15,7 +15,6 @@ client.global.set("authToken", JSON.parse(response.body).data.token);
 
 ###其它绩效核查信息列表
 POST {{baseUrl}}/check/other/record/list
-Authorization: {{authToken}}
 Content-Type: application/json
 
 {
@@ -30,29 +29,33 @@ Authorization: {{authToken}}
 Content-Type: application/json
 
 {
-        "recordId":703,
-        "staffId":863,
-        "staffName":"hbwpyi",
-        "workNum":"mg0vl2",
-        "deptId":40,
-        "deptName":"f5awye",
-        "windowNum":"brthvz",
-        "irregularOtherType":52,
-        "happenTime":"1684339200000",
+        "recordId":536,
+        "staffId":829,
+        "staffName":"ckg18e",
+        "workNum":"hlndp7",
+        "deptId":498,
+        "deptName":"vrsw23",
+        "windowNum":"1kk9jd",
+        "irregularOtherType":322,
+        "happenTime":"1688918400000",
         "duration":0,
-        "ruleId":500,
-        "ruleName":"m4b3bu",
-        "ruleDesc":"zsiuml",
+        "ruleId":15,
+        "ruleName":"3an6o7",
+        "ruleDesc":"ndrhel",
         "subMethod":1,
-        "deductPerson":"ka8ro6",
-        "deductTime":"1684339200000",
+        "deductPerson":"xhvj49",
+        "deductTime":"1688918400000",
         "score":0.00,
-        "checkPerson":"zpiuya",
-        "checkTime":"1684339200000",
-        "checkDesc":"tcyt1u",
-        "checkResult":"0anav7",
+        "checkPerson":"f10qck",
+        "checkTime":"1688918400000",
+        "checkDesc":"h43m5k",
+        "checkResult":"bwq05b",
         "checkStatus":1,
-        "remark":"oqy11g",
+        "remark":"exi1sp",
+        "fileNames":"hwzs68",
+        "filePaths":"cq5yk3",
+        "categoryId":242,
+        "categoryName":"qxzate"
 }
 
 > {%
@@ -61,12 +64,10 @@ client.global.set("CheckOtherRecord_id", JSON.parse(response.body).data.id);
 
 ###其它绩效核查信息查看
 GET {{baseUrl}}/check/other/record/info?id={{CheckOtherRecord_id}}
-Authorization: {{authToken}}
 Accept: application/json
 
 ###其它绩效核查信息编辑
 GET {{baseUrl}}/check/other/record/edit?id={{CheckOtherRecord_id}}
-Authorization: {{authToken}}
 Accept: application/json
 
 

attendance-performance-manager/src/test/java/com/mortals/httpclient/check/CheckReviewRecordController.http

@@ -15,7 +15,6 @@ client.global.set("authToken", JSON.parse(response.body).data.token);
 
 ###评价差评绩效核查信息列表
 POST {{baseUrl}}/check/review/record/list
-Authorization: {{authToken}}
 Content-Type: application/json
 
 {
@@ -30,29 +29,33 @@ Authorization: {{authToken}}
 Content-Type: application/json
 
 {
-        "recordId":33,
-        "staffId":803,
-        "staffName":"luhyu0",
-        "workNum":"q43esf",
-        "windowNum":"1yeoki",
-        "deptId":733,
-        "deptName":"rhf204",
-        "reviewResult":773,
-        "reviewTime":"1684339200000",
-        "reviewSource":"fmpbmd",
-        "reviewDevice":"0lue2k",
-        "ruleId":167,
-        "ruleName":"10p84d",
+        "recordId":600,
+        "staffId":688,
+        "staffName":"75g2nw",
+        "workNum":"8xl87j",
+        "windowNum":"oxziwk",
+        "deptId":63,
+        "deptName":"jdgue4",
+        "reviewResult":551,
+        "reviewTime":"1688918400000",
+        "reviewSource":"pc4gm5",
+        "reviewDevice":"u79xol",
+        "ruleId":641,
+        "ruleName":"93i0wb",
         "subMethod":1,
-        "deductPerson":"iu7xas",
-        "deductTime":"1684339200000",
+        "deductPerson":"i607um",
+        "deductTime":"1688918400000",
         "score":0.00,
-        "checkPerson":"0keze9",
-        "checkTime":"1684339200000",
-        "checkDesc":"vwmy0d",
-        "checkResult":"wvhzu3",
+        "checkPerson":"nr9rq9",
+        "checkTime":"1688918400000",
+        "checkDesc":"h1tbu7",
+        "checkResult":"xkc4pl",
         "checkStatus":1,
-        "remark":"0vrrhb",
+        "remark":"uogdeb",
+        "fileNames":"e9x8xe",
+        "filePaths":"uea48a",
+        "categoryId":828,
+        "categoryName":"r0e60i"
 }
 
 > {%
@@ -61,12 +64,10 @@ client.global.set("CheckReviewRecord_id", JSON.parse(response.body).data.id);
 
 ###评价差评绩效核查信息查看
 GET {{baseUrl}}/check/review/record/info?id={{CheckReviewRecord_id}}
-Authorization: {{authToken}}
 Accept: application/json
 
 ###评价差评绩效核查信息编辑
 GET {{baseUrl}}/check/review/record/edit?id={{CheckReviewRecord_id}}
-Authorization: {{authToken}}
 Accept: application/json
 
 

attendance-performance-manager/src/test/java/com/mortals/httpclient/perform/PerformAttendRecordController.http

@@ -15,7 +15,6 @@ client.global.set("authToken", JSON.parse(response.body).data.token);
 
 ###考勤绩效记录信息列表
 POST {{baseUrl}}/perform/attend/record/list
-Authorization: {{authToken}}
 Content-Type: application/json
 
 {
@@ -30,27 +29,31 @@ Authorization: {{authToken}}
 Content-Type: application/json
 
 {
-        "staffId":353,
-        "staffName":"o8xo0g",
-        "workNum":"pbjtmi",
-        "deptId":465,
-        "deptName":"0d3bt4",
-        "attendanceGroupId":278,
-        "attendanceGroupName":"roso2t",
-        "attendanceDate":"1684339200000",
-        "ruleId":588,
-        "ruleNme":"y3iixt",
-        "errorTime":"1684339200000",
-        "goOffTimeStr":"0wqa9h",
-        "actualAttendTime":"1684339200000",
-        "errorResult":"qzr5oj",
+        "staffId":219,
+        "staffName":"xgq0hy",
+        "workNum":"v0470t",
+        "deptId":615,
+        "deptName":"xncwwi",
+        "attendanceGroupId":58,
+        "attendanceGroupName":"mcp84h",
+        "attendanceDate":"1688918400000",
+        "ruleId":297,
+        "ruleNme":"0bx39w",
+        "errorTime":"1688918400000",
+        "goOffTimeStr":"krvefn",
+        "actualAttendTime":"1688918400000",
+        "errorResult":"rq41vb",
         "subMethod":1,
-        "deductPerson":"tv8dbr",
-        "deductTime":"1684339200000",
+        "deductPerson":"hb15nt",
+        "deductTime":"1688918400000",
         "subAddType":1,
         "score":0.00,
         "processStatus":1,
-        "remark":"kkm3ly",
+        "remark":"98ny3x",
+        "fileNames":"0x7fay",
+        "filePaths":"a2yw1s",
+        "categoryId":676,
+        "categoryName":"5ohsc1"
 }
 
 > {%
@@ -59,12 +62,10 @@ client.global.set("PerformAttendRecord_id", JSON.parse(response.body).data.id);
 
 ###考勤绩效记录信息查看
 GET {{baseUrl}}/perform/attend/record/info?id={{PerformAttendRecord_id}}
-Authorization: {{authToken}}
 Accept: application/json
 
 ###考勤绩效记录信息编辑
 GET {{baseUrl}}/perform/attend/record/edit?id={{PerformAttendRecord_id}}
-Authorization: {{authToken}}
 Accept: application/json
 
 

attendance-performance-manager/src/test/java/com/mortals/httpclient/perform/PerformComplainRecordController.http

@@ -15,7 +15,6 @@ client.global.set("authToken", JSON.parse(response.body).data.token);
 
 ###评价绩效投诉记录信息列表
 POST {{baseUrl}}/perform/complain/record/list
-Authorization: {{authToken}}
 Content-Type: application/json
 
 {
@@ -30,27 +29,31 @@ Authorization: {{authToken}}
 Content-Type: application/json
 
 {
-        "staffId":397,
-        "staffName":"qhoufs",
-        "workNum":"n2ecoi",
-        "windowNum":"qlun42",
-        "deptId":866,
-        "deptName":"k98glz",
-        "complainTitle":"2bsqs9",
-        "complainContent":"h4msbt",
-        "complainRealName":"b5om0b",
-        "contact":"3t5rkz",
-        "complainTime":"1684339200000",
-        "complainSource":"wh6j8u",
-        "complainDevice":"br5kpt",
-        "ruleId":25,
-        "ruleName":"ww7ou4",
+        "staffId":221,
+        "staffName":"j9wwx3",
+        "workNum":"8uuv5a",
+        "windowNum":"cxdbdf",
+        "deptId":12,
+        "deptName":"0xpw93",
+        "complainTitle":"ahoewg",
+        "complainContent":"466we6",
+        "complainRealName":"dz6u48",
+        "contact":"k5sc5r",
+        "complainTime":"1688918400000",
+        "complainSource":"9i7kc7",
+        "complainDevice":"z28v4z",
+        "ruleId":223,
+        "ruleName":"wdvqme",
         "subMethod":1,
-        "deductPerson":"je15o9",
-        "deductTime":"1684339200000",
+        "deductPerson":"uqjmbd",
+        "deductTime":"1688918400000",
         "score":0.00,
         "processStatus":1,
-        "remark":"upottx",
+        "remark":"mylc27",
+        "fileNames":"l0fz13",
+        "filePaths":"49zkgc",
+        "categoryId":219,
+        "categoryName":"xcu8sz"
 }
 
 > {%
@@ -59,12 +62,10 @@ client.global.set("PerformComplainRecord_id", JSON.parse(response.body).data.id)
 
 ###评价绩效投诉记录信息查看
 GET {{baseUrl}}/perform/complain/record/info?id={{PerformComplainRecord_id}}
-Authorization: {{authToken}}
 Accept: application/json
 
 ###评价绩效投诉记录信息编辑
 GET {{baseUrl}}/perform/complain/record/edit?id={{PerformComplainRecord_id}}
-Authorization: {{authToken}}
 Accept: application/json
 
 

attendance-performance-manager/src/test/java/com/mortals/httpclient/perform/PerformEffectRecordController.http

@@ -15,7 +15,6 @@ client.global.set("authToken", JSON.parse(response.body).data.token);
 
 ###效能绩效记录信息列表
 POST {{baseUrl}}/perform/effect/record/list
-Authorization: {{authToken}}
 Content-Type: application/json
 
 {
@@ -30,25 +29,29 @@ Authorization: {{authToken}}
 Content-Type: application/json
 
 {
-        "staffId":575,
-        "staffName":"e1ucg8",
-        "workNum":"aux3m8",
-        "windowNum":"3smh4u",
-        "deptId":959,
-        "deptName":"o2bi7s",
-        "irregularType":83,
-        "happenTime":"1684339200000",
+        "staffId":208,
+        "staffName":"rc0y1i",
+        "workNum":"k4ej90",
+        "windowNum":"8omfgp",
+        "deptId":616,
+        "deptName":"18qrwj",
+        "irregularType":829,
+        "happenTime":"1688918400000",
         "duration":0,
-        "alarmTime":"1684339200000",
-        "snapPath":"0lvso0",
-        "ruleId":660,
-        "ruleName":"buvit9",
+        "alarmTime":"1688918400000",
+        "snapPath":"qkhu4i",
+        "ruleId":363,
+        "ruleName":"qur1e7",
         "subMethod":1,
-        "deductPerson":"nvafoo",
-        "deductTime":"1684339200000",
+        "deductPerson":"h4nngr",
+        "deductTime":"1688918400000",
         "score":0.00,
         "processStatus":1,
-        "remark":"q52y3o",
+        "remark":"pqqzm8",
+        "fileNames":"7xhlzw",
+        "filePaths":"xy5jsk",
+        "categoryId":571,
+        "categoryName":"3z822k"
 }
 
 > {%
@@ -57,12 +60,10 @@ client.global.set("PerformEffectRecord_id", JSON.parse(response.body).data.id);
 
 ###效能绩效记录信息查看
 GET {{baseUrl}}/perform/effect/record/info?id={{PerformEffectRecord_id}}
-Authorization: {{authToken}}
 Accept: application/json
 
 ###效能绩效记录信息编辑
 GET {{baseUrl}}/perform/effect/record/edit?id={{PerformEffectRecord_id}}
-Authorization: {{authToken}}
 Accept: application/json
 
 

attendance-performance-manager/src/test/java/com/mortals/httpclient/perform/PerformGoworkRecordController.http

@@ -15,7 +15,6 @@ client.global.set("authToken", JSON.parse(response.body).data.token);
 
 ###办件绩效记录信息列表
 POST {{baseUrl}}/perform/gowork/record/list
-Authorization: {{authToken}}
 Content-Type: application/json
 
 {
@@ -30,24 +29,28 @@ Authorization: {{authToken}}
 Content-Type: application/json
 
 {
-        "staffId":967,
-        "staffName":"zi7j0o",
-        "workNum":"vlf9fe",
-        "windowNum":"tpwyq8",
-        "deptId":407,
-        "deptName":"njy6bp",
-        "goworkCode":"zswgio",
-        "goworkDepts":"dj25an",
-        "matterlName":"1xled6",
-        "goworkTime":"1684339200000",
-        "ruleId":565,
-        "ruleName":"fjd9pp",
+        "staffId":36,
+        "staffName":"yk637v",
+        "workNum":"822ao3",
+        "windowNum":"ck9zfn",
+        "deptId":711,
+        "deptName":"j3r566",
+        "goworkCode":"bsievb",
+        "goworkDepts":"xum3k5",
+        "matterlName":"ij7vyy",
+        "goworkTime":"1688918400000",
+        "ruleId":170,
+        "ruleName":"yaev76",
         "subMethod":1,
-        "deductPerson":"v96o7j",
-        "deductTime":"1684339200000",
+        "deductPerson":"ae3vr5",
+        "deductTime":"1688918400000",
         "score":0.00,
         "processStatus":1,
-        "remark":"kxwswd",
+        "remark":"72361i",
+        "fileNames":"lzqhhj",
+        "filePaths":"t9ge1w",
+        "categoryId":339,
+        "categoryName":"kv9mgf"
 }
 
 > {%
@@ -56,12 +59,10 @@ client.global.set("PerformGoworkRecord_id", JSON.parse(response.body).data.id);
 
 ###办件绩效记录信息查看
 GET {{baseUrl}}/perform/gowork/record/info?id={{PerformGoworkRecord_id}}
-Authorization: {{authToken}}
 Accept: application/json
 
 ###办件绩效记录信息编辑
 GET {{baseUrl}}/perform/gowork/record/edit?id={{PerformGoworkRecord_id}}
-Authorization: {{authToken}}
 Accept: application/json
 
 

attendance-performance-manager/src/test/java/com/mortals/httpclient/perform/PerformOtherRecordController.http

@@ -15,7 +15,6 @@ client.global.set("authToken", JSON.parse(response.body).data.token);
 
 ###其它绩效记录信息列表
 POST {{baseUrl}}/perform/other/record/list
-Authorization: {{authToken}}
 Content-Type: application/json
 
 {
@@ -30,24 +29,28 @@ Authorization: {{authToken}}
 Content-Type: application/json
 
 {
-        "staffId":812,
-        "staffName":"ntb7dz",
-        "workNum":"z079d7",
-        "windowNum":"l9v7g9",
-        "deptId":147,
-        "deptName":"h3m13f",
-        "irregularOtherType":825,
-        "happenTime":"1684339200000",
+        "staffId":215,
+        "staffName":"wh5253",
+        "workNum":"ynprkv",
+        "windowNum":"9jt4v7",
+        "deptId":404,
+        "deptName":"zpbrf5",
+        "irregularOtherType":342,
+        "happenTime":"1688918400000",
         "duration":0,
-        "ruleId":325,
-        "ruleName":"pgrh7i",
-        "ruleDesc":"q6tcnc",
+        "ruleId":82,
+        "ruleName":"83xbgj",
+        "ruleDesc":"qsvfmf",
         "subMethod":1,
-        "deductPerson":"c22aqq",
-        "deductTime":"1684339200000",
+        "deductPerson":"7mvigx",
+        "deductTime":"1688918400000",
         "score":0.00,
         "processStatus":1,
-        "remark":"97gqr4",
+        "remark":"fu2jxq",
+        "fileNames":"sref2k",
+        "filePaths":"0h3pob",
+        "categoryId":689,
+        "categoryName":"ghl09u"
 }
 
 > {%
@@ -56,12 +59,10 @@ client.global.set("PerformOtherRecord_id", JSON.parse(response.body).data.id);
 
 ###其它绩效记录信息查看
 GET {{baseUrl}}/perform/other/record/info?id={{PerformOtherRecord_id}}
-Authorization: {{authToken}}
 Accept: application/json
 
 ###其它绩效记录信息编辑
 GET {{baseUrl}}/perform/other/record/edit?id={{PerformOtherRecord_id}}
-Authorization: {{authToken}}
 Accept: application/json
 
 

attendance-performance-manager/src/test/java/com/mortals/httpclient/perform/PerformReviewRecordController.http

@@ -15,7 +15,6 @@ client.global.set("authToken", JSON.parse(response.body).data.token);
 
 ###评价差评绩效记录信息列表
 POST {{baseUrl}}/perform/review/record/list
-Authorization: {{authToken}}
 Content-Type: application/json
 
 {
@@ -30,24 +29,28 @@ Authorization: {{authToken}}
 Content-Type: application/json
 
 {
-        "staffId":479,
-        "staffName":"rbyb9i",
-        "workNum":"wfo4qj",
-        "windowNum":"jnenvh",
-        "deptId":413,
-        "deptName":"e27s8o",
-        "reviewResult":244,
-        "reviewTime":"1684339200000",
-        "reviewSource":"qscv3u",
-        "reviewDevice":"xcstb1",
-        "ruleId":490,
-        "ruleName":"azzloc",
+        "staffId":121,
+        "staffName":"innvnz",
+        "workNum":"tlwort",
+        "windowNum":"uumddr",
+        "deptId":908,
+        "deptName":"gkiz6l",
+        "reviewResult":945,
+        "reviewTime":"1688918400000",
+        "reviewSource":"vo2lyt",
+        "reviewDevice":"15k0s9",
+        "ruleId":461,
+        "ruleName":"9pqm28",
         "subMethod":1,
-        "deductPerson":"fj23y1",
-        "deductTime":"1684339200000",
+        "deductPerson":"9nt3w0",
+        "deductTime":"1688918400000",
         "score":0.00,
         "processStatus":1,
-        "remark":"nzayxi",
+        "remark":"zrzoc4",
+        "fileNames":"asduit",
+        "filePaths":"wb59e5",
+        "categoryId":779,
+        "categoryName":"9i7f7x"
 }
 
 > {%
@@ -56,12 +59,10 @@ client.global.set("PerformReviewRecord_id", JSON.parse(response.body).data.id);
 
 ###评价差评绩效记录信息查看
 GET {{baseUrl}}/perform/review/record/info?id={{PerformReviewRecord_id}}
-Authorization: {{authToken}}
 Accept: application/json
 
 ###评价差评绩效记录信息编辑
 GET {{baseUrl}}/perform/review/record/edit?id={{PerformReviewRecord_id}}
-Authorization: {{authToken}}
 Accept: application/json
 
 

db/add.sql

@@ -337,3 +337,47 @@ ALTER TABLE mortals_xhx_check_other_record ADD COLUMN `filePaths`  varchar(256)
 
 ALTER TABLE mortals_xhx_feedback ADD COLUMN `ruleContent`  varchar(1024) DEFAULT ''      COMMENT '规则内容' AFTER formContent;
 
+
+
+
+
+ALTER TABLE mortals_xhx_perform_attend_record ADD COLUMN `categoryId` bigint(20)      COMMENT '绩效规则分类id' AFTER filePaths;
+ALTER TABLE mortals_xhx_perform_attend_record ADD COLUMN `categoryName` varchar(128)      COMMENT '规则名称' AFTER categoryId;
+
+ALTER TABLE mortals_xhx_check_attend_record  ADD COLUMN `categoryId` bigint(20)      COMMENT '绩效规则分类id' AFTER filePaths;
+ALTER TABLE mortals_xhx_check_attend_record ADD COLUMN `categoryName` varchar(128)      COMMENT '规则名称' AFTER categoryId;
+
+ALTER TABLE mortals_xhx_perform_review_record ADD COLUMN `categoryId` bigint(20)      COMMENT '绩效规则分类id' AFTER filePaths;
+ALTER TABLE mortals_xhx_perform_review_record ADD COLUMN `categoryName` varchar(128)      COMMENT '规则名称' AFTER categoryId;
+
+ALTER TABLE mortals_xhx_check_review_record ADD COLUMN `categoryId` bigint(20)      COMMENT '绩效规则分类id' AFTER filePaths;
+ALTER TABLE mortals_xhx_check_review_record ADD COLUMN `categoryName` varchar(128)      COMMENT '规则名称' AFTER categoryId;
+
+ALTER TABLE mortals_xhx_perform_complain_record ADD COLUMN `categoryId` bigint(20)      COMMENT '绩效规则分类id' AFTER filePaths;
+ALTER TABLE mortals_xhx_perform_complain_record ADD COLUMN `categoryName` varchar(128)      COMMENT '规则名称' AFTER categoryId;
+
+ALTER TABLE mortals_xhx_check_complain_record ADD COLUMN `categoryId` bigint(20)      COMMENT '绩效规则分类id' AFTER filePaths;
+ALTER TABLE mortals_xhx_check_complain_record ADD COLUMN `categoryName` varchar(128)      COMMENT '规则名称' AFTER categoryId;
+
+
+ALTER TABLE mortals_xhx_perform_gowork_record ADD COLUMN `categoryId` bigint(20)      COMMENT '绩效规则分类id' AFTER filePaths;
+ALTER TABLE mortals_xhx_perform_gowork_record ADD COLUMN `categoryName` varchar(128)      COMMENT '规则名称' AFTER categoryId;
+
+ALTER TABLE mortals_xhx_check_gowork_record ADD COLUMN `categoryId` bigint(20)      COMMENT '绩效规则分类id' AFTER filePaths;
+ALTER TABLE mortals_xhx_check_gowork_record ADD COLUMN `categoryName` varchar(128)      COMMENT '规则名称' AFTER categoryId;
+
+
+ALTER TABLE mortals_xhx_perform_effect_record ADD COLUMN `categoryId` bigint(20)      COMMENT '绩效规则分类id' AFTER filePaths;
+ALTER TABLE mortals_xhx_perform_effect_record ADD COLUMN `categoryName` varchar(128)      COMMENT '规则名称' AFTER categoryId;
+
+ALTER TABLE mortals_xhx_check_effect_record ADD COLUMN `categoryId` bigint(20)      COMMENT '绩效规则分类id' AFTER filePaths;
+ALTER TABLE mortals_xhx_check_effect_record ADD COLUMN `categoryName` varchar(128)      COMMENT '规则名称' AFTER categoryId;
+
+
+ALTER TABLE mortals_xhx_perform_other_record ADD COLUMN `categoryId` bigint(20)      COMMENT '绩效规则分类id' AFTER filePaths;
+ALTER TABLE mortals_xhx_perform_other_record ADD COLUMN `categoryName` varchar(128)      COMMENT '规则名称' AFTER categoryId;
+
+ALTER TABLE mortals_xhx_check_other_record ADD COLUMN `categoryId` bigint(20)      COMMENT '绩效规则分类id' AFTER filePaths;
+ALTER TABLE mortals_xhx_check_other_record ADD COLUMN `categoryName` varchar(128)      COMMENT '规则名称' AFTER categoryId;
+
+