From ccba712602ff6eafe0928d79b6d595c140e924af Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期日, 27 四月 2025 17:29:09 +0800
Subject: [PATCH] 海康接口修改
---
ycl-server/src/main/java/com/ycl/task/ContractResultTask.java | 40 ++++++++++++++++++++++++++++++----------
1 files changed, 30 insertions(+), 10 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 339f924..ce627db 100644
--- a/ycl-server/src/main/java/com/ycl/task/ContractResultTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/ContractResultTask.java
@@ -1,14 +1,15 @@
package com.ycl.task;
-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.domain.entity.*;
+import com.ycl.platform.mapper.CalculateRecordMapper;
+import com.ycl.platform.service.CalculateRecordService;
import com.ycl.platform.service.IContractResultService;
import com.ycl.platform.service.IContractScoreService;
import com.ycl.platform.service.ITContractService;
import com.ycl.utils.DateUtils;
import com.ycl.utils.bean.BeanUtils;
+import enumeration.general.CalculateReportStatusEnum;
+import enumeration.general.PublishType;
import lombok.Data;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
@@ -16,6 +17,8 @@
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
+import java.util.Calendar;
+import java.util.Date;
import java.util.List;
/**
@@ -30,7 +33,7 @@
private final ITContractService contractService;
private final IContractScoreService contractScoreService;
private final IContractResultService checkResultService;
-
+ private final CalculateRecordMapper calculateRecordMapper;
private String startTime;
private String endTime;
@@ -38,7 +41,6 @@
* 姣忎釜鏈�1鍙锋墽琛岋紝缁熻鑰冩牳缁撴灉
*/
@Transactional
- // @PostConstruct //鍚姩鏃舵墽琛屼竴娆�
public void contractResultTask() {
// 鏌ヨ鏈夋晥鏈熷唴鐨勫悎鍚�
List<TContract> list = contractService.selectUsingContract();
@@ -47,11 +49,28 @@
// 涓婁釜鏈堟墸鍒嗚褰�
List<ContractScore> contractScore = contractScoreService.getDateRangeScoreByContractId(tContract.getId(), startTime, endTime);
// 鏂板鑰冩牳缁撴灉
+ //鑾峰彇涓婁釜鏈堟椂闂�
+ Calendar calendar = Calendar.getInstance();
+ calendar.add(Calendar.MONTH, -1);
ContractResult contractResult = getCheckResult(tContract, contractScore);
+ contractResult.setWhichMonth(calendar.get(Calendar.MONTH)+1);
+ contractResult.setWhichYear(calendar.get(Calendar.YEAR));
checkResultService.save(contractResult);
- // 鏂板鑰冩牳缁撴灉璁板綍
- List<ContractResultRecord> contractResultRecord = getContractResultRecord(contractScore, contractResult);
- checkResultService.saveBatchRecord(contractResultRecord);
+// // 鏂板鑰冩牳缁撴灉璁板綍
+// List<ContractResultRecord> contractResultRecord = getContractResultRecord(contractScore, contractResult);
+// checkResultService.saveBatchRecord(contractResultRecord);
+ // 鏂板鏍哥畻鏄庣粏璁板綍
+ CalculateRecord calculateRecord = new CalculateRecord();
+ //鏀逛负鐩存帴鍘绘煡
+// calculateRecord.setScore(contractResult.getScore());
+ calculateRecord.setContractId(Integer.parseInt(tContract.getId()+""));
+ calculateRecord.setCreateTime(new Date());
+ calculateRecord.setUpdateTime(new Date());
+ calculateRecord.setStatus(PublishType.UNPUBLISHED.getCode());
+
+ calculateRecord.setWhichYear(calendar.get(Calendar.YEAR));
+ calculateRecord.setWhichMonth(calendar.get(Calendar.MONTH)+1);
+ calculateRecordMapper.insert(calculateRecord);
}
}
@@ -87,7 +106,8 @@
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()));
+ //鏀逛负鐩存帴鍘绘煡
+// 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