From f284c5ef6a1aa6e9ba5d4e94e4b2abe83b6ea18c Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 31 七月 2024 14:54:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/task/ContractResultTask.java | 37 ++++++++++++++++++-------------------
1 files changed, 18 insertions(+), 19 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/task/ContractResultTask.java b/ycl-server/src/main/java/com/ycl/task/ContractResultTask.java
index 758c3a8..e15e890 100644
--- a/ycl-server/src/main/java/com/ycl/task/ContractResultTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/ContractResultTask.java
@@ -1,10 +1,10 @@
package com.ycl.task;
-import com.ycl.platform.domain.entity.CheckResult;
+import com.ycl.platform.domain.entity.ContractResult;
import com.ycl.platform.domain.entity.ContractResultRecord;
import com.ycl.platform.domain.entity.ContractScore;
import com.ycl.platform.domain.entity.TContract;
-import com.ycl.platform.service.ICheckResultService;
+import com.ycl.platform.service.IContractResultService;
import com.ycl.platform.service.IContractScoreService;
import com.ycl.platform.service.ITContractService;
import com.ycl.utils.DateUtils;
@@ -30,7 +30,7 @@
private final ITContractService contractService;
private final IContractScoreService contractScoreService;
- private final ICheckResultService checkResultService;
+ private final IContractResultService checkResultService;
private String startTime;
private String endTime;
@@ -49,10 +49,10 @@
// 涓婁釜鏈堟墸鍒嗚褰�
List<ContractScore> contractScore = contractScoreService.getDateRangeScoreByContractId(tContract.getId(), startTime, endTime);
// 鏂板鑰冩牳缁撴灉
- CheckResult checkResult = getCheckResult(tContract, contractScore);
- checkResultService.save(checkResult);
+ ContractResult contractResult = getCheckResult(tContract, contractScore);
+ checkResultService.save(contractResult);
// 鏂板鑰冩牳缁撴灉璁板綍
- List<ContractResultRecord> contractResultRecord = getContractResultRecord(contractScore, checkResult);
+ List<ContractResultRecord> contractResultRecord = getContractResultRecord(contractScore, contractResult);
checkResultService.saveBatchRecord(contractResultRecord);
}
}
@@ -60,16 +60,16 @@
/**
* 淇濆瓨鑰冩牳璁板綍
*
- * @param contractScore 鎵ｅ垎
- * @param checkResult 鑰冩牳缁撴灉
+ * @param contractScore 鎵ｅ垎
+ * @param contractResult 鑰冩牳缁撴灉
* @return 鑰冩牳璁板綍
*/
- private List<ContractResultRecord> getContractResultRecord(List<ContractScore> contractScore, CheckResult checkResult) {
+ private List<ContractResultRecord> getContractResultRecord(List<ContractScore> contractScore, ContractResult contractResult) {
return contractScore.stream().map(
item -> {
ContractResultRecord record = new ContractResultRecord();
BeanUtils.copyProperties(item, record);
- record.setResultId(checkResult.getId());
+ record.setResultId(contractResult.getId());
record.setCreateTime(DateUtils.getNowDate());
return record;
}
@@ -83,15 +83,14 @@
* @param contractScore 鎵ｅ垎
* @return 鑰冩牳缁撴灉
*/
- private CheckResult getCheckResult(TContract tContract, List<ContractScore> contractScore) {
- CheckResult checkResult = new CheckResult();
- checkResult.setUnitId(tContract.getUnitId());
- checkResult.setContractId(tContract.getId());
- checkResult.setPublish(0);
- checkResult.setDeleted("0");
- checkResult.setCheckTime(DateUtils.getNowDate());
- checkResult.setScore(contractScore.isEmpty() ? new BigDecimal("100") : new BigDecimal("100").subtract(contractScore.stream().map(ContractScore::getScore).reduce(BigDecimal::add).get()));
- return checkResult;
+ private ContractResult getCheckResult(TContract tContract, List<ContractScore> contractScore) {
+ ContractResult contractResult = new ContractResult();
+ contractResult.setUnitId(tContract.getUnitId());
+ contractResult.setContractId(tContract.getId());
+ contractResult.setPublish(0);
+ contractResult.setCheckTime(DateUtils.getNowDate());
+ contractResult.setScore(contractScore.isEmpty() ? new BigDecimal("100") : new BigDecimal("100").subtract(contractScore.stream().map(ContractScore::getScore).reduce(BigDecimal::add).get()));
+ return contractResult;
}
--
Gitblit v1.8.0