From 855009dc2173e9ddefcfc4b3901fbe255fe82752 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期五, 27 三月 2026 16:56:51 +0800
Subject: [PATCH] yys 1.修改bug
---
src/main/java/com/ruoyi/production/service/impl/ProductProcessServiceImpl.java | 106 +++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 103 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductProcessServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductProcessServiceImpl.java
index 6a8cf73..4aa7cdb 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductProcessServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductProcessServiceImpl.java
@@ -2,27 +2,50 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.basic.pojo.Customer;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.production.dto.ProductProcessDto;
+import com.ruoyi.production.dto.SysDeptAndUserDto;
+import com.ruoyi.production.mapper.ProcessRouteItemMapper;
import com.ruoyi.production.mapper.ProductProcessMapper;
+import com.ruoyi.production.mapper.ProductProcessRouteItemMapper;
+import com.ruoyi.production.pojo.ProcessRouteItem;
import com.ruoyi.production.pojo.ProductProcess;
+import com.ruoyi.production.pojo.ProductProcessRouteItem;
import com.ruoyi.production.service.ProductProcessService;
+import com.ruoyi.project.system.domain.SysDept;
+import com.ruoyi.project.system.domain.SysUser;
+import com.ruoyi.project.system.mapper.SysDeptMapper;
+import com.ruoyi.project.system.mapper.SysUserDeptMapper;
+import com.ruoyi.project.system.mapper.SysUserMapper;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import org.springframework.web.multipart.MultipartFile;
+import java.util.ArrayList;
import java.util.List;
@Service
public class ProductProcessServiceImpl extends ServiceImpl<ProductProcessMapper, ProductProcess> implements ProductProcessService {
@Autowired
private ProductProcessMapper productProcessMapper;
+ @Autowired
+ private ProcessRouteItemMapper processRouteItemMapper;
+ @Autowired
+ private ProductProcessRouteItemMapper productProcessRouteItemMapper;
+
+ @Autowired
+ private SysDeptMapper sysDeptMapper;
+ @Autowired
+ private SysUserDeptMapper sysUserDeptMapper;
+ @Autowired
+ private SysUserMapper sysUserMapper;
@Override
public IPage<ProductProcessDto> listPage(Page page, ProductProcessDto productProcessDto) {
@@ -34,7 +57,7 @@
ProductProcess productProcess = new ProductProcess();
BeanUtils.copyProperties(productProcessDto,productProcess);
boolean save = productProcessMapper.insert(productProcess) > 0;
- if (save && ObjectUtils.isNotNull(productProcessDto.getNo())) {
+ if (save && ObjectUtils.isNull(productProcessDto.getNo())) {
// 鏍规嵁id鐢熸垚no瀛楁锛欸X + 8浣嶆暟瀛楋紙涓嶈冻8浣嶅墠闈㈣ˉ0锛�
String no = "GX" + String.format("%08d", productProcess.getId());
productProcess.setNo(no);
@@ -42,7 +65,7 @@
productProcessMapper.updateById(productProcess);
return AjaxResult.success();
}
- return AjaxResult.error();
+ return AjaxResult.success();
}
@Override
@@ -53,11 +76,88 @@
if(CollectionUtils.isEmpty(productProcessList)){
return AjaxResult.warn("妯℃澘閿欒鎴栧鍏ユ暟鎹负绌�");
}
+ productProcessList.forEach(productProcess -> {
+ if (ObjectUtils.isEmpty(productProcess)) {
+ throw new RuntimeException("浣跨敤妯℃澘杩涜瀵煎叆");
+ }
+ if (ObjectUtils.isEmpty(productProcess.getName())) {
+ throw new RuntimeException("宸ュ簭鍚嶇О涓嶈兘涓虹┖");
+ }
+ });
this.saveOrUpdateBatch(productProcessList);
return AjaxResult.success(true);
}catch (Exception e){
e.printStackTrace();
- return AjaxResult.error("瀵煎叆澶辫触");
+ return AjaxResult.error(e.getMessage());
}
}
+
+ @Override
+ public String batchDelete(List<Integer> ids) {
+ //鏌ヨ鏄惁鐢熶骇涓凡缁忓紩鐢ㄤ簡杩欎簺宸ュ簭
+ List<ProcessRouteItem> processRouteItems = processRouteItemMapper.selectList(Wrappers.<ProcessRouteItem>lambdaQuery().in(ProcessRouteItem::getProcessId, ids));
+ List<ProductProcessRouteItem> productProcessRouteItems = productProcessRouteItemMapper.selectList(Wrappers.<ProductProcessRouteItem>lambdaQuery().in(ProductProcessRouteItem::getProcessId, ids));
+ if (!CollectionUtils.isEmpty(processRouteItems) || !CollectionUtils.isEmpty(productProcessRouteItems)){
+ throw new RuntimeException("璇ュ伐搴忓凡缁忚浣跨敤锛屾棤娉曞垹闄�");
+ }
+ productProcessMapper.deleteBatchIds(ids);
+ return null;
+ }
+
+ public List<SysDeptAndUserDto> listDeptUserTree() {
+ return buildDeptUserTree();
+ }
+
+
+ /**
+ * 鏋勫缓瀹屾暣鐨勯儴闂�-鐢ㄦ埛鏍戝舰缁撴瀯
+ */
+ public List<SysDeptAndUserDto> buildDeptUserTree() {
+ // 1. 鏌ヨ鎵�鏈夋牴閮ㄩ棬锛坧arent_id = 0锛�
+ List<SysDeptAndUserDto> rootDeptList = sysDeptMapper.selectChildrenDeptByParentId(0L);
+
+ // 2. 閫掑綊鏋勫缓姣忎釜鏍归儴闂ㄧ殑瀛愯妭鐐癸紝骞舵寕杞界敤鎴�
+ for (SysDeptAndUserDto rootDept : rootDeptList) {
+ buildChildrenDept(rootDept);
+ loadDeptUser(rootDept);
+ }
+
+ return rootDeptList;
+ }
+
+ /**
+ * 閫掑綊鏋勫缓瀛愰儴闂�
+ */
+ private void buildChildrenDept(SysDeptAndUserDto parentDept) {
+ // 鏌ヨ褰撳墠閮ㄩ棬鐨勫瓙閮ㄩ棬
+ List<SysDeptAndUserDto> childrenDept = sysDeptMapper.selectChildrenDeptByParentId(parentDept.getDeptId());
+ if (childrenDept == null || childrenDept.isEmpty()) {
+ parentDept.setChildrenList(new ArrayList<>());
+ return;
+ }
+
+ // 涓烘瘡涓瓙閮ㄩ棬閫掑綊鏋勫缓涓嬬骇锛屽苟鎸傝浇鐢ㄦ埛
+ for (SysDeptAndUserDto childDept : childrenDept) {
+ buildChildrenDept(childDept);
+ loadDeptUser(childDept);
+ }
+
+ parentDept.setChildrenList(childrenDept);
+ }
+
+ /**
+ * 涓洪儴闂ㄥ姞杞藉叧鑱旂殑鐢ㄦ埛
+ */
+ private void loadDeptUser(SysDeptAndUserDto dept) {
+ // 鏌ヨ閮ㄩ棬鍏宠仈鐨勭敤鎴稩D
+ List<Long> userIdList = sysUserDeptMapper.selectUserIdByDeptId(dept.getDeptId());
+ if (userIdList == null || userIdList.isEmpty()) {
+ dept.setUserList(new ArrayList<>());
+ return;
+ }
+
+ // 鏍规嵁鐢ㄦ埛ID鏌ヨ鐢ㄦ埛淇℃伅
+ List<SysUser> userList = sysUserMapper.selectUserListByIds(userIdList);
+ dept.setUserList(userList);
+ }
}
--
Gitblit v1.9.3