From 090a241e42feb11f34d3e3678c04f2234a9ca791 Mon Sep 17 00:00:00 2001 From: lym <1994302445@qq.com> Date: Fri, 8 Mar 2024 10:40:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=BA=8F=E6=8E=A5=E5=8F=A3=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/order/OrderServiceImpl.java | 1 - .../admin/process/ProcessController.java | 8 ++++++ .../dal/mysql/process/ProcessMapper.java | 7 +++++ .../service/process/ProcessService.java | 7 +++++ .../service/process/ProcessServiceImpl.java | 28 +++++++++++-------- 5 files changed, 38 insertions(+), 13 deletions(-) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java index f8d4f07a3..d2351b229 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java @@ -47,7 +47,6 @@ public class OrderServiceImpl implements OrderService { * 1、解析文件 * */ - // 插入 OrderDO order = BeanUtils.toBean(createReqVO, OrderDO.class); orderMapper.insert(order); diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/process/ProcessController.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/process/ProcessController.java index 882f9cd5a..c5d687d12 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/process/ProcessController.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/process/ProcessController.java @@ -95,4 +95,12 @@ public class ProcessController { BeanUtils.toBean(list, ProcessRespVO.class)); } + @GetMapping("/getAll") + @Operation(summary = "获得所有工序信息") + @PreAuthorize("@ss.hasPermission('system:process:query')") + public CommonResult> getAllProcess() { + List processUser = processService.getAllProcess(); + return success(BeanUtils.toBean(processUser, ProcessDO.class)); + } + } \ No newline at end of file diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/process/ProcessMapper.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/process/ProcessMapper.java index 124f02a16..854234692 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/process/ProcessMapper.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/process/ProcessMapper.java @@ -7,6 +7,8 @@ import com.cf.imes.module.system.controller.admin.process.vo.process.ProcessPage import com.cf.imes.module.system.dal.dataobject.process.ProcessDO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 工序信息表 process Mapper * @@ -33,4 +35,9 @@ public interface ProcessMapper extends BaseMapperX { .orderByDesc(ProcessDO::getId)); } + default List selectAll() { + return selectList(new LambdaQueryWrapperX() + .orderByDesc(ProcessDO::getId)); + } + } \ No newline at end of file diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/process/ProcessService.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/process/ProcessService.java index a03a33f45..6f186174e 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/process/ProcessService.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/process/ProcessService.java @@ -8,6 +8,7 @@ import com.cf.imes.module.system.dal.dataobject.process.ProcessDO; import com.cf.imes.framework.common.pojo.PageResult; import javax.validation.Valid; +import java.util.List; /** * 工序信息表 process Service 接口 @@ -54,4 +55,10 @@ public interface ProcessService { */ PageResult getProcessPage(ProcessPageReqVO pageReqVO); + /** + * 获得所有工序信息表 process + * + * @return 工序信息表 process + */ + List getAllProcess(); } \ No newline at end of file diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/process/ProcessServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/process/ProcessServiceImpl.java index a709cee39..446400ea7 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/process/ProcessServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/process/ProcessServiceImpl.java @@ -74,19 +74,17 @@ public class ProcessServiceImpl implements ProcessService { // 校验存在 validateProcessExists(updateReqVO.getId()); ProcessDO updateProcess = BeanUtils.toBean(updateReqVO, ProcessDO.class); - System.out.println("pppppppppppppppppppp" + updateProcess); - // 更新工序信息 - int updateProcessObj = processMapper.updateById(updateProcess); + processUserService.deleteProcessUserByProcess(updateReqVO.getId()); -// if(updateReqVO.getUsers() != null){ -// String[] usersId = updateReqVO.getUsers().split(","); -// for (String user : usersId) { -// ProcessAndUserSaveReqVO processAndUserSaveReqVO = new ProcessAndUserSaveReqVO(); -// processAndUserSaveReqVO.setProcessId(updateReqVO.getId()); -// processAndUserSaveReqVO.setUserId(Long.parseLong(user)); -// processUserService.createProcessUser(processAndUserSaveReqVO); -// } -// } + if(updateReqVO.getUsers() != null && updateReqVO.getUsers() != ""){ + String[] usersId = updateReqVO.getUsers().split(","); + for (String user : usersId) { + ProcessAndUserSaveReqVO processAndUserSaveReqVO = new ProcessAndUserSaveReqVO(); + processAndUserSaveReqVO.setProcessId(updateReqVO.getId()); + processAndUserSaveReqVO.setUserId(Long.parseLong(user)); + processUserService.createProcessUser(processAndUserSaveReqVO); + } + } processMapper.updateById(updateProcess); } @@ -128,4 +126,10 @@ public class ProcessServiceImpl implements ProcessService { return processMapper.selectPage(pageReqVO); } + @Override + public List getAllProcess() { + List processDOList = processMapper.selectAll(); + return processDOList; + } + } \ No newline at end of file