From 05b68d67328ec6f966eafd9e32625d5baf99a69c Mon Sep 17 00:00:00 2001
From: liaoxuwei <5789413@qq.com>
Date: Mon, 18 Mar 2024 15:29:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=84=E4=BB=B7=E6=8A=95=E8=AF=89=E5=92=8C?=
=?UTF-8?q?=E8=AF=84=E4=BB=B7=E5=B7=AE=E8=AF=84=E5=90=88=E8=AE=A1=E4=B8=BA?=
=?UTF-8?q?=E8=AF=84=E4=BB=B7=E5=88=86=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../StaffCheckSummaryService.java | 4 ++++
.../impl/CheckComplainRecordServiceImpl.java | 17 +++++++++++++++--
.../staff/model/StaffPerformSummaryEntity.java | 4 ++--
3 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/daemon/applicationservice/StaffCheckSummaryService.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/daemon/applicationservice/StaffCheckSummaryService.java
index e01a78cb..09d71464 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/daemon/applicationservice/StaffCheckSummaryService.java
+++ b/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("缁╂晥鍒嗘暟姹囨€诲畬鎴�");
}
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckComplainRecordServiceImpl.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckComplainRecordServiceImpl.java
index ce5c0d75..8eff6a4a 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckComplainRecordServiceImpl.java
+++ b/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);
}
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/model/StaffPerformSummaryEntity.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/model/StaffPerformSummaryEntity.java
index b049b843..4a8e4667 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/model/StaffPerformSummaryEntity.java
+++ b/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;
/**
* 绱寮傚父鍒嗘暟
--
2.24.3