From 7357691a222745887ca1c336d8c458964a0d3ab8 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期五, 19 四月 2024 11:18:21 +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 | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 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 4ec8d74..91f35f3 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
@@ -8,9 +8,13 @@
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 com.mes.uppattenusage.mapper.UpPattenUsageMapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import java.util.Collections;
import java.util.List;
/**
@@ -26,14 +30,15 @@
@Slf4j
public class OptimizeProjectServiceImpl extends ServiceImpl<OptimizeProjectMapper, OptimizeProject> implements OptimizeProjectService {
-
+ @Resource
+ UpPattenUsageMapper upPattenUsageMapper;
@Override
public List<OptimizeProject> listByState(OptimizeRequest optimizeRequest) {
log.info("灏嗗弬鏁颁紶鍏ュ埌鏌ヨ绫婚噷,宸ョ▼鍙峰仛闈炵┖鍒ゆ柇妯＄硦鏌ヨ");
LambdaQueryWrapper<OptimizeProject> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(OptimizeProject::getState, optimizeRequest.getState())
- .like(StringUtils.isNotBlank(optimizeRequest.getProjectNo()), OptimizeProject::getProjectNo, optimizeRequest.getProjectNo())
- //.groupBy(OptimizeProject::getProjectNo)
+ wrapper.eq(OptimizeProject::getState,optimizeRequest.getState())
+ .like(StringUtils.isNotBlank(optimizeRequest.getProjectNo()),OptimizeProject::getProjectNo,optimizeRequest.getProjectNo())
+ //.groupBy(OptimizeProject::getProjectNo)
;
log.info("杩斿洖宸ョ▼淇℃伅");
return this.list(wrapper);
@@ -41,12 +46,19 @@
@Override
- public void insetProject(OptimizeProject glass) {
-
+ public void insetupPattenUsage(List<OptimizeProject> glass) {
+ log.info("寰幆鏌ヨ缁撴灉淇濆瓨鍒癠pPattenUsage琛ㄤ腑");
+ for (OptimizeProject project : glass) {
+ UpPattenUsage upPattenUsage = new UpPattenUsage();
+ upPattenUsage.setEngineeringId(project.getProjectNo());
+ upPattenUsage.setFilmsId(project.getGlassType());
+ upPattenUsage.setState(project.getState());
+ upPattenUsageMapper.insert(upPattenUsage);
+ }
}
@Override
- public List<OptimizeProject> saveProject(OptimizeRequest optimizeRequest) {
+ public List<OptimizeProject> selectSaveProject(OptimizeRequest optimizeRequest) {
log.info("灏嗗弬鏁颁紶鍏ュ埌鏌ヨ绫婚噷,宸ョ▼鍙峰仛闈炵┖鍒ゆ柇妯＄硦鏌ヨ");
log.info("杩斿洖宸ョ▼淇℃伅");
--
Gitblit v1.8.0