From 2fe150d7351d329fd1bae4f8ef9cbdfc9c172362 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 29 十月 2025 17:48:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeProjectServiceImpl.java | 104 ++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 97 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 dbd645e..f6c14db 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,13 +1,17 @@
package com.mes.pp.service.impl;
+import cn.smallbun.screw.core.util.CollectionUtils;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.github.yulichang.base.MPJBaseServiceImpl;
+import com.mes.engineerScheduling.entity.EngineerScheduling;
+import com.mes.engineerScheduling.service.EngineerSchedulingService;
import com.mes.engineering.entity.Engineering;
import com.mes.engineering.service.EngineeringService;
import com.mes.pp.entity.OptimizeProject;
+import com.mes.pp.entity.dto.ProgressDTO;
import com.mes.pp.entity.request.OptimizeRequest;
import com.mes.pp.mapper.OptimizeProjectMapper;
import com.mes.pp.service.OptimizeProjectService;
@@ -18,8 +22,11 @@
import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime;
-import java.util.Date;
+import java.util.ArrayList;
+import java.util.HashSet;
import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
/**
* <p>
@@ -35,6 +42,8 @@
public class OptimizeProjectServiceImpl extends MPJBaseServiceImpl<OptimizeProjectMapper, OptimizeProject> implements OptimizeProjectService {
@Autowired
private EngineeringService engineeringService;
+ @Autowired
+ private EngineerSchedulingService engineerSchedulingService;
@Override
public List<OptimizeProject> listByState(OptimizeRequest optimizeRequest) {
@@ -42,7 +51,7 @@
// 璁＄畻浜屼釜鏈堝墠鐨勬椂闂�
LocalDateTime twoMonthAgo = LocalDateTime.now().minusMonths(2);
LambdaQueryWrapper<OptimizeProject> wrapper = new LambdaQueryWrapper<>();
- wrapper.select(OptimizeProject::getProjectNo)
+ wrapper.select(OptimizeProject::getProjectNo, OptimizeProject::getProjectName)
.eq(OptimizeProject::getState, optimizeRequest.getState())
.ge(OptimizeProject::getCreateTime, twoMonthAgo);
List<OptimizeProject> glass = this.list(wrapper);
@@ -54,6 +63,7 @@
Engineering engineering = engineerings.get(i);
OptimizeProject newProject = new OptimizeProject();
newProject.setProjectNo(engineering.getEngineerId());
+ newProject.setProjectName(engineering.getEngineerName());
// 灏嗘柊鍒涘缓鐨� OptimizeProject 瀵硅薄娣诲姞鍒� glass 鍒楄〃涓�
glass.add(newProject);
}
@@ -104,20 +114,100 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public List<OptimizeProject> updateEngineerScheduling(Integer type , List<OptimizeProject> projectList) {
+ public List<OptimizeProject> updateEngineerScheduling(Integer type, List<OptimizeProject> projectList) {
// 1. 鍒犻櫎瀵瑰簲绫诲瀷鐨勬暟鎹�
baseMapper.deleteByType(type);
-
// 2. 璁剧疆鍊�
projectList.forEach(project -> {
project.setType(type);
project.setState(100);
project.setId(null); // 娓呴櫎ID
});
-
- // 3. 鎵归噺鎻掑叆鏂版暟鎹�
- baseMapper.batchInsert(projectList);
+ if (CollectionUtils.isNotEmpty(projectList)) {
+ // 3. 鎵归噺鎻掑叆鏂版暟鎹�
+ baseMapper.batchInsert(projectList);
+ }
return projectList;
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ @DS("north_glass_mes")
+ public List<OptimizeProject> updateCuttingLayout(Integer type, List<OptimizeProject> projectList) {
+ //鑾峰彇褰撳墠閽㈠寲鎺掔増淇℃伅
+ List<EngineerScheduling> engineerScheduling = engineerSchedulingService.queryByType(3);
+ List<EngineerScheduling> cutting = new ArrayList<>();
+ if(type==1){
+ cutting = engineerSchedulingService.queryByType(2);
+ }else {
+ cutting = engineerSchedulingService.queryByType(1);
+ }
+ //淇濆瓨鏂板閽㈠寲鎺掔増淇℃伅
+ List<EngineerScheduling> newSchedulingList = new ArrayList<>();
+ Set<String> existingProjectNoSet = engineerScheduling.stream()
+ .map(EngineerScheduling::getProjectNo)
+ .collect(Collectors.toSet());
+ // 鑾峰彇褰撳墠鎺掔増鏂板宸ョ▼
+ for (OptimizeProject project : projectList) {
+ String projectNo = project.getProjectNo();
+ // 宸ョ▼鍙烽潪绌猴紝涓斾笉鍦ㄥ凡鏈夐挗鍖栨帓浜ф暟鎹腑
+ if (projectNo != null && !existingProjectNoSet.contains(projectNo)) {
+ EngineerScheduling newEs = new EngineerScheduling();
+ newEs.setProjectNo(projectNo);
+ newEs.setProjectName(project.getProjectName());
+ newEs.setType(3);
+ newEs.setState(100);
+ newSchedulingList.add(newEs);
+ }
+ }
+ //鑾峰彇褰撳墠鎺掔増鍙栨秷宸ョ▼
+ Set<String> cuttingProjectNos = new HashSet<>();
+ for (EngineerScheduling es : cutting) {
+ if (es.getProjectNo() != null) { // 閬垮厤绌烘寚閽�
+ cuttingProjectNos.add(es.getProjectNo());
+ }
+ }
+ engineerScheduling = engineerScheduling.stream()
+ .filter(es -> es.getProjectNo() == null || !cuttingProjectNos.contains(es.getProjectNo()))
+ .collect(Collectors.toList());
+ //1鍙风嚎閽㈠寲鏁版嵁瀵规瘮1鍙风嚎鍒囧壊鏁版嵁
+ Set<String> projectNoSet2 = new HashSet<>();
+ for (OptimizeProject project : projectList) {
+ String projectNo = project.getProjectNo();
+ if (projectNo != null) { // 閬垮厤绌烘寚閽�
+ projectNoSet2.add(projectNo);
+ }
+ }
+ // 2. 绛涢�夊苟鏀堕泦绗﹀悎鏉′欢鐨勫伐绋嬪彿锛圫tring绫诲瀷锛夊埌 List<String>
+ List<String> missingProjectNos = engineerScheduling.stream()
+ .map(EngineerScheduling::getProjectNo) // 鎻愬彇 engineerScheduling 涓殑宸ョ▼鍙�
+ .filter(esProjectNo -> esProjectNo != null // 鎺掗櫎绌哄伐绋嬪彿
+ && !projectNoSet2.contains(esProjectNo)) // 鎺掗櫎 projectList 涓瓨鍦ㄧ殑宸ョ▼鍙�
+ .collect(Collectors.toList()); // 鏀堕泦缁撴灉鍒� List<String>
+ for (OptimizeProject project : projectList) {
+ project.setType(type);
+ project.setState(100);
+ }
+ //鏂板閽㈠寲鎺掔増鏁版嵁
+ engineerSchedulingService.saveBatch(newSchedulingList);
+ //鏇存柊宸插彇娑堢殑閽㈠寲鎺掔増鐘舵��
+ if(CollectionUtils.isNotEmpty(missingProjectNos)){
+ engineerSchedulingService.updateState(missingProjectNos);
+ }
+ //鍙栨秷褰撳墠绫诲瀷鐨勫伐绋嬫帓浜т俊鎭�
+ engineerSchedulingService.updateByType(type);
+ //淇濆瓨褰撳墠鏂板垏鍓叉帓鐗堟暟鎹�
+ baseMapper.batchInsert(projectList);
+ return projectList;
+ }
+
+ @Override
+ public void deleteengineerSchedulingByid(String engineerId, List<Integer> types) {
+ baseMapper.deleteByScheduling(engineerId, types);
+ }
+
+ @Override
+ public List<ProgressDTO> selectProgress(String engineerId) {
+ return baseMapper.selectProgress(engineerId);
+ }
}
--
Gitblit v1.8.0