Merge remote-tracking branch 'origin/master'

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

@@ -63,8 +63,6 @@ public class                ApiWebPerformController extends AbstractBaseControll
 
         String busiDesc = "外部考勤新增";
         Rest rest = Rest.ok(busiDesc + "成功！");
-        StringBuilder message = new StringBuilder();
-        message.append(String.format("【外部请求】类型【%s】 内容:%s", PerformTypeEnum.getByValue(req.getPerformType()).getDesc(), JSONObject.toJSONString(req)));
         try {
             if (ObjectUtils.isEmpty(req.getPhone())) throw new AppException("手机号码不能为空！");
             if (ObjectUtils.isEmpty(req.getRuleCode())) throw new AppException("绩效规则编码不能为空！");
@@ -90,8 +88,6 @@ public class                ApiWebPerformController extends AbstractBaseControll
 
         String busiDesc = "外部评价新增";
         Rest rest = Rest.ok(busiDesc + "成功！");
-        StringBuilder message = new StringBuilder();
-        message.append(String.format("【外部请求】类型【%s】 内容:%s", PerformTypeEnum.getByValue(req.getPerformType()).getDesc(), JSONObject.toJSONString(req)));
          try {
             if (ObjectUtils.isEmpty(req.getPhone())) throw new AppException("手机号码不能为空！");
             if (ObjectUtils.isEmpty(req.getRuleCode())) throw new AppException("绩效规则编码不能为空！");
@@ -117,8 +113,6 @@ public class                ApiWebPerformController extends AbstractBaseControll
 
         String busiDesc = "外部投诉新增";
         Rest rest = Rest.ok(busiDesc + "成功！");
-        StringBuilder message = new StringBuilder();
-        message.append(String.format("【外部请求】类型【%s】 内容:%s", PerformTypeEnum.getByValue(req.getPerformType()).getDesc(), JSONObject.toJSONString(req)));
         try {
             if (ObjectUtils.isEmpty(req.getPhone())) throw new AppException("手机号码不能为空！");
             if (ObjectUtils.isEmpty(req.getRuleCode())) throw new AppException("绩效规则编码不能为空！");
@@ -144,8 +138,6 @@ public class                ApiWebPerformController extends AbstractBaseControll
 
         String busiDesc = "外部办件新增";
         Rest rest = Rest.ok(busiDesc + "成功！");
-        StringBuilder message = new StringBuilder();
-        message.append(String.format("【外部请求】类型【%s】 内容:%s", PerformTypeEnum.getByValue(req.getPerformType()).getDesc(), JSONObject.toJSONString(req)));
         try {
             if (ObjectUtils.isEmpty(req.getPhone())) throw new AppException("手机号码不能为空！");
             if (ObjectUtils.isEmpty(req.getRuleCode())) throw new AppException("绩效规则编码不能为空！");
@@ -171,8 +163,6 @@ public class                ApiWebPerformController extends AbstractBaseControll
 
         String busiDesc = "外部效能新增";
         Rest rest = Rest.ok(busiDesc + "成功！");
-        StringBuilder message = new StringBuilder();
-        message.append(String.format("【外部请求】类型【%s】 内容:%s", PerformTypeEnum.getByValue(req.getPerformType()).getDesc(), JSONObject.toJSONString(req)));
        try {
             if (ObjectUtils.isEmpty(req.getPhone())) throw new AppException("手机号码不能为空！");
             if (ObjectUtils.isEmpty(req.getRuleCode())) throw new AppException("绩效规则编码不能为空！");
@@ -198,8 +188,6 @@ public class                ApiWebPerformController extends AbstractBaseControll
 
         String busiDesc = "外部其它绩效新增";
         Rest rest = Rest.ok(busiDesc + "成功！");
-        StringBuilder message = new StringBuilder();
-        message.append(String.format("【外部请求】类型【%s】 内容:%s", PerformTypeEnum.getByValue(req.getPerformType()).getDesc(), JSONObject.toJSONString(req)));
        try {
             if (ObjectUtils.isEmpty(req.getPhone())) throw new AppException("手机号码不能为空！");
             if (ObjectUtils.isEmpty(req.getRuleCode())) throw new AppException("绩效规则编码不能为空！");

attendance-performance-manager/src/main/java/com/mortals/xhx/module/feedback/web/FeedbackController.java

@@ -209,4 +209,9 @@ public class FeedbackController extends BaseCRUDJsonBodyMappingController<Feedba
         return ret;
     }
 
+
+    @Override
+    protected int infoAfter(Long id, Map<String, Object> model, FeedbackEntity entity, Context context) throws AppException {
+        return super.infoAfter(id, model, entity, context);
+    }
 }
\ No newline at end of file

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

 package com.mortals.xhx.module.staff.model;
+
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 import java.util.ArrayList;
+
+import cn.hutool.core.date.DateUtil;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.mortals.framework.annotation.Excel;
 import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.staff.model.vo.StaffPerformStatVo;
 import lombok.Data;
+
 /**
-* 员工绩效统计实体对象
-*
-* @author zxfei
-* @date 2023-07-11
-*/
+ * 员工绩效统计实体对象
+ *
+ * @author zxfei
+ * @date 2023-07-13
+ */
 @Data
 public class StaffPerformStatEntity extends StaffPerformStatVo {
     private static final long serialVersionUID = 1L;
@@ -20,28 +25,26 @@ public class StaffPerformStatEntity extends StaffPerformStatVo {
     /**
      * 部门id号
      */
-    private Long deptId;
+    private Long staffId;
     /**
      * 部门名称
      */
-    private String deptName;
+    private String staffName;
     /**
      * 员工绩效总分数
      */
     @Excel(name = "员工绩效总分数")
     private BigDecimal totalScore;
     /**
-    * 备注
-    */
-    private String remark;
-    /**
-    * 年
+     * 员工绩效加分总分数汇总
      */
-    private Integer year;
+    @Excel(name = "员工绩效加分总分数汇总")
+    private BigDecimal totalAddScore;
     /**
-    * 月
+     * 员工绩效减分总分数汇总
      */
-    private Integer month;
+    @Excel(name = "员工绩效减分总分数汇总")
+    private BigDecimal totalSubScore;
     /**
      * 考勤绩效指标增加分数
      */
@@ -58,6 +61,14 @@ public class StaffPerformStatEntity extends StaffPerformStatVo {
      * 评价绩效指标扣减分数
      */
     private BigDecimal assessScoreSub;
+    /**
+     * 投诉绩效指标增加分数
+     */
+    private BigDecimal complainScoreAdd;
+    /**
+     * 投诉绩效指标扣减分数
+     */
+    private BigDecimal complainScoreSub;
     /**
      * 办件绩效指标增加分数
      */
@@ -83,31 +94,27 @@ public class StaffPerformStatEntity extends StaffPerformStatVo {
      */
     private BigDecimal otherScoreSub;
     /**
-    * 日
-    */
-    private Integer day;
-    /**
-    * 员工绩效加分总分数汇总
+     * 备注
      */
-    @Excel(name = "员工绩效加分总分数汇总")
-    private BigDecimal totalAddScore;
+    private String remark;
     /**
-    * 员工绩效减分总分数汇总
+     * 年
      */
-    @Excel(name = "员工绩效减分总分数汇总")
-    private BigDecimal totalSubScore;
+    private Integer year;
     /**
-    * 投诉绩效指标增加分数
+     * 月
      */
-    private BigDecimal complainScoreAdd;
+    private Integer month;
     /**
-    * 投诉绩效指标扣减分数
+     * 日
      */
-    private BigDecimal complainScoreSub;
+    private Integer day;
+
     @Override
     public int hashCode() {
         return this.getId().hashCode();
     }
+
     @Override
     public boolean equals(Object obj) {
         if (obj == null) return false;
@@ -120,19 +127,17 @@ public class StaffPerformStatEntity extends StaffPerformStatVo {
         return false;
     }
 
-    public void initAttrValue(){
+    public void initAttrValue() {
 
-            this.deptId = 0L;
+        this.staffId = 0L;
 
-            this.deptName = "";
+        this.staffName = "";
 
         this.totalScore = new BigDecimal(0);
 
-            this.remark = "";
-
-            this.year = -1;
+        this.totalAddScore = new BigDecimal(0);
 
-            this.month = -1;
+        this.totalSubScore = new BigDecimal(0);
 
         this.attendScoreAdd = new BigDecimal(0);
 
@@ -142,6 +147,10 @@ public class StaffPerformStatEntity extends StaffPerformStatVo {
 
         this.assessScoreSub = new BigDecimal(0);
 
+        this.complainScoreAdd = new BigDecimal(0);
+
+        this.complainScoreSub = new BigDecimal(0);
+
         this.workScoreAdd = new BigDecimal(0);
 
         this.workScoreSub = new BigDecimal(0);
@@ -154,14 +163,12 @@ public class StaffPerformStatEntity extends StaffPerformStatVo {
 
         this.otherScoreSub = new BigDecimal(0);
 
-            this.day = -1;
-
-            this.totalAddScore = new BigDecimal(0);
+        this.remark = "";
 
-            this.totalSubScore = new BigDecimal(0);
+        this.year = DateUtil.year(new Date());
 
-            this.complainScoreAdd = new BigDecimal(0);
+        this.month = DateUtil.month(new Date()) + 1;
 
-            this.complainScoreSub = new BigDecimal(0);
+        this.day = DateUtil.dayOfMonth(new Date());
     }
 }
\ No newline at end of file

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

@@ -4,11 +4,11 @@ import java.math.BigDecimal;
 import java.util.List;
 import com.mortals.xhx.module.staff.model.StaffPerformStatEntity;
 /**
-* 员工绩效统计查询对象
-*
-* @author zxfei
-* @date 2023-07-11
-*/
+ * 员工绩效统计查询对象
+ *
+ * @author zxfei
+ * @date 2023-07-13
+ */
 public class StaffPerformStatQuery extends StaffPerformStatEntity {
     /** 开始 主键ID，主键，自增长 */
     private Long idStart;
@@ -26,25 +26,25 @@ public class StaffPerformStatQuery extends StaffPerformStatEntity {
     private List <Long> idNotList;
 
     /** 开始 部门id号 */
-    private Long deptIdStart;
+    private Long staffIdStart;
 
     /** 结束 部门id号 */
-    private Long deptIdEnd;
+    private Long staffIdEnd;
 
     /** 增加 部门id号 */
-    private Long deptIdIncrement;
+    private Long staffIdIncrement;
 
     /** 部门id号列表 */
-    private List <Long> deptIdList;
+    private List <Long> staffIdList;
 
     /** 部门id号排除列表 */
-    private List <Long> deptIdNotList;
+    private List <Long> staffIdNotList;
 
     /** 部门名称 */
-    private List<String> deptNameList;
+    private List<String> staffNameList;
 
     /** 部门名称排除列表 */
-    private List <String> deptNameNotList;
+    private List <String> staffNameNotList;
     /** 开始 员工绩效总分数 */
     private BigDecimal totalScoreStart;
 
@@ -60,82 +60,35 @@ public class StaffPerformStatQuery extends StaffPerformStatEntity {
     /** 员工绩效总分数排除列表 */
     private List <BigDecimal> totalScoreNotList;
 
-    /** 备注 */
-    private List<String> remarkList;
-
-    /** 备注排除列表 */
-    private List <String> remarkNotList;
-    /** 开始 年 */
-    private Integer yearStart;
-
-    /** 结束 年 */
-    private Integer yearEnd;
-
-    /** 增加 年 */
-    private Integer yearIncrement;
-
-    /** 年列表 */
-    private List <Integer> yearList;
-
-    /** 年排除列表 */
-    private List <Integer> yearNotList;
-
-    /** 开始 月 */
-    private Integer monthStart;
-
-    /** 结束 月 */
-    private Integer monthEnd;
-
-    /** 增加 月 */
-    private Integer monthIncrement;
-
-    /** 月列表 */
-    private List <Integer> monthList;
-
-    /** 月排除列表 */
-    private List <Integer> monthNotList;
-
-    /** 开始 创建时间 */
-    private String createTimeStart;
-
-    /** 结束 创建时间 */
-    private String createTimeEnd;
-
-    /** 开始 创建人id */
-    private Long createUserIdStart;
-
-    /** 结束 创建人id */
-    private Long createUserIdEnd;
-
-    /** 增加 创建人id */
-    private Long createUserIdIncrement;
+    /** 开始 员工绩效加分总分数汇总 */
+    private BigDecimal totalAddScoreStart;
 
-    /** 创建人id列表 */
-    private List <Long> createUserIdList;
+    /** 结束 员工绩效加分总分数汇总 */
+    private BigDecimal totalAddScoreEnd;
 
-    /** 创建人id排除列表 */
-    private List <Long> createUserIdNotList;
+    /** 增加 员工绩效加分总分数汇总 */
+    private BigDecimal totalAddScoreIncrement;
 
-    /** 开始 更新时间 */
-    private String updateTimeStart;
+    /** 员工绩效加分总分数汇总列表 */
+    private List <BigDecimal> totalAddScoreList;
 
-    /** 结束 更新时间 */
-    private String updateTimeEnd;
+    /** 员工绩效加分总分数汇总排除列表 */
+    private List <BigDecimal> totalAddScoreNotList;
 
-    /** 开始 更新人id */
-    private Long updateUserIdStart;
+    /** 开始 员工绩效减分总分数汇总 */
+    private BigDecimal totalSubScoreStart;
 
-    /** 结束 更新人id */
-    private Long updateUserIdEnd;
+    /** 结束 员工绩效减分总分数汇总 */
+    private BigDecimal totalSubScoreEnd;
 
-    /** 增加 更新人id */
-    private Long updateUserIdIncrement;
+    /** 增加 员工绩效减分总分数汇总 */
+    private BigDecimal totalSubScoreIncrement;
 
-    /** 更新人id列表 */
-    private List <Long> updateUserIdList;
+    /** 员工绩效减分总分数汇总列表 */
+    private List <BigDecimal> totalSubScoreList;
 
-    /** 更新人id排除列表 */
-    private List <Long> updateUserIdNotList;
+    /** 员工绩效减分总分数汇总排除列表 */
+    private List <BigDecimal> totalSubScoreNotList;
 
     /** 开始 考勤绩效指标增加分数 */
     private BigDecimal attendScoreAddStart;
@@ -197,6 +150,36 @@ public class StaffPerformStatQuery extends StaffPerformStatEntity {
     /** 评价绩效指标扣减分数排除列表 */
     private List <BigDecimal> assessScoreSubNotList;
 
+    /** 开始 投诉绩效指标增加分数 */
+    private BigDecimal complainScoreAddStart;
+
+    /** 结束 投诉绩效指标增加分数 */
+    private BigDecimal complainScoreAddEnd;
+
+    /** 增加 投诉绩效指标增加分数 */
+    private BigDecimal complainScoreAddIncrement;
+
+    /** 投诉绩效指标增加分数列表 */
+    private List <BigDecimal> complainScoreAddList;
+
+    /** 投诉绩效指标增加分数排除列表 */
+    private List <BigDecimal> complainScoreAddNotList;
+
+    /** 开始 投诉绩效指标扣减分数 */
+    private BigDecimal complainScoreSubStart;
+
+    /** 结束 投诉绩效指标扣减分数 */
+    private BigDecimal complainScoreSubEnd;
+
+    /** 增加 投诉绩效指标扣减分数 */
+    private BigDecimal complainScoreSubIncrement;
+
+    /** 投诉绩效指标扣减分数列表 */
+    private List <BigDecimal> complainScoreSubList;
+
+    /** 投诉绩效指标扣减分数排除列表 */
+    private List <BigDecimal> complainScoreSubNotList;
+
     /** 开始 办件绩效指标增加分数 */
     private BigDecimal workScoreAddStart;
 
@@ -287,6 +270,41 @@ public class StaffPerformStatQuery extends StaffPerformStatEntity {
     /** 其它绩效指标扣减分数排除列表 */
     private List <BigDecimal> otherScoreSubNotList;
 
+    /** 备注 */
+    private List<String> remarkList;
+
+    /** 备注排除列表 */
+    private List <String> remarkNotList;
+    /** 开始 年 */
+    private Integer yearStart;
+
+    /** 结束 年 */
+    private Integer yearEnd;
+
+    /** 增加 年 */
+    private Integer yearIncrement;
+
+    /** 年列表 */
+    private List <Integer> yearList;
+
+    /** 年排除列表 */
+    private List <Integer> yearNotList;
+
+    /** 开始 月 */
+    private Integer monthStart;
+
+    /** 结束 月 */
+    private Integer monthEnd;
+
+    /** 增加 月 */
+    private Integer monthIncrement;
+
+    /** 月列表 */
+    private List <Integer> monthList;
+
+    /** 月排除列表 */
+    private List <Integer> monthNotList;
+
     /** 开始 日 */
     private Integer dayStart;
 
@@ -302,65 +320,47 @@ public class StaffPerformStatQuery extends StaffPerformStatEntity {
     /** 日排除列表 */
     private List <Integer> dayNotList;
 
-    /** 开始 员工绩效加分总分数汇总 */
-    private BigDecimal totalAddScoreStart;
-
-    /** 结束 员工绩效加分总分数汇总 */
-    private BigDecimal totalAddScoreEnd;
-
-    /** 增加 员工绩效加分总分数汇总 */
-    private BigDecimal totalAddScoreIncrement;
-
-    /** 员工绩效加分总分数汇总列表 */
-    private List <BigDecimal> totalAddScoreList;
-
-    /** 员工绩效加分总分数汇总排除列表 */
-    private List <BigDecimal> totalAddScoreNotList;
-
-    /** 开始 员工绩效减分总分数汇总 */
-    private BigDecimal totalSubScoreStart;
-
-    /** 结束 员工绩效减分总分数汇总 */
-    private BigDecimal totalSubScoreEnd;
+    /** 开始 创建时间 */
+    private String createTimeStart;
 
-    /** 增加 员工绩效减分总分数汇总 */
-    private BigDecimal totalSubScoreIncrement;
+    /** 结束 创建时间 */
+    private String createTimeEnd;
 
-    /** 员工绩效减分总分数汇总列表 */
-    private List <BigDecimal> totalSubScoreList;
+    /** 开始 创建人id */
+    private Long createUserIdStart;
 
-    /** 员工绩效减分总分数汇总排除列表 */
-    private List <BigDecimal> totalSubScoreNotList;
+    /** 结束 创建人id */
+    private Long createUserIdEnd;
 
-    /** 开始 投诉绩效指标增加分数 */
-    private BigDecimal complainScoreAddStart;
+    /** 增加 创建人id */
+    private Long createUserIdIncrement;
 
-    /** 结束 投诉绩效指标增加分数 */
-    private BigDecimal complainScoreAddEnd;
+    /** 创建人id列表 */
+    private List <Long> createUserIdList;
 
-    /** 增加 投诉绩效指标增加分数 */
-    private BigDecimal complainScoreAddIncrement;
+    /** 创建人id排除列表 */
+    private List <Long> createUserIdNotList;
 
-    /** 投诉绩效指标增加分数列表 */
-    private List <BigDecimal> complainScoreAddList;
+    /** 开始 更新时间 */
+    private String updateTimeStart;
 
-    /** 投诉绩效指标增加分数排除列表 */
-    private List <BigDecimal> complainScoreAddNotList;
+    /** 结束 更新时间 */
+    private String updateTimeEnd;
 
-    /** 开始 投诉绩效指标扣减分数 */
-    private BigDecimal complainScoreSubStart;
+    /** 开始 更新人id */
+    private Long updateUserIdStart;
 
-    /** 结束 投诉绩效指标扣减分数 */
-    private BigDecimal complainScoreSubEnd;
+    /** 结束 更新人id */
+    private Long updateUserIdEnd;
 
-    /** 增加 投诉绩效指标扣减分数 */
-    private BigDecimal complainScoreSubIncrement;
+    /** 增加 更新人id */
+    private Long updateUserIdIncrement;
 
-    /** 投诉绩效指标扣减分数列表 */
-    private List <BigDecimal> complainScoreSubList;
+    /** 更新人id列表 */
+    private List <Long> updateUserIdList;
 
-    /** 投诉绩效指标扣减分数排除列表 */
-    private List <BigDecimal> complainScoreSubNotList;
+    /** 更新人id排除列表 */
+    private List <Long> updateUserIdNotList;
 
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<StaffPerformStatQuery> orConditionList;
@@ -453,115 +453,115 @@ public class StaffPerformStatQuery extends StaffPerformStatEntity {
 
     /**
      * 获取 开始 部门id号
-    * @return deptIdStart
+     * @return staffIdStart
      */
-    public Long getDeptIdStart(){
-        return this.deptIdStart;
+    public Long getStaffIdStart(){
+        return this.staffIdStart;
     }
 
     /**
      * 设置 开始 部门id号
-    * @param deptIdStart
+     * @param staffIdStart
      */
-    public void setDeptIdStart(Long deptIdStart){
-        this.deptIdStart = deptIdStart;
+    public void setStaffIdStart(Long staffIdStart){
+        this.staffIdStart = staffIdStart;
     }
 
     /**
      * 获取 结束 部门id号
-    * @return $deptIdEnd
+     * @return $staffIdEnd
      */
-    public Long getDeptIdEnd(){
-        return this.deptIdEnd;
+    public Long getStaffIdEnd(){
+        return this.staffIdEnd;
     }
 
     /**
      * 设置 结束 部门id号
-    * @param deptIdEnd
+     * @param staffIdEnd
      */
-    public void setDeptIdEnd(Long deptIdEnd){
-        this.deptIdEnd = deptIdEnd;
+    public void setStaffIdEnd(Long staffIdEnd){
+        this.staffIdEnd = staffIdEnd;
     }
 
     /**
      * 获取 增加 部门id号
-    * @return deptIdIncrement
+     * @return staffIdIncrement
      */
-    public Long getDeptIdIncrement(){
-        return this.deptIdIncrement;
+    public Long getStaffIdIncrement(){
+        return this.staffIdIncrement;
     }
 
     /**
      * 设置 增加 部门id号
-    * @param deptIdIncrement
+     * @param staffIdIncrement
      */
-    public void setDeptIdIncrement(Long deptIdIncrement){
-        this.deptIdIncrement = deptIdIncrement;
+    public void setStaffIdIncrement(Long staffIdIncrement){
+        this.staffIdIncrement = staffIdIncrement;
     }
 
     /**
      * 获取 部门id号
-    * @return deptIdList
+     * @return staffIdList
      */
-    public List<Long> getDeptIdList(){
-        return this.deptIdList;
+    public List<Long> getStaffIdList(){
+        return this.staffIdList;
     }
 
     /**
      * 设置 部门id号
-    * @param deptIdList
+     * @param staffIdList
      */
-    public void setDeptIdList(List<Long> deptIdList){
-        this.deptIdList = deptIdList;
+    public void setStaffIdList(List<Long> staffIdList){
+        this.staffIdList = staffIdList;
     }
 
     /**
      * 获取 部门id号
-    * @return deptIdNotList
+     * @return staffIdNotList
      */
-    public List<Long> getDeptIdNotList(){
-        return this.deptIdNotList;
+    public List<Long> getStaffIdNotList(){
+        return this.staffIdNotList;
     }
 
     /**
      * 设置 部门id号
-    * @param deptIdNotList
+     * @param staffIdNotList
      */
-    public void setDeptIdNotList(List<Long> deptIdNotList){
-        this.deptIdNotList = deptIdNotList;
+    public void setStaffIdNotList(List<Long> staffIdNotList){
+        this.staffIdNotList = staffIdNotList;
     }
 
 
     /**
      * 获取 部门名称
-    * @return deptNameList
+     * @return staffNameList
      */
-    public List<String> getDeptNameList(){
-        return this.deptNameList;
+    public List<String> getStaffNameList(){
+        return this.staffNameList;
     }
 
     /**
      * 设置 部门名称
-    * @param deptNameList
+     * @param staffNameList
      */
-    public void setDeptNameList(List<String> deptNameList){
-        this.deptNameList = deptNameList;
+    public void setStaffNameList(List<String> staffNameList){
+        this.staffNameList = staffNameList;
     }
 
     /**
      * 获取 部门名称
-    * @return deptNameNotList
+     * @return staffNameNotList
      */
-    public List<String> getDeptNameNotList(){
-        return this.deptNameNotList;
+    public List<String> getStaffNameNotList(){
+        return this.staffNameNotList;
     }
 
     /**
      * 设置 部门名称
-    * @param deptNameNotList
+     * @param staffNameNotList
      */
-    public void setDeptNameNotList(List<String> deptNameNotList){
-        this.deptNameNotList = deptNameNotList;
+    public void setStaffNameNotList(List<String> staffNameNotList){
+        this.staffNameNotList = staffNameNotList;
     }
 
     /**
@@ -646,422 +646,164 @@ public class StaffPerformStatQuery extends StaffPerformStatEntity {
 
 
     /**
-    * 获取 备注
-    * @return remarkList
+     * 获取 开始 员工绩效加分总分数汇总
+     * @return totalAddScoreStart
      */
-    public List<String> getRemarkList(){
-        return this.remarkList;
+    public BigDecimal getTotalAddScoreStart(){
+        return this.totalAddScoreStart;
     }
 
     /**
-    * 设置 备注
-    * @param remarkList
+     * 设置 开始 员工绩效加分总分数汇总
+     * @param totalAddScoreStart
      */
-    public void setRemarkList(List<String> remarkList){
-        this.remarkList = remarkList;
+    public void setTotalAddScoreStart(BigDecimal totalAddScoreStart){
+        this.totalAddScoreStart = totalAddScoreStart;
     }
 
     /**
-    * 获取 备注
-    * @return remarkNotList
+     * 获取 结束 员工绩效加分总分数汇总
+     * @return $totalAddScoreEnd
      */
-    public List<String> getRemarkNotList(){
-        return this.remarkNotList;
+    public BigDecimal getTotalAddScoreEnd(){
+        return this.totalAddScoreEnd;
     }
 
     /**
-    * 设置 备注
-    * @param remarkNotList
+     * 设置 结束 员工绩效加分总分数汇总
+     * @param totalAddScoreEnd
      */
-    public void setRemarkNotList(List<String> remarkNotList){
-        this.remarkNotList = remarkNotList;
-    }
-
-    /**
-    * 获取 开始 年
-    * @return yearStart
-    */
-    public Integer getYearStart(){
-        return this.yearStart;
-    }
-
-    /**
-    * 设置 开始 年
-    * @param yearStart
-    */
-    public void setYearStart(Integer yearStart){
-        this.yearStart = yearStart;
-    }
-
-    /**
-    * 获取 结束 年
-    * @return $yearEnd
-    */
-    public Integer getYearEnd(){
-        return this.yearEnd;
-    }
-
-    /**
-    * 设置 结束 年
-    * @param yearEnd
-    */
-    public void setYearEnd(Integer yearEnd){
-        this.yearEnd = yearEnd;
-    }
-
-    /**
-    * 获取 增加 年
-    * @return yearIncrement
-    */
-    public Integer getYearIncrement(){
-        return this.yearIncrement;
-    }
-
-    /**
-    * 设置 增加 年
-    * @param yearIncrement
-    */
-    public void setYearIncrement(Integer yearIncrement){
-        this.yearIncrement = yearIncrement;
-    }
-
-    /**
-    * 获取 年
-    * @return yearList
-    */
-    public List<Integer> getYearList(){
-        return this.yearList;
-    }
-
-    /**
-    * 设置 年
-    * @param yearList
-    */
-    public void setYearList(List<Integer> yearList){
-        this.yearList = yearList;
-    }
-
-    /**
-    * 获取 年
-    * @return yearNotList
-    */
-    public List<Integer> getYearNotList(){
-        return this.yearNotList;
-    }
-
-    /**
-    * 设置 年
-    * @param yearNotList
-    */
-    public void setYearNotList(List<Integer> yearNotList){
-        this.yearNotList = yearNotList;
-    }
-
-
-    /**
-    * 获取 开始 月
-    * @return monthStart
-    */
-    public Integer getMonthStart(){
-        return this.monthStart;
-    }
-
-    /**
-    * 设置 开始 月
-    * @param monthStart
-    */
-    public void setMonthStart(Integer monthStart){
-        this.monthStart = monthStart;
-    }
-
-    /**
-    * 获取 结束 月
-    * @return $monthEnd
-    */
-    public Integer getMonthEnd(){
-        return this.monthEnd;
-    }
-
-    /**
-    * 设置 结束 月
-    * @param monthEnd
-    */
-    public void setMonthEnd(Integer monthEnd){
-        this.monthEnd = monthEnd;
-    }
-
-    /**
-    * 获取 增加 月
-    * @return monthIncrement
-    */
-    public Integer getMonthIncrement(){
-        return this.monthIncrement;
-    }
-
-    /**
-    * 设置 增加 月
-    * @param monthIncrement
-    */
-    public void setMonthIncrement(Integer monthIncrement){
-        this.monthIncrement = monthIncrement;
-    }
-
-    /**
-    * 获取 月
-    * @return monthList
-    */
-    public List<Integer> getMonthList(){
-        return this.monthList;
-    }
-
-    /**
-    * 设置 月
-    * @param monthList
-    */
-    public void setMonthList(List<Integer> monthList){
-        this.monthList = monthList;
-    }
-
-    /**
-    * 获取 月
-    * @return monthNotList
-    */
-    public List<Integer> getMonthNotList(){
-        return this.monthNotList;
-    }
-
-    /**
-    * 设置 月
-    * @param monthNotList
-    */
-    public void setMonthNotList(List<Integer> monthNotList){
-        this.monthNotList = monthNotList;
-    }
-
-
-    /**
-    * 获取 开始 创建时间
-    * @return createTimeStart
-    */
-    public String getCreateTimeStart(){
-        return this.createTimeStart;
-    }
-
-    /**
-    * 设置 开始 创建时间
-    * @param createTimeStart
-    */
-    public void setCreateTimeStart(String createTimeStart){
-        this.createTimeStart = createTimeStart;
-    }
-
-    /**
-    * 获取 结束 创建时间
-    * @return createTimeEnd
-    */
-    public String getCreateTimeEnd(){
-        return this.createTimeEnd;
-    }
-
-    /**
-    * 设置 结束 创建时间
-    * @param createTimeEnd
-    */
-    public void setCreateTimeEnd(String createTimeEnd){
-        this.createTimeEnd = createTimeEnd;
-    }
-
-    /**
-    * 获取 开始 创建人id
-    * @return createUserIdStart
-    */
-    public Long getCreateUserIdStart(){
-        return this.createUserIdStart;
-    }
-
-    /**
-    * 设置 开始 创建人id
-    * @param createUserIdStart
-    */
-    public void setCreateUserIdStart(Long createUserIdStart){
-        this.createUserIdStart = createUserIdStart;
-    }
-
-    /**
-    * 获取 结束 创建人id
-    * @return $createUserIdEnd
-    */
-    public Long getCreateUserIdEnd(){
-        return this.createUserIdEnd;
-    }
-
-    /**
-    * 设置 结束 创建人id
-    * @param createUserIdEnd
-    */
-    public void setCreateUserIdEnd(Long createUserIdEnd){
-        this.createUserIdEnd = createUserIdEnd;
-    }
-
-    /**
-    * 获取 增加 创建人id
-    * @return createUserIdIncrement
-    */
-    public Long getCreateUserIdIncrement(){
-        return this.createUserIdIncrement;
-    }
-
-    /**
-    * 设置 增加 创建人id
-    * @param createUserIdIncrement
-    */
-    public void setCreateUserIdIncrement(Long createUserIdIncrement){
-        this.createUserIdIncrement = createUserIdIncrement;
-    }
-
-    /**
-    * 获取 创建人id
-    * @return createUserIdList
-    */
-    public List<Long> getCreateUserIdList(){
-        return this.createUserIdList;
-    }
-
-    /**
-    * 设置 创建人id
-    * @param createUserIdList
-    */
-    public void setCreateUserIdList(List<Long> createUserIdList){
-        this.createUserIdList = createUserIdList;
+    public void setTotalAddScoreEnd(BigDecimal totalAddScoreEnd){
+        this.totalAddScoreEnd = totalAddScoreEnd;
     }
 
     /**
-    * 获取 创建人id
-    * @return createUserIdNotList
+     * 获取 增加 员工绩效加分总分数汇总
+     * @return totalAddScoreIncrement
      */
-    public List<Long> getCreateUserIdNotList(){
-        return this.createUserIdNotList;
+    public BigDecimal getTotalAddScoreIncrement(){
+        return this.totalAddScoreIncrement;
     }
 
     /**
-    * 设置 创建人id
-    * @param createUserIdNotList
+     * 设置 增加 员工绩效加分总分数汇总
+     * @param totalAddScoreIncrement
      */
-    public void setCreateUserIdNotList(List<Long> createUserIdNotList){
-        this.createUserIdNotList = createUserIdNotList;
+    public void setTotalAddScoreIncrement(BigDecimal totalAddScoreIncrement){
+        this.totalAddScoreIncrement = totalAddScoreIncrement;
     }
 
-
     /**
-    * 获取 开始 更新时间
-    * @return updateTimeStart
+     * 获取 员工绩效加分总分数汇总
+     * @return totalAddScoreList
      */
-    public String getUpdateTimeStart(){
-        return this.updateTimeStart;
+    public List<BigDecimal> getTotalAddScoreList(){
+        return this.totalAddScoreList;
     }
 
     /**
-    * 设置 开始 更新时间
-    * @param updateTimeStart
+     * 设置 员工绩效加分总分数汇总
+     * @param totalAddScoreList
      */
-    public void setUpdateTimeStart(String updateTimeStart){
-        this.updateTimeStart = updateTimeStart;
+    public void setTotalAddScoreList(List<BigDecimal> totalAddScoreList){
+        this.totalAddScoreList = totalAddScoreList;
     }
 
     /**
-    * 获取 结束 更新时间
-    * @return updateTimeEnd
+     * 获取 员工绩效加分总分数汇总
+     * @return totalAddScoreNotList
      */
-    public String getUpdateTimeEnd(){
-        return this.updateTimeEnd;
+    public List<BigDecimal> getTotalAddScoreNotList(){
+        return this.totalAddScoreNotList;
     }
 
     /**
-    * 设置 结束 更新时间
-    * @param updateTimeEnd
+     * 设置 员工绩效加分总分数汇总
+     * @param totalAddScoreNotList
      */
-    public void setUpdateTimeEnd(String updateTimeEnd){
-        this.updateTimeEnd = updateTimeEnd;
+    public void setTotalAddScoreNotList(List<BigDecimal> totalAddScoreNotList){
+        this.totalAddScoreNotList = totalAddScoreNotList;
     }
 
+
     /**
-    * 获取 开始 更新人id
-    * @return updateUserIdStart
+     * 获取 开始 员工绩效减分总分数汇总
+     * @return totalSubScoreStart
      */
-    public Long getUpdateUserIdStart(){
-        return this.updateUserIdStart;
+    public BigDecimal getTotalSubScoreStart(){
+        return this.totalSubScoreStart;
     }
 
     /**
-    * 设置 开始 更新人id
-    * @param updateUserIdStart
+     * 设置 开始 员工绩效减分总分数汇总
+     * @param totalSubScoreStart
      */
-    public void setUpdateUserIdStart(Long updateUserIdStart){
-        this.updateUserIdStart = updateUserIdStart;
+    public void setTotalSubScoreStart(BigDecimal totalSubScoreStart){
+        this.totalSubScoreStart = totalSubScoreStart;
     }
 
     /**
-    * 获取 结束 更新人id
-    * @return $updateUserIdEnd
+     * 获取 结束 员工绩效减分总分数汇总
+     * @return $totalSubScoreEnd
      */
-    public Long getUpdateUserIdEnd(){
-        return this.updateUserIdEnd;
+    public BigDecimal getTotalSubScoreEnd(){
+        return this.totalSubScoreEnd;
     }
 
     /**
-    * 设置 结束 更新人id
-    * @param updateUserIdEnd
+     * 设置 结束 员工绩效减分总分数汇总
+     * @param totalSubScoreEnd
      */
-    public void setUpdateUserIdEnd(Long updateUserIdEnd){
-        this.updateUserIdEnd = updateUserIdEnd;
+    public void setTotalSubScoreEnd(BigDecimal totalSubScoreEnd){
+        this.totalSubScoreEnd = totalSubScoreEnd;
     }
 
     /**
-    * 获取 增加 更新人id
-    * @return updateUserIdIncrement
+     * 获取 增加 员工绩效减分总分数汇总
+     * @return totalSubScoreIncrement
      */
-    public Long getUpdateUserIdIncrement(){
-        return this.updateUserIdIncrement;
+    public BigDecimal getTotalSubScoreIncrement(){
+        return this.totalSubScoreIncrement;
     }
 
     /**
-    * 设置 增加 更新人id
-    * @param updateUserIdIncrement
+     * 设置 增加 员工绩效减分总分数汇总
+     * @param totalSubScoreIncrement
      */
-    public void setUpdateUserIdIncrement(Long updateUserIdIncrement){
-        this.updateUserIdIncrement = updateUserIdIncrement;
+    public void setTotalSubScoreIncrement(BigDecimal totalSubScoreIncrement){
+        this.totalSubScoreIncrement = totalSubScoreIncrement;
     }
 
     /**
-    * 获取 更新人id
-    * @return updateUserIdList
+     * 获取 员工绩效减分总分数汇总
+     * @return totalSubScoreList
      */
-    public List<Long> getUpdateUserIdList(){
-        return this.updateUserIdList;
+    public List<BigDecimal> getTotalSubScoreList(){
+        return this.totalSubScoreList;
     }
 
     /**
-    * 设置 更新人id
-    * @param updateUserIdList
+     * 设置 员工绩效减分总分数汇总
+     * @param totalSubScoreList
      */
-    public void setUpdateUserIdList(List<Long> updateUserIdList){
-        this.updateUserIdList = updateUserIdList;
+    public void setTotalSubScoreList(List<BigDecimal> totalSubScoreList){
+        this.totalSubScoreList = totalSubScoreList;
     }
 
     /**
-    * 获取 更新人id
-    * @return updateUserIdNotList
+     * 获取 员工绩效减分总分数汇总
+     * @return totalSubScoreNotList
      */
-    public List<Long> getUpdateUserIdNotList(){
-        return this.updateUserIdNotList;
+    public List<BigDecimal> getTotalSubScoreNotList(){
+        return this.totalSubScoreNotList;
     }
 
     /**
-    * 设置 更新人id
-    * @param updateUserIdNotList
+     * 设置 员工绩效减分总分数汇总
+     * @param totalSubScoreNotList
      */
-    public void setUpdateUserIdNotList(List<Long> updateUserIdNotList){
-        this.updateUserIdNotList = updateUserIdNotList;
+    public void setTotalSubScoreNotList(List<BigDecimal> totalSubScoreNotList){
+        this.totalSubScoreNotList = totalSubScoreNotList;
     }
 
 
@@ -1325,67 +1067,229 @@ public class StaffPerformStatQuery extends StaffPerformStatEntity {
     }
 
     /**
-    * 获取 结束 评价绩效指标扣减分数
-    * @return $assessScoreSubEnd
+     * 获取 结束 评价绩效指标扣减分数
+     * @return $assessScoreSubEnd
+     */
+    public BigDecimal getAssessScoreSubEnd(){
+        return this.assessScoreSubEnd;
+    }
+
+    /**
+     * 设置 结束 评价绩效指标扣减分数
+     * @param assessScoreSubEnd
+     */
+    public void setAssessScoreSubEnd(BigDecimal assessScoreSubEnd){
+        this.assessScoreSubEnd = assessScoreSubEnd;
+    }
+
+    /**
+     * 获取 增加 评价绩效指标扣减分数
+     * @return assessScoreSubIncrement
+     */
+    public BigDecimal getAssessScoreSubIncrement(){
+        return this.assessScoreSubIncrement;
+    }
+
+    /**
+     * 设置 增加 评价绩效指标扣减分数
+     * @param assessScoreSubIncrement
+     */
+    public void setAssessScoreSubIncrement(BigDecimal assessScoreSubIncrement){
+        this.assessScoreSubIncrement = assessScoreSubIncrement;
+    }
+
+    /**
+     * 获取 评价绩效指标扣减分数
+     * @return assessScoreSubList
+     */
+    public List<BigDecimal> getAssessScoreSubList(){
+        return this.assessScoreSubList;
+    }
+
+    /**
+     * 设置 评价绩效指标扣减分数
+     * @param assessScoreSubList
+     */
+    public void setAssessScoreSubList(List<BigDecimal> assessScoreSubList){
+        this.assessScoreSubList = assessScoreSubList;
+    }
+
+    /**
+     * 获取 评价绩效指标扣减分数
+     * @return assessScoreSubNotList
+     */
+    public List<BigDecimal> getAssessScoreSubNotList(){
+        return this.assessScoreSubNotList;
+    }
+
+    /**
+     * 设置 评价绩效指标扣减分数
+     * @param assessScoreSubNotList
+     */
+    public void setAssessScoreSubNotList(List<BigDecimal> assessScoreSubNotList){
+        this.assessScoreSubNotList = assessScoreSubNotList;
+    }
+
+
+    /**
+     * 获取 开始 投诉绩效指标增加分数
+     * @return complainScoreAddStart
+     */
+    public BigDecimal getComplainScoreAddStart(){
+        return this.complainScoreAddStart;
+    }
+
+    /**
+     * 设置 开始 投诉绩效指标增加分数
+     * @param complainScoreAddStart
+     */
+    public void setComplainScoreAddStart(BigDecimal complainScoreAddStart){
+        this.complainScoreAddStart = complainScoreAddStart;
+    }
+
+    /**
+     * 获取 结束 投诉绩效指标增加分数
+     * @return $complainScoreAddEnd
+     */
+    public BigDecimal getComplainScoreAddEnd(){
+        return this.complainScoreAddEnd;
+    }
+
+    /**
+     * 设置 结束 投诉绩效指标增加分数
+     * @param complainScoreAddEnd
+     */
+    public void setComplainScoreAddEnd(BigDecimal complainScoreAddEnd){
+        this.complainScoreAddEnd = complainScoreAddEnd;
+    }
+
+    /**
+     * 获取 增加 投诉绩效指标增加分数
+     * @return complainScoreAddIncrement
+     */
+    public BigDecimal getComplainScoreAddIncrement(){
+        return this.complainScoreAddIncrement;
+    }
+
+    /**
+     * 设置 增加 投诉绩效指标增加分数
+     * @param complainScoreAddIncrement
+     */
+    public void setComplainScoreAddIncrement(BigDecimal complainScoreAddIncrement){
+        this.complainScoreAddIncrement = complainScoreAddIncrement;
+    }
+
+    /**
+     * 获取 投诉绩效指标增加分数
+     * @return complainScoreAddList
+     */
+    public List<BigDecimal> getComplainScoreAddList(){
+        return this.complainScoreAddList;
+    }
+
+    /**
+     * 设置 投诉绩效指标增加分数
+     * @param complainScoreAddList
+     */
+    public void setComplainScoreAddList(List<BigDecimal> complainScoreAddList){
+        this.complainScoreAddList = complainScoreAddList;
+    }
+
+    /**
+     * 获取 投诉绩效指标增加分数
+     * @return complainScoreAddNotList
+     */
+    public List<BigDecimal> getComplainScoreAddNotList(){
+        return this.complainScoreAddNotList;
+    }
+
+    /**
+     * 设置 投诉绩效指标增加分数
+     * @param complainScoreAddNotList
+     */
+    public void setComplainScoreAddNotList(List<BigDecimal> complainScoreAddNotList){
+        this.complainScoreAddNotList = complainScoreAddNotList;
+    }
+
+
+    /**
+     * 获取 开始 投诉绩效指标扣减分数
+     * @return complainScoreSubStart
+     */
+    public BigDecimal getComplainScoreSubStart(){
+        return this.complainScoreSubStart;
+    }
+
+    /**
+     * 设置 开始 投诉绩效指标扣减分数
+     * @param complainScoreSubStart
+     */
+    public void setComplainScoreSubStart(BigDecimal complainScoreSubStart){
+        this.complainScoreSubStart = complainScoreSubStart;
+    }
+
+    /**
+     * 获取 结束 投诉绩效指标扣减分数
+     * @return $complainScoreSubEnd
      */
-    public BigDecimal getAssessScoreSubEnd(){
-        return this.assessScoreSubEnd;
+    public BigDecimal getComplainScoreSubEnd(){
+        return this.complainScoreSubEnd;
     }
 
     /**
-    * 设置 结束 评价绩效指标扣减分数
-    * @param assessScoreSubEnd
+     * 设置 结束 投诉绩效指标扣减分数
+     * @param complainScoreSubEnd
      */
-    public void setAssessScoreSubEnd(BigDecimal assessScoreSubEnd){
-        this.assessScoreSubEnd = assessScoreSubEnd;
+    public void setComplainScoreSubEnd(BigDecimal complainScoreSubEnd){
+        this.complainScoreSubEnd = complainScoreSubEnd;
     }
 
     /**
-    * 获取 增加 评价绩效指标扣减分数
-    * @return assessScoreSubIncrement
+     * 获取 增加 投诉绩效指标扣减分数
+     * @return complainScoreSubIncrement
      */
-    public BigDecimal getAssessScoreSubIncrement(){
-        return this.assessScoreSubIncrement;
+    public BigDecimal getComplainScoreSubIncrement(){
+        return this.complainScoreSubIncrement;
     }
 
     /**
-    * 设置 增加 评价绩效指标扣减分数
-    * @param assessScoreSubIncrement
+     * 设置 增加 投诉绩效指标扣减分数
+     * @param complainScoreSubIncrement
      */
-    public void setAssessScoreSubIncrement(BigDecimal assessScoreSubIncrement){
-        this.assessScoreSubIncrement = assessScoreSubIncrement;
+    public void setComplainScoreSubIncrement(BigDecimal complainScoreSubIncrement){
+        this.complainScoreSubIncrement = complainScoreSubIncrement;
     }
 
     /**
-    * 获取 评价绩效指标扣减分数
-    * @return assessScoreSubList
+     * 获取 投诉绩效指标扣减分数
+     * @return complainScoreSubList
      */
-    public List<BigDecimal> getAssessScoreSubList(){
-        return this.assessScoreSubList;
+    public List<BigDecimal> getComplainScoreSubList(){
+        return this.complainScoreSubList;
     }
 
     /**
-    * 设置 评价绩效指标扣减分数
-    * @param assessScoreSubList
+     * 设置 投诉绩效指标扣减分数
+     * @param complainScoreSubList
      */
-    public void setAssessScoreSubList(List<BigDecimal> assessScoreSubList){
-        this.assessScoreSubList = assessScoreSubList;
+    public void setComplainScoreSubList(List<BigDecimal> complainScoreSubList){
+        this.complainScoreSubList = complainScoreSubList;
     }
 
     /**
-    * 获取 评价绩效指标扣减分数
-    * @return assessScoreSubNotList
+     * 获取 投诉绩效指标扣减分数
+     * @return complainScoreSubNotList
      */
-    public List<BigDecimal> getAssessScoreSubNotList(){
-        return this.assessScoreSubNotList;
+    public List<BigDecimal> getComplainScoreSubNotList(){
+        return this.complainScoreSubNotList;
     }
 
     /**
-    * 设置 评价绩效指标扣减分数
-    * @param assessScoreSubNotList
+     * 设置 投诉绩效指标扣减分数
+     * @param complainScoreSubNotList
      */
-    public void setAssessScoreSubNotList(List<BigDecimal> assessScoreSubNotList){
-        this.assessScoreSubNotList = assessScoreSubNotList;
+    public void setComplainScoreSubNotList(List<BigDecimal> complainScoreSubNotList){
+        this.complainScoreSubNotList = complainScoreSubNotList;
     }
 
 
@@ -1822,56 +1726,250 @@ public class StaffPerformStatQuery extends StaffPerformStatEntity {
      * 设置 结束 其它绩效指标扣减分数
      * @param otherScoreSubEnd
      */
-    public void setOtherScoreSubEnd(BigDecimal otherScoreSubEnd){
-        this.otherScoreSubEnd = otherScoreSubEnd;
+    public void setOtherScoreSubEnd(BigDecimal otherScoreSubEnd){
+        this.otherScoreSubEnd = otherScoreSubEnd;
+    }
+
+    /**
+     * 获取 增加 其它绩效指标扣减分数
+     * @return otherScoreSubIncrement
+     */
+    public BigDecimal getOtherScoreSubIncrement(){
+        return this.otherScoreSubIncrement;
+    }
+
+    /**
+     * 设置 增加 其它绩效指标扣减分数
+     * @param otherScoreSubIncrement
+     */
+    public void setOtherScoreSubIncrement(BigDecimal otherScoreSubIncrement){
+        this.otherScoreSubIncrement = otherScoreSubIncrement;
+    }
+
+    /**
+     * 获取 其它绩效指标扣减分数
+     * @return otherScoreSubList
+     */
+    public List<BigDecimal> getOtherScoreSubList(){
+        return this.otherScoreSubList;
+    }
+
+    /**
+     * 设置 其它绩效指标扣减分数
+     * @param otherScoreSubList
+     */
+    public void setOtherScoreSubList(List<BigDecimal> otherScoreSubList){
+        this.otherScoreSubList = otherScoreSubList;
+    }
+
+    /**
+     * 获取 其它绩效指标扣减分数
+     * @return otherScoreSubNotList
+     */
+    public List<BigDecimal> getOtherScoreSubNotList(){
+        return this.otherScoreSubNotList;
+    }
+
+    /**
+     * 设置 其它绩效指标扣减分数
+     * @param otherScoreSubNotList
+     */
+    public void setOtherScoreSubNotList(List<BigDecimal> otherScoreSubNotList){
+        this.otherScoreSubNotList = otherScoreSubNotList;
+    }
+
+
+    /**
+     * 获取 备注
+     * @return remarkList
+     */
+    public List<String> getRemarkList(){
+        return this.remarkList;
+    }
+
+    /**
+     * 设置 备注
+     * @param remarkList
+     */
+    public void setRemarkList(List<String> remarkList){
+        this.remarkList = remarkList;
+    }
+
+    /**
+     * 获取 备注
+     * @return remarkNotList
+     */
+    public List<String> getRemarkNotList(){
+        return this.remarkNotList;
+    }
+
+    /**
+     * 设置 备注
+     * @param remarkNotList
+     */
+    public void setRemarkNotList(List<String> remarkNotList){
+        this.remarkNotList = remarkNotList;
+    }
+
+    /**
+     * 获取 开始 年
+     * @return yearStart
+     */
+    public Integer getYearStart(){
+        return this.yearStart;
+    }
+
+    /**
+     * 设置 开始 年
+     * @param yearStart
+     */
+    public void setYearStart(Integer yearStart){
+        this.yearStart = yearStart;
+    }
+
+    /**
+     * 获取 结束 年
+     * @return $yearEnd
+     */
+    public Integer getYearEnd(){
+        return this.yearEnd;
+    }
+
+    /**
+     * 设置 结束 年
+     * @param yearEnd
+     */
+    public void setYearEnd(Integer yearEnd){
+        this.yearEnd = yearEnd;
+    }
+
+    /**
+     * 获取 增加 年
+     * @return yearIncrement
+     */
+    public Integer getYearIncrement(){
+        return this.yearIncrement;
+    }
+
+    /**
+     * 设置 增加 年
+     * @param yearIncrement
+     */
+    public void setYearIncrement(Integer yearIncrement){
+        this.yearIncrement = yearIncrement;
+    }
+
+    /**
+     * 获取 年
+     * @return yearList
+     */
+    public List<Integer> getYearList(){
+        return this.yearList;
+    }
+
+    /**
+     * 设置 年
+     * @param yearList
+     */
+    public void setYearList(List<Integer> yearList){
+        this.yearList = yearList;
+    }
+
+    /**
+     * 获取 年
+     * @return yearNotList
+     */
+    public List<Integer> getYearNotList(){
+        return this.yearNotList;
+    }
+
+    /**
+     * 设置 年
+     * @param yearNotList
+     */
+    public void setYearNotList(List<Integer> yearNotList){
+        this.yearNotList = yearNotList;
+    }
+
+
+    /**
+     * 获取 开始 月
+     * @return monthStart
+     */
+    public Integer getMonthStart(){
+        return this.monthStart;
+    }
+
+    /**
+     * 设置 开始 月
+     * @param monthStart
+     */
+    public void setMonthStart(Integer monthStart){
+        this.monthStart = monthStart;
+    }
+
+    /**
+     * 获取 结束 月
+     * @return $monthEnd
+     */
+    public Integer getMonthEnd(){
+        return this.monthEnd;
+    }
+
+    /**
+     * 设置 结束 月
+     * @param monthEnd
+     */
+    public void setMonthEnd(Integer monthEnd){
+        this.monthEnd = monthEnd;
     }
 
     /**
-    * 获取 增加 其它绩效指标扣减分数
-    * @return otherScoreSubIncrement
+     * 获取 增加 月
+     * @return monthIncrement
      */
-    public BigDecimal getOtherScoreSubIncrement(){
-        return this.otherScoreSubIncrement;
+    public Integer getMonthIncrement(){
+        return this.monthIncrement;
     }
 
     /**
-    * 设置 增加 其它绩效指标扣减分数
-    * @param otherScoreSubIncrement
+     * 设置 增加 月
+     * @param monthIncrement
      */
-    public void setOtherScoreSubIncrement(BigDecimal otherScoreSubIncrement){
-        this.otherScoreSubIncrement = otherScoreSubIncrement;
+    public void setMonthIncrement(Integer monthIncrement){
+        this.monthIncrement = monthIncrement;
     }
 
     /**
-    * 获取 其它绩效指标扣减分数
-    * @return otherScoreSubList
+     * 获取 月
+     * @return monthList
      */
-    public List<BigDecimal> getOtherScoreSubList(){
-        return this.otherScoreSubList;
+    public List<Integer> getMonthList(){
+        return this.monthList;
     }
 
     /**
-    * 设置 其它绩效指标扣减分数
-    * @param otherScoreSubList
+     * 设置 月
+     * @param monthList
      */
-    public void setOtherScoreSubList(List<BigDecimal> otherScoreSubList){
-        this.otherScoreSubList = otherScoreSubList;
+    public void setMonthList(List<Integer> monthList){
+        this.monthList = monthList;
     }
 
     /**
-    * 获取 其它绩效指标扣减分数
-    * @return otherScoreSubNotList
+     * 获取 月
+     * @return monthNotList
      */
-    public List<BigDecimal> getOtherScoreSubNotList(){
-        return this.otherScoreSubNotList;
+    public List<Integer> getMonthNotList(){
+        return this.monthNotList;
     }
 
     /**
-    * 设置 其它绩效指标扣减分数
-    * @param otherScoreSubNotList
+     * 设置 月
+     * @param monthNotList
      */
-    public void setOtherScoreSubNotList(List<BigDecimal> otherScoreSubNotList){
-        this.otherScoreSubNotList = otherScoreSubNotList;
+    public void setMonthNotList(List<Integer> monthNotList){
+        this.monthNotList = monthNotList;
     }
 
 
@@ -1957,326 +2055,228 @@ public class StaffPerformStatQuery extends StaffPerformStatEntity {
 
 
     /**
-    * 获取 开始 员工绩效加分总分数汇总
-    * @return totalAddScoreStart
-    */
-    public BigDecimal getTotalAddScoreStart(){
-        return this.totalAddScoreStart;
-    }
-
-    /**
-    * 设置 开始 员工绩效加分总分数汇总
-    * @param totalAddScoreStart
-    */
-    public void setTotalAddScoreStart(BigDecimal totalAddScoreStart){
-        this.totalAddScoreStart = totalAddScoreStart;
-    }
-
-    /**
-    * 获取 结束 员工绩效加分总分数汇总
-    * @return $totalAddScoreEnd
-    */
-    public BigDecimal getTotalAddScoreEnd(){
-        return this.totalAddScoreEnd;
-    }
-
-    /**
-    * 设置 结束 员工绩效加分总分数汇总
-    * @param totalAddScoreEnd
-    */
-    public void setTotalAddScoreEnd(BigDecimal totalAddScoreEnd){
-        this.totalAddScoreEnd = totalAddScoreEnd;
-    }
-
-    /**
-    * 获取 增加 员工绩效加分总分数汇总
-    * @return totalAddScoreIncrement
-    */
-    public BigDecimal getTotalAddScoreIncrement(){
-        return this.totalAddScoreIncrement;
-    }
-
-    /**
-    * 设置 增加 员工绩效加分总分数汇总
-    * @param totalAddScoreIncrement
-    */
-    public void setTotalAddScoreIncrement(BigDecimal totalAddScoreIncrement){
-        this.totalAddScoreIncrement = totalAddScoreIncrement;
-    }
-
-    /**
-    * 获取 员工绩效加分总分数汇总
-    * @return totalAddScoreList
-    */
-    public List<BigDecimal> getTotalAddScoreList(){
-        return this.totalAddScoreList;
-    }
-
-    /**
-    * 设置 员工绩效加分总分数汇总
-    * @param totalAddScoreList
-    */
-    public void setTotalAddScoreList(List<BigDecimal> totalAddScoreList){
-        this.totalAddScoreList = totalAddScoreList;
-    }
-
-    /**
-    * 获取 员工绩效加分总分数汇总
-    * @return totalAddScoreNotList
-    */
-    public List<BigDecimal> getTotalAddScoreNotList(){
-        return this.totalAddScoreNotList;
-    }
-
-    /**
-    * 设置 员工绩效加分总分数汇总
-    * @param totalAddScoreNotList
-    */
-    public void setTotalAddScoreNotList(List<BigDecimal> totalAddScoreNotList){
-        this.totalAddScoreNotList = totalAddScoreNotList;
-    }
-
-
-    /**
-    * 获取 开始 员工绩效减分总分数汇总
-    * @return totalSubScoreStart
-    */
-    public BigDecimal getTotalSubScoreStart(){
-        return this.totalSubScoreStart;
-    }
-
-    /**
-    * 设置 开始 员工绩效减分总分数汇总
-    * @param totalSubScoreStart
-    */
-    public void setTotalSubScoreStart(BigDecimal totalSubScoreStart){
-        this.totalSubScoreStart = totalSubScoreStart;
-    }
-
-    /**
-    * 获取 结束 员工绩效减分总分数汇总
-    * @return $totalSubScoreEnd
-    */
-    public BigDecimal getTotalSubScoreEnd(){
-        return this.totalSubScoreEnd;
-    }
-
-    /**
-    * 设置 结束 员工绩效减分总分数汇总
-    * @param totalSubScoreEnd
+     * 获取 开始 创建时间
+     * @return createTimeStart
      */
-    public void setTotalSubScoreEnd(BigDecimal totalSubScoreEnd){
-        this.totalSubScoreEnd = totalSubScoreEnd;
+    public String getCreateTimeStart(){
+        return this.createTimeStart;
     }
 
     /**
-    * 获取 增加 员工绩效减分总分数汇总
-    * @return totalSubScoreIncrement
+     * 设置 开始 创建时间
+     * @param createTimeStart
      */
-    public BigDecimal getTotalSubScoreIncrement(){
-        return this.totalSubScoreIncrement;
+    public void setCreateTimeStart(String createTimeStart){
+        this.createTimeStart = createTimeStart;
     }
 
     /**
-    * 设置 增加 员工绩效减分总分数汇总
-    * @param totalSubScoreIncrement
+     * 获取 结束 创建时间
+     * @return createTimeEnd
      */
-    public void setTotalSubScoreIncrement(BigDecimal totalSubScoreIncrement){
-        this.totalSubScoreIncrement = totalSubScoreIncrement;
+    public String getCreateTimeEnd(){
+        return this.createTimeEnd;
     }
 
     /**
-    * 获取 员工绩效减分总分数汇总
-    * @return totalSubScoreList
+     * 设置 结束 创建时间
+     * @param createTimeEnd
      */
-    public List<BigDecimal> getTotalSubScoreList(){
-        return this.totalSubScoreList;
+    public void setCreateTimeEnd(String createTimeEnd){
+        this.createTimeEnd = createTimeEnd;
     }
 
     /**
-    * 设置 员工绩效减分总分数汇总
-    * @param totalSubScoreList
+     * 获取 开始 创建人id
+     * @return createUserIdStart
      */
-    public void setTotalSubScoreList(List<BigDecimal> totalSubScoreList){
-        this.totalSubScoreList = totalSubScoreList;
+    public Long getCreateUserIdStart(){
+        return this.createUserIdStart;
     }
 
     /**
-    * 获取 员工绩效减分总分数汇总
-    * @return totalSubScoreNotList
+     * 设置 开始 创建人id
+     * @param createUserIdStart
      */
-    public List<BigDecimal> getTotalSubScoreNotList(){
-        return this.totalSubScoreNotList;
+    public void setCreateUserIdStart(Long createUserIdStart){
+        this.createUserIdStart = createUserIdStart;
     }
 
     /**
-    * 设置 员工绩效减分总分数汇总
-    * @param totalSubScoreNotList
+     * 获取 结束 创建人id
+     * @return $createUserIdEnd
      */
-    public void setTotalSubScoreNotList(List<BigDecimal> totalSubScoreNotList){
-        this.totalSubScoreNotList = totalSubScoreNotList;
+    public Long getCreateUserIdEnd(){
+        return this.createUserIdEnd;
     }
 
-
     /**
-    * 获取 开始 投诉绩效指标增加分数
-    * @return complainScoreAddStart
+     * 设置 结束 创建人id
+     * @param createUserIdEnd
      */
-    public BigDecimal getComplainScoreAddStart(){
-        return this.complainScoreAddStart;
+    public void setCreateUserIdEnd(Long createUserIdEnd){
+        this.createUserIdEnd = createUserIdEnd;
     }
 
     /**
-    * 设置 开始 投诉绩效指标增加分数
-    * @param complainScoreAddStart
+     * 获取 增加 创建人id
+     * @return createUserIdIncrement
      */
-    public void setComplainScoreAddStart(BigDecimal complainScoreAddStart){
-        this.complainScoreAddStart = complainScoreAddStart;
+    public Long getCreateUserIdIncrement(){
+        return this.createUserIdIncrement;
     }
 
     /**
-    * 获取 结束 投诉绩效指标增加分数
-    * @return $complainScoreAddEnd
+     * 设置 增加 创建人id
+     * @param createUserIdIncrement
      */
-    public BigDecimal getComplainScoreAddEnd(){
-        return this.complainScoreAddEnd;
+    public void setCreateUserIdIncrement(Long createUserIdIncrement){
+        this.createUserIdIncrement = createUserIdIncrement;
     }
 
     /**
-    * 设置 结束 投诉绩效指标增加分数
-    * @param complainScoreAddEnd
+     * 获取 创建人id
+     * @return createUserIdList
      */
-    public void setComplainScoreAddEnd(BigDecimal complainScoreAddEnd){
-        this.complainScoreAddEnd = complainScoreAddEnd;
+    public List<Long> getCreateUserIdList(){
+        return this.createUserIdList;
     }
 
     /**
-    * 获取 增加 投诉绩效指标增加分数
-    * @return complainScoreAddIncrement
+     * 设置 创建人id
+     * @param createUserIdList
      */
-    public BigDecimal getComplainScoreAddIncrement(){
-        return this.complainScoreAddIncrement;
+    public void setCreateUserIdList(List<Long> createUserIdList){
+        this.createUserIdList = createUserIdList;
     }
 
     /**
-    * 设置 增加 投诉绩效指标增加分数
-    * @param complainScoreAddIncrement
+     * 获取 创建人id
+     * @return createUserIdNotList
      */
-    public void setComplainScoreAddIncrement(BigDecimal complainScoreAddIncrement){
-        this.complainScoreAddIncrement = complainScoreAddIncrement;
+    public List<Long> getCreateUserIdNotList(){
+        return this.createUserIdNotList;
     }
 
     /**
-    * 获取 投诉绩效指标增加分数
-    * @return complainScoreAddList
+     * 设置 创建人id
+     * @param createUserIdNotList
      */
-    public List<BigDecimal> getComplainScoreAddList(){
-        return this.complainScoreAddList;
+    public void setCreateUserIdNotList(List<Long> createUserIdNotList){
+        this.createUserIdNotList = createUserIdNotList;
     }
 
+
     /**
-    * 设置 投诉绩效指标增加分数
-    * @param complainScoreAddList
+     * 获取 开始 更新时间
+     * @return updateTimeStart
      */
-    public void setComplainScoreAddList(List<BigDecimal> complainScoreAddList){
-        this.complainScoreAddList = complainScoreAddList;
+    public String getUpdateTimeStart(){
+        return this.updateTimeStart;
     }
 
     /**
-    * 获取 投诉绩效指标增加分数
-    * @return complainScoreAddNotList
+     * 设置 开始 更新时间
+     * @param updateTimeStart
      */
-    public List<BigDecimal> getComplainScoreAddNotList(){
-        return this.complainScoreAddNotList;
+    public void setUpdateTimeStart(String updateTimeStart){
+        this.updateTimeStart = updateTimeStart;
     }
 
     /**
-    * 设置 投诉绩效指标增加分数
-    * @param complainScoreAddNotList
+     * 获取 结束 更新时间
+     * @return updateTimeEnd
      */
-    public void setComplainScoreAddNotList(List<BigDecimal> complainScoreAddNotList){
-        this.complainScoreAddNotList = complainScoreAddNotList;
+    public String getUpdateTimeEnd(){
+        return this.updateTimeEnd;
     }
 
+    /**
+     * 设置 结束 更新时间
+     * @param updateTimeEnd
+     */
+    public void setUpdateTimeEnd(String updateTimeEnd){
+        this.updateTimeEnd = updateTimeEnd;
+    }
 
     /**
-    * 获取 开始 投诉绩效指标扣减分数
-    * @return complainScoreSubStart
+     * 获取 开始 更新人id
+     * @return updateUserIdStart
      */
-    public BigDecimal getComplainScoreSubStart(){
-        return this.complainScoreSubStart;
+    public Long getUpdateUserIdStart(){
+        return this.updateUserIdStart;
     }
 
     /**
-    * 设置 开始 投诉绩效指标扣减分数
-    * @param complainScoreSubStart
+     * 设置 开始 更新人id
+     * @param updateUserIdStart
      */
-    public void setComplainScoreSubStart(BigDecimal complainScoreSubStart){
-        this.complainScoreSubStart = complainScoreSubStart;
+    public void setUpdateUserIdStart(Long updateUserIdStart){
+        this.updateUserIdStart = updateUserIdStart;
     }
 
     /**
-    * 获取 结束 投诉绩效指标扣减分数
-    * @return $complainScoreSubEnd
+     * 获取 结束 更新人id
+     * @return $updateUserIdEnd
      */
-    public BigDecimal getComplainScoreSubEnd(){
-        return this.complainScoreSubEnd;
+    public Long getUpdateUserIdEnd(){
+        return this.updateUserIdEnd;
     }
 
     /**
-    * 设置 结束 投诉绩效指标扣减分数
-    * @param complainScoreSubEnd
+     * 设置 结束 更新人id
+     * @param updateUserIdEnd
      */
-    public void setComplainScoreSubEnd(BigDecimal complainScoreSubEnd){
-        this.complainScoreSubEnd = complainScoreSubEnd;
+    public void setUpdateUserIdEnd(Long updateUserIdEnd){
+        this.updateUserIdEnd = updateUserIdEnd;
     }
 
     /**
-    * 获取 增加 投诉绩效指标扣减分数
-    * @return complainScoreSubIncrement
+     * 获取 增加 更新人id
+     * @return updateUserIdIncrement
      */
-    public BigDecimal getComplainScoreSubIncrement(){
-        return this.complainScoreSubIncrement;
+    public Long getUpdateUserIdIncrement(){
+        return this.updateUserIdIncrement;
     }
 
     /**
-    * 设置 增加 投诉绩效指标扣减分数
-    * @param complainScoreSubIncrement
+     * 设置 增加 更新人id
+     * @param updateUserIdIncrement
      */
-    public void setComplainScoreSubIncrement(BigDecimal complainScoreSubIncrement){
-        this.complainScoreSubIncrement = complainScoreSubIncrement;
+    public void setUpdateUserIdIncrement(Long updateUserIdIncrement){
+        this.updateUserIdIncrement = updateUserIdIncrement;
     }
 
     /**
-    * 获取 投诉绩效指标扣减分数
-    * @return complainScoreSubList
+     * 获取 更新人id
+     * @return updateUserIdList
      */
-    public List<BigDecimal> getComplainScoreSubList(){
-        return this.complainScoreSubList;
+    public List<Long> getUpdateUserIdList(){
+        return this.updateUserIdList;
     }
 
     /**
-    * 设置 投诉绩效指标扣减分数
-    * @param complainScoreSubList
+     * 设置 更新人id
+     * @param updateUserIdList
      */
-    public void setComplainScoreSubList(List<BigDecimal> complainScoreSubList){
-        this.complainScoreSubList = complainScoreSubList;
+    public void setUpdateUserIdList(List<Long> updateUserIdList){
+        this.updateUserIdList = updateUserIdList;
     }
 
     /**
-    * 获取 投诉绩效指标扣减分数
-    * @return complainScoreSubNotList
+     * 获取 更新人id
+     * @return updateUserIdNotList
      */
-    public List<BigDecimal> getComplainScoreSubNotList(){
-        return this.complainScoreSubNotList;
+    public List<Long> getUpdateUserIdNotList(){
+        return this.updateUserIdNotList;
     }
 
     /**
-    * 设置 投诉绩效指标扣减分数
-    * @param complainScoreSubNotList
+     * 设置 更新人id
+     * @param updateUserIdNotList
      */
-    public void setComplainScoreSubNotList(List<BigDecimal> complainScoreSubNotList){
-        this.complainScoreSubNotList = complainScoreSubNotList;
+    public void setUpdateUserIdNotList(List<Long> updateUserIdNotList){
+        this.updateUserIdNotList = updateUserIdNotList;
     }
 
 
@@ -2336,74 +2336,74 @@ public class StaffPerformStatQuery extends StaffPerformStatEntity {
 
     /**
      * 设置  部门id号
-    * @param deptId
+     * @param staffId
      */
-    public StaffPerformStatQuery deptId(Long deptId){
-	    setDeptId(deptId);
+    public StaffPerformStatQuery staffId(Long staffId){
+        setStaffId(staffId);
         return this;
     }
 
     /**
      * 设置 开始 部门id号
-    * @param deptIdStart
+     * @param staffIdStart
      */
-    public StaffPerformStatQuery deptIdStart(Long deptIdStart){
-		this.deptIdStart = deptIdStart;
+    public StaffPerformStatQuery staffIdStart(Long staffIdStart){
+        this.staffIdStart = staffIdStart;
         return this;
     }
 
     /**
      * 设置 结束 部门id号
-    * @param deptIdEnd
+     * @param staffIdEnd
      */
-    public StaffPerformStatQuery deptIdEnd(Long deptIdEnd){
-		this.deptIdEnd = deptIdEnd;
+    public StaffPerformStatQuery staffIdEnd(Long staffIdEnd){
+        this.staffIdEnd = staffIdEnd;
         return this;
     }
 
     /**
      * 设置 增加 部门id号
-    * @param deptIdIncrement
+     * @param staffIdIncrement
      */
-    public StaffPerformStatQuery deptIdIncrement(Long deptIdIncrement){
-		this.deptIdIncrement = deptIdIncrement;
+    public StaffPerformStatQuery staffIdIncrement(Long staffIdIncrement){
+        this.staffIdIncrement = staffIdIncrement;
         return this;
     }
 
     /**
      * 设置 部门id号
-    * @param deptIdList
+     * @param staffIdList
      */
-    public StaffPerformStatQuery deptIdList(List<Long> deptIdList){
-        this.deptIdList = deptIdList;
+    public StaffPerformStatQuery staffIdList(List<Long> staffIdList){
+        this.staffIdList = staffIdList;
         return this;
     }
 
     /**
      * 设置 部门id号
-        * @param deptIdNotList
+     * @param staffIdNotList
      */
-        public StaffPerformStatQuery deptIdNotList(List<Long> deptIdNotList){
-        this.deptIdNotList = deptIdNotList;
+    public StaffPerformStatQuery staffIdNotList(List<Long> staffIdNotList){
+        this.staffIdNotList = staffIdNotList;
         return this;
     }
 
 
     /**
      * 设置 部门名称
-    * @param deptName
+     * @param staffName
      */
-    public StaffPerformStatQuery deptName(String deptName){
-        setDeptName(deptName);
+    public StaffPerformStatQuery staffName(String staffName){
+        setStaffName(staffName);
         return this;
     }
 
     /**
      * 设置 部门名称
-    * @param deptNameList
+     * @param staffNameList
      */
-    public StaffPerformStatQuery deptNameList(List<String> deptNameList){
-        this.deptNameList = deptNameList;
+    public StaffPerformStatQuery staffNameList(List<String> staffNameList){
+        this.staffNameList = staffNameList;
         return this;
     }
 
@@ -2421,280 +2421,151 @@ public class StaffPerformStatQuery extends StaffPerformStatEntity {
      * @param totalScoreStart
      */
     public StaffPerformStatQuery totalScoreStart(BigDecimal totalScoreStart){
-		this.totalScoreStart = totalScoreStart;
-		return this;
-    }
-
-    /**
-    * 设置 结束 员工绩效总分数
-    * @param totalScoreEnd
-    */
-    public StaffPerformStatQuery totalScoreEnd(BigDecimal totalScoreEnd){
-		this.totalScoreEnd = totalScoreEnd;
-		return this;
-    }
-
-    /**
-    * 设置 增加 员工绩效总分数
-    * @param totalScoreIncrement
-    */
-    public StaffPerformStatQuery totalScoreIncrement(BigDecimal totalScoreIncrement){
-		this.totalScoreIncrement = totalScoreIncrement;
-		return this;
-    }
-
-    /**
-    * 设置 员工绩效总分数
-    * @param totalScoreList
-    */
-    public StaffPerformStatQuery totalScoreList(List<BigDecimal> totalScoreList){
-        this.totalScoreList = totalScoreList;
-		return this;
-        }
-
-        /**
-        * 设置 员工绩效总分数
-        * @param totalScoreNotList
-        */
-        public StaffPerformStatQuery totalScoreNotList(List<BigDecimal> totalScoreNotList){
-        this.totalScoreNotList = totalScoreNotList;
-        return this;
-        }
-
-
-	/**
-    * 设置 备注
-    * @param remark
-    */
-    public StaffPerformStatQuery remark(String remark){
-        setRemark(remark);
-		return this;
-    }
-
-    /**
-    * 设置 备注
-    * @param remarkList
-    */
-    public StaffPerformStatQuery remarkList(List<String> remarkList){
-        this.remarkList = remarkList;
-		return this;
-    }
-
-    /**
-    * 设置  年
-    * @param year
-    */
-    public StaffPerformStatQuery year(Integer year){
-	    setYear(year);
-		return this;
-    }
-	
-	 /**
-    * 设置 开始 年
-    * @param yearStart
-    */
-    public StaffPerformStatQuery yearStart(Integer yearStart){
-		this.yearStart = yearStart;
-		return this;
-    }
-
-    /**
-    * 设置 结束 年
-    * @param yearEnd
-    */
-    public StaffPerformStatQuery yearEnd(Integer yearEnd){
-		this.yearEnd = yearEnd;
-		return this;
-    }
-
-    /**
-    * 设置 增加 年
-    * @param yearIncrement
-    */
-    public StaffPerformStatQuery yearIncrement(Integer yearIncrement){
-		this.yearIncrement = yearIncrement;
-		return this;
-    }
-
-    /**
-    * 设置 年
-    * @param yearList
-    */
-    public StaffPerformStatQuery yearList(List<Integer> yearList){
-        this.yearList = yearList;
-		return this;
-        }
-
-        /**
-        * 设置 年
-        * @param yearNotList
-        */
-        public StaffPerformStatQuery yearNotList(List<Integer> yearNotList){
-        this.yearNotList = yearNotList;
-        return this;
-        }
-
-    /**
-    * 设置  月
-    * @param month
-    */
-    public StaffPerformStatQuery month(Integer month){
-	    setMonth(month);
-		return this;
-    }
-	
-	 /**
-    * 设置 开始 月
-    * @param monthStart
-    */
-    public StaffPerformStatQuery monthStart(Integer monthStart){
-		this.monthStart = monthStart;
+        this.totalScoreStart = totalScoreStart;
         return this;
     }
 
     /**
-    * 设置 结束 月
-    * @param monthEnd
+     * 设置 结束 员工绩效总分数
+     * @param totalScoreEnd
      */
-    public StaffPerformStatQuery monthEnd(Integer monthEnd){
-		this.monthEnd = monthEnd;
+    public StaffPerformStatQuery totalScoreEnd(BigDecimal totalScoreEnd){
+        this.totalScoreEnd = totalScoreEnd;
         return this;
     }
 
     /**
-    * 设置 增加 月
-    * @param monthIncrement
+     * 设置 增加 员工绩效总分数
+     * @param totalScoreIncrement
      */
-    public StaffPerformStatQuery monthIncrement(Integer monthIncrement){
-		this.monthIncrement = monthIncrement;
+    public StaffPerformStatQuery totalScoreIncrement(BigDecimal totalScoreIncrement){
+        this.totalScoreIncrement = totalScoreIncrement;
         return this;
     }
 
     /**
-    * 设置 月
-    * @param monthList
+     * 设置 员工绩效总分数
+     * @param totalScoreList
      */
-    public StaffPerformStatQuery monthList(List<Integer> monthList){
-        this.monthList = monthList;
+    public StaffPerformStatQuery totalScoreList(List<BigDecimal> totalScoreList){
+        this.totalScoreList = totalScoreList;
         return this;
     }
 
     /**
-        * 设置 月
-        * @param monthNotList
+     * 设置 员工绩效总分数
+     * @param totalScoreNotList
      */
-        public StaffPerformStatQuery monthNotList(List<Integer> monthNotList){
-        this.monthNotList = monthNotList;
+    public StaffPerformStatQuery totalScoreNotList(List<BigDecimal> totalScoreNotList){
+        this.totalScoreNotList = totalScoreNotList;
         return this;
     }
 
-
     /**
-    * 设置  创建人id
-    * @param createUserId
+     * 设置  员工绩效加分总分数汇总
+     * @param totalAddScore
      */
-    public StaffPerformStatQuery createUserId(Long createUserId){
-	    setCreateUserId(createUserId);
+    public StaffPerformStatQuery totalAddScore(BigDecimal totalAddScore){
+        setTotalAddScore(totalAddScore);
         return this;
     }
 
     /**
-    * 设置 开始 创建人id
-    * @param createUserIdStart
+     * 设置 开始 员工绩效加分总分数汇总
+     * @param totalAddScoreStart
      */
-    public StaffPerformStatQuery createUserIdStart(Long createUserIdStart){
-		this.createUserIdStart = createUserIdStart;
+    public StaffPerformStatQuery totalAddScoreStart(BigDecimal totalAddScoreStart){
+        this.totalAddScoreStart = totalAddScoreStart;
         return this;
     }
 
     /**
-    * 设置 结束 创建人id
-    * @param createUserIdEnd
+     * 设置 结束 员工绩效加分总分数汇总
+     * @param totalAddScoreEnd
      */
-    public StaffPerformStatQuery createUserIdEnd(Long createUserIdEnd){
-		this.createUserIdEnd = createUserIdEnd;
+    public StaffPerformStatQuery totalAddScoreEnd(BigDecimal totalAddScoreEnd){
+        this.totalAddScoreEnd = totalAddScoreEnd;
         return this;
     }
 
     /**
-    * 设置 增加 创建人id
-    * @param createUserIdIncrement
+     * 设置 增加 员工绩效加分总分数汇总
+     * @param totalAddScoreIncrement
      */
-    public StaffPerformStatQuery createUserIdIncrement(Long createUserIdIncrement){
-		this.createUserIdIncrement = createUserIdIncrement;
+    public StaffPerformStatQuery totalAddScoreIncrement(BigDecimal totalAddScoreIncrement){
+        this.totalAddScoreIncrement = totalAddScoreIncrement;
         return this;
     }
 
     /**
-    * 设置 创建人id
-    * @param createUserIdList
+     * 设置 员工绩效加分总分数汇总
+     * @param totalAddScoreList
      */
-    public StaffPerformStatQuery createUserIdList(List<Long> createUserIdList){
-        this.createUserIdList = createUserIdList;
+    public StaffPerformStatQuery totalAddScoreList(List<BigDecimal> totalAddScoreList){
+        this.totalAddScoreList = totalAddScoreList;
         return this;
     }
 
     /**
-        * 设置 创建人id
-        * @param createUserIdNotList
+     * 设置 员工绩效加分总分数汇总
+     * @param totalAddScoreNotList
      */
-        public StaffPerformStatQuery createUserIdNotList(List<Long> createUserIdNotList){
-        this.createUserIdNotList = createUserIdNotList;
+    public StaffPerformStatQuery totalAddScoreNotList(List<BigDecimal> totalAddScoreNotList){
+        this.totalAddScoreNotList = totalAddScoreNotList;
         return this;
     }
 
-
     /**
-    * 设置  更新人id
-    * @param updateUserId
+     * 设置  员工绩效减分总分数汇总
+     * @param totalSubScore
      */
-    public StaffPerformStatQuery updateUserId(Long updateUserId){
-	    setUpdateUserId(updateUserId);
+    public StaffPerformStatQuery totalSubScore(BigDecimal totalSubScore){
+        setTotalSubScore(totalSubScore);
         return this;
     }
 
     /**
-    * 设置 开始 更新人id
-    * @param updateUserIdStart
+     * 设置 开始 员工绩效减分总分数汇总
+     * @param totalSubScoreStart
      */
-    public StaffPerformStatQuery updateUserIdStart(Long updateUserIdStart){
-		this.updateUserIdStart = updateUserIdStart;
+    public StaffPerformStatQuery totalSubScoreStart(BigDecimal totalSubScoreStart){
+        this.totalSubScoreStart = totalSubScoreStart;
         return this;
     }
 
     /**
-    * 设置 结束 更新人id
-    * @param updateUserIdEnd
+     * 设置 结束 员工绩效减分总分数汇总
+     * @param totalSubScoreEnd
      */
-    public StaffPerformStatQuery updateUserIdEnd(Long updateUserIdEnd){
-		this.updateUserIdEnd = updateUserIdEnd;
+    public StaffPerformStatQuery totalSubScoreEnd(BigDecimal totalSubScoreEnd){
+        this.totalSubScoreEnd = totalSubScoreEnd;
         return this;
     }
 
     /**
-    * 设置 增加 更新人id
-    * @param updateUserIdIncrement
+     * 设置 增加 员工绩效减分总分数汇总
+     * @param totalSubScoreIncrement
      */
-    public StaffPerformStatQuery updateUserIdIncrement(Long updateUserIdIncrement){
-		this.updateUserIdIncrement = updateUserIdIncrement;
+    public StaffPerformStatQuery totalSubScoreIncrement(BigDecimal totalSubScoreIncrement){
+        this.totalSubScoreIncrement = totalSubScoreIncrement;
         return this;
     }
 
     /**
-    * 设置 更新人id
-    * @param updateUserIdList
+     * 设置 员工绩效减分总分数汇总
+     * @param totalSubScoreList
      */
-    public StaffPerformStatQuery updateUserIdList(List<Long> updateUserIdList){
-        this.updateUserIdList = updateUserIdList;
+    public StaffPerformStatQuery totalSubScoreList(List<BigDecimal> totalSubScoreList){
+        this.totalSubScoreList = totalSubScoreList;
         return this;
     }
 
     /**
-        * 设置 更新人id
-        * @param updateUserIdNotList
+     * 设置 员工绩效减分总分数汇总
+     * @param totalSubScoreNotList
      */
-        public StaffPerformStatQuery updateUserIdNotList(List<Long> updateUserIdNotList){
-        this.updateUserIdNotList = updateUserIdNotList;
+    public StaffPerformStatQuery totalSubScoreNotList(List<BigDecimal> totalSubScoreNotList){
+        this.totalSubScoreNotList = totalSubScoreNotList;
         return this;
     }
 
@@ -2914,6 +2785,114 @@ public class StaffPerformStatQuery extends StaffPerformStatEntity {
         return this;
     }
 
+    /**
+     * 设置  投诉绩效指标增加分数
+     * @param complainScoreAdd
+     */
+    public StaffPerformStatQuery complainScoreAdd(BigDecimal complainScoreAdd){
+        setComplainScoreAdd(complainScoreAdd);
+        return this;
+    }
+
+    /**
+     * 设置 开始 投诉绩效指标增加分数
+     * @param complainScoreAddStart
+     */
+    public StaffPerformStatQuery complainScoreAddStart(BigDecimal complainScoreAddStart){
+        this.complainScoreAddStart = complainScoreAddStart;
+        return this;
+    }
+
+    /**
+     * 设置 结束 投诉绩效指标增加分数
+     * @param complainScoreAddEnd
+     */
+    public StaffPerformStatQuery complainScoreAddEnd(BigDecimal complainScoreAddEnd){
+        this.complainScoreAddEnd = complainScoreAddEnd;
+        return this;
+    }
+
+    /**
+     * 设置 增加 投诉绩效指标增加分数
+     * @param complainScoreAddIncrement
+     */
+    public StaffPerformStatQuery complainScoreAddIncrement(BigDecimal complainScoreAddIncrement){
+        this.complainScoreAddIncrement = complainScoreAddIncrement;
+        return this;
+    }
+
+    /**
+     * 设置 投诉绩效指标增加分数
+     * @param complainScoreAddList
+     */
+    public StaffPerformStatQuery complainScoreAddList(List<BigDecimal> complainScoreAddList){
+        this.complainScoreAddList = complainScoreAddList;
+        return this;
+    }
+
+    /**
+     * 设置 投诉绩效指标增加分数
+     * @param complainScoreAddNotList
+     */
+    public StaffPerformStatQuery complainScoreAddNotList(List<BigDecimal> complainScoreAddNotList){
+        this.complainScoreAddNotList = complainScoreAddNotList;
+        return this;
+    }
+
+    /**
+     * 设置  投诉绩效指标扣减分数
+     * @param complainScoreSub
+     */
+    public StaffPerformStatQuery complainScoreSub(BigDecimal complainScoreSub){
+        setComplainScoreSub(complainScoreSub);
+        return this;
+    }
+
+    /**
+     * 设置 开始 投诉绩效指标扣减分数
+     * @param complainScoreSubStart
+     */
+    public StaffPerformStatQuery complainScoreSubStart(BigDecimal complainScoreSubStart){
+        this.complainScoreSubStart = complainScoreSubStart;
+        return this;
+    }
+
+    /**
+     * 设置 结束 投诉绩效指标扣减分数
+     * @param complainScoreSubEnd
+     */
+    public StaffPerformStatQuery complainScoreSubEnd(BigDecimal complainScoreSubEnd){
+        this.complainScoreSubEnd = complainScoreSubEnd;
+        return this;
+    }
+
+    /**
+     * 设置 增加 投诉绩效指标扣减分数
+     * @param complainScoreSubIncrement
+     */
+    public StaffPerformStatQuery complainScoreSubIncrement(BigDecimal complainScoreSubIncrement){
+        this.complainScoreSubIncrement = complainScoreSubIncrement;
+        return this;
+    }
+
+    /**
+     * 设置 投诉绩效指标扣减分数
+     * @param complainScoreSubList
+     */
+    public StaffPerformStatQuery complainScoreSubList(List<BigDecimal> complainScoreSubList){
+        this.complainScoreSubList = complainScoreSubList;
+        return this;
+    }
+
+    /**
+     * 设置 投诉绩效指标扣减分数
+     * @param complainScoreSubNotList
+     */
+    public StaffPerformStatQuery complainScoreSubNotList(List<BigDecimal> complainScoreSubNotList){
+        this.complainScoreSubNotList = complainScoreSubNotList;
+        return this;
+    }
+
     /**
      * 设置  办件绩效指标增加分数
      * @param workScoreAdd
@@ -3224,287 +3203,308 @@ public class StaffPerformStatQuery extends StaffPerformStatEntity {
      * 设置 其它绩效指标扣减分数
      * @param otherScoreSubList
      */
-    public StaffPerformStatQuery otherScoreSubList(List<BigDecimal> otherScoreSubList){
-        this.otherScoreSubList = otherScoreSubList;
+    public StaffPerformStatQuery otherScoreSubList(List<BigDecimal> otherScoreSubList){
+        this.otherScoreSubList = otherScoreSubList;
+        return this;
+    }
+
+    /**
+     * 设置 其它绩效指标扣减分数
+     * @param otherScoreSubNotList
+     */
+    public StaffPerformStatQuery otherScoreSubNotList(List<BigDecimal> otherScoreSubNotList){
+        this.otherScoreSubNotList = otherScoreSubNotList;
+        return this;
+    }
+
+
+    /**
+     * 设置 备注
+     * @param remark
+     */
+    public StaffPerformStatQuery remark(String remark){
+        setRemark(remark);
         return this;
     }
 
     /**
-        * 设置 其它绩效指标扣减分数
-        * @param otherScoreSubNotList
+     * 设置 备注
+     * @param remarkList
      */
-        public StaffPerformStatQuery otherScoreSubNotList(List<BigDecimal> otherScoreSubNotList){
-        this.otherScoreSubNotList = otherScoreSubNotList;
+    public StaffPerformStatQuery remarkList(List<String> remarkList){
+        this.remarkList = remarkList;
         return this;
     }
 
     /**
-    * 设置  日
-    * @param day
+     * 设置  年
+     * @param year
      */
-    public StaffPerformStatQuery day(Integer day){
-	    setDay(day);
+    public StaffPerformStatQuery year(Integer year){
+        setYear(year);
         return this;
     }
 
     /**
-    * 设置 开始 日
-    * @param dayStart
+     * 设置 开始 年
+     * @param yearStart
      */
-    public StaffPerformStatQuery dayStart(Integer dayStart){
-		this.dayStart = dayStart;
+    public StaffPerformStatQuery yearStart(Integer yearStart){
+        this.yearStart = yearStart;
         return this;
     }
 
     /**
-    * 设置 结束 日
-    * @param dayEnd
+     * 设置 结束 年
+     * @param yearEnd
      */
-    public StaffPerformStatQuery dayEnd(Integer dayEnd){
-		this.dayEnd = dayEnd;
+    public StaffPerformStatQuery yearEnd(Integer yearEnd){
+        this.yearEnd = yearEnd;
         return this;
     }
 
     /**
-    * 设置 增加 日
-    * @param dayIncrement
+     * 设置 增加 年
+     * @param yearIncrement
      */
-    public StaffPerformStatQuery dayIncrement(Integer dayIncrement){
-		this.dayIncrement = dayIncrement;
+    public StaffPerformStatQuery yearIncrement(Integer yearIncrement){
+        this.yearIncrement = yearIncrement;
         return this;
     }
 
     /**
-    * 设置 日
-    * @param dayList
+     * 设置 年
+     * @param yearList
      */
-    public StaffPerformStatQuery dayList(List<Integer> dayList){
-        this.dayList = dayList;
+    public StaffPerformStatQuery yearList(List<Integer> yearList){
+        this.yearList = yearList;
         return this;
     }
 
     /**
-        * 设置 日
-        * @param dayNotList
+     * 设置 年
+     * @param yearNotList
      */
-        public StaffPerformStatQuery dayNotList(List<Integer> dayNotList){
-        this.dayNotList = dayNotList;
+    public StaffPerformStatQuery yearNotList(List<Integer> yearNotList){
+        this.yearNotList = yearNotList;
         return this;
     }
 
     /**
-    * 设置  员工绩效加分总分数汇总
-    * @param totalAddScore
+     * 设置  月
+     * @param month
      */
-    public StaffPerformStatQuery totalAddScore(BigDecimal totalAddScore){
-	    setTotalAddScore(totalAddScore);
+    public StaffPerformStatQuery month(Integer month){
+        setMonth(month);
         return this;
     }
 
     /**
-    * 设置 开始 员工绩效加分总分数汇总
-    * @param totalAddScoreStart
+     * 设置 开始 月
+     * @param monthStart
      */
-    public StaffPerformStatQuery totalAddScoreStart(BigDecimal totalAddScoreStart){
-		this.totalAddScoreStart = totalAddScoreStart;
+    public StaffPerformStatQuery monthStart(Integer monthStart){
+        this.monthStart = monthStart;
         return this;
     }
 
     /**
-    * 设置 结束 员工绩效加分总分数汇总
-    * @param totalAddScoreEnd
+     * 设置 结束 月
+     * @param monthEnd
      */
-    public StaffPerformStatQuery totalAddScoreEnd(BigDecimal totalAddScoreEnd){
-		this.totalAddScoreEnd = totalAddScoreEnd;
+    public StaffPerformStatQuery monthEnd(Integer monthEnd){
+        this.monthEnd = monthEnd;
         return this;
     }
 
     /**
-    * 设置 增加 员工绩效加分总分数汇总
-    * @param totalAddScoreIncrement
+     * 设置 增加 月
+     * @param monthIncrement
      */
-    public StaffPerformStatQuery totalAddScoreIncrement(BigDecimal totalAddScoreIncrement){
-		this.totalAddScoreIncrement = totalAddScoreIncrement;
+    public StaffPerformStatQuery monthIncrement(Integer monthIncrement){
+        this.monthIncrement = monthIncrement;
         return this;
     }
 
     /**
-    * 设置 员工绩效加分总分数汇总
-    * @param totalAddScoreList
+     * 设置 月
+     * @param monthList
      */
-    public StaffPerformStatQuery totalAddScoreList(List<BigDecimal> totalAddScoreList){
-        this.totalAddScoreList = totalAddScoreList;
+    public StaffPerformStatQuery monthList(List<Integer> monthList){
+        this.monthList = monthList;
         return this;
     }
 
     /**
-        * 设置 员工绩效加分总分数汇总
-        * @param totalAddScoreNotList
+     * 设置 月
+     * @param monthNotList
      */
-        public StaffPerformStatQuery totalAddScoreNotList(List<BigDecimal> totalAddScoreNotList){
-        this.totalAddScoreNotList = totalAddScoreNotList;
+    public StaffPerformStatQuery monthNotList(List<Integer> monthNotList){
+        this.monthNotList = monthNotList;
         return this;
     }
 
     /**
-    * 设置  员工绩效减分总分数汇总
-    * @param totalSubScore
+     * 设置  日
+     * @param day
      */
-    public StaffPerformStatQuery totalSubScore(BigDecimal totalSubScore){
-	    setTotalSubScore(totalSubScore);
+    public StaffPerformStatQuery day(Integer day){
+        setDay(day);
         return this;
     }
 
     /**
-    * 设置 开始 员工绩效减分总分数汇总
-    * @param totalSubScoreStart
+     * 设置 开始 日
+     * @param dayStart
      */
-    public StaffPerformStatQuery totalSubScoreStart(BigDecimal totalSubScoreStart){
-		this.totalSubScoreStart = totalSubScoreStart;
+    public StaffPerformStatQuery dayStart(Integer dayStart){
+        this.dayStart = dayStart;
         return this;
     }
 
     /**
-    * 设置 结束 员工绩效减分总分数汇总
-    * @param totalSubScoreEnd
+     * 设置 结束 日
+     * @param dayEnd
      */
-    public StaffPerformStatQuery totalSubScoreEnd(BigDecimal totalSubScoreEnd){
-		this.totalSubScoreEnd = totalSubScoreEnd;
+    public StaffPerformStatQuery dayEnd(Integer dayEnd){
+        this.dayEnd = dayEnd;
         return this;
     }
 
     /**
-    * 设置 增加 员工绩效减分总分数汇总
-    * @param totalSubScoreIncrement
+     * 设置 增加 日
+     * @param dayIncrement
      */
-    public StaffPerformStatQuery totalSubScoreIncrement(BigDecimal totalSubScoreIncrement){
-		this.totalSubScoreIncrement = totalSubScoreIncrement;
+    public StaffPerformStatQuery dayIncrement(Integer dayIncrement){
+        this.dayIncrement = dayIncrement;
         return this;
     }
 
     /**
-    * 设置 员工绩效减分总分数汇总
-    * @param totalSubScoreList
+     * 设置 日
+     * @param dayList
      */
-    public StaffPerformStatQuery totalSubScoreList(List<BigDecimal> totalSubScoreList){
-        this.totalSubScoreList = totalSubScoreList;
+    public StaffPerformStatQuery dayList(List<Integer> dayList){
+        this.dayList = dayList;
         return this;
     }
 
     /**
-        * 设置 员工绩效减分总分数汇总
-        * @param totalSubScoreNotList
+     * 设置 日
+     * @param dayNotList
      */
-        public StaffPerformStatQuery totalSubScoreNotList(List<BigDecimal> totalSubScoreNotList){
-        this.totalSubScoreNotList = totalSubScoreNotList;
+    public StaffPerformStatQuery dayNotList(List<Integer> dayNotList){
+        this.dayNotList = dayNotList;
         return this;
     }
 
+
     /**
-    * 设置  投诉绩效指标增加分数
-    * @param complainScoreAdd
+     * 设置  创建人id
+     * @param createUserId
      */
-    public StaffPerformStatQuery complainScoreAdd(BigDecimal complainScoreAdd){
-	    setComplainScoreAdd(complainScoreAdd);
+    public StaffPerformStatQuery createUserId(Long createUserId){
+        setCreateUserId(createUserId);
         return this;
     }
 
     /**
-    * 设置 开始 投诉绩效指标增加分数
-    * @param complainScoreAddStart
+     * 设置 开始 创建人id
+     * @param createUserIdStart
      */
-    public StaffPerformStatQuery complainScoreAddStart(BigDecimal complainScoreAddStart){
-		this.complainScoreAddStart = complainScoreAddStart;
+    public StaffPerformStatQuery createUserIdStart(Long createUserIdStart){
+        this.createUserIdStart = createUserIdStart;
         return this;
     }
 
     /**
-    * 设置 结束 投诉绩效指标增加分数
-    * @param complainScoreAddEnd
+     * 设置 结束 创建人id
+     * @param createUserIdEnd
      */
-    public StaffPerformStatQuery complainScoreAddEnd(BigDecimal complainScoreAddEnd){
-		this.complainScoreAddEnd = complainScoreAddEnd;
+    public StaffPerformStatQuery createUserIdEnd(Long createUserIdEnd){
+        this.createUserIdEnd = createUserIdEnd;
         return this;
     }
 
     /**
-    * 设置 增加 投诉绩效指标增加分数
-    * @param complainScoreAddIncrement
+     * 设置 增加 创建人id
+     * @param createUserIdIncrement
      */
-    public StaffPerformStatQuery complainScoreAddIncrement(BigDecimal complainScoreAddIncrement){
-		this.complainScoreAddIncrement = complainScoreAddIncrement;
+    public StaffPerformStatQuery createUserIdIncrement(Long createUserIdIncrement){
+        this.createUserIdIncrement = createUserIdIncrement;
         return this;
     }
 
     /**
-    * 设置 投诉绩效指标增加分数
-    * @param complainScoreAddList
+     * 设置 创建人id
+     * @param createUserIdList
      */
-    public StaffPerformStatQuery complainScoreAddList(List<BigDecimal> complainScoreAddList){
-        this.complainScoreAddList = complainScoreAddList;
+    public StaffPerformStatQuery createUserIdList(List<Long> createUserIdList){
+        this.createUserIdList = createUserIdList;
         return this;
     }
 
     /**
-        * 设置 投诉绩效指标增加分数
-        * @param complainScoreAddNotList
+     * 设置 创建人id
+     * @param createUserIdNotList
      */
-        public StaffPerformStatQuery complainScoreAddNotList(List<BigDecimal> complainScoreAddNotList){
-        this.complainScoreAddNotList = complainScoreAddNotList;
+    public StaffPerformStatQuery createUserIdNotList(List<Long> createUserIdNotList){
+        this.createUserIdNotList = createUserIdNotList;
         return this;
     }
 
+
     /**
-    * 设置  投诉绩效指标扣减分数
-    * @param complainScoreSub
+     * 设置  更新人id
+     * @param updateUserId
      */
-    public StaffPerformStatQuery complainScoreSub(BigDecimal complainScoreSub){
-	    setComplainScoreSub(complainScoreSub);
+    public StaffPerformStatQuery updateUserId(Long updateUserId){
+        setUpdateUserId(updateUserId);
         return this;
     }
 
     /**
-    * 设置 开始 投诉绩效指标扣减分数
-    * @param complainScoreSubStart
+     * 设置 开始 更新人id
+     * @param updateUserIdStart
      */
-    public StaffPerformStatQuery complainScoreSubStart(BigDecimal complainScoreSubStart){
-		this.complainScoreSubStart = complainScoreSubStart;
+    public StaffPerformStatQuery updateUserIdStart(Long updateUserIdStart){
+        this.updateUserIdStart = updateUserIdStart;
         return this;
     }
 
     /**
-    * 设置 结束 投诉绩效指标扣减分数
-    * @param complainScoreSubEnd
+     * 设置 结束 更新人id
+     * @param updateUserIdEnd
      */
-    public StaffPerformStatQuery complainScoreSubEnd(BigDecimal complainScoreSubEnd){
-		this.complainScoreSubEnd = complainScoreSubEnd;
+    public StaffPerformStatQuery updateUserIdEnd(Long updateUserIdEnd){
+        this.updateUserIdEnd = updateUserIdEnd;
         return this;
     }
 
     /**
-    * 设置 增加 投诉绩效指标扣减分数
-    * @param complainScoreSubIncrement
+     * 设置 增加 更新人id
+     * @param updateUserIdIncrement
      */
-    public StaffPerformStatQuery complainScoreSubIncrement(BigDecimal complainScoreSubIncrement){
-		this.complainScoreSubIncrement = complainScoreSubIncrement;
+    public StaffPerformStatQuery updateUserIdIncrement(Long updateUserIdIncrement){
+        this.updateUserIdIncrement = updateUserIdIncrement;
         return this;
     }
 
     /**
-    * 设置 投诉绩效指标扣减分数
-    * @param complainScoreSubList
+     * 设置 更新人id
+     * @param updateUserIdList
      */
-    public StaffPerformStatQuery complainScoreSubList(List<BigDecimal> complainScoreSubList){
-        this.complainScoreSubList = complainScoreSubList;
+    public StaffPerformStatQuery updateUserIdList(List<Long> updateUserIdList){
+        this.updateUserIdList = updateUserIdList;
         return this;
     }
 
     /**
-        * 设置 投诉绩效指标扣减分数
-        * @param complainScoreSubNotList
+     * 设置 更新人id
+     * @param updateUserIdNotList
      */
-        public StaffPerformStatQuery complainScoreSubNotList(List<BigDecimal> complainScoreSubNotList){
-        this.complainScoreSubNotList = complainScoreSubNotList;
+    public StaffPerformStatQuery updateUserIdNotList(List<Long> updateUserIdNotList){
+        this.updateUserIdNotList = updateUserIdNotList;
         return this;
     }
 

db/add.sql

@@ -503,3 +503,40 @@ CREATE TABLE mortals_xhx_window_owner_detail(
 PRIMARY KEY  (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='窗口负责人详细';
 
+
+
+-- ----------------------------
+-- 员工绩效统计表
+-- ----------------------------
+DROP TABLE IF EXISTS `mortals_xhx_staff_perform_stat`;
+CREATE TABLE mortals_xhx_staff_perform_stat(
+    `id` bigint(20) NOT NULL  AUTO_INCREMENT   COMMENT '主键ID，主键，自增长',
+    `staffId` bigint(20)    DEFAULT '0'  COMMENT '部门id号',
+    `staffName` varchar(64)      COMMENT '部门名称',
+    `totalScore` decimal(10,2) NOT NULL     COMMENT '员工绩效总分数',
+    `totalAddScore` decimal(10,2) NOT NULL     COMMENT '员工绩效加分总分数汇总',
+    `totalSubScore` decimal(10,2) NOT NULL     COMMENT '员工绩效减分总分数汇总',
+    `attendScoreAdd` decimal(10,2)      COMMENT '考勤绩效指标增加分数',
+    `attendScoreSub` decimal(10,2)      COMMENT '考勤绩效指标扣减分数',
+    `assessScoreAdd` decimal(10,2)      COMMENT '评价绩效指标增加分数',
+    `assessScoreSub` decimal(10,2)      COMMENT '评价绩效指标扣减分数',
+    `complainScoreAdd` decimal(10,2)      COMMENT '投诉绩效指标增加分数',
+    `complainScoreSub` decimal(10,2)      COMMENT '投诉绩效指标扣减分数',
+    `workScoreAdd` decimal(10,2)      COMMENT '办件绩效指标增加分数',
+    `workScoreSub` decimal(10,2)      COMMENT '办件绩效指标扣减分数',
+    `effectScoreAdd` decimal(10,2)      COMMENT '效能绩效指标增加分数',
+    `effectScoreSub` decimal(10,2)      COMMENT '效能绩效指标扣减分数',
+    `otherScoreAdd` decimal(10,2)      COMMENT '其它绩效指标增加分数',
+    `otherScoreSub` decimal(10,2)      COMMENT '其它绩效指标扣减分数',
+    `remark` varchar(255)      COMMENT '备注',
+    `year` int(9) NOT NULL     COMMENT '年',
+    `month` tinyint(2) NOT NULL     COMMENT '月',
+    `day` tinyint(2) NOT NULL     COMMENT '日',
+    `createTime` datetime      COMMENT '创建时间',
+    `createUserId` bigint(20)      COMMENT '创建人id',
+    `updateTime` datetime      COMMENT '更新时间',
+    `updateUserId` bigint(20)      COMMENT '更新人id',
+PRIMARY KEY  (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='员工绩效统计';
+
+