bug修改

cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/ErrorCodeConstants.java

@@ -179,6 +179,7 @@ public interface ErrorCodeConstants {
 
     //=========== 工序信息 1-002-028-000 ============
     ErrorCode PROCESS_NOT_EXISTS = new ErrorCode(1_002_028_000, "工序不存在");
+    ErrorCode PROCESS_IS_ENABLED = new ErrorCode(1_002_028_000, "工序以启用，禁止关闭");
     ErrorCode PROCESS_ID_IS_NULL = new ErrorCode(1_002_028_000, "工序ID填写错误不存在");
     ErrorCode PROCESS_STATUS_DISABLE = new ErrorCode(1_002_028_000, "工序状态以已禁用");
 

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/process/ProcessGroupMapper.java

@@ -9,6 +9,8 @@ import com.cf.imes.module.system.dal.dataobject.process.ProcessGroupDO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * 工序组表 process_group Mapper
  *
@@ -32,4 +34,10 @@ public interface ProcessGroupMapper extends BaseMapperX<ProcessGroupDO> {
     ProcessDO selectOneById(@Param("id") Long id, @Param("organId") Long organId);
 
     int updateIsDefault(@Param("processGroupId") Long processGroupId, @Param("organId") Long organId);
+
+//    模糊匹配items
+    default List<ProcessGroupDO> selectListByItems(@Param("items") String items) {
+        return selectList(new LambdaQueryWrapperX<ProcessGroupDO>()
+                .likeIfPresent(ProcessGroupDO::getItems, items));
+    }
 }

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/process/ProcessMapper.java

@@ -42,9 +42,12 @@ public interface ProcessMapper extends BaseMapperX<ProcessDO> {
 
     ProcessDO selectOneById(@Param("id") Long id, @Param("organId") Long organId);
 
-    default List<ProcessDO> selectAll() {
+    default List<ProcessDO> selectAll(Long organId) {
         return selectList(new LambdaQueryWrapperX<ProcessDO>()
-                .orderByDesc(ProcessDO::getId));
+                .orderByDesc(ProcessDO::getId)
+                .eqIfPresent(ProcessDO::getOrganId, organId)
+                .eqIfPresent(ProcessDO::getIsEnabled, true));
     }
 
+    int deleteById(@Param("id") Long id);
 }

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/process/ProcessServiceImpl.java

@@ -7,6 +7,7 @@ import com.cf.imes.framework.organ.core.context.OrganContextHolder;
 import com.cf.imes.module.system.controller.admin.process.vo.process.*;
 import com.cf.imes.module.system.controller.admin.process.vo.processUser.ProcessAndUserSaveReqVO;
 import com.cf.imes.module.system.dal.dataobject.process.ProcessUserDO;
+import com.cf.imes.module.system.dal.mysql.process.ProcessGroupMapper;
 import com.cf.imes.module.system.enums.ErrorCodeConstants;
 import com.cf.imes.module.system.service.user.AdminUserService;
 import org.springframework.stereotype.Service;
@@ -41,6 +42,9 @@ public class ProcessServiceImpl implements ProcessService {
     @Resource
     private ProcessMapper processMapper;
 
+    @Resource
+    private ProcessGroupMapper processGroupMapper;
+
     @Resource
     private ProcessUserService processUserService;
 
@@ -84,7 +88,9 @@ public class ProcessServiceImpl implements ProcessService {
         // 校验存在
         validateProcessExists(updateReqVO.getId());
         if (updateReqVO.getIsEnabled()) {//为禁用
-            throw exception(PROCESS_STATUS_DISABLE);
+            if (isProcessUsed(String.valueOf(updateReqVO.getId()))){
+                throw exception(PROCESS_IS_ENABLED);
+            }
         }
 
         ProcessDO updateProcess = BeanUtils.toBean(updateReqVO, ProcessDO.class);
@@ -111,11 +117,23 @@ public class ProcessServiceImpl implements ProcessService {
         }
         processMapper.updateById(updateProcess);
     }
+//    判断此工序是否已在工序组中使用
+    public boolean isProcessUsed(String items) {
+        System.out.println("processGroupMapper.selectListByItems(items) " + processGroupMapper.selectListByItems(items));
+        System.out.println(processGroupMapper.selectListByItems(items) != null);
+        System.out.println(processGroupMapper.selectListByItems(items).size());
+        if (processGroupMapper.selectListByItems(items) != null)
+            return true;
+        return false;
+    }
 
     @Override
     public void deleteProcess(Long id) {
         // 校验存在
         validateProcessExists(id);
+        if (isProcessUsed(String.valueOf(id))){
+            throw exception(PROCESS_IS_ENABLED);
+        }
         // 删除
         processMapper.deleteById(id);
 
@@ -163,7 +181,9 @@ public class ProcessServiceImpl implements ProcessService {
 
     @Override
     public List<ProcessDO> getAllProcess() {
-        List<ProcessDO> processDOList = processMapper.selectAll();
+//        获取组织id
+        Long organId = OrganContextHolder.getOrganId();
+        List<ProcessDO> processDOList = processMapper.selectAll(organId);
         return processDOList;
     }
 

cf-module-system/cf-module-system-biz/src/main/resources/mapper/process/ProcessMapper.xml

@@ -67,4 +67,9 @@
         from process p
         where p.id = #{id} and p.organ_id = #{organId} and p.deleted = 0
     </select>
+
+    <delete id="deleteById" parameterType="java.lang.Long">
+        DELETE FROM process
+        WHERE id = #{id};
+    </delete>
 </mapper>