diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/aop/InspectorBuzStatusUpdateAspect.java b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/aop/InspectorBuzStatusUpdateAspect.java index 7300dc3..812d0ab 100644 --- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/aop/InspectorBuzStatusUpdateAspect.java +++ b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/aop/InspectorBuzStatusUpdateAspect.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 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()); diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmAIServiceImpl.java b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmAIServiceImpl.java index ad28d83..cab80cf 100644 --- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmAIServiceImpl.java +++ b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmAIServiceImpl.java @@ -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)){ diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmGardenService.java b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmGardenService.java index 9613977..30c89eb 100644 --- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmGardenService.java +++ b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmGardenService.java @@ -218,4 +218,11 @@ public interface BpmGardenService { */ public void attachmentInsertOrUpdate(List imgList, String type, MainInfoDO workOrder); + /** + * 删除附件表 + * @param type + * @param orderNo + * @param busiLine + */ + public void deleteAttachement(String type,String orderNo,String busiLine); } diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmGardenServiceImpl.java b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmGardenServiceImpl.java index fc1cb30..b7a2175 100644 --- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmGardenServiceImpl.java +++ b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmGardenServiceImpl.java @@ -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 deleteWrapper = new LambdaQueryWrapper() + .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) { diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmInspectorServiceImpl.java b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmInspectorServiceImpl.java index 095a477..5100716 100644 --- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmInspectorServiceImpl.java +++ b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmInspectorServiceImpl.java @@ -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(); diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmRegionMgrServiceImpl.java b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmRegionMgrServiceImpl.java index 239ac71..8ef9dff 100644 --- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmRegionMgrServiceImpl.java +++ b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmRegionMgrServiceImpl.java @@ -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(); diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmUniversalServiceImpl.java b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmUniversalServiceImpl.java index 6b69414..e532795 100644 --- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmUniversalServiceImpl.java +++ b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmUniversalServiceImpl.java @@ -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());