工单来源修改，重新发起时业务线不一致时删除旧的附件

颜惠青
1 parent d586265e
Showing 7 changed files with 81 additions and 4 deletions
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/aop/InspectorBuzStatusUpdateAspect.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmAIServiceImpl.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmGardenService.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmGardenServiceImpl.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmInspectorServiceImpl.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmRegionMgrServiceImpl.java
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmUniversalServiceImpl.java
@@ -117,6 +117,14 @@ public class InspectorBuzStatusUpdateAspect {
             targeVO.setRoadId(reqVO.getRoadId());
             targeVO.setPressingType(reqVO.getPressingType());
             targeVO.setExpectedFinishDate(reqVO.getExpectedFinishDate());
+            if(!dbData.getBusiLine().equals(reqVO.getBusiLine())){//如果前端业务线和数据库不一致
+                //删除原来的
+                gardenService.deleteAttachement(BpmCommonConstant.PROBLEM_IMG_GROUP,targeVO.getOrderNo(),dbData.getBusiLine());
+            }
+            List<String> problemsImgs = reqVO.getProblemsImgs();
+            if(ObjectUtils.isNotAllEmpty(problemsImgs) && problemsImgs.size()>0){
+                gardenService.attachmentInsertOrUpdate(problemsImgs,BpmCommonConstant.PROBLEM_IMG_GROUP,targeVO);
+            }
         }
         //大区经理退回
@@ -152,7 +160,7 @@ public class InspectorBuzStatusUpdateAspect {
             targeVO.setWoSourceName(roleList.get(0).getName());
             String busiLine = reqVO.getBusiLine();
             if(StringUtil.isEmpty(busiLine)){
-                busiLine = SecurityFrameworkUtils.getBusiLine();
+                busiLine = dbData.getBusiLine();
             }
             targeVO.setBusiLine(busiLine);
             targeVO.setUserId(SecurityFrameworkUtils.getLoginUserId());
@@ -147,8 +147,17 @@ public class BpmAIServiceImpl implements BpmAIService{
         workOrder.setCompanyId(SecurityFrameworkUtils.getCompanyId());
         workOrder.setDeptId(SecurityFrameworkUtils.getDeptId());
-        workOrder.setSourceId(EventSourceEnum.AI.getCode());
-        workOrder.setSourceName(EventSourceEnum.AI.getDesc());
+
+        Integer sourceId = createRequestVo.getSourceId();
+        String sourceName = createRequestVo.getSourceName();
+        if(!ObjectUtils.isNotAllEmpty(sourceId)){
+            sourceId = EventSourceEnum.AI.getCode();
+        }
+        if(StringUtil.isEmpty(sourceName)){
+            sourceName = EventSourceEnum.AI.getDesc();
+        }
+        workOrder.setSourceId(sourceId);
+        workOrder.setSourceName(sourceName);
         String wsourceId = createRequestVo.getWoSourceId();
         String wsourceName = createRequestVo.getWoSourceName();
         if(StringUtil.isEmpty(wsourceId)){
@@ -218,4 +218,11 @@ public interface BpmGardenService {
      */
     public void attachmentInsertOrUpdate(List<String> imgList, String type, MainInfoDO workOrder);
+    /**
+     * 删除附件表
+     * @param type
+     * @param orderNo
+     * @param busiLine
+     */
+    public void deleteAttachement(String type,String orderNo,String busiLine);
 }
@@ -52,6 +52,7 @@ import com.zteits.urbanops.module.workorder.dto.AppGardenWorkOrderReqVO;
 import com.zteits.urbanops.module.workorder.dto.AppGardenWorkOrderRespVO;
 import com.zteits.urbanops.module.workorder.enums.BusiLineTeamLeaderRoleCodeEnum;
 import com.zteits.urbanops.module.workorder.enums.BusiLineWorkerRoleCodeEnum;
+import com.zteits.urbanops.module.workorder.enums.EventSourceEnum;
 import com.zteits.urbanops.module.workorder.util.TaskNodeUtils;
 import jakarta.annotation.Resource;
 import jodd.util.StringUtil;
@@ -596,6 +597,16 @@ public class BpmGardenServiceImpl implements BpmGardenService{
         if(null == roleList || roleList.size()==0){
             throw exception(APP_USER_ROLE_NOT_EXISTS);
         }
+        Integer sourceId = createRequestVo.getSourceId();
+        String sourceName = createRequestVo.getSourceName();
+        if(!ObjectUtils.isNotAllEmpty(sourceId)){
+            sourceId = EventSourceEnum.PATROL.getCode();
+        }
+        if(StringUtil.isEmpty(sourceName)){
+            sourceName = EventSourceEnum.PATROL.getDesc();
+        }
+        workOrder.setSourceId(sourceId);
+        workOrder.setSourceName(sourceName);
         workOrder.setWoSourceId(roleList.get(0).getCode());
         workOrder.setWoSourceName(roleList.get(0).getName());
         String busiLine = createRequestVo.getBusiLine();
@@ -678,6 +689,16 @@ public class BpmGardenServiceImpl implements BpmGardenService{
         }
     }
+    public void deleteAttachement(String type,String orderNo,String busiLine){
+        LambdaQueryWrapper<AttachmentDO> deleteWrapper = new LambdaQueryWrapper<AttachmentDO>()
+                .eq(AttachmentDO::getBusiType, type)
+                .eq(AttachmentDO::getOrderNo, orderNo);
+        if(StringUtil.isNotEmpty(busiLine)){// 全域巡查员 发起的工单 业务线有可能为空
+            deleteWrapper.eq(AttachmentDO::getBusiLine, busiLine);
+        }
+        attachmentMapper.delete(deleteWrapper);
+    }
+
     @Override
     public void updateWorkOrderStatus(Long id, Integer status) {
@@ -31,6 +31,7 @@ import com.zteits.urbanops.module.workorder.dal.mysql.maininfo.MainInfoMapper;
 import com.zteits.urbanops.module.workorder.dto.AppGardenWorkOrderInspectorReqVO;
 import com.zteits.urbanops.module.workorder.dto.AppGardenWorkOrderUniversalReqVO;
 import com.zteits.urbanops.module.workorder.enums.BusiLineTeamLeaderRoleCodeEnum;
+import com.zteits.urbanops.module.workorder.enums.EventSourceEnum;
 import com.zteits.urbanops.module.workorder.util.RoleListUtils;
 import jakarta.annotation.Resource;
 import jodd.util.StringUtil;
@@ -147,6 +148,16 @@ public class BpmInspectorServiceImpl implements BpmInspectorService{
         workOrder.setCompanyId(SecurityFrameworkUtils.getCompanyId());
         workOrder.setDeptId(SecurityFrameworkUtils.getDeptId());
+        Integer sourceId = createRequestVo.getSourceId();
+        String sourceName = createRequestVo.getSourceName();
+        if(!ObjectUtils.isNotAllEmpty(sourceId)){
+            sourceId = EventSourceEnum.PATROL.getCode();
+        }
+        if(StringUtil.isEmpty(sourceName)){
+            sourceName = EventSourceEnum.PATROL.getDesc();
+        }
+        workOrder.setSourceId(sourceId);
+        workOrder.setSourceName(sourceName);
         workOrder.setWoSourceId(roleList.get(0).getCode());
         workOrder.setWoSourceName(roleList.get(0).getName());
         String busiLine = createRequestVo.getBusiLine();
@@ -25,6 +25,7 @@ import com.zteits.urbanops.module.workorder.dal.mysql.maininfo.MainInfoExtMapper
 import com.zteits.urbanops.module.workorder.dal.mysql.maininfo.MainInfoMapper;
 import com.zteits.urbanops.module.workorder.dto.AppGardenWorkOrderReqVO;
 import com.zteits.urbanops.module.workorder.enums.BusiLineTeamLeaderRoleCodeEnum;
+import com.zteits.urbanops.module.workorder.enums.EventSourceEnum;
 import com.zteits.urbanops.module.workorder.util.RoleListUtils;
 import jakarta.annotation.Resource;
 import jodd.util.StringUtil;
@@ -137,6 +138,16 @@ public class BpmRegionMgrServiceImpl implements BpmRegionMgrService{
         if(!RoleListUtils.containsCode(roleList,REGIONAL_MANAGER)){
             throw exception(APP_REGIONMGR_USER_ROLE_ERROR);
         }
+        Integer sourceId = createRequestVo.getSourceId();
+        String sourceName = createRequestVo.getSourceName();
+        if(!ObjectUtils.isNotAllEmpty(sourceId)){
+            sourceId = EventSourceEnum.REGION.getCode();
+        }
+        if(StringUtil.isEmpty(sourceName)){
+            sourceName = EventSourceEnum.REGION.getDesc();
+        }
+        workOrder.setSourceId(sourceId);
+        workOrder.setSourceName(sourceName);
         workOrder.setWoSourceId(roleList.get(0).getCode());
         workOrder.setWoSourceName(roleList.get(0).getName());
         String busiLine = createRequestVo.getBusiLine();
@@ -31,6 +31,7 @@ import com.zteits.urbanops.module.workorder.dal.mysql.maininfo.MainInfoMapper;
 import com.zteits.urbanops.module.workorder.dto.AppGardenWorkOrderReqVO;
 import com.zteits.urbanops.module.workorder.dto.AppGardenWorkOrderUniversalReqVO;
 import com.zteits.urbanops.module.workorder.enums.BusiLineTeamLeaderRoleCodeEnum;
+import com.zteits.urbanops.module.workorder.enums.EventSourceEnum;
 import com.zteits.urbanops.module.workorder.util.RoleListUtils;
 import jakarta.annotation.Resource;
 import jodd.util.StringUtil;
@@ -135,7 +136,16 @@ public class BpmUniversalServiceImpl implements BpmUniversalService{
         if(RoleListUtils.containsBothCodes(roleList, REGIONAL_MANAGER, PARTROL_GLOBAL)){
             throw exception(APP_WORK_ORADER_ROLE_ILLEGLE);
         }
-
+        Integer sourceId = createRequestVo.getSourceId();
+        String sourceName = createRequestVo.getSourceName();
+        if(!ObjectUtils.isNotAllEmpty(sourceId)){
+            sourceId = EventSourceEnum.PATROL.getCode();
+        }
+        if(StringUtil.isEmpty(sourceName)){
+            sourceName = EventSourceEnum.PATROL.getDesc();
+        }
+        workOrder.setSourceId(sourceId);
+        workOrder.setSourceName(sourceName);
         workOrder.setWoSourceId(roleList.get(0).getCode());
         workOrder.setWoSourceName(roleList.get(0).getName());
         workOrder.setUserId(SecurityFrameworkUtils.getLoginUserId());