From 261698358e2b756a61e992bc1651e01b3f45290b Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 23 十月 2025 16:50:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeProjectServiceImpl.java | 38 +++++++++++++++++++++++++++++++++++++-
1 files changed, 37 insertions(+), 1 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 eb13641..de60a35 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,5 +1,6 @@
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;
@@ -15,6 +16,7 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime;
import java.util.List;
@@ -40,7 +42,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);
@@ -52,6 +54,7 @@
Engineering engineering = engineerings.get(i);
OptimizeProject newProject = new OptimizeProject();
newProject.setProjectNo(engineering.getEngineerId());
+ newProject.setProjectName(engineering.getEngineerName());
// 灏嗘柊鍒涘缓鐨� OptimizeProject 瀵硅薄娣诲姞鍒� glass 鍒楄〃涓�
glass.add(newProject);
}
@@ -90,5 +93,38 @@
return this.list(wrapper);
}
+ @Override
+ public List<OptimizeProject> queryEngineer() {
+ return this.baseMapper.queryEngineer();
+ }
+ @Override
+ public List<OptimizeProject> engineerScheduling(OptimizeProject optimizeProject) {
+ return this.baseMapper.engineerScheduling(optimizeProject);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ 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
+ });
+ if (CollectionUtils.isNotEmpty(projectList)) {
+ // 3. 鎵归噺鎻掑叆鏂版暟鎹�
+ baseMapper.batchInsert(projectList);
+ }
+
+ return projectList;
+ }
+
+ @Override
+ public void deleteengineerSchedulingByid(String engineerId, List<Integer> types) {
+ baseMapper.deleteByScheduling(engineerId, types);
+ }
}
--
Gitblit v1.8.0