工作流 启动

adc-da-main/src/main/java/com/adc/da/main/config/MybatisPlusConfig.java

@@ -1,9 +1,7 @@
 package com.adc.da.main.config;
 
 import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
-//import com.baomidou.mybatisplus.extension.plugins.PerformanceInterceptor;
 import org.mybatis.spring.annotation.MapperScan;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
@@ -12,7 +10,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
  * MybatisPlus配置
  */
 @Configuration
-@MapperScan({"com.adc.da.**.dao","com.adc.**.dao"})
+@MapperScan({"com.adc.da.**.dao","com.adc.**.dao","com.adc.**.mapper"})
 @EnableTransactionManagement
 public class MybatisPlusConfig {
 

adc-da-sys/src/main/java/com/adc/da/sys/dao/mysql/UserEODao.java

@@ -1,14 +1,13 @@
 package com.adc.da.sys.dao.mysql;
 
-import java.util.List;
+import com.adc.da.sys.entity.UserEO;
-import java.util.Map;
-
 import com.adc.da.sys.vo.UserVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
 
-import com.adc.da.sys.entity.UserEO;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <br>
@@ -41,4 +40,5 @@ public interface UserEODao extends BaseMapper<UserEO> {
 
     List<Map<String, Object>> allList( @Param("account") String account, @Param("roleName") String roleName);
 
+    UserEO getUserEoById(@Param("usid") String usid);
 }

adc-da-sys/src/main/java/com/adc/da/sys/entity/UserEO.java

@@ -1,20 +1,16 @@
 package com.adc.da.sys.entity;
 
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
 import com.adc.da.base.entity.BaseEntity;
-import com.alibaba.fastjson.annotation.JSONField;
+import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.TableField;
-import lombok.Builder;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
-import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
-import javax.validation.constraints.NotEmpty;
+import java.util.ArrayList;
-import javax.validation.constraints.NotNull;
+import java.util.List;
 
 /**
  * <b>功能：</b>TS_USER UserEOEntity<br>
@@ -117,4 +113,7 @@ public class UserEO extends BaseEntity implements Serializable {
     @TableField(exist = false)
     private String roleId;
 
+    @TableField(exist = false)
+    private String orgName;
+
 }

adc-da-sys/src/main/java/com/adc/da/sys/service/UserEOServiceImpl.java

@@ -1,30 +1,30 @@
 package com.adc.da.sys.service;
 
-import java.text.SimpleDateFormat;
-import java.util.*;
-
 import com.adc.da.sys.constant.SysConstants;
 import com.adc.da.sys.constant.UserBelongEnum;
+import com.adc.da.sys.dao.mysql.UserEODao;
 import com.adc.da.sys.dao.mysql.UserRoleEODao;
 import com.adc.da.sys.entity.RoleEO;
+import com.adc.da.sys.entity.UserEO;
 import com.adc.da.sys.entity.UserRoleEO;
 import com.adc.da.sys.service.iservice.IUserEoService;
 import com.adc.da.sys.util.EncryptUtil;
 import com.adc.da.sys.vo.UserImportVO;
 import com.adc.da.sys.vo.UserVO;
 import com.adc.da.util.exception.AdcDaBaseException;
-import com.adc.da.util.utils.*;
+import com.adc.da.util.utils.CollectionUtils;
+import com.adc.da.util.utils.StringUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.beans.BeanUtils;
-import javax.annotation.Resource;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import com.adc.da.sys.dao.mysql.UserEODao;
+import javax.annotation.Resource;
-import com.adc.da.sys.entity.UserEO;
+import java.text.SimpleDateFormat;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -133,6 +133,12 @@ public class UserEOServiceImpl implements IUserEoService {
         return userEO;
     }
 
+    @Override
+    public UserEO getUserEoById(String usid) {
+        UserEO userEO = dao.getUserEoById(usid);
+        return userEO;
+    }
+
     @Override
     public List<UserVO> getUserByIdList(List<String> userIdList){
         return dao.getUserByIdList(userIdList);

adc-da-sys/src/main/java/com/adc/da/sys/service/iservice/IUserEoService.java

@@ -4,7 +4,6 @@ import com.adc.da.sys.entity.UserEO;
 import com.adc.da.sys.vo.UserImportVO;
 import com.adc.da.sys.vo.UserVO;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -32,6 +31,8 @@ public interface IUserEoService {
 
     UserEO getUserById(String usid);
 
+    UserEO getUserEoById(String usid);
+
     List<UserVO> getUserByIdList(List<String> userIdList);
 
     IPage<Map<String, Object>> list(int pageNo, int pageSize, String account, String roleName);

adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml

@@ -41,6 +41,7 @@
         <result column="CELLPHONE_NUMBER" property="cellPhoneNumber"/>
         <result column="EMAIL" property="email"/>
         <result column="CREATE_TIME" property="createTime"/>
+        <result column="ORG_Name" property="orgName"/>
     </resultMap>
 
     <resultMap id="UserRoleMap" extends="BaseResultMap" type="com.adc.da.sys.entity.UserEO">
@@ -162,5 +163,11 @@
             #{id}
         </foreach>
     </select>
+    <select id="getUserEoById" resultMap="BaseResultMap">
+        select u.* , org.ORG_NAME as orgName from ts_user u
+                                           LEFT JOIN tr_user_org tuo on u.USID = tuo.ORG_ID
+                                           LEFT JOIN ts_org org on org.ID = tuo.ORG_ID
+        WHERE u.id = #{usid}
+    </select>
 
 </mapper>

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;
+    }
+}