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

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

@@ -403,7 +403,7 @@ export default {
         background-color: #fafafa;
         height: 100%;
         border-radius: 4px;
-        width: 49%;
+        width: 49.5%;
         box-sizing: border-box;
         padding: 20px;
 
@@ -419,7 +419,7 @@ export default {
         background-color: #fafafa;
         height: 100%;
         border-radius: 4px;
-        width: 49%;
+        width: 49.5%;
         box-sizing: border-box;
         padding: 20px;
 

attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/dingtalk/api/TalkApiController.java

@@ -37,7 +37,6 @@ public class TalkApiController {
     @PostMapping("/dingtalk/gettoken")
     public Rest<String> getToken(@RequestBody DingTalkBaseReq dingTalkBaseReq) {
         log.info("收到【getToken】请求【请求体】--> {}", JSON.toJSONString(dingTalkBaseReq));
-
         try {
 
 

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

 package com.mortals.xhx.busiz.req;
 
+import com.mortals.framework.annotation.Excel;
 import com.mortals.xhx.busiz.BaseReq;
 import lombok.Data;
 
@@ -29,6 +30,7 @@ public class PerformSaveReq extends BaseReq {
      * 规则编码
      */
     private String ruleCode;
+    private String phone;
 
 
     /**
@@ -36,4 +38,23 @@ public class PerformSaveReq extends BaseReq {
      */
     private String performType;
 
+
+
+    /**
+     * 评价结果(1.非常不满意,2.差评)
+     */
+    private Integer reviewResult;
+    /**
+     * 评价时间
+     */
+    private Date reviewTime;
+    /**
+     * 评价来源(窗口评价系统,导视系统,自助服务系统,微官网,其它)
+     */
+    private String reviewSource;
+    /**
+     * 评价设备
+     */
+    private String reviewDevice;
+
 }

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

@@ -9,15 +9,24 @@ import com.mortals.xhx.busiz.req.PerformSaveReq;
 import com.mortals.xhx.busiz.rsp.ApiResp;
 import com.mortals.xhx.common.code.ApiRespCodeEnum;
 import com.mortals.xhx.common.code.PerformTypeEnum;
+import com.mortals.xhx.module.perform.model.PerformAttendRecordEntity;
+import com.mortals.xhx.module.perform.model.PerformReviewRecordEntity;
+import com.mortals.xhx.module.perform.model.PerformRulesEntity;
 import com.mortals.xhx.module.perform.service.*;
+import com.mortals.xhx.module.staff.model.StaffEntity;
+import com.mortals.xhx.module.staff.model.StaffQuery;
+import com.mortals.xhx.module.staff.service.StaffService;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.Date;
 
 @RestController
 @Slf4j
@@ -38,8 +47,8 @@ public class ApiWebPerformController extends AbstractBaseController<PerformReq>
     private PerformOtherRecordService otherRecordService;
     @Autowired
     private PerformRulesService rulesService;
-
-
+    @Autowired
+    private StaffService staffService;
 
 
     /**
@@ -56,8 +65,11 @@ public class ApiWebPerformController extends AbstractBaseController<PerformReq>
         rsp.setCode(ApiRespCodeEnum.SUCCESS.getValue());
         StringBuilder message = new StringBuilder();
         message.append(String.format("【外部请求】类型【%s】 内容:%s", PerformTypeEnum.getByValue(req.getPerformType()).getDesc(), JSONObject.toJSONString(req)));
-        recordSysLog(request, message.toString());
         try {
+            if (ObjectUtils.isEmpty(req.getPhone())) throw new AppException("手机号码不能为空！");
+            if (ObjectUtils.isEmpty(req.getRuleCode())) throw new AppException("绩效规则编码不能为空！");
+
+
             switch (PerformTypeEnum.getByValue(req.getPerformType())) {
                 case 考勤绩效:
                     attend(req);
@@ -89,15 +101,63 @@ public class ApiWebPerformController extends AbstractBaseController<PerformReq>
             rsp.setMsg(e.getMessage());
             return JSON.toJSONString(rsp);
         }
+        recordSysLog(request, message.toString());
         log.info("响应【设备接收】【响应体】-->  " + JSONObject.toJSONString(rsp));
         return JSON.toJSONString(rsp);
     }
+
     private void attend(PerformSaveReq req) throws AppException {
         //考勤保存
+        //通过手机号码查询员工属性
+        StaffEntity staffEntity = getStaff(req);
+        PerformRulesEntity rule = getRule(req);
+
+        PerformAttendRecordEntity recordEntity = new PerformAttendRecordEntity();
+        recordEntity.initAttrValue();
+        BeanUtils.copyProperties(req, recordEntity);
+        recordEntity.setStaffId(staffEntity.getId());
+        recordEntity.setStaffName(staffEntity.getName());
+
+
+        recordEntity.setSubAddType(rule.getSubAddType());
+        recordEntity.setScore(rule.getScore());
+        recordEntity.setRuleId(rule.getId());
+        recordEntity.setRuleNme(rule.getName());
+        recordEntity.setCategoryId(rule.getCategoryId());
+        recordEntity.setCategoryName(rule.getCategoryName());
+
+
+        recordEntity.setCreateUserId(1L);
+        recordEntity.setCreateTime(new Date());
+        attendRecordService.save(recordEntity);
     }
 
+
     private void review(PerformSaveReq req) throws AppException {
         //评价保存
+        StaffEntity staffEntity = getStaff(req);
+        PerformRulesEntity rule = getRule(req);
+
+        PerformReviewRecordEntity recordEntity = new PerformReviewRecordEntity();
+
+        recordEntity.initAttrValue();
+        BeanUtils.copyProperties(req, recordEntity);
+        recordEntity.setStaffId(staffEntity.getId());
+        recordEntity.setStaffName(staffEntity.getName());
+
+
+        recordEntity.setSubAddType(rule.getSubAddType());
+        recordEntity.setScore(rule.getScore());
+        recordEntity.setRuleId(rule.getId());
+        recordEntity.setRuleName(rule.getName());
+        recordEntity.setCategoryId(rule.getCategoryId());
+        recordEntity.setCategoryName(rule.getCategoryName());
+
+
+        recordEntity.setCreateUserId(1L);
+        recordEntity.setCreateTime(new Date());
+        reviewRecordService.save(recordEntity);
+
     }
 
     private void complain(PerformSaveReq req) throws AppException {
@@ -117,6 +177,25 @@ public class ApiWebPerformController extends AbstractBaseController<PerformReq>
     }
 
 
+
+    private PerformRulesEntity getRule(PerformSaveReq req) {
+        PerformRulesEntity rule = rulesService.getCache(req.getRuleCode());
+        if (ObjectUtils.isEmpty(rule))
+            throw new AppException(String.format("当前手机号码未找到匹配的员工！rule:%s", req.getPhone()));
+
+        return rule;
+    }
+
+    private StaffEntity getStaff(PerformSaveReq req) {
+        StaffEntity staffEntity = staffService.selectOne(new StaffQuery().phoneNumber(req.getPhone()));
+        if (ObjectUtils.isEmpty(staffEntity))
+            throw new AppException(String.format("当前手机号码未找到匹配的员工！phone:%s", req.getPhone()));
+
+        return staffEntity;
+    }
+
+
+
     public static void main(String[] args) {
 
     }

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-07-10
+* @date 2023-07-11
 */
 
 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-07-10
+* @date 2023-07-11
 */
 
 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-07-10
+* @date 2023-07-11
 */
 
 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-07-10
+* @date 2023-07-11
 */
 
 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-07-10
+* @date 2023-07-11
 */
 
 public interface  CheckReviewRecordDao extends ICRUDDao<CheckReviewRecordEntity,Long>{

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-07-10
+* @date 2023-07-11
 */
 @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-07-10
+* @date 2023-07-11
 */
 @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-07-10
+* @date 2023-07-11
 */
 @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-07-10
+* @date 2023-07-11
 */
 @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-07-10
+* @date 2023-07-11
 */
 @Repository("checkReviewRecordDao")
 public class CheckReviewRecordDaoImpl extends BaseCRUDDaoMybatis<CheckReviewRecordEntity,Long> implements CheckReviewRecordDao {

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-10
+* @date 2023-07-11
 */
 @Data
 public class CheckComplainRecordEntity extends CheckComplainRecordVo {
@@ -151,6 +151,10 @@ public class CheckComplainRecordEntity extends CheckComplainRecordVo {
     * 规则名称
     */
     private String categoryName;
+    /**
+    * 增减类型(1.增加,2.扣除)
+    */
+    private Integer subAddType;
     @Override
     public int hashCode() {
          return this.getId().hashCode();
@@ -228,5 +232,7 @@ public class CheckComplainRecordEntity extends CheckComplainRecordVo {
             this.categoryId = -1L;
 
             this.categoryName = "";
+
+            this.subAddType = 1;
     }
 }
\ 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-10
+* @date 2023-07-11
 */
 public class CheckComplainRecordQuery extends CheckComplainRecordEntity {
     /** 开始 序号，主键，自增长 */
@@ -301,6 +301,21 @@ public class CheckComplainRecordQuery extends CheckComplainRecordEntity {
 
     /** 规则名称排除列表 */
     private List <String> categoryNameNotList;
+    /** 开始 增减类型(1.增加,2.扣除) */
+    private Integer subAddTypeStart;
+
+    /** 结束 增减类型(1.增加,2.扣除) */
+    private Integer subAddTypeEnd;
+
+    /** 增加 增减类型(1.增加,2.扣除) */
+    private Integer subAddTypeIncrement;
+
+    /** 增减类型(1.增加,2.扣除)列表 */
+    private List <Integer> subAddTypeList;
+
+    /** 增减类型(1.增加,2.扣除)排除列表 */
+    private List <Integer> subAddTypeNotList;
+
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<CheckComplainRecordQuery> orConditionList;
 
@@ -1968,6 +1983,87 @@ public class CheckComplainRecordQuery extends CheckComplainRecordEntity {
         this.categoryNameNotList = categoryNameNotList;
     }
 
+    /**
+    * 获取 开始 增减类型(1.增加,2.扣除)
+    * @return subAddTypeStart
+    */
+    public Integer getSubAddTypeStart(){
+        return this.subAddTypeStart;
+    }
+
+    /**
+    * 设置 开始 增减类型(1.增加,2.扣除)
+    * @param subAddTypeStart
+    */
+    public void setSubAddTypeStart(Integer subAddTypeStart){
+        this.subAddTypeStart = subAddTypeStart;
+    }
+
+    /**
+    * 获取 结束 增减类型(1.增加,2.扣除)
+    * @return $subAddTypeEnd
+    */
+    public Integer getSubAddTypeEnd(){
+        return this.subAddTypeEnd;
+    }
+
+    /**
+    * 设置 结束 增减类型(1.增加,2.扣除)
+    * @param subAddTypeEnd
+    */
+    public void setSubAddTypeEnd(Integer subAddTypeEnd){
+        this.subAddTypeEnd = subAddTypeEnd;
+    }
+
+    /**
+    * 获取 增加 增减类型(1.增加,2.扣除)
+    * @return subAddTypeIncrement
+    */
+    public Integer getSubAddTypeIncrement(){
+        return this.subAddTypeIncrement;
+    }
+
+    /**
+    * 设置 增加 增减类型(1.增加,2.扣除)
+    * @param subAddTypeIncrement
+    */
+    public void setSubAddTypeIncrement(Integer subAddTypeIncrement){
+        this.subAddTypeIncrement = subAddTypeIncrement;
+    }
+
+    /**
+    * 获取 增减类型(1.增加,2.扣除)
+    * @return subAddTypeList
+    */
+    public List<Integer> getSubAddTypeList(){
+        return this.subAddTypeList;
+    }
+
+    /**
+    * 设置 增减类型(1.增加,2.扣除)
+    * @param subAddTypeList
+    */
+    public void setSubAddTypeList(List<Integer> subAddTypeList){
+        this.subAddTypeList = subAddTypeList;
+    }
+
+    /**
+    * 获取 增减类型(1.增加,2.扣除)
+    * @return subAddTypeNotList
+    */
+    public List<Integer> getSubAddTypeNotList(){
+        return this.subAddTypeNotList;
+    }
+
+    /**
+    * 设置 增减类型(1.增加,2.扣除)
+    * @param subAddTypeNotList
+    */
+    public void setSubAddTypeNotList(List<Integer> subAddTypeNotList){
+        this.subAddTypeNotList = subAddTypeNotList;
+    }
+
+
     /**
     * 设置  序号，主键，自增长
     * @param id
@@ -2928,6 +3024,60 @@ public class CheckComplainRecordQuery extends CheckComplainRecordEntity {
 		return this;
     }
 
+    /**
+    * 设置  增减类型(1.增加,2.扣除)
+    * @param subAddType
+    */
+    public CheckComplainRecordQuery subAddType(Integer subAddType){
+	    setSubAddType(subAddType);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 增减类型(1.增加,2.扣除)
+    * @param subAddTypeStart
+    */
+    public CheckComplainRecordQuery subAddTypeStart(Integer subAddTypeStart){
+		this.subAddTypeStart = subAddTypeStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 增减类型(1.增加,2.扣除)
+    * @param subAddTypeEnd
+    */
+    public CheckComplainRecordQuery subAddTypeEnd(Integer subAddTypeEnd){
+		this.subAddTypeEnd = subAddTypeEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 增减类型(1.增加,2.扣除)
+    * @param subAddTypeIncrement
+    */
+    public CheckComplainRecordQuery subAddTypeIncrement(Integer subAddTypeIncrement){
+		this.subAddTypeIncrement = subAddTypeIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 增减类型(1.增加,2.扣除)
+    * @param subAddTypeList
+    */
+    public CheckComplainRecordQuery subAddTypeList(List<Integer> subAddTypeList){
+        this.subAddTypeList = subAddTypeList;
+		return this;
+        }
+
+        /**
+        * 设置 增减类型(1.增加,2.扣除)
+        * @param subAddTypeNotList
+        */
+        public CheckComplainRecordQuery subAddTypeNotList(List<Integer> subAddTypeNotList){
+        this.subAddTypeNotList = subAddTypeNotList;
+        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-10
+* @date 2023-07-11
 */
 @Data
 public class CheckEffectRecordEntity extends CheckEffectRecordVo {
@@ -142,6 +142,10 @@ public class CheckEffectRecordEntity extends CheckEffectRecordVo {
     * 规则名称
     */
     private String categoryName;
+    /**
+    * 增减类型(1.增加,2.扣除)
+    */
+    private Integer subAddType;
     @Override
     public int hashCode() {
          return this.getId().hashCode();
@@ -215,5 +219,7 @@ public class CheckEffectRecordEntity extends CheckEffectRecordVo {
             this.categoryId = -1L;
 
             this.categoryName = "";
+
+            this.subAddType = 1;
     }
 }
\ 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-10
+* @date 2023-07-11
 */
 public class CheckEffectRecordQuery extends CheckEffectRecordEntity {
     /** 开始 序号，主键，自增长 */
@@ -312,6 +312,21 @@ public class CheckEffectRecordQuery extends CheckEffectRecordEntity {
 
     /** 规则名称排除列表 */
     private List <String> categoryNameNotList;
+    /** 开始 增减类型(1.增加,2.扣除) */
+    private Integer subAddTypeStart;
+
+    /** 结束 增减类型(1.增加,2.扣除) */
+    private Integer subAddTypeEnd;
+
+    /** 增加 增减类型(1.增加,2.扣除) */
+    private Integer subAddTypeIncrement;
+
+    /** 增减类型(1.增加,2.扣除)列表 */
+    private List <Integer> subAddTypeList;
+
+    /** 增减类型(1.增加,2.扣除)排除列表 */
+    private List <Integer> subAddTypeNotList;
+
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<CheckEffectRecordQuery> orConditionList;
 
@@ -2013,6 +2028,87 @@ public class CheckEffectRecordQuery extends CheckEffectRecordEntity {
         this.categoryNameNotList = categoryNameNotList;
     }
 
+    /**
+    * 获取 开始 增减类型(1.增加,2.扣除)
+    * @return subAddTypeStart
+    */
+    public Integer getSubAddTypeStart(){
+        return this.subAddTypeStart;
+    }
+
+    /**
+    * 设置 开始 增减类型(1.增加,2.扣除)
+    * @param subAddTypeStart
+    */
+    public void setSubAddTypeStart(Integer subAddTypeStart){
+        this.subAddTypeStart = subAddTypeStart;
+    }
+
+    /**
+    * 获取 结束 增减类型(1.增加,2.扣除)
+    * @return $subAddTypeEnd
+    */
+    public Integer getSubAddTypeEnd(){
+        return this.subAddTypeEnd;
+    }
+
+    /**
+    * 设置 结束 增减类型(1.增加,2.扣除)
+    * @param subAddTypeEnd
+    */
+    public void setSubAddTypeEnd(Integer subAddTypeEnd){
+        this.subAddTypeEnd = subAddTypeEnd;
+    }
+
+    /**
+    * 获取 增加 增减类型(1.增加,2.扣除)
+    * @return subAddTypeIncrement
+    */
+    public Integer getSubAddTypeIncrement(){
+        return this.subAddTypeIncrement;
+    }
+
+    /**
+    * 设置 增加 增减类型(1.增加,2.扣除)
+    * @param subAddTypeIncrement
+    */
+    public void setSubAddTypeIncrement(Integer subAddTypeIncrement){
+        this.subAddTypeIncrement = subAddTypeIncrement;
+    }
+
+    /**
+    * 获取 增减类型(1.增加,2.扣除)
+    * @return subAddTypeList
+    */
+    public List<Integer> getSubAddTypeList(){
+        return this.subAddTypeList;
+    }
+
+    /**
+    * 设置 增减类型(1.增加,2.扣除)
+    * @param subAddTypeList
+    */
+    public void setSubAddTypeList(List<Integer> subAddTypeList){
+        this.subAddTypeList = subAddTypeList;
+    }
+
+    /**
+    * 获取 增减类型(1.增加,2.扣除)
+    * @return subAddTypeNotList
+    */
+    public List<Integer> getSubAddTypeNotList(){
+        return this.subAddTypeNotList;
+    }
+
+    /**
+    * 设置 增减类型(1.增加,2.扣除)
+    * @param subAddTypeNotList
+    */
+    public void setSubAddTypeNotList(List<Integer> subAddTypeNotList){
+        this.subAddTypeNotList = subAddTypeNotList;
+    }
+
+
     /**
     * 设置  序号，主键，自增长
     * @param id
@@ -2987,6 +3083,60 @@ public class CheckEffectRecordQuery extends CheckEffectRecordEntity {
 		return this;
     }
 
+    /**
+    * 设置  增减类型(1.增加,2.扣除)
+    * @param subAddType
+    */
+    public CheckEffectRecordQuery subAddType(Integer subAddType){
+	    setSubAddType(subAddType);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 增减类型(1.增加,2.扣除)
+    * @param subAddTypeStart
+    */
+    public CheckEffectRecordQuery subAddTypeStart(Integer subAddTypeStart){
+		this.subAddTypeStart = subAddTypeStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 增减类型(1.增加,2.扣除)
+    * @param subAddTypeEnd
+    */
+    public CheckEffectRecordQuery subAddTypeEnd(Integer subAddTypeEnd){
+		this.subAddTypeEnd = subAddTypeEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 增减类型(1.增加,2.扣除)
+    * @param subAddTypeIncrement
+    */
+    public CheckEffectRecordQuery subAddTypeIncrement(Integer subAddTypeIncrement){
+		this.subAddTypeIncrement = subAddTypeIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 增减类型(1.增加,2.扣除)
+    * @param subAddTypeList
+    */
+    public CheckEffectRecordQuery subAddTypeList(List<Integer> subAddTypeList){
+        this.subAddTypeList = subAddTypeList;
+		return this;
+        }
+
+        /**
+        * 设置 增减类型(1.增加,2.扣除)
+        * @param subAddTypeNotList
+        */
+        public CheckEffectRecordQuery subAddTypeNotList(List<Integer> subAddTypeNotList){
+        this.subAddTypeNotList = subAddTypeNotList;
+        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-10
+* @date 2023-07-11
 */
 @Data
 public class CheckGoworkRecordEntity extends CheckGoworkRecordVo {
@@ -141,6 +141,10 @@ public class CheckGoworkRecordEntity extends CheckGoworkRecordVo {
     * 规则名称
     */
     private String categoryName;
+    /**
+    * 增减类型(1.增加,2.扣除)
+    */
+    private Integer subAddType;
     @Override
     public int hashCode() {
          return this.getId().hashCode();
@@ -212,5 +216,7 @@ public class CheckGoworkRecordEntity extends CheckGoworkRecordVo {
             this.categoryId = -1L;
 
             this.categoryName = "";
+
+            this.subAddType = 1;
     }
 }
\ 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-10
+* @date 2023-07-11
 */
 public class CheckGoworkRecordQuery extends CheckGoworkRecordEntity {
     /** 开始 序号，主键，自增长 */
@@ -286,6 +286,21 @@ public class CheckGoworkRecordQuery extends CheckGoworkRecordEntity {
 
     /** 规则名称排除列表 */
     private List <String> categoryNameNotList;
+    /** 开始 增减类型(1.增加,2.扣除) */
+    private Integer subAddTypeStart;
+
+    /** 结束 增减类型(1.增加,2.扣除) */
+    private Integer subAddTypeEnd;
+
+    /** 增加 增减类型(1.增加,2.扣除) */
+    private Integer subAddTypeIncrement;
+
+    /** 增减类型(1.增加,2.扣除)列表 */
+    private List <Integer> subAddTypeList;
+
+    /** 增减类型(1.增加,2.扣除)排除列表 */
+    private List <Integer> subAddTypeNotList;
+
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<CheckGoworkRecordQuery> orConditionList;
 
@@ -1857,6 +1872,87 @@ public class CheckGoworkRecordQuery extends CheckGoworkRecordEntity {
         this.categoryNameNotList = categoryNameNotList;
     }
 
+    /**
+    * 获取 开始 增减类型(1.增加,2.扣除)
+    * @return subAddTypeStart
+    */
+    public Integer getSubAddTypeStart(){
+        return this.subAddTypeStart;
+    }
+
+    /**
+    * 设置 开始 增减类型(1.增加,2.扣除)
+    * @param subAddTypeStart
+    */
+    public void setSubAddTypeStart(Integer subAddTypeStart){
+        this.subAddTypeStart = subAddTypeStart;
+    }
+
+    /**
+    * 获取 结束 增减类型(1.增加,2.扣除)
+    * @return $subAddTypeEnd
+    */
+    public Integer getSubAddTypeEnd(){
+        return this.subAddTypeEnd;
+    }
+
+    /**
+    * 设置 结束 增减类型(1.增加,2.扣除)
+    * @param subAddTypeEnd
+    */
+    public void setSubAddTypeEnd(Integer subAddTypeEnd){
+        this.subAddTypeEnd = subAddTypeEnd;
+    }
+
+    /**
+    * 获取 增加 增减类型(1.增加,2.扣除)
+    * @return subAddTypeIncrement
+    */
+    public Integer getSubAddTypeIncrement(){
+        return this.subAddTypeIncrement;
+    }
+
+    /**
+    * 设置 增加 增减类型(1.增加,2.扣除)
+    * @param subAddTypeIncrement
+    */
+    public void setSubAddTypeIncrement(Integer subAddTypeIncrement){
+        this.subAddTypeIncrement = subAddTypeIncrement;
+    }
+
+    /**
+    * 获取 增减类型(1.增加,2.扣除)
+    * @return subAddTypeList
+    */
+    public List<Integer> getSubAddTypeList(){
+        return this.subAddTypeList;
+    }
+
+    /**
+    * 设置 增减类型(1.增加,2.扣除)
+    * @param subAddTypeList
+    */
+    public void setSubAddTypeList(List<Integer> subAddTypeList){
+        this.subAddTypeList = subAddTypeList;
+    }
+
+    /**
+    * 获取 增减类型(1.增加,2.扣除)
+    * @return subAddTypeNotList
+    */
+    public List<Integer> getSubAddTypeNotList(){
+        return this.subAddTypeNotList;
+    }
+
+    /**
+    * 设置 增减类型(1.增加,2.扣除)
+    * @param subAddTypeNotList
+    */
+    public void setSubAddTypeNotList(List<Integer> subAddTypeNotList){
+        this.subAddTypeNotList = subAddTypeNotList;
+    }
+
+
     /**
     * 设置  序号，主键，自增长
     * @param id
@@ -2760,6 +2856,60 @@ public class CheckGoworkRecordQuery extends CheckGoworkRecordEntity {
 		return this;
     }
 
+    /**
+    * 设置  增减类型(1.增加,2.扣除)
+    * @param subAddType
+    */
+    public CheckGoworkRecordQuery subAddType(Integer subAddType){
+	    setSubAddType(subAddType);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 增减类型(1.增加,2.扣除)
+    * @param subAddTypeStart
+    */
+    public CheckGoworkRecordQuery subAddTypeStart(Integer subAddTypeStart){
+		this.subAddTypeStart = subAddTypeStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 增减类型(1.增加,2.扣除)
+    * @param subAddTypeEnd
+    */
+    public CheckGoworkRecordQuery subAddTypeEnd(Integer subAddTypeEnd){
+		this.subAddTypeEnd = subAddTypeEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 增减类型(1.增加,2.扣除)
+    * @param subAddTypeIncrement
+    */
+    public CheckGoworkRecordQuery subAddTypeIncrement(Integer subAddTypeIncrement){
+		this.subAddTypeIncrement = subAddTypeIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 增减类型(1.增加,2.扣除)
+    * @param subAddTypeList
+    */
+    public CheckGoworkRecordQuery subAddTypeList(List<Integer> subAddTypeList){
+        this.subAddTypeList = subAddTypeList;
+		return this;
+        }
+
+        /**
+        * 设置 增减类型(1.增加,2.扣除)
+        * @param subAddTypeNotList
+        */
+        public CheckGoworkRecordQuery subAddTypeNotList(List<Integer> subAddTypeNotList){
+        this.subAddTypeNotList = subAddTypeNotList;
+        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-10
+* @date 2023-07-11
 */
 @Data
 public class CheckOtherRecordEntity extends CheckOtherRecordVo {
@@ -131,6 +131,10 @@ public class CheckOtherRecordEntity extends CheckOtherRecordVo {
     * 规则名称
     */
     private String categoryName;
+    /**
+    * 增减类型(1.增加,2.扣除)
+    */
+    private Integer subAddType;
     @Override
     public int hashCode() {
          return this.getId().hashCode();
@@ -202,5 +206,7 @@ public class CheckOtherRecordEntity extends CheckOtherRecordVo {
             this.categoryId = -1L;
 
             this.categoryName = "";
+
+            this.subAddType = 1;
     }
 }
\ 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-10
+* @date 2023-07-11
 */
 public class CheckOtherRecordQuery extends CheckOtherRecordEntity {
     /** 开始 序号，主键，自增长 */
@@ -306,6 +306,21 @@ public class CheckOtherRecordQuery extends CheckOtherRecordEntity {
 
     /** 规则名称排除列表 */
     private List <String> categoryNameNotList;
+    /** 开始 增减类型(1.增加,2.扣除) */
+    private Integer subAddTypeStart;
+
+    /** 结束 增减类型(1.增加,2.扣除) */
+    private Integer subAddTypeEnd;
+
+    /** 增加 增减类型(1.增加,2.扣除) */
+    private Integer subAddTypeIncrement;
+
+    /** 增减类型(1.增加,2.扣除)列表 */
+    private List <Integer> subAddTypeList;
+
+    /** 增减类型(1.增加,2.扣除)排除列表 */
+    private List <Integer> subAddTypeNotList;
+
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<CheckOtherRecordQuery> orConditionList;
 
@@ -1975,6 +1990,87 @@ public class CheckOtherRecordQuery extends CheckOtherRecordEntity {
         this.categoryNameNotList = categoryNameNotList;
     }
 
+    /**
+    * 获取 开始 增减类型(1.增加,2.扣除)
+    * @return subAddTypeStart
+    */
+    public Integer getSubAddTypeStart(){
+        return this.subAddTypeStart;
+    }
+
+    /**
+    * 设置 开始 增减类型(1.增加,2.扣除)
+    * @param subAddTypeStart
+    */
+    public void setSubAddTypeStart(Integer subAddTypeStart){
+        this.subAddTypeStart = subAddTypeStart;
+    }
+
+    /**
+    * 获取 结束 增减类型(1.增加,2.扣除)
+    * @return $subAddTypeEnd
+    */
+    public Integer getSubAddTypeEnd(){
+        return this.subAddTypeEnd;
+    }
+
+    /**
+    * 设置 结束 增减类型(1.增加,2.扣除)
+    * @param subAddTypeEnd
+    */
+    public void setSubAddTypeEnd(Integer subAddTypeEnd){
+        this.subAddTypeEnd = subAddTypeEnd;
+    }
+
+    /**
+    * 获取 增加 增减类型(1.增加,2.扣除)
+    * @return subAddTypeIncrement
+    */
+    public Integer getSubAddTypeIncrement(){
+        return this.subAddTypeIncrement;
+    }
+
+    /**
+    * 设置 增加 增减类型(1.增加,2.扣除)
+    * @param subAddTypeIncrement
+    */
+    public void setSubAddTypeIncrement(Integer subAddTypeIncrement){
+        this.subAddTypeIncrement = subAddTypeIncrement;
+    }
+
+    /**
+    * 获取 增减类型(1.增加,2.扣除)
+    * @return subAddTypeList
+    */
+    public List<Integer> getSubAddTypeList(){
+        return this.subAddTypeList;
+    }
+
+    /**
+    * 设置 增减类型(1.增加,2.扣除)
+    * @param subAddTypeList
+    */
+    public void setSubAddTypeList(List<Integer> subAddTypeList){
+        this.subAddTypeList = subAddTypeList;
+    }
+
+    /**
+    * 获取 增减类型(1.增加,2.扣除)
+    * @return subAddTypeNotList
+    */
+    public List<Integer> getSubAddTypeNotList(){
+        return this.subAddTypeNotList;
+    }
+
+    /**
+    * 设置 增减类型(1.增加,2.扣除)
+    * @param subAddTypeNotList
+    */
+    public void setSubAddTypeNotList(List<Integer> subAddTypeNotList){
+        this.subAddTypeNotList = subAddTypeNotList;
+    }
+
+
     /**
     * 设置  序号，主键，自增长
     * @param id
@@ -2948,6 +3044,60 @@ public class CheckOtherRecordQuery extends CheckOtherRecordEntity {
 		return this;
     }
 
+    /**
+    * 设置  增减类型(1.增加,2.扣除)
+    * @param subAddType
+    */
+    public CheckOtherRecordQuery subAddType(Integer subAddType){
+	    setSubAddType(subAddType);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 增减类型(1.增加,2.扣除)
+    * @param subAddTypeStart
+    */
+    public CheckOtherRecordQuery subAddTypeStart(Integer subAddTypeStart){
+		this.subAddTypeStart = subAddTypeStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 增减类型(1.增加,2.扣除)
+    * @param subAddTypeEnd
+    */
+    public CheckOtherRecordQuery subAddTypeEnd(Integer subAddTypeEnd){
+		this.subAddTypeEnd = subAddTypeEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 增减类型(1.增加,2.扣除)
+    * @param subAddTypeIncrement
+    */
+    public CheckOtherRecordQuery subAddTypeIncrement(Integer subAddTypeIncrement){
+		this.subAddTypeIncrement = subAddTypeIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 增减类型(1.增加,2.扣除)
+    * @param subAddTypeList
+    */
+    public CheckOtherRecordQuery subAddTypeList(List<Integer> subAddTypeList){
+        this.subAddTypeList = subAddTypeList;
+		return this;
+        }
+
+        /**
+        * 设置 增减类型(1.增加,2.扣除)
+        * @param subAddTypeNotList
+        */
+        public CheckOtherRecordQuery subAddTypeNotList(List<Integer> subAddTypeNotList){
+        this.subAddTypeNotList = subAddTypeNotList;
+        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-10
+* @date 2023-07-11
 */
 @Data
 public class CheckReviewRecordEntity extends CheckReviewRecordVo {
@@ -138,6 +138,10 @@ public class CheckReviewRecordEntity extends CheckReviewRecordVo {
     * 规则名称
     */
     private String categoryName;
+    /**
+    * 增减类型(1.增加,2.扣除)
+    */
+    private Integer subAddType;
     @Override
     public int hashCode() {
          return this.getId().hashCode();
@@ -209,5 +213,7 @@ public class CheckReviewRecordEntity extends CheckReviewRecordVo {
             this.categoryId = -1L;
 
             this.categoryName = "";
+
+            this.subAddType = 1;
     }
 }
\ 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-10
+* @date 2023-07-11
 */
 public class CheckReviewRecordQuery extends CheckReviewRecordEntity {
     /** 开始 序号，主键，自增长 */
@@ -296,6 +296,21 @@ public class CheckReviewRecordQuery extends CheckReviewRecordEntity {
 
     /** 规则名称排除列表 */
     private List <String> categoryNameNotList;
+    /** 开始 增减类型(1.增加,2.扣除) */
+    private Integer subAddTypeStart;
+
+    /** 结束 增减类型(1.增加,2.扣除) */
+    private Integer subAddTypeEnd;
+
+    /** 增加 增减类型(1.增加,2.扣除) */
+    private Integer subAddTypeIncrement;
+
+    /** 增减类型(1.增加,2.扣除)列表 */
+    private List <Integer> subAddTypeList;
+
+    /** 增减类型(1.增加,2.扣除)排除列表 */
+    private List <Integer> subAddTypeNotList;
+
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<CheckReviewRecordQuery> orConditionList;
 
@@ -1916,6 +1931,87 @@ public class CheckReviewRecordQuery extends CheckReviewRecordEntity {
         this.categoryNameNotList = categoryNameNotList;
     }
 
+    /**
+    * 获取 开始 增减类型(1.增加,2.扣除)
+    * @return subAddTypeStart
+    */
+    public Integer getSubAddTypeStart(){
+        return this.subAddTypeStart;
+    }
+
+    /**
+    * 设置 开始 增减类型(1.增加,2.扣除)
+    * @param subAddTypeStart
+    */
+    public void setSubAddTypeStart(Integer subAddTypeStart){
+        this.subAddTypeStart = subAddTypeStart;
+    }
+
+    /**
+    * 获取 结束 增减类型(1.增加,2.扣除)
+    * @return $subAddTypeEnd
+    */
+    public Integer getSubAddTypeEnd(){
+        return this.subAddTypeEnd;
+    }
+
+    /**
+    * 设置 结束 增减类型(1.增加,2.扣除)
+    * @param subAddTypeEnd
+    */
+    public void setSubAddTypeEnd(Integer subAddTypeEnd){
+        this.subAddTypeEnd = subAddTypeEnd;
+    }
+
+    /**
+    * 获取 增加 增减类型(1.增加,2.扣除)
+    * @return subAddTypeIncrement
+    */
+    public Integer getSubAddTypeIncrement(){
+        return this.subAddTypeIncrement;
+    }
+
+    /**
+    * 设置 增加 增减类型(1.增加,2.扣除)
+    * @param subAddTypeIncrement
+    */
+    public void setSubAddTypeIncrement(Integer subAddTypeIncrement){
+        this.subAddTypeIncrement = subAddTypeIncrement;
+    }
+
+    /**
+    * 获取 增减类型(1.增加,2.扣除)
+    * @return subAddTypeList
+    */
+    public List<Integer> getSubAddTypeList(){
+        return this.subAddTypeList;
+    }
+
+    /**
+    * 设置 增减类型(1.增加,2.扣除)
+    * @param subAddTypeList
+    */
+    public void setSubAddTypeList(List<Integer> subAddTypeList){
+        this.subAddTypeList = subAddTypeList;
+    }
+
+    /**
+    * 获取 增减类型(1.增加,2.扣除)
+    * @return subAddTypeNotList
+    */
+    public List<Integer> getSubAddTypeNotList(){
+        return this.subAddTypeNotList;
+    }
+
+    /**
+    * 设置 增减类型(1.增加,2.扣除)
+    * @param subAddTypeNotList
+    */
+    public void setSubAddTypeNotList(List<Integer> subAddTypeNotList){
+        this.subAddTypeNotList = subAddTypeNotList;
+    }
+
+
     /**
     * 设置  序号，主键，自增长
     * @param id
@@ -2854,6 +2950,60 @@ public class CheckReviewRecordQuery extends CheckReviewRecordEntity {
 		return this;
     }
 
+    /**
+    * 设置  增减类型(1.增加,2.扣除)
+    * @param subAddType
+    */
+    public CheckReviewRecordQuery subAddType(Integer subAddType){
+	    setSubAddType(subAddType);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 增减类型(1.增加,2.扣除)
+    * @param subAddTypeStart
+    */
+    public CheckReviewRecordQuery subAddTypeStart(Integer subAddTypeStart){
+		this.subAddTypeStart = subAddTypeStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 增减类型(1.增加,2.扣除)
+    * @param subAddTypeEnd
+    */
+    public CheckReviewRecordQuery subAddTypeEnd(Integer subAddTypeEnd){
+		this.subAddTypeEnd = subAddTypeEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 增减类型(1.增加,2.扣除)
+    * @param subAddTypeIncrement
+    */
+    public CheckReviewRecordQuery subAddTypeIncrement(Integer subAddTypeIncrement){
+		this.subAddTypeIncrement = subAddTypeIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 增减类型(1.增加,2.扣除)
+    * @param subAddTypeList
+    */
+    public CheckReviewRecordQuery subAddTypeList(List<Integer> subAddTypeList){
+        this.subAddTypeList = subAddTypeList;
+		return this;
+        }
+
+        /**
+        * 设置 增减类型(1.增加,2.扣除)
+        * @param subAddTypeNotList
+        */
+        public CheckReviewRecordQuery subAddTypeNotList(List<Integer> subAddTypeNotList){
+        this.subAddTypeNotList = subAddTypeNotList;
+        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/CheckComplainRecordVo.java

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

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

@@ -8,7 +8,7 @@ import com.mortals.xhx.module.check.dao.CheckComplainRecordDao;
 * 评价绩效投诉核查信息 service接口
 *
 * @author zxfei
-* @date 2023-07-10
+* @date 2023-07-11
 */
 public interface CheckComplainRecordService extends ICRUDService<CheckComplainRecordEntity,Long>{
 

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

@@ -8,7 +8,7 @@ import com.mortals.xhx.module.check.dao.CheckEffectRecordDao;
 * 效能绩效核查信息 service接口
 *
 * @author zxfei
-* @date 2023-07-10
+* @date 2023-07-11
 */
 public interface CheckEffectRecordService extends ICRUDService<CheckEffectRecordEntity,Long>{
 

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

@@ -8,7 +8,7 @@ import com.mortals.xhx.module.check.dao.CheckGoworkRecordDao;
 * 办件绩效核查信息 service接口
 *
 * @author zxfei
-* @date 2023-07-10
+* @date 2023-07-11
 */
 public interface CheckGoworkRecordService extends ICRUDService<CheckGoworkRecordEntity,Long>{
 

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

@@ -8,7 +8,7 @@ import com.mortals.xhx.module.check.dao.CheckOtherRecordDao;
 * 其它绩效核查信息 service接口
 *
 * @author zxfei
-* @date 2023-07-10
+* @date 2023-07-11
 */
 public interface CheckOtherRecordService extends ICRUDService<CheckOtherRecordEntity,Long>{
 

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

@@ -8,7 +8,7 @@ import com.mortals.xhx.module.check.dao.CheckReviewRecordDao;
 * 评价差评绩效核查信息 service接口
 *
 * @author zxfei
-* @date 2023-07-10
+* @date 2023-07-11
 */
 public interface CheckReviewRecordService extends ICRUDService<CheckReviewRecordEntity,Long>{
 

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

@@ -12,7 +12,7 @@ import lombok.extern.slf4j.Slf4j;
 * 评价绩效投诉核查信息 service实现
 *
 * @author zxfei
-* @date 2023-07-10
+* @date 2023-07-11
 */
 @Service("checkComplainRecordService")
 @Slf4j

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

@@ -12,7 +12,7 @@ import lombok.extern.slf4j.Slf4j;
 * 效能绩效核查信息 service实现
 *
 * @author zxfei
-* @date 2023-07-10
+* @date 2023-07-11
 */
 @Service("checkEffectRecordService")
 @Slf4j

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

@@ -12,7 +12,7 @@ import lombok.extern.slf4j.Slf4j;
 * 办件绩效核查信息 service实现
 *
 * @author zxfei
-* @date 2023-07-10
+* @date 2023-07-11
 */
 @Service("checkGoworkRecordService")
 @Slf4j

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

@@ -12,7 +12,7 @@ import lombok.extern.slf4j.Slf4j;
 * 其它绩效核查信息 service实现
 *
 * @author zxfei
-* @date 2023-07-10
+* @date 2023-07-11
 */
 @Service("checkOtherRecordService")
 @Slf4j

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

@@ -12,7 +12,7 @@ import lombok.extern.slf4j.Slf4j;
 * 评价差评绩效核查信息 service实现
 *
 * @author zxfei
-* @date 2023-07-10
+* @date 2023-07-11
 */
 @Service("checkReviewRecordService")
 @Slf4j

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-07-10
+* @date 2023-07-11
 */
 @RestController
 @RequestMapping("check/complain/record")
@@ -44,6 +44,7 @@ public class CheckComplainRecordController extends BaseCRUDJsonBodyMappingContro
     protected void init(Map<String, Object> model, Context context) {
         this.addDict(model, "subMethod", paramService.getParamBySecondOrganize("CheckComplainRecord","subMethod"));
         this.addDict(model, "checkStatus", paramService.getParamBySecondOrganize("CheckComplainRecord","checkStatus"));
+        this.addDict(model, "subAddType", paramService.getParamBySecondOrganize("CheckComplainRecord","subAddType"));
         super.init(model, context);
     }
 

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-07-10
+* @date 2023-07-11
 */
 @RestController
 @RequestMapping("check/effect/record")
@@ -45,6 +45,7 @@ public class CheckEffectRecordController extends BaseCRUDJsonBodyMappingControll
         this.addDict(model, "irregularType", paramService.getParamBySecondOrganize("CheckEffectRecord","irregularType"));
         this.addDict(model, "subMethod", paramService.getParamBySecondOrganize("CheckEffectRecord","subMethod"));
         this.addDict(model, "checkStatus", paramService.getParamBySecondOrganize("CheckEffectRecord","checkStatus"));
+        this.addDict(model, "subAddType", paramService.getParamBySecondOrganize("CheckEffectRecord","subAddType"));
         super.init(model, context);
     }
 

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-07-10
+* @date 2023-07-11
 */
 @RestController
 @RequestMapping("check/gowork/record")
@@ -44,6 +44,7 @@ public class CheckGoworkRecordController extends BaseCRUDJsonBodyMappingControll
     protected void init(Map<String, Object> model, Context context) {
         this.addDict(model, "subMethod", paramService.getParamBySecondOrganize("CheckGoworkRecord","subMethod"));
         this.addDict(model, "checkStatus", paramService.getParamBySecondOrganize("CheckGoworkRecord","checkStatus"));
+        this.addDict(model, "subAddType", paramService.getParamBySecondOrganize("CheckGoworkRecord","subAddType"));
         super.init(model, context);
     }
 

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-07-10
+* @date 2023-07-11
 */
 @RestController
 @RequestMapping("check/other/record")
@@ -45,6 +45,7 @@ public class CheckOtherRecordController extends BaseCRUDJsonBodyMappingControlle
         this.addDict(model, "irregularOtherType", paramService.getParamBySecondOrganize("CheckOtherRecord","irregularOtherType"));
         this.addDict(model, "subMethod", paramService.getParamBySecondOrganize("CheckOtherRecord","subMethod"));
         this.addDict(model, "checkStatus", paramService.getParamBySecondOrganize("CheckOtherRecord","checkStatus"));
+        this.addDict(model, "subAddType", paramService.getParamBySecondOrganize("CheckOtherRecord","subAddType"));
         super.init(model, context);
     }
 

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-07-10
+* @date 2023-07-11
 */
 @RestController
 @RequestMapping("check/review/record")
@@ -46,6 +46,7 @@ public class CheckReviewRecordController extends BaseCRUDJsonBodyMappingControll
         this.addDict(model, "reviewSource", paramService.getParamBySecondOrganize("CheckReviewRecord","reviewSource"));
         this.addDict(model, "subMethod", paramService.getParamBySecondOrganize("CheckReviewRecord","subMethod"));
         this.addDict(model, "checkStatus", paramService.getParamBySecondOrganize("CheckReviewRecord","checkStatus"));
+        this.addDict(model, "subAddType", paramService.getParamBySecondOrganize("CheckReviewRecord","subAddType"));
         super.init(model, context);
     }
 

attendance-performance-manager/src/main/java/com/mortals/xhx/module/dept/model/DeptPerformStatEntity.java

@@ -11,7 +11,7 @@ import lombok.Data;
 * 部门绩效分数统计实体对象
 *
 * @author zxfei
-* @date 2023-05-16
+* @date 2023-07-11
 */
 @Data
 public class DeptPerformStatEntity extends DeptPerformStatVo {
@@ -28,6 +28,7 @@ public class DeptPerformStatEntity extends DeptPerformStatVo {
     /**
     * 部门绩效总分数
     */
+    @Excel(name = "部门绩效总分数")
     private BigDecimal totalScore;
     /**
     * 考勤绩效指标增加分数
@@ -85,6 +86,29 @@ public class DeptPerformStatEntity extends DeptPerformStatVo {
     * 日
     */
     private Integer day;
+    /**
+    * 部门绩效加分总分数汇总
+    */
+    @Excel(name = "部门绩效加分总分数汇总")
+    private BigDecimal totalAddScore;
+    /**
+    * 部门绩效减分总分数汇总
+    */
+    @Excel(name = "部门绩效减分总分数汇总")
+    private BigDecimal totalSubScore;
+    /**
+    * 投诉绩效指标增加分数
+    */
+    private BigDecimal complainScoreAdd;
+    /**
+    * 投诉绩效指标扣减分数
+    */
+    private BigDecimal complainScoreSub;
+    /**
+    * 部门绩效平均分数，根据部门所属人数平均
+    */
+    @Excel(name = "部门绩效平均分数，根据部门所属人数平均")
+    private BigDecimal averageScore;
     @Override
     public int hashCode() {
          return this.getId().hashCode();
@@ -136,5 +160,15 @@ public class DeptPerformStatEntity extends DeptPerformStatVo {
             this.month = -1;
 
             this.day = -1;
+
+            this.totalAddScore = new BigDecimal(0);
+
+            this.totalSubScore = new BigDecimal(0);
+
+            this.complainScoreAdd = new BigDecimal(0);
+
+            this.complainScoreSub = new BigDecimal(0);
+
+            this.averageScore = new BigDecimal(0);
     }
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/dept/model/vo/DeptPerformStatVo.java

 package com.mortals.xhx.module.dept.model.vo;
-import com.mortals.framework.annotation.Excel;
 import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.dept.model.DeptPerformStatEntity;
-
-import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 import lombok.Data;
+import com.mortals.framework.annotation.Excel;
+import java.math.BigDecimal;
+import java.util.Date;
 /**
 * 部门绩效分数统计视图对象
 *
 * @author zxfei
-* @date 2023-05-16
+* @date 2023-07-11
 */
 @Data
 public class DeptPerformStatVo extends BaseEntityLong {
 
-        /**
-        * 部门绩效总分数
-        */
-        @Excel(name = "部门绩效总分数")
-        private BigDecimal totalScore;
-
-
 }
\ No newline at end of file

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

@@ -16,4 +16,6 @@ import java.util.Date;
 @Data
 public class FeedbackVo extends BaseEntityLong {
 
+    private List<Long> staffList;
+
 }
\ No newline at end of file

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-07-10
+* @date 2023-07-11
 */
 
 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-07-10
+* @date 2023-07-11
 */
 
 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-07-10
+* @date 2023-07-11
 */
 
 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-07-10
+* @date 2023-07-11
 */
 
 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-07-10
+* @date 2023-07-11
 */
 
 public interface  PerformReviewRecordDao extends ICRUDDao<PerformReviewRecordEntity,Long>{

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-07-10
+* @date 2023-07-11
 */
 @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-07-10
+* @date 2023-07-11
 */
 @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-07-10
+* @date 2023-07-11
 */
 @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-07-10
+* @date 2023-07-11
 */
 @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-07-10
+* @date 2023-07-11
 */
 @Repository("performReviewRecordDao")
 public class PerformReviewRecordDaoImpl extends BaseCRUDDaoMybatis<PerformReviewRecordEntity,Long> implements PerformReviewRecordDao {

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-10
+* @date 2023-07-11
 */
 @Data
 public class PerformComplainRecordEntity extends PerformComplainRecordVo {
@@ -129,6 +129,10 @@ public class PerformComplainRecordEntity extends PerformComplainRecordVo {
     * 规则名称
     */
     private String categoryName;
+    /**
+    * 增减类型(1.增加,2.扣除)
+    */
+    private Integer subAddType;
     @Override
     public int hashCode() {
          return this.getId().hashCode();
@@ -196,5 +200,7 @@ public class PerformComplainRecordEntity extends PerformComplainRecordVo {
             this.categoryId = -1L;
 
             this.categoryName = "";
+
+            this.subAddType = 1;
     }
 }
\ 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-10
+* @date 2023-07-11
 */
 public class PerformComplainRecordQuery extends PerformComplainRecordEntity {
     /** 开始 序号，主键，自增长 */
@@ -265,6 +265,21 @@ public class PerformComplainRecordQuery extends PerformComplainRecordEntity {
 
     /** 规则名称排除列表 */
     private List <String> categoryNameNotList;
+    /** 开始 增减类型(1.增加,2.扣除) */
+    private Integer subAddTypeStart;
+
+    /** 结束 增减类型(1.增加,2.扣除) */
+    private Integer subAddTypeEnd;
+
+    /** 增加 增减类型(1.增加,2.扣除) */
+    private Integer subAddTypeIncrement;
+
+    /** 增减类型(1.增加,2.扣除)列表 */
+    private List <Integer> subAddTypeList;
+
+    /** 增减类型(1.增加,2.扣除)排除列表 */
+    private List <Integer> subAddTypeNotList;
+
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<PerformComplainRecordQuery> orConditionList;
 
@@ -1723,6 +1738,87 @@ public class PerformComplainRecordQuery extends PerformComplainRecordEntity {
         this.categoryNameNotList = categoryNameNotList;
     }
 
+    /**
+    * 获取 开始 增减类型(1.增加,2.扣除)
+    * @return subAddTypeStart
+    */
+    public Integer getSubAddTypeStart(){
+        return this.subAddTypeStart;
+    }
+
+    /**
+    * 设置 开始 增减类型(1.增加,2.扣除)
+    * @param subAddTypeStart
+    */
+    public void setSubAddTypeStart(Integer subAddTypeStart){
+        this.subAddTypeStart = subAddTypeStart;
+    }
+
+    /**
+    * 获取 结束 增减类型(1.增加,2.扣除)
+    * @return $subAddTypeEnd
+    */
+    public Integer getSubAddTypeEnd(){
+        return this.subAddTypeEnd;
+    }
+
+    /**
+    * 设置 结束 增减类型(1.增加,2.扣除)
+    * @param subAddTypeEnd
+    */
+    public void setSubAddTypeEnd(Integer subAddTypeEnd){
+        this.subAddTypeEnd = subAddTypeEnd;
+    }
+
+    /**
+    * 获取 增加 增减类型(1.增加,2.扣除)
+    * @return subAddTypeIncrement
+    */
+    public Integer getSubAddTypeIncrement(){
+        return this.subAddTypeIncrement;
+    }
+
+    /**
+    * 设置 增加 增减类型(1.增加,2.扣除)
+    * @param subAddTypeIncrement
+    */
+    public void setSubAddTypeIncrement(Integer subAddTypeIncrement){
+        this.subAddTypeIncrement = subAddTypeIncrement;
+    }
+
+    /**
+    * 获取 增减类型(1.增加,2.扣除)
+    * @return subAddTypeList
+    */
+    public List<Integer> getSubAddTypeList(){
+        return this.subAddTypeList;
+    }
+
+    /**
+    * 设置 增减类型(1.增加,2.扣除)
+    * @param subAddTypeList
+    */
+    public void setSubAddTypeList(List<Integer> subAddTypeList){
+        this.subAddTypeList = subAddTypeList;
+    }
+
+    /**
+    * 获取 增减类型(1.增加,2.扣除)
+    * @return subAddTypeNotList
+    */
+    public List<Integer> getSubAddTypeNotList(){
+        return this.subAddTypeNotList;
+    }
+
+    /**
+    * 设置 增减类型(1.增加,2.扣除)
+    * @param subAddTypeNotList
+    */
+    public void setSubAddTypeNotList(List<Integer> subAddTypeNotList){
+        this.subAddTypeNotList = subAddTypeNotList;
+    }
+
+
     /**
     * 设置  序号，主键，自增长
     * @param id
@@ -2571,6 +2667,60 @@ public class PerformComplainRecordQuery extends PerformComplainRecordEntity {
 		return this;
     }
 
+    /**
+    * 设置  增减类型(1.增加,2.扣除)
+    * @param subAddType
+    */
+    public PerformComplainRecordQuery subAddType(Integer subAddType){
+	    setSubAddType(subAddType);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 增减类型(1.增加,2.扣除)
+    * @param subAddTypeStart
+    */
+    public PerformComplainRecordQuery subAddTypeStart(Integer subAddTypeStart){
+		this.subAddTypeStart = subAddTypeStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 增减类型(1.增加,2.扣除)
+    * @param subAddTypeEnd
+    */
+    public PerformComplainRecordQuery subAddTypeEnd(Integer subAddTypeEnd){
+		this.subAddTypeEnd = subAddTypeEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 增减类型(1.增加,2.扣除)
+    * @param subAddTypeIncrement
+    */
+    public PerformComplainRecordQuery subAddTypeIncrement(Integer subAddTypeIncrement){
+		this.subAddTypeIncrement = subAddTypeIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 增减类型(1.增加,2.扣除)
+    * @param subAddTypeList
+    */
+    public PerformComplainRecordQuery subAddTypeList(List<Integer> subAddTypeList){
+        this.subAddTypeList = subAddTypeList;
+		return this;
+        }
+
+        /**
+        * 设置 增减类型(1.增加,2.扣除)
+        * @param subAddTypeNotList
+        */
+        public PerformComplainRecordQuery subAddTypeNotList(List<Integer> subAddTypeNotList){
+        this.subAddTypeNotList = subAddTypeNotList;
+        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-10
+* @date 2023-07-11
 */
 @Data
 public class PerformEffectRecordEntity extends PerformEffectRecordVo {
@@ -120,6 +120,10 @@ public class PerformEffectRecordEntity extends PerformEffectRecordVo {
     * 规则名称
     */
     private String categoryName;
+    /**
+    * 增减类型(1.增加,2.扣除)
+    */
+    private Integer subAddType;
     @Override
     public int hashCode() {
          return this.getId().hashCode();
@@ -183,5 +187,7 @@ public class PerformEffectRecordEntity extends PerformEffectRecordVo {
             this.categoryId = -1L;
 
             this.categoryName = "";
+
+            this.subAddType = 1;
     }
 }
\ 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-10
+* @date 2023-07-11
 */
 public class PerformEffectRecordQuery extends PerformEffectRecordEntity {
     /** 开始 序号，主键，自增长 */
@@ -276,6 +276,21 @@ public class PerformEffectRecordQuery extends PerformEffectRecordEntity {
 
     /** 规则名称排除列表 */
     private List <String> categoryNameNotList;
+    /** 开始 增减类型(1.增加,2.扣除) */
+    private Integer subAddTypeStart;
+
+    /** 结束 增减类型(1.增加,2.扣除) */
+    private Integer subAddTypeEnd;
+
+    /** 增加 增减类型(1.增加,2.扣除) */
+    private Integer subAddTypeIncrement;
+
+    /** 增减类型(1.增加,2.扣除)列表 */
+    private List <Integer> subAddTypeList;
+
+    /** 增减类型(1.增加,2.扣除)排除列表 */
+    private List <Integer> subAddTypeNotList;
+
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<PerformEffectRecordQuery> orConditionList;
 
@@ -1768,6 +1783,87 @@ public class PerformEffectRecordQuery extends PerformEffectRecordEntity {
         this.categoryNameNotList = categoryNameNotList;
     }
 
+    /**
+    * 获取 开始 增减类型(1.增加,2.扣除)
+    * @return subAddTypeStart
+    */
+    public Integer getSubAddTypeStart(){
+        return this.subAddTypeStart;
+    }
+
+    /**
+    * 设置 开始 增减类型(1.增加,2.扣除)
+    * @param subAddTypeStart
+    */
+    public void setSubAddTypeStart(Integer subAddTypeStart){
+        this.subAddTypeStart = subAddTypeStart;
+    }
+
+    /**
+    * 获取 结束 增减类型(1.增加,2.扣除)
+    * @return $subAddTypeEnd
+    */
+    public Integer getSubAddTypeEnd(){
+        return this.subAddTypeEnd;
+    }
+
+    /**
+    * 设置 结束 增减类型(1.增加,2.扣除)
+    * @param subAddTypeEnd
+    */
+    public void setSubAddTypeEnd(Integer subAddTypeEnd){
+        this.subAddTypeEnd = subAddTypeEnd;
+    }
+
+    /**
+    * 获取 增加 增减类型(1.增加,2.扣除)
+    * @return subAddTypeIncrement
+    */
+    public Integer getSubAddTypeIncrement(){
+        return this.subAddTypeIncrement;
+    }
+
+    /**
+    * 设置 增加 增减类型(1.增加,2.扣除)
+    * @param subAddTypeIncrement
+    */
+    public void setSubAddTypeIncrement(Integer subAddTypeIncrement){
+        this.subAddTypeIncrement = subAddTypeIncrement;
+    }
+
+    /**
+    * 获取 增减类型(1.增加,2.扣除)
+    * @return subAddTypeList
+    */
+    public List<Integer> getSubAddTypeList(){
+        return this.subAddTypeList;
+    }
+
+    /**
+    * 设置 增减类型(1.增加,2.扣除)
+    * @param subAddTypeList
+    */
+    public void setSubAddTypeList(List<Integer> subAddTypeList){
+        this.subAddTypeList = subAddTypeList;
+    }
+
+    /**
+    * 获取 增减类型(1.增加,2.扣除)
+    * @return subAddTypeNotList
+    */
+    public List<Integer> getSubAddTypeNotList(){
+        return this.subAddTypeNotList;
+    }
+
+    /**
+    * 设置 增减类型(1.增加,2.扣除)
+    * @param subAddTypeNotList
+    */
+    public void setSubAddTypeNotList(List<Integer> subAddTypeNotList){
+        this.subAddTypeNotList = subAddTypeNotList;
+    }
+
+
     /**
     * 设置  序号，主键，自增长
     * @param id
@@ -2630,6 +2726,60 @@ public class PerformEffectRecordQuery extends PerformEffectRecordEntity {
 		return this;
     }
 
+    /**
+    * 设置  增减类型(1.增加,2.扣除)
+    * @param subAddType
+    */
+    public PerformEffectRecordQuery subAddType(Integer subAddType){
+	    setSubAddType(subAddType);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 增减类型(1.增加,2.扣除)
+    * @param subAddTypeStart
+    */
+    public PerformEffectRecordQuery subAddTypeStart(Integer subAddTypeStart){
+		this.subAddTypeStart = subAddTypeStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 增减类型(1.增加,2.扣除)
+    * @param subAddTypeEnd
+    */
+    public PerformEffectRecordQuery subAddTypeEnd(Integer subAddTypeEnd){
+		this.subAddTypeEnd = subAddTypeEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 增减类型(1.增加,2.扣除)
+    * @param subAddTypeIncrement
+    */
+    public PerformEffectRecordQuery subAddTypeIncrement(Integer subAddTypeIncrement){
+		this.subAddTypeIncrement = subAddTypeIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 增减类型(1.增加,2.扣除)
+    * @param subAddTypeList
+    */
+    public PerformEffectRecordQuery subAddTypeList(List<Integer> subAddTypeList){
+        this.subAddTypeList = subAddTypeList;
+		return this;
+        }
+
+        /**
+        * 设置 增减类型(1.增加,2.扣除)
+        * @param subAddTypeNotList
+        */
+        public PerformEffectRecordQuery subAddTypeNotList(List<Integer> subAddTypeNotList){
+        this.subAddTypeNotList = subAddTypeNotList;
+        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-10
+* @date 2023-07-11
 */
 @Data
 public class PerformGoworkRecordEntity extends PerformGoworkRecordVo {
@@ -119,6 +119,10 @@ public class PerformGoworkRecordEntity extends PerformGoworkRecordVo {
     * 规则名称
     */
     private String categoryName;
+    /**
+    * 增减类型(1.增加,2.扣除)
+    */
+    private Integer subAddType;
     @Override
     public int hashCode() {
          return this.getId().hashCode();
@@ -180,5 +184,7 @@ public class PerformGoworkRecordEntity extends PerformGoworkRecordVo {
             this.categoryId = -1L;
 
             this.categoryName = "";
+
+            this.subAddType = 1;
     }
 }
\ 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-10
+* @date 2023-07-11
 */
 public class PerformGoworkRecordQuery extends PerformGoworkRecordEntity {
     /** 开始 序号，主键，自增长 */
@@ -250,6 +250,21 @@ public class PerformGoworkRecordQuery extends PerformGoworkRecordEntity {
 
     /** 规则名称排除列表 */
     private List <String> categoryNameNotList;
+    /** 开始 增减类型(1.增加,2.扣除) */
+    private Integer subAddTypeStart;
+
+    /** 结束 增减类型(1.增加,2.扣除) */
+    private Integer subAddTypeEnd;
+
+    /** 增加 增减类型(1.增加,2.扣除) */
+    private Integer subAddTypeIncrement;
+
+    /** 增减类型(1.增加,2.扣除)列表 */
+    private List <Integer> subAddTypeList;
+
+    /** 增减类型(1.增加,2.扣除)排除列表 */
+    private List <Integer> subAddTypeNotList;
+
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<PerformGoworkRecordQuery> orConditionList;
 
@@ -1612,6 +1627,87 @@ public class PerformGoworkRecordQuery extends PerformGoworkRecordEntity {
         this.categoryNameNotList = categoryNameNotList;
     }
 
+    /**
+    * 获取 开始 增减类型(1.增加,2.扣除)
+    * @return subAddTypeStart
+    */
+    public Integer getSubAddTypeStart(){
+        return this.subAddTypeStart;
+    }
+
+    /**
+    * 设置 开始 增减类型(1.增加,2.扣除)
+    * @param subAddTypeStart
+    */
+    public void setSubAddTypeStart(Integer subAddTypeStart){
+        this.subAddTypeStart = subAddTypeStart;
+    }
+
+    /**
+    * 获取 结束 增减类型(1.增加,2.扣除)
+    * @return $subAddTypeEnd
+    */
+    public Integer getSubAddTypeEnd(){
+        return this.subAddTypeEnd;
+    }
+
+    /**
+    * 设置 结束 增减类型(1.增加,2.扣除)
+    * @param subAddTypeEnd
+    */
+    public void setSubAddTypeEnd(Integer subAddTypeEnd){
+        this.subAddTypeEnd = subAddTypeEnd;
+    }
+
+    /**
+    * 获取 增加 增减类型(1.增加,2.扣除)
+    * @return subAddTypeIncrement
+    */
+    public Integer getSubAddTypeIncrement(){
+        return this.subAddTypeIncrement;
+    }
+
+    /**
+    * 设置 增加 增减类型(1.增加,2.扣除)
+    * @param subAddTypeIncrement
+    */
+    public void setSubAddTypeIncrement(Integer subAddTypeIncrement){
+        this.subAddTypeIncrement = subAddTypeIncrement;
+    }
+
+    /**
+    * 获取 增减类型(1.增加,2.扣除)
+    * @return subAddTypeList
+    */
+    public List<Integer> getSubAddTypeList(){
+        return this.subAddTypeList;
+    }
+
+    /**
+    * 设置 增减类型(1.增加,2.扣除)
+    * @param subAddTypeList
+    */
+    public void setSubAddTypeList(List<Integer> subAddTypeList){
+        this.subAddTypeList = subAddTypeList;
+    }
+
+    /**
+    * 获取 增减类型(1.增加,2.扣除)
+    * @return subAddTypeNotList
+    */
+    public List<Integer> getSubAddTypeNotList(){
+        return this.subAddTypeNotList;
+    }
+
+    /**
+    * 设置 增减类型(1.增加,2.扣除)
+    * @param subAddTypeNotList
+    */
+    public void setSubAddTypeNotList(List<Integer> subAddTypeNotList){
+        this.subAddTypeNotList = subAddTypeNotList;
+    }
+
+
     /**
     * 设置  序号，主键，自增长
     * @param id
@@ -2403,6 +2499,60 @@ public class PerformGoworkRecordQuery extends PerformGoworkRecordEntity {
 		return this;
     }
 
+    /**
+    * 设置  增减类型(1.增加,2.扣除)
+    * @param subAddType
+    */
+    public PerformGoworkRecordQuery subAddType(Integer subAddType){
+	    setSubAddType(subAddType);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 增减类型(1.增加,2.扣除)
+    * @param subAddTypeStart
+    */
+    public PerformGoworkRecordQuery subAddTypeStart(Integer subAddTypeStart){
+		this.subAddTypeStart = subAddTypeStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 增减类型(1.增加,2.扣除)
+    * @param subAddTypeEnd
+    */
+    public PerformGoworkRecordQuery subAddTypeEnd(Integer subAddTypeEnd){
+		this.subAddTypeEnd = subAddTypeEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 增减类型(1.增加,2.扣除)
+    * @param subAddTypeIncrement
+    */
+    public PerformGoworkRecordQuery subAddTypeIncrement(Integer subAddTypeIncrement){
+		this.subAddTypeIncrement = subAddTypeIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 增减类型(1.增加,2.扣除)
+    * @param subAddTypeList
+    */
+    public PerformGoworkRecordQuery subAddTypeList(List<Integer> subAddTypeList){
+        this.subAddTypeList = subAddTypeList;
+		return this;
+        }
+
+        /**
+        * 设置 增减类型(1.增加,2.扣除)
+        * @param subAddTypeNotList
+        */
+        public PerformGoworkRecordQuery subAddTypeNotList(List<Integer> subAddTypeNotList){
+        this.subAddTypeNotList = subAddTypeNotList;
+        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-10
+* @date 2023-07-11
 */
 @Data
 public class PerformOtherRecordEntity extends PerformOtherRecordVo {
@@ -108,6 +108,10 @@ public class PerformOtherRecordEntity extends PerformOtherRecordVo {
     * 规则名称
     */
     private String categoryName;
+    /**
+    * 增减类型(1.增加,2.扣除)
+    */
+    private Integer subAddType;
     @Override
     public int hashCode() {
          return this.getId().hashCode();
@@ -169,5 +173,7 @@ public class PerformOtherRecordEntity extends PerformOtherRecordVo {
             this.categoryId = -1L;
 
             this.categoryName = "";
+
+            this.subAddType = 1;
     }
 }
\ 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-10
+* @date 2023-07-11
 */
 public class PerformOtherRecordQuery extends PerformOtherRecordEntity {
     /** 开始 序号，主键，自增长 */
@@ -270,6 +270,21 @@ public class PerformOtherRecordQuery extends PerformOtherRecordEntity {
 
     /** 规则名称排除列表 */
     private List <String> categoryNameNotList;
+    /** 开始 增减类型(1.增加,2.扣除) */
+    private Integer subAddTypeStart;
+
+    /** 结束 增减类型(1.增加,2.扣除) */
+    private Integer subAddTypeEnd;
+
+    /** 增加 增减类型(1.增加,2.扣除) */
+    private Integer subAddTypeIncrement;
+
+    /** 增减类型(1.增加,2.扣除)列表 */
+    private List <Integer> subAddTypeList;
+
+    /** 增减类型(1.增加,2.扣除)排除列表 */
+    private List <Integer> subAddTypeNotList;
+
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<PerformOtherRecordQuery> orConditionList;
 
@@ -1730,6 +1745,87 @@ public class PerformOtherRecordQuery extends PerformOtherRecordEntity {
         this.categoryNameNotList = categoryNameNotList;
     }
 
+    /**
+    * 获取 开始 增减类型(1.增加,2.扣除)
+    * @return subAddTypeStart
+    */
+    public Integer getSubAddTypeStart(){
+        return this.subAddTypeStart;
+    }
+
+    /**
+    * 设置 开始 增减类型(1.增加,2.扣除)
+    * @param subAddTypeStart
+    */
+    public void setSubAddTypeStart(Integer subAddTypeStart){
+        this.subAddTypeStart = subAddTypeStart;
+    }
+
+    /**
+    * 获取 结束 增减类型(1.增加,2.扣除)
+    * @return $subAddTypeEnd
+    */
+    public Integer getSubAddTypeEnd(){
+        return this.subAddTypeEnd;
+    }
+
+    /**
+    * 设置 结束 增减类型(1.增加,2.扣除)
+    * @param subAddTypeEnd
+    */
+    public void setSubAddTypeEnd(Integer subAddTypeEnd){
+        this.subAddTypeEnd = subAddTypeEnd;
+    }
+
+    /**
+    * 获取 增加 增减类型(1.增加,2.扣除)
+    * @return subAddTypeIncrement
+    */
+    public Integer getSubAddTypeIncrement(){
+        return this.subAddTypeIncrement;
+    }
+
+    /**
+    * 设置 增加 增减类型(1.增加,2.扣除)
+    * @param subAddTypeIncrement
+    */
+    public void setSubAddTypeIncrement(Integer subAddTypeIncrement){
+        this.subAddTypeIncrement = subAddTypeIncrement;
+    }
+
+    /**
+    * 获取 增减类型(1.增加,2.扣除)
+    * @return subAddTypeList
+    */
+    public List<Integer> getSubAddTypeList(){
+        return this.subAddTypeList;
+    }
+
+    /**
+    * 设置 增减类型(1.增加,2.扣除)
+    * @param subAddTypeList
+    */
+    public void setSubAddTypeList(List<Integer> subAddTypeList){
+        this.subAddTypeList = subAddTypeList;
+    }
+
+    /**
+    * 获取 增减类型(1.增加,2.扣除)
+    * @return subAddTypeNotList
+    */
+    public List<Integer> getSubAddTypeNotList(){
+        return this.subAddTypeNotList;
+    }
+
+    /**
+    * 设置 增减类型(1.增加,2.扣除)
+    * @param subAddTypeNotList
+    */
+    public void setSubAddTypeNotList(List<Integer> subAddTypeNotList){
+        this.subAddTypeNotList = subAddTypeNotList;
+    }
+
+
     /**
     * 设置  序号，主键，自增长
     * @param id
@@ -2591,6 +2687,60 @@ public class PerformOtherRecordQuery extends PerformOtherRecordEntity {
 		return this;
     }
 
+    /**
+    * 设置  增减类型(1.增加,2.扣除)
+    * @param subAddType
+    */
+    public PerformOtherRecordQuery subAddType(Integer subAddType){
+	    setSubAddType(subAddType);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 增减类型(1.增加,2.扣除)
+    * @param subAddTypeStart
+    */
+    public PerformOtherRecordQuery subAddTypeStart(Integer subAddTypeStart){
+		this.subAddTypeStart = subAddTypeStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 增减类型(1.增加,2.扣除)
+    * @param subAddTypeEnd
+    */
+    public PerformOtherRecordQuery subAddTypeEnd(Integer subAddTypeEnd){
+		this.subAddTypeEnd = subAddTypeEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 增减类型(1.增加,2.扣除)
+    * @param subAddTypeIncrement
+    */
+    public PerformOtherRecordQuery subAddTypeIncrement(Integer subAddTypeIncrement){
+		this.subAddTypeIncrement = subAddTypeIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 增减类型(1.增加,2.扣除)
+    * @param subAddTypeList
+    */
+    public PerformOtherRecordQuery subAddTypeList(List<Integer> subAddTypeList){
+        this.subAddTypeList = subAddTypeList;
+		return this;
+        }
+
+        /**
+        * 设置 增减类型(1.增加,2.扣除)
+        * @param subAddTypeNotList
+        */
+        public PerformOtherRecordQuery subAddTypeNotList(List<Integer> subAddTypeNotList){
+        this.subAddTypeNotList = subAddTypeNotList;
+        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/PerformPerposeStaffStatEntity.java

@@ -11,7 +11,7 @@ import lombok.Data;
 * 员工目标统计实体对象
 *
 * @author zxfei
-* @date 2023-05-16
+* @date 2023-07-11
 */
 @Data
 public class PerformPerposeStaffStatEntity extends PerformPerposeStaffStatVo {

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

@@ -7,7 +7,7 @@ import com.mortals.xhx.module.perform.model.PerformPerposeStaffStatEntity;
 * 员工目标统计查询对象
 *
 * @author zxfei
-* @date 2023-05-16
+* @date 2023-07-11
 */
 public class PerformPerposeStaffStatQuery extends PerformPerposeStaffStatEntity {
     /** 开始 主键ID，主键，自增长 */

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-10
+* @date 2023-07-11
 */
 @Data
 public class PerformReviewRecordEntity extends PerformReviewRecordVo {
@@ -76,12 +76,12 @@ public class PerformReviewRecordEntity extends PerformReviewRecordVo {
     */
     private Integer subMethod;
     /**
-    * 扣分人员
+    * 加分扣分人员
     */
-    @Excel(name = "扣分人员")
+    @Excel(name = "加分扣分人员")
     private String deductPerson;
     /**
-    * 扣分时间
+    * 加分扣分时间
     */
     private Date deductTime;
     /**
@@ -115,6 +115,10 @@ public class PerformReviewRecordEntity extends PerformReviewRecordVo {
     * 规则名称
     */
     private String categoryName;
+    /**
+    * 增减类型(1.增加,2.扣除)
+    */
+    private Integer subAddType;
     @Override
     public int hashCode() {
          return this.getId().hashCode();
@@ -176,5 +180,7 @@ public class PerformReviewRecordEntity extends PerformReviewRecordVo {
             this.categoryId = -1L;
 
             this.categoryName = "";
+
+            this.subAddType = 1;
     }
 }
\ 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-10
+* @date 2023-07-11
 */
 public class PerformReviewRecordQuery extends PerformReviewRecordEntity {
     /** 开始 序号，主键，自增长 */
@@ -142,15 +142,15 @@ public class PerformReviewRecordQuery extends PerformReviewRecordEntity {
     /** 扣分方式(1.系统自动,2.人工添加)排除列表 */
     private List <Integer> subMethodNotList;
 
-    /** 扣分人员 */
+    /** 加分扣分人员 */
     private List<String> deductPersonList;
 
-    /** 扣分人员排除列表 */
+    /** 加分扣分人员排除列表 */
     private List <String> deductPersonNotList;
-    /** 开始 扣分时间 */
+    /** 开始 加分扣分时间 */
     private String deductTimeStart;
 
-    /** 结束 扣分时间 */
+    /** 结束 加分扣分时间 */
     private String deductTimeEnd;
 
     /** 开始 扣分或增加分值 */
@@ -260,6 +260,21 @@ public class PerformReviewRecordQuery extends PerformReviewRecordEntity {
 
     /** 规则名称排除列表 */
     private List <String> categoryNameNotList;
+    /** 开始 增减类型(1.增加,2.扣除) */
+    private Integer subAddTypeStart;
+
+    /** 结束 增减类型(1.增加,2.扣除) */
+    private Integer subAddTypeEnd;
+
+    /** 增加 增减类型(1.增加,2.扣除) */
+    private Integer subAddTypeIncrement;
+
+    /** 增减类型(1.增加,2.扣除)列表 */
+    private List <Integer> subAddTypeList;
+
+    /** 增减类型(1.增加,2.扣除)排除列表 */
+    private List <Integer> subAddTypeNotList;
+
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<PerformReviewRecordQuery> orConditionList;
 
@@ -1011,7 +1026,7 @@ public class PerformReviewRecordQuery extends PerformReviewRecordEntity {
 
 
     /**
-    * 获取 扣分人员
+    * 获取 加分扣分人员
     * @return deductPersonList
     */
     public List<String> getDeductPersonList(){
@@ -1019,7 +1034,7 @@ public class PerformReviewRecordQuery extends PerformReviewRecordEntity {
     }
 
     /**
-    * 设置 扣分人员
+    * 设置 加分扣分人员
     * @param deductPersonList
     */
     public void setDeductPersonList(List<String> deductPersonList){
@@ -1027,7 +1042,7 @@ public class PerformReviewRecordQuery extends PerformReviewRecordEntity {
     }
 
     /**
-    * 获取 扣分人员
+    * 获取 加分扣分人员
     * @return deductPersonNotList
     */
     public List<String> getDeductPersonNotList(){
@@ -1035,7 +1050,7 @@ public class PerformReviewRecordQuery extends PerformReviewRecordEntity {
     }
 
     /**
-    * 设置 扣分人员
+    * 设置 加分扣分人员
     * @param deductPersonNotList
     */
     public void setDeductPersonNotList(List<String> deductPersonNotList){
@@ -1043,7 +1058,7 @@ public class PerformReviewRecordQuery extends PerformReviewRecordEntity {
     }
 
     /**
-    * 获取 开始 扣分时间
+    * 获取 开始 加分扣分时间
     * @return deductTimeStart
     */
     public String getDeductTimeStart(){
@@ -1051,7 +1066,7 @@ public class PerformReviewRecordQuery extends PerformReviewRecordEntity {
     }
 
     /**
-    * 设置 开始 扣分时间
+    * 设置 开始 加分扣分时间
     * @param deductTimeStart
     */
     public void setDeductTimeStart(String deductTimeStart){
@@ -1059,7 +1074,7 @@ public class PerformReviewRecordQuery extends PerformReviewRecordEntity {
     }
 
     /**
-    * 获取 结束 扣分时间
+    * 获取 结束 加分扣分时间
     * @return deductTimeEnd
     */
     public String getDeductTimeEnd(){
@@ -1067,7 +1082,7 @@ public class PerformReviewRecordQuery extends PerformReviewRecordEntity {
     }
 
     /**
-    * 设置 结束 扣分时间
+    * 设置 结束 加分扣分时间
     * @param deductTimeEnd
     */
     public void setDeductTimeEnd(String deductTimeEnd){
@@ -1671,6 +1686,87 @@ public class PerformReviewRecordQuery extends PerformReviewRecordEntity {
         this.categoryNameNotList = categoryNameNotList;
     }
 
+    /**
+    * 获取 开始 增减类型(1.增加,2.扣除)
+    * @return subAddTypeStart
+    */
+    public Integer getSubAddTypeStart(){
+        return this.subAddTypeStart;
+    }
+
+    /**
+    * 设置 开始 增减类型(1.增加,2.扣除)
+    * @param subAddTypeStart
+    */
+    public void setSubAddTypeStart(Integer subAddTypeStart){
+        this.subAddTypeStart = subAddTypeStart;
+    }
+
+    /**
+    * 获取 结束 增减类型(1.增加,2.扣除)
+    * @return $subAddTypeEnd
+    */
+    public Integer getSubAddTypeEnd(){
+        return this.subAddTypeEnd;
+    }
+
+    /**
+    * 设置 结束 增减类型(1.增加,2.扣除)
+    * @param subAddTypeEnd
+    */
+    public void setSubAddTypeEnd(Integer subAddTypeEnd){
+        this.subAddTypeEnd = subAddTypeEnd;
+    }
+
+    /**
+    * 获取 增加 增减类型(1.增加,2.扣除)
+    * @return subAddTypeIncrement
+    */
+    public Integer getSubAddTypeIncrement(){
+        return this.subAddTypeIncrement;
+    }
+
+    /**
+    * 设置 增加 增减类型(1.增加,2.扣除)
+    * @param subAddTypeIncrement
+    */
+    public void setSubAddTypeIncrement(Integer subAddTypeIncrement){
+        this.subAddTypeIncrement = subAddTypeIncrement;
+    }
+
+    /**
+    * 获取 增减类型(1.增加,2.扣除)
+    * @return subAddTypeList
+    */
+    public List<Integer> getSubAddTypeList(){
+        return this.subAddTypeList;
+    }
+
+    /**
+    * 设置 增减类型(1.增加,2.扣除)
+    * @param subAddTypeList
+    */
+    public void setSubAddTypeList(List<Integer> subAddTypeList){
+        this.subAddTypeList = subAddTypeList;
+    }
+
+    /**
+    * 获取 增减类型(1.增加,2.扣除)
+    * @return subAddTypeNotList
+    */
+    public List<Integer> getSubAddTypeNotList(){
+        return this.subAddTypeNotList;
+    }
+
+    /**
+    * 设置 增减类型(1.增加,2.扣除)
+    * @param subAddTypeNotList
+    */
+    public void setSubAddTypeNotList(List<Integer> subAddTypeNotList){
+        this.subAddTypeNotList = subAddTypeNotList;
+    }
+
+
     /**
     * 设置  序号，主键，自增长
     * @param id
@@ -2131,7 +2227,7 @@ public class PerformReviewRecordQuery extends PerformReviewRecordEntity {
 
 
 	/**
-    * 设置 扣分人员
+    * 设置 加分扣分人员
     * @param deductPerson
     */
     public PerformReviewRecordQuery deductPerson(String deductPerson){
@@ -2140,7 +2236,7 @@ public class PerformReviewRecordQuery extends PerformReviewRecordEntity {
     }
 
     /**
-    * 设置 扣分人员
+    * 设置 加分扣分人员
     * @param deductPersonList
     */
     public PerformReviewRecordQuery deductPersonList(List<String> deductPersonList){
@@ -2497,6 +2593,60 @@ public class PerformReviewRecordQuery extends PerformReviewRecordEntity {
 		return this;
     }
 
+    /**
+    * 设置  增减类型(1.增加,2.扣除)
+    * @param subAddType
+    */
+    public PerformReviewRecordQuery subAddType(Integer subAddType){
+	    setSubAddType(subAddType);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 增减类型(1.增加,2.扣除)
+    * @param subAddTypeStart
+    */
+    public PerformReviewRecordQuery subAddTypeStart(Integer subAddTypeStart){
+		this.subAddTypeStart = subAddTypeStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 增减类型(1.增加,2.扣除)
+    * @param subAddTypeEnd
+    */
+    public PerformReviewRecordQuery subAddTypeEnd(Integer subAddTypeEnd){
+		this.subAddTypeEnd = subAddTypeEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 增减类型(1.增加,2.扣除)
+    * @param subAddTypeIncrement
+    */
+    public PerformReviewRecordQuery subAddTypeIncrement(Integer subAddTypeIncrement){
+		this.subAddTypeIncrement = subAddTypeIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 增减类型(1.增加,2.扣除)
+    * @param subAddTypeList
+    */
+    public PerformReviewRecordQuery subAddTypeList(List<Integer> subAddTypeList){
+        this.subAddTypeList = subAddTypeList;
+		return this;
+        }
+
+        /**
+        * 设置 增减类型(1.增加,2.扣除)
+        * @param subAddTypeNotList
+        */
+        public PerformReviewRecordQuery subAddTypeNotList(List<Integer> subAddTypeNotList){
+        this.subAddTypeNotList = subAddTypeNotList;
+        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/PerformComplainRecordVo.java

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

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

@@ -4,15 +4,16 @@ import com.mortals.xhx.module.perform.model.PerformPerposeStaffStatEntity;
 import java.util.ArrayList;
 import java.util.List;
 import lombok.Data;
+import com.mortals.framework.annotation.Excel;
+import java.math.BigDecimal;
+import java.util.Date;
 /**
 * 员工目标统计视图对象
 *
 * @author zxfei
-* @date 2023-05-16
+* @date 2023-07-11
 */
 @Data
 public class PerformPerposeStaffStatVo extends BaseEntityLong {
 
-
-
 }
\ No newline at end of file

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-10
+* @date 2023-07-11
 */
 @Data
 public class PerformReviewRecordVo extends BaseEntityLong {

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

@@ -8,7 +8,7 @@ import com.mortals.xhx.module.perform.dao.PerformComplainRecordDao;
 * 评价绩效投诉记录信息 service接口
 *
 * @author zxfei
-* @date 2023-07-10
+* @date 2023-07-11
 */
 public interface PerformComplainRecordService extends ICRUDService<PerformComplainRecordEntity,Long>{
 

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

@@ -8,7 +8,7 @@ import com.mortals.xhx.module.perform.dao.PerformEffectRecordDao;
 * 效能绩效记录信息 service接口
 *
 * @author zxfei
-* @date 2023-07-10
+* @date 2023-07-11
 */
 public interface PerformEffectRecordService extends ICRUDService<PerformEffectRecordEntity,Long>{
 

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

@@ -8,7 +8,7 @@ import com.mortals.xhx.module.perform.dao.PerformGoworkRecordDao;
 * 办件绩效记录信息 service接口
 *
 * @author zxfei
-* @date 2023-07-10
+* @date 2023-07-11
 */
 public interface PerformGoworkRecordService extends ICRUDService<PerformGoworkRecordEntity,Long>{
 

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

@@ -8,7 +8,7 @@ import com.mortals.xhx.module.perform.dao.PerformOtherRecordDao;
 * 其它绩效记录信息 service接口
 *
 * @author zxfei
-* @date 2023-07-10
+* @date 2023-07-11
 */
 public interface PerformOtherRecordService extends ICRUDService<PerformOtherRecordEntity,Long>{
 

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

@@ -8,7 +8,7 @@ import com.mortals.xhx.module.perform.dao.PerformReviewRecordDao;
 * 评价差评绩效记录信息 service接口
 *
 * @author zxfei
-* @date 2023-07-10
+* @date 2023-07-11
 */
 public interface PerformReviewRecordService extends ICRUDService<PerformReviewRecordEntity,Long>{
 

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

@@ -12,7 +12,7 @@ import lombok.extern.slf4j.Slf4j;
 * 评价绩效投诉记录信息 service实现
 *
 * @author zxfei
-* @date 2023-07-10
+* @date 2023-07-11
 */
 @Service("performComplainRecordService")
 @Slf4j

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

@@ -12,7 +12,7 @@ import lombok.extern.slf4j.Slf4j;
 * 效能绩效记录信息 service实现
 *
 * @author zxfei
-* @date 2023-07-10
+* @date 2023-07-11
 */
 @Service("performEffectRecordService")
 @Slf4j

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

@@ -12,7 +12,7 @@ import lombok.extern.slf4j.Slf4j;
 * 办件绩效记录信息 service实现
 *
 * @author zxfei
-* @date 2023-07-10
+* @date 2023-07-11
 */
 @Service("performGoworkRecordService")
 @Slf4j

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

@@ -12,7 +12,7 @@ import lombok.extern.slf4j.Slf4j;
 * 其它绩效记录信息 service实现
 *
 * @author zxfei
-* @date 2023-07-10
+* @date 2023-07-11
 */
 @Service("performOtherRecordService")
 @Slf4j

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

@@ -12,7 +12,7 @@ import lombok.extern.slf4j.Slf4j;
 * 评价差评绩效记录信息 service实现
 *
 * @author zxfei
-* @date 2023-07-10
+* @date 2023-07-11
 */
 @Service("performReviewRecordService")
 @Slf4j

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

@@ -89,7 +89,6 @@ public class PerformRulesServiceImpl extends AbstractCRUDCacheServiceImpl<Perfor
 
         str = ReUtil.replaceAll(str, "[^\\u4E00-\\u9FA5]", "");
 
-
         System.out.println(PinyinUtil.getPinyin(str));
         System.out.println(PinyinUtil.getPinyin(str, ""));
         System.out.println(PinyinUtil.getFirstLetter(str, ""));

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-07-10
+* @date 2023-07-11
 */
 @RestController
 @RequestMapping("perform/complain/record")
@@ -44,6 +44,7 @@ public class PerformComplainRecordController extends BaseCRUDJsonBodyMappingCont
     protected void init(Map<String, Object> model, Context context) {
         this.addDict(model, "subMethod", paramService.getParamBySecondOrganize("PerformComplainRecord","subMethod"));
         this.addDict(model, "processStatus", paramService.getParamBySecondOrganize("PerformComplainRecord","processStatus"));
+        this.addDict(model, "subAddType", paramService.getParamBySecondOrganize("PerformComplainRecord","subAddType"));
         super.init(model, context);
     }
 

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-07-10
+* @date 2023-07-11
 */
 @RestController
 @RequestMapping("perform/effect/record")
@@ -45,6 +45,7 @@ public class PerformEffectRecordController extends BaseCRUDJsonBodyMappingContro
         this.addDict(model, "irregularType", paramService.getParamBySecondOrganize("PerformEffectRecord","irregularType"));
         this.addDict(model, "subMethod", paramService.getParamBySecondOrganize("PerformEffectRecord","subMethod"));
         this.addDict(model, "processStatus", paramService.getParamBySecondOrganize("PerformEffectRecord","processStatus"));
+        this.addDict(model, "subAddType", paramService.getParamBySecondOrganize("PerformEffectRecord","subAddType"));
         super.init(model, context);
     }
 

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-07-10
+* @date 2023-07-11
 */
 @RestController
 @RequestMapping("perform/gowork/record")
@@ -44,6 +44,7 @@ public class PerformGoworkRecordController extends BaseCRUDJsonBodyMappingContro
     protected void init(Map<String, Object> model, Context context) {
         this.addDict(model, "subMethod", paramService.getParamBySecondOrganize("PerformGoworkRecord","subMethod"));
         this.addDict(model, "processStatus", paramService.getParamBySecondOrganize("PerformGoworkRecord","processStatus"));
+        this.addDict(model, "subAddType", paramService.getParamBySecondOrganize("PerformGoworkRecord","subAddType"));
         super.init(model, context);
     }
 

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-07-10
+* @date 2023-07-11
 */
 @RestController
 @RequestMapping("perform/other/record")
@@ -45,6 +45,7 @@ public class PerformOtherRecordController extends BaseCRUDJsonBodyMappingControl
         this.addDict(model, "irregularOtherType", paramService.getParamBySecondOrganize("PerformOtherRecord","irregularOtherType"));
         this.addDict(model, "subMethod", paramService.getParamBySecondOrganize("PerformOtherRecord","subMethod"));
         this.addDict(model, "processStatus", paramService.getParamBySecondOrganize("PerformOtherRecord","processStatus"));
+        this.addDict(model, "subAddType", paramService.getParamBySecondOrganize("PerformOtherRecord","subAddType"));
         super.init(model, context);
     }
 

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-07-10
+* @date 2023-07-11
 */
 @RestController
 @RequestMapping("perform/review/record")
@@ -46,6 +46,7 @@ public class PerformReviewRecordController extends BaseCRUDJsonBodyMappingContro
         this.addDict(model, "reviewSource", paramService.getParamBySecondOrganize("PerformReviewRecord","reviewSource"));
         this.addDict(model, "subMethod", paramService.getParamBySecondOrganize("PerformReviewRecord","subMethod"));
         this.addDict(model, "processStatus", paramService.getParamBySecondOrganize("PerformReviewRecord","processStatus"));
+        this.addDict(model, "subAddType", paramService.getParamBySecondOrganize("PerformReviewRecord","subAddType"));
         super.init(model, context);
     }
 

attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/model/StaffPerformStatEntity.java

@@ -11,7 +11,7 @@ import lombok.Data;
 * 员工绩效统计实体对象
 *
 * @author zxfei
-* @date 2023-05-17
+* @date 2023-07-11
 */
 @Data
 public class StaffPerformStatEntity extends StaffPerformStatVo {
@@ -26,10 +26,23 @@ public class StaffPerformStatEntity extends StaffPerformStatVo {
     */
     private String deptName;
     /**
-    * 部门绩效总分数
+    * 员工绩效总分数
     */
+    @Excel(name = "员工绩效总分数")
     private BigDecimal totalScore;
     /**
+    * 备注
+    */
+    private String remark;
+    /**
+    * 年
+    */
+    private Integer year;
+    /**
+    * 月
+    */
+    private Integer month;
+    /**
     * 考勤绩效指标增加分数
     */
     private BigDecimal attendScoreAdd;
@@ -70,21 +83,27 @@ public class StaffPerformStatEntity extends StaffPerformStatVo {
     */
     private BigDecimal otherScoreSub;
     /**
-    * 备注
+    * 日
     */
-    private String remark;
+    private Integer day;
     /**
-    * 年
+    * 员工绩效加分总分数汇总
     */
-    private Integer year;
+    @Excel(name = "员工绩效加分总分数汇总")
+    private BigDecimal totalAddScore;
     /**
-    * 月
+    * 员工绩效减分总分数汇总
     */
-    private Integer month;
+    @Excel(name = "员工绩效减分总分数汇总")
+    private BigDecimal totalSubScore;
     /**
-    * 日
+    * 投诉绩效指标增加分数
     */
-    private Integer day;
+    private BigDecimal complainScoreAdd;
+    /**
+    * 投诉绩效指标扣减分数
+    */
+    private BigDecimal complainScoreSub;
     @Override
     public int hashCode() {
          return this.getId().hashCode();
@@ -109,6 +128,12 @@ public class StaffPerformStatEntity extends StaffPerformStatVo {
 
             this.totalScore = new BigDecimal(0);
 
+            this.remark = "";
+
+            this.year = -1;
+
+            this.month = -1;
+
             this.attendScoreAdd = new BigDecimal(0);
 
             this.attendScoreSub = new BigDecimal(0);
@@ -129,12 +154,14 @@ public class StaffPerformStatEntity extends StaffPerformStatVo {
 
             this.otherScoreSub = new BigDecimal(0);
 
-            this.remark = "";
+            this.day = -1;
 
-            this.year = -1;
+            this.totalAddScore = new BigDecimal(0);
 
-            this.month = -1;
+            this.totalSubScore = new BigDecimal(0);
 
-            this.day = -1;
+            this.complainScoreAdd = new BigDecimal(0);
+
+            this.complainScoreSub = new BigDecimal(0);
     }
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/model/vo/StaffPerformStatVo.java

 package com.mortals.xhx.module.staff.model.vo;
-import com.mortals.framework.annotation.Excel;
 import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.staff.model.StaffPerformStatEntity;
-
-import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 import lombok.Data;
+import com.mortals.framework.annotation.Excel;
+import java.math.BigDecimal;
+import java.util.Date;
 /**
 * 员工绩效统计视图对象
 *
 * @author zxfei
-* @date 2023-05-17
+* @date 2023-07-11
 */
 @Data
 public class StaffPerformStatVo extends BaseEntityLong {
 
-        /**
-        * 部门绩效总分数
-        */
-        @Excel(name = "部门绩效总分数")
-        private BigDecimal totalScore;
-
-
 }
\ No newline at end of file

attendance-performance-manager/src/main/resources/bootstrap.yml

@@ -61,3 +61,5 @@ hik:
   appKey: @profiles.hik.appKey@
   protocol: @profiles.hik.protocol@
   appSecret: @profiles.hik.appSecret@
+dingtalk:
+  agentId: 123123

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

@@ -40,6 +40,7 @@
             <result property="filePaths" column="filePaths" />
             <result property="categoryId" column="categoryId" />
             <result property="categoryName" column="categoryName" />
+            <result property="subAddType" column="subAddType" />
             
     </resultMap>
 
@@ -152,23 +153,26 @@
                 <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('categoryName') or colPickMode == 1 and data.containsKey('categoryName')))">
                     a.categoryName,
                 </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('subAddType') or colPickMode == 1 and data.containsKey('subAddType')))">
+                    a.subAddType,
+                </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,categoryId,categoryName)
+        (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,subAddType)
         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},#{categoryId},#{categoryName})
+        (#{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},#{subAddType})
     </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,categoryId,categoryName)
+        (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,subAddType)
         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.categoryId},#{item.categoryName})
+            (#{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},#{item.subAddType})
         </foreach>
     </insert>
 
@@ -310,6 +314,12 @@
             <if test="(colPickMode==0 and data.containsKey('categoryName')) or (colPickMode==1 and !data.containsKey('categoryName'))">
                 a.categoryName=#{data.categoryName},
             </if>
+            <if test="(colPickMode==0 and data.containsKey('subAddType')) or (colPickMode==1 and !data.containsKey('subAddType'))">
+                a.subAddType=#{data.subAddType},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('subAddTypeIncrement')) or (colPickMode==1 and !data.containsKey('subAddTypeIncrement'))">
+                a.subAddType=ifnull(a.subAddType,0) + #{data.subAddTypeIncrement},
+            </if>
         </trim>
         <trim suffixOverrides="where" suffix="">
             where
@@ -610,6 +620,18 @@
                         </if>
                     </foreach>
                 </trim>
+                        <trim prefix="subAddType=(case" suffix="ELSE subAddType end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('subAddType')) or (colPickMode==1 and !item.containsKey('subAddType'))">
+                                        when a.id=#{item.id} then #{item.subAddType}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('subAddTypeIncrement')) or (colPickMode==1 and !item.containsKey('subAddTypeIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.subAddType,0) + #{item.subAddTypeIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
         </trim>
         where id in
         <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
@@ -1497,6 +1519,33 @@
                     #{item}
                 </foreach>
             </if>
+            <if test="conditionParamRef.containsKey('subAddType')">
+                <if test="conditionParamRef.subAddType != null ">
+                    ${_conditionType_} a.subAddType = #{${_conditionParam_}.subAddType}
+                </if>
+                <if test="conditionParamRef.subAddType == null">
+                    ${_conditionType_} a.subAddType is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('subAddTypeList') and conditionParamRef.subAddTypeList.size() > 0">
+                ${_conditionType_} a.subAddType in
+                <foreach collection="conditionParamRef.subAddTypeList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('subAddTypeNotList') and conditionParamRef.subAddTypeNotList.size() > 0">
+                ${_conditionType_} a.subAddType not in
+                <foreach collection="conditionParamRef.subAddTypeNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('subAddTypeStart') and conditionParamRef.subAddTypeStart != null">
+                ${_conditionType_} a.subAddType <![CDATA[ >= ]]> #{${_conditionParam_}.subAddTypeStart}
+            </if>
+            <if test="conditionParamRef.containsKey('subAddTypeEnd') and conditionParamRef.subAddTypeEnd != null">
+                ${_conditionType_} a.subAddType <![CDATA[ <= ]]> #{${_conditionParam_}.subAddTypeEnd}
+            </if>
+
     </sql>
     <sql id="_orderCols_">
         <if test="orderColList != null and !orderColList.isEmpty()">
@@ -1685,6 +1734,11 @@
                         <if test='orderCol.categoryName != null and "DESC".equalsIgnoreCase(orderCol.categoryName)'>DESC</if>
                         ,
                     </if>
+                    <if test="orderCol.containsKey('subAddType')">
+                        a.subAddType
+                        <if test='orderCol.subAddType != null and "DESC".equalsIgnoreCase(orderCol.subAddType)'>DESC</if>
+                        ,
+                    </if>
             </trim>
         </if>
     </sql>

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

@@ -38,6 +38,7 @@
             <result property="filePaths" column="filePaths" />
             <result property="categoryId" column="categoryId" />
             <result property="categoryName" column="categoryName" />
+            <result property="subAddType" column="subAddType" />
             
     </resultMap>
 
@@ -144,23 +145,26 @@
                 <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('categoryName') or colPickMode == 1 and data.containsKey('categoryName')))">
                     a.categoryName,
                 </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('subAddType') or colPickMode == 1 and data.containsKey('subAddType')))">
+                    a.subAddType,
+                </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,categoryId,categoryName)
+        (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,subAddType)
         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},#{categoryId},#{categoryName})
+        (#{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},#{subAddType})
     </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,categoryId,categoryName)
+        (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,subAddType)
         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.categoryId},#{item.categoryName})
+            (#{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},#{item.subAddType})
         </foreach>
     </insert>
 
@@ -302,6 +306,12 @@
             <if test="(colPickMode==0 and data.containsKey('categoryName')) or (colPickMode==1 and !data.containsKey('categoryName'))">
                 a.categoryName=#{data.categoryName},
             </if>
+            <if test="(colPickMode==0 and data.containsKey('subAddType')) or (colPickMode==1 and !data.containsKey('subAddType'))">
+                a.subAddType=#{data.subAddType},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('subAddTypeIncrement')) or (colPickMode==1 and !data.containsKey('subAddTypeIncrement'))">
+                a.subAddType=ifnull(a.subAddType,0) + #{data.subAddTypeIncrement},
+            </if>
         </trim>
         <trim suffixOverrides="where" suffix="">
             where
@@ -598,6 +608,18 @@
                         </if>
                     </foreach>
                 </trim>
+                        <trim prefix="subAddType=(case" suffix="ELSE subAddType end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('subAddType')) or (colPickMode==1 and !item.containsKey('subAddType'))">
+                                        when a.id=#{item.id} then #{item.subAddType}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('subAddTypeIncrement')) or (colPickMode==1 and !item.containsKey('subAddTypeIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.subAddType,0) + #{item.subAddTypeIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
         </trim>
         where id in
         <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
@@ -1449,6 +1471,33 @@
                     #{item}
                 </foreach>
             </if>
+            <if test="conditionParamRef.containsKey('subAddType')">
+                <if test="conditionParamRef.subAddType != null ">
+                    ${_conditionType_} a.subAddType = #{${_conditionParam_}.subAddType}
+                </if>
+                <if test="conditionParamRef.subAddType == null">
+                    ${_conditionType_} a.subAddType is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('subAddTypeList') and conditionParamRef.subAddTypeList.size() > 0">
+                ${_conditionType_} a.subAddType in
+                <foreach collection="conditionParamRef.subAddTypeList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('subAddTypeNotList') and conditionParamRef.subAddTypeNotList.size() > 0">
+                ${_conditionType_} a.subAddType not in
+                <foreach collection="conditionParamRef.subAddTypeNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('subAddTypeStart') and conditionParamRef.subAddTypeStart != null">
+                ${_conditionType_} a.subAddType <![CDATA[ >= ]]> #{${_conditionParam_}.subAddTypeStart}
+            </if>
+            <if test="conditionParamRef.containsKey('subAddTypeEnd') and conditionParamRef.subAddTypeEnd != null">
+                ${_conditionType_} a.subAddType <![CDATA[ <= ]]> #{${_conditionParam_}.subAddTypeEnd}
+            </if>
+
     </sql>
     <sql id="_orderCols_">
         <if test="orderColList != null and !orderColList.isEmpty()">
@@ -1627,6 +1676,11 @@
                         <if test='orderCol.categoryName != null and "DESC".equalsIgnoreCase(orderCol.categoryName)'>DESC</if>
                         ,
                     </if>
+                    <if test="orderCol.containsKey('subAddType')">
+                        a.subAddType
+                        <if test='orderCol.subAddType != null and "DESC".equalsIgnoreCase(orderCol.subAddType)'>DESC</if>
+                        ,
+                    </if>
             </trim>
         </if>
     </sql>

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

@@ -37,6 +37,7 @@
             <result property="filePaths" column="filePaths" />
             <result property="categoryId" column="categoryId" />
             <result property="categoryName" column="categoryName" />
+            <result property="subAddType" column="subAddType" />
             
     </resultMap>
 
@@ -140,23 +141,26 @@
                 <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('categoryName') or colPickMode == 1 and data.containsKey('categoryName')))">
                     a.categoryName,
                 </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('subAddType') or colPickMode == 1 and data.containsKey('subAddType')))">
+                    a.subAddType,
+                </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,categoryId,categoryName)
+        (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,subAddType)
         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},#{categoryId},#{categoryName})
+        (#{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},#{subAddType})
     </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,categoryId,categoryName)
+        (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,subAddType)
         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.categoryId},#{item.categoryName})
+            (#{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},#{item.subAddType})
         </foreach>
     </insert>
 
@@ -289,6 +293,12 @@
             <if test="(colPickMode==0 and data.containsKey('categoryName')) or (colPickMode==1 and !data.containsKey('categoryName'))">
                 a.categoryName=#{data.categoryName},
             </if>
+            <if test="(colPickMode==0 and data.containsKey('subAddType')) or (colPickMode==1 and !data.containsKey('subAddType'))">
+                a.subAddType=#{data.subAddType},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('subAddTypeIncrement')) or (colPickMode==1 and !data.containsKey('subAddTypeIncrement'))">
+                a.subAddType=ifnull(a.subAddType,0) + #{data.subAddTypeIncrement},
+            </if>
         </trim>
         <trim suffixOverrides="where" suffix="">
             where
@@ -568,6 +578,18 @@
                         </if>
                     </foreach>
                 </trim>
+                        <trim prefix="subAddType=(case" suffix="ELSE subAddType end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('subAddType')) or (colPickMode==1 and !item.containsKey('subAddType'))">
+                                        when a.id=#{item.id} then #{item.subAddType}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('subAddTypeIncrement')) or (colPickMode==1 and !item.containsKey('subAddTypeIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.subAddType,0) + #{item.subAddTypeIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
         </trim>
         where id in
         <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
@@ -1392,6 +1414,33 @@
                     #{item}
                 </foreach>
             </if>
+            <if test="conditionParamRef.containsKey('subAddType')">
+                <if test="conditionParamRef.subAddType != null ">
+                    ${_conditionType_} a.subAddType = #{${_conditionParam_}.subAddType}
+                </if>
+                <if test="conditionParamRef.subAddType == null">
+                    ${_conditionType_} a.subAddType is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('subAddTypeList') and conditionParamRef.subAddTypeList.size() > 0">
+                ${_conditionType_} a.subAddType in
+                <foreach collection="conditionParamRef.subAddTypeList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('subAddTypeNotList') and conditionParamRef.subAddTypeNotList.size() > 0">
+                ${_conditionType_} a.subAddType not in
+                <foreach collection="conditionParamRef.subAddTypeNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('subAddTypeStart') and conditionParamRef.subAddTypeStart != null">
+                ${_conditionType_} a.subAddType <![CDATA[ >= ]]> #{${_conditionParam_}.subAddTypeStart}
+            </if>
+            <if test="conditionParamRef.containsKey('subAddTypeEnd') and conditionParamRef.subAddTypeEnd != null">
+                ${_conditionType_} a.subAddType <![CDATA[ <= ]]> #{${_conditionParam_}.subAddTypeEnd}
+            </if>
+
     </sql>
     <sql id="_orderCols_">
         <if test="orderColList != null and !orderColList.isEmpty()">
@@ -1565,6 +1614,11 @@
                         <if test='orderCol.categoryName != null and "DESC".equalsIgnoreCase(orderCol.categoryName)'>DESC</if>
                         ,
                     </if>
+                    <if test="orderCol.containsKey('subAddType')">
+                        a.subAddType
+                        <if test='orderCol.subAddType != null and "DESC".equalsIgnoreCase(orderCol.subAddType)'>DESC</if>
+                        ,
+                    </if>
             </trim>
         </if>
     </sql>

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

@@ -37,6 +37,7 @@
             <result property="filePaths" column="filePaths" />
             <result property="categoryId" column="categoryId" />
             <result property="categoryName" column="categoryName" />
+            <result property="subAddType" column="subAddType" />
             
     </resultMap>
 
@@ -140,23 +141,26 @@
                 <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('categoryName') or colPickMode == 1 and data.containsKey('categoryName')))">
                     a.categoryName,
                 </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('subAddType') or colPickMode == 1 and data.containsKey('subAddType')))">
+                    a.subAddType,
+                </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,categoryId,categoryName)
+        (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,subAddType)
         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},#{categoryId},#{categoryName})
+        (#{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},#{subAddType})
     </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,categoryId,categoryName)
+        (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,subAddType)
         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.categoryId},#{item.categoryName})
+            (#{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},#{item.subAddType})
         </foreach>
     </insert>
 
@@ -295,6 +299,12 @@
             <if test="(colPickMode==0 and data.containsKey('categoryName')) or (colPickMode==1 and !data.containsKey('categoryName'))">
                 a.categoryName=#{data.categoryName},
             </if>
+            <if test="(colPickMode==0 and data.containsKey('subAddType')) or (colPickMode==1 and !data.containsKey('subAddType'))">
+                a.subAddType=#{data.subAddType},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('subAddTypeIncrement')) or (colPickMode==1 and !data.containsKey('subAddTypeIncrement'))">
+                a.subAddType=ifnull(a.subAddType,0) + #{data.subAddTypeIncrement},
+            </if>
         </trim>
         <trim suffixOverrides="where" suffix="">
             where
@@ -584,6 +594,18 @@
                         </if>
                     </foreach>
                 </trim>
+                        <trim prefix="subAddType=(case" suffix="ELSE subAddType end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('subAddType')) or (colPickMode==1 and !item.containsKey('subAddType'))">
+                                        when a.id=#{item.id} then #{item.subAddType}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('subAddTypeIncrement')) or (colPickMode==1 and !item.containsKey('subAddTypeIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.subAddType,0) + #{item.subAddTypeIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
         </trim>
         where id in
         <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
@@ -1420,6 +1442,33 @@
                     #{item}
                 </foreach>
             </if>
+            <if test="conditionParamRef.containsKey('subAddType')">
+                <if test="conditionParamRef.subAddType != null ">
+                    ${_conditionType_} a.subAddType = #{${_conditionParam_}.subAddType}
+                </if>
+                <if test="conditionParamRef.subAddType == null">
+                    ${_conditionType_} a.subAddType is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('subAddTypeList') and conditionParamRef.subAddTypeList.size() > 0">
+                ${_conditionType_} a.subAddType in
+                <foreach collection="conditionParamRef.subAddTypeList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('subAddTypeNotList') and conditionParamRef.subAddTypeNotList.size() > 0">
+                ${_conditionType_} a.subAddType not in
+                <foreach collection="conditionParamRef.subAddTypeNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('subAddTypeStart') and conditionParamRef.subAddTypeStart != null">
+                ${_conditionType_} a.subAddType <![CDATA[ >= ]]> #{${_conditionParam_}.subAddTypeStart}
+            </if>
+            <if test="conditionParamRef.containsKey('subAddTypeEnd') and conditionParamRef.subAddTypeEnd != null">
+                ${_conditionType_} a.subAddType <![CDATA[ <= ]]> #{${_conditionParam_}.subAddTypeEnd}
+            </if>
+
     </sql>
     <sql id="_orderCols_">
         <if test="orderColList != null and !orderColList.isEmpty()">
@@ -1593,6 +1642,11 @@
                         <if test='orderCol.categoryName != null and "DESC".equalsIgnoreCase(orderCol.categoryName)'>DESC</if>
                         ,
                     </if>
+                    <if test="orderCol.containsKey('subAddType')">
+                        a.subAddType
+                        <if test='orderCol.subAddType != null and "DESC".equalsIgnoreCase(orderCol.subAddType)'>DESC</if>
+                        ,
+                    </if>
             </trim>
         </if>
     </sql>