Merge remote-tracking branch 'origin/master' into caihaohan

adc-da-main/src/main/resources/application-dev.properties

@@ -36,6 +36,9 @@
 
 spring.datasource.driverClassName = com.mysql.cj.jdbc.Driver
 spring.datasource.url = jdbc:mysql://121.36.69.172:3307/report-library?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+#spring.datasource.url = jdbc:mysql://121.36.69\
+#  .172:3307/report-library_test?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false\
+#  &allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
 spring.datasource.username = root
 spring.datasource.password = hzwlsoft.com
 
@@ -64,7 +67,7 @@ swaggerLevel=0
 # \u672C\u5730\u5B58\u50A8\u6587\u4EF6\u7684\u78C1\u76D8\u5730\u5740
 #uploadFile=D:\\work\\idea\\changan\\
 #uploadFile=D:\\uploadfile\\tmp\\
-uploadFile=/data/DeploymentPackage/report_library/uploadfile/
+uploadFile=D:\\desktop\\dazhong\\uploadfile
 # \u672C\u5730\u6587\u4EF6\u8BBF\u95EE\u7684url\u5730\u5740
 picPath=/api/home/pic/
 

adc-da-report/src/main/java/com/adc/da/report/controller/ReportManageConroller.java

@@ -153,7 +153,7 @@ public class ReportManageConroller {
             return Result.error("报告名称已流程中存在");
         }
         // 非新增流程
-        if(!"4".equals(vo.getPrcType())){
+        if( StringUtils.isNotEmpty(vo.getPrcType()) && !"4".equals(vo.getPrcType())){
             long count2 = reportDao.selectByReportId(vo.getId());
             if (count2==0){
                 return Result.error("报告已经不存在");

adc-da-report/src/main/resources/mybatis/mapper/mysql/PowerApplyMapper.xml

@@ -19,7 +19,7 @@
 
     <!--表名信息-->
     <sql id="TableName">
-        power_apply_act
+        power_apply
     </sql>
 
     <!-- 通用查询结果列 -->

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

@@ -9,13 +9,15 @@
         GROUP_CONCAT( DISTINCT org.LONG_NAME ORDER BY org.ID DESC )as ORGNAME
         from
         (
-        select * from  TS_USER
+        select tu.* from  TS_USER tu
-        where del_flag = 0
+        left join TR_USER_ROLE tur on tu.USID=tur.USER_ID
+        left JOIN TS_ROLE tr on tur.ROLE_ID=tr.ID
+        where tu.del_flag = 0
             <if test="account !='' and account !=null">
                 and ACCOUNT like  CONCAT('%',CONCAT(#{account},'%'))
             </if>
             <if test="roleName !='' and roleName !=null">
-                and NAME like  CONCAT('%',CONCAT(#{roleName},'%'))
+                and tr.NAME like  CONCAT('%',CONCAT(#{roleName},'%'))
             </if>
         ORDER BY UPDATE_TIME DESC
         LIMIT #{current},#{size}
@@ -31,14 +33,17 @@
     </select>
 
     <select id="listCount" resultType="java.lang.Long">
-        select count(1) from  TS_USER
+        select count(1) from TS_USER tu
-        where del_flag = 0
+        left join TR_USER_ROLE tur on tu.USID=tur.USER_ID
+        left JOIN TS_ROLE tr on tur.ROLE_ID=tr.ID
+        where tu.del_flag = 0
         <if test="account !='' and account !=null">
             and ACCOUNT like  CONCAT('%',CONCAT(#{account},'%'))
         </if>
         <if test="roleName !='' and roleName !=null">
             and NAME like  CONCAT('%',CONCAT(#{roleName},'%'))
         </if>
+
     </select>
 
     <select id="getUserCount"  resultType="java.lang.Long">

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

@@ -233,6 +233,7 @@ public class ActivitDefineController {
 		List<BusProcessName> busProcessNames = new ArrayList<>();
 		StringBuilder taskIds = new StringBuilder();
 
+		int i = 0;
 		for (StartProcessEO startProcessEO : startProcessEOList) {
 			startProcessEO.setLoginUserId(UserUtils.getUserId());
 			if(com.adc.da.util.utils.StringUtils.isNotEmpty(startProcessEO.getId())){
@@ -240,6 +241,13 @@ public class ActivitDefineController {
 			}
 			String prcType = startProcessEO.getPrcType();
 			Map<String, Object> prcNameAndPrcNum = createPrcNameAndPrcNum(prcType);
+			//并发 防止prcNum重复
+			String prcNumStr = (String) prcNameAndPrcNum.get("prcNum");
+			int num = Integer.parseInt(prcNumStr.substring(12)) + i++;
+			if(num>9999){
+				return  WrapMapper.error("当日发起已达最大上限，请明日再发起！");
+			}
+			String prcNum = prcNumStr.substring(0, 12) + String.format("%04d", num);
 
 			startProcessEO.setId((String) prcNameAndPrcNum.get("id"));
 
@@ -276,7 +284,7 @@ public class ActivitDefineController {
 				busProcessName.setCreatUser(userId);
 				UserEO byId = userEoService.getUserById(userId);
 				busProcessName.setCreatUserName(byId.getUsname());
-				busProcessName.setPrcNum((String) prcNameAndPrcNum.get("prcNum"));
+				busProcessName.setPrcNum(prcNum);
 				busProcessName.setPrcType(prcType);
 //			String data = JSON.toJSONString(dataMsg, SerializerFeature.DisableCircularReferenceDetect);
 //			String dateId = activitDefineService.saveOrUpdateDate(prcType,data,task.getId(),pi.getId(),reportId);
@@ -295,7 +303,7 @@ public class ActivitDefineController {
 
 				String newId = UUID.randomUUID().toString().replace("-", "");
 				one.setId(newId);
-				one.setPrcNum((String) prcNameAndPrcNum.get("prcNum"));
+				one.setPrcNum(prcNum);
 //			one.setPrcName((String) prcNameAndPrcNum.get("prcName"));
 				one.setPrcName(startProcessEO.getPrcName());
 				one.setPrcId(pi.getId());

report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TodoTaskController.java

@@ -376,6 +376,12 @@ public class TodoTaskController {
                 wrapper.eq(BusProcessName::getPrcId,task.getProcessInstanceId());
                 BusProcessName one = iBusProcessNameService.getOne(wrapper);
                 one.setDataId(reportId);
+                if (!StringUtils.isBlank(dataJson)){
+                    one.setPrcName((String) JSONObject.parseObject(dataJson).get("prcName"));
+                }
+                if(!StringUtils.isBlank(busMes.getPrcType())){
+                    one.setPrcType(busMes.getPrcType());
+                }
                 iBusProcessNameService.updateById(one);
             }
             return WrapMapper.ok(task.getProcessInstanceId());
@@ -417,6 +423,12 @@ public class TodoTaskController {
                     wrapper.eq(BusProcessName::getPrcId,task.getProcessInstanceId());
                     BusProcessName one = iBusProcessNameService.getOne(wrapper);
                     one.setDataId(reportId);
+                    if (!StringUtils.isBlank(dataJson)){
+                        one.setPrcName((String) JSONObject.parseObject(dataJson).get("prcName"));
+                    }
+                    if(!StringUtils.isBlank(busMes.getPrcType())){
+                        one.setPrcType(busMes.getPrcType());
+                    }
                     iBusProcessNameService.updateById(one);
                 }
             } else {
@@ -651,7 +663,7 @@ public class TodoTaskController {
 
             QueryWrapper<BusProcessName> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("CREAT_USER", approveDataVO.getCreateUser());
-            queryWrapper.eq("PRC_TYPE", approveDataVO.getPrcType());
+//            queryWrapper.eq("PRC_TYPE", approveDataVO.getPrcType());
             queryWrapper.eq("ID", approveDataVO.getId());
             queryWrapper.isNull("PRC_ID");
             List<BusProcessName> list = iBusProcessNameService.list(queryWrapper);
@@ -659,6 +671,7 @@ public class TodoTaskController {
                 BusProcessName busProcessName = list.get(0);
                 busProcessName.setPrcName(approveDataVO.getPrcName());
                 busProcessName.setSubmitStatus(SubmitStatusEnum.DRAFT.getValue());
+                busProcessName.setPrcType(approveDataVO.getPrcType());
                 if (StringUtils.isNotEmpty(dataJson)){
                     //根据业务情况 对业务数据进行saveOrupdate
                     dataId = activitDefineService.saveOrUpdateDate(approveDataVO.getPrcType(), dataJson, null,
@@ -732,7 +745,7 @@ public class TodoTaskController {
 
                 QueryWrapper<BusProcessName> queryWrapper = new QueryWrapper<>();
                 queryWrapper.eq("CREAT_USER", approveDataVO.getCreateUser());
-                queryWrapper.eq("PRC_TYPE", approveDataVO.getPrcType());
+//                queryWrapper.eq("PRC_TYPE", approveDataVO.getPrcType());
                 queryWrapper.eq("ID", approveDataVO.getId());
                 queryWrapper.isNull("PRC_ID");
                 List<BusProcessName> list = iBusProcessNameService.list(queryWrapper);
@@ -740,6 +753,7 @@ public class TodoTaskController {
                     BusProcessName busProcessName = list.get(0);
                     busProcessName.setPrcName(approveDataVO.getPrcName());
                     busProcessName.setSubmitStatus(SubmitStatusEnum.DRAFT.getValue());
+                    busProcessName.setPrcType(approveDataVO.getPrcType());
                     if (StringUtils.isNotEmpty(dataJson)){
                         //根据业务情况 对业务数据进行saveOrupdate
                         dataId = activitDefineService.saveOrUpdateDate(approveDataVO.getPrcType(), dataJson, null,