add flow code

Author: xlorne

admin-ui/src/pages/flow/leave/index.tsx

@@ -92,7 +92,7 @@ const LeavePage = () => {
                 >
 
                     <ProFormText
-                        name={"flowId"}
+                        name={"flowCode"}
                         hidden={true}
                     />
 
@@ -143,7 +143,7 @@ const LeavePage = () => {
 
                 <FlowSelect visible={flowSelectVisible} setVisible={setFlowSelectVisible} onSelect={(flow) => {
 
-                    form.setFieldValue('flowId', flow.id);
+                    form.setFieldValue('flowCode', flow.code);
                     form.setFieldValue('flowName', flow.title);
 
                 }}/>

admin-ui/src/pages/flow/work/index.tsx

@@ -75,6 +75,10 @@ const FlowPage = () => {
             dataIndex: 'id',
             search: false,
         },
+        {
+            title: '编码',
+            dataIndex: 'code',
+        },
         {
             title: '标题',
             dataIndex: 'title',
@@ -218,6 +222,17 @@ const FlowPage = () => {
                     ]}
                 />
 
+                <ProFormText
+                    name={"code"}
+                    label={"编码"}
+                    rules={[
+                        {
+                            required: true,
+                            message: "请输入编码"
+                        }
+                    ]}
+                />
+
                 <ProFormTextArea
                     name={"description"}
                     label={"描述"}

example/example-application/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.2.3.dev</version>
+        <version>3.3.2.4.dev</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

example/example-application/src/main/java/com/codingapi/example/command/FlowRecordCmdController.java

@@ -3,10 +3,8 @@
 import com.codingapi.example.domain.User;
 import com.codingapi.example.pojo.cmd.FlowCmd;
 import com.codingapi.example.repository.UserRepository;
-import com.codingapi.springboot.flow.pojo.FlowDetail;
 import com.codingapi.springboot.flow.service.FlowService;
 import com.codingapi.springboot.framework.dto.response.Response;
-import com.codingapi.springboot.framework.dto.response.SingleResponse;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -26,7 +24,7 @@ public class FlowRecordCmdController {
     @PostMapping("/startFlow")
     public Response startFlow(@RequestBody FlowCmd.StartFlow request) {
         User current = userRepository.getUserByUsername(request.getUserName());
-        flowService.startFlow(request.getWorkId(), current, request.getBindData(), request.getAdvice());
+        flowService.startFlow(request.getWorkCode(), current, request.getBindData(), request.getAdvice());
         return Response.buildSuccess();
     }
 

example/example-application/src/main/java/com/codingapi/example/command/LeaveCmdController.java

@@ -31,7 +31,7 @@ public Response startLeave(@RequestBody LeaveCmd.StartLeave request) {
         leave.setDays(request.getDays());
         leave.setCreateTime(System.currentTimeMillis());
 
-        flowService.startFlow(request.getFlowId(), user, leave, request.getDesc());
+        flowService.startFlow(request.getFlowCode(), user, leave, request.getDesc());
 
         return Response.buildSuccess();
     }

example/example-application/src/main/java/com/codingapi/example/pojo/cmd/FlowCmd.java

@@ -14,7 +14,7 @@ public class FlowCmd {
     @Getter
     public static class StartFlow {
 
-        private long workId;
+        private String workCode;
         private String advice;
         private JSONObject formData;
 

example/example-application/src/main/java/com/codingapi/example/pojo/cmd/FlowWorkCmd.java

@@ -13,6 +13,7 @@ public static class CreateRequest{
 
         private long id;
         private String title;
+        private String code;
         private String description;
         private int postponedMax;
 

example/example-application/src/main/java/com/codingapi/example/pojo/cmd/LeaveCmd.java

@@ -11,7 +11,7 @@ public class LeaveCmd {
     public static class StartLeave{
         private String desc;
         private int days;
-        private long flowId;
+        private String flowCode;
 
 
         public String getUsername(){

example/example-application/src/main/java/com/codingapi/example/router/FlowWorkRouter.java

@@ -26,11 +26,12 @@ public void save(FlowWorkCmd.CreateRequest request) {
         User user = userRepository.getUserByUsername(request.getUsername());
         long id = request.getId();
         if (id == 0) {
-            FlowWork flowWork = new FlowWork(request.getTitle(), request.getDescription(), request.getPostponedMax(), user);
+            FlowWork flowWork = new FlowWork(request.getCode(),request.getTitle(), request.getDescription(), request.getPostponedMax(), user);
             flowWorkRepository.save(flowWork);
         } else {
             FlowWorkEntity flowWork = flowWorkEntityRepository.getFlowWorkEntityById(id);
             flowWork.setTitle(request.getTitle());
+            flowWork.setCode(request.getCode());
             flowWork.setDescription(request.getDescription());
             flowWork.setPostponedMax(request.getPostponedMax());
             flowWork.setUpdateTime(System.currentTimeMillis());

example/example-domain/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>springboot-example</artifactId>
         <groupId>com.codingapi.springboot</groupId>
-        <version>3.3.2.3.dev</version>
+        <version>3.3.2.4.dev</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>