个人和部门统计添加字段

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

@@ -7,7 +7,7 @@ import com.mortals.xhx.module.dept.model.DeptPerformStatEntity;
 * 部门绩效分数统计查询对象
 *
 * @author zxfei
-* @date 2023-05-16
+* @date 2023-07-11
 */
 public class DeptPerformStatQuery extends DeptPerformStatEntity {
     /** 开始 主键ID，主键，自增长 */
@@ -302,6 +302,81 @@ public class DeptPerformStatQuery extends DeptPerformStatEntity {
     /** 更新人id排除列表 */
     private List <Long> updateUserIdNotList;
 
+    /** 开始 部门绩效加分总分数汇总 */
+    private BigDecimal totalAddScoreStart;
+
+    /** 结束 部门绩效加分总分数汇总 */
+    private BigDecimal totalAddScoreEnd;
+
+    /** 增加 部门绩效加分总分数汇总 */
+    private BigDecimal totalAddScoreIncrement;
+
+    /** 部门绩效加分总分数汇总列表 */
+    private List <BigDecimal> totalAddScoreList;
+
+    /** 部门绩效加分总分数汇总排除列表 */
+    private List <BigDecimal> totalAddScoreNotList;
+
+    /** 开始 部门绩效减分总分数汇总 */
+    private BigDecimal totalSubScoreStart;
+
+    /** 结束 部门绩效减分总分数汇总 */
+    private BigDecimal totalSubScoreEnd;
+
+    /** 增加 部门绩效减分总分数汇总 */
+    private BigDecimal totalSubScoreIncrement;
+
+    /** 部门绩效减分总分数汇总列表 */
+    private List <BigDecimal> totalSubScoreList;
+
+    /** 部门绩效减分总分数汇总排除列表 */
+    private List <BigDecimal> totalSubScoreNotList;
+
+    /** 开始 投诉绩效指标增加分数 */
+    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 averageScoreStart;
+
+    /** 结束 部门绩效平均分数，根据部门所属人数平均 */
+    private BigDecimal averageScoreEnd;
+
+    /** 增加 部门绩效平均分数，根据部门所属人数平均 */
+    private BigDecimal averageScoreIncrement;
+
+    /** 部门绩效平均分数，根据部门所属人数平均列表 */
+    private List <BigDecimal> averageScoreList;
+
+    /** 部门绩效平均分数，根据部门所属人数平均排除列表 */
+    private List <BigDecimal> averageScoreNotList;
+
     /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
     private List<DeptPerformStatQuery> orConditionList;
 
@@ -1896,6 +1971,411 @@ public class DeptPerformStatQuery extends DeptPerformStatEntity {
     }
 
 
+    /**
+    * 获取 开始 部门绩效加分总分数汇总
+    * @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
+    */
+    public void setTotalSubScoreEnd(BigDecimal totalSubScoreEnd){
+        this.totalSubScoreEnd = totalSubScoreEnd;
+    }
+
+    /**
+    * 获取 增加 部门绩效减分总分数汇总
+    * @return totalSubScoreIncrement
+    */
+    public BigDecimal getTotalSubScoreIncrement(){
+        return this.totalSubScoreIncrement;
+    }
+
+    /**
+    * 设置 增加 部门绩效减分总分数汇总
+    * @param totalSubScoreIncrement
+    */
+    public void setTotalSubScoreIncrement(BigDecimal totalSubScoreIncrement){
+        this.totalSubScoreIncrement = totalSubScoreIncrement;
+    }
+
+    /**
+    * 获取 部门绩效减分总分数汇总
+    * @return totalSubScoreList
+    */
+    public List<BigDecimal> getTotalSubScoreList(){
+        return this.totalSubScoreList;
+    }
+
+    /**
+    * 设置 部门绩效减分总分数汇总
+    * @param totalSubScoreList
+    */
+    public void setTotalSubScoreList(List<BigDecimal> totalSubScoreList){
+        this.totalSubScoreList = totalSubScoreList;
+    }
+
+    /**
+    * 获取 部门绩效减分总分数汇总
+    * @return totalSubScoreNotList
+    */
+    public List<BigDecimal> getTotalSubScoreNotList(){
+        return this.totalSubScoreNotList;
+    }
+
+    /**
+    * 设置 部门绩效减分总分数汇总
+    * @param totalSubScoreNotList
+    */
+    public void setTotalSubScoreNotList(List<BigDecimal> totalSubScoreNotList){
+        this.totalSubScoreNotList = totalSubScoreNotList;
+    }
+
+
+    /**
+    * 获取 开始 投诉绩效指标增加分数
+    * @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 getComplainScoreSubEnd(){
+        return this.complainScoreSubEnd;
+    }
+
+    /**
+    * 设置 结束 投诉绩效指标扣减分数
+    * @param complainScoreSubEnd
+    */
+    public void setComplainScoreSubEnd(BigDecimal complainScoreSubEnd){
+        this.complainScoreSubEnd = complainScoreSubEnd;
+    }
+
+    /**
+    * 获取 增加 投诉绩效指标扣减分数
+    * @return complainScoreSubIncrement
+    */
+    public BigDecimal getComplainScoreSubIncrement(){
+        return this.complainScoreSubIncrement;
+    }
+
+    /**
+    * 设置 增加 投诉绩效指标扣减分数
+    * @param complainScoreSubIncrement
+    */
+    public void setComplainScoreSubIncrement(BigDecimal complainScoreSubIncrement){
+        this.complainScoreSubIncrement = complainScoreSubIncrement;
+    }
+
+    /**
+    * 获取 投诉绩效指标扣减分数
+    * @return complainScoreSubList
+    */
+    public List<BigDecimal> getComplainScoreSubList(){
+        return this.complainScoreSubList;
+    }
+
+    /**
+    * 设置 投诉绩效指标扣减分数
+    * @param complainScoreSubList
+    */
+    public void setComplainScoreSubList(List<BigDecimal> complainScoreSubList){
+        this.complainScoreSubList = complainScoreSubList;
+    }
+
+    /**
+    * 获取 投诉绩效指标扣减分数
+    * @return complainScoreSubNotList
+    */
+    public List<BigDecimal> getComplainScoreSubNotList(){
+        return this.complainScoreSubNotList;
+    }
+
+    /**
+    * 设置 投诉绩效指标扣减分数
+    * @param complainScoreSubNotList
+    */
+    public void setComplainScoreSubNotList(List<BigDecimal> complainScoreSubNotList){
+        this.complainScoreSubNotList = complainScoreSubNotList;
+    }
+
+
+    /**
+    * 获取 开始 部门绩效平均分数，根据部门所属人数平均
+    * @return averageScoreStart
+    */
+    public BigDecimal getAverageScoreStart(){
+        return this.averageScoreStart;
+    }
+
+    /**
+    * 设置 开始 部门绩效平均分数，根据部门所属人数平均
+    * @param averageScoreStart
+    */
+    public void setAverageScoreStart(BigDecimal averageScoreStart){
+        this.averageScoreStart = averageScoreStart;
+    }
+
+    /**
+    * 获取 结束 部门绩效平均分数，根据部门所属人数平均
+    * @return $averageScoreEnd
+    */
+    public BigDecimal getAverageScoreEnd(){
+        return this.averageScoreEnd;
+    }
+
+    /**
+    * 设置 结束 部门绩效平均分数，根据部门所属人数平均
+    * @param averageScoreEnd
+    */
+    public void setAverageScoreEnd(BigDecimal averageScoreEnd){
+        this.averageScoreEnd = averageScoreEnd;
+    }
+
+    /**
+    * 获取 增加 部门绩效平均分数，根据部门所属人数平均
+    * @return averageScoreIncrement
+    */
+    public BigDecimal getAverageScoreIncrement(){
+        return this.averageScoreIncrement;
+    }
+
+    /**
+    * 设置 增加 部门绩效平均分数，根据部门所属人数平均
+    * @param averageScoreIncrement
+    */
+    public void setAverageScoreIncrement(BigDecimal averageScoreIncrement){
+        this.averageScoreIncrement = averageScoreIncrement;
+    }
+
+    /**
+    * 获取 部门绩效平均分数，根据部门所属人数平均
+    * @return averageScoreList
+    */
+    public List<BigDecimal> getAverageScoreList(){
+        return this.averageScoreList;
+    }
+
+    /**
+    * 设置 部门绩效平均分数，根据部门所属人数平均
+    * @param averageScoreList
+    */
+    public void setAverageScoreList(List<BigDecimal> averageScoreList){
+        this.averageScoreList = averageScoreList;
+    }
+
+    /**
+    * 获取 部门绩效平均分数，根据部门所属人数平均
+    * @return averageScoreNotList
+    */
+    public List<BigDecimal> getAverageScoreNotList(){
+        return this.averageScoreNotList;
+    }
+
+    /**
+    * 设置 部门绩效平均分数，根据部门所属人数平均
+    * @param averageScoreNotList
+    */
+    public void setAverageScoreNotList(List<BigDecimal> averageScoreNotList){
+        this.averageScoreNotList = averageScoreNotList;
+    }
+
+
     /**
     * 设置  主键ID，主键，自增长
     * @param id
@@ -2908,6 +3388,276 @@ public class DeptPerformStatQuery extends DeptPerformStatEntity {
         return this;
         }
 
+    /**
+    * 设置  部门绩效加分总分数汇总
+    * @param totalAddScore
+    */
+    public DeptPerformStatQuery totalAddScore(BigDecimal totalAddScore){
+	    setTotalAddScore(totalAddScore);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 部门绩效加分总分数汇总
+    * @param totalAddScoreStart
+    */
+    public DeptPerformStatQuery totalAddScoreStart(BigDecimal totalAddScoreStart){
+		this.totalAddScoreStart = totalAddScoreStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 部门绩效加分总分数汇总
+    * @param totalAddScoreEnd
+    */
+    public DeptPerformStatQuery totalAddScoreEnd(BigDecimal totalAddScoreEnd){
+		this.totalAddScoreEnd = totalAddScoreEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 部门绩效加分总分数汇总
+    * @param totalAddScoreIncrement
+    */
+    public DeptPerformStatQuery totalAddScoreIncrement(BigDecimal totalAddScoreIncrement){
+		this.totalAddScoreIncrement = totalAddScoreIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 部门绩效加分总分数汇总
+    * @param totalAddScoreList
+    */
+    public DeptPerformStatQuery totalAddScoreList(List<BigDecimal> totalAddScoreList){
+        this.totalAddScoreList = totalAddScoreList;
+		return this;
+        }
+
+        /**
+        * 设置 部门绩效加分总分数汇总
+        * @param totalAddScoreNotList
+        */
+        public DeptPerformStatQuery totalAddScoreNotList(List<BigDecimal> totalAddScoreNotList){
+        this.totalAddScoreNotList = totalAddScoreNotList;
+        return this;
+        }
+
+    /**
+    * 设置  部门绩效减分总分数汇总
+    * @param totalSubScore
+    */
+    public DeptPerformStatQuery totalSubScore(BigDecimal totalSubScore){
+	    setTotalSubScore(totalSubScore);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 部门绩效减分总分数汇总
+    * @param totalSubScoreStart
+    */
+    public DeptPerformStatQuery totalSubScoreStart(BigDecimal totalSubScoreStart){
+		this.totalSubScoreStart = totalSubScoreStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 部门绩效减分总分数汇总
+    * @param totalSubScoreEnd
+    */
+    public DeptPerformStatQuery totalSubScoreEnd(BigDecimal totalSubScoreEnd){
+		this.totalSubScoreEnd = totalSubScoreEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 部门绩效减分总分数汇总
+    * @param totalSubScoreIncrement
+    */
+    public DeptPerformStatQuery totalSubScoreIncrement(BigDecimal totalSubScoreIncrement){
+		this.totalSubScoreIncrement = totalSubScoreIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 部门绩效减分总分数汇总
+    * @param totalSubScoreList
+    */
+    public DeptPerformStatQuery totalSubScoreList(List<BigDecimal> totalSubScoreList){
+        this.totalSubScoreList = totalSubScoreList;
+		return this;
+        }
+
+        /**
+        * 设置 部门绩效减分总分数汇总
+        * @param totalSubScoreNotList
+        */
+        public DeptPerformStatQuery totalSubScoreNotList(List<BigDecimal> totalSubScoreNotList){
+        this.totalSubScoreNotList = totalSubScoreNotList;
+        return this;
+        }
+
+    /**
+    * 设置  投诉绩效指标增加分数
+    * @param complainScoreAdd
+    */
+    public DeptPerformStatQuery complainScoreAdd(BigDecimal complainScoreAdd){
+	    setComplainScoreAdd(complainScoreAdd);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 投诉绩效指标增加分数
+    * @param complainScoreAddStart
+    */
+    public DeptPerformStatQuery complainScoreAddStart(BigDecimal complainScoreAddStart){
+		this.complainScoreAddStart = complainScoreAddStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 投诉绩效指标增加分数
+    * @param complainScoreAddEnd
+    */
+    public DeptPerformStatQuery complainScoreAddEnd(BigDecimal complainScoreAddEnd){
+		this.complainScoreAddEnd = complainScoreAddEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 投诉绩效指标增加分数
+    * @param complainScoreAddIncrement
+    */
+    public DeptPerformStatQuery complainScoreAddIncrement(BigDecimal complainScoreAddIncrement){
+		this.complainScoreAddIncrement = complainScoreAddIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 投诉绩效指标增加分数
+    * @param complainScoreAddList
+    */
+    public DeptPerformStatQuery complainScoreAddList(List<BigDecimal> complainScoreAddList){
+        this.complainScoreAddList = complainScoreAddList;
+		return this;
+        }
+
+        /**
+        * 设置 投诉绩效指标增加分数
+        * @param complainScoreAddNotList
+        */
+        public DeptPerformStatQuery complainScoreAddNotList(List<BigDecimal> complainScoreAddNotList){
+        this.complainScoreAddNotList = complainScoreAddNotList;
+        return this;
+        }
+
+    /**
+    * 设置  投诉绩效指标扣减分数
+    * @param complainScoreSub
+    */
+    public DeptPerformStatQuery complainScoreSub(BigDecimal complainScoreSub){
+	    setComplainScoreSub(complainScoreSub);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 投诉绩效指标扣减分数
+    * @param complainScoreSubStart
+    */
+    public DeptPerformStatQuery complainScoreSubStart(BigDecimal complainScoreSubStart){
+		this.complainScoreSubStart = complainScoreSubStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 投诉绩效指标扣减分数
+    * @param complainScoreSubEnd
+    */
+    public DeptPerformStatQuery complainScoreSubEnd(BigDecimal complainScoreSubEnd){
+		this.complainScoreSubEnd = complainScoreSubEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 投诉绩效指标扣减分数
+    * @param complainScoreSubIncrement
+    */
+    public DeptPerformStatQuery complainScoreSubIncrement(BigDecimal complainScoreSubIncrement){
+		this.complainScoreSubIncrement = complainScoreSubIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 投诉绩效指标扣减分数
+    * @param complainScoreSubList
+    */
+    public DeptPerformStatQuery complainScoreSubList(List<BigDecimal> complainScoreSubList){
+        this.complainScoreSubList = complainScoreSubList;
+		return this;
+        }
+
+        /**
+        * 设置 投诉绩效指标扣减分数
+        * @param complainScoreSubNotList
+        */
+        public DeptPerformStatQuery complainScoreSubNotList(List<BigDecimal> complainScoreSubNotList){
+        this.complainScoreSubNotList = complainScoreSubNotList;
+        return this;
+        }
+
+    /**
+    * 设置  部门绩效平均分数，根据部门所属人数平均
+    * @param averageScore
+    */
+    public DeptPerformStatQuery averageScore(BigDecimal averageScore){
+	    setAverageScore(averageScore);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 部门绩效平均分数，根据部门所属人数平均
+    * @param averageScoreStart
+    */
+    public DeptPerformStatQuery averageScoreStart(BigDecimal averageScoreStart){
+		this.averageScoreStart = averageScoreStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 部门绩效平均分数，根据部门所属人数平均
+    * @param averageScoreEnd
+    */
+    public DeptPerformStatQuery averageScoreEnd(BigDecimal averageScoreEnd){
+		this.averageScoreEnd = averageScoreEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 部门绩效平均分数，根据部门所属人数平均
+    * @param averageScoreIncrement
+    */
+    public DeptPerformStatQuery averageScoreIncrement(BigDecimal averageScoreIncrement){
+		this.averageScoreIncrement = averageScoreIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 部门绩效平均分数，根据部门所属人数平均
+    * @param averageScoreList
+    */
+    public DeptPerformStatQuery averageScoreList(List<BigDecimal> averageScoreList){
+        this.averageScoreList = averageScoreList;
+		return this;
+        }
+
+        /**
+        * 设置 部门绩效平均分数，根据部门所属人数平均
+        * @param averageScoreNotList
+        */
+        public DeptPerformStatQuery averageScoreNotList(List<BigDecimal> averageScoreNotList){
+        this.averageScoreNotList = averageScoreNotList;
+        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/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/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/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/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/sqlmap/module/dept/DeptPerformStatMapper.xml

@@ -27,6 +27,11 @@
             <result property="createUserId" column="createUserId" />
             <result property="updateTime" column="updateTime" />
             <result property="updateUserId" column="updateUserId" />
+            <result property="totalAddScore" column="totalAddScore" />
+            <result property="totalSubScore" column="totalSubScore" />
+            <result property="complainScoreAdd" column="complainScoreAdd" />
+            <result property="complainScoreSub" column="complainScoreSub" />
+            <result property="averageScore" column="averageScore" />
             
     </resultMap>
 
@@ -100,23 +105,38 @@
                 <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateUserId') or colPickMode == 1 and data.containsKey('updateUserId')))">
                     a.updateUserId,
                 </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('totalAddScore') or colPickMode == 1 and data.containsKey('totalAddScore')))">
+                    a.totalAddScore,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('totalSubScore') or colPickMode == 1 and data.containsKey('totalSubScore')))">
+                    a.totalSubScore,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('complainScoreAdd') or colPickMode == 1 and data.containsKey('complainScoreAdd')))">
+                    a.complainScoreAdd,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('complainScoreSub') or colPickMode == 1 and data.containsKey('complainScoreSub')))">
+                    a.complainScoreSub,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('averageScore') or colPickMode == 1 and data.containsKey('averageScore')))">
+                    a.averageScore,
+                </if>
         </trim>
     </sql>
     <!-- 新增 区分主键自增加还是业务插入 -->
     <insert id="insert" parameterType="DeptPerformStatEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_xhx_dept_perform_stat
-        (deptId,deptName,totalScore,attendScoreAdd,attendScoreSub,assessScoreAdd,assessScoreSub,workScoreAdd,workScoreSub,effectScoreAdd,effectScoreSub,otherScoreAdd,otherScoreSub,remark,year,month,day,createTime,createUserId,updateTime,updateUserId)
+        (deptId,deptName,totalScore,attendScoreAdd,attendScoreSub,assessScoreAdd,assessScoreSub,workScoreAdd,workScoreSub,effectScoreAdd,effectScoreSub,otherScoreAdd,otherScoreSub,remark,year,month,day,createTime,createUserId,updateTime,updateUserId,totalAddScore,totalSubScore,complainScoreAdd,complainScoreSub,averageScore)
         VALUES
-        (#{deptId},#{deptName},#{totalScore},#{attendScoreAdd},#{attendScoreSub},#{assessScoreAdd},#{assessScoreSub},#{workScoreAdd},#{workScoreSub},#{effectScoreAdd},#{effectScoreSub},#{otherScoreAdd},#{otherScoreSub},#{remark},#{year},#{month},#{day},#{createTime},#{createUserId},#{updateTime},#{updateUserId})
+        (#{deptId},#{deptName},#{totalScore},#{attendScoreAdd},#{attendScoreSub},#{assessScoreAdd},#{assessScoreSub},#{workScoreAdd},#{workScoreSub},#{effectScoreAdd},#{effectScoreSub},#{otherScoreAdd},#{otherScoreSub},#{remark},#{year},#{month},#{day},#{createTime},#{createUserId},#{updateTime},#{updateUserId},#{totalAddScore},#{totalSubScore},#{complainScoreAdd},#{complainScoreSub},#{averageScore})
     </insert>
 
     <!-- 批量新增 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_xhx_dept_perform_stat
-        (deptId,deptName,totalScore,attendScoreAdd,attendScoreSub,assessScoreAdd,assessScoreSub,workScoreAdd,workScoreSub,effectScoreAdd,effectScoreSub,otherScoreAdd,otherScoreSub,remark,year,month,day,createTime,createUserId,updateTime,updateUserId)
+        (deptId,deptName,totalScore,attendScoreAdd,attendScoreSub,assessScoreAdd,assessScoreSub,workScoreAdd,workScoreSub,effectScoreAdd,effectScoreSub,otherScoreAdd,otherScoreSub,remark,year,month,day,createTime,createUserId,updateTime,updateUserId,totalAddScore,totalSubScore,complainScoreAdd,complainScoreSub,averageScore)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.deptId},#{item.deptName},#{item.totalScore},#{item.attendScoreAdd},#{item.attendScoreSub},#{item.assessScoreAdd},#{item.assessScoreSub},#{item.workScoreAdd},#{item.workScoreSub},#{item.effectScoreAdd},#{item.effectScoreSub},#{item.otherScoreAdd},#{item.otherScoreSub},#{item.remark},#{item.year},#{item.month},#{item.day},#{item.createTime},#{item.createUserId},#{item.updateTime},#{item.updateUserId})
+            (#{item.deptId},#{item.deptName},#{item.totalScore},#{item.attendScoreAdd},#{item.attendScoreSub},#{item.assessScoreAdd},#{item.assessScoreSub},#{item.workScoreAdd},#{item.workScoreSub},#{item.effectScoreAdd},#{item.effectScoreSub},#{item.otherScoreAdd},#{item.otherScoreSub},#{item.remark},#{item.year},#{item.month},#{item.day},#{item.createTime},#{item.createUserId},#{item.updateTime},#{item.updateUserId},#{item.totalAddScore},#{item.totalSubScore},#{item.complainScoreAdd},#{item.complainScoreSub},#{item.averageScore})
         </foreach>
     </insert>
 
@@ -240,6 +260,36 @@
             <if test="(colPickMode==0 and data.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !data.containsKey('updateUserIdIncrement'))">
                 a.updateUserId=ifnull(a.updateUserId,0) + #{data.updateUserIdIncrement},
             </if>
+            <if test="(colPickMode==0 and data.containsKey('totalAddScore')) or (colPickMode==1 and !data.containsKey('totalAddScore'))">
+                a.totalAddScore=#{data.totalAddScore},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('totalAddScoreIncrement')) or (colPickMode==1 and !data.containsKey('totalAddScoreIncrement'))">
+                a.totalAddScore=ifnull(a.totalAddScore,0) + #{data.totalAddScoreIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('totalSubScore')) or (colPickMode==1 and !data.containsKey('totalSubScore'))">
+                a.totalSubScore=#{data.totalSubScore},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('totalSubScoreIncrement')) or (colPickMode==1 and !data.containsKey('totalSubScoreIncrement'))">
+                a.totalSubScore=ifnull(a.totalSubScore,0) + #{data.totalSubScoreIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('complainScoreAdd')) or (colPickMode==1 and !data.containsKey('complainScoreAdd'))">
+                a.complainScoreAdd=#{data.complainScoreAdd},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('complainScoreAddIncrement')) or (colPickMode==1 and !data.containsKey('complainScoreAddIncrement'))">
+                a.complainScoreAdd=ifnull(a.complainScoreAdd,0) + #{data.complainScoreAddIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('complainScoreSub')) or (colPickMode==1 and !data.containsKey('complainScoreSub'))">
+                a.complainScoreSub=#{data.complainScoreSub},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('complainScoreSubIncrement')) or (colPickMode==1 and !data.containsKey('complainScoreSubIncrement'))">
+                a.complainScoreSub=ifnull(a.complainScoreSub,0) + #{data.complainScoreSubIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('averageScore')) or (colPickMode==1 and !data.containsKey('averageScore'))">
+                a.averageScore=#{data.averageScore},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('averageScoreIncrement')) or (colPickMode==1 and !data.containsKey('averageScoreIncrement'))">
+                a.averageScore=ifnull(a.averageScore,0) + #{data.averageScoreIncrement},
+            </if>
         </trim>
         <trim suffixOverrides="where" suffix="">
             where
@@ -484,6 +534,66 @@
                                 </choose>
                             </foreach>
                         </trim>
+                        <trim prefix="totalAddScore=(case" suffix="ELSE totalAddScore end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('totalAddScore')) or (colPickMode==1 and !item.containsKey('totalAddScore'))">
+                                        when a.id=#{item.id} then #{item.totalAddScore}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('totalAddScoreIncrement')) or (colPickMode==1 and !item.containsKey('totalAddScoreIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.totalAddScore,0) + #{item.totalAddScoreIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                        <trim prefix="totalSubScore=(case" suffix="ELSE totalSubScore end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('totalSubScore')) or (colPickMode==1 and !item.containsKey('totalSubScore'))">
+                                        when a.id=#{item.id} then #{item.totalSubScore}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('totalSubScoreIncrement')) or (colPickMode==1 and !item.containsKey('totalSubScoreIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.totalSubScore,0) + #{item.totalSubScoreIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                        <trim prefix="complainScoreAdd=(case" suffix="ELSE complainScoreAdd end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('complainScoreAdd')) or (colPickMode==1 and !item.containsKey('complainScoreAdd'))">
+                                        when a.id=#{item.id} then #{item.complainScoreAdd}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('complainScoreAddIncrement')) or (colPickMode==1 and !item.containsKey('complainScoreAddIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.complainScoreAdd,0) + #{item.complainScoreAddIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                        <trim prefix="complainScoreSub=(case" suffix="ELSE complainScoreSub end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('complainScoreSub')) or (colPickMode==1 and !item.containsKey('complainScoreSub'))">
+                                        when a.id=#{item.id} then #{item.complainScoreSub}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('complainScoreSubIncrement')) or (colPickMode==1 and !item.containsKey('complainScoreSubIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.complainScoreSub,0) + #{item.complainScoreSubIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                        <trim prefix="averageScore=(case" suffix="ELSE averageScore end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('averageScore')) or (colPickMode==1 and !item.containsKey('averageScore'))">
+                                        when a.id=#{item.id} then #{item.averageScore}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('averageScoreIncrement')) or (colPickMode==1 and !item.containsKey('averageScoreIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.averageScore,0) + #{item.averageScoreIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
         </trim>
         where id in
         <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
@@ -1158,6 +1268,141 @@
                 ${_conditionType_} a.updateUserId <![CDATA[ <= ]]> #{${_conditionParam_}.updateUserIdEnd}
             </if>
 
+            <if test="conditionParamRef.containsKey('totalAddScore')">
+                <if test="conditionParamRef.totalAddScore != null ">
+                    ${_conditionType_} a.totalAddScore = #{${_conditionParam_}.totalAddScore}
+                </if>
+                <if test="conditionParamRef.totalAddScore == null">
+                    ${_conditionType_} a.totalAddScore is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('totalAddScoreList') and conditionParamRef.totalAddScoreList.size() > 0">
+                ${_conditionType_} a.totalAddScore in
+                <foreach collection="conditionParamRef.totalAddScoreList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('totalAddScoreNotList') and conditionParamRef.totalAddScoreNotList.size() > 0">
+                ${_conditionType_} a.totalAddScore not in
+                <foreach collection="conditionParamRef.totalAddScoreNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('totalAddScoreStart') and conditionParamRef.totalAddScoreStart != null">
+                ${_conditionType_} a.totalAddScore <![CDATA[ >= ]]> #{${_conditionParam_}.totalAddScoreStart}
+            </if>
+            <if test="conditionParamRef.containsKey('totalAddScoreEnd') and conditionParamRef.totalAddScoreEnd != null">
+                ${_conditionType_} a.totalAddScore <![CDATA[ <= ]]> #{${_conditionParam_}.totalAddScoreEnd}
+            </if>
+
+            <if test="conditionParamRef.containsKey('totalSubScore')">
+                <if test="conditionParamRef.totalSubScore != null ">
+                    ${_conditionType_} a.totalSubScore = #{${_conditionParam_}.totalSubScore}
+                </if>
+                <if test="conditionParamRef.totalSubScore == null">
+                    ${_conditionType_} a.totalSubScore is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('totalSubScoreList') and conditionParamRef.totalSubScoreList.size() > 0">
+                ${_conditionType_} a.totalSubScore in
+                <foreach collection="conditionParamRef.totalSubScoreList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('totalSubScoreNotList') and conditionParamRef.totalSubScoreNotList.size() > 0">
+                ${_conditionType_} a.totalSubScore not in
+                <foreach collection="conditionParamRef.totalSubScoreNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('totalSubScoreStart') and conditionParamRef.totalSubScoreStart != null">
+                ${_conditionType_} a.totalSubScore <![CDATA[ >= ]]> #{${_conditionParam_}.totalSubScoreStart}
+            </if>
+            <if test="conditionParamRef.containsKey('totalSubScoreEnd') and conditionParamRef.totalSubScoreEnd != null">
+                ${_conditionType_} a.totalSubScore <![CDATA[ <= ]]> #{${_conditionParam_}.totalSubScoreEnd}
+            </if>
+
+            <if test="conditionParamRef.containsKey('complainScoreAdd')">
+                <if test="conditionParamRef.complainScoreAdd != null ">
+                    ${_conditionType_} a.complainScoreAdd = #{${_conditionParam_}.complainScoreAdd}
+                </if>
+                <if test="conditionParamRef.complainScoreAdd == null">
+                    ${_conditionType_} a.complainScoreAdd is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('complainScoreAddList') and conditionParamRef.complainScoreAddList.size() > 0">
+                ${_conditionType_} a.complainScoreAdd in
+                <foreach collection="conditionParamRef.complainScoreAddList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('complainScoreAddNotList') and conditionParamRef.complainScoreAddNotList.size() > 0">
+                ${_conditionType_} a.complainScoreAdd not in
+                <foreach collection="conditionParamRef.complainScoreAddNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('complainScoreAddStart') and conditionParamRef.complainScoreAddStart != null">
+                ${_conditionType_} a.complainScoreAdd <![CDATA[ >= ]]> #{${_conditionParam_}.complainScoreAddStart}
+            </if>
+            <if test="conditionParamRef.containsKey('complainScoreAddEnd') and conditionParamRef.complainScoreAddEnd != null">
+                ${_conditionType_} a.complainScoreAdd <![CDATA[ <= ]]> #{${_conditionParam_}.complainScoreAddEnd}
+            </if>
+
+            <if test="conditionParamRef.containsKey('complainScoreSub')">
+                <if test="conditionParamRef.complainScoreSub != null ">
+                    ${_conditionType_} a.complainScoreSub = #{${_conditionParam_}.complainScoreSub}
+                </if>
+                <if test="conditionParamRef.complainScoreSub == null">
+                    ${_conditionType_} a.complainScoreSub is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('complainScoreSubList') and conditionParamRef.complainScoreSubList.size() > 0">
+                ${_conditionType_} a.complainScoreSub in
+                <foreach collection="conditionParamRef.complainScoreSubList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('complainScoreSubNotList') and conditionParamRef.complainScoreSubNotList.size() > 0">
+                ${_conditionType_} a.complainScoreSub not in
+                <foreach collection="conditionParamRef.complainScoreSubNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('complainScoreSubStart') and conditionParamRef.complainScoreSubStart != null">
+                ${_conditionType_} a.complainScoreSub <![CDATA[ >= ]]> #{${_conditionParam_}.complainScoreSubStart}
+            </if>
+            <if test="conditionParamRef.containsKey('complainScoreSubEnd') and conditionParamRef.complainScoreSubEnd != null">
+                ${_conditionType_} a.complainScoreSub <![CDATA[ <= ]]> #{${_conditionParam_}.complainScoreSubEnd}
+            </if>
+
+            <if test="conditionParamRef.containsKey('averageScore')">
+                <if test="conditionParamRef.averageScore != null ">
+                    ${_conditionType_} a.averageScore = #{${_conditionParam_}.averageScore}
+                </if>
+                <if test="conditionParamRef.averageScore == null">
+                    ${_conditionType_} a.averageScore is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('averageScoreList') and conditionParamRef.averageScoreList.size() > 0">
+                ${_conditionType_} a.averageScore in
+                <foreach collection="conditionParamRef.averageScoreList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('averageScoreNotList') and conditionParamRef.averageScoreNotList.size() > 0">
+                ${_conditionType_} a.averageScore not in
+                <foreach collection="conditionParamRef.averageScoreNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('averageScoreStart') and conditionParamRef.averageScoreStart != null">
+                ${_conditionType_} a.averageScore <![CDATA[ >= ]]> #{${_conditionParam_}.averageScoreStart}
+            </if>
+            <if test="conditionParamRef.containsKey('averageScoreEnd') and conditionParamRef.averageScoreEnd != null">
+                ${_conditionType_} a.averageScore <![CDATA[ <= ]]> #{${_conditionParam_}.averageScoreEnd}
+            </if>
+
     </sql>
     <sql id="_orderCols_">
         <if test="orderColList != null and !orderColList.isEmpty()">
@@ -1281,6 +1526,31 @@
                         <if test='orderCol.updateUserId != null and "DESC".equalsIgnoreCase(orderCol.updateUserId)'>DESC</if>
                         ,
                     </if>
+                    <if test="orderCol.containsKey('totalAddScore')">
+                        a.totalAddScore
+                        <if test='orderCol.totalAddScore != null and "DESC".equalsIgnoreCase(orderCol.totalAddScore)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('totalSubScore')">
+                        a.totalSubScore
+                        <if test='orderCol.totalSubScore != null and "DESC".equalsIgnoreCase(orderCol.totalSubScore)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('complainScoreAdd')">
+                        a.complainScoreAdd
+                        <if test='orderCol.complainScoreAdd != null and "DESC".equalsIgnoreCase(orderCol.complainScoreAdd)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('complainScoreSub')">
+                        a.complainScoreSub
+                        <if test='orderCol.complainScoreSub != null and "DESC".equalsIgnoreCase(orderCol.complainScoreSub)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('averageScore')">
+                        a.averageScore
+                        <if test='orderCol.averageScore != null and "DESC".equalsIgnoreCase(orderCol.averageScore)'>DESC</if>
+                        ,
+                    </if>
             </trim>
         </if>
     </sql>

attendance-performance-manager/src/main/resources/sqlmap/module/staff/StaffPerformStatMapper.xml

@@ -9,6 +9,13 @@
             <result property="deptId" column="deptId" />
             <result property="deptName" column="deptName" />
             <result property="totalScore" column="totalScore" />
+            <result property="remark" column="remark" />
+            <result property="year" column="year" />
+            <result property="month" column="month" />
+            <result property="createTime" column="createTime" />
+            <result property="createUserId" column="createUserId" />
+            <result property="updateTime" column="updateTime" />
+            <result property="updateUserId" column="updateUserId" />
             <result property="attendScoreAdd" column="attendScoreAdd" />
             <result property="attendScoreSub" column="attendScoreSub" />
             <result property="assessScoreAdd" column="assessScoreAdd" />
@@ -19,14 +26,11 @@
             <result property="effectScoreSub" column="effectScoreSub" />
             <result property="otherScoreAdd" column="otherScoreAdd" />
             <result property="otherScoreSub" column="otherScoreSub" />
-            <result property="remark" column="remark" />
-            <result property="year" column="year" />
-            <result property="month" column="month" />
             <result property="day" column="day" />
-            <result property="createTime" column="createTime" />
-            <result property="createUserId" column="createUserId" />
-            <result property="updateTime" column="updateTime" />
-            <result property="updateUserId" column="updateUserId" />
+            <result property="totalAddScore" column="totalAddScore" />
+            <result property="totalSubScore" column="totalSubScore" />
+            <result property="complainScoreAdd" column="complainScoreAdd" />
+            <result property="complainScoreSub" column="complainScoreSub" />
             
     </resultMap>
 
@@ -46,6 +50,27 @@
                 <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('totalScore') or colPickMode == 1 and data.containsKey('totalScore')))">
                     a.totalScore,
                 </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('remark') or colPickMode == 1 and data.containsKey('remark')))">
+                    a.remark,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('year') or colPickMode == 1 and data.containsKey('year')))">
+                    a.year,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('month') or colPickMode == 1 and data.containsKey('month')))">
+                    a.month,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
+                    a.createTime,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))">
+                    a.createUserId,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
+                    a.updateTime,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateUserId') or colPickMode == 1 and data.containsKey('updateUserId')))">
+                    a.updateUserId,
+                </if>
                 <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('attendScoreAdd') or colPickMode == 1 and data.containsKey('attendScoreAdd')))">
                     a.attendScoreAdd,
                 </if>
@@ -76,47 +101,38 @@
                 <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('otherScoreSub') or colPickMode == 1 and data.containsKey('otherScoreSub')))">
                     a.otherScoreSub,
                 </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('remark') or colPickMode == 1 and data.containsKey('remark')))">
-                    a.remark,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('year') or colPickMode == 1 and data.containsKey('year')))">
-                    a.year,
-                </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('month') or colPickMode == 1 and data.containsKey('month')))">
-                    a.month,
-                </if>
                 <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('day') or colPickMode == 1 and data.containsKey('day')))">
                     a.day,
                 </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
-                    a.createTime,
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('totalAddScore') or colPickMode == 1 and data.containsKey('totalAddScore')))">
+                    a.totalAddScore,
                 </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))">
-                    a.createUserId,
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('totalSubScore') or colPickMode == 1 and data.containsKey('totalSubScore')))">
+                    a.totalSubScore,
                 </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
-                    a.updateTime,
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('complainScoreAdd') or colPickMode == 1 and data.containsKey('complainScoreAdd')))">
+                    a.complainScoreAdd,
                 </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateUserId') or colPickMode == 1 and data.containsKey('updateUserId')))">
-                    a.updateUserId,
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('complainScoreSub') or colPickMode == 1 and data.containsKey('complainScoreSub')))">
+                    a.complainScoreSub,
                 </if>
         </trim>
     </sql>
     <!-- 新增 区分主键自增加还是业务插入 -->
     <insert id="insert" parameterType="StaffPerformStatEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_xhx_staff_perform_stat
-        (deptId,deptName,totalScore,attendScoreAdd,attendScoreSub,assessScoreAdd,assessScoreSub,workScoreAdd,workScoreSub,effectScoreAdd,effectScoreSub,otherScoreAdd,otherScoreSub,remark,year,month,day,createTime,createUserId,updateTime,updateUserId)
+        (deptId,deptName,totalScore,remark,year,month,createTime,createUserId,updateTime,updateUserId,attendScoreAdd,attendScoreSub,assessScoreAdd,assessScoreSub,workScoreAdd,workScoreSub,effectScoreAdd,effectScoreSub,otherScoreAdd,otherScoreSub,day,totalAddScore,totalSubScore,complainScoreAdd,complainScoreSub)
         VALUES
-        (#{deptId},#{deptName},#{totalScore},#{attendScoreAdd},#{attendScoreSub},#{assessScoreAdd},#{assessScoreSub},#{workScoreAdd},#{workScoreSub},#{effectScoreAdd},#{effectScoreSub},#{otherScoreAdd},#{otherScoreSub},#{remark},#{year},#{month},#{day},#{createTime},#{createUserId},#{updateTime},#{updateUserId})
+        (#{deptId},#{deptName},#{totalScore},#{remark},#{year},#{month},#{createTime},#{createUserId},#{updateTime},#{updateUserId},#{attendScoreAdd},#{attendScoreSub},#{assessScoreAdd},#{assessScoreSub},#{workScoreAdd},#{workScoreSub},#{effectScoreAdd},#{effectScoreSub},#{otherScoreAdd},#{otherScoreSub},#{day},#{totalAddScore},#{totalSubScore},#{complainScoreAdd},#{complainScoreSub})
     </insert>
 
     <!-- 批量新增 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_xhx_staff_perform_stat
-        (deptId,deptName,totalScore,attendScoreAdd,attendScoreSub,assessScoreAdd,assessScoreSub,workScoreAdd,workScoreSub,effectScoreAdd,effectScoreSub,otherScoreAdd,otherScoreSub,remark,year,month,day,createTime,createUserId,updateTime,updateUserId)
+        (deptId,deptName,totalScore,remark,year,month,createTime,createUserId,updateTime,updateUserId,attendScoreAdd,attendScoreSub,assessScoreAdd,assessScoreSub,workScoreAdd,workScoreSub,effectScoreAdd,effectScoreSub,otherScoreAdd,otherScoreSub,day,totalAddScore,totalSubScore,complainScoreAdd,complainScoreSub)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.deptId},#{item.deptName},#{item.totalScore},#{item.attendScoreAdd},#{item.attendScoreSub},#{item.assessScoreAdd},#{item.assessScoreSub},#{item.workScoreAdd},#{item.workScoreSub},#{item.effectScoreAdd},#{item.effectScoreSub},#{item.otherScoreAdd},#{item.otherScoreSub},#{item.remark},#{item.year},#{item.month},#{item.day},#{item.createTime},#{item.createUserId},#{item.updateTime},#{item.updateUserId})
+            (#{item.deptId},#{item.deptName},#{item.totalScore},#{item.remark},#{item.year},#{item.month},#{item.createTime},#{item.createUserId},#{item.updateTime},#{item.updateUserId},#{item.attendScoreAdd},#{item.attendScoreSub},#{item.assessScoreAdd},#{item.assessScoreSub},#{item.workScoreAdd},#{item.workScoreSub},#{item.effectScoreAdd},#{item.effectScoreSub},#{item.otherScoreAdd},#{item.otherScoreSub},#{item.day},#{item.totalAddScore},#{item.totalSubScore},#{item.complainScoreAdd},#{item.complainScoreSub})
         </foreach>
     </insert>
 
@@ -141,6 +157,39 @@
             <if test="(colPickMode==0 and data.containsKey('totalScoreIncrement')) or (colPickMode==1 and !data.containsKey('totalScoreIncrement'))">
                 a.totalScore=ifnull(a.totalScore,0) + #{data.totalScoreIncrement},
             </if>
+            <if test="(colPickMode==0 and data.containsKey('remark')) or (colPickMode==1 and !data.containsKey('remark'))">
+                a.remark=#{data.remark},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('year')) or (colPickMode==1 and !data.containsKey('year'))">
+                a.year=#{data.year},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('yearIncrement')) or (colPickMode==1 and !data.containsKey('yearIncrement'))">
+                a.year=ifnull(a.year,0) + #{data.yearIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('month')) or (colPickMode==1 and !data.containsKey('month'))">
+                a.month=#{data.month},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('monthIncrement')) or (colPickMode==1 and !data.containsKey('monthIncrement'))">
+                a.month=ifnull(a.month,0) + #{data.monthIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))">
+                a.createTime=#{data.createTime},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('createUserId')) or (colPickMode==1 and !data.containsKey('createUserId'))">
+                a.createUserId=#{data.createUserId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('createUserIdIncrement')) or (colPickMode==1 and !data.containsKey('createUserIdIncrement'))">
+                a.createUserId=ifnull(a.createUserId,0) + #{data.createUserIdIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
+                a.updateTime=#{data.updateTime},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('updateUserId')) or (colPickMode==1 and !data.containsKey('updateUserId'))">
+                a.updateUserId=#{data.updateUserId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !data.containsKey('updateUserIdIncrement'))">
+                a.updateUserId=ifnull(a.updateUserId,0) + #{data.updateUserIdIncrement},
+            </if>
             <if test="(colPickMode==0 and data.containsKey('attendScoreAdd')) or (colPickMode==1 and !data.containsKey('attendScoreAdd'))">
                 a.attendScoreAdd=#{data.attendScoreAdd},
             </if>
@@ -201,44 +250,35 @@
             <if test="(colPickMode==0 and data.containsKey('otherScoreSubIncrement')) or (colPickMode==1 and !data.containsKey('otherScoreSubIncrement'))">
                 a.otherScoreSub=ifnull(a.otherScoreSub,0) + #{data.otherScoreSubIncrement},
             </if>
-            <if test="(colPickMode==0 and data.containsKey('remark')) or (colPickMode==1 and !data.containsKey('remark'))">
-                a.remark=#{data.remark},
-            </if>
-            <if test="(colPickMode==0 and data.containsKey('year')) or (colPickMode==1 and !data.containsKey('year'))">
-                a.year=#{data.year},
-            </if>
-            <if test="(colPickMode==0 and data.containsKey('yearIncrement')) or (colPickMode==1 and !data.containsKey('yearIncrement'))">
-                a.year=ifnull(a.year,0) + #{data.yearIncrement},
-            </if>
-            <if test="(colPickMode==0 and data.containsKey('month')) or (colPickMode==1 and !data.containsKey('month'))">
-                a.month=#{data.month},
-            </if>
-            <if test="(colPickMode==0 and data.containsKey('monthIncrement')) or (colPickMode==1 and !data.containsKey('monthIncrement'))">
-                a.month=ifnull(a.month,0) + #{data.monthIncrement},
-            </if>
             <if test="(colPickMode==0 and data.containsKey('day')) or (colPickMode==1 and !data.containsKey('day'))">
                 a.day=#{data.day},
             </if>
             <if test="(colPickMode==0 and data.containsKey('dayIncrement')) or (colPickMode==1 and !data.containsKey('dayIncrement'))">
                 a.day=ifnull(a.day,0) + #{data.dayIncrement},
             </if>
-            <if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))">
-                a.createTime=#{data.createTime},
+            <if test="(colPickMode==0 and data.containsKey('totalAddScore')) or (colPickMode==1 and !data.containsKey('totalAddScore'))">
+                a.totalAddScore=#{data.totalAddScore},
             </if>
-            <if test="(colPickMode==0 and data.containsKey('createUserId')) or (colPickMode==1 and !data.containsKey('createUserId'))">
-                a.createUserId=#{data.createUserId},
+            <if test="(colPickMode==0 and data.containsKey('totalAddScoreIncrement')) or (colPickMode==1 and !data.containsKey('totalAddScoreIncrement'))">
+                a.totalAddScore=ifnull(a.totalAddScore,0) + #{data.totalAddScoreIncrement},
             </if>
-            <if test="(colPickMode==0 and data.containsKey('createUserIdIncrement')) or (colPickMode==1 and !data.containsKey('createUserIdIncrement'))">
-                a.createUserId=ifnull(a.createUserId,0) + #{data.createUserIdIncrement},
+            <if test="(colPickMode==0 and data.containsKey('totalSubScore')) or (colPickMode==1 and !data.containsKey('totalSubScore'))">
+                a.totalSubScore=#{data.totalSubScore},
             </if>
-            <if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
-                a.updateTime=#{data.updateTime},
+            <if test="(colPickMode==0 and data.containsKey('totalSubScoreIncrement')) or (colPickMode==1 and !data.containsKey('totalSubScoreIncrement'))">
+                a.totalSubScore=ifnull(a.totalSubScore,0) + #{data.totalSubScoreIncrement},
             </if>
-            <if test="(colPickMode==0 and data.containsKey('updateUserId')) or (colPickMode==1 and !data.containsKey('updateUserId'))">
-                a.updateUserId=#{data.updateUserId},
+            <if test="(colPickMode==0 and data.containsKey('complainScoreAdd')) or (colPickMode==1 and !data.containsKey('complainScoreAdd'))">
+                a.complainScoreAdd=#{data.complainScoreAdd},
             </if>
-            <if test="(colPickMode==0 and data.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !data.containsKey('updateUserIdIncrement'))">
-                a.updateUserId=ifnull(a.updateUserId,0) + #{data.updateUserIdIncrement},
+            <if test="(colPickMode==0 and data.containsKey('complainScoreAddIncrement')) or (colPickMode==1 and !data.containsKey('complainScoreAddIncrement'))">
+                a.complainScoreAdd=ifnull(a.complainScoreAdd,0) + #{data.complainScoreAddIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('complainScoreSub')) or (colPickMode==1 and !data.containsKey('complainScoreSub'))">
+                a.complainScoreSub=#{data.complainScoreSub},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('complainScoreSubIncrement')) or (colPickMode==1 and !data.containsKey('complainScoreSubIncrement'))">
+                a.complainScoreSub=ifnull(a.complainScoreSub,0) + #{data.complainScoreSubIncrement},
             </if>
         </trim>
         <trim suffixOverrides="where" suffix="">
@@ -283,6 +323,75 @@
                                 </choose>
                             </foreach>
                         </trim>
+                <trim prefix="remark=(case" suffix="ELSE remark end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('remark')) or (colPickMode==1 and !item.containsKey('remark'))">
+                            when a.id=#{item.id} then #{item.remark}
+                        </if>
+                    </foreach>
+                </trim>
+                        <trim prefix="year=(case" suffix="ELSE year end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('year')) or (colPickMode==1 and !item.containsKey('year'))">
+                                        when a.id=#{item.id} then #{item.year}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('yearIncrement')) or (colPickMode==1 and !item.containsKey('yearIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.year,0) + #{item.yearIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                        <trim prefix="month=(case" suffix="ELSE month end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('month')) or (colPickMode==1 and !item.containsKey('month'))">
+                                        when a.id=#{item.id} then #{item.month}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('monthIncrement')) or (colPickMode==1 and !item.containsKey('monthIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.month,0) + #{item.monthIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                <trim prefix="createTime=(case" suffix="ELSE createTime end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
+                            when a.id=#{item.id} then #{item.createTime}
+                        </if>
+                    </foreach>
+                </trim>
+                        <trim prefix="createUserId=(case" suffix="ELSE createUserId end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))">
+                                        when a.id=#{item.id} then #{item.createUserId}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('createUserIdIncrement')) or (colPickMode==1 and !item.containsKey('createUserIdIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.createUserId,0) + #{item.createUserIdIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                <trim prefix="updateTime=(case" suffix="ELSE updateTime end),">
+                    <foreach collection="data.dataList" item="item" index="index" separator="" >
+                        <if test="(colPickMode==0 and item.containsKey('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))">
+                            when a.id=#{item.id} then #{item.updateTime}
+                        </if>
+                    </foreach>
+                </trim>
+                        <trim prefix="updateUserId=(case" suffix="ELSE updateUserId end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('updateUserId')) or (colPickMode==1 and !item.containsKey('updateUserId'))">
+                                        when a.id=#{item.id} then #{item.updateUserId}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !item.containsKey('updateUserIdIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.updateUserId,0) + #{item.updateUserIdIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
                         <trim prefix="attendScoreAdd=(case" suffix="ELSE attendScoreAdd end),">
                             <foreach collection="data.dataList" item="item" index="index" separator="" >
                                 <choose>
@@ -403,83 +512,62 @@
                                 </choose>
                             </foreach>
                         </trim>
-                <trim prefix="remark=(case" suffix="ELSE remark end),">
-                    <foreach collection="data.dataList" item="item" index="index" separator="" >
-                        <if test="(colPickMode==0 and item.containsKey('remark')) or (colPickMode==1 and !item.containsKey('remark'))">
-                            when a.id=#{item.id} then #{item.remark}
-                        </if>
-                    </foreach>
-                </trim>
-                        <trim prefix="year=(case" suffix="ELSE year end),">
+                        <trim prefix="day=(case" suffix="ELSE day end),">
                             <foreach collection="data.dataList" item="item" index="index" separator="" >
                                 <choose>
-                                    <when test="(colPickMode==0 and item.containsKey('year')) or (colPickMode==1 and !item.containsKey('year'))">
-                                        when a.id=#{item.id} then #{item.year}
+                                    <when test="(colPickMode==0 and item.containsKey('day')) or (colPickMode==1 and !item.containsKey('day'))">
+                                        when a.id=#{item.id} then #{item.day}
                                     </when>
-                                    <when test="(colPickMode==0 and item.containsKey('yearIncrement')) or (colPickMode==1 and !item.containsKey('yearIncrement'))">
-                                        when a.id=#{item.id} then ifnull(a.year,0) + #{item.yearIncrement}
+                                    <when test="(colPickMode==0 and item.containsKey('dayIncrement')) or (colPickMode==1 and !item.containsKey('dayIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.day,0) + #{item.dayIncrement}
                                     </when>
                                 </choose>
                             </foreach>
                         </trim>
-                        <trim prefix="month=(case" suffix="ELSE month end),">
+                        <trim prefix="totalAddScore=(case" suffix="ELSE totalAddScore end),">
                             <foreach collection="data.dataList" item="item" index="index" separator="" >
                                 <choose>
-                                    <when test="(colPickMode==0 and item.containsKey('month')) or (colPickMode==1 and !item.containsKey('month'))">
-                                        when a.id=#{item.id} then #{item.month}
+                                    <when test="(colPickMode==0 and item.containsKey('totalAddScore')) or (colPickMode==1 and !item.containsKey('totalAddScore'))">
+                                        when a.id=#{item.id} then #{item.totalAddScore}
                                     </when>
-                                    <when test="(colPickMode==0 and item.containsKey('monthIncrement')) or (colPickMode==1 and !item.containsKey('monthIncrement'))">
-                                        when a.id=#{item.id} then ifnull(a.month,0) + #{item.monthIncrement}
+                                    <when test="(colPickMode==0 and item.containsKey('totalAddScoreIncrement')) or (colPickMode==1 and !item.containsKey('totalAddScoreIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.totalAddScore,0) + #{item.totalAddScoreIncrement}
                                     </when>
                                 </choose>
                             </foreach>
                         </trim>
-                        <trim prefix="day=(case" suffix="ELSE day end),">
+                        <trim prefix="totalSubScore=(case" suffix="ELSE totalSubScore end),">
                             <foreach collection="data.dataList" item="item" index="index" separator="" >
                                 <choose>
-                                    <when test="(colPickMode==0 and item.containsKey('day')) or (colPickMode==1 and !item.containsKey('day'))">
-                                        when a.id=#{item.id} then #{item.day}
+                                    <when test="(colPickMode==0 and item.containsKey('totalSubScore')) or (colPickMode==1 and !item.containsKey('totalSubScore'))">
+                                        when a.id=#{item.id} then #{item.totalSubScore}
                                     </when>
-                                    <when test="(colPickMode==0 and item.containsKey('dayIncrement')) or (colPickMode==1 and !item.containsKey('dayIncrement'))">
-                                        when a.id=#{item.id} then ifnull(a.day,0) + #{item.dayIncrement}
+                                    <when test="(colPickMode==0 and item.containsKey('totalSubScoreIncrement')) or (colPickMode==1 and !item.containsKey('totalSubScoreIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.totalSubScore,0) + #{item.totalSubScoreIncrement}
                                     </when>
                                 </choose>
                             </foreach>
                         </trim>
-                <trim prefix="createTime=(case" suffix="ELSE createTime end),">
-                    <foreach collection="data.dataList" item="item" index="index" separator="" >
-                        <if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
-                            when a.id=#{item.id} then #{item.createTime}
-                        </if>
-                    </foreach>
-                </trim>
-                        <trim prefix="createUserId=(case" suffix="ELSE createUserId end),">
+                        <trim prefix="complainScoreAdd=(case" suffix="ELSE complainScoreAdd end),">
                             <foreach collection="data.dataList" item="item" index="index" separator="" >
                                 <choose>
-                                    <when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))">
-                                        when a.id=#{item.id} then #{item.createUserId}
+                                    <when test="(colPickMode==0 and item.containsKey('complainScoreAdd')) or (colPickMode==1 and !item.containsKey('complainScoreAdd'))">
+                                        when a.id=#{item.id} then #{item.complainScoreAdd}
                                     </when>
-                                    <when test="(colPickMode==0 and item.containsKey('createUserIdIncrement')) or (colPickMode==1 and !item.containsKey('createUserIdIncrement'))">
-                                        when a.id=#{item.id} then ifnull(a.createUserId,0) + #{item.createUserIdIncrement}
+                                    <when test="(colPickMode==0 and item.containsKey('complainScoreAddIncrement')) or (colPickMode==1 and !item.containsKey('complainScoreAddIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.complainScoreAdd,0) + #{item.complainScoreAddIncrement}
                                     </when>
                                 </choose>
                             </foreach>
                         </trim>
-                <trim prefix="updateTime=(case" suffix="ELSE updateTime end),">
-                    <foreach collection="data.dataList" item="item" index="index" separator="" >
-                        <if test="(colPickMode==0 and item.containsKey('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))">
-                            when a.id=#{item.id} then #{item.updateTime}
-                        </if>
-                    </foreach>
-                </trim>
-                        <trim prefix="updateUserId=(case" suffix="ELSE updateUserId end),">
+                        <trim prefix="complainScoreSub=(case" suffix="ELSE complainScoreSub end),">
                             <foreach collection="data.dataList" item="item" index="index" separator="" >
                                 <choose>
-                                    <when test="(colPickMode==0 and item.containsKey('updateUserId')) or (colPickMode==1 and !item.containsKey('updateUserId'))">
-                                        when a.id=#{item.id} then #{item.updateUserId}
+                                    <when test="(colPickMode==0 and item.containsKey('complainScoreSub')) or (colPickMode==1 and !item.containsKey('complainScoreSub'))">
+                                        when a.id=#{item.id} then #{item.complainScoreSub}
                                     </when>
-                                    <when test="(colPickMode==0 and item.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !item.containsKey('updateUserIdIncrement'))">
-                                        when a.id=#{item.id} then ifnull(a.updateUserId,0) + #{item.updateUserIdIncrement}
+                                    <when test="(colPickMode==0 and item.containsKey('complainScoreSubIncrement')) or (colPickMode==1 and !item.containsKey('complainScoreSubIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.complainScoreSub,0) + #{item.complainScoreSubIncrement}
                                     </when>
                                 </choose>
                             </foreach>
@@ -702,25 +790,184 @@
                 ${_conditionType_} a.totalScore <![CDATA[ <= ]]> #{${_conditionParam_}.totalScoreEnd}
             </if>
 
-            <if test="conditionParamRef.containsKey('attendScoreAdd')">
-                <if test="conditionParamRef.attendScoreAdd != null ">
-                    ${_conditionType_} a.attendScoreAdd = #{${_conditionParam_}.attendScoreAdd}
+
+            <if test="conditionParamRef.containsKey('remark')">
+                <if test="conditionParamRef.remark != null and conditionParamRef.remark != ''">
+                    ${_conditionType_} a.remark like #{${_conditionParam_}.remark}
                 </if>
-                <if test="conditionParamRef.attendScoreAdd == null">
-                    ${_conditionType_} a.attendScoreAdd is null
+                <if test="conditionParamRef.remark == null">
+                    ${_conditionType_} a.remark is null
                 </if>
             </if>
-            <if test="conditionParamRef.containsKey('attendScoreAddList') and conditionParamRef.attendScoreAddList.size() > 0">
-                ${_conditionType_} a.attendScoreAdd in
-                <foreach collection="conditionParamRef.attendScoreAddList" open="(" close=")" index="index" item="item" separator=",">
+            <if test="conditionParamRef.containsKey('remarkList') and conditionParamRef.remarkList.size() > 0">
+                ${_conditionType_} a.remark in
+                <foreach collection="conditionParamRef.remarkList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
             </if>
-            <if test="conditionParamRef.containsKey('attendScoreAddNotList') and conditionParamRef.attendScoreAddNotList.size() > 0">
-                ${_conditionType_} a.attendScoreAdd not in
-                <foreach collection="conditionParamRef.attendScoreAddNotList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
+            <if test="conditionParamRef.containsKey('remarkNotList') and conditionParamRef.remarkNotList.size() > 0">
+                ${_conditionType_} a.remark not in
+                <foreach collection="conditionParamRef.remarkNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('year')">
+                <if test="conditionParamRef.year != null ">
+                    ${_conditionType_} a.year = #{${_conditionParam_}.year}
+                </if>
+                <if test="conditionParamRef.year == null">
+                    ${_conditionType_} a.year is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('yearList') and conditionParamRef.yearList.size() > 0">
+                ${_conditionType_} a.year in
+                <foreach collection="conditionParamRef.yearList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('yearNotList') and conditionParamRef.yearNotList.size() > 0">
+                ${_conditionType_} a.year not in
+                <foreach collection="conditionParamRef.yearNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('yearStart') and conditionParamRef.yearStart != null">
+                ${_conditionType_} a.year <![CDATA[ >= ]]> #{${_conditionParam_}.yearStart}
+            </if>
+            <if test="conditionParamRef.containsKey('yearEnd') and conditionParamRef.yearEnd != null">
+                ${_conditionType_} a.year <![CDATA[ <= ]]> #{${_conditionParam_}.yearEnd}
+            </if>
+
+            <if test="conditionParamRef.containsKey('month')">
+                <if test="conditionParamRef.month != null ">
+                    ${_conditionType_} a.month = #{${_conditionParam_}.month}
+                </if>
+                <if test="conditionParamRef.month == null">
+                    ${_conditionType_} a.month is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('monthList') and conditionParamRef.monthList.size() > 0">
+                ${_conditionType_} a.month in
+                <foreach collection="conditionParamRef.monthList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('monthNotList') and conditionParamRef.monthNotList.size() > 0">
+                ${_conditionType_} a.month not in
+                <foreach collection="conditionParamRef.monthNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('monthStart') and conditionParamRef.monthStart != null">
+                ${_conditionType_} a.month <![CDATA[ >= ]]> #{${_conditionParam_}.monthStart}
+            </if>
+            <if test="conditionParamRef.containsKey('monthEnd') and conditionParamRef.monthEnd != null">
+                ${_conditionType_} a.month <![CDATA[ <= ]]> #{${_conditionParam_}.monthEnd}
+            </if>
+
+
+            <if test="conditionParamRef.containsKey('createTime')">
+                <if test="conditionParamRef.createTime != null ">
+                    ${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
+                </if>
+                <if test="conditionParamRef.createTime == null">
+                    ${_conditionType_} a.createTime is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
+                ${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+            <if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''">
+                ${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+            <if test="conditionParamRef.containsKey('createUserId')">
+                <if test="conditionParamRef.createUserId != null ">
+                    ${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
+                </if>
+                <if test="conditionParamRef.createUserId == null">
+                    ${_conditionType_} a.createUserId is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
+                ${_conditionType_} a.createUserId in
+                <foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('createUserIdNotList') and conditionParamRef.createUserIdNotList.size() > 0">
+                ${_conditionType_} a.createUserId not in
+                <foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
+                ${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
+            </if>
+            <if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null">
+                ${_conditionType_} a.createUserId <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd}
+            </if>
+
+
+            <if test="conditionParamRef.containsKey('updateTime')">
+                <if test="conditionParamRef.updateTime != null ">
+                    ${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime}
+                </if>
+                <if test="conditionParamRef.updateTime == null">
+                    ${_conditionType_} a.updateTime is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('updateTimeStart') and conditionParamRef.updateTimeStart != null and conditionParamRef.updateTimeStart!=''">
+                ${_conditionType_} a.updateTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+            <if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
+                ${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+            </if>
+            <if test="conditionParamRef.containsKey('updateUserId')">
+                <if test="conditionParamRef.updateUserId != null ">
+                    ${_conditionType_} a.updateUserId = #{${_conditionParam_}.updateUserId}
+                </if>
+                <if test="conditionParamRef.updateUserId == null">
+                    ${_conditionType_} a.updateUserId is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
+                ${_conditionType_} a.updateUserId in
+                <foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('updateUserIdNotList') and conditionParamRef.updateUserIdNotList.size() > 0">
+                ${_conditionType_} a.updateUserId not in
+                <foreach collection="conditionParamRef.updateUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null">
+                ${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart}
+            </if>
+            <if test="conditionParamRef.containsKey('updateUserIdEnd') and conditionParamRef.updateUserIdEnd != null">
+                ${_conditionType_} a.updateUserId <![CDATA[ <= ]]> #{${_conditionParam_}.updateUserIdEnd}
+            </if>
+
+            <if test="conditionParamRef.containsKey('attendScoreAdd')">
+                <if test="conditionParamRef.attendScoreAdd != null ">
+                    ${_conditionType_} a.attendScoreAdd = #{${_conditionParam_}.attendScoreAdd}
+                </if>
+                <if test="conditionParamRef.attendScoreAdd == null">
+                    ${_conditionType_} a.attendScoreAdd is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('attendScoreAddList') and conditionParamRef.attendScoreAddList.size() > 0">
+                ${_conditionType_} a.attendScoreAdd in
+                <foreach collection="conditionParamRef.attendScoreAddList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('attendScoreAddNotList') and conditionParamRef.attendScoreAddNotList.size() > 0">
+                ${_conditionType_} a.attendScoreAdd not in
+                <foreach collection="conditionParamRef.attendScoreAddNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
             </if>
             <if test="conditionParamRef.containsKey('attendScoreAddStart') and conditionParamRef.attendScoreAddStart != null">
                 ${_conditionType_} a.attendScoreAdd <![CDATA[ >= ]]> #{${_conditionParam_}.attendScoreAddStart}
@@ -972,81 +1219,6 @@
                 ${_conditionType_} a.otherScoreSub <![CDATA[ <= ]]> #{${_conditionParam_}.otherScoreSubEnd}
             </if>
 
-
-            <if test="conditionParamRef.containsKey('remark')">
-                <if test="conditionParamRef.remark != null and conditionParamRef.remark != ''">
-                    ${_conditionType_} a.remark like #{${_conditionParam_}.remark}
-                </if>
-                <if test="conditionParamRef.remark == null">
-                    ${_conditionType_} a.remark is null
-                </if>
-            </if>
-            <if test="conditionParamRef.containsKey('remarkList') and conditionParamRef.remarkList.size() > 0">
-                ${_conditionType_} a.remark in
-                <foreach collection="conditionParamRef.remarkList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="conditionParamRef.containsKey('remarkNotList') and conditionParamRef.remarkNotList.size() > 0">
-                ${_conditionType_} a.remark not in
-                <foreach collection="conditionParamRef.remarkNotList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="conditionParamRef.containsKey('year')">
-                <if test="conditionParamRef.year != null ">
-                    ${_conditionType_} a.year = #{${_conditionParam_}.year}
-                </if>
-                <if test="conditionParamRef.year == null">
-                    ${_conditionType_} a.year is null
-                </if>
-            </if>
-            <if test="conditionParamRef.containsKey('yearList') and conditionParamRef.yearList.size() > 0">
-                ${_conditionType_} a.year in
-                <foreach collection="conditionParamRef.yearList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="conditionParamRef.containsKey('yearNotList') and conditionParamRef.yearNotList.size() > 0">
-                ${_conditionType_} a.year not in
-                <foreach collection="conditionParamRef.yearNotList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="conditionParamRef.containsKey('yearStart') and conditionParamRef.yearStart != null">
-                ${_conditionType_} a.year <![CDATA[ >= ]]> #{${_conditionParam_}.yearStart}
-            </if>
-            <if test="conditionParamRef.containsKey('yearEnd') and conditionParamRef.yearEnd != null">
-                ${_conditionType_} a.year <![CDATA[ <= ]]> #{${_conditionParam_}.yearEnd}
-            </if>
-
-            <if test="conditionParamRef.containsKey('month')">
-                <if test="conditionParamRef.month != null ">
-                    ${_conditionType_} a.month = #{${_conditionParam_}.month}
-                </if>
-                <if test="conditionParamRef.month == null">
-                    ${_conditionType_} a.month is null
-                </if>
-            </if>
-            <if test="conditionParamRef.containsKey('monthList') and conditionParamRef.monthList.size() > 0">
-                ${_conditionType_} a.month in
-                <foreach collection="conditionParamRef.monthList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="conditionParamRef.containsKey('monthNotList') and conditionParamRef.monthNotList.size() > 0">
-                ${_conditionType_} a.month not in
-                <foreach collection="conditionParamRef.monthNotList" open="(" close=")" index="index" item="item" separator=",">
-                    #{item}
-                </foreach>
-            </if>
-            <if test="conditionParamRef.containsKey('monthStart') and conditionParamRef.monthStart != null">
-                ${_conditionType_} a.month <![CDATA[ >= ]]> #{${_conditionParam_}.monthStart}
-            </if>
-            <if test="conditionParamRef.containsKey('monthEnd') and conditionParamRef.monthEnd != null">
-                ${_conditionType_} a.month <![CDATA[ <= ]]> #{${_conditionParam_}.monthEnd}
-            </if>
-
             <if test="conditionParamRef.containsKey('day')">
                 <if test="conditionParamRef.day != null ">
                     ${_conditionType_} a.day = #{${_conditionParam_}.day}
@@ -1074,88 +1246,112 @@
                 ${_conditionType_} a.day <![CDATA[ <= ]]> #{${_conditionParam_}.dayEnd}
             </if>
 
-
-            <if test="conditionParamRef.containsKey('createTime')">
-                <if test="conditionParamRef.createTime != null ">
-                    ${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
+            <if test="conditionParamRef.containsKey('totalAddScore')">
+                <if test="conditionParamRef.totalAddScore != null ">
+                    ${_conditionType_} a.totalAddScore = #{${_conditionParam_}.totalAddScore}
                 </if>
-                <if test="conditionParamRef.createTime == null">
-                    ${_conditionType_} a.createTime is null
+                <if test="conditionParamRef.totalAddScore == null">
+                    ${_conditionType_} a.totalAddScore is null
                 </if>
             </if>
-            <if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
-                ${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+            <if test="conditionParamRef.containsKey('totalAddScoreList') and conditionParamRef.totalAddScoreList.size() > 0">
+                ${_conditionType_} a.totalAddScore in
+                <foreach collection="conditionParamRef.totalAddScoreList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
             </if>
-            <if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''">
-                ${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+            <if test="conditionParamRef.containsKey('totalAddScoreNotList') and conditionParamRef.totalAddScoreNotList.size() > 0">
+                ${_conditionType_} a.totalAddScore not in
+                <foreach collection="conditionParamRef.totalAddScoreNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
             </if>
-            <if test="conditionParamRef.containsKey('createUserId')">
-                <if test="conditionParamRef.createUserId != null ">
-                    ${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
+            <if test="conditionParamRef.containsKey('totalAddScoreStart') and conditionParamRef.totalAddScoreStart != null">
+                ${_conditionType_} a.totalAddScore <![CDATA[ >= ]]> #{${_conditionParam_}.totalAddScoreStart}
+            </if>
+            <if test="conditionParamRef.containsKey('totalAddScoreEnd') and conditionParamRef.totalAddScoreEnd != null">
+                ${_conditionType_} a.totalAddScore <![CDATA[ <= ]]> #{${_conditionParam_}.totalAddScoreEnd}
+            </if>
+
+            <if test="conditionParamRef.containsKey('totalSubScore')">
+                <if test="conditionParamRef.totalSubScore != null ">
+                    ${_conditionType_} a.totalSubScore = #{${_conditionParam_}.totalSubScore}
                 </if>
-                <if test="conditionParamRef.createUserId == null">
-                    ${_conditionType_} a.createUserId is null
+                <if test="conditionParamRef.totalSubScore == null">
+                    ${_conditionType_} a.totalSubScore is null
                 </if>
             </if>
-            <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
-                ${_conditionType_} a.createUserId in
-                <foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
+            <if test="conditionParamRef.containsKey('totalSubScoreList') and conditionParamRef.totalSubScoreList.size() > 0">
+                ${_conditionType_} a.totalSubScore in
+                <foreach collection="conditionParamRef.totalSubScoreList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
             </if>
-            <if test="conditionParamRef.containsKey('createUserIdNotList') and conditionParamRef.createUserIdNotList.size() > 0">
-                ${_conditionType_} a.createUserId not in
-                <foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
+            <if test="conditionParamRef.containsKey('totalSubScoreNotList') and conditionParamRef.totalSubScoreNotList.size() > 0">
+                ${_conditionType_} a.totalSubScore not in
+                <foreach collection="conditionParamRef.totalSubScoreNotList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
             </if>
-            <if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
-                ${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
+            <if test="conditionParamRef.containsKey('totalSubScoreStart') and conditionParamRef.totalSubScoreStart != null">
+                ${_conditionType_} a.totalSubScore <![CDATA[ >= ]]> #{${_conditionParam_}.totalSubScoreStart}
             </if>
-            <if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null">
-                ${_conditionType_} a.createUserId <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd}
+            <if test="conditionParamRef.containsKey('totalSubScoreEnd') and conditionParamRef.totalSubScoreEnd != null">
+                ${_conditionType_} a.totalSubScore <![CDATA[ <= ]]> #{${_conditionParam_}.totalSubScoreEnd}
             </if>
 
-
-            <if test="conditionParamRef.containsKey('updateTime')">
-                <if test="conditionParamRef.updateTime != null ">
-                    ${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime}
+            <if test="conditionParamRef.containsKey('complainScoreAdd')">
+                <if test="conditionParamRef.complainScoreAdd != null ">
+                    ${_conditionType_} a.complainScoreAdd = #{${_conditionParam_}.complainScoreAdd}
                 </if>
-                <if test="conditionParamRef.updateTime == null">
-                    ${_conditionType_} a.updateTime is null
+                <if test="conditionParamRef.complainScoreAdd == null">
+                    ${_conditionType_} a.complainScoreAdd is null
                 </if>
             </if>
-            <if test="conditionParamRef.containsKey('updateTimeStart') and conditionParamRef.updateTimeStart != null and conditionParamRef.updateTimeStart!=''">
-                ${_conditionType_} a.updateTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
+            <if test="conditionParamRef.containsKey('complainScoreAddList') and conditionParamRef.complainScoreAddList.size() > 0">
+                ${_conditionType_} a.complainScoreAdd in
+                <foreach collection="conditionParamRef.complainScoreAddList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
             </if>
-            <if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
-                ${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
+            <if test="conditionParamRef.containsKey('complainScoreAddNotList') and conditionParamRef.complainScoreAddNotList.size() > 0">
+                ${_conditionType_} a.complainScoreAdd not in
+                <foreach collection="conditionParamRef.complainScoreAddNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
             </if>
-            <if test="conditionParamRef.containsKey('updateUserId')">
-                <if test="conditionParamRef.updateUserId != null ">
-                    ${_conditionType_} a.updateUserId = #{${_conditionParam_}.updateUserId}
+            <if test="conditionParamRef.containsKey('complainScoreAddStart') and conditionParamRef.complainScoreAddStart != null">
+                ${_conditionType_} a.complainScoreAdd <![CDATA[ >= ]]> #{${_conditionParam_}.complainScoreAddStart}
+            </if>
+            <if test="conditionParamRef.containsKey('complainScoreAddEnd') and conditionParamRef.complainScoreAddEnd != null">
+                ${_conditionType_} a.complainScoreAdd <![CDATA[ <= ]]> #{${_conditionParam_}.complainScoreAddEnd}
+            </if>
+
+            <if test="conditionParamRef.containsKey('complainScoreSub')">
+                <if test="conditionParamRef.complainScoreSub != null ">
+                    ${_conditionType_} a.complainScoreSub = #{${_conditionParam_}.complainScoreSub}
                 </if>
-                <if test="conditionParamRef.updateUserId == null">
-                    ${_conditionType_} a.updateUserId is null
+                <if test="conditionParamRef.complainScoreSub == null">
+                    ${_conditionType_} a.complainScoreSub is null
                 </if>
             </if>
-            <if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
-                ${_conditionType_} a.updateUserId in
-                <foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=",">
+            <if test="conditionParamRef.containsKey('complainScoreSubList') and conditionParamRef.complainScoreSubList.size() > 0">
+                ${_conditionType_} a.complainScoreSub in
+                <foreach collection="conditionParamRef.complainScoreSubList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
             </if>
-            <if test="conditionParamRef.containsKey('updateUserIdNotList') and conditionParamRef.updateUserIdNotList.size() > 0">
-                ${_conditionType_} a.updateUserId not in
-                <foreach collection="conditionParamRef.updateUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
+            <if test="conditionParamRef.containsKey('complainScoreSubNotList') and conditionParamRef.complainScoreSubNotList.size() > 0">
+                ${_conditionType_} a.complainScoreSub not in
+                <foreach collection="conditionParamRef.complainScoreSubNotList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
             </if>
-            <if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null">
-                ${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart}
+            <if test="conditionParamRef.containsKey('complainScoreSubStart') and conditionParamRef.complainScoreSubStart != null">
+                ${_conditionType_} a.complainScoreSub <![CDATA[ >= ]]> #{${_conditionParam_}.complainScoreSubStart}
             </if>
-            <if test="conditionParamRef.containsKey('updateUserIdEnd') and conditionParamRef.updateUserIdEnd != null">
-                ${_conditionType_} a.updateUserId <![CDATA[ <= ]]> #{${_conditionParam_}.updateUserIdEnd}
+            <if test="conditionParamRef.containsKey('complainScoreSubEnd') and conditionParamRef.complainScoreSubEnd != null">
+                ${_conditionType_} a.complainScoreSub <![CDATA[ <= ]]> #{${_conditionParam_}.complainScoreSubEnd}
             </if>
 
     </sql>
@@ -1191,6 +1387,41 @@
                         <if test='orderCol.totalScore != null and "DESC".equalsIgnoreCase(orderCol.totalScore)'>DESC</if>
                         ,
                     </if>
+                    <if test="orderCol.containsKey('remark')">
+                        a.remark
+                        <if test='orderCol.remark != null and "DESC".equalsIgnoreCase(orderCol.remark)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('year')">
+                        a.year
+                        <if test='orderCol.year != null and "DESC".equalsIgnoreCase(orderCol.year)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('month')">
+                        a.month
+                        <if test='orderCol.month != null and "DESC".equalsIgnoreCase(orderCol.month)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('createTime')">
+                        a.createTime
+                        <if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('createUserId')">
+                        a.createUserId
+                        <if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('updateTime')">
+                        a.updateTime
+                        <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('updateUserId')">
+                        a.updateUserId
+                        <if test='orderCol.updateUserId != null and "DESC".equalsIgnoreCase(orderCol.updateUserId)'>DESC</if>
+                        ,
+                    </if>
                     <if test="orderCol.containsKey('attendScoreAdd')">
                         a.attendScoreAdd
                         <if test='orderCol.attendScoreAdd != null and "DESC".equalsIgnoreCase(orderCol.attendScoreAdd)'>DESC</if>
@@ -1241,44 +1472,29 @@
                         <if test='orderCol.otherScoreSub != null and "DESC".equalsIgnoreCase(orderCol.otherScoreSub)'>DESC</if>
                         ,
                     </if>
-                    <if test="orderCol.containsKey('remark')">
-                        a.remark
-                        <if test='orderCol.remark != null and "DESC".equalsIgnoreCase(orderCol.remark)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('year')">
-                        a.year
-                        <if test='orderCol.year != null and "DESC".equalsIgnoreCase(orderCol.year)'>DESC</if>
-                        ,
-                    </if>
-                    <if test="orderCol.containsKey('month')">
-                        a.month
-                        <if test='orderCol.month != null and "DESC".equalsIgnoreCase(orderCol.month)'>DESC</if>
-                        ,
-                    </if>
                     <if test="orderCol.containsKey('day')">
                         a.day
                         <if test='orderCol.day != null and "DESC".equalsIgnoreCase(orderCol.day)'>DESC</if>
                         ,
                     </if>
-                    <if test="orderCol.containsKey('createTime')">
-                        a.createTime
-                        <if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
+                    <if test="orderCol.containsKey('totalAddScore')">
+                        a.totalAddScore
+                        <if test='orderCol.totalAddScore != null and "DESC".equalsIgnoreCase(orderCol.totalAddScore)'>DESC</if>
                         ,
                     </if>
-                    <if test="orderCol.containsKey('createUserId')">
-                        a.createUserId
-                        <if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if>
+                    <if test="orderCol.containsKey('totalSubScore')">
+                        a.totalSubScore
+                        <if test='orderCol.totalSubScore != null and "DESC".equalsIgnoreCase(orderCol.totalSubScore)'>DESC</if>
                         ,
                     </if>
-                    <if test="orderCol.containsKey('updateTime')">
-                        a.updateTime
-                        <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
+                    <if test="orderCol.containsKey('complainScoreAdd')">
+                        a.complainScoreAdd
+                        <if test='orderCol.complainScoreAdd != null and "DESC".equalsIgnoreCase(orderCol.complainScoreAdd)'>DESC</if>
                         ,
                     </if>
-                    <if test="orderCol.containsKey('updateUserId')">
-                        a.updateUserId
-                        <if test='orderCol.updateUserId != null and "DESC".equalsIgnoreCase(orderCol.updateUserId)'>DESC</if>
+                    <if test="orderCol.containsKey('complainScoreSub')">
+                        a.complainScoreSub
+                        <if test='orderCol.complainScoreSub != null and "DESC".equalsIgnoreCase(orderCol.complainScoreSub)'>DESC</if>
                         ,
                     </if>
             </trim>

db/add.sql

@@ -403,3 +403,20 @@ ALTER TABLE mortals_xhx_check_effect_record ADD COLUMN `subAddType` tinyint(1)
 ALTER TABLE mortals_xhx_perform_other_record ADD COLUMN `subAddType` tinyint(1)    DEFAULT '1'  COMMENT '增减类型(1.增加,2.扣除)' AFTER deductTime;
 
 ALTER TABLE mortals_xhx_check_other_record ADD COLUMN `subAddType` tinyint(1)    DEFAULT '1'  COMMENT '增减类型(1.增加,2.扣除)' AFTER deductTime;
+
+
+-- ----------------------------
+2023-7-10  2
+-- ----------------------------
+
+
+ALTER TABLE mortals_xhx_dept_perform_stat ADD COLUMN `totalAddScore` decimal(10,2) DEFAULT 0.0     COMMENT '部门绩效加分总分数汇总' AFTER otherScoreSub;
+ALTER TABLE mortals_xhx_dept_perform_stat ADD COLUMN `totalSubScore` decimal(10,2) DEFAULT 0.0     COMMENT '部门绩效减分总分数汇总' AFTER totalAddScore;
+ALTER TABLE mortals_xhx_dept_perform_stat ADD COLUMN `complainScoreAdd` decimal(10,2) DEFAULT 0.0     COMMENT '投诉绩效指标增加分数' AFTER totalSubScore;
+ALTER TABLE mortals_xhx_dept_perform_stat ADD COLUMN `complainScoreSub` decimal(10,2) DEFAULT 0.0     COMMENT '投诉绩效指标扣减分数' AFTER complainScoreAdd;
+ALTER TABLE mortals_xhx_dept_perform_stat ADD COLUMN `averageScore` decimal(10,2) DEFAULT 0.0    COMMENT '部门绩效平均分数，根据部门所属人数平均' AFTER complainScoreSub;
+
+ALTER TABLE mortals_xhx_staff_perform_stat ADD COLUMN `totalAddScore` decimal(10,2) DEFAULT 0.0     COMMENT '员工绩效加分总分数汇总' AFTER otherScoreSub;
+ALTER TABLE mortals_xhx_staff_perform_stat ADD COLUMN `totalSubScore` decimal(10,2) DEFAULT 0.0     COMMENT '员工绩效减分总分数汇总' AFTER totalAddScore;
+ALTER TABLE mortals_xhx_staff_perform_stat ADD COLUMN `complainScoreAdd` decimal(10,2) DEFAULT 0.0     COMMENT '员工绩效指标增加分数' AFTER totalSubScore;
+ALTER TABLE mortals_xhx_staff_perform_stat ADD COLUMN `complainScoreSub` decimal(10,2) DEFAULT 0.0     COMMENT '员工绩效指标扣减分数' AFTER complainScoreAdd;