From 112ff5924fd5f6114c1562af60ca16e6eba6f7fb Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 27 十月 2025 08:34:50 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/YiWuProject
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeProjectServiceImpl.java | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 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..f705d85 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;
@@ -8,6 +9,7 @@
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,7 +20,6 @@
import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime;
-import java.util.Date;
import java.util.List;
/**
@@ -42,7 +43,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 +55,7 @@
Engineering engineering = engineerings.get(i);
OptimizeProject newProject = new OptimizeProject();
newProject.setProjectNo(engineering.getEngineerId());
+ newProject.setProjectName(engineering.getEngineerName());
// 灏嗘柊鍒涘缓鐨� OptimizeProject 瀵硅薄娣诲姞鍒� glass 鍒楄〃涓�
glass.add(newProject);
}
@@ -104,7 +106,7 @@
@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);
@@ -114,10 +116,21 @@
project.setState(100);
project.setId(null); // 娓呴櫎ID
});
-
- // 3. 鎵归噺鎻掑叆鏂版暟鎹�
- baseMapper.batchInsert(projectList);
+ if (CollectionUtils.isNotEmpty(projectList)) {
+ // 3. 鎵归噺鎻掑叆鏂版暟鎹�
+ 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