瀏覽代碼

移动端-工单管理

zengy 1 周之前
父節點
當前提交
5a8218721a

+ 1 - 1
pipe-network-service/zksy-admin/src/main/java/com/zksy/web/controller/ops/WorkOrderController.java

@@ -123,7 +123,7 @@ public class WorkOrderController {
 
     @PreAuthorize("@ss.hasPermi('ops:workOrder:process')")
     @PutMapping("/{orderId}/process")
-    @ApiOperation("工单处置(已接单/处理中/延期中 → 处理中,可多次处置)")
+    @ApiOperation("工单处置(已接单/延期中 → 处理中)")
     @Log(title = "工单处置", businessType = BusinessType.UPDATE)
     public AjaxResult process(@PathVariable("orderId") Long orderId, @Valid @RequestBody WorkOrderOperateDTO dto) {
         return workOrderService.process(orderId, dto) ? AjaxResult.success("处置成功") : AjaxResult.error("处置失败");

+ 2 - 2
pipe-network-service/zksy-system/src/main/java/com/zksy/ops/enums/WorkOrderStatusEnum.java

@@ -48,10 +48,10 @@ public enum WorkOrderStatusEnum {
                     PENDING_DISPATCH.code, PENDING_ACCEPT.code, ACCEPTED.code,
                     PROCESSING.code, PENDING_VERIFY.code));
 
-    /** 允许处置(处理)的状态:已接单/处理中/延期中 */
+    /** 允许处置(处理)的状态:已接单/延期中 */
     private static final List<Integer> PROCESSABLE_CODES =
             Collections.unmodifiableList(Arrays.asList(
-                    ACCEPTED.code, PROCESSING.code, DELAYING.code));
+                    ACCEPTED.code, DELAYING.code));
 
     /** 允许提交验收的状态:处理中/延期中 */
     private static final List<Integer> SUBMIT_VERIFY_CODES =

+ 1 - 1
pipe-network-service/zksy-system/src/main/java/com/zksy/ops/service/WorkOrderService.java

@@ -125,7 +125,7 @@ public interface WorkOrderService extends IService<WorkOrder> {
     boolean accept(Long orderId, WorkOrderOperateDTO dto);
 
     /**
-     * 处置:已接单/处理中/延期中 → 处理中(支持多次处置)
+     * 处置:已接单/延期中 → 处理中;处理中状态不允许重复处置
      *
      * @param orderId 工单ID
      * @param dto     操作入参(处置内容、附件)

+ 1 - 1
pipe-network-service/zksy-system/src/main/java/com/zksy/ops/service/impl/WorkOrderServiceImpl.java

@@ -568,7 +568,7 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
             throw new ServiceException("当前工单状态不允许处置");
         }
 
-        // 已接单/延期中 → 处理中;处理中保持原状态,支持多次处置
+        // 已接单/延期中处置后进入处理中;处理中不允许重复提交处置
         Integer targetStatus = (Objects.equals(WorkOrderStatusEnum.ACCEPTED.getCode(), status)
                 || Objects.equals(WorkOrderStatusEnum.DELAYING.getCode(), status))
                 ? WorkOrderStatusEnum.PROCESSING.getCode()