fix:修改开发管理接口

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/DevelopmentOrderConstants.java

@@ -2,22 +2,22 @@ package org.dromara.common.core.constant;
 
 public interface DevelopmentOrderConstants {
 
-//  待处理
-    Long PENDING_PROCESSING = 0L;
-//  画图中
-    Long IN_THE_DRAWING = 1L;
-//  确认中
-    Long CONFIRMING_IN_PROGRESS = 2L;
-//  修改中
-    Long UNDER_MODIFICATION = 3L;
-//  调色中
-    Long IN_COLOR_ADJUSTMENT = 4L;
-//  排版中
-    Long IN_TYPESETTING = 5L;
-//  打版中
-    Long PRINTING_IN_PROGRESS = 6L;
-//  已完成
-    Long COMPLETED = 7L;
-//  已取消
-    Long CANCELLED = 8L;
+    //  待处理
+    int PENDING_PROCESSING = 0;
+    //  画图中
+    int IN_THE_DRAWING = 1;
+    //  确认中
+    int CONFIRMING_IN_PROGRESS = 2;
+    //  修改中
+    int UNDER_MODIFICATION = 3;
+    //  调色中
+    int IN_COLOR_ADJUSTMENT = 4;
+    //  排版中
+    int IN_TYPESETTING = 5;
+    //  打版中
+    int PRINTING_IN_PROGRESS = 6;
+    //  已完成
+    int COMPLETED = 7;
+    //  已取消
+    int CANCELLED = 99;
 }

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/context/DevelopmentOrderContext.java

@@ -0,0 +1,21 @@
+package org.dromara.bulk.context;
+
+import lombok.Setter;
+import org.dromara.bulk.domain.bo.DevelopmentOrderBo;
+import org.dromara.bulk.domain.vo.DevelopmentOrderVo;
+import org.dromara.bulk.service.DevelopmentOrderState;
+
+@Setter
+public class DevelopmentOrderContext {
+
+    private DevelopmentOrderState currentState;
+
+    public DevelopmentOrderContext(DevelopmentOrderState initialState) {
+        this.currentState = initialState;
+    }
+
+    public void handle(DevelopmentOrderBo developmentOrderBo, DevelopmentOrderVo developmentOrderVo) {
+        currentState.handle(developmentOrderBo, developmentOrderVo);
+    }
+
+}

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/controller/DevelopmentOrderController.java

@@ -6,17 +6,21 @@ import org.dromara.bulk.domain.bo.DevelopmentOrderBo;
 import org.dromara.bulk.domain.vo.DevelopmentOrderTableDataInfo;
 import org.dromara.bulk.domain.vo.DevelopmentOrderVo;
 import org.dromara.bulk.service.DevelopmentOrderService;
+import org.dromara.common.core.domain.R;
 import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
 import org.dromara.common.core.validate.QueryGroup;
 import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.web.core.BaseController;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 @RestController
 @RequestMapping("/development")
 @RequiredArgsConstructor
-public class DevelopmentOrderController {
+public class DevelopmentOrderController extends BaseController {
 
     private final DevelopmentOrderService developmentOrderService;
 
@@ -26,21 +30,21 @@ public class DevelopmentOrderController {
         return developmentOrderService.getList(developmentOrderBo, pageQuery);
     }
 
-    @GetMapping("/add")
+    @PostMapping("/add")
     @SaCheckPermission("fa:development:add")
-    public int add(@Validated(AddGroup.class) @RequestBody DevelopmentOrderBo developmentOrderBo) {
-        return developmentOrderService.insert(developmentOrderBo);
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody DevelopmentOrderBo developmentOrderBo) {
+        return toAjax(developmentOrderService.insert(developmentOrderBo));
     }
 
-    @GetMapping("/edit")
+    @PutMapping("/edit")
     @SaCheckPermission("fa:development:edit")
-    public int edit(@Validated(EditGroup.class) @RequestBody DevelopmentOrderBo developmentOrderBo) {
-        return developmentOrderService.update(developmentOrderBo);
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody List<DevelopmentOrderBo> developmentOrderBo) {
+        return toAjax(developmentOrderService.update(developmentOrderBo));
     }
 
-    @GetMapping("/delete/{ids}")
+    @DeleteMapping("/delete/{ids}")
     @SaCheckPermission("fa:development:delete")
-    public int delete(@PathVariable Long[] ids) {
-        return developmentOrderService.delete(ids);
+    public R<Void> delete(@PathVariable Long[] ids) {
+        return toAjax(developmentOrderService.delete(ids));
     }
 }

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/domain/DevelopmentOrder.java

@@ -19,7 +19,7 @@ import java.util.Date;
 @EqualsAndHashCode(callSuper = true)
 public class DevelopmentOrder extends TenantEntity {
 
-    private Long id;
+    private int id;
 
     /**
      * 订单编号
@@ -39,7 +39,7 @@ public class DevelopmentOrder extends TenantEntity {
     /**
      * 款号
      */
-    private String itemNumber;
+    private String kuanhao;
 
     /**
      * 参考图
@@ -64,17 +64,17 @@ public class DevelopmentOrder extends TenantEntity {
     /**
      * 面料
      */
-    private String fabric;
+    private String mianliao;
 
     /**
      * 设计师ID
      */
-    private Long designUserId;
+    private Long designUserid;
 
     /**
      * 确认人ID
      */
-    private Long confirmUserId;
+    private Long confirmUserid;
 
     /**
      * 设计文件
@@ -89,7 +89,7 @@ public class DevelopmentOrder extends TenantEntity {
     /**
      * 调色师ID
      */
-    private Long colorUserId;
+    private Long colorUserid;
 
     /**
      * 调试文件
@@ -99,7 +99,7 @@ public class DevelopmentOrder extends TenantEntity {
     /**
      * 排版师ID
      */
-    private Long layoutUserId;
+    private Long layoutUserid;
 
     /**
      * 打版文件
@@ -126,92 +126,95 @@ public class DevelopmentOrder extends TenantEntity {
     /**
      * 取消时间
      */
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime cancelTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date cancelTime;
 
     /**
      * 画图开始时间
      */
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime status1StartTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date status_1StartTime;
 
     /**
      * 画图结束时间
      */
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime status1EndTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date status_1EndTime;
 
     /**
      * 调色开始时间
      */
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime status2StartTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date status_2StartTime;
 
     /**
      * 调色结束时间
      */
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime status2EndTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date status_2EndTime;
 
     /**
      * 确认开始时间
      */
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime status3StartTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date status_3StartTime;
 
     /**
      * 确认结束时间
      */
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime status3EndTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date status_3EndTime;
 
     /**
      * 排版开始时间
      */
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime status4StartTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date status_4StartTime;
 
     /**
      * 排版结束时间
      */
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime status4EndTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date status_4EndTime;
 
     /**
      * 打版开始时间
      */
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime status5StartTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date status_5StartTime;
 
     /**
      * 打版结束时间
      */
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime status5EndTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date status_5EndTime;
 
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime status6StartTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date status_6StartTime;
 
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime status6EndTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date status_6EndTime;
 
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime status7StartTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date status_7StartTime;
 
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime status7EndTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date status_7EndTime;
 
+    /**
+     * 客户/复色文件
+     */
     private String customerFile;
 
     /**
      * 大货款号
      */
-    private String largePaymentNumber;
+    private String dahuoKuanhao;
 
     /**
      * 花型号
      */
-    private String flowerModel;
+    private String huaxinghao;
 
     private String remark;
 

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/domain/bo/DevelopmentOrderBo.java

@@ -25,7 +25,7 @@ import java.util.Date;
 public class DevelopmentOrderBo extends BaseEntity {
 
     @NotNull(message = "ID不能为空", groups = {EditGroup.class})
-    private Long id;
+    private int id;
 
     /**
      * 订单编号
@@ -47,7 +47,7 @@ public class DevelopmentOrderBo extends BaseEntity {
      * 款号
      */
     @NotBlank(message = "款号不能为空", groups = {EditGroup.class})
-    private String itemNumber;
+    private String kuanhao;
 
     /**
      * 参考图
@@ -60,7 +60,7 @@ public class DevelopmentOrderBo extends BaseEntity {
     private String designImage;
 
     /**
-     * 纸张设计文件
+     * 纸样文件
      */
     private String paperDesignFile;
 
@@ -74,17 +74,17 @@ public class DevelopmentOrderBo extends BaseEntity {
      * 面料
      */
     @NotBlank(message = "面料名称不能为空", groups = {AddGroup.class, EditGroup.class})
-    private String fabric;
+    private String mianliao;
 
     /**
      * 设计师ID
      */
-    private Long designUserId;
+    private Long designUserid;
 
     /**
      * 确认人ID
      */
-    private Long confirmUserId;
+    private Long confirmUserid;
 
     /**
      * 设计文件
@@ -99,17 +99,17 @@ public class DevelopmentOrderBo extends BaseEntity {
     /**
      * 调色师ID
      */
-    private Long colorUserId;
+    private Long colorUserid;
 
     /**
-     * 调试文件
+     * 调色文件
      */
     private String colorFile;
 
     /**
      * 排版师ID
      */
-    private Long layoutUserId;
+    private Long layoutUserid;
 
     /**
      * 排版文件
@@ -136,87 +136,103 @@ public class DevelopmentOrderBo extends BaseEntity {
      * 6已完成
      * 99已取消
      */
-    private Long status;
+    private Integer status;
 
     /**
-     * 是否排版
+     * 是否排版 0:是 1:否
      */
+    @NotNull(message = "是否排版不能为空", groups = {AddGroup.class, EditGroup.class})
     private Integer isLayout;
 
-    /**
-     * 取消时间
-     */
-    private LocalDateTime cancelTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date cancelTime;
 
     /**
      * 画图开始时间
      */
-    private LocalDateTime status1StartTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date status1StartTime;
 
     /**
      * 画图结束时间
      */
-    private LocalDateTime status1EndTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date status1EndTime;
 
     /**
      * 调色开始时间
      */
-    private LocalDateTime status2StartTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date status2StartTime;
 
     /**
      * 调色结束时间
      */
-    private LocalDateTime status2EndTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date status2EndTime;
 
     /**
      * 确认开始时间
      */
-    private LocalDateTime status3StartTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date status3StartTime;
 
     /**
      * 确认结束时间
      */
-    private LocalDateTime status3EndTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date status3EndTime;
 
     /**
      * 排版开始时间
      */
-    private LocalDateTime status4StartTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date status4StartTime;
 
     /**
      * 排版结束时间
      */
-    private LocalDateTime status4EndTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date status4EndTime;
 
     /**
      * 打版开始时间
      */
-    private LocalDateTime status5StartTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date status5StartTime;
 
     /**
      * 打版结束时间
      */
-    private LocalDateTime status5EndTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date status5EndTime;
 
-    private LocalDateTime status6StartTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date status6StartTime;
 
-    private LocalDateTime status6EndTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date status6EndTime;
 
-    private LocalDateTime status7StartTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date status7StartTime;
 
-    private LocalDateTime status7EndTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date status7EndTime;
 
+    /**
+     * 客户/复色文件
+     */
     private String customerFile;
 
     /**
      * 大货款号
      */
-    private String largePaymentNumber;
+    private String dahuoKuanhao;
 
     /**
      * 花型号
      */
-    private String flowerModel;
+    private String huaxinghao;
 
     private String remark;
 

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/domain/vo/DevelopmentOrderTableDataInfo.java

@@ -30,14 +30,14 @@ public class DevelopmentOrderTableDataInfo<T> implements Serializable {
     public static class DataWrapper<T> {
         private List<T> list;
         private long total;
-        private Map<Long, String> map;
+        private Map<Integer, String> map;
 
         public DataWrapper(List<T> list, long total) {
             this.list = list;
             this.total = total;
         }
 
-        public DataWrapper(List<T> list, long total, Map<Long, String> map) {
+        public DataWrapper(List<T> list, long total, Map<Integer, String> map) {
             this.list = list;
             this.total = total;
             this.map = map;
@@ -82,7 +82,7 @@ public class DevelopmentOrderTableDataInfo<T> implements Serializable {
         this.data = new DataWrapper<>(list, total);
     }
 
-    public DevelopmentOrderTableDataInfo(List<T> list, long total, Map<Long, String> map) {
+    public DevelopmentOrderTableDataInfo(List<T> list, long total, Map<Integer, String> map) {
         this.data = new DataWrapper<>(list, total, map);
     }
 
@@ -96,7 +96,7 @@ public class DevelopmentOrderTableDataInfo<T> implements Serializable {
         return rspData;
     }
 
-    public static <T> DevelopmentOrderTableDataInfo<T> build(IPage<T> page, Map<Long, String> map) {
+    public static <T> DevelopmentOrderTableDataInfo<T> build(IPage<T> page, Map<Integer, String> map) {
         DevelopmentOrderTableDataInfo<T> rspData = new DevelopmentOrderTableDataInfo<>(page.getRecords(), page.getTotal(), map);
         rspData.setCode(HttpStatus.HTTP_OK);
         rspData.setMsg("查询成功");

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/domain/vo/DevelopmentOrderVo.java

@@ -24,7 +24,7 @@ import java.util.List;
 @AutoMapper(target = DevelopmentOrder.class)
 public class DevelopmentOrderVo extends BaseEntity {
 
-    private Long id;
+    private int id;
 
     /**
      * 订单编号
@@ -44,7 +44,7 @@ public class DevelopmentOrderVo extends BaseEntity {
     /**
      * 款号
      */
-    private String itemNumber;
+    private String kuanhao;
 
     /**
      * 参考图
@@ -54,7 +54,7 @@ public class DevelopmentOrderVo extends BaseEntity {
     /**
      * 参考图列表
      */
-    private List<OssDTO> refernceImageList;
+//    private List<OssDTO> refernceImageList;
 
     /**
      * 设计图
@@ -64,7 +64,7 @@ public class DevelopmentOrderVo extends BaseEntity {
     /**
      * 设计图列表
      */
-    private List<OssDTO> designImageList;
+//    private List<OssDTO> designImageList;
 
     /**
      * 纸张设计文件
@@ -74,7 +74,7 @@ public class DevelopmentOrderVo extends BaseEntity {
     /**
      * 纸张设计文件列表
      */
-    private List<OssDTO> paperDesignFileList;
+//    private List<OssDTO> paperDesignFileList;
 
     /**
      * 开发描述
@@ -84,17 +84,17 @@ public class DevelopmentOrderVo extends BaseEntity {
     /**
      * 面料
      */
-    private String fabric;
+    private String mianliao;
 
     /**
      * 设计师ID
      */
-    private Long designUserId;
+    private Long designUserid;
 
     /**
      * 确认人ID
      */
-    private Long confirmUserId;
+    private Long confirmUserid;
 
     /**
      * 设计文件
@@ -104,7 +104,7 @@ public class DevelopmentOrderVo extends BaseEntity {
     /**
      * 设计文件列表
      */
-    private List<OssDTO> designFileList;
+//    private List<OssDTO> designFileList;
 
     /**
      * 设计素材
@@ -114,12 +114,12 @@ public class DevelopmentOrderVo extends BaseEntity {
     /**
      * 素材列表
      */
-    private List<OssDTO> designMaterialList;
+//    private List<OssDTO> designMaterialList;
 
     /**
      * 调色师ID
      */
-    private Long colorUserId;
+    private Long colorUserid;
 
     /**
      * 调试文件
@@ -129,12 +129,22 @@ public class DevelopmentOrderVo extends BaseEntity {
     /**
      * 调试文件列表
      */
-    private List<OssDTO> colorFileList;
+//    private List<OssDTO> colorFileList;
 
     /**
      * 排版师ID
      */
-    private Long layoutUserId;
+    private Long layoutUserid;
+
+    /**
+     * 排版文件
+     */
+    private String layoutFile;
+
+    /**
+     * 打版师ID
+     */
+    private Long patternUserid;
 
     /**
      * 打版文件
@@ -144,7 +154,7 @@ public class DevelopmentOrderVo extends BaseEntity {
     /**
      * 打版文件列表
      */
-    private List<OssDTO> patternFileList;
+//    private List<OssDTO> patternFileList;
 
     /**
      * 0待处理
@@ -156,7 +166,7 @@ public class DevelopmentOrderVo extends BaseEntity {
      * 6已完成
      * 99已取消
      */
-    private Long status;
+    private Integer status;
 
     /**
      * 是否排版
@@ -166,92 +176,95 @@ public class DevelopmentOrderVo extends BaseEntity {
     /**
      * 取消时间
      */
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime cancelTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date cancelTime;
 
     /**
      * 画图开始时间
      */
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime status1StartTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date status_1StartTime;
 
     /**
      * 画图结束时间
      */
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime status1EndTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date status_1EndTime;
 
     /**
      * 调色开始时间
      */
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime status2StartTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date status_2StartTime;
 
     /**
      * 调色结束时间
      */
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime status2EndTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date status_2EndTime;
 
     /**
      * 确认开始时间
      */
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime status3StartTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date status_3StartTime;
 
     /**
      * 确认结束时间
      */
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime status3EndTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date status_3EndTime;
 
     /**
      * 排版开始时间
      */
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime status4StartTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date status_4StartTime;
 
     /**
      * 排版结束时间
      */
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime status4EndTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date status_4EndTime;
 
     /**
      * 打版开始时间
      */
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime status5StartTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date status_5StartTime;
 
     /**
      * 打版结束时间
      */
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime status5EndTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date status_5EndTime;
 
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime status6StartTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date status_6StartTime;
 
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime status6EndTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date status_6EndTime;
 
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime status7StartTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date status_7StartTime;
 
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime status7EndTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date status_7EndTime;
 
+    /**
+     * 客户/复色文件
+     */
     private String customerFile;
 
     /**
      * 大货款号
      */
-    private String largePaymentNumber;
+    private String dahuoKuanhao;
 
     /**
      * 花型号
      */
-    private String flowerModel;
+    private String huaxinghao;
 
     private String remark;
 

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/mapper/DevelopmentOrderMapper.java

@@ -20,7 +20,7 @@ public interface DevelopmentOrderMapper extends BaseMapperPlus<DevelopmentOrder,
      * @param statusCodes 状态列表
      * @return 状态统计结果
      */
-    List<Map<String, Object>> countStatusBatch(@Param("statusCodes") Collection<Long> statusCodes);
+    List<Map<String, Object>> countStatusBatch(@Param("statusCodes") Collection<Integer> statusCodes);
 
-    int getCountWithCondition(@Param("status") Long status, @Param("statusFieldName") String statusFieldName);
-}
+    int getCountWithCondition(@Param("status") Integer status, @Param("statusFieldName") String statusFieldName);
+}

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/service/DevelopmentOrderService.java

@@ -6,17 +6,19 @@ import org.dromara.bulk.domain.vo.DevelopmentOrderTableDataInfo;
 import org.dromara.bulk.domain.vo.DevelopmentOrderVo;
 import org.dromara.common.mybatis.core.page.PageQuery;
 
+import java.util.List;
+
 public interface DevelopmentOrderService {
 
     DevelopmentOrderTableDataInfo<DevelopmentOrderVo> getList(DevelopmentOrderBo developmentOrderBo, PageQuery pageQuery);
 
     int insert(DevelopmentOrderBo developmentOrder);
 
-    int update(DevelopmentOrderBo developmentOrder);
+    boolean update(List<DevelopmentOrderBo> developmentOrderBo);
 
     int delete(Long[] id);
 
-    DevelopmentOrderVo selectById(Long id);
+    DevelopmentOrderVo selectById(int id);
 
     /**
      * 状态参数校验

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/service/DevelopmentOrderState.java

@@ -0,0 +1,14 @@
+package org.dromara.bulk.service;
+
+import org.dromara.bulk.domain.bo.DevelopmentOrderBo;
+import org.dromara.bulk.domain.vo.DevelopmentOrderVo;
+
+/**
+ * 订单状态模式
+ */
+
+public interface DevelopmentOrderState {
+
+    void handle(DevelopmentOrderBo developmentOrderBo, DevelopmentOrderVo developmentOrderVo);
+
+}

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/service/impl/DevelopmentOrderServiceImpl.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.RequiredArgsConstructor;
+import org.dromara.bulk.context.DevelopmentOrderContext;
 import org.dromara.bulk.domain.DevelopmentOrder;
 import org.dromara.bulk.domain.DevelopmentOrderRemark;
 import org.dromara.bulk.domain.bo.DevelopmentOrderBo;
@@ -14,6 +15,8 @@ import org.dromara.bulk.domain.vo.DevelopmentOrderVo;
 import org.dromara.bulk.mapper.DevelopmentOrderMapper;
 import org.dromara.bulk.mapper.DevelopmentOrderRemarkMapper;
 import org.dromara.bulk.service.DevelopmentOrderService;
+import org.dromara.bulk.service.DevelopmentOrderState;
+import org.dromara.bulk.service.stateModeServiceImpl.*;
 import org.dromara.common.core.constant.DevelopmentOrderConstants;
 import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.core.service.OssService;
@@ -22,16 +25,12 @@ import org.dromara.common.core.utils.OrderNumberGenerator;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.satoken.utils.LoginHelper;
-import org.dromara.common.tenant.helper.TenantHelper;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeParseException;
 import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * 开发订单Service业务层处理
@@ -46,7 +45,7 @@ public class DevelopmentOrderServiceImpl implements DevelopmentOrderService {
     /**
      * 创建所有状态的常量Set集合
      */
-    private static final Set<Long> STATUS_CODES = Set.of(
+    private static final Set<Integer> STATUS_CODES = Set.of(
             DevelopmentOrderConstants.PENDING_PROCESSING,
             DevelopmentOrderConstants.IN_THE_DRAWING,
             DevelopmentOrderConstants.CONFIRMING_IN_PROGRESS,
@@ -58,12 +57,13 @@ public class DevelopmentOrderServiceImpl implements DevelopmentOrderService {
             DevelopmentOrderConstants.CANCELLED
     );
 
-    private static final Map<Long, String> SPECIAL_STATUS_FIELDS = new HashMap<>();
+    private static final Map<Integer, String> SPECIAL_STATUS_FIELDS = new HashMap<>();
+
     static {
-        SPECIAL_STATUS_FIELDS.put(DevelopmentOrderConstants.CONFIRMING_IN_PROGRESS, "confirm_user_id");
-        SPECIAL_STATUS_FIELDS.put(DevelopmentOrderConstants.IN_COLOR_ADJUSTMENT, "color_user_id");
-        SPECIAL_STATUS_FIELDS.put(DevelopmentOrderConstants.IN_TYPESETTING, "layout_user_id");
-        SPECIAL_STATUS_FIELDS.put(DevelopmentOrderConstants.PRINTING_IN_PROGRESS, "pattern_user_id");
+        SPECIAL_STATUS_FIELDS.put(DevelopmentOrderConstants.CONFIRMING_IN_PROGRESS, "confirm_userid");
+        SPECIAL_STATUS_FIELDS.put(DevelopmentOrderConstants.IN_COLOR_ADJUSTMENT, "color_userid");
+        SPECIAL_STATUS_FIELDS.put(DevelopmentOrderConstants.IN_TYPESETTING, "layout_userid");
+        SPECIAL_STATUS_FIELDS.put(DevelopmentOrderConstants.PRINTING_IN_PROGRESS, "pattern_userid");
     }
 
     @Override
@@ -80,41 +80,40 @@ public class DevelopmentOrderServiceImpl implements DevelopmentOrderService {
             List<DevelopmentOrderRemarkVo> developmentOrderRemarkVoList = developmentOrderRemarkMapper.selectVoList(remarkQueryWrapper);
             item.setDevelopmentOrderRemarkVoList(developmentOrderRemarkVoList);
 //          查询各个文件URL
-            item.setColorFileList(ossService.selectByIds(item.getColorFile()));
-            item.setDesignFileList(ossService.selectByIds(item.getDesignFile()));
-            item.setDesignMaterialList(ossService.selectByIds(item.getDesignMaterial()));
-            item.setDesignImageList(ossService.selectByIds(item.getDesignImage()));
-            item.setPaperDesignFileList(ossService.selectByIds(item.getPaperDesignFile()));
-            item.setPatternFileList(ossService.selectByIds(item.getPatternFile()));
-            item.setRefernceImageList(ossService.selectByIds(item.getReferenceImage()));
+//            item.setColorFileList(ossService.selectByIds(item.getColorFile()));
+//            item.setDesignFileList(ossService.selectByIds(item.getDesignFile()));
+//            item.setDesignMaterialList(ossService.selectByIds(item.getDesignMaterial()));
+//            item.setDesignImageList(ossService.selectByIds(item.getDesignImage()));
+//            item.setPaperDesignFileList(ossService.selectByIds(item.getPaperDesignFile()));
+//            item.setPatternFileList(ossService.selectByIds(item.getPatternFile()));
+//            item.setRefernceImageList(ossService.selectByIds(item.getReferenceImage()));
         });
-        Map<Long, String> statusCount = getStatusCount();
+        Map<Integer, String> statusCount = getStatusCount();
         // 组装数据返回
         return DevelopmentOrderTableDataInfo.build(page, statusCount);
     }
 
     /**
      * 查询每个状态的数量
+     *
      * @return
      */
-    public Map<Long, String> getStatusCount() {
-        // 定义所有的状态代码
-        Set<Long> allStatusCodes = Set.of(0L, 1L, 2L, 3L, 4L, 5L, 6L, 7L, 8L);
+    public Map<Integer, String> getStatusCount() {
         // 调用 Mapper 方法获取 List<Map<String, Object>>
         List<Map<String, Object>> resultList = developmentOrderMapper.countStatusBatch(STATUS_CODES);
         // 将 List<Map<String, Object>> 转换为 Map<Long, Integer>
-        Map<Long, Integer> result = new HashMap<>();
-        for (Long statusCode : allStatusCodes) {
+        Map<Integer, Integer> result = new HashMap<>();
+        for (Integer statusCode : STATUS_CODES) {
             result.put(statusCode, 0); // 初始化所有状态代码，默认值为0
         }
         for (Map<String, Object> row : resultList) {
-            Long key = ((Number) row.get("key")).longValue();
+            Integer key = (Integer) row.get("key");
             Integer value = ((Number) row.get("value")).intValue();
             result.put(key, value);
         }
-        Map<Long, String> statusCountMap = new HashMap<>();
-        for (Map.Entry<Long, Integer> entry : result.entrySet()) {
-            Long status = entry.getKey();
+        Map<Integer, String> statusCountMap = new HashMap<>();
+        for (Map.Entry<Integer, Integer> entry : result.entrySet()) {
+            Integer status = entry.getKey();
             Integer baseCount = entry.getValue();
 
             statusCountMap.put(status, String.valueOf(baseCount));
@@ -135,11 +134,14 @@ public class DevelopmentOrderServiceImpl implements DevelopmentOrderService {
         if (StringUtils.isNotBlank(bo.getCustomerName())) {
             queryWrapper.like(DevelopmentOrder::getCustomerName, bo.getCustomerName());
         }
-        if (StringUtils.isNotBlank(bo.getFabric())) {
-            queryWrapper.like(DevelopmentOrder::getFabric, bo.getFabric());
+        if (StringUtils.isNotBlank(bo.getMianliao())) {
+            queryWrapper.like(DevelopmentOrder::getMianliao, bo.getMianliao());
+        }
+        if (StringUtils.isNotBlank(bo.getKuanhao())) {
+            queryWrapper.like(DevelopmentOrder::getKuanhao, bo.getKuanhao());
         }
-        if (StringUtils.isNotBlank(bo.getItemNumber())) {
-            queryWrapper.like(DevelopmentOrder::getItemNumber, bo.getItemNumber());
+        if (bo.getStatus() != null) {
+            queryWrapper.eq(DevelopmentOrder::getStatus, bo.getStatus());
         }
 
         // 时间范围处理
@@ -166,9 +168,9 @@ public class DevelopmentOrderServiceImpl implements DevelopmentOrderService {
     }
 
     @Override
-    public int update(DevelopmentOrderBo developmentOrderBo) {
-        checkStatus(developmentOrderBo);
-        return developmentOrderMapper.updateById(MapstructUtils.convert(developmentOrderBo, DevelopmentOrder.class));
+    public boolean update(List<DevelopmentOrderBo> developmentOrderBo) {
+        developmentOrderBo.forEach(this::checkStatus);
+        return developmentOrderMapper.updateBatchById(MapstructUtils.convert(developmentOrderBo, DevelopmentOrder.class));
     }
 
     /**
@@ -190,68 +192,35 @@ public class DevelopmentOrderServiceImpl implements DevelopmentOrderService {
     }
 
     @Override
-    public DevelopmentOrderVo selectById(Long id) {
+    public DevelopmentOrderVo selectById(int id) {
         return MapstructUtils.convert(developmentOrderMapper.selectById(id), DevelopmentOrderVo.class);
     }
 
     @Override
     public void checkStatus(DevelopmentOrderBo developmentOrderBo) {
-//      状态为画图中
-        if (developmentOrderBo.getStatus().equals(DevelopmentOrderConstants.IN_THE_DRAWING)) {
-            assertNotLongBlank(developmentOrderBo.getDesignUserId(), "设计师不能为空");
-            assertNotBlank(developmentOrderBo.getDesignFile(), "设计文件不能为空");
-            assertNotBlank(developmentOrderBo.getDesignImage(), "设计图片不能为空");
-            assertNotBlank(developmentOrderBo.getDesignMaterial(), "素材图片不能为空");
-//          设置画图开始时间
-            developmentOrderBo.setStatus1StartTime(LocalDateTime.now());
-        }
-//      状态为确认中
-        if (developmentOrderBo.getStatus().equals(DevelopmentOrderConstants.CONFIRMING_IN_PROGRESS)) {
-            assertNotLongBlank(developmentOrderBo.getConfirmUserId(), "确认人不能为空");
-            assertNotBlank(developmentOrderBo.getPaperDesignFile(), "纸样文件不能为空");
-//          设置画图结束时间
-            developmentOrderBo.setStatus1EndTime(LocalDateTime.now());
-//          设置确认开始时间
-            developmentOrderBo.setStatus2StartTime(LocalDateTime.now());
-        }
-//      状态为调色中
-        if (developmentOrderBo.getStatus().equals(DevelopmentOrderConstants.IN_COLOR_ADJUSTMENT)) {
-            assertNotLongBlank(developmentOrderBo.getColorUserId(), "调色人不能为空");
-            assertNotBlank(developmentOrderBo.getColorFile(), "调色文件不能为空");
-//          设置确认结束时间
-            developmentOrderBo.setStatus2EndTime(LocalDateTime.now());
-//          设置调色开始时间
-            developmentOrderBo.setStatus3StartTime(LocalDateTime.now());
-        }
-//      状态为排版中
-        if (developmentOrderBo.getStatus().equals(DevelopmentOrderConstants.IN_TYPESETTING)) {
-            assertNotLongBlank(developmentOrderBo.getLayoutUserId(), "排版人不能为空");
-            assertNotBlank(developmentOrderBo.getLayoutFile(), "排版文件不能为空");
-//          设置调色结束时间
-            developmentOrderBo.setStatus3EndTime(LocalDateTime.now());
-//          设置排版开始时间
-            developmentOrderBo.setStatus4StartTime(LocalDateTime.now());
-        }
-//      状态为打版中
-        if (developmentOrderBo.getStatus().equals(DevelopmentOrderConstants.PRINTING_IN_PROGRESS)) {
-            assertNotLongBlank(developmentOrderBo.getPatternUserid(), "打版人不能为空");
-            assertNotBlank(developmentOrderBo.getPatternFile(), "打版文件不能为空");
-//      设置排版结束时间
-            developmentOrderBo.setStatus4EndTime(LocalDateTime.now());
-//      设置打版开始时间
-            developmentOrderBo.setStatus5StartTime(LocalDateTime.now());
-        }
-//      状态为已完成
-        if (developmentOrderBo.getStatus().equals(DevelopmentOrderConstants.COMPLETED)) {
-
-        }
-//      状态为取消
-        if (developmentOrderBo.getStatus().equals(DevelopmentOrderConstants.CANCELLED)) {
-            if (!developmentOrderBo.getStatus().equals(DevelopmentOrderConstants.CONFIRMING_IN_PROGRESS)) {
-                throw new ServiceException("状态为确认中才可以取消");
-            }
-            developmentOrderBo.setCancelTime(LocalDateTime.now());
-        }
+        DevelopmentOrderVo developmentOrderVo = selectById(developmentOrderBo.getId());
+        developmentOrderBo.setOrderNum(developmentOrderVo.getOrderNum());
+        developmentOrderBo.setStatus(developmentOrderVo.getStatus());
+        DevelopmentOrderState initialState = switch (developmentOrderBo.getStatus()) {
+//          待处理
+            case DevelopmentOrderConstants.PENDING_PROCESSING -> new PendingStatusServiceImpl();
+//          画图中
+            case DevelopmentOrderConstants.IN_THE_DRAWING -> new StateInDrawingServiceImpl();
+//          确认中
+            case DevelopmentOrderConstants.CONFIRMING_IN_PROGRESS -> new ConfirmTheStatusInProgressServiceImpl();
+//          调色中
+            case DevelopmentOrderConstants.IN_COLOR_ADJUSTMENT -> new ColorGradingStatusServiceImpl();
+//          排版中
+            case DevelopmentOrderConstants.IN_TYPESETTING -> new StatusInTypesettingServiceImpl();
+//          打版中
+            case DevelopmentOrderConstants.PRINTING_IN_PROGRESS -> new PrintingStatusServiceImpl();
+//          已完成
+            case DevelopmentOrderConstants.COMPLETED -> new CompletedStatusServiceImpl();
+            default -> throw new IllegalStateException("意外状态: " + developmentOrderBo.getStatus());
+        };
+
+        DevelopmentOrderContext context = new DevelopmentOrderContext(initialState);
+        context.handle(developmentOrderBo, developmentOrderVo);
     }
 
     public static void assertNotLongBlank(Long longId, String errorMessage) {

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/service/stateModeServiceImpl/ColorGradingStatusServiceImpl.java

@@ -0,0 +1,37 @@
+package org.dromara.bulk.service.stateModeServiceImpl;
+
+import org.dromara.bulk.domain.bo.DevelopmentOrderBo;
+import org.dromara.bulk.domain.vo.DevelopmentOrderVo;
+import org.dromara.bulk.service.DevelopmentOrderState;
+import org.dromara.common.core.constant.DevelopmentOrderConstants;
+
+import java.util.Date;
+
+import static org.dromara.bulk.service.impl.DevelopmentOrderServiceImpl.assertNotBlank;
+import static org.dromara.bulk.service.impl.DevelopmentOrderServiceImpl.assertNotLongBlank;
+
+/**
+ * 调色中状态实现类
+ */
+public class ColorGradingStatusServiceImpl implements DevelopmentOrderState {
+    @Override
+    public void handle(DevelopmentOrderBo developmentOrderBo, DevelopmentOrderVo developmentOrderVo) {
+        if ((developmentOrderVo.getColorUserid() == null || developmentOrderVo.getColorUserid() == 0) &&
+                developmentOrderVo.getColorFile() == null) {
+            assertNotLongBlank(developmentOrderBo.getColorUserid(), "订单" + developmentOrderBo.getOrderNum() + ":调色人不能为空");
+            assertNotBlank(developmentOrderBo.getColorFile(), "订单" + developmentOrderBo.getOrderNum() + ":调色文件不能为空");
+        } else {
+            //          设置调色结束时间
+            developmentOrderBo.setStatus3EndTime(new Date());
+            //          设置排版开始时间
+            developmentOrderBo.setStatus4StartTime(new Date());
+            //          判断是否排版
+            if (developmentOrderVo.getIsLayout() == 0) {
+                //              设置状态为排版中
+                developmentOrderBo.setStatus(DevelopmentOrderConstants.IN_TYPESETTING);
+            } else {
+                developmentOrderBo.setStatus(DevelopmentOrderConstants.PRINTING_IN_PROGRESS);
+            }
+        }
+    }
+}

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/service/stateModeServiceImpl/CompletedStatusServiceImpl.java

@@ -0,0 +1,15 @@
+package org.dromara.bulk.service.stateModeServiceImpl;
+
+import org.dromara.bulk.domain.bo.DevelopmentOrderBo;
+import org.dromara.bulk.domain.vo.DevelopmentOrderVo;
+import org.dromara.bulk.service.DevelopmentOrderState;
+
+/**
+ * 已完成状态实现类
+ */
+public class CompletedStatusServiceImpl implements DevelopmentOrderState {
+    @Override
+    public void handle(DevelopmentOrderBo developmentOrderBo, DevelopmentOrderVo developmentOrderVo) {
+
+    }
+}

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/service/stateModeServiceImpl/ConfirmTheStatusInProgressServiceImpl.java

@@ -0,0 +1,32 @@
+package org.dromara.bulk.service.stateModeServiceImpl;
+
+import org.dromara.bulk.domain.bo.DevelopmentOrderBo;
+import org.dromara.bulk.domain.vo.DevelopmentOrderVo;
+import org.dromara.bulk.service.DevelopmentOrderState;
+import org.dromara.common.core.constant.DevelopmentOrderConstants;
+
+import java.util.Date;
+
+import static org.dromara.bulk.service.impl.DevelopmentOrderServiceImpl.assertNotBlank;
+import static org.dromara.bulk.service.impl.DevelopmentOrderServiceImpl.assertNotLongBlank;
+
+/**
+ * 确认中状态实现类
+ */
+public class ConfirmTheStatusInProgressServiceImpl implements DevelopmentOrderState {
+    @Override
+    public void handle(DevelopmentOrderBo developmentOrderBo, DevelopmentOrderVo developmentOrderVo) {
+        if ((developmentOrderVo.getConfirmUserid() == null || developmentOrderVo.getConfirmUserid() == 0) &&
+                developmentOrderVo.getPaperDesignFile() == null) {
+            assertNotLongBlank(developmentOrderBo.getConfirmUserid(), "订单" + developmentOrderBo.getOrderNum() + ":确认人不能为空");
+            assertNotBlank(developmentOrderBo.getPaperDesignFile(), "订单" + developmentOrderBo.getOrderNum() + ":纸样文件不能为空");
+        } else {
+            //          设置确认结束时间
+            developmentOrderBo.setStatus2EndTime(new Date());
+//          设置调色开始时间
+            developmentOrderBo.setStatus3StartTime(new Date());
+//                  设置状态为调色中
+            developmentOrderBo.setStatus(DevelopmentOrderConstants.IN_COLOR_ADJUSTMENT);
+        }
+    }
+}

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/service/stateModeServiceImpl/PendingStatusServiceImpl.java

@@ -0,0 +1,22 @@
+package org.dromara.bulk.service.stateModeServiceImpl;
+
+import org.dromara.bulk.domain.bo.DevelopmentOrderBo;
+import org.dromara.bulk.domain.vo.DevelopmentOrderVo;
+import org.dromara.bulk.service.DevelopmentOrderState;
+import org.dromara.common.core.constant.DevelopmentOrderConstants;
+
+import java.util.Date;
+
+/**
+ * 待处理状态实现类
+ */
+
+public class PendingStatusServiceImpl implements DevelopmentOrderState {
+    @Override
+    public void handle(DevelopmentOrderBo developmentOrderBo, DevelopmentOrderVo developmentOrderVo) {
+        //      设置状态为画图中
+        developmentOrderBo.setStatus(DevelopmentOrderConstants.IN_THE_DRAWING);
+        //      设置画图开始时间
+        developmentOrderBo.setStatus1StartTime(new Date());
+    }
+}

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/service/stateModeServiceImpl/PrintingStatusServiceImpl.java

@@ -0,0 +1,30 @@
+package org.dromara.bulk.service.stateModeServiceImpl;
+
+import org.dromara.bulk.domain.bo.DevelopmentOrderBo;
+import org.dromara.bulk.domain.vo.DevelopmentOrderVo;
+import org.dromara.bulk.service.DevelopmentOrderState;
+import org.dromara.common.core.constant.DevelopmentOrderConstants;
+
+import java.util.Date;
+
+import static org.dromara.bulk.service.impl.DevelopmentOrderServiceImpl.assertNotBlank;
+import static org.dromara.bulk.service.impl.DevelopmentOrderServiceImpl.assertNotLongBlank;
+
+/**
+ * 打版状态实现类
+ */
+public class PrintingStatusServiceImpl implements DevelopmentOrderState {
+    @Override
+    public void handle(DevelopmentOrderBo developmentOrderBo, DevelopmentOrderVo developmentOrderVo) {
+        if ((developmentOrderVo.getPatternUserid() == null || developmentOrderVo.getPatternUserid() == 0) &&
+                developmentOrderVo.getPatternFile() == null) {
+            assertNotLongBlank(developmentOrderBo.getPatternUserid(), "订单" + developmentOrderBo.getOrderNum() + ":打版人不能为空");
+            assertNotBlank(developmentOrderBo.getPatternFile(), "订单" + developmentOrderBo.getOrderNum() + ":打版文件不能为空");
+        } else {
+            //              设置打版结束时间
+            developmentOrderBo.setStatus5EndTime(new Date());
+//                  设置状态为已完成
+            developmentOrderBo.setStatus(DevelopmentOrderConstants.COMPLETED);
+        }
+    }
+}

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/service/stateModeServiceImpl/StateInDrawingServiceImpl.java

@@ -0,0 +1,34 @@
+package org.dromara.bulk.service.stateModeServiceImpl;
+
+import org.dromara.bulk.domain.bo.DevelopmentOrderBo;
+import org.dromara.bulk.domain.vo.DevelopmentOrderVo;
+import org.dromara.bulk.service.DevelopmentOrderState;
+import org.dromara.common.core.constant.DevelopmentOrderConstants;
+
+import java.util.Date;
+
+import static org.dromara.bulk.service.impl.DevelopmentOrderServiceImpl.assertNotBlank;
+import static org.dromara.bulk.service.impl.DevelopmentOrderServiceImpl.assertNotLongBlank;
+
+/**
+ * 画图中状态实现类
+ */
+public class StateInDrawingServiceImpl implements DevelopmentOrderState {
+    @Override
+    public void handle(DevelopmentOrderBo developmentOrderBo, DevelopmentOrderVo developmentOrderVo) {
+        if ((developmentOrderVo.getDesignUserid() == null || developmentOrderVo.getDesignUserid() == 0) && developmentOrderVo.getDesignFile() == null
+                && developmentOrderVo.getDesignImage() == null && developmentOrderVo.getDesignMaterial() == null) {
+            assertNotLongBlank(developmentOrderBo.getDesignUserid(), "订单" + developmentOrderBo.getOrderNum() + ":设计师不能为空");
+            assertNotBlank(developmentOrderBo.getDesignFile(), "订单" + developmentOrderBo.getOrderNum() + ":设计文件不能为空");
+            assertNotBlank(developmentOrderBo.getDesignImage(), "订单" + developmentOrderBo.getOrderNum() + ":设计图片不能为空");
+            assertNotBlank(developmentOrderBo.getDesignMaterial(), "订单" + developmentOrderBo.getOrderNum() + ":素材图片不能为空");
+        } else {
+            //          设置画图结束时间
+            developmentOrderBo.setStatus1EndTime(new Date());
+            //          设置确认开始时间
+            developmentOrderBo.setStatus2StartTime(new Date());
+            //          设置状态为确认中
+            developmentOrderBo.setStatus(DevelopmentOrderConstants.CONFIRMING_IN_PROGRESS);
+        }
+    }
+}

ruoyi-modules/ruoyi-bulkOrder/src/main/java/org/dromara/bulk/service/stateModeServiceImpl/StatusInTypesettingServiceImpl.java

@@ -0,0 +1,32 @@
+package org.dromara.bulk.service.stateModeServiceImpl;
+
+import org.dromara.bulk.domain.bo.DevelopmentOrderBo;
+import org.dromara.bulk.domain.vo.DevelopmentOrderVo;
+import org.dromara.bulk.service.DevelopmentOrderState;
+import org.dromara.common.core.constant.DevelopmentOrderConstants;
+
+import java.util.Date;
+
+import static org.dromara.bulk.service.impl.DevelopmentOrderServiceImpl.assertNotBlank;
+import static org.dromara.bulk.service.impl.DevelopmentOrderServiceImpl.assertNotLongBlank;
+
+/**
+ * 排版中状态实现类
+ */
+public class StatusInTypesettingServiceImpl implements DevelopmentOrderState {
+    @Override
+    public void handle(DevelopmentOrderBo developmentOrderBo, DevelopmentOrderVo developmentOrderVo) {
+        if ((developmentOrderVo.getLayoutUserid() == null || developmentOrderVo.getLayoutUserid() == 0) &&
+                developmentOrderVo.getLayoutFile() == null) {
+            assertNotLongBlank(developmentOrderBo.getLayoutUserid(), "订单" + developmentOrderBo.getOrderNum() + ":排版人不能为空");
+            assertNotBlank(developmentOrderBo.getLayoutFile(), "订单" + developmentOrderBo.getOrderNum() + ":排版文件不能为空");
+        } else {
+            //      设置排版结束时间
+            developmentOrderBo.setStatus4EndTime(new Date());
+            //      设置打版开始时间
+            developmentOrderBo.setStatus5StartTime(new Date());
+            //      设置状态为打版中
+            developmentOrderBo.setStatus(DevelopmentOrderConstants.PRINTING_IN_PROGRESS);
+        }
+    }
+}

ruoyi-modules/ruoyi-commodityManagement/src/main/java/org/dromara/commodityManagement/domain/vo/BrandVo.java

@@ -18,7 +18,7 @@ public class BrandVo {
      * 品牌ID
      */
     @TableId("id")
-    private int id;
+    private Long id;
 
     /**
      *租户ID

ruoyi-modules/ruoyi-commodityManagement/src/main/java/org/dromara/commodityManagement/service/impl/BrandServiceImpl.java

@@ -41,7 +41,6 @@ public class BrandServiceImpl implements BrandService {
     public TableDataInfo<BrandVo> selectPageBrandList(BrandBo brandBo,PageQuery pageQuery) {
         QueryWrapper<Brand> qw = new QueryWrapper<>();
         qw.eq(StringUtils.isNotBlank(brandBo.getName()), "name", brandBo.getName());
-        qw.eq(null != brandBo.getTenant_id(),"tenant_id", brandBo.getTenant_id());
         qw.eq("type", BRAND_TYPE);
         Page<BrandVo> page = brandMapper.selectVoPage(pageQuery.build(), qw);
         return TableDataInfo.build(page);