24282 1 an în urmă
părinte
comite
511a13b87e

+ 9 - 0
hx-flow/src/main/java/com/fjhx/flow/controller/flow/FlowExampleController.java

@@ -4,6 +4,7 @@ import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.flow.entity.flow.dto.FlowExampleSelectDto;
 import com.fjhx.flow.entity.flow.dto.FlowNodeDto;
+import com.fjhx.flow.entity.flow.dto.SetStartDataDto;
 import com.fjhx.flow.entity.flow.po.FlowInfo;
 import com.fjhx.flow.entity.flow.vo.ApprovalRecordVo;
 import com.fjhx.flow.entity.flow.vo.FlowExampleVo;
@@ -92,4 +93,12 @@ public class FlowExampleController {
         return flowExampleService.getFlowNode(dto);
     }
 
+    /**
+     * 重新赋值开始节点数据
+     */
+    @PostMapping("setStartData")
+    public void setStartData(@Validated @RequestBody SetStartDataDto dto) {
+        flowExampleService.setStartData(dto);
+    }
+
 }

+ 25 - 0
hx-flow/src/main/java/com/fjhx/flow/entity/flow/dto/SetStartDataDto.java

@@ -0,0 +1,25 @@
+package com.fjhx.flow.entity.flow.dto;
+
+import com.alibaba.fastjson2.JSONObject;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+
+@Getter
+@Setter
+public class SetStartDataDto {
+
+    /**
+     * 实例id
+     */
+    @NotNull(message = "实例id不能为空")
+    private Long exampleId;
+
+    /**
+     * 流程发起数据
+     */
+    @NotNull(message = "流程发起数据不能为空")
+    private JSONObject startDate;
+
+}

+ 6 - 0
hx-flow/src/main/java/com/fjhx/flow/service/flow/FlowExampleService.java

@@ -3,6 +3,7 @@ package com.fjhx.flow.service.flow;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.flow.entity.flow.dto.FlowExampleSelectDto;
 import com.fjhx.flow.entity.flow.dto.FlowNodeDto;
+import com.fjhx.flow.entity.flow.dto.SetStartDataDto;
 import com.fjhx.flow.entity.flow.po.FlowExample;
 import com.fjhx.flow.entity.flow.po.FlowInfo;
 import com.fjhx.flow.entity.flow.vo.ApprovalRecordVo;
@@ -57,4 +58,9 @@ public interface FlowExampleService extends BaseService<FlowExample> {
      */
     List<ApprovalRecordVo.Record> getFlowNode(FlowNodeDto dto);
 
+    /**
+     * 重新赋值开始节点数据
+     */
+    void setStartData(SetStartDataDto dto);
+
 }

+ 9 - 0
hx-flow/src/main/java/com/fjhx/flow/service/flow/impl/FlowExampleServiceImpl.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.flow.entity.flow.dto.FlowExampleSelectDto;
 import com.fjhx.flow.entity.flow.dto.FlowNodeDto;
+import com.fjhx.flow.entity.flow.dto.SetStartDataDto;
 import com.fjhx.flow.entity.flow.po.*;
 import com.fjhx.flow.entity.flow.vo.ApprovalRecordVo;
 import com.fjhx.flow.entity.flow.vo.FlowExampleVo;
@@ -199,6 +200,14 @@ public class FlowExampleServiceImpl extends ServiceImpl<FlowExampleMapper, FlowE
         return recordList;
     }
 
+    @Override
+    public void setStartData(SetStartDataDto dto) {
+        FlowExample flowExample = new FlowExample();
+        flowExample.setId(dto.getExampleId());
+        flowExample.setStartData(dto.getStartDate().toJSONString());
+        updateById(flowExample);
+    }
+
     private List<ApprovalRecordVo.ButtonInfo> getButtonInfoList(FlowExample flowExample,
                                                                 List<FlowDefinitionNode> flowDefinitionNodeList) {
 

+ 1 - 1
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java

@@ -253,11 +253,11 @@ public class SysUser extends BaseEntity {
         this.avatar = avatar;
     }
 
+    @Size(min = 5, max = 20, message = "密码长度不能少于5个字符,不能大于20个字符")
     public String getPassword() {
         return password;
     }
 
-    @Size(min = 5, max = 20, message = "密码长度不能少于5个字符,不能大于20个字符")
     public void setPassword(String password) {
         this.password = password;
     }