From 1a74c9c77b67ee5faa444e9671dcb2020e673341 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期二, 23 九月 2025 11:18:57 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeProjectServiceImpl.java | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeProjectServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeProjectServiceImpl.java
index 964898a..eb13641 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeProjectServiceImpl.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeProjectServiceImpl.java
@@ -16,6 +16,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.time.LocalDateTime;
import java.util.List;
/**
@@ -36,9 +37,12 @@
@Override
public List<OptimizeProject> listByState(OptimizeRequest optimizeRequest) {
//PP琛ㄦ湭寮�濮嬬殑宸ョ▼鍙�
+ // 璁＄畻浜屼釜鏈堝墠鐨勬椂闂�
+ LocalDateTime twoMonthAgo = LocalDateTime.now().minusMonths(2);
LambdaQueryWrapper<OptimizeProject> wrapper = new LambdaQueryWrapper<>();
wrapper.select(OptimizeProject::getProjectNo)
- .eq(OptimizeProject::getState, optimizeRequest.getState());
+ .eq(OptimizeProject::getState, optimizeRequest.getState())
+ .ge(OptimizeProject::getCreateTime, twoMonthAgo);
List<OptimizeProject> glass = this.list(wrapper);
//鏆傚仠鐨勫伐绋嬪彿
List<Engineering> engineerings = engineeringService.selectTask();
@@ -59,21 +63,21 @@
@Override
public void changeTask(String engineeringId, int state) {
UpdateWrapper<OptimizeProject> wrapper = new UpdateWrapper<>();
- wrapper.eq("project_no",engineeringId)
- .set("state",state);
+ wrapper.eq("project_no", engineeringId)
+ .set("state", state);
boolean updateSuccess = this.update(wrapper);
- log.info("宸ョ▼琛ㄦ洿鏂扮姸鎬亄}",updateSuccess);
+ log.info("宸ョ▼琛ㄦ洿鏂扮姸鎬亄}", updateSuccess);
}
@Override
public boolean overTask(UpPattenUsage sequence, int state) {
- if(sequence.getState()==100){
- UpdateWrapper<OptimizeProject> wrapper=new UpdateWrapper<>();
- wrapper.eq("project_no",sequence.getEngineeringId())
- .set("state",state);
+ if (sequence.getState() == 100) {
+ UpdateWrapper<OptimizeProject> wrapper = new UpdateWrapper<>();
+ wrapper.eq("project_no", sequence.getEngineeringId())
+ .set("state", state);
boolean updateSuccess = this.update(wrapper);
- log.info("宸ョ▼瀹屾垚鏇存柊鐘舵�亄}",updateSuccess);
+ log.info("宸ョ▼瀹屾垚鏇存柊鐘舵�亄}", updateSuccess);
}
return false;
}
@@ -82,7 +86,7 @@
public List<OptimizeProject> getDoingTask() {
QueryWrapper<OptimizeProject> wrapper = new QueryWrapper<>();
wrapper.select("project_no,project_name")
- .eq("state",200);
+ .eq("state", 200);
return this.list(wrapper);
}
--
Gitblit v1.8.0