工序接口添加

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);

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<List<ProcessDO>> getAllProcess() {
+        List<ProcessDO> processUser = processService.getAllProcess();
+        return success(BeanUtils.toBean(processUser, ProcessDO.class));
+    }
+
 }

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<ProcessDO> {
                 .orderByDesc(ProcessDO::getId));
     }
 
+    default List<ProcessDO> selectAll() {
+        return selectList(new LambdaQueryWrapperX<ProcessDO>()
+                .orderByDesc(ProcessDO::getId));
+    }
+
 }

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<ProcessDO> getProcessPage(ProcessPageReqVO pageReqVO);
 
+    /**
+     * 获得所有工序信息表 process
+     *
+     * @return 工序信息表 process
+     */
+    List<ProcessDO> getAllProcess();
 }

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){
+        if(updateReqVO.getUsers() != null && updateReqVO.getUsers() != ""){
-//            String[] usersId = updateReqVO.getUsers().split(",");
+            String[] usersId = updateReqVO.getUsers().split(",");
-//            for (String user : usersId) {
+            for (String user : usersId) {
-//                ProcessAndUserSaveReqVO processAndUserSaveReqVO = new ProcessAndUserSaveReqVO();
+                ProcessAndUserSaveReqVO processAndUserSaveReqVO = new ProcessAndUserSaveReqVO();
-//                processAndUserSaveReqVO.setProcessId(updateReqVO.getId());
+                processAndUserSaveReqVO.setProcessId(updateReqVO.getId());
-//                processAndUserSaveReqVO.setUserId(Long.parseLong(user));
+                processAndUserSaveReqVO.setUserId(Long.parseLong(user));
-//                processUserService.createProcessUser(processAndUserSaveReqVO);
+                processUserService.createProcessUser(processAndUserSaveReqVO);
-//            }
+            }
-//        }
+        }
         processMapper.updateById(updateProcess);
     }
 
@@ -128,4 +126,10 @@ public class ProcessServiceImpl implements ProcessService {
         return processMapper.selectPage(pageReqVO);
     }
 
+    @Override
+    public List<ProcessDO> getAllProcess() {
+        List<ProcessDO> processDOList = processMapper.selectAll();
+        return processDOList;
+    }
+
 }