工作流 启动

report-activity/src/main/java/com/adc/da/wkflow/business_activiti/define/ActivitDefineController.java

@@ -50,7 +50,7 @@ public class ActivitDefineController {
 	private TaskService taskService;
 	@Resource
 	private IdentityService identityService;
-	@Resource
+	@Autowired
 	private IBusProcessNameService ibusprocessnameService;
 
 	@Resource

report-activity/src/main/java/com/adc/da/wkflow/business_main/entity/BusProcessName.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -32,36 +33,46 @@ public class BusProcessName implements Serializable {
     private String id;
 
     @TableField("PRC_NAME")
+    @ApiModelProperty(value = "流程名称")
     private String prcName;
 
     @TableField("PRC_ID")
+    @ApiModelProperty(value = "流程id")
     private String prcId;
 
     @TableField("OVER_TIME")
+    @ApiModelProperty(value = "完成时间")
     private String overTime;
 
     @TableField("PRC_NUM")
+    @ApiModelProperty(value = "流程编号")
     private String prcNum;
 
     @TableField("CREAT_TIME")
+    @ApiModelProperty(value = "创建时间")
     private String creatTime;
 
     @TableField("CREAT_USER")
+    @ApiModelProperty(value = "创建人Id")
     private String creatUser;
 
     @TableField("PRC_TYPE")
+    @ApiModelProperty(value = "流程类型")
     private String prcType;
 
     @TableField("CREATE_USER_NAME")
+    @ApiModelProperty(value = "创建人姓名")
     private String creatUserName;
 
     /**
      * 具体的数据ID，关联具体的业务表的id
      */
     @TableField("DATA_ID")
+    @ApiModelProperty(value = "具体的数据ID")
     private String dataId;
 
     @TableField("END_TIME")
+    @ApiModelProperty(value = "结束时间")
     private String endTime;
 
     @TableField(exist = false)

report-activity/src/main/java/com/adc/da/wkflow/business_main/entity/BusProcessNew.java

@@ -37,6 +37,9 @@ public class BusProcessNew implements Serializable {
     @TableField("USER_ID")
     private String userId;
 
+    @TableField(exist = false)
+    private String userName;
+
     @ApiModelProperty(value = "具体的数据ID，关联具体的业务表的id")
     @TableField("DATA_ID")
     private String dataId;

report-activity/src/main/java/com/adc/da/wkflow/business_main/service/impl/BusProcessNameServiceImpl.java

@@ -1,16 +1,16 @@
 package com.adc.da.wkflow.business_main.service.impl;
 
-import com.adc.da.wkflow.enums.FlowTypeEnum;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.adc.da.wkflow.business_main.entity.BusProcessName;
 import com.adc.da.wkflow.business_main.mapper.BusProcessNameMapper;
 import com.adc.da.wkflow.business_main.service.IBusProcessNameService;
+import com.adc.da.wkflow.enums.FlowTypeEnum;
 import com.adc.da.wkflow.util.ImpulseSenderUtils;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.activiti.engine.ActivitiException;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
@@ -28,7 +28,7 @@ import java.util.Map;
 @Service
 public class BusProcessNameServiceImpl extends ServiceImpl<BusProcessNameMapper, BusProcessName> implements IBusProcessNameService {
 
-    @Autowired
+    @Resource
     BusProcessNameMapper busProcessNameMapper;
 
     public List<BusProcessName> findBusProcessNameForEnd(){

report-activity/src/main/java/com/adc/da/wkflow/dto/Page.java

@@ -0,0 +1,44 @@
+package com.adc.da.wkflow.dto;
+
+import com.adc.da.wkflow.business_main.entity.BusProcessName;
+
+import java.util.List;
+
+public class Page {
+    private Integer pageNo;
+    private Integer pageSize;
+    private Long count;
+    private List<BusProcessName> list;
+
+    public Integer getPageSize() {
+        return pageSize;
+    }
+
+    public void setPageSize(Integer pageSize) {
+        this.pageSize = pageSize;
+    }
+
+    public Long getCount() {
+        return count;
+    }
+
+    public void setCount(Long count) {
+        this.count = count;
+    }
+
+    public List<BusProcessName> getList() {
+        return list;
+    }
+
+    public void setList(List<BusProcessName> list) {
+        this.list = list;
+    }
+
+    public Integer getPageNo() {
+        return pageNo;
+    }
+
+    public void setPageNo(Integer pageNo) {
+        this.pageNo = pageNo;
+    }
+}