评价投诉和评价差评合计为评价分数

attendance-performance-manager/src/main/java/com/mortals/xhx/daemon/applicationservice/StaffCheckSummaryService.java

@@ -36,6 +36,8 @@ public class StaffCheckSummaryService implements IApplicationStartedService {
     @Autowired
     private CheckReviewRecordService checkReviewRecordService;
     @Autowired
+    private CheckComplainRecordService checkComplainRecordService;
+    @Autowired
     private CheckWindowWorkmanPerformService checkWindowWorkmanPerformService;
 
     @Override
@@ -64,6 +66,7 @@ public class StaffCheckSummaryService implements IApplicationStartedService {
                             }
                             if(query.getCheckType() == CheckTypeEnum.评价绩效.getValue()){
                                 checkReviewRecordService.summaryCheck(query);
+                                checkComplainRecordService.summaryCheck(query);
                             }
                             if(query.getCheckType() == CheckTypeEnum.其它绩效.getValue()){
                                 checkWindowWorkmanPerformService.summaryCheck(query);
@@ -74,6 +77,7 @@ public class StaffCheckSummaryService implements IApplicationStartedService {
                                 checkEffectRecordService.summaryCheck(query);
                                 checkGoworkRecordService.summaryCheck(query);
                                 checkReviewRecordService.summaryCheck(query);
+                                checkComplainRecordService.summaryCheck(query);
                                 checkWindowWorkmanPerformService.summaryCheck(query);
                                 log.info("绩效分数汇总完成");
                             }

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

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.mortals.framework.common.Rest;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
+import com.mortals.framework.service.ICacheService;
 import com.mortals.framework.service.IUser;
 import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
 import com.mortals.framework.util.DateUtils;
@@ -52,6 +53,7 @@ import java.util.Date;
 import java.util.List;
 
 import static com.mortals.xhx.common.key.ParamKey.SYS_PARAM_WEIGHT;
+import static com.mortals.xhx.common.key.RedisKey.KEY_CHECK_SUMMARY_CACHE;
 
 /**
  * CheckComplainRecordService
@@ -86,6 +88,8 @@ public class CheckComplainRecordServiceImpl extends AbstractCRUDServiceImpl<Chec
     private PerformRulesService rulesService;
     @Autowired
     private ParamService paramService;
+    @Autowired
+    private ICacheService cacheService;
 
     @Override
     protected void saveBefore(CheckComplainRecordEntity entity, Context context) throws AppException {
@@ -106,7 +110,10 @@ public class CheckComplainRecordServiceImpl extends AbstractCRUDServiceImpl<Chec
         if (!ObjectUtils.isEmpty(entity.getStaffId())) {
             StaffEntity staffCache = staffService.getCache(entity.getStaffId().toString());
             entity.setStaffName(staffCache == null ? "" : staffCache.getName());
+            entity.setDeptId(staffCache == null ? null : staffCache.getDeptId());
             entity.setDeptName(staffCache == null ? "" : staffCache.getDeptName());
+            entity.setSalaId(staffCache == null ? null : staffCache.getSalaId());
+            entity.setSalaName(staffCache == null ? "" : staffCache.getSalaName());
         }
     }
 
@@ -118,7 +125,9 @@ public class CheckComplainRecordServiceImpl extends AbstractCRUDServiceImpl<Chec
             query.setStaffId(entity.getStaffId());
             query.setCheckTimeStart(DateUtils.getStrDate(entity.getCheckTime()));
             query.setCheckTimeEnd(query.getCheckTimeStart());
-            summaryCheck(query);
+            query.setCheckType(CheckTypeEnum.评价绩效.getValue());
+            cacheService.lpush(KEY_CHECK_SUMMARY_CACHE, query);
+            //summaryCheck(query);
         } catch (Exception e) {
             log.error("汇总已审核的核查记录出错", e);
         }
@@ -186,7 +195,11 @@ public class CheckComplainRecordServiceImpl extends AbstractCRUDServiceImpl<Chec
             sendCheckDingTalk(entity);
             StaffCheckSummaryQuery query = new StaffCheckSummaryQuery();
             query.setStaffId(temp.getStaffId());
-            summaryCheck(query);
+            query.setCheckTimeStart(DateUtils.getStrDate(entity.getCheckTime()));
+            query.setCheckTimeEnd(query.getCheckTimeStart());
+            query.setCheckType(CheckTypeEnum.评价绩效.getValue());
+            cacheService.lpush(KEY_CHECK_SUMMARY_CACHE, query);
+            //summaryCheck(query);
         } catch (Exception e) {
             log.error("汇总已审核的核查记录出错", e);
         }

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

@@ -73,7 +73,7 @@ public class StaffPerformSummaryEntity extends StaffPerformSummaryVo {
     /**
      * 投诉绩效指标分数
      */
-    @Excel(name = "投诉绩效指标分数")
+    //@Excel(name = "投诉绩效指标分数")
     private BigDecimal complainScore;
     /**
      * 办件绩效分数
@@ -88,7 +88,7 @@ public class StaffPerformSummaryEntity extends StaffPerformSummaryVo {
     /**
      * 其它绩效分数
      */
-    @Excel(name = "其它绩效分数")
+    @Excel(name = "自评绩效分数")
     private BigDecimal otherScore;
     /**
      * 累计异常分数