订单策略基础代码生成

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/OrderApproveController.java

@@ -56,7 +56,6 @@ public class OrderApproveController extends BaseController {
     /**
      * 新增订单审批
      */
-    @SaCheckPermission("workflow:orderApprove:add")
     @Log(title = "订单审批", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/OrderApprove.java

 package org.dromara.workflow.domain;
 
-import org.dromara.common.tenant.core.TenantEntity;
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
+import org.dromara.common.tenant.core.TenantEntity;
 
 import java.io.Serial;
+import java.util.Date;
 
 /**
  * 订单审批对象 srv_order_approve
@@ -42,7 +42,7 @@ public class OrderApprove extends TenantEntity {
     /**
      * 是否需要审批
      */
-    private Long deptApprove;
+    private Boolean deptApprove;
 
     /**
      * 授权人用户id

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/OrderApproveBo.java

 package org.dromara.workflow.domain.bo;
 
-import org.dromara.workflow.domain.OrderApprove;
-import org.dromara.common.mybatis.core.domain.BaseEntity;
-import org.dromara.common.core.validate.AddGroup;
-import org.dromara.common.core.validate.EditGroup;
 import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import jakarta.validation.constraints.*;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.workflow.domain.OrderApprove;
+
 import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
 
 /**
  * 订单审批业务对象 srv_order_approve
@@ -44,12 +45,11 @@ public class OrderApproveBo extends BaseEntity {
      * 是否需要审批
      */
     @NotNull(message = "是否需要审批不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Long deptApprove;
+    private Boolean deptApprove;
 
     /**
      * 授权人用户id
      */
-    @NotNull(message = "授权人用户id不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long authId;
 
     /**
@@ -73,19 +73,16 @@ public class OrderApproveBo extends BaseEntity {
     /**
      * 订单失效时间
      */
-    @NotNull(message = "订单失效时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date expireTime;
 
     /**
      * 订单信息
      */
-    @NotBlank(message = "订单信息不能为空", groups = { AddGroup.class, EditGroup.class })
     private String info;
 
     /**
      * 状态
      */
-    @NotBlank(message = "状态不能为空", groups = { AddGroup.class, EditGroup.class })
     private String status;
 
 

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/OrderApproveVo.java

 package org.dromara.workflow.domain.vo;
 
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.dromara.workflow.domain.OrderApprove;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
-import org.dromara.common.excel.annotation.ExcelDictFormat;
-import org.dromara.common.excel.convert.ExcelDictConvert;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
+import org.dromara.workflow.domain.OrderApprove;
 
 import java.io.Serial;
 import java.io.Serializable;
@@ -52,7 +48,7 @@ public class OrderApproveVo implements Serializable {
      * 是否需要审批
      */
     @ExcelProperty(value = "是否需要审批")
-    private Long deptApprove;
+    private Boolean deptApprove;
 
     /**
      * 授权人用户id

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/listener/OrderApproveAssigneeListener.java

+package org.dromara.workflow.flowable.listener;
+
+
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.utils.SpringUtils;
+import org.dromara.workflow.common.constant.FlowConstant;
+import org.dromara.workflow.domain.OrderApprove;
+import org.dromara.workflow.mapper.OrderApproveMapper;
+import org.flowable.task.service.delegate.DelegateTask;
+import org.flowable.task.service.delegate.TaskListener;
+import org.springframework.stereotype.Component;
+
+import java.util.Objects;
+
+/**
+ * 部门文件下载申请自定义审批人监听器
+ *
+ * @author wenhe
+ */
+@Component
+@Slf4j
+public class OrderApproveAssigneeListener implements TaskListener {
+
+    @Override
+    public void notify(DelegateTask delegateTask) {
+        // 获取业务id
+        Long businessKey = Long.parseLong(delegateTask.getVariable(FlowConstant.BUSINESS_KEY).toString());
+
+        OrderApproveMapper mapper = SpringUtils.getBean(OrderApproveMapper.class);
+        OrderApprove oa = mapper.selectById(businessKey);
+
+        // 调用服务获取审批人列表
+        Long approveId = oa.getAuthId();
+
+        // 设置候选用户
+        String owner = Objects.isNull(approveId) ? null : approveId.toString();
+        delegateTask.setAssignee(owner);
+    }
+
+}

ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/flowable/listener/OrderApproveUserAssigneeListener.java

+package org.dromara.workflow.flowable.listener;
+
+
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.utils.SpringUtils;
+import org.dromara.workflow.common.constant.FlowConstant;
+import org.dromara.workflow.domain.OrderApprove;
+import org.dromara.workflow.mapper.OrderApproveMapper;
+import org.flowable.task.service.delegate.DelegateTask;
+import org.flowable.task.service.delegate.TaskListener;
+import org.springframework.stereotype.Component;
+
+import java.util.Objects;
+
+/**
+ * 部门文件下载申请自定义审批人监听器
+ *
+ * @author wenhe
+ */
+@Component
+@Slf4j
+public class OrderApproveUserAssigneeListener implements TaskListener {
+
+    @Override
+    public void notify(DelegateTask delegateTask) {
+        // 获取业务id
+        Long businessKey = Long.parseLong(delegateTask.getVariable(FlowConstant.BUSINESS_KEY).toString());
+
+        OrderApproveMapper mapper = SpringUtils.getBean(OrderApproveMapper.class);
+        OrderApprove oa = mapper.selectById(businessKey);
+
+        // 调用服务获取审批人列表
+        Long approveId = oa.getStaffId();
+
+        // 设置候选用户
+        String owner = Objects.isNull(approveId) ? null : approveId.toString();
+        delegateTask.setAssignee(owner);
+    }
+
+}