From 79f62c734c3bdb3bee9374df0d66c5dde00c5650 Mon Sep 17 00:00:00 2001 From: halley Date: Tue, 26 May 2026 22:59:13 +0800 Subject: [PATCH] 督察员三级类型 --- urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/AppGardenWorkOrderInspectorController.java | 13 +++++++++---- urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmInspectorService.java | 12 ++++++++++-- urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/service/garden/BpmInspectorServiceImpl.java | 14 ++++++++++++-- 3 files changed, 31 insertions(+), 8 deletions(-) diff --git a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/AppGardenWorkOrderInspectorController.java b/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/AppGardenWorkOrderInspectorController.java index 6d2dcdd..78c3c18 100644 --- a/urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/garden/AppGardenWorkOrderInspectorController.java +++ b/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; import com.zteits.urbanops.framework.idempotent.core.keyresolver.impl.DefaultIdempotentKeyResolver; import com.zteits.urbanops.module.garden.api.road.RoadApi; import com.zteits.urbanops.module.workorder.annotation.AutoUpdateWorkerOrderInspectorBuzStatus; -import com.zteits.urbanops.module.workorder.annotation.AutoUpdateWorkerOrderUniversalBuzStatus; import com.zteits.urbanops.module.workorder.controller.app.garden.vo.common.AppUniversalApprovalReqVO; import com.zteits.urbanops.module.workorder.controller.app.garden.vo.operator.AppGardenTaskReturnExtReqVO; 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 import com.zteits.urbanops.module.workorder.controller.app.garden.vo.task.AppGardenTaskRegionMgrApproveReqVO; import com.zteits.urbanops.module.workorder.dto.AppGardenWorkOrderInspectorReqVO; import com.zteits.urbanops.module.workorder.dto.AppGardenWorkOrderReqVO; -import com.zteits.urbanops.module.workorder.dto.AppGardenWorkOrderUniversalReqVO; -import com.zteits.urbanops.module.workorder.enums.InspectorOperateTypeEnum; import com.zteits.urbanops.module.workorder.enums.InspectorOperateTypeEnum; import com.zteits.urbanops.module.workorder.service.garden.BpmGardenService; import com.zteits.urbanops.module.workorder.service.garden.BpmInspectorService; -import com.zteits.urbanops.module.workorder.service.garden.BpmUniversalService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; @@ -76,6 +72,15 @@ public class AppGardenWorkOrderInspectorController { return success(inspectorService.createWorkOrder(createReqVO)); } + @PostMapping("/createBatch") + //@PreAuthorize("@ss.hasPermission('bpm:garden-workorder:create')") + @Operation(summary = "app-全域巡查员创建工单信息") + public CommonResult> createMainInfoBatch(@Valid @RequestBody List createReqVOList) { + return success(inspectorService.batchCreateWorkOrder(createReqVOList)); + } + + + @Operation(summary = "app-统一审批入口") @PostMapping("/universalApproval") @AutoUpdateWorkerOrderInspectorBuzStatus 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 fc42531..e8ec5f7 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 @@ -1,12 +1,12 @@ package com.zteits.urbanops.module.workorder.service.garden; -import com.zteits.urbanops.module.workorder.controller.app.garden.vo.task.AppGardenTaskApproveReqVO; import com.zteits.urbanops.module.workorder.controller.app.garden.vo.task.AppGardenTaskInspectorApproveReqVO; import com.zteits.urbanops.module.workorder.controller.app.garden.vo.task.AppGardenTaskRegionMgrApproveReqVO; import com.zteits.urbanops.module.workorder.dto.AppGardenWorkOrderInspectorReqVO; -import com.zteits.urbanops.module.workorder.dto.AppGardenWorkOrderUniversalReqVO; import jakarta.validation.Valid; +import java.util.List; + /** * 类描述：全域督察员工单处理server * 创建人：yanhuiqing @@ -27,6 +27,14 @@ public interface BpmInspectorService { */ Long createWorkOrder(@Valid AppGardenWorkOrderInspectorReqVO createRequestVo); + + /** + * 批量创建工单 + * @param reqVOList 工单列表 + * @return 工单ID集合 + */ + List batchCreateWorkOrder(List reqVOList); + /** * 全域督察员工单分配 * @param regionPassReqVO 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 6ad467a..f32c879 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 @@ -21,7 +21,6 @@ import com.zteits.urbanops.module.system.api.user.dto.AdminUserRespDTO; import com.zteits.urbanops.module.system.controller.admin.permission.vo.role.RoleRespVO; import com.zteits.urbanops.module.workorder.api.WorkOrderApi; import com.zteits.urbanops.module.workorder.api.constant.BpmCommonConstant; -import com.zteits.urbanops.module.workorder.controller.app.garden.vo.task.AppGardenTaskApproveReqVO; import com.zteits.urbanops.module.workorder.controller.app.garden.vo.task.AppGardenTaskInspectorApproveReqVO; import com.zteits.urbanops.module.workorder.controller.app.garden.vo.task.AppGardenTaskRegionMgrApproveReqVO; import com.zteits.urbanops.module.workorder.dal.dataobject.maininfo.MainInfoDO; @@ -29,7 +28,6 @@ import com.zteits.urbanops.module.workorder.dal.mysql.attachment.AttachmentMappe 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.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; @@ -220,6 +218,18 @@ public class BpmInspectorServiceImpl implements BpmInspectorService{ } @Override + @Transactional(rollbackFor = Exception.class) + public List batchCreateWorkOrder(List reqVOList) { + List idList = new ArrayList<>(); + for (AppGardenWorkOrderInspectorReqVO reqVO : reqVOList) { + // 调用你原来的单个创建方法 + Long id = createWorkOrder(reqVO); + idList.add(id); + } + return idList; + } + + @Override public void approveTask2TeamLeader(AppGardenTaskRegionMgrApproveReqVO reqVO) { BpmTaskApproveReqVO targetVO = BeanUtils.toBean(reqVO,BpmTaskApproveReqVO.class); Map variables = new HashMap<>(); -- libgit2 0.21.4