diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/aop/AIBuzStatusUpdateAspect.java b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/aop/AIBuzStatusUpdateAspect.java index 5233dca..43e6e02 100644 --- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/aop/AIBuzStatusUpdateAspect.java +++ b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/aop/AIBuzStatusUpdateAspect.java @@ -132,7 +132,7 @@ public class AIBuzStatusUpdateAspect { if(null == roadStreetRespDTO){ throw exception(APP_WORK_ROAD_NOT_EXISTS); } - targeVO.setWorkerCompanyId(roadStreetRespDTO.getDeptId());//道路负责部门id + targeVO.setWorkerCompanyId(roadStreetRespDTO.getCompanyId());//道路负责部门id targeVO.setStreetId(roadStreetRespDTO.getStreetId()); targeVO.setStreetName(roadStreetRespDTO.getStreetName()); targeVO.setBuzStatus(ORDER_STATUS_INIT);//工单业务初始化状态 后续操作状态 见 OperateTypeEnum diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/aop/BuzStatusUpdateAspect.java b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/aop/BuzStatusUpdateAspect.java index ca772cf..1bc7c37 100644 --- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/aop/BuzStatusUpdateAspect.java +++ b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/aop/BuzStatusUpdateAspect.java @@ -135,7 +135,7 @@ public class BuzStatusUpdateAspect { targeVO.setOrderNo(dbData.getOrderNo()); targeVO.setStreetId(roadStreetRespDTO.getStreetId()); targeVO.setStreetName(roadStreetRespDTO.getStreetName()); - targeVO.setWorkerCompanyId(roadStreetRespDTO.getDeptId());//道路负责部门id + targeVO.setWorkerCompanyId(roadStreetRespDTO.getCompanyId());//道路负责部门id DictDataRespDTO dictData = dictDataCommonApi.getDictData(CONSERVE_LEVEL, roadStreetRespDTO.getLevelId().toString()); if(null == dictData){ throw exception(APP_WORKER_LEVEL_ID_NOT_EXISTS); 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 812d0ab..40fcc79 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 @@ -104,7 +104,7 @@ public class InspectorBuzStatusUpdateAspect { } targeVO.setStreetId(roadStreetRespDTO.getStreetId()); targeVO.setStreetName(roadStreetRespDTO.getStreetName()); - targeVO.setWorkerCompanyId(roadStreetRespDTO.getDeptId());//道路负责部门id + targeVO.setWorkerCompanyId(roadStreetRespDTO.getCompanyId());//道路负责部门id DictDataRespDTO dictData = dictDataCommonApi.getDictData(CONSERVE_LEVEL, roadStreetRespDTO.getLevelId().toString()); if(null == dictData){ throw exception(APP_WORKER_LEVEL_ID_NOT_EXISTS); @@ -140,7 +140,7 @@ public class InspectorBuzStatusUpdateAspect { if(null == roadStreetRespDTO){ throw exception(APP_WORK_ROAD_NOT_EXISTS); } - targeVO.setWorkerCompanyId(roadStreetRespDTO.getDeptId());//道路负责部门id + targeVO.setWorkerCompanyId(roadStreetRespDTO.getCompanyId());//道路负责部门id targeVO.setStreetId(roadStreetRespDTO.getStreetId()); targeVO.setStreetName(roadStreetRespDTO.getStreetName()); targeVO.setBuzStatus(ORDER_STATUS_INIT);//工单业务初始化状态 后续操作状态 见 OperateTypeEnum diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/aop/UniversalBuzStatusUpdateAspect.java b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/aop/UniversalBuzStatusUpdateAspect.java index 377e37d..a9b078c 100644 --- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/aop/UniversalBuzStatusUpdateAspect.java +++ b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/aop/UniversalBuzStatusUpdateAspect.java @@ -98,7 +98,7 @@ public class UniversalBuzStatusUpdateAspect { if(null == roadStreetRespDTO){ throw exception(APP_WORK_ROAD_NOT_EXISTS); } - targeVO.setWorkerCompanyId(roadStreetRespDTO.getDeptId());//道路负责部门id + targeVO.setWorkerCompanyId(roadStreetRespDTO.getCompanyId());//道路负责部门id targeVO.setStreetId(roadStreetRespDTO.getStreetId()); targeVO.setStreetName(roadStreetRespDTO.getStreetName()); DictDataRespDTO dictData = dictDataCommonApi.getDictData(CONSERVE_LEVEL, roadStreetRespDTO.getLevelId().toString()); 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 8179a10..fe0c352 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 @@ -37,6 +37,7 @@ import jodd.util.StringUtil; import org.flowable.engine.RuntimeService; import org.flowable.engine.runtime.ProcessInstance; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; import java.time.LocalDateTime; @@ -103,6 +104,7 @@ public class BpmAIServiceImpl implements BpmAIService{ @Resource private DictDataCommonApi dictDataCommonApi; + @Transactional(rollbackFor = Exception.class) @Override public Long createWorkOrder(AppGardenWorkOrderAIReqVO createRequestVo) { List roleList = roleApi.getRoleListByUsrId(SecurityFrameworkUtils.getLoginUserId()); @@ -125,7 +127,7 @@ public class BpmAIServiceImpl implements BpmAIService{ if(null == roadStreetRespDTO){ throw exception(APP_WORK_ROAD_NOT_EXISTS); } - workOrder.setWorkerCompanyId(roadStreetRespDTO.getDeptId());//道路负责部门id + workOrder.setWorkerCompanyId(roadStreetRespDTO.getCompanyId());//道路负责部门id workOrder.setStreetId(roadStreetRespDTO.getStreetId()); workOrder.setStreetName(roadStreetRespDTO.getStreetName()); workOrder.setBuzStatus(ORDER_STATUS_INIT);//工单业务初始化状态 后续操作状态 见 OperateTypeEnum 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 2a281e1..8454718 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 @@ -142,6 +142,7 @@ public class BpmGardenServiceImpl implements BpmGardenService{ if(null == roadStreetRespDTO){ throw exception(APP_WORK_ROAD_NOT_EXISTS); } + workOrder.setWorkerCompanyId(roadStreetRespDTO.getCompanyId());//道路负责部门id workOrder.setStreetId(roadStreetRespDTO.getStreetId()); workOrder.setStreetName(roadStreetRespDTO.getStreetName()); workOrder.setBuzStatus(ORDER_STATUS_INIT);//工单业务初始化状态 后续操作状态 见 OperateTypeEnum @@ -571,7 +572,7 @@ public class BpmGardenServiceImpl implements BpmGardenService{ MainInfoDO workOrder = BeanUtils.toBean(createRequestVo, MainInfoDO.class) .setStatus(BpmTaskStatusEnum.RUNNING.getStatus()); RoadStreetRespDTO roadStreetRespDTO = roadApi.getRoadInfoById(createRequestVo.getRoadId()); - workOrder.setWorkerCompanyId(roadStreetRespDTO.getDeptId());//道路负责部门id + workOrder.setWorkerCompanyId(roadStreetRespDTO.getCompanyId());//道路负责部门id workOrder.setStreetId(roadStreetRespDTO.getStreetId()); workOrder.setStreetName(roadStreetRespDTO.getStreetName()); workOrder.setBuzStatus(ORDER_STATUS_INIT);//工单业务初始化状态 后续操作状态 见 OperateTypeEnum 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 3b9d44a..52a7bae 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 @@ -38,6 +38,7 @@ import jodd.util.StringUtil; import org.flowable.engine.RuntimeService; import org.flowable.engine.runtime.ProcessInstance; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; import java.time.LocalDateTime; @@ -105,6 +106,7 @@ public class BpmInspectorServiceImpl implements BpmInspectorService{ @Resource private DictDataCommonApi dictDataCommonApi; @Override + @Transactional(rollbackFor = Exception.class) public Long createWorkOrder(AppGardenWorkOrderInspectorReqVO createRequestVo) { List roleList = roleApi.getRoleListByUsrId(SecurityFrameworkUtils.getLoginUserId()); if(null == roleList || roleList.size()==0){ @@ -126,7 +128,7 @@ public class BpmInspectorServiceImpl implements BpmInspectorService{ if(null == roadStreetRespDTO){ throw exception(APP_WORK_ROAD_NOT_EXISTS); } - workOrder.setWorkerCompanyId(roadStreetRespDTO.getDeptId());//道路负责部门id + workOrder.setWorkerCompanyId(roadStreetRespDTO.getCompanyId());//道路负责部门id workOrder.setStreetId(roadStreetRespDTO.getStreetId()); workOrder.setStreetName(roadStreetRespDTO.getStreetName()); workOrder.setBuzStatus(ORDER_STATUS_INIT);//工单业务初始化状态 后续操作状态 见 OperateTypeEnum 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 8ef9dff..926c727 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 @@ -109,7 +109,7 @@ public class BpmRegionMgrServiceImpl implements BpmRegionMgrService{ if(null == roadStreetRespDTO){ throw exception(APP_WORK_ROAD_NOT_EXISTS); } - workOrder.setWorkerCompanyId(roadStreetRespDTO.getDeptId());//道路负责部门id + workOrder.setWorkerCompanyId(roadStreetRespDTO.getCompanyId());//道路负责部门id workOrder.setStreetId(roadStreetRespDTO.getStreetId()); workOrder.setStreetName(roadStreetRespDTO.getStreetName()); workOrder.setBuzStatus(ORDER_STATUS_INIT);//工单业务初始化状态 后续操作状态 见 OperateTypeEnum 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 0f7f9d0..1f5a0da 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 @@ -38,6 +38,7 @@ import jodd.util.StringUtil; import org.flowable.engine.RuntimeService; import org.flowable.engine.runtime.ProcessInstance; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; import java.time.LocalDateTime; @@ -106,6 +107,7 @@ public class BpmUniversalServiceImpl implements BpmUniversalService{ @Resource private DictDataCommonApi dictDataCommonApi; @Override + @Transactional(rollbackFor = Exception.class) public Long createWorkOrder(AppGardenWorkOrderUniversalReqVO createRequestVo) { List problemsImgsList = createRequestVo.getProblemsImgs();