From dda4c08d41693d2495a13e7db230c3e9747540de Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期二, 02 九月 2025 10:33:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master
---
service/src/main/java/com/ruoyi/cwgl/service/impl/KeyCollectionInfoServiceImpl.java | 38 ++++++++++++++++++++++++++++++++++++++
1 files changed, 38 insertions(+), 0 deletions(-)
diff --git a/service/src/main/java/com/ruoyi/cwgl/service/impl/KeyCollectionInfoServiceImpl.java b/service/src/main/java/com/ruoyi/cwgl/service/impl/KeyCollectionInfoServiceImpl.java
index 8d2ea1a..f450d72 100644
--- a/service/src/main/java/com/ruoyi/cwgl/service/impl/KeyCollectionInfoServiceImpl.java
+++ b/service/src/main/java/com/ruoyi/cwgl/service/impl/KeyCollectionInfoServiceImpl.java
@@ -1,8 +1,16 @@
package com.ruoyi.cwgl.service.impl;
+import java.util.Date;
import java.util.List;
import javax.annotation.Resource;
+
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.cwgl.domain.RequestLog;
+import com.ruoyi.cwgl.domain.dto.TakeReviewDto;
+import com.ruoyi.cwgl.service.IRequestLogService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.stereotype.Service;
import org.springframework.scheduling.annotation.Async;
@@ -32,6 +40,7 @@
protected final Logger logger = LoggerFactory.getLogger(getClass());
@Resource
private KeyCollectionInfoMapper keyCollectionInfoMapper;
+
/**
@@ -176,4 +185,33 @@
{
return keyCollectionInfoMapper.deleteKeyCollectionInfoById(id);
}
+
+ @DataSource(DataSourceType.CWSJ)
+ @Override
+ public KeyCollectionInfo selectCwData(TakeReviewDto takeReviewDto) {
+ return keyCollectionInfoMapper.selectCwData(takeReviewDto);
+ }
+
+ @Override
+ public AjaxResult takeReview(KeyCollectionInfo keyCollectionInfo) {
+ if (keyCollectionInfo == null) {
+ return AjaxResult.error("鏌ユ棤绗﹀悎瑕佹眰鐨勮皟搴﹀崟锛岃鑱旂郴璋冨害浜哄憳",3);
+ }
+ keyCollectionInfoMapper.insertKeyCollectionInfo(keyCollectionInfo);
+
+
+ //璋冨害瓒呮椂
+ Integer schedulingTimeout = keyCollectionInfo.getSchedulingTimeout();
+ if(schedulingTimeout>5){
+ return AjaxResult.error("璋冨害瓒呮椂涓嬪崟锛岃秴鏃�"+schedulingTimeout+"涓皬鏃�",3);
+
+ }
+ Integer keyTimeout = keyCollectionInfo.getKeyTimeout();
+ if (keyTimeout!=null && keyTimeout>24){
+ Date estimatedDepartureTime = keyCollectionInfo.getEstimatedDepartureTime();
+ String dateToStr = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, estimatedDepartureTime);
+ return AjaxResult.error("瑕佹眰鍑哄彂鏃堕棿"+ dateToStr+"锛岄鍙栭挜鍖欒秴鏃�"+keyTimeout+"涓皬鏃�");
+ }
+ return AjaxResult.success("鎴愬姛",2);
+ }
}
--
Gitblit v1.8.0