Commit 79f62c734c3bdb3bee9374df0d66c5dde00c5650

Authored by 颜惠青
1 parent 4de540ef

督察员三级类型

urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/AppGardenWorkOrderInspectorController.java
@@ -6,7 +6,6 @@ import com.zteits.urbanops.framework.idempotent.core.annotation.Idempotent; @@ -6,7 +6,6 @@ import com.zteits.urbanops.framework.idempotent.core.annotation.Idempotent;
6 import com.zteits.urbanops.framework.idempotent.core.keyresolver.impl.DefaultIdempotentKeyResolver; 6 import com.zteits.urbanops.framework.idempotent.core.keyresolver.impl.DefaultIdempotentKeyResolver;
7 import com.zteits.urbanops.module.garden.api.road.RoadApi; 7 import com.zteits.urbanops.module.garden.api.road.RoadApi;
8 import com.zteits.urbanops.module.workorder.annotation.AutoUpdateWorkerOrderInspectorBuzStatus; 8 import com.zteits.urbanops.module.workorder.annotation.AutoUpdateWorkerOrderInspectorBuzStatus;
9 -import com.zteits.urbanops.module.workorder.annotation.AutoUpdateWorkerOrderUniversalBuzStatus;  
10 import com.zteits.urbanops.module.workorder.controller.app.garden.vo.common.AppUniversalApprovalReqVO; 9 import com.zteits.urbanops.module.workorder.controller.app.garden.vo.common.AppUniversalApprovalReqVO;
11 import com.zteits.urbanops.module.workorder.controller.app.garden.vo.operator.AppGardenTaskReturnExtReqVO; 10 import com.zteits.urbanops.module.workorder.controller.app.garden.vo.operator.AppGardenTaskReturnExtReqVO;
12 import com.zteits.urbanops.module.workorder.controller.app.garden.vo.operator.AppGardenTaskTeamLeaderAssignReqVO; 11 import com.zteits.urbanops.module.workorder.controller.app.garden.vo.operator.AppGardenTaskTeamLeaderAssignReqVO;
@@ -16,12 +15,9 @@ import com.zteits.urbanops.module.workorder.controller.app.garden.vo.task.AppGar @@ -16,12 +15,9 @@ import com.zteits.urbanops.module.workorder.controller.app.garden.vo.task.AppGar
16 import com.zteits.urbanops.module.workorder.controller.app.garden.vo.task.AppGardenTaskRegionMgrApproveReqVO; 15 import com.zteits.urbanops.module.workorder.controller.app.garden.vo.task.AppGardenTaskRegionMgrApproveReqVO;
17 import com.zteits.urbanops.module.workorder.dto.AppGardenWorkOrderInspectorReqVO; 16 import com.zteits.urbanops.module.workorder.dto.AppGardenWorkOrderInspectorReqVO;
18 import com.zteits.urbanops.module.workorder.dto.AppGardenWorkOrderReqVO; 17 import com.zteits.urbanops.module.workorder.dto.AppGardenWorkOrderReqVO;
19 -import com.zteits.urbanops.module.workorder.dto.AppGardenWorkOrderUniversalReqVO;  
20 -import com.zteits.urbanops.module.workorder.enums.InspectorOperateTypeEnum;  
21 import com.zteits.urbanops.module.workorder.enums.InspectorOperateTypeEnum; 18 import com.zteits.urbanops.module.workorder.enums.InspectorOperateTypeEnum;
22 import com.zteits.urbanops.module.workorder.service.garden.BpmGardenService; 19 import com.zteits.urbanops.module.workorder.service.garden.BpmGardenService;
23 import com.zteits.urbanops.module.workorder.service.garden.BpmInspectorService; 20 import com.zteits.urbanops.module.workorder.service.garden.BpmInspectorService;
24 -import com.zteits.urbanops.module.workorder.service.garden.BpmUniversalService;  
25 import io.swagger.v3.oas.annotations.Operation; 21 import io.swagger.v3.oas.annotations.Operation;
26 import io.swagger.v3.oas.annotations.tags.Tag; 22 import io.swagger.v3.oas.annotations.tags.Tag;
27 import jakarta.annotation.Resource; 23 import jakarta.annotation.Resource;
@@ -76,6 +72,15 @@ public class AppGardenWorkOrderInspectorController { @@ -76,6 +72,15 @@ public class AppGardenWorkOrderInspectorController {
76 return success(inspectorService.createWorkOrder(createReqVO)); 72 return success(inspectorService.createWorkOrder(createReqVO));
77 } 73 }
78 74
  75 + @PostMapping("/createBatch")
  76 + //@PreAuthorize("@ss.hasPermission('bpm:garden-workorder:create')")
  77 + @Operation(summary = "app-全域巡查员创建工单信息")
  78 + public CommonResult<List<Long>> createMainInfoBatch(@Valid @RequestBody List<AppGardenWorkOrderInspectorReqVO> createReqVOList) {
  79 + return success(inspectorService.batchCreateWorkOrder(createReqVOList));
  80 + }
  81 +
  82 +
  83 +
79 @Operation(summary = "app-统一审批入口") 84 @Operation(summary = "app-统一审批入口")
80 @PostMapping("/universalApproval") 85 @PostMapping("/universalApproval")
81 @AutoUpdateWorkerOrderInspectorBuzStatus 86 @AutoUpdateWorkerOrderInspectorBuzStatus
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmInspectorService.java
1 package com.zteits.urbanops.module.workorder.service.garden; 1 package com.zteits.urbanops.module.workorder.service.garden;
2 2
3 -import com.zteits.urbanops.module.workorder.controller.app.garden.vo.task.AppGardenTaskApproveReqVO;  
4 import com.zteits.urbanops.module.workorder.controller.app.garden.vo.task.AppGardenTaskInspectorApproveReqVO; 3 import com.zteits.urbanops.module.workorder.controller.app.garden.vo.task.AppGardenTaskInspectorApproveReqVO;
5 import com.zteits.urbanops.module.workorder.controller.app.garden.vo.task.AppGardenTaskRegionMgrApproveReqVO; 4 import com.zteits.urbanops.module.workorder.controller.app.garden.vo.task.AppGardenTaskRegionMgrApproveReqVO;
6 import com.zteits.urbanops.module.workorder.dto.AppGardenWorkOrderInspectorReqVO; 5 import com.zteits.urbanops.module.workorder.dto.AppGardenWorkOrderInspectorReqVO;
7 -import com.zteits.urbanops.module.workorder.dto.AppGardenWorkOrderUniversalReqVO;  
8 import jakarta.validation.Valid; 6 import jakarta.validation.Valid;
9 7
  8 +import java.util.List;
  9 +
10 /** 10 /**
11 * 类描述:全域督察员工单处理server 11 * 类描述:全域督察员工单处理server
12 * 创建人:yanhuiqing 12 * 创建人:yanhuiqing
@@ -27,6 +27,14 @@ public interface BpmInspectorService { @@ -27,6 +27,14 @@ public interface BpmInspectorService {
27 */ 27 */
28 Long createWorkOrder(@Valid AppGardenWorkOrderInspectorReqVO createRequestVo); 28 Long createWorkOrder(@Valid AppGardenWorkOrderInspectorReqVO createRequestVo);
29 29
  30 +
  31 + /**
  32 + * 批量创建工单
  33 + * @param reqVOList 工单列表
  34 + * @return 工单ID集合
  35 + */
  36 + List<Long> batchCreateWorkOrder(List<AppGardenWorkOrderInspectorReqVO> reqVOList);
  37 +
30 /** 38 /**
31 * 全域督察员工单分配 39 * 全域督察员工单分配
32 * @param regionPassReqVO 40 * @param regionPassReqVO
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmInspectorServiceImpl.java
@@ -21,7 +21,6 @@ import com.zteits.urbanops.module.system.api.user.dto.AdminUserRespDTO; @@ -21,7 +21,6 @@ import com.zteits.urbanops.module.system.api.user.dto.AdminUserRespDTO;
21 import com.zteits.urbanops.module.system.controller.admin.permission.vo.role.RoleRespVO; 21 import com.zteits.urbanops.module.system.controller.admin.permission.vo.role.RoleRespVO;
22 import com.zteits.urbanops.module.workorder.api.WorkOrderApi; 22 import com.zteits.urbanops.module.workorder.api.WorkOrderApi;
23 import com.zteits.urbanops.module.workorder.api.constant.BpmCommonConstant; 23 import com.zteits.urbanops.module.workorder.api.constant.BpmCommonConstant;
24 -import com.zteits.urbanops.module.workorder.controller.app.garden.vo.task.AppGardenTaskApproveReqVO;  
25 import com.zteits.urbanops.module.workorder.controller.app.garden.vo.task.AppGardenTaskInspectorApproveReqVO; 24 import com.zteits.urbanops.module.workorder.controller.app.garden.vo.task.AppGardenTaskInspectorApproveReqVO;
26 import com.zteits.urbanops.module.workorder.controller.app.garden.vo.task.AppGardenTaskRegionMgrApproveReqVO; 25 import com.zteits.urbanops.module.workorder.controller.app.garden.vo.task.AppGardenTaskRegionMgrApproveReqVO;
27 import com.zteits.urbanops.module.workorder.dal.dataobject.maininfo.MainInfoDO; 26 import com.zteits.urbanops.module.workorder.dal.dataobject.maininfo.MainInfoDO;
@@ -29,7 +28,6 @@ import com.zteits.urbanops.module.workorder.dal.mysql.attachment.AttachmentMappe @@ -29,7 +28,6 @@ import com.zteits.urbanops.module.workorder.dal.mysql.attachment.AttachmentMappe
29 import com.zteits.urbanops.module.workorder.dal.mysql.maininfo.MainInfoExtMapper; 28 import com.zteits.urbanops.module.workorder.dal.mysql.maininfo.MainInfoExtMapper;
30 import com.zteits.urbanops.module.workorder.dal.mysql.maininfo.MainInfoMapper; 29 import com.zteits.urbanops.module.workorder.dal.mysql.maininfo.MainInfoMapper;
31 import com.zteits.urbanops.module.workorder.dto.AppGardenWorkOrderInspectorReqVO; 30 import com.zteits.urbanops.module.workorder.dto.AppGardenWorkOrderInspectorReqVO;
32 -import com.zteits.urbanops.module.workorder.dto.AppGardenWorkOrderUniversalReqVO;  
33 import com.zteits.urbanops.module.workorder.enums.BusiLineTeamLeaderRoleCodeEnum; 31 import com.zteits.urbanops.module.workorder.enums.BusiLineTeamLeaderRoleCodeEnum;
34 import com.zteits.urbanops.module.workorder.enums.EventSourceEnum; 32 import com.zteits.urbanops.module.workorder.enums.EventSourceEnum;
35 import com.zteits.urbanops.module.workorder.util.RoleListUtils; 33 import com.zteits.urbanops.module.workorder.util.RoleListUtils;
@@ -220,6 +218,18 @@ public class BpmInspectorServiceImpl implements BpmInspectorService{ @@ -220,6 +218,18 @@ public class BpmInspectorServiceImpl implements BpmInspectorService{
220 } 218 }
221 219
222 @Override 220 @Override
  221 + @Transactional(rollbackFor = Exception.class)
  222 + public List<Long> batchCreateWorkOrder(List<AppGardenWorkOrderInspectorReqVO> reqVOList) {
  223 + List<Long> idList = new ArrayList<>();
  224 + for (AppGardenWorkOrderInspectorReqVO reqVO : reqVOList) {
  225 + // 调用你原来的单个创建方法
  226 + Long id = createWorkOrder(reqVO);
  227 + idList.add(id);
  228 + }
  229 + return idList;
  230 + }
  231 +
  232 + @Override
223 public void approveTask2TeamLeader(AppGardenTaskRegionMgrApproveReqVO reqVO) { 233 public void approveTask2TeamLeader(AppGardenTaskRegionMgrApproveReqVO reqVO) {
224 BpmTaskApproveReqVO targetVO = BeanUtils.toBean(reqVO,BpmTaskApproveReqVO.class); 234 BpmTaskApproveReqVO targetVO = BeanUtils.toBean(reqVO,BpmTaskApproveReqVO.class);
225 Map<String, Object> variables = new HashMap<>(); 235 Map<String, Object> variables = new HashMap<>();