From 08bae96ce03625f054f3977147a7e9861c51209d Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期五, 28 六月 2024 08:21:52 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeProjectServiceImpl.java | 50 ++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 48 insertions(+), 2 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 d09f0a9..22f9d8e 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
@@ -1,11 +1,19 @@
package com.mes.pp.service.impl;
import com.baomidou.dynamic.datasource.annotation.DS;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.github.yulichang.base.MPJBaseServiceImpl;
import com.mes.pp.entity.OptimizeProject;
+import com.mes.pp.entity.request.OptimizeRequest;
import com.mes.pp.mapper.OptimizeProjectMapper;
import com.mes.pp.service.OptimizeProjectService;
+import com.mes.uppattenusage.entity.UpPattenUsage;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
+
+import java.util.List;
/**
* <p>
@@ -17,6 +25,44 @@
*/
@Service
@DS("pp")
-public class OptimizeProjectServiceImpl extends ServiceImpl<OptimizeProjectMapper, OptimizeProject> implements OptimizeProjectService {
+@Slf4j
+public class OptimizeProjectServiceImpl extends MPJBaseServiceImpl<OptimizeProjectMapper, OptimizeProject> implements OptimizeProjectService {
+
+ @Override
+ public List<OptimizeProject> listByState(OptimizeRequest optimizeRequest) {
+ //灏嗗弬鏁颁紶鍏ュ埌鏌ヨ绫婚噷,宸ョ▼鍙峰仛闈炵┖鍒ゆ柇妯＄硦鏌ヨ
+ LambdaQueryWrapper<OptimizeProject> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(OptimizeProject::getState,optimizeRequest.getState())
+ .or(qw -> qw.eq(OptimizeProject::getState, 200))
+ .like(StringUtils.isNotBlank(optimizeRequest.getProjectNo()),OptimizeProject::getProjectNo,optimizeRequest.getProjectNo())
+ //.groupBy(OptimizeProject::getProjectNo)
+ ;
+ //杩斿洖宸ョ▼淇℃伅
+ return this.list(wrapper);
+ }
+
+
+ @Override
+ public void changeTask(String engineeringId, int state) {
+ UpdateWrapper<OptimizeProject> wrapper = new UpdateWrapper<>();
+ wrapper.eq("project_no",engineeringId)
+ .set("state",state);
+ boolean updateSuccess = this.update(wrapper);
+ 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);
+ boolean updateSuccess = this.update(wrapper);
+ log.info("宸ョ▼瀹屾垚鏇存柊鐘舵�亄}",updateSuccess);
+ }
+ return false;
+ }
+
}
--
Gitblit v1.8.0