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

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

@@ -47,5 +47,6 @@ public class AppealReq extends BaseReq {
     private List<PerformAttendAppealFilesEntity> performAttendAppealFilesList = new ArrayList<>();
     ;
 
+    private  Long checkRecordId;
 
 }

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

@@ -153,6 +153,5 @@ public class InspectSaveReq extends BaseReq {
 
 
 
-    private  Long checkRecordId;
 
 }

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

@@ -121,8 +121,8 @@ public class AppealApiController extends AbstractBaseController<PerformReq> {
             }
             PageInfo pageInfo = buildPageInfo(appealReq);
             PerformAttendAppealQuery query = new PerformAttendAppealQuery();
-            query.setAppealTimeStart(appealReq.getApperalStartDate());
-            query.setAppealTimeEnd(appealReq.getAppealEndDate());
+            query.setCreateTimeStart(appealReq.getApperalStartDate());
+            query.setCreateTimeEnd(appealReq.getAppealEndDate());
             query.setStaffId(context.getUser().getCustomerId());
 
             Result<PerformAttendAppealEntity> result = appealService.find(query, pageInfo, context);
@@ -223,6 +223,7 @@ public class AppealApiController extends AbstractBaseController<PerformReq> {
             entity.setAppealDesc(req.getAppealDesc());
             entity.setStaffId(context.getUser().getCustomerId());
             entity.setCreateUserId(context.getUser().getId());
+            entity.setCheckRecordId(req.getId());
 
             PerformAttendAppealEntity saveEntity = appealService.save(entity, context);
             rest.setData(saveEntity);

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

@@ -105,23 +105,23 @@ public class CheckAttendRecordServiceImpl extends AbstractCRUDServiceImpl<CheckA
                 summaryQuery.setMonth(vo.getMonth());
                 StaffPerformSummaryEntity temp = staffPerformSummaryService.selectOne(summaryQuery);
                 if(temp!=null){
-                    if(temp.getAssessScore()==null){
-                        staffPerformSummaryEntity.setAssessScore(new BigDecimal(0));
+                    if(temp.getReviewScore()==null){
+                        staffPerformSummaryEntity.setReviewScore(new BigDecimal(0));
                     }
                     if(temp.getOtherScore()==null){
                         staffPerformSummaryEntity.setOtherScore(new BigDecimal(0));
                     }
-                    if(temp.getWorkScore()==null){
-                        staffPerformSummaryEntity.setWorkScore(new BigDecimal(0));
+                    if(temp.getGoworkScore()==null){
+                        staffPerformSummaryEntity.setGoworkScore(new BigDecimal(0));
                     }
                     if(temp.getEffectScore()==null){
                         staffPerformSummaryEntity.setEffectScore(new BigDecimal(0));
                     }
                     BigDecimal erro = new BigDecimal(0);
-                    erro.add(staffPerformSummaryEntity.getAssessScore());
+                    erro.add(staffPerformSummaryEntity.getReviewScore());
                     erro.add(staffPerformSummaryEntity.getAttendScore());
                     erro.add(staffPerformSummaryEntity.getOtherScore());
-                    erro.add(staffPerformSummaryEntity.getWorkScore());
+                    erro.add(staffPerformSummaryEntity.getGoworkScore());
                     erro.add(staffPerformSummaryEntity.getEffectScore());
                     staffPerformSummaryEntity.setErrorScore(erro);
                     BigDecimal total = new BigDecimal(100);
@@ -130,9 +130,9 @@ public class CheckAttendRecordServiceImpl extends AbstractCRUDServiceImpl<CheckA
                     staffPerformSummaryEntity.setUpdateTime(new Date());
                     staffPerformSummaryService.update(staffPerformSummaryEntity);
                 }else {
-                    staffPerformSummaryEntity.setAssessScore(new BigDecimal(0));
+                    staffPerformSummaryEntity.setReviewScore(new BigDecimal(0));
                     staffPerformSummaryEntity.setOtherScore(new BigDecimal(0));
-                    staffPerformSummaryEntity.setWorkScore(new BigDecimal(0));
+                    staffPerformSummaryEntity.setGoworkScore(new BigDecimal(0));
                     staffPerformSummaryEntity.setEffectScore(new BigDecimal(0));
                     staffPerformSummaryEntity.setErrorScore(vo.getSumScore());
                     BigDecimal total = new BigDecimal(100);

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

@@ -98,7 +98,7 @@ public class CheckComplainRecordServiceImpl extends AbstractCRUDServiceImpl<Chec
             for(StaffCheckSummaryVo vo:summaryVoList){
                 StaffPerformSummaryEntity staffPerformSummaryEntity = new StaffPerformSummaryEntity();
                 BeanUtils.copyProperties(vo,staffPerformSummaryEntity, BeanUtil.getNullPropertyNames(vo));
-                staffPerformSummaryEntity.setAssessScore(vo.getSumScore());
+                staffPerformSummaryEntity.setReviewScore(vo.getSumScore());
                 StaffPerformSummaryQuery summaryQuery = new StaffPerformSummaryQuery();
                 summaryQuery.setStaffId(vo.getStaffId());
                 summaryQuery.setYear(vo.getYear());
@@ -111,17 +111,17 @@ public class CheckComplainRecordServiceImpl extends AbstractCRUDServiceImpl<Chec
                     if(temp.getOtherScore()==null){
                         staffPerformSummaryEntity.setOtherScore(new BigDecimal(0));
                     }
-                    if(temp.getWorkScore()==null){
-                        staffPerformSummaryEntity.setWorkScore(new BigDecimal(0));
+                    if(temp.getGoworkScore()==null){
+                        staffPerformSummaryEntity.setGoworkScore(new BigDecimal(0));
                     }
                     if(temp.getEffectScore()==null){
                         staffPerformSummaryEntity.setEffectScore(new BigDecimal(0));
                     }
                     BigDecimal erro = new BigDecimal(0);
-                    erro.add(staffPerformSummaryEntity.getAssessScore());
+                    erro.add(staffPerformSummaryEntity.getReviewScore());
                     erro.add(staffPerformSummaryEntity.getAttendScore());
                     erro.add(staffPerformSummaryEntity.getOtherScore());
-                    erro.add(staffPerformSummaryEntity.getWorkScore());
+                    erro.add(staffPerformSummaryEntity.getGoworkScore());
                     erro.add(staffPerformSummaryEntity.getEffectScore());
                     staffPerformSummaryEntity.setErrorScore(erro);
                     BigDecimal total = new BigDecimal(100);
@@ -135,7 +135,7 @@ public class CheckComplainRecordServiceImpl extends AbstractCRUDServiceImpl<Chec
                 }else {
                     staffPerformSummaryEntity.setAttendScore(new BigDecimal(0));
                     staffPerformSummaryEntity.setOtherScore(new BigDecimal(0));
-                    staffPerformSummaryEntity.setWorkScore(new BigDecimal(0));
+                    staffPerformSummaryEntity.setGoworkScore(new BigDecimal(0));
                     staffPerformSummaryEntity.setEffectScore(new BigDecimal(0));
                     staffPerformSummaryEntity.setErrorScore(vo.getSumScore());
                     BigDecimal total = new BigDecimal(100);

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

@@ -105,23 +105,23 @@ public class CheckEffectRecordServiceImpl extends AbstractCRUDServiceImpl<CheckE
                 summaryQuery.setMonth(vo.getMonth());
                 StaffPerformSummaryEntity temp = staffPerformSummaryService.selectOne(summaryQuery);
                 if(temp!=null){
-                    if(temp.getAssessScore()==null){
-                        staffPerformSummaryEntity.setAssessScore(new BigDecimal(0));
+                    if(temp.getReviewScore()==null){
+                        staffPerformSummaryEntity.setReviewScore(new BigDecimal(0));
                     }
                     if(temp.getOtherScore()==null){
                         staffPerformSummaryEntity.setOtherScore(new BigDecimal(0));
                     }
-                    if(temp.getWorkScore()==null){
-                        staffPerformSummaryEntity.setWorkScore(new BigDecimal(0));
+                    if(temp.getGoworkScore()==null){
+                        staffPerformSummaryEntity.setGoworkScore(new BigDecimal(0));
                     }
                     if(temp.getAttendScore()==null){
                         staffPerformSummaryEntity.setAttendScore(new BigDecimal(0));
                     }
                     BigDecimal erro = new BigDecimal(0);
-                    erro.add(staffPerformSummaryEntity.getAssessScore());
+                    erro.add(staffPerformSummaryEntity.getReviewScore());
                     erro.add(staffPerformSummaryEntity.getAttendScore());
                     erro.add(staffPerformSummaryEntity.getOtherScore());
-                    erro.add(staffPerformSummaryEntity.getWorkScore());
+                    erro.add(staffPerformSummaryEntity.getGoworkScore());
                     erro.add(staffPerformSummaryEntity.getEffectScore());
                     staffPerformSummaryEntity.setErrorScore(erro);
                     BigDecimal total = new BigDecimal(100);
@@ -134,9 +134,9 @@ public class CheckEffectRecordServiceImpl extends AbstractCRUDServiceImpl<CheckE
                     staffPerformSummaryService.update(staffPerformSummaryEntity);
                 }else {
                     staffPerformSummaryEntity.setAttendScore(new BigDecimal(0));
-                    staffPerformSummaryEntity.setAssessScore(new BigDecimal(0));
+                    staffPerformSummaryEntity.setReviewScore(new BigDecimal(0));
                     staffPerformSummaryEntity.setOtherScore(new BigDecimal(0));
-                    staffPerformSummaryEntity.setWorkScore(new BigDecimal(0));
+                    staffPerformSummaryEntity.setGoworkScore(new BigDecimal(0));
                     staffPerformSummaryEntity.setErrorScore(vo.getSumScore());
                     BigDecimal total = new BigDecimal(100);
                     staffPerformSummaryEntity.setTotalScore(total.subtract(vo.getSumScore()));

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

@@ -98,15 +98,15 @@ public class CheckGoworkRecordServiceImpl extends AbstractCRUDServiceImpl<CheckG
             for(StaffCheckSummaryVo vo:summaryVoList){
                 StaffPerformSummaryEntity staffPerformSummaryEntity = new StaffPerformSummaryEntity();
                 BeanUtils.copyProperties(vo,staffPerformSummaryEntity, BeanUtil.getNullPropertyNames(vo));
-                staffPerformSummaryEntity.setWorkScore(vo.getSumScore());
+                staffPerformSummaryEntity.setGoworkScore(vo.getSumScore());
                 StaffPerformSummaryQuery summaryQuery = new StaffPerformSummaryQuery();
                 summaryQuery.setStaffId(vo.getStaffId());
                 summaryQuery.setYear(vo.getYear());
                 summaryQuery.setMonth(vo.getMonth());
                 StaffPerformSummaryEntity temp = staffPerformSummaryService.selectOne(summaryQuery);
                 if(temp!=null){
-                    if(temp.getAssessScore()==null){
-                        staffPerformSummaryEntity.setAssessScore(new BigDecimal(0));
+                    if(temp.getReviewScore()==null){
+                        staffPerformSummaryEntity.setReviewScore(new BigDecimal(0));
                     }
                     if(temp.getOtherScore()==null){
                         staffPerformSummaryEntity.setOtherScore(new BigDecimal(0));
@@ -118,10 +118,10 @@ public class CheckGoworkRecordServiceImpl extends AbstractCRUDServiceImpl<CheckG
                         staffPerformSummaryEntity.setEffectScore(new BigDecimal(0));
                     }
                     BigDecimal erro = new BigDecimal(0);
-                    erro.add(staffPerformSummaryEntity.getAssessScore());
+                    erro.add(staffPerformSummaryEntity.getReviewScore());
                     erro.add(staffPerformSummaryEntity.getAttendScore());
                     erro.add(staffPerformSummaryEntity.getOtherScore());
-                    erro.add(staffPerformSummaryEntity.getWorkScore());
+                    erro.add(staffPerformSummaryEntity.getGoworkScore());
                     erro.add(staffPerformSummaryEntity.getEffectScore());
                     staffPerformSummaryEntity.setErrorScore(erro);
                     BigDecimal total = new BigDecimal(100);
@@ -134,7 +134,7 @@ public class CheckGoworkRecordServiceImpl extends AbstractCRUDServiceImpl<CheckG
                     staffPerformSummaryService.update(staffPerformSummaryEntity);
                 }else {
                     staffPerformSummaryEntity.setAttendScore(new BigDecimal(0));
-                    staffPerformSummaryEntity.setAssessScore(new BigDecimal(0));
+                    staffPerformSummaryEntity.setReviewScore(new BigDecimal(0));
                     staffPerformSummaryEntity.setOtherScore(new BigDecimal(0));
                     staffPerformSummaryEntity.setEffectScore(new BigDecimal(0));
                     staffPerformSummaryEntity.setErrorScore(vo.getSumScore());

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

@@ -104,23 +104,23 @@ public class CheckOtherRecordServiceImpl extends AbstractCRUDServiceImpl<CheckOt
                 summaryQuery.setMonth(vo.getMonth());
                 StaffPerformSummaryEntity temp = staffPerformSummaryService.selectOne(summaryQuery);
                 if(temp!=null){
-                    if(temp.getAssessScore()==null){
-                        staffPerformSummaryEntity.setAssessScore(new BigDecimal(0));
+                    if(temp.getReviewScore()==null){
+                        staffPerformSummaryEntity.setReviewScore(new BigDecimal(0));
                     }
                     if(temp.getAttendScore()==null){
                         staffPerformSummaryEntity.setAttendScore(new BigDecimal(0));
                     }
-                    if(temp.getWorkScore()==null){
-                        staffPerformSummaryEntity.setWorkScore(new BigDecimal(0));
+                    if(temp.getGoworkScore()==null){
+                        staffPerformSummaryEntity.setGoworkScore(new BigDecimal(0));
                     }
                     if(temp.getEffectScore()==null){
                         staffPerformSummaryEntity.setEffectScore(new BigDecimal(0));
                     }
                     BigDecimal erro = new BigDecimal(0);
-                    erro.add(staffPerformSummaryEntity.getAssessScore());
+                    erro.add(staffPerformSummaryEntity.getReviewScore());
                     erro.add(staffPerformSummaryEntity.getAttendScore());
                     erro.add(staffPerformSummaryEntity.getOtherScore());
-                    erro.add(staffPerformSummaryEntity.getWorkScore());
+                    erro.add(staffPerformSummaryEntity.getGoworkScore());
                     erro.add(staffPerformSummaryEntity.getEffectScore());
                     staffPerformSummaryEntity.setErrorScore(erro);
                     BigDecimal total = new BigDecimal(100);
@@ -133,8 +133,8 @@ public class CheckOtherRecordServiceImpl extends AbstractCRUDServiceImpl<CheckOt
                     staffPerformSummaryService.update(staffPerformSummaryEntity);
                 }else {
                     staffPerformSummaryEntity.setAttendScore(new BigDecimal(0));
-                    staffPerformSummaryEntity.setAssessScore(new BigDecimal(0));
-                    staffPerformSummaryEntity.setWorkScore(new BigDecimal(0));
+                    staffPerformSummaryEntity.setReviewScore(new BigDecimal(0));
+                    staffPerformSummaryEntity.setGoworkScore(new BigDecimal(0));
                     staffPerformSummaryEntity.setEffectScore(new BigDecimal(0));
                     staffPerformSummaryEntity.setErrorScore(vo.getSumScore());
                     BigDecimal total = new BigDecimal(100);

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

@@ -97,7 +97,7 @@ public class CheckReviewRecordServiceImpl extends AbstractCRUDServiceImpl<CheckR
             for(StaffCheckSummaryVo vo:summaryVoList){
                 StaffPerformSummaryEntity staffPerformSummaryEntity = new StaffPerformSummaryEntity();
                 BeanUtils.copyProperties(vo,staffPerformSummaryEntity, BeanUtil.getNullPropertyNames(vo));
-                staffPerformSummaryEntity.setAssessScore(vo.getSumScore());
+                staffPerformSummaryEntity.setReviewScore(vo.getSumScore());
                 StaffPerformSummaryQuery summaryQuery = new StaffPerformSummaryQuery();
                 summaryQuery.setStaffId(vo.getStaffId());
                 summaryQuery.setYear(vo.getYear());
@@ -110,17 +110,17 @@ public class CheckReviewRecordServiceImpl extends AbstractCRUDServiceImpl<CheckR
                     if(temp.getOtherScore()==null){
                         staffPerformSummaryEntity.setOtherScore(new BigDecimal(0));
                     }
-                    if(temp.getWorkScore()==null){
-                        staffPerformSummaryEntity.setWorkScore(new BigDecimal(0));
+                    if(temp.getGoworkScore()==null){
+                        staffPerformSummaryEntity.setGoworkScore(new BigDecimal(0));
                     }
                     if(temp.getEffectScore()==null){
                         staffPerformSummaryEntity.setEffectScore(new BigDecimal(0));
                     }
                     BigDecimal erro = new BigDecimal(0);
-                    erro.add(staffPerformSummaryEntity.getAssessScore());
+                    erro.add(staffPerformSummaryEntity.getReviewScore());
                     erro.add(staffPerformSummaryEntity.getAttendScore());
                     erro.add(staffPerformSummaryEntity.getOtherScore());
-                    erro.add(staffPerformSummaryEntity.getWorkScore());
+                    erro.add(staffPerformSummaryEntity.getGoworkScore());
                     erro.add(staffPerformSummaryEntity.getEffectScore());
                     staffPerformSummaryEntity.setErrorScore(erro);
                     BigDecimal total = new BigDecimal(100);
@@ -134,7 +134,7 @@ public class CheckReviewRecordServiceImpl extends AbstractCRUDServiceImpl<CheckR
                 }else {
                     staffPerformSummaryEntity.setAttendScore(new BigDecimal(0));
                     staffPerformSummaryEntity.setOtherScore(new BigDecimal(0));
-                    staffPerformSummaryEntity.setWorkScore(new BigDecimal(0));
+                    staffPerformSummaryEntity.setGoworkScore(new BigDecimal(0));
                     staffPerformSummaryEntity.setEffectScore(new BigDecimal(0));
                     staffPerformSummaryEntity.setErrorScore(vo.getSumScore());
                     BigDecimal total = new BigDecimal(100);

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-07-11
+* @date 2023-07-14
 */
 @Data
 public class DeptPerformStatEntity extends DeptPerformStatVo {
@@ -31,6 +31,16 @@ public class DeptPerformStatEntity extends DeptPerformStatVo {
     @Excel(name = "部门绩效总分数")
     private BigDecimal totalScore;
     /**
+    * 部门绩效加分总分数汇总
+    */
+    @Excel(name = "部门绩效加分总分数汇总")
+    private BigDecimal totalAddScore;
+    /**
+    * 部门绩效减分总分数汇总
+    */
+    @Excel(name = "部门绩效减分总分数汇总")
+    private BigDecimal totalSubScore;
+    /**
     * 考勤绩效指标增加分数
     */
     private BigDecimal attendScoreAdd;
@@ -41,19 +51,27 @@ public class DeptPerformStatEntity extends DeptPerformStatVo {
     /**
     * 评价绩效指标增加分数
     */
-    private BigDecimal assessScoreAdd;
+    private BigDecimal reviewScoreAdd;
     /**
     * 评价绩效指标扣减分数
     */
-    private BigDecimal assessScoreSub;
+    private BigDecimal reviewScoreSub;
+    /**
+    * 投诉绩效指标增加分数
+    */
+    private BigDecimal complainScoreAdd;
+    /**
+    * 投诉绩效指标扣减分数
+    */
+    private BigDecimal complainScoreSub;
     /**
     * 办件绩效指标增加分数
     */
-    private BigDecimal workScoreAdd;
+    private BigDecimal goworkScoreAdd;
     /**
     * 办件绩效指标扣减分数
     */
-    private BigDecimal workScoreSub;
+    private BigDecimal goworkScoreSub;
     /**
     * 效能绩效指标增加分数
     */
@@ -71,6 +89,11 @@ public class DeptPerformStatEntity extends DeptPerformStatVo {
     */
     private BigDecimal otherScoreSub;
     /**
+    * 部门绩效平均分数，根据部门所属人数平均
+    */
+    @Excel(name = "部门绩效平均分数，根据部门所属人数平均")
+    private BigDecimal averageScore;
+    /**
     * 备注
     */
     private String remark;
@@ -86,29 +109,6 @@ 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();
@@ -133,17 +133,25 @@ public class DeptPerformStatEntity extends DeptPerformStatVo {
 
             this.totalScore = new BigDecimal(0);
 
+            this.totalAddScore = new BigDecimal(0);
+
+            this.totalSubScore = new BigDecimal(0);
+
             this.attendScoreAdd = new BigDecimal(0);
 
             this.attendScoreSub = new BigDecimal(0);
 
-            this.assessScoreAdd = new BigDecimal(0);
+            this.reviewScoreAdd = new BigDecimal(0);
 
-            this.assessScoreSub = new BigDecimal(0);
+            this.reviewScoreSub = new BigDecimal(0);
 
-            this.workScoreAdd = new BigDecimal(0);
+            this.complainScoreAdd = new BigDecimal(0);
+
+            this.complainScoreSub = new BigDecimal(0);
+
+            this.goworkScoreAdd = new BigDecimal(0);
 
-            this.workScoreSub = new BigDecimal(0);
+            this.goworkScoreSub = new BigDecimal(0);
 
             this.effectScoreAdd = new BigDecimal(0);
 
@@ -153,6 +161,8 @@ public class DeptPerformStatEntity extends DeptPerformStatVo {
 
             this.otherScoreSub = new BigDecimal(0);
 
+            this.averageScore = new BigDecimal(0);
+
             this.remark = "";
 
             this.year = -1;
@@ -160,15 +170,5 @@ public class DeptPerformStatEntity extends DeptPerformStatVo {
             this.month = -1;
 
             this.day = -1;
-
-            this.totalAddScore = new BigDecimal(0);
-
-            this.totalSubScore = new BigDecimal(0);
-
-            this.complainScoreAdd = new BigDecimal(0);
-
-            this.complainScoreSub = new BigDecimal(0);
-
-            this.averageScore = new BigDecimal(0);
     }
 }
\ No newline at end of file

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

@@ -11,7 +11,7 @@ import java.util.Date;
 * 部门绩效分数统计视图对象
 *
 * @author zxfei
-* @date 2023-07-11
+* @date 2023-07-14
 */
 @Data
 public class DeptPerformStatVo extends BaseEntityLong {

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

+package com.mortals.xhx.module.dept.model.vo;
+
+import lombok.Data;
+
+/**
+ * 部门绩效总分排名统计查询条件
+ */
+@Data
+public class DeptSummaryTopQuery {
+}

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

@@ -12,7 +12,7 @@ import lombok.Data;
 */
 @Data
 public class PerformRulesVo extends BaseEntityLong {
-
-
+    /** 类型名称 **/
+    private String typeName;
 
 }
\ No newline at end of file

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

 package com.mortals.xhx.module.perform.service;
+import com.mortals.framework.exception.AppException;
 import com.mortals.framework.service.ICRUDCacheService;
 import com.mortals.framework.service.ICRUDService;
 import com.mortals.xhx.module.perform.model.PerformRulesEntity;
 import com.mortals.xhx.module.perform.dao.PerformRulesDao;
+
+import java.util.List;
+import java.util.Map;
+
 /**
 * PerformRulesService
 *
@@ -14,4 +19,11 @@ import com.mortals.xhx.module.perform.dao.PerformRulesDao;
 public interface PerformRulesService extends ICRUDCacheService<PerformRulesEntity,Long> {
 
     PerformRulesDao getDao();
+
+    /**
+     * 规则分数统计
+     * @return
+     * @throws AppException
+     */
+    Map<String,Object> summaryRules() throws AppException;
 }
\ No newline at end of file

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

@@ -6,6 +6,7 @@ import cn.hutool.core.util.StrUtil;
 import cn.hutool.extra.pinyin.PinyinUtil;
 import com.mortals.framework.service.impl.AbstractCRUDCacheServiceImpl;
 import com.mortals.xhx.base.system.idgenerator.service.IdgeneratorService;
+import com.mortals.xhx.common.code.CheckTypeEnum;
 import com.mortals.xhx.common.code.CommentTypeEnum;
 import com.mortals.xhx.common.code.PerformRulesTypeEnum;
 import com.mortals.xhx.common.code.PerformTypeEnum;
@@ -19,6 +20,13 @@ import com.mortals.xhx.module.perform.service.PerformRulesService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.util.ObjectUtils;
 
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
 import static com.mortals.xhx.base.system.idgenerator.service.impl.IdgeneratorServiceImpl.IdGeneratorKey.*;
 
 /**
@@ -93,4 +101,31 @@ public class PerformRulesServiceImpl extends AbstractCRUDCacheServiceImpl<Perfor
         System.out.println(PinyinUtil.getFirstLetter(str, ""));
 
     }
+
+    @Override
+    public Map<String,Object> summaryRules() throws AppException {
+        Map<String,Object> resultMap = new HashMap<>();
+        List<PerformRulesEntity> all = this.getAllList();
+        List<PerformRulesEntity> resultList = new ArrayList<>();
+        BigDecimal totalScore = new BigDecimal(0);
+        Map<Integer,List<PerformRulesEntity>> groupMap = all.stream().collect(Collectors.groupingBy(PerformRulesEntity::getType));
+        for (Map.Entry<Integer, List<PerformRulesEntity>> entry:groupMap.entrySet()){
+            BigDecimal sum = new BigDecimal(0);
+            for(PerformRulesEntity item:entry.getValue()){
+                sum = sum.add(item.getScore());
+            }
+            PerformRulesEntity entity = new PerformRulesEntity();
+            entity.setType(entry.getKey());
+            CheckTypeEnum type = CheckTypeEnum.getByValue(entry.getKey());
+            if(type!=null){
+                entity.setTypeName(type.getDesc());
+            }
+            entity.setScore(sum);
+            totalScore = totalScore.add(sum);
+            resultList.add(entity);
+        }
+        resultMap.put("totalScore",totalScore);
+        resultMap.put("list",resultList);
+        return resultMap;
+    }
 }
\ No newline at end of file

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

@@ -41,6 +41,7 @@ public class PerformStaffConfServiceImpl extends AbstractCRUDServiceImpl<Perform
     private PerformRulesCategoryService performRulesCategoryService;
 
 
+
     @Override
     protected void saveBefore(PerformStaffConfEntity entity, Context context) throws AppException {
         super.saveBefore(entity,context);

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

 package com.mortals.xhx.module.perform.web;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.OrderCol;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.base.system.user.model.UserQuery;
+import com.mortals.xhx.base.system.user.service.UserService;
 import com.mortals.xhx.common.code.CheckTypeEnum;
 import com.mortals.xhx.common.code.EnableEnum;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.*;
@@ -37,6 +42,8 @@ public class PerformDeptConfController extends BaseCRUDJsonBodyMappingController
 
     @Autowired
     private ParamService paramService;
+    @Autowired
+    private UserService userService;
 
     public PerformDeptConfController(){
         super.setModuleDesc( "部门自动考核信息");
@@ -46,8 +53,20 @@ public class PerformDeptConfController extends BaseCRUDJsonBodyMappingController
     protected void init(Map<String, Object> model, Context context) {
         this.addDict(model, "type", CheckTypeEnum.getEnumMap());
         this.addDict(model, "enable", EnableEnum.getEnumMap());
+
+        Map<String, String> collect = userService.find(new UserQuery(), getContext()).stream()
+                .collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getRealName(), (o, n) -> n));
+        this.addDict(model, "updateUserId", collect);
+
         super.init(model, context);
     }
 
-
+    @Override
+    protected void doListBefore(PerformDeptConfEntity query, Map<String, Object> model, Context context) throws AppException {
+        if (ObjectUtils.isEmpty(query.getOrderColList())) {
+            query.setOrderColList(Arrays.asList(new OrderCol("createTime", OrderCol.DESCENDING)));
+        } else {
+            query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
+        }
+    }
 }
\ No newline at end of file

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

 package com.mortals.xhx.module.perform.web;
 
+import com.mortals.framework.annotation.UnAuth;
+import com.mortals.framework.common.Rest;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.model.OrderCol;
+import com.mortals.framework.model.PageInfo;
+import com.mortals.framework.model.Result;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.base.system.user.model.UserQuery;
 import com.mortals.xhx.base.system.user.service.UserService;
+import com.mortals.xhx.common.code.CheckTypeEnum;
 import com.mortals.xhx.module.perform.model.PerformRulesCategoryQuery;
 import com.mortals.xhx.module.perform.model.PerformRulesEntity;
 import com.mortals.xhx.module.perform.service.PerformRulesCategoryService;
 import com.mortals.xhx.module.perform.service.PerformRulesService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.Map;
 
 import static java.util.stream.Collectors.toMap;
@@ -47,7 +56,7 @@ public class PerformRulesController extends BaseCRUDJsonBodyMappingController<Pe
     protected void init(Map<String, Object> model, Context context) {
         this.addDict(model, "subAddType", paramService.getParamBySecondOrganize("PerformRules", "subAddType"));
         this.addDict(model, "assoOwner", paramService.getParamBySecondOrganize("PerformRules", "assoOwner"));
-        this.addDict(model, "type", paramService.getParamBySecondOrganize("PerformRules", "type"));
+        this.addDict(model, "type", CheckTypeEnum.getEnumMap());
         this.addDict(model, "categoryId", categoryService.find(new PerformRulesCategoryQuery()).stream().collect(toMap(x -> x.getId().toString(), y -> y.getName(), (o, n) -> n)));
         this.addDict(model, "createUserId", userService.find(new UserQuery()).stream().collect(toMap(x -> x.getId().toString(), y -> y.getRealName(), (o, n) -> n)));
         super.init(model, context);
@@ -58,4 +67,33 @@ public class PerformRulesController extends BaseCRUDJsonBodyMappingController<Pe
         super.doListBefore(query, model, context);
         query.setOrderColList(Arrays.asList(new OrderCol("createTime", OrderCol.DESCENDING)));
     }
+
+    @PostMapping({"summary"})
+    @UnAuth
+    public Rest<Object> summary() {
+        Rest<Object> ret = new Rest();
+        Map<String, Object> model = new HashMap();
+        Context context = this.getContext();
+        String busiDesc = "查询规则分数统计";
+
+        int code = 1;
+        try {
+            Map<String,Object> result = this.getService().summaryRules();
+            model.put("data", result);
+            model.put("message_info", busiDesc + "成功");
+            if (!ObjectUtils.isEmpty(context) && !ObjectUtils.isEmpty(context.getUser())) {
+                this.recordSysLog(this.request, busiDesc + " 【成功】");
+            }
+        } catch (Exception var9) {
+            code = -1;
+            this.doException(this.request, busiDesc, model, var9);
+        }
+
+        this.init(model, context);
+        ret.setCode(code);
+        ret.setData(model.get("data"));
+        ret.setDict(model.get("dict"));
+        ret.setMsg(model.get("message_info") == null ? "" : model.remove("message_info").toString());
+        return ret;
+    }
 }
\ No newline at end of file

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

 package com.mortals.xhx.module.perform.web;
+
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.OrderCol;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.base.system.user.model.UserQuery;
+import com.mortals.xhx.base.system.user.service.UserService;
 import com.mortals.xhx.common.code.CheckTypeEnum;
 import com.mortals.xhx.common.code.EnableEnum;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.*;
 import com.mortals.framework.model.Context;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.module.perform.model.PerformStaffConfEntity;
 import com.mortals.xhx.module.perform.service.PerformStaffConfService;
 import org.apache.commons.lang3.ArrayUtils;
 import com.mortals.framework.util.StringUtils;
+
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
+
 import com.alibaba.fastjson.JSONObject;
+
 import java.util.Arrays;
+
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
+
 import static com.mortals.framework.ap.SysConstains.*;
+
 /**
-*
-* 人员自动考核信息
-*
-* @author zxfei
-* @date 2023-05-16
-*/
+ * 人员自动考核信息
+ *
+ * @author zxfei
+ * @date 2023-05-16
+ */
 @RestController
 @RequestMapping("perform/staff/conf")
-public class PerformStaffConfController extends BaseCRUDJsonBodyMappingController<PerformStaffConfService,PerformStaffConfEntity,Long> {
+public class PerformStaffConfController extends BaseCRUDJsonBodyMappingController<PerformStaffConfService, PerformStaffConfEntity, Long> {
 
     @Autowired
     private ParamService paramService;
+    @Autowired
+    private UserService userService;
 
-    public PerformStaffConfController(){
-        super.setModuleDesc( "人员自动考核信息");
+    public PerformStaffConfController() {
+        super.setModuleDesc("人员自动考核信息");
     }
 
     @Override
     protected void init(Map<String, Object> model, Context context) {
         this.addDict(model, "type", CheckTypeEnum.getEnumMap());
         this.addDict(model, "enable", EnableEnum.getEnumMap());
+
+        Map<String, String> collect = userService.find(new UserQuery(), getContext()).stream()
+                .collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getRealName(), (o, n) -> n));
+
+        this.addDict(model, "updateUserId", collect);
+
         super.init(model, context);
     }
 
-
+    @Override
+    protected void doListBefore(PerformStaffConfEntity query, Map<String, Object> model, Context context) throws AppException {
+        if (ObjectUtils.isEmpty(query.getOrderColList())) {
+            query.setOrderColList(Arrays.asList(new OrderCol("createTime", OrderCol.DESCENDING)));
+        } else {
+            query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
+        }
+    }
 }
\ No newline at end of file

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

 package com.mortals.xhx.module.staff.model;
-
 import java.math.BigDecimal;
-import java.util.Date;
 import java.util.List;
 import java.util.ArrayList;
-
-import cn.hutool.core.date.DateUtil;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.mortals.framework.annotation.Excel;
 import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.staff.model.vo.StaffPerformStatVo;
 import lombok.Data;
-
 /**
- * 员工绩效统计实体对象
- *
- * @author zxfei
- * @date 2023-07-13
- */
+* 员工绩效统计实体对象
+*
+* @author zxfei
+* @date 2023-07-14
+*/
 @Data
 public class StaffPerformStatEntity extends StaffPerformStatVo {
     private static final long serialVersionUID = 1L;
@@ -56,11 +51,11 @@ public class StaffPerformStatEntity extends StaffPerformStatVo {
     /**
     * 评价绩效指标增加分数
     */
-    private BigDecimal assessScoreAdd;
+    private BigDecimal reviewScoreAdd;
     /**
     * 评价绩效指标扣减分数
     */
-    private BigDecimal assessScoreSub;
+    private BigDecimal reviewScoreSub;
     /**
     * 投诉绩效指标增加分数
     */
@@ -72,11 +67,11 @@ public class StaffPerformStatEntity extends StaffPerformStatVo {
     /**
     * 办件绩效指标增加分数
     */
-    private BigDecimal workScoreAdd;
+    private BigDecimal goworkScoreAdd;
     /**
     * 办件绩效指标扣减分数
     */
-    private BigDecimal workScoreSub;
+    private BigDecimal goworkScoreSub;
     /**
     * 效能绩效指标增加分数
     */
@@ -109,12 +104,10 @@ public class StaffPerformStatEntity extends StaffPerformStatVo {
     * 日
     */
     private Integer day;
-
     @Override
     public int hashCode() {
          return this.getId().hashCode();
     }
-
     @Override
     public boolean equals(Object obj) {
         if (obj == null) return false;
@@ -127,7 +120,7 @@ public class StaffPerformStatEntity extends StaffPerformStatVo {
         return false;
     }
 
-    public void initAttrValue() {
+    public void initAttrValue(){
 
             this.staffId = 0L;
 
@@ -143,17 +136,17 @@ public class StaffPerformStatEntity extends StaffPerformStatVo {
 
             this.attendScoreSub = new BigDecimal(0);
 
-        this.assessScoreAdd = new BigDecimal(0);
+            this.reviewScoreAdd = new BigDecimal(0);
 
-        this.assessScoreSub = new BigDecimal(0);
+            this.reviewScoreSub = new BigDecimal(0);
 
             this.complainScoreAdd = new BigDecimal(0);
 
             this.complainScoreSub = new BigDecimal(0);
 
-        this.workScoreAdd = new BigDecimal(0);
+            this.goworkScoreAdd = new BigDecimal(0);
 
-        this.workScoreSub = new BigDecimal(0);
+            this.goworkScoreSub = new BigDecimal(0);
 
             this.effectScoreAdd = new BigDecimal(0);
 
@@ -165,10 +158,10 @@ public class StaffPerformStatEntity extends StaffPerformStatVo {
 
             this.remark = "";
 
-        this.year = DateUtil.year(new Date());
+            this.year = -1;
 
-        this.month = DateUtil.month(new Date()) + 1;
+            this.month = -1;
 
-        this.day = DateUtil.dayOfMonth(new Date());
+            this.day = -1;
     }
 }
\ No newline at end of file

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

@@ -4,11 +4,11 @@ import java.math.BigDecimal;
 import java.util.List;
 import com.mortals.xhx.module.staff.model.StaffPerformStatEntity;
 /**
- * 员工绩效统计查询对象
- *
- * @author zxfei
- * @date 2023-07-13
- */
+* 员工绩效统计查询对象
+*
+* @author zxfei
+* @date 2023-07-14
+*/
 public class StaffPerformStatQuery extends StaffPerformStatEntity {
     /** 开始 主键ID，主键，自增长 */
     private Long idStart;
@@ -121,34 +121,34 @@ public class StaffPerformStatQuery extends StaffPerformStatEntity {
     private List <BigDecimal> attendScoreSubNotList;
 
     /** 开始 评价绩效指标增加分数 */
-    private BigDecimal assessScoreAddStart;
+    private BigDecimal reviewScoreAddStart;
 
     /** 结束 评价绩效指标增加分数 */
-    private BigDecimal assessScoreAddEnd;
+    private BigDecimal reviewScoreAddEnd;
 
     /** 增加 评价绩效指标增加分数 */
-    private BigDecimal assessScoreAddIncrement;
+    private BigDecimal reviewScoreAddIncrement;
 
     /** 评价绩效指标增加分数列表 */
-    private List <BigDecimal> assessScoreAddList;
+    private List <BigDecimal> reviewScoreAddList;
 
     /** 评价绩效指标增加分数排除列表 */
-    private List <BigDecimal> assessScoreAddNotList;
+    private List <BigDecimal> reviewScoreAddNotList;
 
     /** 开始 评价绩效指标扣减分数 */
-    private BigDecimal assessScoreSubStart;
+    private BigDecimal reviewScoreSubStart;
 
     /** 结束 评价绩效指标扣减分数 */
-    private BigDecimal assessScoreSubEnd;
+    private BigDecimal reviewScoreSubEnd;
 
     /** 增加 评价绩效指标扣减分数 */
-    private BigDecimal assessScoreSubIncrement;
+    private BigDecimal reviewScoreSubIncrement;
 
     /** 评价绩效指标扣减分数列表 */
-    private List <BigDecimal> assessScoreSubList;
+    private List <BigDecimal> reviewScoreSubList;
 
     /** 评价绩效指标扣减分数排除列表 */
-    private List <BigDecimal> assessScoreSubNotList;
+    private List <BigDecimal> reviewScoreSubNotList;
 
     /** 开始 投诉绩效指标增加分数 */
     private BigDecimal complainScoreAddStart;
@@ -181,34 +181,34 @@ public class StaffPerformStatQuery extends StaffPerformStatEntity {
     private List <BigDecimal> complainScoreSubNotList;
 
     /** 开始 办件绩效指标增加分数 */
-    private BigDecimal workScoreAddStart;
+    private BigDecimal goworkScoreAddStart;
 
     /** 结束 办件绩效指标增加分数 */
-    private BigDecimal workScoreAddEnd;
+    private BigDecimal goworkScoreAddEnd;
 
     /** 增加 办件绩效指标增加分数 */
-    private BigDecimal workScoreAddIncrement;
+    private BigDecimal goworkScoreAddIncrement;
 
     /** 办件绩效指标增加分数列表 */
-    private List <BigDecimal> workScoreAddList;
+    private List <BigDecimal> goworkScoreAddList;
 
     /** 办件绩效指标增加分数排除列表 */
-    private List <BigDecimal> workScoreAddNotList;
+    private List <BigDecimal> goworkScoreAddNotList;
 
     /** 开始 办件绩效指标扣减分数 */
-    private BigDecimal workScoreSubStart;
+    private BigDecimal goworkScoreSubStart;
 
     /** 结束 办件绩效指标扣减分数 */
-    private BigDecimal workScoreSubEnd;
+    private BigDecimal goworkScoreSubEnd;
 
     /** 增加 办件绩效指标扣减分数 */
-    private BigDecimal workScoreSubIncrement;
+    private BigDecimal goworkScoreSubIncrement;
 
     /** 办件绩效指标扣减分数列表 */
-    private List <BigDecimal> workScoreSubList;
+    private List <BigDecimal> goworkScoreSubList;
 
     /** 办件绩效指标扣减分数排除列表 */
-    private List <BigDecimal> workScoreSubNotList;
+    private List <BigDecimal> goworkScoreSubNotList;
 
     /** 开始 效能绩效指标增加分数 */
     private BigDecimal effectScoreAddStart;
@@ -971,163 +971,163 @@ public class StaffPerformStatQuery extends StaffPerformStatEntity {
 
     /**
     * 获取 开始 评价绩效指标增加分数
-     * @return assessScoreAddStart
+    * @return reviewScoreAddStart
     */
-    public BigDecimal getAssessScoreAddStart(){
-        return this.assessScoreAddStart;
+    public BigDecimal getReviewScoreAddStart(){
+        return this.reviewScoreAddStart;
     }
 
     /**
     * 设置 开始 评价绩效指标增加分数
-     * @param assessScoreAddStart
+    * @param reviewScoreAddStart
     */
-    public void setAssessScoreAddStart(BigDecimal assessScoreAddStart){
-        this.assessScoreAddStart = assessScoreAddStart;
+    public void setReviewScoreAddStart(BigDecimal reviewScoreAddStart){
+        this.reviewScoreAddStart = reviewScoreAddStart;
     }
 
     /**
     * 获取 结束 评价绩效指标增加分数
-     * @return $assessScoreAddEnd
+    * @return $reviewScoreAddEnd
     */
-    public BigDecimal getAssessScoreAddEnd(){
-        return this.assessScoreAddEnd;
+    public BigDecimal getReviewScoreAddEnd(){
+        return this.reviewScoreAddEnd;
     }
 
     /**
     * 设置 结束 评价绩效指标增加分数
-     * @param assessScoreAddEnd
+    * @param reviewScoreAddEnd
     */
-    public void setAssessScoreAddEnd(BigDecimal assessScoreAddEnd){
-        this.assessScoreAddEnd = assessScoreAddEnd;
+    public void setReviewScoreAddEnd(BigDecimal reviewScoreAddEnd){
+        this.reviewScoreAddEnd = reviewScoreAddEnd;
     }
 
     /**
     * 获取 增加 评价绩效指标增加分数
-     * @return assessScoreAddIncrement
+    * @return reviewScoreAddIncrement
     */
-    public BigDecimal getAssessScoreAddIncrement(){
-        return this.assessScoreAddIncrement;
+    public BigDecimal getReviewScoreAddIncrement(){
+        return this.reviewScoreAddIncrement;
     }
 
     /**
     * 设置 增加 评价绩效指标增加分数
-     * @param assessScoreAddIncrement
+    * @param reviewScoreAddIncrement
     */
-    public void setAssessScoreAddIncrement(BigDecimal assessScoreAddIncrement){
-        this.assessScoreAddIncrement = assessScoreAddIncrement;
+    public void setReviewScoreAddIncrement(BigDecimal reviewScoreAddIncrement){
+        this.reviewScoreAddIncrement = reviewScoreAddIncrement;
     }
 
     /**
     * 获取 评价绩效指标增加分数
-     * @return assessScoreAddList
+    * @return reviewScoreAddList
     */
-    public List<BigDecimal> getAssessScoreAddList(){
-        return this.assessScoreAddList;
+    public List<BigDecimal> getReviewScoreAddList(){
+        return this.reviewScoreAddList;
     }
 
     /**
     * 设置 评价绩效指标增加分数
-     * @param assessScoreAddList
+    * @param reviewScoreAddList
     */
-    public void setAssessScoreAddList(List<BigDecimal> assessScoreAddList){
-        this.assessScoreAddList = assessScoreAddList;
+    public void setReviewScoreAddList(List<BigDecimal> reviewScoreAddList){
+        this.reviewScoreAddList = reviewScoreAddList;
     }
 
     /**
     * 获取 评价绩效指标增加分数
-     * @return assessScoreAddNotList
+    * @return reviewScoreAddNotList
     */
-    public List<BigDecimal> getAssessScoreAddNotList(){
-        return this.assessScoreAddNotList;
+    public List<BigDecimal> getReviewScoreAddNotList(){
+        return this.reviewScoreAddNotList;
     }
 
     /**
     * 设置 评价绩效指标增加分数
-     * @param assessScoreAddNotList
+    * @param reviewScoreAddNotList
     */
-    public void setAssessScoreAddNotList(List<BigDecimal> assessScoreAddNotList){
-        this.assessScoreAddNotList = assessScoreAddNotList;
+    public void setReviewScoreAddNotList(List<BigDecimal> reviewScoreAddNotList){
+        this.reviewScoreAddNotList = reviewScoreAddNotList;
     }
 
 
     /**
     * 获取 开始 评价绩效指标扣减分数
-     * @return assessScoreSubStart
+    * @return reviewScoreSubStart
     */
-    public BigDecimal getAssessScoreSubStart(){
-        return this.assessScoreSubStart;
+    public BigDecimal getReviewScoreSubStart(){
+        return this.reviewScoreSubStart;
     }
 
     /**
     * 设置 开始 评价绩效指标扣减分数
-     * @param assessScoreSubStart
+    * @param reviewScoreSubStart
     */
-    public void setAssessScoreSubStart(BigDecimal assessScoreSubStart){
-        this.assessScoreSubStart = assessScoreSubStart;
+    public void setReviewScoreSubStart(BigDecimal reviewScoreSubStart){
+        this.reviewScoreSubStart = reviewScoreSubStart;
     }
 
     /**
     * 获取 结束 评价绩效指标扣减分数
-     * @return $assessScoreSubEnd
+    * @return $reviewScoreSubEnd
     */
-    public BigDecimal getAssessScoreSubEnd(){
-        return this.assessScoreSubEnd;
+    public BigDecimal getReviewScoreSubEnd(){
+        return this.reviewScoreSubEnd;
     }
 
     /**
     * 设置 结束 评价绩效指标扣减分数
-     * @param assessScoreSubEnd
+    * @param reviewScoreSubEnd
     */
-    public void setAssessScoreSubEnd(BigDecimal assessScoreSubEnd){
-        this.assessScoreSubEnd = assessScoreSubEnd;
+    public void setReviewScoreSubEnd(BigDecimal reviewScoreSubEnd){
+        this.reviewScoreSubEnd = reviewScoreSubEnd;
     }
 
     /**
     * 获取 增加 评价绩效指标扣减分数
-     * @return assessScoreSubIncrement
+    * @return reviewScoreSubIncrement
     */
-    public BigDecimal getAssessScoreSubIncrement(){
-        return this.assessScoreSubIncrement;
+    public BigDecimal getReviewScoreSubIncrement(){
+        return this.reviewScoreSubIncrement;
     }
 
     /**
     * 设置 增加 评价绩效指标扣减分数
-     * @param assessScoreSubIncrement
+    * @param reviewScoreSubIncrement
     */
-    public void setAssessScoreSubIncrement(BigDecimal assessScoreSubIncrement){
-        this.assessScoreSubIncrement = assessScoreSubIncrement;
+    public void setReviewScoreSubIncrement(BigDecimal reviewScoreSubIncrement){
+        this.reviewScoreSubIncrement = reviewScoreSubIncrement;
     }
 
     /**
     * 获取 评价绩效指标扣减分数
-     * @return assessScoreSubList
+    * @return reviewScoreSubList
     */
-    public List<BigDecimal> getAssessScoreSubList(){
-        return this.assessScoreSubList;
+    public List<BigDecimal> getReviewScoreSubList(){
+        return this.reviewScoreSubList;
     }
 
     /**
     * 设置 评价绩效指标扣减分数
-     * @param assessScoreSubList
+    * @param reviewScoreSubList
     */
-    public void setAssessScoreSubList(List<BigDecimal> assessScoreSubList){
-        this.assessScoreSubList = assessScoreSubList;
+    public void setReviewScoreSubList(List<BigDecimal> reviewScoreSubList){
+        this.reviewScoreSubList = reviewScoreSubList;
     }
 
     /**
     * 获取 评价绩效指标扣减分数
-     * @return assessScoreSubNotList
+    * @return reviewScoreSubNotList
     */
-    public List<BigDecimal> getAssessScoreSubNotList(){
-        return this.assessScoreSubNotList;
+    public List<BigDecimal> getReviewScoreSubNotList(){
+        return this.reviewScoreSubNotList;
     }
 
     /**
     * 设置 评价绩效指标扣减分数
-     * @param assessScoreSubNotList
+    * @param reviewScoreSubNotList
     */
-    public void setAssessScoreSubNotList(List<BigDecimal> assessScoreSubNotList){
-        this.assessScoreSubNotList = assessScoreSubNotList;
+    public void setReviewScoreSubNotList(List<BigDecimal> reviewScoreSubNotList){
+        this.reviewScoreSubNotList = reviewScoreSubNotList;
     }
 
 
@@ -1295,163 +1295,163 @@ public class StaffPerformStatQuery extends StaffPerformStatEntity {
 
     /**
     * 获取 开始 办件绩效指标增加分数
-     * @return workScoreAddStart
+    * @return goworkScoreAddStart
     */
-    public BigDecimal getWorkScoreAddStart(){
-        return this.workScoreAddStart;
+    public BigDecimal getGoworkScoreAddStart(){
+        return this.goworkScoreAddStart;
     }
 
     /**
     * 设置 开始 办件绩效指标增加分数
-     * @param workScoreAddStart
+    * @param goworkScoreAddStart
     */
-    public void setWorkScoreAddStart(BigDecimal workScoreAddStart){
-        this.workScoreAddStart = workScoreAddStart;
+    public void setGoworkScoreAddStart(BigDecimal goworkScoreAddStart){
+        this.goworkScoreAddStart = goworkScoreAddStart;
     }
 
     /**
     * 获取 结束 办件绩效指标增加分数
-     * @return $workScoreAddEnd
+    * @return $goworkScoreAddEnd
     */
-    public BigDecimal getWorkScoreAddEnd(){
-        return this.workScoreAddEnd;
+    public BigDecimal getGoworkScoreAddEnd(){
+        return this.goworkScoreAddEnd;
     }
 
     /**
     * 设置 结束 办件绩效指标增加分数
-     * @param workScoreAddEnd
+    * @param goworkScoreAddEnd
     */
-    public void setWorkScoreAddEnd(BigDecimal workScoreAddEnd){
-        this.workScoreAddEnd = workScoreAddEnd;
+    public void setGoworkScoreAddEnd(BigDecimal goworkScoreAddEnd){
+        this.goworkScoreAddEnd = goworkScoreAddEnd;
     }
 
     /**
     * 获取 增加 办件绩效指标增加分数
-     * @return workScoreAddIncrement
+    * @return goworkScoreAddIncrement
     */
-    public BigDecimal getWorkScoreAddIncrement(){
-        return this.workScoreAddIncrement;
+    public BigDecimal getGoworkScoreAddIncrement(){
+        return this.goworkScoreAddIncrement;
     }
 
     /**
     * 设置 增加 办件绩效指标增加分数
-     * @param workScoreAddIncrement
+    * @param goworkScoreAddIncrement
     */
-    public void setWorkScoreAddIncrement(BigDecimal workScoreAddIncrement){
-        this.workScoreAddIncrement = workScoreAddIncrement;
+    public void setGoworkScoreAddIncrement(BigDecimal goworkScoreAddIncrement){
+        this.goworkScoreAddIncrement = goworkScoreAddIncrement;
     }
 
     /**
     * 获取 办件绩效指标增加分数
-     * @return workScoreAddList
+    * @return goworkScoreAddList
     */
-    public List<BigDecimal> getWorkScoreAddList(){
-        return this.workScoreAddList;
+    public List<BigDecimal> getGoworkScoreAddList(){
+        return this.goworkScoreAddList;
     }
 
     /**
     * 设置 办件绩效指标增加分数
-     * @param workScoreAddList
+    * @param goworkScoreAddList
     */
-    public void setWorkScoreAddList(List<BigDecimal> workScoreAddList){
-        this.workScoreAddList = workScoreAddList;
+    public void setGoworkScoreAddList(List<BigDecimal> goworkScoreAddList){
+        this.goworkScoreAddList = goworkScoreAddList;
     }
 
     /**
     * 获取 办件绩效指标增加分数
-     * @return workScoreAddNotList
+    * @return goworkScoreAddNotList
     */
-    public List<BigDecimal> getWorkScoreAddNotList(){
-        return this.workScoreAddNotList;
+    public List<BigDecimal> getGoworkScoreAddNotList(){
+        return this.goworkScoreAddNotList;
     }
 
     /**
     * 设置 办件绩效指标增加分数
-     * @param workScoreAddNotList
+    * @param goworkScoreAddNotList
     */
-    public void setWorkScoreAddNotList(List<BigDecimal> workScoreAddNotList){
-        this.workScoreAddNotList = workScoreAddNotList;
+    public void setGoworkScoreAddNotList(List<BigDecimal> goworkScoreAddNotList){
+        this.goworkScoreAddNotList = goworkScoreAddNotList;
     }
 
 
     /**
     * 获取 开始 办件绩效指标扣减分数
-     * @return workScoreSubStart
+    * @return goworkScoreSubStart
     */
-    public BigDecimal getWorkScoreSubStart(){
-        return this.workScoreSubStart;
+    public BigDecimal getGoworkScoreSubStart(){
+        return this.goworkScoreSubStart;
     }
 
     /**
     * 设置 开始 办件绩效指标扣减分数
-     * @param workScoreSubStart
+    * @param goworkScoreSubStart
     */
-    public void setWorkScoreSubStart(BigDecimal workScoreSubStart){
-        this.workScoreSubStart = workScoreSubStart;
+    public void setGoworkScoreSubStart(BigDecimal goworkScoreSubStart){
+        this.goworkScoreSubStart = goworkScoreSubStart;
     }
 
     /**
     * 获取 结束 办件绩效指标扣减分数
-     * @return $workScoreSubEnd
+    * @return $goworkScoreSubEnd
     */
-    public BigDecimal getWorkScoreSubEnd(){
-        return this.workScoreSubEnd;
+    public BigDecimal getGoworkScoreSubEnd(){
+        return this.goworkScoreSubEnd;
     }
 
     /**
     * 设置 结束 办件绩效指标扣减分数
-     * @param workScoreSubEnd
+    * @param goworkScoreSubEnd
     */
-    public void setWorkScoreSubEnd(BigDecimal workScoreSubEnd){
-        this.workScoreSubEnd = workScoreSubEnd;
+    public void setGoworkScoreSubEnd(BigDecimal goworkScoreSubEnd){
+        this.goworkScoreSubEnd = goworkScoreSubEnd;
     }
 
     /**
     * 获取 增加 办件绩效指标扣减分数
-     * @return workScoreSubIncrement
+    * @return goworkScoreSubIncrement
     */
-    public BigDecimal getWorkScoreSubIncrement(){
-        return this.workScoreSubIncrement;
+    public BigDecimal getGoworkScoreSubIncrement(){
+        return this.goworkScoreSubIncrement;
     }
 
     /**
     * 设置 增加 办件绩效指标扣减分数
-     * @param workScoreSubIncrement
+    * @param goworkScoreSubIncrement
     */
-    public void setWorkScoreSubIncrement(BigDecimal workScoreSubIncrement){
-        this.workScoreSubIncrement = workScoreSubIncrement;
+    public void setGoworkScoreSubIncrement(BigDecimal goworkScoreSubIncrement){
+        this.goworkScoreSubIncrement = goworkScoreSubIncrement;
     }
 
     /**
     * 获取 办件绩效指标扣减分数
-     * @return workScoreSubList
+    * @return goworkScoreSubList
     */
-    public List<BigDecimal> getWorkScoreSubList(){
-        return this.workScoreSubList;
+    public List<BigDecimal> getGoworkScoreSubList(){
+        return this.goworkScoreSubList;
     }
 
     /**
     * 设置 办件绩效指标扣减分数
-     * @param workScoreSubList
+    * @param goworkScoreSubList
     */
-    public void setWorkScoreSubList(List<BigDecimal> workScoreSubList){
-        this.workScoreSubList = workScoreSubList;
+    public void setGoworkScoreSubList(List<BigDecimal> goworkScoreSubList){
+        this.goworkScoreSubList = goworkScoreSubList;
     }
 
     /**
     * 获取 办件绩效指标扣减分数
-     * @return workScoreSubNotList
+    * @return goworkScoreSubNotList
     */
-    public List<BigDecimal> getWorkScoreSubNotList(){
-        return this.workScoreSubNotList;
+    public List<BigDecimal> getGoworkScoreSubNotList(){
+        return this.goworkScoreSubNotList;
     }
 
     /**
     * 设置 办件绩效指标扣减分数
-     * @param workScoreSubNotList
+    * @param goworkScoreSubNotList
     */
-    public void setWorkScoreSubNotList(List<BigDecimal> workScoreSubNotList){
-        this.workScoreSubNotList = workScoreSubNotList;
+    public void setGoworkScoreSubNotList(List<BigDecimal> goworkScoreSubNotList){
+        this.goworkScoreSubNotList = goworkScoreSubNotList;
     }
 
 
@@ -2679,109 +2679,109 @@ public class StaffPerformStatQuery extends StaffPerformStatEntity {
 
     /**
     * 设置  评价绩效指标增加分数
-     * @param assessScoreAdd
+    * @param reviewScoreAdd
     */
-    public StaffPerformStatQuery assessScoreAdd(BigDecimal assessScoreAdd){
-        setAssessScoreAdd(assessScoreAdd);
+    public StaffPerformStatQuery reviewScoreAdd(BigDecimal reviewScoreAdd){
+	    setReviewScoreAdd(reviewScoreAdd);
 		return this;
     }
 	
 	 /**
     * 设置 开始 评价绩效指标增加分数
-     * @param assessScoreAddStart
+    * @param reviewScoreAddStart
     */
-    public StaffPerformStatQuery assessScoreAddStart(BigDecimal assessScoreAddStart){
-        this.assessScoreAddStart = assessScoreAddStart;
+    public StaffPerformStatQuery reviewScoreAddStart(BigDecimal reviewScoreAddStart){
+		this.reviewScoreAddStart = reviewScoreAddStart;
 		return this;
     }
 
     /**
     * 设置 结束 评价绩效指标增加分数
-     * @param assessScoreAddEnd
+    * @param reviewScoreAddEnd
     */
-    public StaffPerformStatQuery assessScoreAddEnd(BigDecimal assessScoreAddEnd){
-        this.assessScoreAddEnd = assessScoreAddEnd;
+    public StaffPerformStatQuery reviewScoreAddEnd(BigDecimal reviewScoreAddEnd){
+		this.reviewScoreAddEnd = reviewScoreAddEnd;
 		return this;
     }
 
     /**
     * 设置 增加 评价绩效指标增加分数
-     * @param assessScoreAddIncrement
+    * @param reviewScoreAddIncrement
     */
-    public StaffPerformStatQuery assessScoreAddIncrement(BigDecimal assessScoreAddIncrement){
-        this.assessScoreAddIncrement = assessScoreAddIncrement;
+    public StaffPerformStatQuery reviewScoreAddIncrement(BigDecimal reviewScoreAddIncrement){
+		this.reviewScoreAddIncrement = reviewScoreAddIncrement;
 		return this;
     }
 
     /**
     * 设置 评价绩效指标增加分数
-     * @param assessScoreAddList
+    * @param reviewScoreAddList
     */
-    public StaffPerformStatQuery assessScoreAddList(List<BigDecimal> assessScoreAddList){
-        this.assessScoreAddList = assessScoreAddList;
+    public StaffPerformStatQuery reviewScoreAddList(List<BigDecimal> reviewScoreAddList){
+        this.reviewScoreAddList = reviewScoreAddList;
 		return this;
         }
 
         /**
         * 设置 评价绩效指标增加分数
-     * @param assessScoreAddNotList
+        * @param reviewScoreAddNotList
         */
-    public StaffPerformStatQuery assessScoreAddNotList(List<BigDecimal> assessScoreAddNotList){
-        this.assessScoreAddNotList = assessScoreAddNotList;
+        public StaffPerformStatQuery reviewScoreAddNotList(List<BigDecimal> reviewScoreAddNotList){
+        this.reviewScoreAddNotList = reviewScoreAddNotList;
         return this;
         }
 
     /**
     * 设置  评价绩效指标扣减分数
-     * @param assessScoreSub
+    * @param reviewScoreSub
     */
-    public StaffPerformStatQuery assessScoreSub(BigDecimal assessScoreSub){
-        setAssessScoreSub(assessScoreSub);
+    public StaffPerformStatQuery reviewScoreSub(BigDecimal reviewScoreSub){
+	    setReviewScoreSub(reviewScoreSub);
 		return this;
     }
 	
 	 /**
     * 设置 开始 评价绩效指标扣减分数
-     * @param assessScoreSubStart
+    * @param reviewScoreSubStart
     */
-    public StaffPerformStatQuery assessScoreSubStart(BigDecimal assessScoreSubStart){
-        this.assessScoreSubStart = assessScoreSubStart;
+    public StaffPerformStatQuery reviewScoreSubStart(BigDecimal reviewScoreSubStart){
+		this.reviewScoreSubStart = reviewScoreSubStart;
 		return this;
     }
 
     /**
     * 设置 结束 评价绩效指标扣减分数
-     * @param assessScoreSubEnd
+    * @param reviewScoreSubEnd
     */
-    public StaffPerformStatQuery assessScoreSubEnd(BigDecimal assessScoreSubEnd){
-        this.assessScoreSubEnd = assessScoreSubEnd;
+    public StaffPerformStatQuery reviewScoreSubEnd(BigDecimal reviewScoreSubEnd){
+		this.reviewScoreSubEnd = reviewScoreSubEnd;
 		return this;
     }
 
     /**
     * 设置 增加 评价绩效指标扣减分数
-     * @param assessScoreSubIncrement
+    * @param reviewScoreSubIncrement
     */
-    public StaffPerformStatQuery assessScoreSubIncrement(BigDecimal assessScoreSubIncrement){
-        this.assessScoreSubIncrement = assessScoreSubIncrement;
+    public StaffPerformStatQuery reviewScoreSubIncrement(BigDecimal reviewScoreSubIncrement){
+		this.reviewScoreSubIncrement = reviewScoreSubIncrement;
 		return this;
     }
 
     /**
     * 设置 评价绩效指标扣减分数
-     * @param assessScoreSubList
+    * @param reviewScoreSubList
     */
-    public StaffPerformStatQuery assessScoreSubList(List<BigDecimal> assessScoreSubList){
-        this.assessScoreSubList = assessScoreSubList;
+    public StaffPerformStatQuery reviewScoreSubList(List<BigDecimal> reviewScoreSubList){
+        this.reviewScoreSubList = reviewScoreSubList;
 		return this;
         }
 
         /**
         * 设置 评价绩效指标扣减分数
-     * @param assessScoreSubNotList
+        * @param reviewScoreSubNotList
         */
-    public StaffPerformStatQuery assessScoreSubNotList(List<BigDecimal> assessScoreSubNotList){
-        this.assessScoreSubNotList = assessScoreSubNotList;
+        public StaffPerformStatQuery reviewScoreSubNotList(List<BigDecimal> reviewScoreSubNotList){
+        this.reviewScoreSubNotList = reviewScoreSubNotList;
         return this;
         }
 
@@ -2895,109 +2895,109 @@ public class StaffPerformStatQuery extends StaffPerformStatEntity {
 
     /**
     * 设置  办件绩效指标增加分数
-     * @param workScoreAdd
+    * @param goworkScoreAdd
     */
-    public StaffPerformStatQuery workScoreAdd(BigDecimal workScoreAdd){
-        setWorkScoreAdd(workScoreAdd);
+    public StaffPerformStatQuery goworkScoreAdd(BigDecimal goworkScoreAdd){
+	    setGoworkScoreAdd(goworkScoreAdd);
 		return this;
     }
 	
 	 /**
     * 设置 开始 办件绩效指标增加分数
-     * @param workScoreAddStart
+    * @param goworkScoreAddStart
     */
-    public StaffPerformStatQuery workScoreAddStart(BigDecimal workScoreAddStart){
-        this.workScoreAddStart = workScoreAddStart;
+    public StaffPerformStatQuery goworkScoreAddStart(BigDecimal goworkScoreAddStart){
+		this.goworkScoreAddStart = goworkScoreAddStart;
 		return this;
     }
 
     /**
     * 设置 结束 办件绩效指标增加分数
-     * @param workScoreAddEnd
+    * @param goworkScoreAddEnd
     */
-    public StaffPerformStatQuery workScoreAddEnd(BigDecimal workScoreAddEnd){
-        this.workScoreAddEnd = workScoreAddEnd;
+    public StaffPerformStatQuery goworkScoreAddEnd(BigDecimal goworkScoreAddEnd){
+		this.goworkScoreAddEnd = goworkScoreAddEnd;
 		return this;
     }
 
     /**
     * 设置 增加 办件绩效指标增加分数
-     * @param workScoreAddIncrement
+    * @param goworkScoreAddIncrement
     */
-    public StaffPerformStatQuery workScoreAddIncrement(BigDecimal workScoreAddIncrement){
-        this.workScoreAddIncrement = workScoreAddIncrement;
+    public StaffPerformStatQuery goworkScoreAddIncrement(BigDecimal goworkScoreAddIncrement){
+		this.goworkScoreAddIncrement = goworkScoreAddIncrement;
 		return this;
     }
 
     /**
     * 设置 办件绩效指标增加分数
-     * @param workScoreAddList
+    * @param goworkScoreAddList
     */
-    public StaffPerformStatQuery workScoreAddList(List<BigDecimal> workScoreAddList){
-        this.workScoreAddList = workScoreAddList;
+    public StaffPerformStatQuery goworkScoreAddList(List<BigDecimal> goworkScoreAddList){
+        this.goworkScoreAddList = goworkScoreAddList;
 		return this;
         }
 
         /**
         * 设置 办件绩效指标增加分数
-     * @param workScoreAddNotList
+        * @param goworkScoreAddNotList
         */
-    public StaffPerformStatQuery workScoreAddNotList(List<BigDecimal> workScoreAddNotList){
-        this.workScoreAddNotList = workScoreAddNotList;
+        public StaffPerformStatQuery goworkScoreAddNotList(List<BigDecimal> goworkScoreAddNotList){
+        this.goworkScoreAddNotList = goworkScoreAddNotList;
         return this;
         }
 
     /**
     * 设置  办件绩效指标扣减分数
-     * @param workScoreSub
+    * @param goworkScoreSub
     */
-    public StaffPerformStatQuery workScoreSub(BigDecimal workScoreSub){
-        setWorkScoreSub(workScoreSub);
+    public StaffPerformStatQuery goworkScoreSub(BigDecimal goworkScoreSub){
+	    setGoworkScoreSub(goworkScoreSub);
 		return this;
     }
 	
 	 /**
     * 设置 开始 办件绩效指标扣减分数
-     * @param workScoreSubStart
+    * @param goworkScoreSubStart
     */
-    public StaffPerformStatQuery workScoreSubStart(BigDecimal workScoreSubStart){
-        this.workScoreSubStart = workScoreSubStart;
+    public StaffPerformStatQuery goworkScoreSubStart(BigDecimal goworkScoreSubStart){
+		this.goworkScoreSubStart = goworkScoreSubStart;
 		return this;
     }
 
     /**
     * 设置 结束 办件绩效指标扣减分数
-     * @param workScoreSubEnd
+    * @param goworkScoreSubEnd
     */
-    public StaffPerformStatQuery workScoreSubEnd(BigDecimal workScoreSubEnd){
-        this.workScoreSubEnd = workScoreSubEnd;
+    public StaffPerformStatQuery goworkScoreSubEnd(BigDecimal goworkScoreSubEnd){
+		this.goworkScoreSubEnd = goworkScoreSubEnd;
 		return this;
     }
 
     /**
     * 设置 增加 办件绩效指标扣减分数
-     * @param workScoreSubIncrement
+    * @param goworkScoreSubIncrement
     */
-    public StaffPerformStatQuery workScoreSubIncrement(BigDecimal workScoreSubIncrement){
-        this.workScoreSubIncrement = workScoreSubIncrement;
+    public StaffPerformStatQuery goworkScoreSubIncrement(BigDecimal goworkScoreSubIncrement){
+		this.goworkScoreSubIncrement = goworkScoreSubIncrement;
 		return this;
     }
 
     /**
     * 设置 办件绩效指标扣减分数
-     * @param workScoreSubList
+    * @param goworkScoreSubList
     */
-    public StaffPerformStatQuery workScoreSubList(List<BigDecimal> workScoreSubList){
-        this.workScoreSubList = workScoreSubList;
+    public StaffPerformStatQuery goworkScoreSubList(List<BigDecimal> goworkScoreSubList){
+        this.goworkScoreSubList = goworkScoreSubList;
 		return this;
         }
 
         /**
         * 设置 办件绩效指标扣减分数
-     * @param workScoreSubNotList
+        * @param goworkScoreSubNotList
         */
-    public StaffPerformStatQuery workScoreSubNotList(List<BigDecimal> workScoreSubNotList){
-        this.workScoreSubNotList = workScoreSubNotList;
+        public StaffPerformStatQuery goworkScoreSubNotList(List<BigDecimal> goworkScoreSubNotList){
+        this.goworkScoreSubNotList = goworkScoreSubNotList;
         return this;
         }
 

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

@@ -11,7 +11,7 @@ import lombok.Data;
 * 员工绩效统计实体对象
 *
 * @author zxfei
-* @date 2023-07-05
+* @date 2023-07-14
 */
 @Data
 public class StaffPerformSummaryEntity extends StaffPerformSummaryVo {
@@ -44,11 +44,15 @@ public class StaffPerformSummaryEntity extends StaffPerformSummaryVo {
     /**
     * 评价绩效指标分数
     */
-    private BigDecimal assessScore;
+    private BigDecimal reviewScore;
+    /**
+    * 投诉绩效指标分数
+    */
+    private BigDecimal complainScore;
     /**
     * 办件绩效分数
     */
-    private BigDecimal workScore;
+    private BigDecimal goworkScore;
     /**
     * 效能绩效分数
     */
@@ -107,9 +111,11 @@ public class StaffPerformSummaryEntity extends StaffPerformSummaryVo {
 
             this.attendScore = new BigDecimal(0);
 
-            this.assessScore = new BigDecimal(0);
+            this.reviewScore = new BigDecimal(0);
+
+            this.complainScore = new BigDecimal(0);
 
-            this.workScore = new BigDecimal(0);
+            this.goworkScore = new BigDecimal(0);
 
             this.effectScore = new BigDecimal(0);
 

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

@@ -7,7 +7,7 @@ import com.mortals.xhx.module.staff.model.StaffPerformSummaryEntity;
 * 员工绩效统计查询对象
 *
 * @author zxfei
-* @date 2023-07-05
+* @date 2023-07-14
 */
 public class StaffPerformSummaryQuery extends StaffPerformSummaryEntity {
     /** 开始 主键ID，主键，自增长 */
@@ -86,34 +86,49 @@ public class StaffPerformSummaryQuery extends StaffPerformSummaryEntity {
     private List <BigDecimal> attendScoreNotList;
 
     /** 开始 评价绩效指标分数 */
-    private BigDecimal assessScoreStart;
+    private BigDecimal reviewScoreStart;
 
     /** 结束 评价绩效指标分数 */
-    private BigDecimal assessScoreEnd;
+    private BigDecimal reviewScoreEnd;
 
     /** 增加 评价绩效指标分数 */
-    private BigDecimal assessScoreIncrement;
+    private BigDecimal reviewScoreIncrement;
 
     /** 评价绩效指标分数列表 */
-    private List <BigDecimal> assessScoreList;
+    private List <BigDecimal> reviewScoreList;
 
     /** 评价绩效指标分数排除列表 */
-    private List <BigDecimal> assessScoreNotList;
+    private List <BigDecimal> reviewScoreNotList;
+
+    /** 开始 投诉绩效指标分数 */
+    private BigDecimal complainScoreStart;
+
+    /** 结束 投诉绩效指标分数 */
+    private BigDecimal complainScoreEnd;
+
+    /** 增加 投诉绩效指标分数 */
+    private BigDecimal complainScoreIncrement;
+
+    /** 投诉绩效指标分数列表 */
+    private List <BigDecimal> complainScoreList;
+
+    /** 投诉绩效指标分数排除列表 */
+    private List <BigDecimal> complainScoreNotList;
 
     /** 开始 办件绩效分数 */
-    private BigDecimal workScoreStart;
+    private BigDecimal goworkScoreStart;
 
     /** 结束 办件绩效分数 */
-    private BigDecimal workScoreEnd;
+    private BigDecimal goworkScoreEnd;
 
     /** 增加 办件绩效分数 */
-    private BigDecimal workScoreIncrement;
+    private BigDecimal goworkScoreIncrement;
 
     /** 办件绩效分数列表 */
-    private List <BigDecimal> workScoreList;
+    private List <BigDecimal> goworkScoreList;
 
     /** 办件绩效分数排除列表 */
-    private List <BigDecimal> workScoreNotList;
+    private List <BigDecimal> goworkScoreNotList;
 
     /** 开始 效能绩效分数 */
     private BigDecimal effectScoreStart;
@@ -682,163 +697,244 @@ public class StaffPerformSummaryQuery extends StaffPerformSummaryEntity {
 
     /**
     * 获取 开始 评价绩效指标分数
-    * @return assessScoreStart
+    * @return reviewScoreStart
     */
-    public BigDecimal getAssessScoreStart(){
-        return this.assessScoreStart;
+    public BigDecimal getReviewScoreStart(){
+        return this.reviewScoreStart;
     }
 
     /**
     * 设置 开始 评价绩效指标分数
-    * @param assessScoreStart
+    * @param reviewScoreStart
     */
-    public void setAssessScoreStart(BigDecimal assessScoreStart){
-        this.assessScoreStart = assessScoreStart;
+    public void setReviewScoreStart(BigDecimal reviewScoreStart){
+        this.reviewScoreStart = reviewScoreStart;
     }
 
     /**
     * 获取 结束 评价绩效指标分数
-    * @return $assessScoreEnd
+    * @return $reviewScoreEnd
     */
-    public BigDecimal getAssessScoreEnd(){
-        return this.assessScoreEnd;
+    public BigDecimal getReviewScoreEnd(){
+        return this.reviewScoreEnd;
     }
 
     /**
     * 设置 结束 评价绩效指标分数
-    * @param assessScoreEnd
+    * @param reviewScoreEnd
     */
-    public void setAssessScoreEnd(BigDecimal assessScoreEnd){
-        this.assessScoreEnd = assessScoreEnd;
+    public void setReviewScoreEnd(BigDecimal reviewScoreEnd){
+        this.reviewScoreEnd = reviewScoreEnd;
     }
 
     /**
     * 获取 增加 评价绩效指标分数
-    * @return assessScoreIncrement
+    * @return reviewScoreIncrement
     */
-    public BigDecimal getAssessScoreIncrement(){
-        return this.assessScoreIncrement;
+    public BigDecimal getReviewScoreIncrement(){
+        return this.reviewScoreIncrement;
     }
 
     /**
     * 设置 增加 评价绩效指标分数
-    * @param assessScoreIncrement
+    * @param reviewScoreIncrement
     */
-    public void setAssessScoreIncrement(BigDecimal assessScoreIncrement){
-        this.assessScoreIncrement = assessScoreIncrement;
+    public void setReviewScoreIncrement(BigDecimal reviewScoreIncrement){
+        this.reviewScoreIncrement = reviewScoreIncrement;
     }
 
     /**
     * 获取 评价绩效指标分数
-    * @return assessScoreList
+    * @return reviewScoreList
     */
-    public List<BigDecimal> getAssessScoreList(){
-        return this.assessScoreList;
+    public List<BigDecimal> getReviewScoreList(){
+        return this.reviewScoreList;
     }
 
     /**
     * 设置 评价绩效指标分数
-    * @param assessScoreList
+    * @param reviewScoreList
     */
-    public void setAssessScoreList(List<BigDecimal> assessScoreList){
-        this.assessScoreList = assessScoreList;
+    public void setReviewScoreList(List<BigDecimal> reviewScoreList){
+        this.reviewScoreList = reviewScoreList;
     }
 
     /**
     * 获取 评价绩效指标分数
-    * @return assessScoreNotList
+    * @return reviewScoreNotList
     */
-    public List<BigDecimal> getAssessScoreNotList(){
-        return this.assessScoreNotList;
+    public List<BigDecimal> getReviewScoreNotList(){
+        return this.reviewScoreNotList;
     }
 
     /**
     * 设置 评价绩效指标分数
-    * @param assessScoreNotList
+    * @param reviewScoreNotList
+    */
+    public void setReviewScoreNotList(List<BigDecimal> reviewScoreNotList){
+        this.reviewScoreNotList = reviewScoreNotList;
+    }
+
+
+    /**
+    * 获取 开始 投诉绩效指标分数
+    * @return complainScoreStart
+    */
+    public BigDecimal getComplainScoreStart(){
+        return this.complainScoreStart;
+    }
+
+    /**
+    * 设置 开始 投诉绩效指标分数
+    * @param complainScoreStart
+    */
+    public void setComplainScoreStart(BigDecimal complainScoreStart){
+        this.complainScoreStart = complainScoreStart;
+    }
+
+    /**
+    * 获取 结束 投诉绩效指标分数
+    * @return $complainScoreEnd
+    */
+    public BigDecimal getComplainScoreEnd(){
+        return this.complainScoreEnd;
+    }
+
+    /**
+    * 设置 结束 投诉绩效指标分数
+    * @param complainScoreEnd
+    */
+    public void setComplainScoreEnd(BigDecimal complainScoreEnd){
+        this.complainScoreEnd = complainScoreEnd;
+    }
+
+    /**
+    * 获取 增加 投诉绩效指标分数
+    * @return complainScoreIncrement
+    */
+    public BigDecimal getComplainScoreIncrement(){
+        return this.complainScoreIncrement;
+    }
+
+    /**
+    * 设置 增加 投诉绩效指标分数
+    * @param complainScoreIncrement
+    */
+    public void setComplainScoreIncrement(BigDecimal complainScoreIncrement){
+        this.complainScoreIncrement = complainScoreIncrement;
+    }
+
+    /**
+    * 获取 投诉绩效指标分数
+    * @return complainScoreList
+    */
+    public List<BigDecimal> getComplainScoreList(){
+        return this.complainScoreList;
+    }
+
+    /**
+    * 设置 投诉绩效指标分数
+    * @param complainScoreList
     */
-    public void setAssessScoreNotList(List<BigDecimal> assessScoreNotList){
-        this.assessScoreNotList = assessScoreNotList;
+    public void setComplainScoreList(List<BigDecimal> complainScoreList){
+        this.complainScoreList = complainScoreList;
+    }
+
+    /**
+    * 获取 投诉绩效指标分数
+    * @return complainScoreNotList
+    */
+    public List<BigDecimal> getComplainScoreNotList(){
+        return this.complainScoreNotList;
+    }
+
+    /**
+    * 设置 投诉绩效指标分数
+    * @param complainScoreNotList
+    */
+    public void setComplainScoreNotList(List<BigDecimal> complainScoreNotList){
+        this.complainScoreNotList = complainScoreNotList;
     }
 
 
     /**
     * 获取 开始 办件绩效分数
-    * @return workScoreStart
+    * @return goworkScoreStart
     */
-    public BigDecimal getWorkScoreStart(){
-        return this.workScoreStart;
+    public BigDecimal getGoworkScoreStart(){
+        return this.goworkScoreStart;
     }
 
     /**
     * 设置 开始 办件绩效分数
-    * @param workScoreStart
+    * @param goworkScoreStart
     */
-    public void setWorkScoreStart(BigDecimal workScoreStart){
-        this.workScoreStart = workScoreStart;
+    public void setGoworkScoreStart(BigDecimal goworkScoreStart){
+        this.goworkScoreStart = goworkScoreStart;
     }
 
     /**
     * 获取 结束 办件绩效分数
-    * @return $workScoreEnd
+    * @return $goworkScoreEnd
     */
-    public BigDecimal getWorkScoreEnd(){
-        return this.workScoreEnd;
+    public BigDecimal getGoworkScoreEnd(){
+        return this.goworkScoreEnd;
     }
 
     /**
     * 设置 结束 办件绩效分数
-    * @param workScoreEnd
+    * @param goworkScoreEnd
     */
-    public void setWorkScoreEnd(BigDecimal workScoreEnd){
-        this.workScoreEnd = workScoreEnd;
+    public void setGoworkScoreEnd(BigDecimal goworkScoreEnd){
+        this.goworkScoreEnd = goworkScoreEnd;
     }
 
     /**
     * 获取 增加 办件绩效分数
-    * @return workScoreIncrement
+    * @return goworkScoreIncrement
     */
-    public BigDecimal getWorkScoreIncrement(){
-        return this.workScoreIncrement;
+    public BigDecimal getGoworkScoreIncrement(){
+        return this.goworkScoreIncrement;
     }
 
     /**
     * 设置 增加 办件绩效分数
-    * @param workScoreIncrement
+    * @param goworkScoreIncrement
     */
-    public void setWorkScoreIncrement(BigDecimal workScoreIncrement){
-        this.workScoreIncrement = workScoreIncrement;
+    public void setGoworkScoreIncrement(BigDecimal goworkScoreIncrement){
+        this.goworkScoreIncrement = goworkScoreIncrement;
     }
 
     /**
     * 获取 办件绩效分数
-    * @return workScoreList
+    * @return goworkScoreList
     */
-    public List<BigDecimal> getWorkScoreList(){
-        return this.workScoreList;
+    public List<BigDecimal> getGoworkScoreList(){
+        return this.goworkScoreList;
     }
 
     /**
     * 设置 办件绩效分数
-    * @param workScoreList
+    * @param goworkScoreList
     */
-    public void setWorkScoreList(List<BigDecimal> workScoreList){
-        this.workScoreList = workScoreList;
+    public void setGoworkScoreList(List<BigDecimal> goworkScoreList){
+        this.goworkScoreList = goworkScoreList;
     }
 
     /**
     * 获取 办件绩效分数
-    * @return workScoreNotList
+    * @return goworkScoreNotList
     */
-    public List<BigDecimal> getWorkScoreNotList(){
-        return this.workScoreNotList;
+    public List<BigDecimal> getGoworkScoreNotList(){
+        return this.goworkScoreNotList;
     }
 
     /**
     * 设置 办件绩效分数
-    * @param workScoreNotList
+    * @param goworkScoreNotList
     */
-    public void setWorkScoreNotList(List<BigDecimal> workScoreNotList){
-        this.workScoreNotList = workScoreNotList;
+    public void setGoworkScoreNotList(List<BigDecimal> goworkScoreNotList){
+        this.goworkScoreNotList = goworkScoreNotList;
     }
 
 
@@ -1861,109 +1957,163 @@ public class StaffPerformSummaryQuery extends StaffPerformSummaryEntity {
 
     /**
     * 设置  评价绩效指标分数
-    * @param assessScore
+    * @param reviewScore
     */
-    public StaffPerformSummaryQuery assessScore(BigDecimal assessScore){
-	    setAssessScore(assessScore);
+    public StaffPerformSummaryQuery reviewScore(BigDecimal reviewScore){
+	    setReviewScore(reviewScore);
 		return this;
     }
 	
 	 /**
     * 设置 开始 评价绩效指标分数
-    * @param assessScoreStart
+    * @param reviewScoreStart
     */
-    public StaffPerformSummaryQuery assessScoreStart(BigDecimal assessScoreStart){
-		this.assessScoreStart = assessScoreStart;
+    public StaffPerformSummaryQuery reviewScoreStart(BigDecimal reviewScoreStart){
+		this.reviewScoreStart = reviewScoreStart;
 		return this;
     }
 
     /**
     * 设置 结束 评价绩效指标分数
-    * @param assessScoreEnd
+    * @param reviewScoreEnd
     */
-    public StaffPerformSummaryQuery assessScoreEnd(BigDecimal assessScoreEnd){
-		this.assessScoreEnd = assessScoreEnd;
+    public StaffPerformSummaryQuery reviewScoreEnd(BigDecimal reviewScoreEnd){
+		this.reviewScoreEnd = reviewScoreEnd;
 		return this;
     }
 
     /**
     * 设置 增加 评价绩效指标分数
-    * @param assessScoreIncrement
+    * @param reviewScoreIncrement
     */
-    public StaffPerformSummaryQuery assessScoreIncrement(BigDecimal assessScoreIncrement){
-		this.assessScoreIncrement = assessScoreIncrement;
+    public StaffPerformSummaryQuery reviewScoreIncrement(BigDecimal reviewScoreIncrement){
+		this.reviewScoreIncrement = reviewScoreIncrement;
 		return this;
     }
 
     /**
     * 设置 评价绩效指标分数
-    * @param assessScoreList
+    * @param reviewScoreList
     */
-    public StaffPerformSummaryQuery assessScoreList(List<BigDecimal> assessScoreList){
-        this.assessScoreList = assessScoreList;
+    public StaffPerformSummaryQuery reviewScoreList(List<BigDecimal> reviewScoreList){
+        this.reviewScoreList = reviewScoreList;
 		return this;
         }
 
         /**
         * 设置 评价绩效指标分数
-        * @param assessScoreNotList
+        * @param reviewScoreNotList
+        */
+        public StaffPerformSummaryQuery reviewScoreNotList(List<BigDecimal> reviewScoreNotList){
+        this.reviewScoreNotList = reviewScoreNotList;
+        return this;
+        }
+
+    /**
+    * 设置  投诉绩效指标分数
+    * @param complainScore
+    */
+    public StaffPerformSummaryQuery complainScore(BigDecimal complainScore){
+	    setComplainScore(complainScore);
+		return this;
+    }
+	
+	 /**
+    * 设置 开始 投诉绩效指标分数
+    * @param complainScoreStart
+    */
+    public StaffPerformSummaryQuery complainScoreStart(BigDecimal complainScoreStart){
+		this.complainScoreStart = complainScoreStart;
+		return this;
+    }
+
+    /**
+    * 设置 结束 投诉绩效指标分数
+    * @param complainScoreEnd
+    */
+    public StaffPerformSummaryQuery complainScoreEnd(BigDecimal complainScoreEnd){
+		this.complainScoreEnd = complainScoreEnd;
+		return this;
+    }
+
+    /**
+    * 设置 增加 投诉绩效指标分数
+    * @param complainScoreIncrement
+    */
+    public StaffPerformSummaryQuery complainScoreIncrement(BigDecimal complainScoreIncrement){
+		this.complainScoreIncrement = complainScoreIncrement;
+		return this;
+    }
+
+    /**
+    * 设置 投诉绩效指标分数
+    * @param complainScoreList
+    */
+    public StaffPerformSummaryQuery complainScoreList(List<BigDecimal> complainScoreList){
+        this.complainScoreList = complainScoreList;
+		return this;
+        }
+
+        /**
+        * 设置 投诉绩效指标分数
+        * @param complainScoreNotList
         */
-        public StaffPerformSummaryQuery assessScoreNotList(List<BigDecimal> assessScoreNotList){
-        this.assessScoreNotList = assessScoreNotList;
+        public StaffPerformSummaryQuery complainScoreNotList(List<BigDecimal> complainScoreNotList){
+        this.complainScoreNotList = complainScoreNotList;
         return this;
         }
 
     /**
     * 设置  办件绩效分数
-    * @param workScore
+    * @param goworkScore
     */
-    public StaffPerformSummaryQuery workScore(BigDecimal workScore){
-	    setWorkScore(workScore);
+    public StaffPerformSummaryQuery goworkScore(BigDecimal goworkScore){
+	    setGoworkScore(goworkScore);
 		return this;
     }
 	
 	 /**
     * 设置 开始 办件绩效分数
-    * @param workScoreStart
+    * @param goworkScoreStart
     */
-    public StaffPerformSummaryQuery workScoreStart(BigDecimal workScoreStart){
-		this.workScoreStart = workScoreStart;
+    public StaffPerformSummaryQuery goworkScoreStart(BigDecimal goworkScoreStart){
+		this.goworkScoreStart = goworkScoreStart;
 		return this;
     }
 
     /**
     * 设置 结束 办件绩效分数
-    * @param workScoreEnd
+    * @param goworkScoreEnd
     */
-    public StaffPerformSummaryQuery workScoreEnd(BigDecimal workScoreEnd){
-		this.workScoreEnd = workScoreEnd;
+    public StaffPerformSummaryQuery goworkScoreEnd(BigDecimal goworkScoreEnd){
+		this.goworkScoreEnd = goworkScoreEnd;
 		return this;
     }
 
     /**
     * 设置 增加 办件绩效分数
-    * @param workScoreIncrement
+    * @param goworkScoreIncrement
     */
-    public StaffPerformSummaryQuery workScoreIncrement(BigDecimal workScoreIncrement){
-		this.workScoreIncrement = workScoreIncrement;
+    public StaffPerformSummaryQuery goworkScoreIncrement(BigDecimal goworkScoreIncrement){
+		this.goworkScoreIncrement = goworkScoreIncrement;
 		return this;
     }
 
     /**
     * 设置 办件绩效分数
-    * @param workScoreList
+    * @param goworkScoreList
     */
-    public StaffPerformSummaryQuery workScoreList(List<BigDecimal> workScoreList){
-        this.workScoreList = workScoreList;
+    public StaffPerformSummaryQuery goworkScoreList(List<BigDecimal> goworkScoreList){
+        this.goworkScoreList = goworkScoreList;
 		return this;
         }
 
         /**
         * 设置 办件绩效分数
-        * @param workScoreNotList
+        * @param goworkScoreNotList
         */
-        public StaffPerformSummaryQuery workScoreNotList(List<BigDecimal> workScoreNotList){
-        this.workScoreNotList = workScoreNotList;
+        public StaffPerformSummaryQuery goworkScoreNotList(List<BigDecimal> goworkScoreNotList){
+        this.goworkScoreNotList = goworkScoreNotList;
         return this;
         }
 

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

@@ -11,7 +11,7 @@ import java.util.Date;
 * 员工绩效统计视图对象
 *
 * @author zxfei
-* @date 2023-07-11
+* @date 2023-07-14
 */
 @Data
 public class StaffPerformStatVo extends BaseEntityLong {

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

@@ -11,7 +11,7 @@ import java.util.Date;
 * 员工绩效统计视图对象
 *
 * @author zxfei
-* @date 2023-07-05
+* @date 2023-07-14
 */
 @Data
 public class StaffPerformSummaryVo extends BaseEntityLong {

attendance-performance-manager/src/main/resources/sqlmap/module/dept/DeptPerformStatMapper.xml

@@ -9,16 +9,21 @@
             <result property="deptId" column="deptId" />
             <result property="deptName" column="deptName" />
             <result property="totalScore" column="totalScore" />
+            <result property="totalAddScore" column="totalAddScore" />
+            <result property="totalSubScore" column="totalSubScore" />
             <result property="attendScoreAdd" column="attendScoreAdd" />
             <result property="attendScoreSub" column="attendScoreSub" />
-            <result property="assessScoreAdd" column="assessScoreAdd" />
-            <result property="assessScoreSub" column="assessScoreSub" />
-            <result property="workScoreAdd" column="workScoreAdd" />
-            <result property="workScoreSub" column="workScoreSub" />
+            <result property="reviewScoreAdd" column="reviewScoreAdd" />
+            <result property="reviewScoreSub" column="reviewScoreSub" />
+            <result property="complainScoreAdd" column="complainScoreAdd" />
+            <result property="complainScoreSub" column="complainScoreSub" />
+            <result property="goworkScoreAdd" column="goworkScoreAdd" />
+            <result property="goworkScoreSub" column="goworkScoreSub" />
             <result property="effectScoreAdd" column="effectScoreAdd" />
             <result property="effectScoreSub" column="effectScoreSub" />
             <result property="otherScoreAdd" column="otherScoreAdd" />
             <result property="otherScoreSub" column="otherScoreSub" />
+            <result property="averageScore" column="averageScore" />
             <result property="remark" column="remark" />
             <result property="year" column="year" />
             <result property="month" column="month" />
@@ -27,11 +32,6 @@
             <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>
 
@@ -51,23 +51,35 @@
                 <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('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('attendScoreAdd') or colPickMode == 1 and data.containsKey('attendScoreAdd')))">
                     a.attendScoreAdd,
                 </if>
                 <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('attendScoreSub') or colPickMode == 1 and data.containsKey('attendScoreSub')))">
                     a.attendScoreSub,
                 </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('assessScoreAdd') or colPickMode == 1 and data.containsKey('assessScoreAdd')))">
-                    a.assessScoreAdd,
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('reviewScoreAdd') or colPickMode == 1 and data.containsKey('reviewScoreAdd')))">
+                    a.reviewScoreAdd,
                 </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('assessScoreSub') or colPickMode == 1 and data.containsKey('assessScoreSub')))">
-                    a.assessScoreSub,
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('reviewScoreSub') or colPickMode == 1 and data.containsKey('reviewScoreSub')))">
+                    a.reviewScoreSub,
                 </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('workScoreAdd') or colPickMode == 1 and data.containsKey('workScoreAdd')))">
-                    a.workScoreAdd,
+                <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('goworkScoreAdd') or colPickMode == 1 and data.containsKey('goworkScoreAdd')))">
+                    a.goworkScoreAdd,
                 </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('workScoreSub') or colPickMode == 1 and data.containsKey('workScoreSub')))">
-                    a.workScoreSub,
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('goworkScoreSub') or colPickMode == 1 and data.containsKey('goworkScoreSub')))">
+                    a.goworkScoreSub,
                 </if>
                 <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('effectScoreAdd') or colPickMode == 1 and data.containsKey('effectScoreAdd')))">
                     a.effectScoreAdd,
@@ -81,6 +93,9 @@
                 <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('averageScore') or colPickMode == 1 and data.containsKey('averageScore')))">
+                    a.averageScore,
+                </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>
@@ -105,38 +120,23 @@
                 <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,totalAddScore,totalSubScore,complainScoreAdd,complainScoreSub,averageScore)
+        (deptId,deptName,totalScore,totalAddScore,totalSubScore,attendScoreAdd,attendScoreSub,reviewScoreAdd,reviewScoreSub,complainScoreAdd,complainScoreSub,goworkScoreAdd,goworkScoreSub,effectScoreAdd,effectScoreSub,otherScoreAdd,otherScoreSub,averageScore,remark,year,month,day,createTime,createUserId,updateTime,updateUserId)
         VALUES
-        (#{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})
+        (#{deptId},#{deptName},#{totalScore},#{totalAddScore},#{totalSubScore},#{attendScoreAdd},#{attendScoreSub},#{reviewScoreAdd},#{reviewScoreSub},#{complainScoreAdd},#{complainScoreSub},#{goworkScoreAdd},#{goworkScoreSub},#{effectScoreAdd},#{effectScoreSub},#{otherScoreAdd},#{otherScoreSub},#{averageScore},#{remark},#{year},#{month},#{day},#{createTime},#{createUserId},#{updateTime},#{updateUserId})
     </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,totalAddScore,totalSubScore,complainScoreAdd,complainScoreSub,averageScore)
+        (deptId,deptName,totalScore,totalAddScore,totalSubScore,attendScoreAdd,attendScoreSub,reviewScoreAdd,reviewScoreSub,complainScoreAdd,complainScoreSub,goworkScoreAdd,goworkScoreSub,effectScoreAdd,effectScoreSub,otherScoreAdd,otherScoreSub,averageScore,remark,year,month,day,createTime,createUserId,updateTime,updateUserId)
         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.totalAddScore},#{item.totalSubScore},#{item.complainScoreAdd},#{item.complainScoreSub},#{item.averageScore})
+            (#{item.deptId},#{item.deptName},#{item.totalScore},#{item.totalAddScore},#{item.totalSubScore},#{item.attendScoreAdd},#{item.attendScoreSub},#{item.reviewScoreAdd},#{item.reviewScoreSub},#{item.complainScoreAdd},#{item.complainScoreSub},#{item.goworkScoreAdd},#{item.goworkScoreSub},#{item.effectScoreAdd},#{item.effectScoreSub},#{item.otherScoreAdd},#{item.otherScoreSub},#{item.averageScore},#{item.remark},#{item.year},#{item.month},#{item.day},#{item.createTime},#{item.createUserId},#{item.updateTime},#{item.updateUserId})
         </foreach>
     </insert>
 
@@ -161,6 +161,18 @@
             <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('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('attendScoreAdd')) or (colPickMode==1 and !data.containsKey('attendScoreAdd'))">
                 a.attendScoreAdd=#{data.attendScoreAdd},
             </if>
@@ -173,29 +185,41 @@
             <if test="(colPickMode==0 and data.containsKey('attendScoreSubIncrement')) or (colPickMode==1 and !data.containsKey('attendScoreSubIncrement'))">
                 a.attendScoreSub=ifnull(a.attendScoreSub,0) + #{data.attendScoreSubIncrement},
             </if>
-            <if test="(colPickMode==0 and data.containsKey('assessScoreAdd')) or (colPickMode==1 and !data.containsKey('assessScoreAdd'))">
-                a.assessScoreAdd=#{data.assessScoreAdd},
+            <if test="(colPickMode==0 and data.containsKey('reviewScoreAdd')) or (colPickMode==1 and !data.containsKey('reviewScoreAdd'))">
+                a.reviewScoreAdd=#{data.reviewScoreAdd},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('reviewScoreAddIncrement')) or (colPickMode==1 and !data.containsKey('reviewScoreAddIncrement'))">
+                a.reviewScoreAdd=ifnull(a.reviewScoreAdd,0) + #{data.reviewScoreAddIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('reviewScoreSub')) or (colPickMode==1 and !data.containsKey('reviewScoreSub'))">
+                a.reviewScoreSub=#{data.reviewScoreSub},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('reviewScoreSubIncrement')) or (colPickMode==1 and !data.containsKey('reviewScoreSubIncrement'))">
+                a.reviewScoreSub=ifnull(a.reviewScoreSub,0) + #{data.reviewScoreSubIncrement},
+            </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('assessScoreAddIncrement')) or (colPickMode==1 and !data.containsKey('assessScoreAddIncrement'))">
-                a.assessScoreAdd=ifnull(a.assessScoreAdd,0) + #{data.assessScoreAddIncrement},
+            <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('assessScoreSub')) or (colPickMode==1 and !data.containsKey('assessScoreSub'))">
-                a.assessScoreSub=#{data.assessScoreSub},
+            <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('assessScoreSubIncrement')) or (colPickMode==1 and !data.containsKey('assessScoreSubIncrement'))">
-                a.assessScoreSub=ifnull(a.assessScoreSub,0) + #{data.assessScoreSubIncrement},
+            <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('workScoreAdd')) or (colPickMode==1 and !data.containsKey('workScoreAdd'))">
-                a.workScoreAdd=#{data.workScoreAdd},
+            <if test="(colPickMode==0 and data.containsKey('goworkScoreAdd')) or (colPickMode==1 and !data.containsKey('goworkScoreAdd'))">
+                a.goworkScoreAdd=#{data.goworkScoreAdd},
             </if>
-            <if test="(colPickMode==0 and data.containsKey('workScoreAddIncrement')) or (colPickMode==1 and !data.containsKey('workScoreAddIncrement'))">
-                a.workScoreAdd=ifnull(a.workScoreAdd,0) + #{data.workScoreAddIncrement},
+            <if test="(colPickMode==0 and data.containsKey('goworkScoreAddIncrement')) or (colPickMode==1 and !data.containsKey('goworkScoreAddIncrement'))">
+                a.goworkScoreAdd=ifnull(a.goworkScoreAdd,0) + #{data.goworkScoreAddIncrement},
             </if>
-            <if test="(colPickMode==0 and data.containsKey('workScoreSub')) or (colPickMode==1 and !data.containsKey('workScoreSub'))">
-                a.workScoreSub=#{data.workScoreSub},
+            <if test="(colPickMode==0 and data.containsKey('goworkScoreSub')) or (colPickMode==1 and !data.containsKey('goworkScoreSub'))">
+                a.goworkScoreSub=#{data.goworkScoreSub},
             </if>
-            <if test="(colPickMode==0 and data.containsKey('workScoreSubIncrement')) or (colPickMode==1 and !data.containsKey('workScoreSubIncrement'))">
-                a.workScoreSub=ifnull(a.workScoreSub,0) + #{data.workScoreSubIncrement},
+            <if test="(colPickMode==0 and data.containsKey('goworkScoreSubIncrement')) or (colPickMode==1 and !data.containsKey('goworkScoreSubIncrement'))">
+                a.goworkScoreSub=ifnull(a.goworkScoreSub,0) + #{data.goworkScoreSubIncrement},
             </if>
             <if test="(colPickMode==0 and data.containsKey('effectScoreAdd')) or (colPickMode==1 and !data.containsKey('effectScoreAdd'))">
                 a.effectScoreAdd=#{data.effectScoreAdd},
@@ -221,6 +245,12 @@
             <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('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>
             <if test="(colPickMode==0 and data.containsKey('remark')) or (colPickMode==1 and !data.containsKey('remark'))">
                 a.remark=#{data.remark},
             </if>
@@ -260,36 +290,6 @@
             <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
@@ -333,6 +333,30 @@
                                 </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="attendScoreAdd=(case" suffix="ELSE attendScoreAdd end),">
                             <foreach collection="data.dataList" item="item" index="index" separator="" >
                                 <choose>
@@ -357,50 +381,74 @@
                                 </choose>
                             </foreach>
                         </trim>
-                        <trim prefix="assessScoreAdd=(case" suffix="ELSE assessScoreAdd end),">
+                        <trim prefix="reviewScoreAdd=(case" suffix="ELSE reviewScoreAdd end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('reviewScoreAdd')) or (colPickMode==1 and !item.containsKey('reviewScoreAdd'))">
+                                        when a.id=#{item.id} then #{item.reviewScoreAdd}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('reviewScoreAddIncrement')) or (colPickMode==1 and !item.containsKey('reviewScoreAddIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.reviewScoreAdd,0) + #{item.reviewScoreAddIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                        <trim prefix="reviewScoreSub=(case" suffix="ELSE reviewScoreSub end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('reviewScoreSub')) or (colPickMode==1 and !item.containsKey('reviewScoreSub'))">
+                                        when a.id=#{item.id} then #{item.reviewScoreSub}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('reviewScoreSubIncrement')) or (colPickMode==1 and !item.containsKey('reviewScoreSubIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.reviewScoreSub,0) + #{item.reviewScoreSubIncrement}
+                                    </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('assessScoreAdd')) or (colPickMode==1 and !item.containsKey('assessScoreAdd'))">
-                                        when a.id=#{item.id} then #{item.assessScoreAdd}
+                                    <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('assessScoreAddIncrement')) or (colPickMode==1 and !item.containsKey('assessScoreAddIncrement'))">
-                                        when a.id=#{item.id} then ifnull(a.assessScoreAdd,0) + #{item.assessScoreAddIncrement}
+                                    <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="assessScoreSub=(case" suffix="ELSE assessScoreSub 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('assessScoreSub')) or (colPickMode==1 and !item.containsKey('assessScoreSub'))">
-                                        when a.id=#{item.id} then #{item.assessScoreSub}
+                                    <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('assessScoreSubIncrement')) or (colPickMode==1 and !item.containsKey('assessScoreSubIncrement'))">
-                                        when a.id=#{item.id} then ifnull(a.assessScoreSub,0) + #{item.assessScoreSubIncrement}
+                                    <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="workScoreAdd=(case" suffix="ELSE workScoreAdd end),">
+                        <trim prefix="goworkScoreAdd=(case" suffix="ELSE goworkScoreAdd end),">
                             <foreach collection="data.dataList" item="item" index="index" separator="" >
                                 <choose>
-                                    <when test="(colPickMode==0 and item.containsKey('workScoreAdd')) or (colPickMode==1 and !item.containsKey('workScoreAdd'))">
-                                        when a.id=#{item.id} then #{item.workScoreAdd}
+                                    <when test="(colPickMode==0 and item.containsKey('goworkScoreAdd')) or (colPickMode==1 and !item.containsKey('goworkScoreAdd'))">
+                                        when a.id=#{item.id} then #{item.goworkScoreAdd}
                                     </when>
-                                    <when test="(colPickMode==0 and item.containsKey('workScoreAddIncrement')) or (colPickMode==1 and !item.containsKey('workScoreAddIncrement'))">
-                                        when a.id=#{item.id} then ifnull(a.workScoreAdd,0) + #{item.workScoreAddIncrement}
+                                    <when test="(colPickMode==0 and item.containsKey('goworkScoreAddIncrement')) or (colPickMode==1 and !item.containsKey('goworkScoreAddIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.goworkScoreAdd,0) + #{item.goworkScoreAddIncrement}
                                     </when>
                                 </choose>
                             </foreach>
                         </trim>
-                        <trim prefix="workScoreSub=(case" suffix="ELSE workScoreSub end),">
+                        <trim prefix="goworkScoreSub=(case" suffix="ELSE goworkScoreSub end),">
                             <foreach collection="data.dataList" item="item" index="index" separator="" >
                                 <choose>
-                                    <when test="(colPickMode==0 and item.containsKey('workScoreSub')) or (colPickMode==1 and !item.containsKey('workScoreSub'))">
-                                        when a.id=#{item.id} then #{item.workScoreSub}
+                                    <when test="(colPickMode==0 and item.containsKey('goworkScoreSub')) or (colPickMode==1 and !item.containsKey('goworkScoreSub'))">
+                                        when a.id=#{item.id} then #{item.goworkScoreSub}
                                     </when>
-                                    <when test="(colPickMode==0 and item.containsKey('workScoreSubIncrement')) or (colPickMode==1 and !item.containsKey('workScoreSubIncrement'))">
-                                        when a.id=#{item.id} then ifnull(a.workScoreSub,0) + #{item.workScoreSubIncrement}
+                                    <when test="(colPickMode==0 and item.containsKey('goworkScoreSubIncrement')) or (colPickMode==1 and !item.containsKey('goworkScoreSubIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.goworkScoreSub,0) + #{item.goworkScoreSubIncrement}
                                     </when>
                                 </choose>
                             </foreach>
@@ -453,6 +501,18 @@
                                 </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 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'))">
@@ -534,66 +594,6 @@
                                 </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=")">
@@ -812,36 +812,90 @@
                 ${_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('totalAddScore')">
+                <if test="conditionParamRef.totalAddScore != null ">
+                    ${_conditionType_} a.totalAddScore = #{${_conditionParam_}.totalAddScore}
                 </if>
-                <if test="conditionParamRef.attendScoreAdd == null">
-                    ${_conditionType_} a.attendScoreAdd is null
+                <if test="conditionParamRef.totalAddScore == null">
+                    ${_conditionType_} a.totalAddScore 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('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('attendScoreAddNotList') and conditionParamRef.attendScoreAddNotList.size() > 0">
-                ${_conditionType_} a.attendScoreAdd not in
-                <foreach collection="conditionParamRef.attendScoreAddNotList" open="(" close=")" index="index" item="item" separator=",">
+            <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('attendScoreAddStart') and conditionParamRef.attendScoreAddStart != null">
-                ${_conditionType_} a.attendScoreAdd <![CDATA[ >= ]]> #{${_conditionParam_}.attendScoreAddStart}
+            <if test="conditionParamRef.containsKey('totalAddScoreStart') and conditionParamRef.totalAddScoreStart != null">
+                ${_conditionType_} a.totalAddScore <![CDATA[ >= ]]> #{${_conditionParam_}.totalAddScoreStart}
             </if>
-            <if test="conditionParamRef.containsKey('attendScoreAddEnd') and conditionParamRef.attendScoreAddEnd != null">
-                ${_conditionType_} a.attendScoreAdd <![CDATA[ <= ]]> #{${_conditionParam_}.attendScoreAddEnd}
+            <if test="conditionParamRef.containsKey('totalAddScoreEnd') and conditionParamRef.totalAddScoreEnd != null">
+                ${_conditionType_} a.totalAddScore <![CDATA[ <= ]]> #{${_conditionParam_}.totalAddScoreEnd}
             </if>
 
-            <if test="conditionParamRef.containsKey('attendScoreSub')">
-                <if test="conditionParamRef.attendScoreSub != null ">
-                    ${_conditionType_} a.attendScoreSub = #{${_conditionParam_}.attendScoreSub}
+            <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('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}
+            </if>
+            <if test="conditionParamRef.containsKey('attendScoreAddEnd') and conditionParamRef.attendScoreAddEnd != null">
+                ${_conditionType_} a.attendScoreAdd <![CDATA[ <= ]]> #{${_conditionParam_}.attendScoreAddEnd}
+            </if>
+
+            <if test="conditionParamRef.containsKey('attendScoreSub')">
+                <if test="conditionParamRef.attendScoreSub != null ">
+                    ${_conditionType_} a.attendScoreSub = #{${_conditionParam_}.attendScoreSub}
                 </if>
                 <if test="conditionParamRef.attendScoreSub == null">
                     ${_conditionType_} a.attendScoreSub is null
@@ -866,112 +920,166 @@
                 ${_conditionType_} a.attendScoreSub <![CDATA[ <= ]]> #{${_conditionParam_}.attendScoreSubEnd}
             </if>
 
-            <if test="conditionParamRef.containsKey('assessScoreAdd')">
-                <if test="conditionParamRef.assessScoreAdd != null ">
-                    ${_conditionType_} a.assessScoreAdd = #{${_conditionParam_}.assessScoreAdd}
+            <if test="conditionParamRef.containsKey('reviewScoreAdd')">
+                <if test="conditionParamRef.reviewScoreAdd != null ">
+                    ${_conditionType_} a.reviewScoreAdd = #{${_conditionParam_}.reviewScoreAdd}
+                </if>
+                <if test="conditionParamRef.reviewScoreAdd == null">
+                    ${_conditionType_} a.reviewScoreAdd is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('reviewScoreAddList') and conditionParamRef.reviewScoreAddList.size() > 0">
+                ${_conditionType_} a.reviewScoreAdd in
+                <foreach collection="conditionParamRef.reviewScoreAddList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('reviewScoreAddNotList') and conditionParamRef.reviewScoreAddNotList.size() > 0">
+                ${_conditionType_} a.reviewScoreAdd not in
+                <foreach collection="conditionParamRef.reviewScoreAddNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('reviewScoreAddStart') and conditionParamRef.reviewScoreAddStart != null">
+                ${_conditionType_} a.reviewScoreAdd <![CDATA[ >= ]]> #{${_conditionParam_}.reviewScoreAddStart}
+            </if>
+            <if test="conditionParamRef.containsKey('reviewScoreAddEnd') and conditionParamRef.reviewScoreAddEnd != null">
+                ${_conditionType_} a.reviewScoreAdd <![CDATA[ <= ]]> #{${_conditionParam_}.reviewScoreAddEnd}
+            </if>
+
+            <if test="conditionParamRef.containsKey('reviewScoreSub')">
+                <if test="conditionParamRef.reviewScoreSub != null ">
+                    ${_conditionType_} a.reviewScoreSub = #{${_conditionParam_}.reviewScoreSub}
+                </if>
+                <if test="conditionParamRef.reviewScoreSub == null">
+                    ${_conditionType_} a.reviewScoreSub is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('reviewScoreSubList') and conditionParamRef.reviewScoreSubList.size() > 0">
+                ${_conditionType_} a.reviewScoreSub in
+                <foreach collection="conditionParamRef.reviewScoreSubList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('reviewScoreSubNotList') and conditionParamRef.reviewScoreSubNotList.size() > 0">
+                ${_conditionType_} a.reviewScoreSub not in
+                <foreach collection="conditionParamRef.reviewScoreSubNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('reviewScoreSubStart') and conditionParamRef.reviewScoreSubStart != null">
+                ${_conditionType_} a.reviewScoreSub <![CDATA[ >= ]]> #{${_conditionParam_}.reviewScoreSubStart}
+            </if>
+            <if test="conditionParamRef.containsKey('reviewScoreSubEnd') and conditionParamRef.reviewScoreSubEnd != null">
+                ${_conditionType_} a.reviewScoreSub <![CDATA[ <= ]]> #{${_conditionParam_}.reviewScoreSubEnd}
+            </if>
+
+            <if test="conditionParamRef.containsKey('complainScoreAdd')">
+                <if test="conditionParamRef.complainScoreAdd != null ">
+                    ${_conditionType_} a.complainScoreAdd = #{${_conditionParam_}.complainScoreAdd}
                 </if>
-                <if test="conditionParamRef.assessScoreAdd == null">
-                    ${_conditionType_} a.assessScoreAdd is null
+                <if test="conditionParamRef.complainScoreAdd == null">
+                    ${_conditionType_} a.complainScoreAdd is null
                 </if>
             </if>
-            <if test="conditionParamRef.containsKey('assessScoreAddList') and conditionParamRef.assessScoreAddList.size() > 0">
-                ${_conditionType_} a.assessScoreAdd in
-                <foreach collection="conditionParamRef.assessScoreAddList" open="(" close=")" index="index" item="item" separator=",">
+            <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('assessScoreAddNotList') and conditionParamRef.assessScoreAddNotList.size() > 0">
-                ${_conditionType_} a.assessScoreAdd not in
-                <foreach collection="conditionParamRef.assessScoreAddNotList" open="(" close=")" index="index" item="item" separator=",">
+            <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('assessScoreAddStart') and conditionParamRef.assessScoreAddStart != null">
-                ${_conditionType_} a.assessScoreAdd <![CDATA[ >= ]]> #{${_conditionParam_}.assessScoreAddStart}
+            <if test="conditionParamRef.containsKey('complainScoreAddStart') and conditionParamRef.complainScoreAddStart != null">
+                ${_conditionType_} a.complainScoreAdd <![CDATA[ >= ]]> #{${_conditionParam_}.complainScoreAddStart}
             </if>
-            <if test="conditionParamRef.containsKey('assessScoreAddEnd') and conditionParamRef.assessScoreAddEnd != null">
-                ${_conditionType_} a.assessScoreAdd <![CDATA[ <= ]]> #{${_conditionParam_}.assessScoreAddEnd}
+            <if test="conditionParamRef.containsKey('complainScoreAddEnd') and conditionParamRef.complainScoreAddEnd != null">
+                ${_conditionType_} a.complainScoreAdd <![CDATA[ <= ]]> #{${_conditionParam_}.complainScoreAddEnd}
             </if>
 
-            <if test="conditionParamRef.containsKey('assessScoreSub')">
-                <if test="conditionParamRef.assessScoreSub != null ">
-                    ${_conditionType_} a.assessScoreSub = #{${_conditionParam_}.assessScoreSub}
+            <if test="conditionParamRef.containsKey('complainScoreSub')">
+                <if test="conditionParamRef.complainScoreSub != null ">
+                    ${_conditionType_} a.complainScoreSub = #{${_conditionParam_}.complainScoreSub}
                 </if>
-                <if test="conditionParamRef.assessScoreSub == null">
-                    ${_conditionType_} a.assessScoreSub is null
+                <if test="conditionParamRef.complainScoreSub == null">
+                    ${_conditionType_} a.complainScoreSub is null
                 </if>
             </if>
-            <if test="conditionParamRef.containsKey('assessScoreSubList') and conditionParamRef.assessScoreSubList.size() > 0">
-                ${_conditionType_} a.assessScoreSub in
-                <foreach collection="conditionParamRef.assessScoreSubList" 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('assessScoreSubNotList') and conditionParamRef.assessScoreSubNotList.size() > 0">
-                ${_conditionType_} a.assessScoreSub not in
-                <foreach collection="conditionParamRef.assessScoreSubNotList" 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('assessScoreSubStart') and conditionParamRef.assessScoreSubStart != null">
-                ${_conditionType_} a.assessScoreSub <![CDATA[ >= ]]> #{${_conditionParam_}.assessScoreSubStart}
+            <if test="conditionParamRef.containsKey('complainScoreSubStart') and conditionParamRef.complainScoreSubStart != null">
+                ${_conditionType_} a.complainScoreSub <![CDATA[ >= ]]> #{${_conditionParam_}.complainScoreSubStart}
             </if>
-            <if test="conditionParamRef.containsKey('assessScoreSubEnd') and conditionParamRef.assessScoreSubEnd != null">
-                ${_conditionType_} a.assessScoreSub <![CDATA[ <= ]]> #{${_conditionParam_}.assessScoreSubEnd}
+            <if test="conditionParamRef.containsKey('complainScoreSubEnd') and conditionParamRef.complainScoreSubEnd != null">
+                ${_conditionType_} a.complainScoreSub <![CDATA[ <= ]]> #{${_conditionParam_}.complainScoreSubEnd}
             </if>
 
-            <if test="conditionParamRef.containsKey('workScoreAdd')">
-                <if test="conditionParamRef.workScoreAdd != null ">
-                    ${_conditionType_} a.workScoreAdd = #{${_conditionParam_}.workScoreAdd}
+            <if test="conditionParamRef.containsKey('goworkScoreAdd')">
+                <if test="conditionParamRef.goworkScoreAdd != null ">
+                    ${_conditionType_} a.goworkScoreAdd = #{${_conditionParam_}.goworkScoreAdd}
                 </if>
-                <if test="conditionParamRef.workScoreAdd == null">
-                    ${_conditionType_} a.workScoreAdd is null
+                <if test="conditionParamRef.goworkScoreAdd == null">
+                    ${_conditionType_} a.goworkScoreAdd is null
                 </if>
             </if>
-            <if test="conditionParamRef.containsKey('workScoreAddList') and conditionParamRef.workScoreAddList.size() > 0">
-                ${_conditionType_} a.workScoreAdd in
-                <foreach collection="conditionParamRef.workScoreAddList" open="(" close=")" index="index" item="item" separator=",">
+            <if test="conditionParamRef.containsKey('goworkScoreAddList') and conditionParamRef.goworkScoreAddList.size() > 0">
+                ${_conditionType_} a.goworkScoreAdd in
+                <foreach collection="conditionParamRef.goworkScoreAddList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
             </if>
-            <if test="conditionParamRef.containsKey('workScoreAddNotList') and conditionParamRef.workScoreAddNotList.size() > 0">
-                ${_conditionType_} a.workScoreAdd not in
-                <foreach collection="conditionParamRef.workScoreAddNotList" open="(" close=")" index="index" item="item" separator=",">
+            <if test="conditionParamRef.containsKey('goworkScoreAddNotList') and conditionParamRef.goworkScoreAddNotList.size() > 0">
+                ${_conditionType_} a.goworkScoreAdd not in
+                <foreach collection="conditionParamRef.goworkScoreAddNotList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
             </if>
-            <if test="conditionParamRef.containsKey('workScoreAddStart') and conditionParamRef.workScoreAddStart != null">
-                ${_conditionType_} a.workScoreAdd <![CDATA[ >= ]]> #{${_conditionParam_}.workScoreAddStart}
+            <if test="conditionParamRef.containsKey('goworkScoreAddStart') and conditionParamRef.goworkScoreAddStart != null">
+                ${_conditionType_} a.goworkScoreAdd <![CDATA[ >= ]]> #{${_conditionParam_}.goworkScoreAddStart}
             </if>
-            <if test="conditionParamRef.containsKey('workScoreAddEnd') and conditionParamRef.workScoreAddEnd != null">
-                ${_conditionType_} a.workScoreAdd <![CDATA[ <= ]]> #{${_conditionParam_}.workScoreAddEnd}
+            <if test="conditionParamRef.containsKey('goworkScoreAddEnd') and conditionParamRef.goworkScoreAddEnd != null">
+                ${_conditionType_} a.goworkScoreAdd <![CDATA[ <= ]]> #{${_conditionParam_}.goworkScoreAddEnd}
             </if>
 
-            <if test="conditionParamRef.containsKey('workScoreSub')">
-                <if test="conditionParamRef.workScoreSub != null ">
-                    ${_conditionType_} a.workScoreSub = #{${_conditionParam_}.workScoreSub}
+            <if test="conditionParamRef.containsKey('goworkScoreSub')">
+                <if test="conditionParamRef.goworkScoreSub != null ">
+                    ${_conditionType_} a.goworkScoreSub = #{${_conditionParam_}.goworkScoreSub}
                 </if>
-                <if test="conditionParamRef.workScoreSub == null">
-                    ${_conditionType_} a.workScoreSub is null
+                <if test="conditionParamRef.goworkScoreSub == null">
+                    ${_conditionType_} a.goworkScoreSub is null
                 </if>
             </if>
-            <if test="conditionParamRef.containsKey('workScoreSubList') and conditionParamRef.workScoreSubList.size() > 0">
-                ${_conditionType_} a.workScoreSub in
-                <foreach collection="conditionParamRef.workScoreSubList" open="(" close=")" index="index" item="item" separator=",">
+            <if test="conditionParamRef.containsKey('goworkScoreSubList') and conditionParamRef.goworkScoreSubList.size() > 0">
+                ${_conditionType_} a.goworkScoreSub in
+                <foreach collection="conditionParamRef.goworkScoreSubList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
             </if>
-            <if test="conditionParamRef.containsKey('workScoreSubNotList') and conditionParamRef.workScoreSubNotList.size() > 0">
-                ${_conditionType_} a.workScoreSub not in
-                <foreach collection="conditionParamRef.workScoreSubNotList" open="(" close=")" index="index" item="item" separator=",">
+            <if test="conditionParamRef.containsKey('goworkScoreSubNotList') and conditionParamRef.goworkScoreSubNotList.size() > 0">
+                ${_conditionType_} a.goworkScoreSub not in
+                <foreach collection="conditionParamRef.goworkScoreSubNotList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
             </if>
-            <if test="conditionParamRef.containsKey('workScoreSubStart') and conditionParamRef.workScoreSubStart != null">
-                ${_conditionType_} a.workScoreSub <![CDATA[ >= ]]> #{${_conditionParam_}.workScoreSubStart}
+            <if test="conditionParamRef.containsKey('goworkScoreSubStart') and conditionParamRef.goworkScoreSubStart != null">
+                ${_conditionType_} a.goworkScoreSub <![CDATA[ >= ]]> #{${_conditionParam_}.goworkScoreSubStart}
             </if>
-            <if test="conditionParamRef.containsKey('workScoreSubEnd') and conditionParamRef.workScoreSubEnd != null">
-                ${_conditionType_} a.workScoreSub <![CDATA[ <= ]]> #{${_conditionParam_}.workScoreSubEnd}
+            <if test="conditionParamRef.containsKey('goworkScoreSubEnd') and conditionParamRef.goworkScoreSubEnd != null">
+                ${_conditionType_} a.goworkScoreSub <![CDATA[ <= ]]> #{${_conditionParam_}.goworkScoreSubEnd}
             </if>
 
             <if test="conditionParamRef.containsKey('effectScoreAdd')">
@@ -1082,6 +1190,33 @@
                 ${_conditionType_} a.otherScoreSub <![CDATA[ <= ]]> #{${_conditionParam_}.otherScoreSubEnd}
             </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>
+
 
             <if test="conditionParamRef.containsKey('remark')">
                 <if test="conditionParamRef.remark != null and conditionParamRef.remark != ''">
@@ -1268,141 +1403,6 @@
                 ${_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()">
@@ -1436,6 +1436,16 @@
                         <if test='orderCol.totalScore != null and "DESC".equalsIgnoreCase(orderCol.totalScore)'>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('attendScoreAdd')">
                         a.attendScoreAdd
                         <if test='orderCol.attendScoreAdd != null and "DESC".equalsIgnoreCase(orderCol.attendScoreAdd)'>DESC</if>
@@ -1446,24 +1456,34 @@
                         <if test='orderCol.attendScoreSub != null and "DESC".equalsIgnoreCase(orderCol.attendScoreSub)'>DESC</if>
                         ,
                     </if>
-                    <if test="orderCol.containsKey('assessScoreAdd')">
-                        a.assessScoreAdd
-                        <if test='orderCol.assessScoreAdd != null and "DESC".equalsIgnoreCase(orderCol.assessScoreAdd)'>DESC</if>
+                    <if test="orderCol.containsKey('reviewScoreAdd')">
+                        a.reviewScoreAdd
+                        <if test='orderCol.reviewScoreAdd != null and "DESC".equalsIgnoreCase(orderCol.reviewScoreAdd)'>DESC</if>
                         ,
                     </if>
-                    <if test="orderCol.containsKey('assessScoreSub')">
-                        a.assessScoreSub
-                        <if test='orderCol.assessScoreSub != null and "DESC".equalsIgnoreCase(orderCol.assessScoreSub)'>DESC</if>
+                    <if test="orderCol.containsKey('reviewScoreSub')">
+                        a.reviewScoreSub
+                        <if test='orderCol.reviewScoreSub != null and "DESC".equalsIgnoreCase(orderCol.reviewScoreSub)'>DESC</if>
                         ,
                     </if>
-                    <if test="orderCol.containsKey('workScoreAdd')">
-                        a.workScoreAdd
-                        <if test='orderCol.workScoreAdd != null and "DESC".equalsIgnoreCase(orderCol.workScoreAdd)'>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('complainScoreSub')">
+                        a.complainScoreSub
+                        <if test='orderCol.complainScoreSub != null and "DESC".equalsIgnoreCase(orderCol.complainScoreSub)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('goworkScoreAdd')">
+                        a.goworkScoreAdd
+                        <if test='orderCol.goworkScoreAdd != null and "DESC".equalsIgnoreCase(orderCol.goworkScoreAdd)'>DESC</if>
                         ,
                     </if>
-                    <if test="orderCol.containsKey('workScoreSub')">
-                        a.workScoreSub
-                        <if test='orderCol.workScoreSub != null and "DESC".equalsIgnoreCase(orderCol.workScoreSub)'>DESC</if>
+                    <if test="orderCol.containsKey('goworkScoreSub')">
+                        a.goworkScoreSub
+                        <if test='orderCol.goworkScoreSub != null and "DESC".equalsIgnoreCase(orderCol.goworkScoreSub)'>DESC</if>
                         ,
                     </if>
                     <if test="orderCol.containsKey('effectScoreAdd')">
@@ -1486,6 +1506,11 @@
                         <if test='orderCol.otherScoreSub != null and "DESC".equalsIgnoreCase(orderCol.otherScoreSub)'>DESC</if>
                         ,
                     </if>
+                    <if test="orderCol.containsKey('averageScore')">
+                        a.averageScore
+                        <if test='orderCol.averageScore != null and "DESC".equalsIgnoreCase(orderCol.averageScore)'>DESC</if>
+                        ,
+                    </if>
                     <if test="orderCol.containsKey('remark')">
                         a.remark
                         <if test='orderCol.remark != null and "DESC".equalsIgnoreCase(orderCol.remark)'>DESC</if>
@@ -1526,31 +1551,6 @@
                         <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/dept/DeptPerformStatMapperExt.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "mybatis-3-mapper.dtd">
+<mapper namespace="com.mortals.xhx.module.dept.dao.ibatis.DeptPerformStatDaoImpl">
+    <!-- 按天top10 -->
+    <select id="getSummaryCheckList" parameterType="com.mortals.xhx.module.dept.model.vo.DeptSummaryTopQuery" resultType="com.mortals.xhx.module.dept.model.DeptPerformStatEntity">
+        SELECT * FROM (
+            SELECT
+                `year`,
+                `month`,
+                `day`,
+                deptId,
+                deptName,
+                SUM(totalScore) AS totalScore
+            FROM
+                mortals_xhx_dept_perform_stat
+            WHERE 1=1
+            <if test="year != null">
+                AND `year` = #{year}
+            </if>
+            <if test="month != null">
+                AND `month` = #{month}
+            </if>
+            <if test="day != null">
+                AND `day` = #{day}
+            </if>
+            GROUP BY
+                deptId,
+                `year`,
+                `month`,
+                `day`
+        ) AS a ORDER BY totalScore DESC LIMIT 10
+    </select>
+</mapper>
\ No newline at end of file

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

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "mybatis-3-mapper.dtd">
+"mybatis-3-mapper.dtd">
 <mapper namespace="com.mortals.xhx.module.staff.dao.ibatis.StaffPerformStatDaoImpl">
 
     <!-- 字段和属性映射 -->
@@ -13,12 +13,12 @@
             <result property="totalSubScore" column="totalSubScore" />
             <result property="attendScoreAdd" column="attendScoreAdd" />
             <result property="attendScoreSub" column="attendScoreSub" />
-        <result property="assessScoreAdd" column="assessScoreAdd" />
-        <result property="assessScoreSub" column="assessScoreSub" />
+            <result property="reviewScoreAdd" column="reviewScoreAdd" />
+            <result property="reviewScoreSub" column="reviewScoreSub" />
             <result property="complainScoreAdd" column="complainScoreAdd" />
             <result property="complainScoreSub" column="complainScoreSub" />
-        <result property="workScoreAdd" column="workScoreAdd" />
-        <result property="workScoreSub" column="workScoreSub" />
+            <result property="goworkScoreAdd" column="goworkScoreAdd" />
+            <result property="goworkScoreSub" column="goworkScoreSub" />
             <result property="effectScoreAdd" column="effectScoreAdd" />
             <result property="effectScoreSub" column="effectScoreSub" />
             <result property="otherScoreAdd" column="otherScoreAdd" />
@@ -62,11 +62,11 @@
                 <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('attendScoreSub') or colPickMode == 1 and data.containsKey('attendScoreSub')))">
                     a.attendScoreSub,
                 </if>
-            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('assessScoreAdd') or colPickMode == 1 and data.containsKey('assessScoreAdd')))">
-                a.assessScoreAdd,
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('reviewScoreAdd') or colPickMode == 1 and data.containsKey('reviewScoreAdd')))">
+                    a.reviewScoreAdd,
                 </if>
-            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('assessScoreSub') or colPickMode == 1 and data.containsKey('assessScoreSub')))">
-                a.assessScoreSub,
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('reviewScoreSub') or colPickMode == 1 and data.containsKey('reviewScoreSub')))">
+                    a.reviewScoreSub,
                 </if>
                 <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('complainScoreAdd') or colPickMode == 1 and data.containsKey('complainScoreAdd')))">
                     a.complainScoreAdd,
@@ -74,11 +74,11 @@
                 <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('workScoreAdd') or colPickMode == 1 and data.containsKey('workScoreAdd')))">
-                a.workScoreAdd,
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('goworkScoreAdd') or colPickMode == 1 and data.containsKey('goworkScoreAdd')))">
+                    a.goworkScoreAdd,
                 </if>
-            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('workScoreSub') or colPickMode == 1 and data.containsKey('workScoreSub')))">
-                a.workScoreSub,
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('goworkScoreSub') or colPickMode == 1 and data.containsKey('goworkScoreSub')))">
+                    a.goworkScoreSub,
                 </if>
                 <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('effectScoreAdd') or colPickMode == 1 and data.containsKey('effectScoreAdd')))">
                     a.effectScoreAdd,
@@ -121,18 +121,18 @@
     <!-- 新增 区分主键自增加还是业务插入 -->
     <insert id="insert" parameterType="StaffPerformStatEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_xhx_staff_perform_stat
-        (staffId,staffName,totalScore,totalAddScore,totalSubScore,attendScoreAdd,attendScoreSub,assessScoreAdd,assessScoreSub,complainScoreAdd,complainScoreSub,workScoreAdd,workScoreSub,effectScoreAdd,effectScoreSub,otherScoreAdd,otherScoreSub,remark,year,month,day,createTime,createUserId,updateTime,updateUserId)
+        (staffId,staffName,totalScore,totalAddScore,totalSubScore,attendScoreAdd,attendScoreSub,reviewScoreAdd,reviewScoreSub,complainScoreAdd,complainScoreSub,goworkScoreAdd,goworkScoreSub,effectScoreAdd,effectScoreSub,otherScoreAdd,otherScoreSub,remark,year,month,day,createTime,createUserId,updateTime,updateUserId)
         VALUES
-        (#{staffId},#{staffName},#{totalScore},#{totalAddScore},#{totalSubScore},#{attendScoreAdd},#{attendScoreSub},#{assessScoreAdd},#{assessScoreSub},#{complainScoreAdd},#{complainScoreSub},#{workScoreAdd},#{workScoreSub},#{effectScoreAdd},#{effectScoreSub},#{otherScoreAdd},#{otherScoreSub},#{remark},#{year},#{month},#{day},#{createTime},#{createUserId},#{updateTime},#{updateUserId})
+        (#{staffId},#{staffName},#{totalScore},#{totalAddScore},#{totalSubScore},#{attendScoreAdd},#{attendScoreSub},#{reviewScoreAdd},#{reviewScoreSub},#{complainScoreAdd},#{complainScoreSub},#{goworkScoreAdd},#{goworkScoreSub},#{effectScoreAdd},#{effectScoreSub},#{otherScoreAdd},#{otherScoreSub},#{remark},#{year},#{month},#{day},#{createTime},#{createUserId},#{updateTime},#{updateUserId})
     </insert>
 
     <!-- 批量新增 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_xhx_staff_perform_stat
-        (staffId,staffName,totalScore,totalAddScore,totalSubScore,attendScoreAdd,attendScoreSub,assessScoreAdd,assessScoreSub,complainScoreAdd,complainScoreSub,workScoreAdd,workScoreSub,effectScoreAdd,effectScoreSub,otherScoreAdd,otherScoreSub,remark,year,month,day,createTime,createUserId,updateTime,updateUserId)
+        (staffId,staffName,totalScore,totalAddScore,totalSubScore,attendScoreAdd,attendScoreSub,reviewScoreAdd,reviewScoreSub,complainScoreAdd,complainScoreSub,goworkScoreAdd,goworkScoreSub,effectScoreAdd,effectScoreSub,otherScoreAdd,otherScoreSub,remark,year,month,day,createTime,createUserId,updateTime,updateUserId)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.staffId},#{item.staffName},#{item.totalScore},#{item.totalAddScore},#{item.totalSubScore},#{item.attendScoreAdd},#{item.attendScoreSub},#{item.assessScoreAdd},#{item.assessScoreSub},#{item.complainScoreAdd},#{item.complainScoreSub},#{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.staffId},#{item.staffName},#{item.totalScore},#{item.totalAddScore},#{item.totalSubScore},#{item.attendScoreAdd},#{item.attendScoreSub},#{item.reviewScoreAdd},#{item.reviewScoreSub},#{item.complainScoreAdd},#{item.complainScoreSub},#{item.goworkScoreAdd},#{item.goworkScoreSub},#{item.effectScoreAdd},#{item.effectScoreSub},#{item.otherScoreAdd},#{item.otherScoreSub},#{item.remark},#{item.year},#{item.month},#{item.day},#{item.createTime},#{item.createUserId},#{item.updateTime},#{item.updateUserId})
         </foreach>
     </insert>
 
@@ -181,17 +181,17 @@
             <if test="(colPickMode==0 and data.containsKey('attendScoreSubIncrement')) or (colPickMode==1 and !data.containsKey('attendScoreSubIncrement'))">
                 a.attendScoreSub=ifnull(a.attendScoreSub,0) + #{data.attendScoreSubIncrement},
             </if>
-            <if test="(colPickMode==0 and data.containsKey('assessScoreAdd')) or (colPickMode==1 and !data.containsKey('assessScoreAdd'))">
-                a.assessScoreAdd=#{data.assessScoreAdd},
+            <if test="(colPickMode==0 and data.containsKey('reviewScoreAdd')) or (colPickMode==1 and !data.containsKey('reviewScoreAdd'))">
+                a.reviewScoreAdd=#{data.reviewScoreAdd},
             </if>
-            <if test="(colPickMode==0 and data.containsKey('assessScoreAddIncrement')) or (colPickMode==1 and !data.containsKey('assessScoreAddIncrement'))">
-                a.assessScoreAdd=ifnull(a.assessScoreAdd,0) + #{data.assessScoreAddIncrement},
+            <if test="(colPickMode==0 and data.containsKey('reviewScoreAddIncrement')) or (colPickMode==1 and !data.containsKey('reviewScoreAddIncrement'))">
+                a.reviewScoreAdd=ifnull(a.reviewScoreAdd,0) + #{data.reviewScoreAddIncrement},
             </if>
-            <if test="(colPickMode==0 and data.containsKey('assessScoreSub')) or (colPickMode==1 and !data.containsKey('assessScoreSub'))">
-                a.assessScoreSub=#{data.assessScoreSub},
+            <if test="(colPickMode==0 and data.containsKey('reviewScoreSub')) or (colPickMode==1 and !data.containsKey('reviewScoreSub'))">
+                a.reviewScoreSub=#{data.reviewScoreSub},
             </if>
-            <if test="(colPickMode==0 and data.containsKey('assessScoreSubIncrement')) or (colPickMode==1 and !data.containsKey('assessScoreSubIncrement'))">
-                a.assessScoreSub=ifnull(a.assessScoreSub,0) + #{data.assessScoreSubIncrement},
+            <if test="(colPickMode==0 and data.containsKey('reviewScoreSubIncrement')) or (colPickMode==1 and !data.containsKey('reviewScoreSubIncrement'))">
+                a.reviewScoreSub=ifnull(a.reviewScoreSub,0) + #{data.reviewScoreSubIncrement},
             </if>
             <if test="(colPickMode==0 and data.containsKey('complainScoreAdd')) or (colPickMode==1 and !data.containsKey('complainScoreAdd'))">
                 a.complainScoreAdd=#{data.complainScoreAdd},
@@ -205,17 +205,17 @@
             <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('workScoreAdd')) or (colPickMode==1 and !data.containsKey('workScoreAdd'))">
-                a.workScoreAdd=#{data.workScoreAdd},
+            <if test="(colPickMode==0 and data.containsKey('goworkScoreAdd')) or (colPickMode==1 and !data.containsKey('goworkScoreAdd'))">
+                a.goworkScoreAdd=#{data.goworkScoreAdd},
             </if>
-            <if test="(colPickMode==0 and data.containsKey('workScoreAddIncrement')) or (colPickMode==1 and !data.containsKey('workScoreAddIncrement'))">
-                a.workScoreAdd=ifnull(a.workScoreAdd,0) + #{data.workScoreAddIncrement},
+            <if test="(colPickMode==0 and data.containsKey('goworkScoreAddIncrement')) or (colPickMode==1 and !data.containsKey('goworkScoreAddIncrement'))">
+                a.goworkScoreAdd=ifnull(a.goworkScoreAdd,0) + #{data.goworkScoreAddIncrement},
             </if>
-            <if test="(colPickMode==0 and data.containsKey('workScoreSub')) or (colPickMode==1 and !data.containsKey('workScoreSub'))">
-                a.workScoreSub=#{data.workScoreSub},
+            <if test="(colPickMode==0 and data.containsKey('goworkScoreSub')) or (colPickMode==1 and !data.containsKey('goworkScoreSub'))">
+                a.goworkScoreSub=#{data.goworkScoreSub},
             </if>
-            <if test="(colPickMode==0 and data.containsKey('workScoreSubIncrement')) or (colPickMode==1 and !data.containsKey('workScoreSubIncrement'))">
-                a.workScoreSub=ifnull(a.workScoreSub,0) + #{data.workScoreSubIncrement},
+            <if test="(colPickMode==0 and data.containsKey('goworkScoreSubIncrement')) or (colPickMode==1 and !data.containsKey('goworkScoreSubIncrement'))">
+                a.goworkScoreSub=ifnull(a.goworkScoreSub,0) + #{data.goworkScoreSubIncrement},
             </if>
             <if test="(colPickMode==0 and data.containsKey('effectScoreAdd')) or (colPickMode==1 and !data.containsKey('effectScoreAdd'))">
                 a.effectScoreAdd=#{data.effectScoreAdd},
@@ -371,26 +371,26 @@
                                 </choose>
                             </foreach>
                         </trim>
-            <trim prefix="assessScoreAdd=(case" suffix="ELSE assessScoreAdd end),">
+                        <trim prefix="reviewScoreAdd=(case" suffix="ELSE reviewScoreAdd end),">
                             <foreach collection="data.dataList" item="item" index="index" separator="" >
                                 <choose>
-                        <when test="(colPickMode==0 and item.containsKey('assessScoreAdd')) or (colPickMode==1 and !item.containsKey('assessScoreAdd'))">
-                            when a.id=#{item.id} then #{item.assessScoreAdd}
+                                    <when test="(colPickMode==0 and item.containsKey('reviewScoreAdd')) or (colPickMode==1 and !item.containsKey('reviewScoreAdd'))">
+                                        when a.id=#{item.id} then #{item.reviewScoreAdd}
                                     </when>
-                        <when test="(colPickMode==0 and item.containsKey('assessScoreAddIncrement')) or (colPickMode==1 and !item.containsKey('assessScoreAddIncrement'))">
-                            when a.id=#{item.id} then ifnull(a.assessScoreAdd,0) + #{item.assessScoreAddIncrement}
+                                    <when test="(colPickMode==0 and item.containsKey('reviewScoreAddIncrement')) or (colPickMode==1 and !item.containsKey('reviewScoreAddIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.reviewScoreAdd,0) + #{item.reviewScoreAddIncrement}
                                     </when>
                                 </choose>
                             </foreach>
                         </trim>
-            <trim prefix="assessScoreSub=(case" suffix="ELSE assessScoreSub end),">
+                        <trim prefix="reviewScoreSub=(case" suffix="ELSE reviewScoreSub end),">
                             <foreach collection="data.dataList" item="item" index="index" separator="" >
                                 <choose>
-                        <when test="(colPickMode==0 and item.containsKey('assessScoreSub')) or (colPickMode==1 and !item.containsKey('assessScoreSub'))">
-                            when a.id=#{item.id} then #{item.assessScoreSub}
+                                    <when test="(colPickMode==0 and item.containsKey('reviewScoreSub')) or (colPickMode==1 and !item.containsKey('reviewScoreSub'))">
+                                        when a.id=#{item.id} then #{item.reviewScoreSub}
                                     </when>
-                        <when test="(colPickMode==0 and item.containsKey('assessScoreSubIncrement')) or (colPickMode==1 and !item.containsKey('assessScoreSubIncrement'))">
-                            when a.id=#{item.id} then ifnull(a.assessScoreSub,0) + #{item.assessScoreSubIncrement}
+                                    <when test="(colPickMode==0 and item.containsKey('reviewScoreSubIncrement')) or (colPickMode==1 and !item.containsKey('reviewScoreSubIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.reviewScoreSub,0) + #{item.reviewScoreSubIncrement}
                                     </when>
                                 </choose>
                             </foreach>
@@ -419,26 +419,26 @@
                                 </choose>
                             </foreach>
                         </trim>
-            <trim prefix="workScoreAdd=(case" suffix="ELSE workScoreAdd end),">
+                        <trim prefix="goworkScoreAdd=(case" suffix="ELSE goworkScoreAdd end),">
                             <foreach collection="data.dataList" item="item" index="index" separator="" >
                                 <choose>
-                        <when test="(colPickMode==0 and item.containsKey('workScoreAdd')) or (colPickMode==1 and !item.containsKey('workScoreAdd'))">
-                            when a.id=#{item.id} then #{item.workScoreAdd}
+                                    <when test="(colPickMode==0 and item.containsKey('goworkScoreAdd')) or (colPickMode==1 and !item.containsKey('goworkScoreAdd'))">
+                                        when a.id=#{item.id} then #{item.goworkScoreAdd}
                                     </when>
-                        <when test="(colPickMode==0 and item.containsKey('workScoreAddIncrement')) or (colPickMode==1 and !item.containsKey('workScoreAddIncrement'))">
-                            when a.id=#{item.id} then ifnull(a.workScoreAdd,0) + #{item.workScoreAddIncrement}
+                                    <when test="(colPickMode==0 and item.containsKey('goworkScoreAddIncrement')) or (colPickMode==1 and !item.containsKey('goworkScoreAddIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.goworkScoreAdd,0) + #{item.goworkScoreAddIncrement}
                                     </when>
                                 </choose>
                             </foreach>
                         </trim>
-            <trim prefix="workScoreSub=(case" suffix="ELSE workScoreSub end),">
+                        <trim prefix="goworkScoreSub=(case" suffix="ELSE goworkScoreSub end),">
                             <foreach collection="data.dataList" item="item" index="index" separator="" >
                                 <choose>
-                        <when test="(colPickMode==0 and item.containsKey('workScoreSub')) or (colPickMode==1 and !item.containsKey('workScoreSub'))">
-                            when a.id=#{item.id} then #{item.workScoreSub}
+                                    <when test="(colPickMode==0 and item.containsKey('goworkScoreSub')) or (colPickMode==1 and !item.containsKey('goworkScoreSub'))">
+                                        when a.id=#{item.id} then #{item.goworkScoreSub}
                                     </when>
-                        <when test="(colPickMode==0 and item.containsKey('workScoreSubIncrement')) or (colPickMode==1 and !item.containsKey('workScoreSubIncrement'))">
-                            when a.id=#{item.id} then ifnull(a.workScoreSub,0) + #{item.workScoreSubIncrement}
+                                    <when test="(colPickMode==0 and item.containsKey('goworkScoreSubIncrement')) or (colPickMode==1 and !item.containsKey('goworkScoreSubIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.goworkScoreSub,0) + #{item.goworkScoreSubIncrement}
                                     </when>
                                 </choose>
                             </foreach>
@@ -898,58 +898,58 @@
                 ${_conditionType_} a.attendScoreSub <![CDATA[ <= ]]> #{${_conditionParam_}.attendScoreSubEnd}
             </if>
 
-        <if test="conditionParamRef.containsKey('assessScoreAdd')">
-            <if test="conditionParamRef.assessScoreAdd != null ">
-                ${_conditionType_} a.assessScoreAdd = #{${_conditionParam_}.assessScoreAdd}
+            <if test="conditionParamRef.containsKey('reviewScoreAdd')">
+                <if test="conditionParamRef.reviewScoreAdd != null ">
+                    ${_conditionType_} a.reviewScoreAdd = #{${_conditionParam_}.reviewScoreAdd}
                 </if>
-            <if test="conditionParamRef.assessScoreAdd == null">
-                ${_conditionType_} a.assessScoreAdd is null
+                <if test="conditionParamRef.reviewScoreAdd == null">
+                    ${_conditionType_} a.reviewScoreAdd is null
                 </if>
             </if>
-        <if test="conditionParamRef.containsKey('assessScoreAddList') and conditionParamRef.assessScoreAddList.size() > 0">
-            ${_conditionType_} a.assessScoreAdd in
-            <foreach collection="conditionParamRef.assessScoreAddList" open="(" close=")" index="index" item="item" separator=",">
+            <if test="conditionParamRef.containsKey('reviewScoreAddList') and conditionParamRef.reviewScoreAddList.size() > 0">
+                ${_conditionType_} a.reviewScoreAdd in
+                <foreach collection="conditionParamRef.reviewScoreAddList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
             </if>
-        <if test="conditionParamRef.containsKey('assessScoreAddNotList') and conditionParamRef.assessScoreAddNotList.size() > 0">
-            ${_conditionType_} a.assessScoreAdd not in
-            <foreach collection="conditionParamRef.assessScoreAddNotList" open="(" close=")" index="index" item="item" separator=",">
+            <if test="conditionParamRef.containsKey('reviewScoreAddNotList') and conditionParamRef.reviewScoreAddNotList.size() > 0">
+                ${_conditionType_} a.reviewScoreAdd not in
+                <foreach collection="conditionParamRef.reviewScoreAddNotList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
             </if>
-        <if test="conditionParamRef.containsKey('assessScoreAddStart') and conditionParamRef.assessScoreAddStart != null">
-            ${_conditionType_} a.assessScoreAdd <![CDATA[ >= ]]> #{${_conditionParam_}.assessScoreAddStart}
+            <if test="conditionParamRef.containsKey('reviewScoreAddStart') and conditionParamRef.reviewScoreAddStart != null">
+                ${_conditionType_} a.reviewScoreAdd <![CDATA[ >= ]]> #{${_conditionParam_}.reviewScoreAddStart}
             </if>
-        <if test="conditionParamRef.containsKey('assessScoreAddEnd') and conditionParamRef.assessScoreAddEnd != null">
-            ${_conditionType_} a.assessScoreAdd <![CDATA[ <= ]]> #{${_conditionParam_}.assessScoreAddEnd}
+            <if test="conditionParamRef.containsKey('reviewScoreAddEnd') and conditionParamRef.reviewScoreAddEnd != null">
+                ${_conditionType_} a.reviewScoreAdd <![CDATA[ <= ]]> #{${_conditionParam_}.reviewScoreAddEnd}
             </if>
 
-        <if test="conditionParamRef.containsKey('assessScoreSub')">
-            <if test="conditionParamRef.assessScoreSub != null ">
-                ${_conditionType_} a.assessScoreSub = #{${_conditionParam_}.assessScoreSub}
+            <if test="conditionParamRef.containsKey('reviewScoreSub')">
+                <if test="conditionParamRef.reviewScoreSub != null ">
+                    ${_conditionType_} a.reviewScoreSub = #{${_conditionParam_}.reviewScoreSub}
                 </if>
-            <if test="conditionParamRef.assessScoreSub == null">
-                ${_conditionType_} a.assessScoreSub is null
+                <if test="conditionParamRef.reviewScoreSub == null">
+                    ${_conditionType_} a.reviewScoreSub is null
                 </if>
             </if>
-        <if test="conditionParamRef.containsKey('assessScoreSubList') and conditionParamRef.assessScoreSubList.size() > 0">
-            ${_conditionType_} a.assessScoreSub in
-            <foreach collection="conditionParamRef.assessScoreSubList" open="(" close=")" index="index" item="item" separator=",">
+            <if test="conditionParamRef.containsKey('reviewScoreSubList') and conditionParamRef.reviewScoreSubList.size() > 0">
+                ${_conditionType_} a.reviewScoreSub in
+                <foreach collection="conditionParamRef.reviewScoreSubList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
             </if>
-        <if test="conditionParamRef.containsKey('assessScoreSubNotList') and conditionParamRef.assessScoreSubNotList.size() > 0">
-            ${_conditionType_} a.assessScoreSub not in
-            <foreach collection="conditionParamRef.assessScoreSubNotList" open="(" close=")" index="index" item="item" separator=",">
+            <if test="conditionParamRef.containsKey('reviewScoreSubNotList') and conditionParamRef.reviewScoreSubNotList.size() > 0">
+                ${_conditionType_} a.reviewScoreSub not in
+                <foreach collection="conditionParamRef.reviewScoreSubNotList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
             </if>
-        <if test="conditionParamRef.containsKey('assessScoreSubStart') and conditionParamRef.assessScoreSubStart != null">
-            ${_conditionType_} a.assessScoreSub <![CDATA[ >= ]]> #{${_conditionParam_}.assessScoreSubStart}
+            <if test="conditionParamRef.containsKey('reviewScoreSubStart') and conditionParamRef.reviewScoreSubStart != null">
+                ${_conditionType_} a.reviewScoreSub <![CDATA[ >= ]]> #{${_conditionParam_}.reviewScoreSubStart}
             </if>
-        <if test="conditionParamRef.containsKey('assessScoreSubEnd') and conditionParamRef.assessScoreSubEnd != null">
-            ${_conditionType_} a.assessScoreSub <![CDATA[ <= ]]> #{${_conditionParam_}.assessScoreSubEnd}
+            <if test="conditionParamRef.containsKey('reviewScoreSubEnd') and conditionParamRef.reviewScoreSubEnd != null">
+                ${_conditionType_} a.reviewScoreSub <![CDATA[ <= ]]> #{${_conditionParam_}.reviewScoreSubEnd}
             </if>
 
             <if test="conditionParamRef.containsKey('complainScoreAdd')">
@@ -1006,58 +1006,58 @@
                 ${_conditionType_} a.complainScoreSub <![CDATA[ <= ]]> #{${_conditionParam_}.complainScoreSubEnd}
             </if>
 
-        <if test="conditionParamRef.containsKey('workScoreAdd')">
-            <if test="conditionParamRef.workScoreAdd != null ">
-                ${_conditionType_} a.workScoreAdd = #{${_conditionParam_}.workScoreAdd}
+            <if test="conditionParamRef.containsKey('goworkScoreAdd')">
+                <if test="conditionParamRef.goworkScoreAdd != null ">
+                    ${_conditionType_} a.goworkScoreAdd = #{${_conditionParam_}.goworkScoreAdd}
                 </if>
-            <if test="conditionParamRef.workScoreAdd == null">
-                ${_conditionType_} a.workScoreAdd is null
+                <if test="conditionParamRef.goworkScoreAdd == null">
+                    ${_conditionType_} a.goworkScoreAdd is null
                 </if>
             </if>
-        <if test="conditionParamRef.containsKey('workScoreAddList') and conditionParamRef.workScoreAddList.size() > 0">
-            ${_conditionType_} a.workScoreAdd in
-            <foreach collection="conditionParamRef.workScoreAddList" open="(" close=")" index="index" item="item" separator=",">
+            <if test="conditionParamRef.containsKey('goworkScoreAddList') and conditionParamRef.goworkScoreAddList.size() > 0">
+                ${_conditionType_} a.goworkScoreAdd in
+                <foreach collection="conditionParamRef.goworkScoreAddList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
             </if>
-        <if test="conditionParamRef.containsKey('workScoreAddNotList') and conditionParamRef.workScoreAddNotList.size() > 0">
-            ${_conditionType_} a.workScoreAdd not in
-            <foreach collection="conditionParamRef.workScoreAddNotList" open="(" close=")" index="index" item="item" separator=",">
+            <if test="conditionParamRef.containsKey('goworkScoreAddNotList') and conditionParamRef.goworkScoreAddNotList.size() > 0">
+                ${_conditionType_} a.goworkScoreAdd not in
+                <foreach collection="conditionParamRef.goworkScoreAddNotList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
             </if>
-        <if test="conditionParamRef.containsKey('workScoreAddStart') and conditionParamRef.workScoreAddStart != null">
-            ${_conditionType_} a.workScoreAdd <![CDATA[ >= ]]> #{${_conditionParam_}.workScoreAddStart}
+            <if test="conditionParamRef.containsKey('goworkScoreAddStart') and conditionParamRef.goworkScoreAddStart != null">
+                ${_conditionType_} a.goworkScoreAdd <![CDATA[ >= ]]> #{${_conditionParam_}.goworkScoreAddStart}
             </if>
-        <if test="conditionParamRef.containsKey('workScoreAddEnd') and conditionParamRef.workScoreAddEnd != null">
-            ${_conditionType_} a.workScoreAdd <![CDATA[ <= ]]> #{${_conditionParam_}.workScoreAddEnd}
+            <if test="conditionParamRef.containsKey('goworkScoreAddEnd') and conditionParamRef.goworkScoreAddEnd != null">
+                ${_conditionType_} a.goworkScoreAdd <![CDATA[ <= ]]> #{${_conditionParam_}.goworkScoreAddEnd}
             </if>
 
-        <if test="conditionParamRef.containsKey('workScoreSub')">
-            <if test="conditionParamRef.workScoreSub != null ">
-                ${_conditionType_} a.workScoreSub = #{${_conditionParam_}.workScoreSub}
+            <if test="conditionParamRef.containsKey('goworkScoreSub')">
+                <if test="conditionParamRef.goworkScoreSub != null ">
+                    ${_conditionType_} a.goworkScoreSub = #{${_conditionParam_}.goworkScoreSub}
                 </if>
-            <if test="conditionParamRef.workScoreSub == null">
-                ${_conditionType_} a.workScoreSub is null
+                <if test="conditionParamRef.goworkScoreSub == null">
+                    ${_conditionType_} a.goworkScoreSub is null
                 </if>
             </if>
-        <if test="conditionParamRef.containsKey('workScoreSubList') and conditionParamRef.workScoreSubList.size() > 0">
-            ${_conditionType_} a.workScoreSub in
-            <foreach collection="conditionParamRef.workScoreSubList" open="(" close=")" index="index" item="item" separator=",">
+            <if test="conditionParamRef.containsKey('goworkScoreSubList') and conditionParamRef.goworkScoreSubList.size() > 0">
+                ${_conditionType_} a.goworkScoreSub in
+                <foreach collection="conditionParamRef.goworkScoreSubList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
             </if>
-        <if test="conditionParamRef.containsKey('workScoreSubNotList') and conditionParamRef.workScoreSubNotList.size() > 0">
-            ${_conditionType_} a.workScoreSub not in
-            <foreach collection="conditionParamRef.workScoreSubNotList" open="(" close=")" index="index" item="item" separator=",">
+            <if test="conditionParamRef.containsKey('goworkScoreSubNotList') and conditionParamRef.goworkScoreSubNotList.size() > 0">
+                ${_conditionType_} a.goworkScoreSub not in
+                <foreach collection="conditionParamRef.goworkScoreSubNotList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
             </if>
-        <if test="conditionParamRef.containsKey('workScoreSubStart') and conditionParamRef.workScoreSubStart != null">
-            ${_conditionType_} a.workScoreSub <![CDATA[ >= ]]> #{${_conditionParam_}.workScoreSubStart}
+            <if test="conditionParamRef.containsKey('goworkScoreSubStart') and conditionParamRef.goworkScoreSubStart != null">
+                ${_conditionType_} a.goworkScoreSub <![CDATA[ >= ]]> #{${_conditionParam_}.goworkScoreSubStart}
             </if>
-        <if test="conditionParamRef.containsKey('workScoreSubEnd') and conditionParamRef.workScoreSubEnd != null">
-            ${_conditionType_} a.workScoreSub <![CDATA[ <= ]]> #{${_conditionParam_}.workScoreSubEnd}
+            <if test="conditionParamRef.containsKey('goworkScoreSubEnd') and conditionParamRef.goworkScoreSubEnd != null">
+                ${_conditionType_} a.goworkScoreSub <![CDATA[ <= ]]> #{${_conditionParam_}.goworkScoreSubEnd}
             </if>
 
             <if test="conditionParamRef.containsKey('effectScoreAdd')">
@@ -1407,14 +1407,14 @@
                         <if test='orderCol.attendScoreSub != null and "DESC".equalsIgnoreCase(orderCol.attendScoreSub)'>DESC</if>
                         ,
                     </if>
-                <if test="orderCol.containsKey('assessScoreAdd')">
-                    a.assessScoreAdd
-                    <if test='orderCol.assessScoreAdd != null and "DESC".equalsIgnoreCase(orderCol.assessScoreAdd)'>DESC</if>
+                    <if test="orderCol.containsKey('reviewScoreAdd')">
+                        a.reviewScoreAdd
+                        <if test='orderCol.reviewScoreAdd != null and "DESC".equalsIgnoreCase(orderCol.reviewScoreAdd)'>DESC</if>
                         ,
                     </if>
-                <if test="orderCol.containsKey('assessScoreSub')">
-                    a.assessScoreSub
-                    <if test='orderCol.assessScoreSub != null and "DESC".equalsIgnoreCase(orderCol.assessScoreSub)'>DESC</if>
+                    <if test="orderCol.containsKey('reviewScoreSub')">
+                        a.reviewScoreSub
+                        <if test='orderCol.reviewScoreSub != null and "DESC".equalsIgnoreCase(orderCol.reviewScoreSub)'>DESC</if>
                         ,
                     </if>
                     <if test="orderCol.containsKey('complainScoreAdd')">
@@ -1427,14 +1427,14 @@
                         <if test='orderCol.complainScoreSub != null and "DESC".equalsIgnoreCase(orderCol.complainScoreSub)'>DESC</if>
                         ,
                     </if>
-                <if test="orderCol.containsKey('workScoreAdd')">
-                    a.workScoreAdd
-                    <if test='orderCol.workScoreAdd != null and "DESC".equalsIgnoreCase(orderCol.workScoreAdd)'>DESC</if>
+                    <if test="orderCol.containsKey('goworkScoreAdd')">
+                        a.goworkScoreAdd
+                        <if test='orderCol.goworkScoreAdd != null and "DESC".equalsIgnoreCase(orderCol.goworkScoreAdd)'>DESC</if>
                         ,
                     </if>
-                <if test="orderCol.containsKey('workScoreSub')">
-                    a.workScoreSub
-                    <if test='orderCol.workScoreSub != null and "DESC".equalsIgnoreCase(orderCol.workScoreSub)'>DESC</if>
+                    <if test="orderCol.containsKey('goworkScoreSub')">
+                        a.goworkScoreSub
+                        <if test='orderCol.goworkScoreSub != null and "DESC".equalsIgnoreCase(orderCol.goworkScoreSub)'>DESC</if>
                         ,
                     </if>
                     <if test="orderCol.containsKey('effectScoreAdd')">

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

@@ -12,8 +12,9 @@
             <result property="deptId" column="deptId" />
             <result property="deptName" column="deptName" />
             <result property="attendScore" column="attendScore" />
-            <result property="assessScore" column="assessScore" />
-            <result property="workScore" column="workScore" />
+            <result property="reviewScore" column="reviewScore" />
+            <result property="complainScore" column="complainScore" />
+            <result property="goworkScore" column="goworkScore" />
             <result property="effectScore" column="effectScore" />
             <result property="otherScore" column="otherScore" />
             <result property="errorScore" column="errorScore" />
@@ -53,11 +54,14 @@
                 <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('attendScore') or colPickMode == 1 and data.containsKey('attendScore')))">
                     a.attendScore,
                 </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('assessScore') or colPickMode == 1 and data.containsKey('assessScore')))">
-                    a.assessScore,
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('reviewScore') or colPickMode == 1 and data.containsKey('reviewScore')))">
+                    a.reviewScore,
                 </if>
-                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('workScore') or colPickMode == 1 and data.containsKey('workScore')))">
-                    a.workScore,
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('complainScore') or colPickMode == 1 and data.containsKey('complainScore')))">
+                    a.complainScore,
+                </if>
+                <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('goworkScore') or colPickMode == 1 and data.containsKey('goworkScore')))">
+                    a.goworkScore,
                 </if>
                 <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('effectScore') or colPickMode == 1 and data.containsKey('effectScore')))">
                     a.effectScore,
@@ -97,18 +101,18 @@
     <!-- 新增 区分主键自增加还是业务插入 -->
     <insert id="insert" parameterType="StaffPerformSummaryEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_xhx_staff_perform_summary
-        (staffId,workNum,staffName,deptId,deptName,attendScore,assessScore,workScore,effectScore,otherScore,errorScore,totalScore,remark,year,month,createTime,createUserId,updateTime,updateUserId)
+        (staffId,workNum,staffName,deptId,deptName,attendScore,reviewScore,complainScore,goworkScore,effectScore,otherScore,errorScore,totalScore,remark,year,month,createTime,createUserId,updateTime,updateUserId)
         VALUES
-        (#{staffId},#{workNum},#{staffName},#{deptId},#{deptName},#{attendScore},#{assessScore},#{workScore},#{effectScore},#{otherScore},#{errorScore},#{totalScore},#{remark},#{year},#{month},#{createTime},#{createUserId},#{updateTime},#{updateUserId})
+        (#{staffId},#{workNum},#{staffName},#{deptId},#{deptName},#{attendScore},#{reviewScore},#{complainScore},#{goworkScore},#{effectScore},#{otherScore},#{errorScore},#{totalScore},#{remark},#{year},#{month},#{createTime},#{createUserId},#{updateTime},#{updateUserId})
     </insert>
 
     <!-- 批量新增 -->
     <insert id="insertBatch" parameterType="paramDto">
         insert into mortals_xhx_staff_perform_summary
-        (staffId,workNum,staffName,deptId,deptName,attendScore,assessScore,workScore,effectScore,otherScore,errorScore,totalScore,remark,year,month,createTime,createUserId,updateTime,updateUserId)
+        (staffId,workNum,staffName,deptId,deptName,attendScore,reviewScore,complainScore,goworkScore,effectScore,otherScore,errorScore,totalScore,remark,year,month,createTime,createUserId,updateTime,updateUserId)
         VALUES
         <foreach collection="data.dataList" item="item" index="index" separator="," >
-            (#{item.staffId},#{item.workNum},#{item.staffName},#{item.deptId},#{item.deptName},#{item.attendScore},#{item.assessScore},#{item.workScore},#{item.effectScore},#{item.otherScore},#{item.errorScore},#{item.totalScore},#{item.remark},#{item.year},#{item.month},#{item.createTime},#{item.createUserId},#{item.updateTime},#{item.updateUserId})
+            (#{item.staffId},#{item.workNum},#{item.staffName},#{item.deptId},#{item.deptName},#{item.attendScore},#{item.reviewScore},#{item.complainScore},#{item.goworkScore},#{item.effectScore},#{item.otherScore},#{item.errorScore},#{item.totalScore},#{item.remark},#{item.year},#{item.month},#{item.createTime},#{item.createUserId},#{item.updateTime},#{item.updateUserId})
         </foreach>
     </insert>
 
@@ -145,17 +149,23 @@
             <if test="(colPickMode==0 and data.containsKey('attendScoreIncrement')) or (colPickMode==1 and !data.containsKey('attendScoreIncrement'))">
                 a.attendScore=ifnull(a.attendScore,0) + #{data.attendScoreIncrement},
             </if>
-            <if test="(colPickMode==0 and data.containsKey('assessScore')) or (colPickMode==1 and !data.containsKey('assessScore'))">
-                a.assessScore=#{data.assessScore},
+            <if test="(colPickMode==0 and data.containsKey('reviewScore')) or (colPickMode==1 and !data.containsKey('reviewScore'))">
+                a.reviewScore=#{data.reviewScore},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('reviewScoreIncrement')) or (colPickMode==1 and !data.containsKey('reviewScoreIncrement'))">
+                a.reviewScore=ifnull(a.reviewScore,0) + #{data.reviewScoreIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('complainScore')) or (colPickMode==1 and !data.containsKey('complainScore'))">
+                a.complainScore=#{data.complainScore},
             </if>
-            <if test="(colPickMode==0 and data.containsKey('assessScoreIncrement')) or (colPickMode==1 and !data.containsKey('assessScoreIncrement'))">
-                a.assessScore=ifnull(a.assessScore,0) + #{data.assessScoreIncrement},
+            <if test="(colPickMode==0 and data.containsKey('complainScoreIncrement')) or (colPickMode==1 and !data.containsKey('complainScoreIncrement'))">
+                a.complainScore=ifnull(a.complainScore,0) + #{data.complainScoreIncrement},
             </if>
-            <if test="(colPickMode==0 and data.containsKey('workScore')) or (colPickMode==1 and !data.containsKey('workScore'))">
-                a.workScore=#{data.workScore},
+            <if test="(colPickMode==0 and data.containsKey('goworkScore')) or (colPickMode==1 and !data.containsKey('goworkScore'))">
+                a.goworkScore=#{data.goworkScore},
             </if>
-            <if test="(colPickMode==0 and data.containsKey('workScoreIncrement')) or (colPickMode==1 and !data.containsKey('workScoreIncrement'))">
-                a.workScore=ifnull(a.workScore,0) + #{data.workScoreIncrement},
+            <if test="(colPickMode==0 and data.containsKey('goworkScoreIncrement')) or (colPickMode==1 and !data.containsKey('goworkScoreIncrement'))">
+                a.goworkScore=ifnull(a.goworkScore,0) + #{data.goworkScoreIncrement},
             </if>
             <if test="(colPickMode==0 and data.containsKey('effectScore')) or (colPickMode==1 and !data.containsKey('effectScore'))">
                 a.effectScore=#{data.effectScore},
@@ -283,26 +293,38 @@
                                 </choose>
                             </foreach>
                         </trim>
-                        <trim prefix="assessScore=(case" suffix="ELSE assessScore end),">
+                        <trim prefix="reviewScore=(case" suffix="ELSE reviewScore end),">
+                            <foreach collection="data.dataList" item="item" index="index" separator="" >
+                                <choose>
+                                    <when test="(colPickMode==0 and item.containsKey('reviewScore')) or (colPickMode==1 and !item.containsKey('reviewScore'))">
+                                        when a.id=#{item.id} then #{item.reviewScore}
+                                    </when>
+                                    <when test="(colPickMode==0 and item.containsKey('reviewScoreIncrement')) or (colPickMode==1 and !item.containsKey('reviewScoreIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.reviewScore,0) + #{item.reviewScoreIncrement}
+                                    </when>
+                                </choose>
+                            </foreach>
+                        </trim>
+                        <trim prefix="complainScore=(case" suffix="ELSE complainScore end),">
                             <foreach collection="data.dataList" item="item" index="index" separator="" >
                                 <choose>
-                                    <when test="(colPickMode==0 and item.containsKey('assessScore')) or (colPickMode==1 and !item.containsKey('assessScore'))">
-                                        when a.id=#{item.id} then #{item.assessScore}
+                                    <when test="(colPickMode==0 and item.containsKey('complainScore')) or (colPickMode==1 and !item.containsKey('complainScore'))">
+                                        when a.id=#{item.id} then #{item.complainScore}
                                     </when>
-                                    <when test="(colPickMode==0 and item.containsKey('assessScoreIncrement')) or (colPickMode==1 and !item.containsKey('assessScoreIncrement'))">
-                                        when a.id=#{item.id} then ifnull(a.assessScore,0) + #{item.assessScoreIncrement}
+                                    <when test="(colPickMode==0 and item.containsKey('complainScoreIncrement')) or (colPickMode==1 and !item.containsKey('complainScoreIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.complainScore,0) + #{item.complainScoreIncrement}
                                     </when>
                                 </choose>
                             </foreach>
                         </trim>
-                        <trim prefix="workScore=(case" suffix="ELSE workScore end),">
+                        <trim prefix="goworkScore=(case" suffix="ELSE goworkScore end),">
                             <foreach collection="data.dataList" item="item" index="index" separator="" >
                                 <choose>
-                                    <when test="(colPickMode==0 and item.containsKey('workScore')) or (colPickMode==1 and !item.containsKey('workScore'))">
-                                        when a.id=#{item.id} then #{item.workScore}
+                                    <when test="(colPickMode==0 and item.containsKey('goworkScore')) or (colPickMode==1 and !item.containsKey('goworkScore'))">
+                                        when a.id=#{item.id} then #{item.goworkScore}
                                     </when>
-                                    <when test="(colPickMode==0 and item.containsKey('workScoreIncrement')) or (colPickMode==1 and !item.containsKey('workScoreIncrement'))">
-                                        when a.id=#{item.id} then ifnull(a.workScore,0) + #{item.workScoreIncrement}
+                                    <when test="(colPickMode==0 and item.containsKey('goworkScoreIncrement')) or (colPickMode==1 and !item.containsKey('goworkScoreIncrement'))">
+                                        when a.id=#{item.id} then ifnull(a.goworkScore,0) + #{item.goworkScoreIncrement}
                                     </when>
                                 </choose>
                             </foreach>
@@ -711,58 +733,85 @@
                 ${_conditionType_} a.attendScore <![CDATA[ <= ]]> #{${_conditionParam_}.attendScoreEnd}
             </if>
 
-            <if test="conditionParamRef.containsKey('assessScore')">
-                <if test="conditionParamRef.assessScore != null ">
-                    ${_conditionType_} a.assessScore = #{${_conditionParam_}.assessScore}
+            <if test="conditionParamRef.containsKey('reviewScore')">
+                <if test="conditionParamRef.reviewScore != null ">
+                    ${_conditionType_} a.reviewScore = #{${_conditionParam_}.reviewScore}
+                </if>
+                <if test="conditionParamRef.reviewScore == null">
+                    ${_conditionType_} a.reviewScore is null
+                </if>
+            </if>
+            <if test="conditionParamRef.containsKey('reviewScoreList') and conditionParamRef.reviewScoreList.size() > 0">
+                ${_conditionType_} a.reviewScore in
+                <foreach collection="conditionParamRef.reviewScoreList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('reviewScoreNotList') and conditionParamRef.reviewScoreNotList.size() > 0">
+                ${_conditionType_} a.reviewScore not in
+                <foreach collection="conditionParamRef.reviewScoreNotList" open="(" close=")" index="index" item="item" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="conditionParamRef.containsKey('reviewScoreStart') and conditionParamRef.reviewScoreStart != null">
+                ${_conditionType_} a.reviewScore <![CDATA[ >= ]]> #{${_conditionParam_}.reviewScoreStart}
+            </if>
+            <if test="conditionParamRef.containsKey('reviewScoreEnd') and conditionParamRef.reviewScoreEnd != null">
+                ${_conditionType_} a.reviewScore <![CDATA[ <= ]]> #{${_conditionParam_}.reviewScoreEnd}
+            </if>
+
+            <if test="conditionParamRef.containsKey('complainScore')">
+                <if test="conditionParamRef.complainScore != null ">
+                    ${_conditionType_} a.complainScore = #{${_conditionParam_}.complainScore}
                 </if>
-                <if test="conditionParamRef.assessScore == null">
-                    ${_conditionType_} a.assessScore is null
+                <if test="conditionParamRef.complainScore == null">
+                    ${_conditionType_} a.complainScore is null
                 </if>
             </if>
-            <if test="conditionParamRef.containsKey('assessScoreList') and conditionParamRef.assessScoreList.size() > 0">
-                ${_conditionType_} a.assessScore in
-                <foreach collection="conditionParamRef.assessScoreList" open="(" close=")" index="index" item="item" separator=",">
+            <if test="conditionParamRef.containsKey('complainScoreList') and conditionParamRef.complainScoreList.size() > 0">
+                ${_conditionType_} a.complainScore in
+                <foreach collection="conditionParamRef.complainScoreList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
             </if>
-            <if test="conditionParamRef.containsKey('assessScoreNotList') and conditionParamRef.assessScoreNotList.size() > 0">
-                ${_conditionType_} a.assessScore not in
-                <foreach collection="conditionParamRef.assessScoreNotList" open="(" close=")" index="index" item="item" separator=",">
+            <if test="conditionParamRef.containsKey('complainScoreNotList') and conditionParamRef.complainScoreNotList.size() > 0">
+                ${_conditionType_} a.complainScore not in
+                <foreach collection="conditionParamRef.complainScoreNotList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
             </if>
-            <if test="conditionParamRef.containsKey('assessScoreStart') and conditionParamRef.assessScoreStart != null">
-                ${_conditionType_} a.assessScore <![CDATA[ >= ]]> #{${_conditionParam_}.assessScoreStart}
+            <if test="conditionParamRef.containsKey('complainScoreStart') and conditionParamRef.complainScoreStart != null">
+                ${_conditionType_} a.complainScore <![CDATA[ >= ]]> #{${_conditionParam_}.complainScoreStart}
             </if>
-            <if test="conditionParamRef.containsKey('assessScoreEnd') and conditionParamRef.assessScoreEnd != null">
-                ${_conditionType_} a.assessScore <![CDATA[ <= ]]> #{${_conditionParam_}.assessScoreEnd}
+            <if test="conditionParamRef.containsKey('complainScoreEnd') and conditionParamRef.complainScoreEnd != null">
+                ${_conditionType_} a.complainScore <![CDATA[ <= ]]> #{${_conditionParam_}.complainScoreEnd}
             </if>
 
-            <if test="conditionParamRef.containsKey('workScore')">
-                <if test="conditionParamRef.workScore != null ">
-                    ${_conditionType_} a.workScore = #{${_conditionParam_}.workScore}
+            <if test="conditionParamRef.containsKey('goworkScore')">
+                <if test="conditionParamRef.goworkScore != null ">
+                    ${_conditionType_} a.goworkScore = #{${_conditionParam_}.goworkScore}
                 </if>
-                <if test="conditionParamRef.workScore == null">
-                    ${_conditionType_} a.workScore is null
+                <if test="conditionParamRef.goworkScore == null">
+                    ${_conditionType_} a.goworkScore is null
                 </if>
             </if>
-            <if test="conditionParamRef.containsKey('workScoreList') and conditionParamRef.workScoreList.size() > 0">
-                ${_conditionType_} a.workScore in
-                <foreach collection="conditionParamRef.workScoreList" open="(" close=")" index="index" item="item" separator=",">
+            <if test="conditionParamRef.containsKey('goworkScoreList') and conditionParamRef.goworkScoreList.size() > 0">
+                ${_conditionType_} a.goworkScore in
+                <foreach collection="conditionParamRef.goworkScoreList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
             </if>
-            <if test="conditionParamRef.containsKey('workScoreNotList') and conditionParamRef.workScoreNotList.size() > 0">
-                ${_conditionType_} a.workScore not in
-                <foreach collection="conditionParamRef.workScoreNotList" open="(" close=")" index="index" item="item" separator=",">
+            <if test="conditionParamRef.containsKey('goworkScoreNotList') and conditionParamRef.goworkScoreNotList.size() > 0">
+                ${_conditionType_} a.goworkScore not in
+                <foreach collection="conditionParamRef.goworkScoreNotList" open="(" close=")" index="index" item="item" separator=",">
                     #{item}
                 </foreach>
             </if>
-            <if test="conditionParamRef.containsKey('workScoreStart') and conditionParamRef.workScoreStart != null">
-                ${_conditionType_} a.workScore <![CDATA[ >= ]]> #{${_conditionParam_}.workScoreStart}
+            <if test="conditionParamRef.containsKey('goworkScoreStart') and conditionParamRef.goworkScoreStart != null">
+                ${_conditionType_} a.goworkScore <![CDATA[ >= ]]> #{${_conditionParam_}.goworkScoreStart}
             </if>
-            <if test="conditionParamRef.containsKey('workScoreEnd') and conditionParamRef.workScoreEnd != null">
-                ${_conditionType_} a.workScore <![CDATA[ <= ]]> #{${_conditionParam_}.workScoreEnd}
+            <if test="conditionParamRef.containsKey('goworkScoreEnd') and conditionParamRef.goworkScoreEnd != null">
+                ${_conditionType_} a.goworkScore <![CDATA[ <= ]]> #{${_conditionParam_}.goworkScoreEnd}
             </if>
 
             <if test="conditionParamRef.containsKey('effectScore')">
@@ -1080,14 +1129,19 @@
                         <if test='orderCol.attendScore != null and "DESC".equalsIgnoreCase(orderCol.attendScore)'>DESC</if>
                         ,
                     </if>
-                    <if test="orderCol.containsKey('assessScore')">
-                        a.assessScore
-                        <if test='orderCol.assessScore != null and "DESC".equalsIgnoreCase(orderCol.assessScore)'>DESC</if>
+                    <if test="orderCol.containsKey('reviewScore')">
+                        a.reviewScore
+                        <if test='orderCol.reviewScore != null and "DESC".equalsIgnoreCase(orderCol.reviewScore)'>DESC</if>
+                        ,
+                    </if>
+                    <if test="orderCol.containsKey('complainScore')">
+                        a.complainScore
+                        <if test='orderCol.complainScore != null and "DESC".equalsIgnoreCase(orderCol.complainScore)'>DESC</if>
                         ,
                     </if>
-                    <if test="orderCol.containsKey('workScore')">
-                        a.workScore
-                        <if test='orderCol.workScore != null and "DESC".equalsIgnoreCase(orderCol.workScore)'>DESC</if>
+                    <if test="orderCol.containsKey('goworkScore')">
+                        a.goworkScore
+                        <if test='orderCol.goworkScore != null and "DESC".equalsIgnoreCase(orderCol.goworkScore)'>DESC</if>
                         ,
                     </if>
                     <if test="orderCol.containsKey('effectScore')">

db/add.sql

@@ -540,3 +540,104 @@ PRIMARY KEY  (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='员工绩效统计';
 
 
+
+-- ----------------------------
+2023-7-14
+-- ----------------------------
+
+-- ----------------------------
+-- 部门绩效分数统计表
+-- ----------------------------
+DROP TABLE IF EXISTS `mortals_xhx_dept_perform_stat`;
+CREATE TABLE mortals_xhx_dept_perform_stat(
+    `id` bigint(20) NOT NULL  AUTO_INCREMENT   COMMENT '主键ID，主键，自增长',
+    `deptId` bigint(20)    DEFAULT '0'  COMMENT '部门id号',
+    `deptName` varchar(64)      COMMENT '部门名称',
+    `totalScore` decimal(10,2) NOT NULL     COMMENT '部门绩效总分数',
+    `totalAddScore` decimal(10,2) NOT NULL     COMMENT '部门绩效加分总分数汇总',
+    `totalSubScore` decimal(10,2) NOT NULL     COMMENT '部门绩效减分总分数汇总',
+    `attendScoreAdd` decimal(10,2)      COMMENT '考勤绩效指标增加分数',
+    `attendScoreSub` decimal(10,2)      COMMENT '考勤绩效指标扣减分数',
+    `reviewScoreAdd` decimal(10,2)      COMMENT '评价绩效指标增加分数',
+    `reviewScoreSub` decimal(10,2)      COMMENT '评价绩效指标扣减分数',
+    `complainScoreAdd` decimal(10,2)      COMMENT '投诉绩效指标增加分数',
+    `complainScoreSub` decimal(10,2)      COMMENT '投诉绩效指标扣减分数',
+    `goworkScoreAdd` decimal(10,2)      COMMENT '办件绩效指标增加分数',
+    `goworkScoreSub` decimal(10,2)      COMMENT '办件绩效指标扣减分数',
+    `effectScoreAdd` decimal(10,2)      COMMENT '效能绩效指标增加分数',
+    `effectScoreSub` decimal(10,2)      COMMENT '效能绩效指标扣减分数',
+    `otherScoreAdd` decimal(10,2)      COMMENT '其它绩效指标增加分数',
+    `otherScoreSub` decimal(10,2)      COMMENT '其它绩效指标扣减分数',
+    `averageScore` decimal(10,2) NOT NULL     COMMENT '部门绩效平均分数，根据部门所属人数平均',
+    `remark` varchar(255)      COMMENT '备注',
+    `year` int(9) NOT NULL     COMMENT '年',
+    `month` tinyint(2) NOT NULL     COMMENT '月',
+    `day` tinyint(2) NOT NULL     COMMENT '日',
+    `createTime` datetime      COMMENT '创建时间',
+    `createUserId` bigint(20)      COMMENT '创建人id',
+    `updateTime` datetime      COMMENT '更新时间',
+    `updateUserId` bigint(20)      COMMENT '更新人id',
+PRIMARY KEY  (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='部门绩效分数统计';
+-- ----------------------------
+-- 员工绩效统计表
+-- ----------------------------
+DROP TABLE IF EXISTS `mortals_xhx_staff_perform_stat`;
+CREATE TABLE mortals_xhx_staff_perform_stat(
+    `id` bigint(20) NOT NULL  AUTO_INCREMENT   COMMENT '主键ID，主键，自增长',
+    `staffId` bigint(20)    DEFAULT '0'  COMMENT '部门id号',
+    `staffName` varchar(64)      COMMENT '部门名称',
+    `totalScore` decimal(10,2) NOT NULL     COMMENT '员工绩效总分数',
+    `totalAddScore` decimal(10,2) NOT NULL     COMMENT '员工绩效加分总分数汇总',
+    `totalSubScore` decimal(10,2) NOT NULL     COMMENT '员工绩效减分总分数汇总',
+    `attendScoreAdd` decimal(10,2)      COMMENT '考勤绩效指标增加分数',
+    `attendScoreSub` decimal(10,2)      COMMENT '考勤绩效指标扣减分数',
+    `reviewScoreAdd` decimal(10,2)      COMMENT '评价绩效指标增加分数',
+    `reviewScoreSub` decimal(10,2)      COMMENT '评价绩效指标扣减分数',
+    `complainScoreAdd` decimal(10,2)      COMMENT '投诉绩效指标增加分数',
+    `complainScoreSub` decimal(10,2)      COMMENT '投诉绩效指标扣减分数',
+    `goworkScoreAdd` decimal(10,2)      COMMENT '办件绩效指标增加分数',
+    `goworkScoreSub` decimal(10,2)      COMMENT '办件绩效指标扣减分数',
+    `effectScoreAdd` decimal(10,2)      COMMENT '效能绩效指标增加分数',
+    `effectScoreSub` decimal(10,2)      COMMENT '效能绩效指标扣减分数',
+    `otherScoreAdd` decimal(10,2)      COMMENT '其它绩效指标增加分数',
+    `otherScoreSub` decimal(10,2)      COMMENT '其它绩效指标扣减分数',
+    `remark` varchar(255)      COMMENT '备注',
+    `year` int(9) NOT NULL     COMMENT '年',
+    `month` tinyint(2) NOT NULL     COMMENT '月',
+    `day` tinyint(2) NOT NULL     COMMENT '日',
+    `createTime` datetime      COMMENT '创建时间',
+    `createUserId` bigint(20)      COMMENT '创建人id',
+    `updateTime` datetime      COMMENT '更新时间',
+    `updateUserId` bigint(20)      COMMENT '更新人id',
+PRIMARY KEY  (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='员工绩效统计';
+-- ----------------------------
+-- 员工绩效统计表
+-- ----------------------------
+DROP TABLE IF EXISTS `mortals_xhx_staff_perform_summary`;
+CREATE TABLE mortals_xhx_staff_perform_summary(
+    `id` bigint(20) NOT NULL  AUTO_INCREMENT   COMMENT '主键ID，主键，自增长',
+    `staffId` bigint(20)    DEFAULT '0'  COMMENT '人员id',
+    `workNum` varchar(64)      COMMENT '工号',
+    `staffName` varchar(512)      COMMENT '人员名称',
+    `deptId` bigint(20)    DEFAULT '0'  COMMENT '部门id号',
+    `deptName` varchar(64)      COMMENT '部门名称',
+    `attendScore` decimal(10,2)      COMMENT '考勤绩效指标分数',
+    `reviewScore` decimal(10,2)      COMMENT '评价绩效指标分数',
+    `complainScore` decimal(10,2)      COMMENT '投诉绩效指标分数',
+    `goworkScore` decimal(10,2)      COMMENT '办件绩效分数',
+    `effectScore` decimal(10,2)      COMMENT '效能绩效分数',
+    `otherScore` decimal(10,2)      COMMENT '其它绩效分数',
+    `errorScore` decimal(10,2)      COMMENT '累计异常分数',
+    `totalScore` decimal(10,2)      COMMENT '当月得分数',
+    `remark` varchar(255)      COMMENT '备注',
+    `year` int(9) NOT NULL     COMMENT '年',
+    `month` tinyint(2) NOT NULL     COMMENT '月',
+    `createTime` datetime      COMMENT '创建时间',
+    `createUserId` bigint(20)      COMMENT '创建人id',
+    `updateTime` datetime      COMMENT '更新时间',
+    `updateUserId` bigint(20)      COMMENT '更新人id',
+PRIMARY KEY  (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='员工绩效统计';
+