From 09bafc78dc4a26eab554c0c14e910657a51c0477 Mon Sep 17 00:00:00 2001 From: bupengxiang Date: Thu, 18 May 2023 17:59:21 +0800 Subject: [PATCH 01/12] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=20=E5=B9=B6=E5=8F=91?= =?UTF-8?q?=20=E6=B5=81=E7=A8=8B=E7=BC=96=E5=8F=B7=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../define/ActivitDefineController.java | 9 +++++++-- .../business_activiti/task/TodoTaskController.java | 2 ++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/define/ActivitDefineController.java b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/define/ActivitDefineController.java index 894d313..e7e670e 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/define/ActivitDefineController.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/define/ActivitDefineController.java @@ -233,6 +233,7 @@ public class ActivitDefineController { List 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,10 @@ public class ActivitDefineController { } String prcType = startProcessEO.getPrcType(); Map prcNameAndPrcNum = createPrcNameAndPrcNum(prcType); + //并发 防止prcNum重复 + String prcNumStr = (String) prcNameAndPrcNum.get("prcNum"); + int num = Integer.parseInt(prcNumStr.substring(8)) + i++; + String prcNum = prcNumStr.substring(0, 8) + String.format("%08d", num); startProcessEO.setId((String) prcNameAndPrcNum.get("id")); @@ -276,7 +281,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 +300,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()); diff --git a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TodoTaskController.java b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TodoTaskController.java index 077c6cc..773e41c 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TodoTaskController.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TodoTaskController.java @@ -376,6 +376,7 @@ public class TodoTaskController { wrapper.eq(BusProcessName::getPrcId,task.getProcessInstanceId()); BusProcessName one = iBusProcessNameService.getOne(wrapper); one.setDataId(reportId); + one.setPrcName((String) JSONObject.parseObject(dataJson).get("prcName")); iBusProcessNameService.updateById(one); } return WrapMapper.ok(task.getProcessInstanceId()); @@ -417,6 +418,7 @@ public class TodoTaskController { wrapper.eq(BusProcessName::getPrcId,task.getProcessInstanceId()); BusProcessName one = iBusProcessNameService.getOne(wrapper); one.setDataId(reportId); + one.setPrcName((String) JSONObject.parseObject(dataJson).get("prcName")); iBusProcessNameService.updateById(one); } } else { From 2263a8f554c20f0bcd278119ac8e757868729c3a Mon Sep 17 00:00:00 2001 From: bupengxiang Date: Thu, 18 May 2023 19:05:57 +0800 Subject: [PATCH 02/12] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=20=E5=B9=B6=E5=8F=91?= =?UTF-8?q?=20=E5=8D=95=E6=97=A5=E5=8F=91=E8=B5=B7=E6=9C=80=E5=A4=9A?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=95=B09999?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business_activiti/define/ActivitDefineController.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/define/ActivitDefineController.java b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/define/ActivitDefineController.java index e7e670e..c6f2058 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/define/ActivitDefineController.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/define/ActivitDefineController.java @@ -243,8 +243,11 @@ public class ActivitDefineController { Map prcNameAndPrcNum = createPrcNameAndPrcNum(prcType); //并发 防止prcNum重复 String prcNumStr = (String) prcNameAndPrcNum.get("prcNum"); - int num = Integer.parseInt(prcNumStr.substring(8)) + i++; - String prcNum = prcNumStr.substring(0, 8) + String.format("%08d", num); + 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")); From 40d6720216f9e981687d3d07600389fd0e54b017 Mon Sep 17 00:00:00 2001 From: bupengxiang Date: Thu, 18 May 2023 20:10:46 +0800 Subject: [PATCH 03/12] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=20=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=91=98=E4=B8=8A=E4=BC=A0=E6=8A=A5=E5=BC=82=E5=B8=B8=EF=BC=8C?= =?UTF-8?q?=20=E6=99=AE=E9=80=9A=E7=94=A8=E6=88=B7=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=EF=BC=8C=E5=AE=A1=E6=A0=B8=E6=97=B6=E6=8A=A5=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/adc/da/report/controller/ReportManageConroller.java | 2 +- .../da/wkflow/business_activiti/task/TodoTaskController.java | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/adc-da-report/src/main/java/com/adc/da/report/controller/ReportManageConroller.java b/adc-da-report/src/main/java/com/adc/da/report/controller/ReportManageConroller.java index 0e89344..4ffa9b5 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/controller/ReportManageConroller.java +++ b/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("报告已经不存在"); diff --git a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TodoTaskController.java b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TodoTaskController.java index 773e41c..33ae058 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TodoTaskController.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TodoTaskController.java @@ -376,7 +376,9 @@ public class TodoTaskController { wrapper.eq(BusProcessName::getPrcId,task.getProcessInstanceId()); BusProcessName one = iBusProcessNameService.getOne(wrapper); one.setDataId(reportId); - one.setPrcName((String) JSONObject.parseObject(dataJson).get("prcName")); + if (!StringUtils.isBlank(dataJson)){ + one.setPrcName((String) JSONObject.parseObject(dataJson).get("prcName")); + } iBusProcessNameService.updateById(one); } return WrapMapper.ok(task.getProcessInstanceId()); From 429a11143161d06b344ef1948bc9b51cd1a8840f Mon Sep 17 00:00:00 2001 From: bupengxiang Date: Thu, 18 May 2023 20:44:01 +0800 Subject: [PATCH 04/12] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=20=E6=9D=83=E9=99=90?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E6=B5=81=E7=A8=8B=EF=BC=8C=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E5=90=8C=E6=84=8F=E6=8A=A5=E7=A8=8B=E5=BA=8F=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../da/wkflow/business_activiti/task/TodoTaskController.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TodoTaskController.java b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TodoTaskController.java index 33ae058..5163d08 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TodoTaskController.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TodoTaskController.java @@ -420,7 +420,9 @@ public class TodoTaskController { wrapper.eq(BusProcessName::getPrcId,task.getProcessInstanceId()); BusProcessName one = iBusProcessNameService.getOne(wrapper); one.setDataId(reportId); - one.setPrcName((String) JSONObject.parseObject(dataJson).get("prcName")); + if (!StringUtils.isBlank(dataJson)){ + one.setPrcName((String) JSONObject.parseObject(dataJson).get("prcName")); + } iBusProcessNameService.updateById(one); } } else { From 09eb8c51716fb3d967bc1751ca9a464720ac2ee4 Mon Sep 17 00:00:00 2001 From: bupengxiang Date: Thu, 18 May 2023 21:11:27 +0800 Subject: [PATCH 05/12] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=20=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=88=97=E8=A1=A8,=E8=A7=92=E8=89=B2=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mybatis/mapper/sys/mysql/UserEOMapper.xml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml index fef279e..f662eeb 100644 --- a/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml +++ b/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 - where del_flag = 0 + select tu.* from TS_USER tu + 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 and ACCOUNT like CONCAT('%',CONCAT(#{account},'%')) - and NAME like CONCAT('%',CONCAT(#{roleName},'%')) + and tr.NAME like CONCAT('%',CONCAT(#{roleName},'%')) ORDER BY UPDATE_TIME DESC LIMIT #{current},#{size} @@ -31,14 +33,17 @@