From 17a067a436cbe7469e13b88c67bbbcf70225614a Mon Sep 17 00:00:00 2001 From: yanhuiqing Date: Thu, 1 Jan 2026 13:20:09 +0800 Subject: [PATCH] 工单 道路id由 LONG 改为 STRING --- urbanops-module-api/urbanops-module-garden-api/src/main/java/com/zteits/urbanops/module/garden/api/road/RoadApi.java | 2 +- urbanops-module-api/urbanops-module-garden-api/src/main/java/com/zteits/urbanops/module/garden/dto/road/RoadStreetRespDTO.java | 2 +- urbanops-module-api/urbanops-module-workorder-api/src/main/java/com/zteits/urbanops/module/workorder/api/WorkOrderApi.java | 2 +- urbanops-module-api/urbanops-module-workorder-api/src/main/java/com/zteits/urbanops/module/workorder/dto/AppGardenWorkOrderAIReqVO.java | 4 ++-- urbanops-module-api/urbanops-module-workorder-api/src/main/java/com/zteits/urbanops/module/workorder/dto/AppGardenWorkOrderInspectorReqVO.java | 2 +- urbanops-module-api/urbanops-module-workorder-api/src/main/java/com/zteits/urbanops/module/workorder/dto/AppGardenWorkOrderReqVO.java | 2 +- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/api/road/RoadApiImpl.java | 8 +++++--- urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/convert/AppGardenWorkOrderConvert.java | 2 +- urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/api/workorder/WorkOrderApiImpl.java | 2 +- urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/garden/vo/BpmGardenTaskAssignReqVO.java | 2 +- urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/vo/common/AppUniversalApprovalReqVO.java | 2 +- urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/vo/task/AppGardenTaskInspectorApproveReqVO.java | 2 +- urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/vo/task/AppGardenTaskRegionMgrApproveReqVO.java | 2 +- urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/dataobject/maininfo/MainInfoDO.java | 2 +- urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/dataobject/maininfo/MainInfoExtDO.java | 2 +- urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/mysql/maininfo/MainInfoExtMapper.java | 6 +++--- urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmAIService.java | 2 +- urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmAIServiceImpl.java | 4 ++-- urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmGardenService.java | 2 +- urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmGardenServiceImpl.java | 2 +- urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmInspectorService.java | 2 +- urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmInspectorServiceImpl.java | 4 ++-- urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmUniversalServiceImpl.java | 2 +- urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/el/YlTaskAssignService.java | 2 +- 24 files changed, 33 insertions(+), 31 deletions(-) diff --git a/urbanops-module-api/urbanops-module-garden-api/src/main/java/com/zteits/urbanops/module/garden/api/road/RoadApi.java b/urbanops-module-api/urbanops-module-garden-api/src/main/java/com/zteits/urbanops/module/garden/api/road/RoadApi.java index 4ba08be..491837c 100644 --- a/urbanops-module-api/urbanops-module-garden-api/src/main/java/com/zteits/urbanops/module/garden/api/road/RoadApi.java +++ b/urbanops-module-api/urbanops-module-garden-api/src/main/java/com/zteits/urbanops/module/garden/api/road/RoadApi.java @@ -10,5 +10,5 @@ import java.util.List; public interface RoadApi { List getRoadInfoBy(RoadReqDTO reqDTO); - RoadStreetRespDTO getRoadInfoById(Long id); + RoadStreetRespDTO getRoadInfoById(String id); } diff --git a/urbanops-module-api/urbanops-module-garden-api/src/main/java/com/zteits/urbanops/module/garden/dto/road/RoadStreetRespDTO.java b/urbanops-module-api/urbanops-module-garden-api/src/main/java/com/zteits/urbanops/module/garden/dto/road/RoadStreetRespDTO.java index 925b1cc..a1846f3 100644 --- a/urbanops-module-api/urbanops-module-garden-api/src/main/java/com/zteits/urbanops/module/garden/dto/road/RoadStreetRespDTO.java +++ b/urbanops-module-api/urbanops-module-garden-api/src/main/java/com/zteits/urbanops/module/garden/dto/road/RoadStreetRespDTO.java @@ -12,7 +12,7 @@ import lombok.Data; @Data public class RoadStreetRespDTO { - private Long id; + private String id; private String roadName; diff --git a/urbanops-module-api/urbanops-module-workorder-api/src/main/java/com/zteits/urbanops/module/workorder/api/WorkOrderApi.java b/urbanops-module-api/urbanops-module-workorder-api/src/main/java/com/zteits/urbanops/module/workorder/api/WorkOrderApi.java index e230773..33c1eaa 100644 --- a/urbanops-module-api/urbanops-module-workorder-api/src/main/java/com/zteits/urbanops/module/workorder/api/WorkOrderApi.java +++ b/urbanops-module-api/urbanops-module-workorder-api/src/main/java/com/zteits/urbanops/module/workorder/api/WorkOrderApi.java @@ -33,7 +33,7 @@ public interface WorkOrderApi { * @param busiLine * @return */ - public List getUserByRoadIdAndRoleCode(Long roadId, String roleCode, String busiLine); + public List getUserByRoadIdAndRoleCode(String roadId, String roleCode, String busiLine); /** * 创建工单API diff --git a/urbanops-module-api/urbanops-module-workorder-api/src/main/java/com/zteits/urbanops/module/workorder/dto/AppGardenWorkOrderAIReqVO.java b/urbanops-module-api/urbanops-module-workorder-api/src/main/java/com/zteits/urbanops/module/workorder/dto/AppGardenWorkOrderAIReqVO.java index d5581b6..2540af2 100644 --- a/urbanops-module-api/urbanops-module-workorder-api/src/main/java/com/zteits/urbanops/module/workorder/dto/AppGardenWorkOrderAIReqVO.java +++ b/urbanops-module-api/urbanops-module-workorder-api/src/main/java/com/zteits/urbanops/module/workorder/dto/AppGardenWorkOrderAIReqVO.java @@ -23,7 +23,7 @@ public class AppGardenWorkOrderAIReqVO { @Schema(description = "道路ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "21128") @NotNull(message = "道路ID不能为空") - private Long roadId; + private String roadId; /** * 工单类型 Q:快速工单,C:普通工单,O:其他工单 @@ -63,7 +63,7 @@ public class AppGardenWorkOrderAIReqVO { @Schema(description = "工单名称", example = "绿地卫生") private String orderName; - @Schema(description = "来源ID 工单来源 1、巡查，2、游客居民，3、12345，4、网格", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @Schema(description = "来源ID 工单来源 1、巡查，2、游客居民，3、12345，4、网格,5 大区经理，6 AI", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") //@NotNull(message = "来源ID不能为空") private Integer sourceId; diff --git a/urbanops-module-api/urbanops-module-workorder-api/src/main/java/com/zteits/urbanops/module/workorder/dto/AppGardenWorkOrderInspectorReqVO.java b/urbanops-module-api/urbanops-module-workorder-api/src/main/java/com/zteits/urbanops/module/workorder/dto/AppGardenWorkOrderInspectorReqVO.java index b74aac7..264026d 100644 --- a/urbanops-module-api/urbanops-module-workorder-api/src/main/java/com/zteits/urbanops/module/workorder/dto/AppGardenWorkOrderInspectorReqVO.java +++ b/urbanops-module-api/urbanops-module-workorder-api/src/main/java/com/zteits/urbanops/module/workorder/dto/AppGardenWorkOrderInspectorReqVO.java @@ -23,7 +23,7 @@ public class AppGardenWorkOrderInspectorReqVO { @Schema(description = "道路ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "21128") @NotNull(message = "道路ID不能为空") - private Long roadId; + private String roadId; /** * 工单类型 Q:快速工单,C:普通工单,O:其他工单 diff --git a/urbanops-module-api/urbanops-module-workorder-api/src/main/java/com/zteits/urbanops/module/workorder/dto/AppGardenWorkOrderReqVO.java b/urbanops-module-api/urbanops-module-workorder-api/src/main/java/com/zteits/urbanops/module/workorder/dto/AppGardenWorkOrderReqVO.java index 9fbbf18..a1b411f 100644 --- a/urbanops-module-api/urbanops-module-workorder-api/src/main/java/com/zteits/urbanops/module/workorder/dto/AppGardenWorkOrderReqVO.java +++ b/urbanops-module-api/urbanops-module-workorder-api/src/main/java/com/zteits/urbanops/module/workorder/dto/AppGardenWorkOrderReqVO.java @@ -24,7 +24,7 @@ public class AppGardenWorkOrderReqVO { @Schema(description = "道路ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "21128") @NotNull(message = "道路ID不能为空") - private Long roadId; + private String roadId; /** * 工单类型 Q:快速工单,C:普通工单,O:其他工单 diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/api/road/RoadApiImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/api/road/RoadApiImpl.java index 5f39f15..46106a6 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/api/road/RoadApiImpl.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/api/road/RoadApiImpl.java @@ -62,8 +62,10 @@ public class RoadApiImpl implements RoadApi { } @Override - public RoadStreetRespDTO getRoadInfoById(Long id) { - RoadRespVO roadRespVO = roadService.getUniqueRoad(id); - return BeanUtils.toBean(roadRespVO, RoadStreetRespDTO.class); + public RoadStreetRespDTO getRoadInfoById(String id) { + RoadRespVO roadRespVO = roadService.getUniqueRoad(Long.parseLong(id)); + RoadStreetRespDTO targetVO = BeanUtils.toBean(roadRespVO, RoadStreetRespDTO.class); + targetVO.setId(roadRespVO.getId().toString()); + return targetVO; } } diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/convert/AppGardenWorkOrderConvert.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/convert/AppGardenWorkOrderConvert.java index 485099a..956ce17 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/convert/AppGardenWorkOrderConvert.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/convert/AppGardenWorkOrderConvert.java @@ -17,7 +17,7 @@ public interface AppGardenWorkOrderConvert { default AppGardenWorkOrderReqVO buildAppGardenWorkOrderReqVO(AppInspectionPlanCommitSaveReqVO createReqVO, InspectionPlanDO inspectionPlanDO, RoadDO roadDO, String planNo ) { AppGardenWorkOrderReqVO orderReqVO = new AppGardenWorkOrderReqVO(); - orderReqVO.setRoadId(inspectionPlanDO.getRoadId()); + orderReqVO.setRoadId(inspectionPlanDO.getRoadId().toString()); orderReqVO.setRoadName(inspectionPlanDO.getRoadName()); orderReqVO.setProblemsImgs(createReqVO.getImgList()); orderReqVO.setRemark(createReqVO.getRemark()); diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/api/workorder/WorkOrderApiImpl.java b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/api/workorder/WorkOrderApiImpl.java index 3ca17b5..e619ed1 100644 --- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/api/workorder/WorkOrderApiImpl.java +++ b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/api/workorder/WorkOrderApiImpl.java @@ -67,7 +67,7 @@ public class WorkOrderApiImpl implements WorkOrderApi { } @Override - public List getUserByRoadIdAndRoleCode(Long roadId, String roleCode, String busiLine) { + public List getUserByRoadIdAndRoleCode(String roadId, String roleCode, String busiLine) { if(ObjectUtils.isEmpty(roadId) || ObjectUtils.isEmpty(roleCode) || ObjectUtils.isEmpty(busiLine)){ throw exception0(BAD_REQUEST.getCode(),"param:roadId,roleCode,busiLine 不能为空！"); } diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/garden/vo/BpmGardenTaskAssignReqVO.java b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/garden/vo/BpmGardenTaskAssignReqVO.java index 81dd61f..6df1209 100644 --- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/garden/vo/BpmGardenTaskAssignReqVO.java +++ b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/admin/garden/vo/BpmGardenTaskAssignReqVO.java @@ -28,7 +28,7 @@ public class BpmGardenTaskAssignReqVO { @Schema(description = "道路ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "21128") @NotNull(message = "道路ID不能为空") - private Long roadId; + private String roadId; @Schema(description = "道路名称", example = "测试道路") private String roadName; diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/vo/common/AppUniversalApprovalReqVO.java b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/vo/common/AppUniversalApprovalReqVO.java index 09c9e73..33d0de7 100644 --- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/vo/common/AppUniversalApprovalReqVO.java +++ b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/vo/common/AppUniversalApprovalReqVO.java @@ -90,7 +90,7 @@ public class AppUniversalApprovalReqVO { //-------------------------重新发起需提交表单数据------------------------ @Schema(description = "道路ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "21128") @NotNull(message = "道路ID不能为空", groups = RelaunchGroup.class) - private Long roadId; + private String roadId; @Schema(description = "道路名称", example = "测试道路") private String roadName; diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/vo/task/AppGardenTaskInspectorApproveReqVO.java b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/vo/task/AppGardenTaskInspectorApproveReqVO.java index aaa2768..d8febb2 100644 --- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/vo/task/AppGardenTaskInspectorApproveReqVO.java +++ b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/vo/task/AppGardenTaskInspectorApproveReqVO.java @@ -40,7 +40,7 @@ public class AppGardenTaskInspectorApproveReqVO { @Schema(description = "道路ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "21128") @NotNull(message = "道路ID不能为空", groups = RelaunchGroup.class) - private Long roadId; + private String roadId; @Schema(description = "道路名称", example = "测试道路") private String roadName; diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/vo/task/AppGardenTaskRegionMgrApproveReqVO.java b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/vo/task/AppGardenTaskRegionMgrApproveReqVO.java index 670347a..597225e 100644 --- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/vo/task/AppGardenTaskRegionMgrApproveReqVO.java +++ b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/vo/task/AppGardenTaskRegionMgrApproveReqVO.java @@ -40,7 +40,7 @@ public class AppGardenTaskRegionMgrApproveReqVO { @Schema(description = "道路ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "21128") @NotNull(message = "道路ID不能为空") - private Long roadId; + private String roadId; @Schema(description = "道路名称", example = "测试道路") private String roadName; diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/dataobject/maininfo/MainInfoDO.java b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/dataobject/maininfo/MainInfoDO.java index df40f27..4eec0fc 100644 --- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/dataobject/maininfo/MainInfoDO.java +++ b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/dataobject/maininfo/MainInfoDO.java @@ -64,7 +64,7 @@ public class MainInfoDO extends BaseDO { /** * 道路ID */ - private Long roadId; + private String roadId; /** * 道路名称 */ diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/dataobject/maininfo/MainInfoExtDO.java b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/dataobject/maininfo/MainInfoExtDO.java index 0a56b4d..22ea2a1 100644 --- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/dataobject/maininfo/MainInfoExtDO.java +++ b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/dataobject/maininfo/MainInfoExtDO.java @@ -58,7 +58,7 @@ public class MainInfoExtDO extends BaseDO { /** * 道路ID */ - private Long roadId; + private String roadId; /** * 道路名称 */ diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/mysql/maininfo/MainInfoExtMapper.java b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/mysql/maininfo/MainInfoExtMapper.java index ccab62a..23c917b 100644 --- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/mysql/maininfo/MainInfoExtMapper.java +++ b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/mysql/maininfo/MainInfoExtMapper.java @@ -725,11 +725,11 @@ public interface MainInfoExtMapper extends BaseMapperX { @Result(column = "avatar", property = "avatar") }) @DataPermission(enable = false) - IPage getUserByRoadIdAndRoleCodeIPage(IPage page,@NonNull @Param("roadId") Long roadId, + IPage getUserByRoadIdAndRoleCodeIPage(IPage page,@NonNull @Param("roadId") String roadId, @NonNull @Param("roleCode") String roleCode, @NonNull @Param("busiLine") String busiLine); @DataPermission(enable = false) - default PageResult getUserByRoadIdAndRoleCodePage(PageParam pageParam,@NonNull @Param("roadId") Long roadId, + default PageResult getUserByRoadIdAndRoleCodePage(PageParam pageParam,@NonNull @Param("roadId") String roadId, @NonNull @Param("roleCode") String roleCode, @NonNull @Param("busiLine") String busiLine){ IPage mpPage = MyBatisUtils.buildPage(pageParam); @@ -739,7 +739,7 @@ public interface MainInfoExtMapper extends BaseMapperX { } @DataPermission(enable = false) - default List getUserByRoadIdAndRoleCode(@NonNull @Param("roadId") Long roadId, + default List getUserByRoadIdAndRoleCode(@NonNull @Param("roadId") String roadId, @NonNull @Param("roleCode") String roleCode, @NonNull @Param("busiLine") String busiLine){ // 创建一个“不分页”的Page对象（size=Integer.MAX_VALUE，查询所有数据） diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmAIService.java b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmAIService.java index 2e00a94..d255084 100644 --- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmAIService.java +++ b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmAIService.java @@ -50,5 +50,5 @@ public interface BpmAIService { * @param roadId * @return */ - boolean isSanhaiByRoadId(Long roadId); + boolean isSanhaiByRoadId(String roadId); } \ No newline at end of file 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 cab80cf..8179a10 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 @@ -242,7 +242,7 @@ public class BpmAIServiceImpl implements BpmAIService{ //String busiLine = (String)processInstanceVariables.get(BPM_COMMON_PROD_BUSILINE); //Long roadId = (Long) processInstanceVariables.get(BPM_COMMON_PROD_ROADID); String busiLine = reqVO.getBusiLine(); - Long roadId = reqVO.getRoadId(); + String roadId = reqVO.getRoadId(); String roleCode = BusiLineTeamLeaderRoleCodeEnum.getByCode(busiLine).getRoleCode(); if(StringUtil.isEmpty(roleCode)){// 找不到 默认为园林组长的角色 @@ -311,7 +311,7 @@ public class BpmAIServiceImpl implements BpmAIService{ } @Override - public boolean isSanhaiByRoadId(Long roadId) { + public boolean isSanhaiByRoadId(String roadId) { RoadStreetRespDTO roadStreetRespDTO = roadApi.getRoadInfoById(roadId); if(null == roadStreetRespDTO){ throw exception(APP_WORK_ROAD_NOT_EXISTS); 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 30c89eb..29bc142 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 @@ -208,7 +208,7 @@ public interface BpmGardenService { * @param busiLine * @return */ - public PageResult getUserByRoadIdAndRoleCode(PageParam param,Long roadId,String roleCode,String busiLine); + public PageResult getUserByRoadIdAndRoleCode(PageParam param,String roadId,String roleCode,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 b7a2175..2a281e1 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 @@ -773,7 +773,7 @@ public class BpmGardenServiceImpl implements BpmGardenService{ } @Override - public PageResult getUserByRoadIdAndRoleCode(PageParam param,Long roadId, String roleCode, String busiLine) { + public PageResult getUserByRoadIdAndRoleCode(PageParam param,String roadId, String roleCode, String busiLine) { if(org.springframework.util.ObjectUtils.isEmpty(roadId) || org.springframework.util.ObjectUtils.isEmpty(roleCode) || org.springframework.util.ObjectUtils.isEmpty(busiLine)){ throw exception0(BAD_REQUEST.getCode(),"param:roadId,roleCode,busiLine 不能为空！"); } diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmInspectorService.java b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmInspectorService.java index 70ed39e..fc42531 100644 --- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmInspectorService.java +++ b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmInspectorService.java @@ -51,5 +51,5 @@ public interface BpmInspectorService { * @param roadId * @return */ - boolean isSanhaiByRoadId(Long roadId); + boolean isSanhaiByRoadId(String roadId); } \ No newline at end of file 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 5100716..3b9d44a 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 @@ -234,7 +234,7 @@ public class BpmInspectorServiceImpl implements BpmInspectorService{ //String busiLine = (String)processInstanceVariables.get(BPM_COMMON_PROD_BUSILINE); //Long roadId = (Long) processInstanceVariables.get(BPM_COMMON_PROD_ROADID); String busiLine = reqVO.getBusiLine(); - Long roadId = reqVO.getRoadId(); + String roadId = reqVO.getRoadId(); String roleCode = BusiLineTeamLeaderRoleCodeEnum.getByCode(busiLine).getRoleCode(); if(StringUtil.isEmpty(roleCode)){// 找不到 默认为园林组长的角色 @@ -303,7 +303,7 @@ public class BpmInspectorServiceImpl implements BpmInspectorService{ } @Override - public boolean isSanhaiByRoadId(Long roadId) { + public boolean isSanhaiByRoadId(String roadId) { RoadStreetRespDTO roadStreetRespDTO = roadApi.getRoadInfoById(roadId); if(null == roadStreetRespDTO){ throw exception(APP_WORK_ROAD_NOT_EXISTS); 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 e532795..0f7f9d0 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 @@ -196,7 +196,7 @@ public class BpmUniversalServiceImpl implements BpmUniversalService{ //String busiLine = (String)processInstanceVariables.get(BPM_COMMON_PROD_BUSILINE); //Long roadId = (Long) processInstanceVariables.get(BPM_COMMON_PROD_ROADID); String busiLine = reqVO.getBusiLine(); - Long roadId = reqVO.getRoadId(); + String roadId = reqVO.getRoadId(); String roleCode = BusiLineTeamLeaderRoleCodeEnum.getByCode(busiLine).getRoleCode(); if(StringUtil.isEmpty(roleCode)){// 找不到 默认为园林组长的角色 diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/el/YlTaskAssignService.java b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/el/YlTaskAssignService.java index afa07da..8aa142e 100644 --- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/el/YlTaskAssignService.java +++ b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/el/YlTaskAssignService.java @@ -29,7 +29,7 @@ public class YlTaskAssignService { @Resource private MainInfoExtMapper workOrderExtMapper; - public Long getInitiatorApproverByBusiness(Long roadId,String roleCode,String busiLine) { + public Long getInitiatorApproverByBusiness(String roadId,String roleCode,String busiLine) { List userList = workOrderExtMapper.getUserByRoadIdAndRoleCode(roadId,roleCode,busiLine); if(null != userList && userList.size() > 0){ return userList.get(0).getId(); -- libgit2 0.21.4