Browse Source

工作流支持流程key

hubin 1 year ago
parent
commit
99cf933503

+ 8 - 5
src/main/java/com/aizuda/boot/modules/flw/entity/dto/FlwProcessDTO.java

@@ -23,15 +23,18 @@ public class FlwProcessDTO {
     @Schema(description = "流程定义ID")
     private Long processId;
 
+    @Schema(description = "流程定义 key 唯一标识")
+    private String processKey;
+
     @Schema(description = "流程定义名称")
     private String processName;
 
-    @Schema(description = "流程定义说明")
-    private String displayName;
-
-    @Schema(description = "流程定义图标")
+    @Schema(description = "流程定义名称")
     private String processIcon;
 
+    @Schema(description = "备注说明")
+    private String remark;
+
     @Schema(description = "流程分类ID")
     private Long categoryId;
 
@@ -63,8 +66,8 @@ public class FlwProcessDTO {
     public static FlwProcessDTO of(FlwProcess flwProcess) {
         FlwProcessDTO dto = new FlwProcessDTO();
         dto.setProcessId(flwProcess.getId());
+        dto.setProcessKey(flwProcess.getProcessKey());
         dto.setProcessName(flwProcess.getProcessName());
-        dto.setDisplayName(flwProcess.getDisplayName());
         dto.setProcessIcon(flwProcess.getProcessIcon());
         dto.setUseScope(flwProcess.getUseScope());
         dto.setModelContent(flwProcess.getModelContent());

+ 3 - 3
src/main/java/com/aizuda/boot/modules/flw/entity/vo/FlwProcessVO.java

@@ -22,12 +22,12 @@ public class FlwProcessVO {
     @Schema(description = "流程定义ID")
     private Long processId;
 
+    @Schema(description = "流程定义 key 唯一标识")
+    private String processKey;
+
     @Schema(description = "流程定义名称")
     private String processName;
 
-    @Schema(description = "流程定义说明")
-    private String displayName;
-
     @Schema(description = "流程定义图标地址")
     private String processIcon;
 

+ 2 - 2
src/main/java/com/aizuda/boot/modules/flw/service/impl/FlwProcessServiceImpl.java

@@ -16,8 +16,8 @@ import com.aizuda.service.web.UserSession;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.flowlong.bpm.engine.core.mapper.FlwProcessMapper;
 import com.flowlong.bpm.engine.entity.FlwProcess;
+import com.flowlong.bpm.mybatisplus.mapper.FlwProcessMapper;
 import lombok.AllArgsConstructor;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.stereotype.Service;
@@ -123,8 +123,8 @@ public class FlwProcessServiceImpl extends ServiceImpl<FlwProcessMapper, FlwProc
         // 流程定义ID
         Long processId = dto.getProcessId();
         FlwProcess flwProcess = new FlwProcess();
+        flwProcess.setProcessKey(dto.getProcessKey());
         flwProcess.setProcessName(dto.getProcessName());
-        flwProcess.setDisplayName(dto.getDisplayName());
         flwProcess.setProcessIcon(dto.getProcessIcon());
         flwProcess.setUseScope(dto.getUseScope());
         flwProcess.setModelContent(dto.getModelContent());

+ 1 - 1
src/main/resources/mapper/FlowlongMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.aizuda.boot.modules.flw.mapper.FlowlongMapper">
 
     <select id="selectFlwProcessList" resultType="com.aizuda.boot.modules.flw.entity.vo.FlwProcessVO">
-        SELECT t2.category_id,t2.process_id,t1.process_name,t1.display_name,t1.process_icon,t1.process_version,t1.use_scope,t1.process_state
+        SELECT t2.category_id,t2.process_id,t1.process_key,t1.process_name,t1.process_icon,t1.process_version,t1.use_scope,t1.process_state
              ,t1.sort AS process_sort FROM flw_process t1 JOIN  flw_process_configure t2 ON t1.id=t2.process_id
     </select>
 </mapper>