From d570492906a0ac2829533beeebd25da7a3834a82 Mon Sep 17 00:00:00 2001 From: bupengxiang Date: Tue, 9 May 2023 09:08:46 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=96=B0=E5=A2=9E]=20=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E6=8A=A5=E5=91=8A=E6=B5=81=E7=A8=8B=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/mysql/TtReportManageActDao.java | 4 +- .../com/adc/da/report/eo/ReportEntity.java | 6 ++ .../adc/da/report/eo/TtReportManageAct.java | 12 ++- .../impl/ITtReportManageActServiceImpl.java | 4 - .../mapper/mysql/ReportManageMapper.xml | 17 +++-- .../mapper/mysql/TtReportManageActMapper.xml | 31 +++++++- .../dao/mysql/TtReportManageActDao.class | Bin 1353 -> 1390 bytes .../com/adc/da/report/eo/ReportEntity.class | Bin 8573 -> 9195 bytes .../adc/da/report/eo/TtReportManageAct.class | Bin 10344 -> 11428 bytes .../impl/ITtReportManageActServiceImpl.class | Bin 5693 -> 5446 bytes .../mapper/mysql/ReportManageMapper.xml | 17 +++-- .../mapper/mysql/TtReportManageActMapper.xml | 31 +++++++- .../da/sys/controller/UserEOController.java | 21 +++++- .../java/com/adc/da/sys/entity/UserEO.java | 8 ++ .../mybatis/mapper/sys/mysql/UserEOMapper.xml | 15 +++- .../da/sys/controller/UserEOController.class | Bin 12280 -> 14702 bytes .../com/adc/da/sys/entity/UserEO.class | Bin 8585 -> 9658 bytes .../mybatis/mapper/sys/mysql/UserEOMapper.xml | 15 +++- .../define/ActivitDefineController.java | 15 ++-- .../service/ActivitDefineService.java | 49 ++++++------ .../task/TodoTaskController.java | 39 +++++----- .../impl/BusProcessNameServiceImpl.java | 6 +- .../business_main/vo/ApproveDataVO.java | 2 + .../com/adc/da/wkflow/enums/FlowTypeEnum.java | 6 +- .../wkflow/listener/SCBG/oneApplyAfter.java | 6 ++ .../da/wkflow/listener/SCBG/reEditAfter.java | 1 - .../da/wkflow/listener/SCBG/startAfter.java | 1 - .../wkflow/listener/SCBG/twoApplyAfter.java | 70 ------------------ .../da/wkflow/util/ImpulseSenderUtils.java | 22 +++++- .../define/ActivitDefineController.class | Bin 14688 -> 14021 bytes .../service/ActivitDefineService.class | Bin 3923 -> 5239 bytes .../task/TodoTaskController$1.class | Bin 1573 -> 1573 bytes .../task/TodoTaskController.class | Bin 47623 -> 47710 bytes .../impl/BusProcessNameServiceImpl.class | Bin 5939 -> 5935 bytes .../business_main/vo/ApproveDataVO.class | Bin 5562 -> 6045 bytes .../adc/da/wkflow/enums/FlowTypeEnum.class | Bin 2414 -> 2597 bytes .../wkflow/listener/SCBG/oneApplyAfter.class | Bin 5641 -> 5883 bytes .../da/wkflow/listener/SCBG/reEditAfter.class | Bin 5440 -> 5405 bytes .../da/wkflow/listener/SCBG/startAfter.class | Bin 5468 -> 5433 bytes .../wkflow/listener/SCBG/twoApplyAfter.class | Bin 6686 -> 0 bytes .../da/wkflow/util/ImpulseSenderUtils$1.class | Bin 767 -> 855 bytes .../da/wkflow/util/ImpulseSenderUtils.class | Bin 7984 -> 8178 bytes 42 files changed, 237 insertions(+), 161 deletions(-) delete mode 100644 report-activity/src/main/java/com/adc/da/wkflow/listener/SCBG/twoApplyAfter.java delete mode 100644 report-activity/target/classes/com/adc/da/wkflow/listener/SCBG/twoApplyAfter.class diff --git a/adc-da-report/src/main/java/com/adc/da/report/dao/mysql/TtReportManageActDao.java b/adc-da-report/src/main/java/com/adc/da/report/dao/mysql/TtReportManageActDao.java index 6f4bb6a..7965ce7 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/dao/mysql/TtReportManageActDao.java +++ b/adc-da-report/src/main/java/com/adc/da/report/dao/mysql/TtReportManageActDao.java @@ -44,5 +44,7 @@ public interface TtReportManageActDao extends BaseMapper { */ List queryList(@Param("pageVO") TtReportManageActPageVO ttReportManageActPageVO); - TtReportManageActPageVO selectByDataId(String dataId); + TtReportManageAct selectByDataId(String dataId); + + TtReportManageAct selectByPrcId(String prcId); } diff --git a/adc-da-report/src/main/java/com/adc/da/report/eo/ReportEntity.java b/adc-da-report/src/main/java/com/adc/da/report/eo/ReportEntity.java index c73c660..f472697 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/eo/ReportEntity.java +++ b/adc-da-report/src/main/java/com/adc/da/report/eo/ReportEntity.java @@ -95,6 +95,12 @@ public class ReportEntity { @TableField("del_flag") private String delFlag; + /** + * 保密到期时间 + */ + @TableField("secrecy_last") + private Date secrecyLast; + /** * 用户id列表 */ diff --git a/adc-da-report/src/main/java/com/adc/da/report/eo/TtReportManageAct.java b/adc-da-report/src/main/java/com/adc/da/report/eo/TtReportManageAct.java index e8618aa..7e1c069 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/eo/TtReportManageAct.java +++ b/adc-da-report/src/main/java/com/adc/da/report/eo/TtReportManageAct.java @@ -113,11 +113,15 @@ public class TtReportManageAct { @TableField("del_flag") private Integer delFlag; - - /** - * 权限设置 + * 保密到期时间 */ + @TableField("secrecy_last") + private Date secrecyLast; + + @TableField("file_name") + private String fileName; + @TableField(exist = false) - private List powerList; + private List labelList; } diff --git a/adc-da-report/src/main/java/com/adc/da/report/service/impl/ITtReportManageActServiceImpl.java b/adc-da-report/src/main/java/com/adc/da/report/service/impl/ITtReportManageActServiceImpl.java index 4e30d21..e110bd2 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/service/impl/ITtReportManageActServiceImpl.java +++ b/adc-da-report/src/main/java/com/adc/da/report/service/impl/ITtReportManageActServiceImpl.java @@ -4,7 +4,6 @@ package com.adc.da.report.service.impl; import com.adc.da.report.dao.mysql.PowerApplyDao; import com.adc.da.report.dao.mysql.ReportDao; import com.adc.da.report.dao.mysql.TtReportManageActDao; -import com.adc.da.report.eo.PowerApplyAct; import com.adc.da.report.eo.TtReportManageAct; import com.adc.da.report.service.ITtReportManageActService; import com.adc.da.report.vo.DeleteParamRequestVO; @@ -123,8 +122,5 @@ public class ITtReportManageActServiceImpl extends ServiceImpl powerList = ttReportManageAct.getPowerList(); - powerApplyDao.saveBatch(powerList); } } diff --git a/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml b/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml index 210c100..947da47 100644 --- a/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml +++ b/adc-da-report/src/main/resources/mybatis/mapper/mysql/ReportManageMapper.xml @@ -4,21 +4,26 @@ - id, - data_id, name, keycontent, maincontent, department, year, fileId, confidentialLevel, privacyLevel, createUserId, createDate, updateDate, del_flag + id, name, keycontent, maincontent, department, year, fileId, confidentialLevel, privacyLevel, + createUserId, createDate, updateDate, del_flag,secrecy_last - #{Vo.id}, - #{Vo.dataId},#{Vo.name},#{Vo.keycontent},#{Vo.maincontent},#{Vo.department},#{Vo.year},#{Vo.fileId}, + #{Vo.id},#{Vo.name},#{Vo.keycontent},#{Vo.maincontent},#{Vo.department},#{Vo.year},#{Vo.fileId}, #{Vo.confidentialLevel},#{Vo.privacyLevel}, #{Vo.createUserId}, - #{Vo.createDate},#{Vo.updateDate},#{Vo.del_flag} + #{Vo.createDate},#{Vo.updateDate},#{Vo.del_flag}, + #{Vo.secrecyLast} insert into TT_REPORT_MANAGE () - value () + value ( + #{Vo.dataId},#{Vo.name},#{Vo.keycontent},#{Vo.maincontent},#{Vo.department},#{Vo.year},#{Vo.fileId}, + #{Vo.confidentialLevel},#{Vo.privacyLevel}, + #{Vo.createUserId}, + #{Vo.createDate},#{Vo.updateDate},#{Vo.del_flag}, + #{Vo.secrecyLast}) - SELECT - - FROM + a.id, + task_id, prc_id, data_id, name, keycontent, maincontent, department, year, fileId, confidentialLevel, privacyLevel, createUserId, createDate, updateDate, del_flag + ,secrecy_last,file_name + ,label.label as lableName,label.id as labelId + FROM a + LEFT JOIN ts_report_label rl on rl.report_id = a.data_id + LEFT JOIN ts_tree_label label on rl.label_id = label.id data_id = #{dataId} + diff --git a/adc-da-report/target/classes/com/adc/da/report/dao/mysql/TtReportManageActDao.class b/adc-da-report/target/classes/com/adc/da/report/dao/mysql/TtReportManageActDao.class index 83a07edfdb54c7f63694428931018a1e585dcc2c..dd21becee32e28b7463897b798a5cae942257a84 100644 GIT binary patch delta 119 zcmX@f^^QyU)W2Q(7#J8#806U*WY`&G*%{#Hli%C>g|OEhtLfT*s`y$jCZ*KFbVM7Dfhf22lo}4xo{&j0_S$iiv>} LOiD6HfoW*~l4ceS delta 76 zcmaFIb&^Z?)W2Q(7#J8#7-ZQQq}Umx*%@Ru3M(=*I!!iZR-YWhD9z5uz?PC&lDK&S cvjQU{%jAtLGlUqJ7&w8Nm>9$vB*3&J0JXUeTL1t6 diff --git a/adc-da-report/target/classes/com/adc/da/report/eo/ReportEntity.class b/adc-da-report/target/classes/com/adc/da/report/eo/ReportEntity.class index 5266edca70cc32530539bf62a45b6965a9019182..57c549f709928d6e19fad889e43e721936c71d40 100644 GIT binary patch literal 9195 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 Rvz5Q<{TJ>R{tWxy{|7SGQM~{F literal 10344 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 KZA)(K+TkCTPV3_U diff --git a/adc-da-report/target/classes/mybatis/mapper/mysql/ReportManageMapper.xml b/adc-da-report/target/classes/mybatis/mapper/mysql/ReportManageMapper.xml index 210c100..947da47 100644 --- a/adc-da-report/target/classes/mybatis/mapper/mysql/ReportManageMapper.xml +++ b/adc-da-report/target/classes/mybatis/mapper/mysql/ReportManageMapper.xml @@ -4,21 +4,26 @@ - id, - data_id, name, keycontent, maincontent, department, year, fileId, confidentialLevel, privacyLevel, createUserId, createDate, updateDate, del_flag + id, name, keycontent, maincontent, department, year, fileId, confidentialLevel, privacyLevel, + createUserId, createDate, updateDate, del_flag,secrecy_last - #{Vo.id}, - #{Vo.dataId},#{Vo.name},#{Vo.keycontent},#{Vo.maincontent},#{Vo.department},#{Vo.year},#{Vo.fileId}, + #{Vo.id},#{Vo.name},#{Vo.keycontent},#{Vo.maincontent},#{Vo.department},#{Vo.year},#{Vo.fileId}, #{Vo.confidentialLevel},#{Vo.privacyLevel}, #{Vo.createUserId}, - #{Vo.createDate},#{Vo.updateDate},#{Vo.del_flag} + #{Vo.createDate},#{Vo.updateDate},#{Vo.del_flag}, + #{Vo.secrecyLast} insert into TT_REPORT_MANAGE () - value () + value ( + #{Vo.dataId},#{Vo.name},#{Vo.keycontent},#{Vo.maincontent},#{Vo.department},#{Vo.year},#{Vo.fileId}, + #{Vo.confidentialLevel},#{Vo.privacyLevel}, + #{Vo.createUserId}, + #{Vo.createDate},#{Vo.updateDate},#{Vo.del_flag}, + #{Vo.secrecyLast}) - SELECT - - FROM + a.id, + task_id, prc_id, data_id, name, keycontent, maincontent, department, year, fileId, confidentialLevel, privacyLevel, createUserId, createDate, updateDate, del_flag + ,secrecy_last,file_name + ,label.label as lableName,label.id as labelId + FROM a + LEFT JOIN ts_report_label rl on rl.report_id = a.data_id + LEFT JOIN ts_tree_label label on rl.label_id = label.id data_id = #{dataId} + diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java b/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java index a6fb932..cf2db9c 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java @@ -4,7 +4,9 @@ import com.adc.da.base.web.BaseController; import com.adc.da.excel.poi.excel.ExcelImportUtil; import com.adc.da.excel.poi.excel.entity.ImportParams; import com.adc.da.sys.constant.SysConstants; +import com.adc.da.sys.dao.mysql.UserOrgEODao; import com.adc.da.sys.entity.UserEO; +import com.adc.da.sys.entity.UserOrgEO; import com.adc.da.sys.service.iservice.IUserEoService; import com.adc.da.sys.util.EncryptUtil; import com.adc.da.sys.util.RSAUtil; @@ -14,6 +16,7 @@ import com.adc.da.util.http.ResponseMessage; import com.adc.da.util.http.Result; import com.adc.da.util.utils.FileUtil; import com.adc.da.util.utils.StringUtils; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.google.gson.Gson; import com.google.gson.JsonElement; @@ -35,6 +38,7 @@ import java.io.InputStream; import java.io.OutputStream; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -47,6 +51,8 @@ public class UserEOController extends BaseController { @Resource private IUserEoService userEOService; + private UserOrgEODao userOrgEODao; + @Value("${isPassEncrypted}") private boolean isPassEncrypted; @@ -112,7 +118,20 @@ public class UserEOController extends BaseController { userEOService.save(eo); - + //保存部门 + LambdaQueryWrapper userOrgEOLambdaQueryWrapper = new LambdaQueryWrapper<>(); + userOrgEOLambdaQueryWrapper.eq(UserOrgEO::getUserId,eo.getUsid()); + userOrgEODao.delete(userOrgEOLambdaQueryWrapper); + String orgId = eo.getOrgId(); + String[] split = orgId.split(","); + List userOrgEOS = new ArrayList<>(); + for (String s : split) { + UserOrgEO userOrgEO = new UserOrgEO(); + userOrgEO.setUserId(eo.getUsid()); + userOrgEO.setOrgId(s); + userOrgEOS.add(userOrgEO); + } + userOrgEODao.insertBatch(userOrgEOS); return Result.success(); } diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserEO.java b/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserEO.java index c3253a5..2559953 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserEO.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/entity/UserEO.java @@ -97,6 +97,8 @@ public class UserEO extends BaseEntity implements Serializable { @TableField("USNAME") private String usname; + @TableField(exist = false) + private String orgId; /** * 角色ID列表 @@ -110,6 +112,12 @@ public class UserEO extends BaseEntity implements Serializable { @TableField(exist = false) private List roleEOList = new ArrayList<>(); + /** + * 部门EO列表 + */ + @TableField(exist = false) + private List orgList = new ArrayList<>(); + @TableField(exist = false) private String roleId; 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 0cd18df..a136665 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 @@ -57,6 +57,10 @@ + + + + @@ -93,10 +97,19 @@ diff --git a/adc-da-sys/target/classes/com/adc/da/sys/controller/UserEOController.class b/adc-da-sys/target/classes/com/adc/da/sys/controller/UserEOController.class index be220f3d7fbe9ee98cbe81260d86f3dd503a042e..57e7c2fbf0c24b9b650ac6f61cebe75567491cdc 100644 GIT binary patch delta 6480 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 T;Ft?Tm++;08OJQ@D!%N$nW^PG delta 4423 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 diff --git a/adc-da-sys/target/classes/mybatis/mapper/sys/mysql/UserEOMapper.xml b/adc-da-sys/target/classes/mybatis/mapper/sys/mysql/UserEOMapper.xml index 0cd18df..a136665 100644 --- a/adc-da-sys/target/classes/mybatis/mapper/sys/mysql/UserEOMapper.xml +++ b/adc-da-sys/target/classes/mybatis/mapper/sys/mysql/UserEOMapper.xml @@ -57,6 +57,10 @@ + + + + @@ -93,10 +97,19 @@ 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 f9e4f4b..82edc9b 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 @@ -13,9 +13,7 @@ import com.adc.da.wkflow.util.ImpulseSenderUtils; import com.adc.da.wkflow.util.activiti.ActivitiTools; import com.adc.da.wkflow.util.wrapper.WrapMapper; import com.adc.da.wkflow.util.wrapper.Wrapper; -import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.alibaba.fastjson.serializer.SerializerFeature; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -155,6 +153,7 @@ public class ActivitDefineController { String id = jsonObject.getString("id"); String userId = jsonObject.getString("loginUserId"); String bpnId = jsonObject.getString("bpnId"); + String reportId = jsonObject.getString("reportId"); Object dataMsg = jsonObject.get("dataMsg"); Object approveData =jsonObject.get("approveData"); @@ -187,9 +186,9 @@ public class ActivitDefineController { busProcessName.setCreatUserName(byId.getUsname()); busProcessName.setPrcNum((String) prcNameAndPrcNum.get("prcNum")); busProcessName.setPrcType(prcType); - String data = JSON.toJSONString(dataMsg, SerializerFeature.DisableCircularReferenceDetect); - String dateId = activitDefineService.saveOrUpdateDate(prcType,data,task.getId(),pi.getId()); - busProcessName.setDataId(dateId); +// String data = JSON.toJSONString(dataMsg, SerializerFeature.DisableCircularReferenceDetect); +// String dateId = activitDefineService.saveOrUpdateDate(prcType,data,task.getId(),pi.getId(),reportId); +// busProcessName.setDataId(dateId); // busProcessName.setPrcName((String) prcNameAndPrcNum.get("prcName")); busProcessName.setPrcName(jsonObject.getString("prcName")); busProcessName.setSubmitStatus(SubmitStatusEnum.SUBMIT.getValue()); @@ -210,9 +209,9 @@ public class ActivitDefineController { one.setPrcId(pi.getId()); one.setSubmitStatus(SubmitStatusEnum.SUBMIT.getValue()); one.setCreatTime(sdf.format(new Date())); - String data = JSON.toJSONString(dataMsg, SerializerFeature.DisableCircularReferenceDetect); - String dateId = activitDefineService.saveOrUpdateDate(prcType,data,task.getId(),pi.getId()); - one.setDataId(dateId); +// String data = JSON.toJSONString(dataMsg, SerializerFeature.DisableCircularReferenceDetect); +// String dateId = activitDefineService.saveOrUpdateDate(prcType,data,task.getId(),pi.getId(),reportId); +// one.setDataId(dateId); ibusprocessnameService.save(one); } diff --git a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/service/ActivitDefineService.java b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/service/ActivitDefineService.java index 4667c85..ccc8e70 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/service/ActivitDefineService.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/business_activiti/service/ActivitDefineService.java @@ -1,10 +1,13 @@ package com.adc.da.wkflow.business_activiti.service; import com.adc.da.report.dao.mysql.PowerApplyActDao; +import com.adc.da.report.dao.mysql.ReportLabelDao; import com.adc.da.report.dao.mysql.TtReportManageActDao; import com.adc.da.report.eo.PowerApplyAct; +import com.adc.da.report.eo.ReportLabelEntity; import com.adc.da.report.eo.TtReportManageAct; import com.adc.da.report.service.IPowerApplyActService; +import com.adc.da.report.service.IReportLabelService; import com.adc.da.report.service.ITtReportManageActService; import com.adc.da.util.utils.StringUtils; import com.alibaba.fastjson.JSONObject; @@ -13,7 +16,6 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.UUID; @@ -35,47 +37,44 @@ public class ActivitDefineService { @Autowired ITtReportManageActService ttReportManageActService; + @Autowired + private ReportLabelDao reportLabelDao; + @Autowired + private IReportLabelService iReportLabelService; + //保存data数据 - public String saveOrUpdateDate(String prcType, String dataJson,String taskId,String prcId) { - String dataId = UUID.randomUUID().toString().replaceAll("-",""); + public String saveOrUpdateDate(String prcType, String dataJson,String taskId,String prcId,String reportId) { + if (StringUtils.isBlank(reportId)){ + reportId = UUID.randomUUID().toString().replace("-",""); + } if ("1".equals(prcType)){ List powerApplyActs = JSONObject.parseArray(dataJson, PowerApplyAct.class); for (PowerApplyAct powerApplyAct : powerApplyActs) { powerApplyAct.setId(UUID.randomUUID().toString().replaceAll("-","")); - powerApplyAct.setDataId(dataId); + powerApplyAct.setDataId(reportId); powerApplyAct.setTaskId(taskId); powerApplyAct.setPrcId(prcId); powerApplyAct.setDelFlag(0); powerApplyAct.setCreateDate(new Date()); } powerApplyActDao.batchInsert(powerApplyActs); - }else if ("2".equals(prcType)){ + }else if ("4".equals(prcType)){ TtReportManageAct ttReportManageAct = JSONObject.parseObject(dataJson, TtReportManageAct.class); - ttReportManageAct.setDataId(dataId); + ttReportManageAct.setDataId(reportId); ttReportManageAct.setTaskId(taskId); ttReportManageAct.setPrcId(prcId); ttReportManageAct.setDelFlag(0); ttReportManageAct.setCreateDate(new Date()); ttReportManageActService.saveOrUpdateSingle(ttReportManageAct); - //权限 - List powerApplyActs = new ArrayList<>(); - List powerList = ttReportManageAct.getPowerList(); - for (PowerApplyAct powerApplyAct : powerList) { - if (StringUtils.isEmpty(powerApplyAct.getId())){ - powerApplyAct.setId(UUID.randomUUID().toString().replaceAll("-","")); - powerApplyAct.setReportId(ttReportManageAct.getId()); - powerApplyAct.setDataId(dataId); -// powerApplyAct.setTaskId(taskId); - powerApplyAct.setPrcId(prcId); - powerApplyAct.setDelFlag(0); - powerApplyAct.setCreateDate(new Date()); - powerApplyActs.add(powerApplyAct); - } - } - if (powerApplyActs.size()>0){ - powerApplyActDao.batchInsert(powerApplyActs); - } + //插入报表标签关系表 + //修改报表标签关系表(先删后增) + iReportLabelService.deleteReportLabelByReportId(new String[]{reportId}); + ttReportManageAct.getLabelList().forEach((label) -> { + ReportLabelEntity reportLabelEntity = new ReportLabelEntity(com.adc.da.util.utils.UUID.randomUUID10() + ,ttReportManageAct.getDataId(), label); + reportLabelDao.insert(reportLabelEntity); + }); } - return dataId; + return reportId; } } 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 4d4781b..c5ebe89 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 @@ -4,8 +4,8 @@ import cn.hutool.core.util.StrUtil; import com.adc.da.login.util.UserUtils; import com.adc.da.report.dao.mysql.PowerApplyActDao; import com.adc.da.report.dao.mysql.TtReportManageActDao; +import com.adc.da.report.eo.TtReportManageAct; import com.adc.da.report.vo.PowerApplyActPageVO; -import com.adc.da.report.vo.TtReportManageActPageVO; import com.adc.da.sys.service.iservice.IUserEoService; import com.adc.da.sys.vo.UserVO; import com.adc.da.util.exception.AdcDaBaseException; @@ -282,6 +282,7 @@ public class TodoTaskController { public Wrapper completeTaskByUserId(@RequestBody ApproveDataVO busMes) { log.info("!!!!!!!!!!!!!TaskId!!!!!!!!!!!!!!!"+busMes.getTaskId()); String dataJson = busMes.getDataJson(); + String reportId = busMes.getReportId(); if (busMes.getTaskId() != null && !busMes.getTaskId().equals("")) { Task task = taskService.createTaskQuery().taskId(busMes.getTaskId()).singleResult(); if(task!=null){ @@ -297,7 +298,8 @@ public class TodoTaskController { ibusProcessApproveService.save(busProcessApprove); if (StringUtils.isNotEmpty(dataJson)){ //根据业务情况 对业务数据进行saveOrupdate - activitDefineService.saveOrUpdateDate(busMes.getPrcType(),dataJson, task.getId(),task.getProcessInstanceId()); + activitDefineService.saveOrUpdateDate(busMes.getPrcType(),dataJson, task.getId(), + task.getProcessInstanceId(),reportId); } taskService.complete(busMes.getTaskId()); } @@ -444,11 +446,9 @@ public class TodoTaskController { String string = JSONArray.toJSONString(powerApplyActs); //去对应的 数据表查数据 busProcessNewVO.setDataJson(string); - }else if ("2".equals(prcType)){ - TtReportManageActPageVO ttReportManageActPageVO = ttReportManageActDao.selectByDataId(dataId); - List powerApplyActs = powerApplyActDao.selectListByPrcId(ttReportManageActPageVO.getPrcId()); - ttReportManageActPageVO.setPowerList(powerApplyActs); - String string = JSONArray.toJSONString(ttReportManageActPageVO); + }else if ("4".equals(prcType)){ + TtReportManageAct ttReportManageAct = ttReportManageActDao.selectByDataId(dataId); + String string = JSONArray.toJSONString(ttReportManageAct); //去对应的 数据表查数据 busProcessNewVO.setDataJson(string); } @@ -458,23 +458,27 @@ public class TodoTaskController { private BusProcessNewVO queryDetailDate(BusProcessNew busProcessNew, String prcType, Integer tag) { BusProcessNewVO busProcessNewVO = new BusProcessNewVO(); BeanUtils.copyProperties(busProcessNew,busProcessNewVO); + String pId = busProcessNew.getPId(); String dataId = busProcessNew.getDataId(); if ("1".equals(prcType)){ List powerApplyActs = new ArrayList<>(); - if (tag == 1){ + if (StringUtils.isBlank(pId)){ //代办查看详情 - powerApplyActs = powerApplyActDao.selectListBydataIdNodel(dataId); - }else { powerApplyActs = powerApplyActDao.selectListBydataId(dataId); + }else { + powerApplyActs = powerApplyActDao.selectListByPrcId(pId); } String string = JSONArray.toJSONString(powerApplyActs); //去对应的 数据表查数据 busProcessNewVO.setDataJson(string); - }else if("2".equals(prcType)){ - TtReportManageActPageVO ttReportManageActPageVO = ttReportManageActDao.selectByDataId(dataId); - List powerApplyActs = powerApplyActDao.selectListByPrcId(ttReportManageActPageVO.getPrcId()); - ttReportManageActPageVO.setPowerList(powerApplyActs); - String string = JSONArray.toJSONString(ttReportManageActPageVO); + }else if("4".equals(prcType)){ + TtReportManageAct ttReportManageAct = new TtReportManageAct(); + if (StringUtils.isBlank(pId)){ + ttReportManageAct = ttReportManageActDao.selectByDataId(dataId); + }else { + ttReportManageAct = ttReportManageActDao.selectByPrcId(pId); + } + String string = JSONArray.toJSONString(ttReportManageAct); //去对应的 数据表查数据 busProcessNewVO.setDataJson(string); } @@ -491,6 +495,7 @@ public class TodoTaskController { public Wrapper saveTaskFirst(@RequestBody ApproveDataVO approveDataVO) { String dataJson = approveDataVO.getDataJson(); String submitJson = approveDataVO.getSubmitJson(); + String reportId = approveDataVO.getReportId(); String saveId = null; String dataId = null; if (approveDataVO.getId() != null && !approveDataVO.getId().equals("")) { @@ -509,7 +514,7 @@ public class TodoTaskController { if (StringUtils.isNotEmpty(dataJson)){ //根据业务情况 对业务数据进行saveOrupdate dataId = activitDefineService.saveOrUpdateDate(approveDataVO.getPrcType(), dataJson, null, - null); + null,reportId); busProcessName.setDataId(dataId); } iBusProcessNameService.saveOrUpdate(busProcessName); @@ -521,7 +526,7 @@ public class TodoTaskController { if (StringUtils.isNotEmpty(dataJson)) { //根据业务情况 对业务数据进行saveOrupdate dataId = activitDefineService.saveOrUpdateDate(approveDataVO.getPrcType(), dataJson, - approveDataVO.getTaskId(),""); + approveDataVO.getTaskId(),"",reportId); busProcessName.setDataId(dataId); } busProcessName.setPrcType(approveDataVO.getPrcType()); diff --git a/report-activity/src/main/java/com/adc/da/wkflow/business_main/service/impl/BusProcessNameServiceImpl.java b/report-activity/src/main/java/com/adc/da/wkflow/business_main/service/impl/BusProcessNameServiceImpl.java index 6050223..dcd5441 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/business_main/service/impl/BusProcessNameServiceImpl.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/business_main/service/impl/BusProcessNameServiceImpl.java @@ -43,9 +43,9 @@ public class BusProcessNameServiceImpl extends ServiceImpl result = new HashMap<>(); String prcName = ""; String prcNum = ""; - if(StringUtils.equals(FlowTypeEnum.BGQXSQLC.getValue(), prcType)){ - prcName = FlowTypeEnum.BGQXSQLC.getPrcName(); - prcNum = FlowTypeEnum.BGQXSQLC.getPrcNum(); + if(StringUtils.equals(FlowTypeEnum.XZSQ.getValue(), prcType)){ + prcName = FlowTypeEnum.XZSQ.getPrcName(); + prcNum = FlowTypeEnum.XZSQ.getPrcNum(); }else if (StringUtils.equals(FlowTypeEnum.SCBGLC.getValue(), prcType)){ prcName = FlowTypeEnum.SCBGLC.getPrcName(); prcNum = FlowTypeEnum.SCBGLC.getPrcNum(); diff --git a/report-activity/src/main/java/com/adc/da/wkflow/business_main/vo/ApproveDataVO.java b/report-activity/src/main/java/com/adc/da/wkflow/business_main/vo/ApproveDataVO.java index 6a998d8..ba3c7d6 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/business_main/vo/ApproveDataVO.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/business_main/vo/ApproveDataVO.java @@ -34,4 +34,6 @@ public class ApproveDataVO { private String prcName; + private String reportId; + } diff --git a/report-activity/src/main/java/com/adc/da/wkflow/enums/FlowTypeEnum.java b/report-activity/src/main/java/com/adc/da/wkflow/enums/FlowTypeEnum.java index f5620ba..5e5f2e1 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/enums/FlowTypeEnum.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/enums/FlowTypeEnum.java @@ -5,8 +5,10 @@ package com.adc.da.wkflow.enums; */ public enum FlowTypeEnum { - BGQXSQLC("1","报告权限申请流程","QXSQ","报告权限申请流程",""), - SCBGLC("2","上传报告流程","SCBG","上传报告流程",""), + XZSQ("1","下载申请流程","QXSQ","下载申请流程",""), + YLSQ("2","预览申请流程","QXSQ","预览申请流程",""), + YLXZSQ("3","预览+下载申请流程","QXSQ","预览+下载申请流程",""), + SCBGLC("4","上传审批流程","SCBG","上传审批流程",""), ; private String value; diff --git a/report-activity/src/main/java/com/adc/da/wkflow/listener/SCBG/oneApplyAfter.java b/report-activity/src/main/java/com/adc/da/wkflow/listener/SCBG/oneApplyAfter.java index f25ebee..05d17af 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/listener/SCBG/oneApplyAfter.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/listener/SCBG/oneApplyAfter.java @@ -1,6 +1,7 @@ package com.adc.da.wkflow.listener.SCBG; import com.adc.da.login.util.UserUtils; +import com.adc.da.report.dao.mysql.ReportDao; import com.adc.da.report.dao.mysql.TtReportManageActDao; import com.adc.da.report.eo.TtReportManageAct; import com.adc.da.wkflow.business_main.entity.BusProcessApprove; @@ -24,6 +25,7 @@ public class oneApplyAfter implements TaskListener { @Override public void notify(DelegateTask delegateTask) { TtReportManageActDao ttReportManageActDao = SpringContextUtil.getBean(TtReportManageActDao.class); + ReportDao reportDao = SpringContextUtil.getBean(ReportDao.class); IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); IBusProcessApproveService approveService = SpringContextUtil.getBean(IBusProcessApproveService.class); //查询task任务 @@ -52,6 +54,10 @@ public class oneApplyAfter implements TaskListener { String s = object.getString("flag") == "" || object.getString("flag") == null ? FlagEnum.AGREE.getValue() : object.getString("flag"); // 1: 同意 2：退回 delegateTask.setVariable("flag",s); + if ("1".equals(s)){ +// ttReportManageActService.saveReport(ttReportManageAct); + reportDao.saveReportAct(ttReportManageAct); + } } } diff --git a/report-activity/src/main/java/com/adc/da/wkflow/listener/SCBG/reEditAfter.java b/report-activity/src/main/java/com/adc/da/wkflow/listener/SCBG/reEditAfter.java index 18ca0ab..19102b4 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/listener/SCBG/reEditAfter.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/listener/SCBG/reEditAfter.java @@ -50,6 +50,5 @@ public class reEditAfter implements TaskListener { JSONObject object = JSONObject.parseObject(fromValsJson); delegateTask.setVariable("oneApprove",object.getString("oneApprove")); - delegateTask.setVariable("twoApprove",object.getString("twoApprove")); } } diff --git a/report-activity/src/main/java/com/adc/da/wkflow/listener/SCBG/startAfter.java b/report-activity/src/main/java/com/adc/da/wkflow/listener/SCBG/startAfter.java index d20bcc6..f44b899 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/listener/SCBG/startAfter.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/listener/SCBG/startAfter.java @@ -50,7 +50,6 @@ public class startAfter implements TaskListener { JSONObject object = JSONObject.parseObject(fromValsJson); //审批人 delegateTask.setVariable("oneApprove",object.getString("oneApprove")); - delegateTask.setVariable("twoApprove",object.getString("twoApprove")); //发起人 delegateTask.setVariable("userId",object.getString("userId")); } diff --git a/report-activity/src/main/java/com/adc/da/wkflow/listener/SCBG/twoApplyAfter.java b/report-activity/src/main/java/com/adc/da/wkflow/listener/SCBG/twoApplyAfter.java deleted file mode 100644 index f49caac..0000000 --- a/report-activity/src/main/java/com/adc/da/wkflow/listener/SCBG/twoApplyAfter.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.adc.da.wkflow.listener.SCBG; - -import com.adc.da.login.util.UserUtils; -import com.adc.da.report.dao.mysql.PowerApplyActDao; -import com.adc.da.report.dao.mysql.TtReportManageActDao; -import com.adc.da.report.eo.PowerApplyAct; -import com.adc.da.report.eo.TtReportManageAct; -import com.adc.da.report.service.ITtReportManageActService; -import com.adc.da.wkflow.business_main.entity.BusProcessApprove; -import com.adc.da.wkflow.business_main.entity.BusProcessNew; -import com.adc.da.wkflow.business_main.service.IBusProcessApproveService; -import com.adc.da.wkflow.business_main.service.IBusProcessNewService; -import com.adc.da.wkflow.listener.FlagEnum; -import com.adc.da.wkflow.util.SpringContextUtil; -import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import org.activiti.engine.delegate.DelegateTask; -import org.activiti.engine.delegate.TaskListener; - -import java.util.List; - -/** - * 上传报告 发起流程 - */ -public class twoApplyAfter implements TaskListener { - - @Override - public void notify(DelegateTask delegateTask) { - PowerApplyActDao powerApplyActDao = SpringContextUtil.getBean(PowerApplyActDao.class); - TtReportManageActDao ttReportManageActDao = SpringContextUtil.getBean(TtReportManageActDao.class); - ITtReportManageActService ttReportManageActService = SpringContextUtil.getBean(ITtReportManageActService.class); - IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); - IBusProcessApproveService approveService = SpringContextUtil.getBean(IBusProcessApproveService.class); - //查询task任务 - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(TtReportManageAct::getTaskId, delegateTask.getId()); - List ttReportManageActs = ttReportManageActDao.selectList(queryWrapper); - TtReportManageAct ttReportManageAct = new TtReportManageAct(); - if (ttReportManageActs.size()>0){ - ttReportManageAct = ttReportManageActs.get(0); - List powerApplyActs = powerApplyActDao.selectActListBydataId(ttReportManageAct.getCreateUserId()); - for (PowerApplyAct powerApplyAct : powerApplyActs) { - powerApplyAct.setReportId(ttReportManageAct.getId()); - } - ttReportManageAct.setPowerList(powerApplyActs); - } - //构建工作流代办 - BusProcessNew busProcessNew = new BusProcessNew(); - busProcessNew.setUserId(UserUtils.getUserId()); - busProcessNew.setPId(delegateTask.getProcessInstanceId()); - busProcessNew.setTaskInfo(delegateTask.getEventName()); - busProcessNew.setTaskId(delegateTask.getId()); - busProcessNew.setDataId(ttReportManageAct.getDataId()); - busBean.save(busProcessNew); - - //审批结果 - LambdaQueryWrapper approveWrapper = new LambdaQueryWrapper<>(); - approveWrapper.eq(BusProcessApprove::getTaskId, delegateTask.getId()); - List list = approveService.list(approveWrapper); - String fromValsJson = list.get(0).getFromValsJson(); - JSONObject object = JSONObject.parseObject(fromValsJson); - String s = object.getString("flag") == "" || object.getString("flag") == null ? FlagEnum.AGREE.getValue() : object.getString("flag"); - // 1: 同意 2：退回 - delegateTask.setVariable("flag",s); - if ("1".equals(s)){ - ttReportManageActService.saveReport(ttReportManageAct); - } - - } -} diff --git a/report-activity/src/main/java/com/adc/da/wkflow/util/ImpulseSenderUtils.java b/report-activity/src/main/java/com/adc/da/wkflow/util/ImpulseSenderUtils.java index ccb0484..73c9a56 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/util/ImpulseSenderUtils.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/util/ImpulseSenderUtils.java @@ -69,7 +69,13 @@ public class ImpulseSenderUtils { String prcType = entry.getKey(); FlowTypeEnum flowTypeEnumByValue = FlowTypeEnum.getFlowTypeEnumByValue(prcType); switch (flowTypeEnumByValue){ - case BGQXSQLC: + case XZSQ: + bgqxsqNumber = new AtomicInteger(count); + case YLSQ: + bgqxsqNumber = new AtomicInteger(count); + case YLXZSQ: + bgqxsqNumber = new AtomicInteger(count); + case SCBGLC: bgqxsqNumber = new AtomicInteger(count); break; } @@ -88,13 +94,21 @@ public class ImpulseSenderUtils { throw new ActivitiException("非法的流程类型： " + flowType); } switch (flowTypeEnum){ - case BGQXSQLC: + case XZSQ: number = bgqxsqNumber.incrementAndGet(); - checkNumberLegitimate(number,"报告权限申请流程"); + checkNumberLegitimate(number,"下载申请流程"); + break; + case YLSQ: + number = bgqxsqNumber.incrementAndGet(); + checkNumberLegitimate(number,"预览申请流程"); + break; + case YLXZSQ: + number = bgqxsqNumber.incrementAndGet(); + checkNumberLegitimate(number,"预览+下载申请流程"); break; case SCBGLC: number = bgqxsqNumber.incrementAndGet(); - checkNumberLegitimate(number,"上传报告流程"); + checkNumberLegitimate(number,"上传审批流程"); break; default: throw new ActivitiException("流程类型 " + flowType + " 非法！"); diff --git a/report-activity/target/classes/com/adc/da/wkflow/business_activiti/define/ActivitDefineController.class b/report-activity/target/classes/com/adc/da/wkflow/business_activiti/define/ActivitDefineController.class index c832aeacc027da756e57d693e78826f1ae73718e..3258a07ca0d2ed32c1d7653c7ab0f27a65486d7f 100644 GIT binary patch delta 4983 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 delta 5350 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 AQUCw| diff --git a/report-activity/target/classes/com/adc/da/wkflow/business_activiti/service/ActivitDefineService.class b/report-activity/target/classes/com/adc/da/wkflow/business_activiti/service/ActivitDefineService.class index b3acb09fef838b1c391f11018a41f5bd25769c55..12651f6e88cea33ef383aaa78de21cfe1f269b0e 100644 GIT binary patch literal 5239 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 diff --git a/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TodoTaskController$1.class b/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TodoTaskController$1.class index e14f121b6b63103501f48cd777ea136943b1406b..bc012ff4d5bdc563eaaf65ab89540cc4379df148 100644 GIT binary patch delta 25 fcmZ3=vy^9p5G&)c$-=BLj3*}-u%-jqH&}fEY(xmP delta 25 fcmZ3=vy^9p5G&)s$-=BLj7KIHu%-jqH&}fEYo7?F diff --git a/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TodoTaskController.class b/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TodoTaskController.class index 31464285c918c7df79bd87a6b4a0136270ffc5ad..80663abd7d8407e3dfaa5afeb467ed29bc9e629c 100644 GIT binary patch literal 47710 zcmeIbcYIW37B_yLax;_3O$TJ?NN)xkXi$(UEr1jedq@Tdge0bb*cLlt#SV5+v7y)k z0eeAL-PN_PtFDcpYu&Xg<^7)Lxp(GHG68hoeLufHewI78JohQ*oadbHInQ}+Ufi+q zaUwdv`Ex{^uUdsv>j+8JDx%t`y&|fuit=SUzHHBD9m1+3Uv!Gl5Y;)Xy6{C;KJ3kh zZt3D&)jgtmsGb?Bm+BqCWuFWhr20lwKh>XW7!XnWsDg+ZsP^Rt`(>#8)d74sFr)_Y z>w`1YLF(X;DvVHP)heupWKain2wxl;RzvxB7#|MHP{Y*-K8y^hQDHSYgZij3T=wvg z8XKVjcvo!YK^+!WPY^b8CFN}AZLZu(R_VO9+8@zu1ZvC1cz8e%~3OW1amXgJXID_^SRaq z++KNDu8vTVTF8fru&U(WDkjHC{6ckxs!_FkRu@)_GSp&qa#$^is8iIb5p|k6J*>_M zt3QR+QZ904hB`}~9a85+s6?I17w3i4`4O4}uHmqZ4;O^ha{j%L4;OJ`VAvdWF&{4B zN-oV%m#Gzec6o-nLS4xnxGIAdsjEZk8vX@QuMMe{5n94@d^&?pR;&2p@UZxSFRlx# z>m%w0bt4~c;=|1mb&I-{&sKA7w}sU05rRnZ;f{z}qdf-Jzz=3c)Pw3FuJz%NdL*psBeYVj=V9&5EZq=R4czCAT=%B1 zdNiya<98p=P*12Q`S4VRdRjfh2aM}krrC3R*vyCLSx8^t@_&xd!|KHh^^$s-d-4~) z{3}0wh3~x@Qh(z+5R2Ei^y?Yw4fSS3y`|pf+wX+c-}&~t8R{SEy@+~WeZUNQkq`gm z;e5#DKMJXjBlHZU5T!ohv8@WLPx*ICST(X#ZDrv(o9}>SMd~w_uh04HUwrt2pMu|C zhSgUQdX0(jn);fbfX+qg8$Nu?hktVo|KYRm_>~o5^?g|Vz}H~o`RYfe@_8)H;L4%u zCqDcfQNO5PGt_Tt8<*S8quG(6c52F?ue9KU^i77aha86aRJ&>n_|vS1t~jDAL`y)$U>4gD-mKkpr<}8q=!dDfgTajBlV~}lDZ$aJ|?UW=N86> z^|**0uP1QXiD6xoj*CfQJvpMM=p({_D^7qc)O^wA-G zOhk;)$MU$3!#9p)cr&Zoz8P<>d&=g#`n^(kFSj~YRasM3TUos%{%Wt(uQn}+x3hVK(<@6W zl~M=0@U0lSab2hSiI`P{!rD48c=sD4AJj29uyTfhAf~jH+Jkwgyz5SqEtuosimrL88ww) zyAv@{Ml4}Yjw=;Z+&eg+7I{@#TWR#v$jXHaD=Utui&ZZf(kJ+4U2R!;!MxhqD%QtU z(ABXbC@&BW!_URkU{z)~47FcbA!xsp>NTN<3p`Ddcn1|J$TZW9Z9su(5yFi7&Z6S- zI?yjC@PvoSuPlfyVZxeM%8M)J7EG&UiQ>1as!Nyz?nykHnbpNXeKotda$#9%WgP@$ zHjGbARe4=aK}ltG42OzRGl-f3^J0OahW9$E%}UJKNswAWgM)NxN@1e_W3YF%OPVM^ zRF%f;pu4$^7mO(i@JP_XyJ|cxHmTSPIjsW!noOOh{ZFc5 zisg591t_)%@>{dO&_+<-l-xGLIw`p<2BFKrIzeIn;Ti>n_;hpy2obK1)zsBu$T($z zW-i03O{@&gn9s#4E_J0 zG##=l=IugqxZ$e65aJ@zV#m$M{+p3+T z+E_JId5?)@l?646iy0vYOju39@T#)Oz)S}0f}U*~m#x^k>YOc)pSxxGjh}AXv}O4% zTb5n(*)4bSglf5paSN-;%Sy^HchF=F>gltmg;7>l7@d{2<+6*nu33kvS5jA94ecW+ zeamB4Y`Ng#&u@7IrE1Df!Mt=E@4pn+jW^uVcooW~F`!^|72bN~osG-Z^XY*pt@z^D z?1I^46{UgE!v@#z#ICZ+IkO;WuLSL#>=eYwndBYpd1F&!(A}_um8DBCXa&DP(4^j0 zJc3rD`JE)I=V?PTdlp**Qjo9&VR%Pnb1Pz?RQfcW6xY^O<9zo2)pk`W#EYaWaGvyE3OrEz#cQ`@K}I9*##x@U`=Dg<3r3%z5%~Q&^dcF)aFFq zlRLkI5t#v#%-tIF2lQ%eF{qlGsEAE2Tna&jzrQl?U6#Dc3P?nz0TQ0z>%YhiU1px7niVGC8+NIwN=6BS*pfb#ssXz?^mE+Ro$Ca)eNEyMQrF21bqcv z`~LwsYGI;fH(tFid9G!DcI!Rf9dC|hH9m6Y);llUa^H=gK7Qf2QNW{3W{;UHgZ6kP zdfLk=x~ALN)6* z_+N?kDL7|L&zAcxYFu`i&!GXH@Lzn@ryK76Z24JR z&uXxbzIpVbt=B!=c**U_mcKnYJ`EdjPZdi9n|*9+>|cymMJ#rGwv1S{If1;h4|hn7>&Y_$3Q9pE((zz_nq zqM~jg#0j1)=)!2OZXu+~VNi$PXtRkmqOPpG)WiouD2hl#4VDSxQ_bt62L-zaJ09$+ zH!rRm>b&RVHXaO2vrIawOXiX86Oy zjKB1M+|5INSATfgw*KtC+djYbye$p&$s`}J<-S`QFKF1h>59f1um5zzMtj+K;pJO5 z-GC{)W!Xx8bi+-S?ZB78@_H4zp1o+j$d%;FmCLo{#La*vpDP*sI;Cf4E{zLPZ{)$_u)QpWS~) z zKwzx8Us-arEVdZz%uYaTprRuuvxl-fqQEAONUS~ZTab^uL`9yVMeP~I*5+GlIkAaU z{egIkZ^L;8rTJuct&I4z&JR$2#1e)Ztly6Ry&UiYmwU{BG=>F?1pWr;{OsZjw%+-K z-@#VF4ko&^SD>TlChUse*`xQUvq@d^bSSuB*S&ny)tpmVN#S~MDGh!P!T?Yn&4TcP zk^qf`I|VUBr<;b}!4S_Z$F)Whf4x^BJ4w-hjyOVon4j5A$RTJ&QsXH{m~w&!=8?z6 zz#V@w{2}TgYbB(wL=FVJ$eLmsbRAPx&5o(6DV-yzgKeocc5-dOv@%9e%-J!O)eDO` zKCan5;azWDFu!@uMQZA1FD$FI(e$ zYGxHQ=|GmDA8SglM-x&=(e6jxoT5My=(;nzs)8p{Yl}ac^(Q-_slE0S9U4_#JO?C# zCFeLG2Sto;VP^?ApLo?P>6F!&0CdlkLulr@g6?+NvaDpdU7K0r8-LqilFPqei|Zk& z@xu{j{RO?o)S6o!!-|W6BbnYh%V@KzE~r~d4B#!S*g_yryy$&H4q2 zU07U&*oeDj+0CD?yv;`)Z3+fw z6{WG0F)zkJf@>?iEAyh|Q^uT1WGPLJVWkrI+uic$#x2Y08!x|Y%XK&6vLNYc)L6~{ zQi8>U$u<@!uXl>BPH1*B3G3`3QenHwY;I@GU+VVV`ITiAwQ=_KNMR5IQo>^&!buM{ zog=RFyv0BUBn4RVszI?B9Dihl8UKbQZ?ri@cfz%}8ez0f=c=Zu1h&+OB}P`ET}G!g zdM&l%4I`0d5N~uZuO)xhC0Z~F)TVHxvx4GNOu9&1`QhT=-BTsyR3t4Tc8)z-Lr4yWwVQC7bCT%rglDJi3Q`QO`hZ}iF2iX8qTLZHc4El0^DopcBm*JA98DZ#k}$-9&8Q_s)&g zvhf@TJIfrk+F)<5t%RCNF{_QF+457HmQO7{O=ez_5@>4A(6#Q6+!(Tr%AwjO7B8G# zTHGD^DnT-oRV=Dp5G$DGmnyZz5C%wKUQbGZ-O5cJaXVoYY)dsDG-!)=57>t8Q2b{F z+xOk2fL;C_$}HtHX^NYg0(7IU>|#t)b+y}9k&EIDDhWk)9|$dWNJ+Vu1{RrSGFHcw zanjdb)4jy3M7q{KOj~x{T3+ObTEvpfT&S9)z|YqEZrOU-dA_!-X_7pbYS|smLv5mE zRGT{QF7>N0Q^7@hx1jr}h>aripmyHruDDmM1;p9~=i=mL@XY2L5X;rq>FeRry7~rv zqpNSyH@o^4eZ8x1)i=Ys_HgxTz1-EeX?UEn0GD^@HLkvs@7;wnafP@tr0;h1J^Ef` zWVqsG`H3svlyAA>3$Ax9*L$C<@7L=>`TXHhh6=MB3IYz^~m3F^#Wz96 zK(vu^GfA<4<%$*J@{oSi)sN}N!MVf~uwv>((=o9;Es(G)<4Rrqgg)QZPwJ-xp{*zN z)2@DobFH6s)e!xhE3e=N2d2WY9ICMC$$lg`QE{R%U!ifdrG<95ku6`?|-*)vo`tPoOm-+G!S6m~m z4e9q>{l5MHsVuvYu~;_8q2=_mSAS6nDA z3h6DbZq!>{ae=^?GP!)0Q%~>02CPd+f9C4X^%@viyU>i~wk^wV3h95j`V0MKNPp$( zuk|;e)QoAPr-E=en?8Kn1aqdRFeSxR0uK4Nm>>Gz2(kYDp~V)v`ak+RSAWl!dj$*TKFD*Gbn~{|K?XC^OSzO~{G3P6kvRgcei$XBLCNOl2q9buyhS z*U9DmakdyB^t(?}b(}v#+s%N7jV!jJsFub&6RPl)7fL9O0z7=lE zx)nCoR#uAjpT=u$ZhYvfErBIpD1KJN_d0t)L-*|I$`N{}>$GJOx^_*^iYqRIYe}xS zRA6(-HLko7td&Fzo`oDLzUr|a}`db>^^ zCa^fb6?cn!LQY@T>F4whIRjj0AE&@|26FrRvSjS%bilH3py^#iwOwa_2Ue z(@)^(?K%fAX(cALb0AxoJD^9LK~Q7PU_LvD^-Vh?*(rm-Fab;O&w!$$0i~r~#*Qsq zxUjIM#&r&M3SDOi*Ki0Q4&}p8?(;CN(CfhTaYdt{VNGvFo9>)2i8Zlv5DVyG=#Dd7 zpC58YxXwst6oP=RGuj#BI)|eoah9uLn)0SY2!^Cw=NKl!vCjCAa~#ju<6XHExWqZZIUX_7fPf@HdDl4+t?SzyKt}b+ z(#u?DHVcG+1eWlL?(@mg6|Pf?9?MJQrLGg>zRz*yqD&vxnJ3T7PIJm~ocZ`!kmHoQ z&O)ccbt;{zkaLpjRLj#`r-sK@>(rqe2}w#0`MJ&_#(SfKaWNaNvB6&Giq9UqxAEdz zw=BDE%chNu*VKQ0&BLE8J=0q~HkVr-J!{K`4c|Pv%5@fVizl-bEpbi(TyjnY4A`>n zQoQFnr|}3*cg}E~Ke6&Za8DR+6t)*CGlIgDKBJk^N4#tgSr@F(b(T73Vv|OIM@`+7 zIM}sTsTt_+4mEPGb5_VX+jY)y&IL0t#`EQA9!dRR+J8aPWzH#(kS(`CRbAjZ%bg2d z=OPABqnk(A{t(M9b}qqc%)b0j<0E%}_HcvcF>(e9Lk{HbGS-J}8?So!)5os(?1{@h zy9LIBg#ZN%%U1yAJC{3GaLmsn5C>yqu5+aW<9fB3pEhh}&4}w<1BmZj>#Rg#XDUHx zDfYwsv+)N;TCfBEmj3}z8u00(tG2Fv+;vv*yD(n~WQ(t+h`Y5AJwXq>`0IVE zK5e)l(Zj$4&TULQaK&nITgbWFb?#9Va_)7VwcMlo^z{f&BO)@*tS?T(#?Cs}n){ja z>v*7pc?PxYC)8F}mMEy@mk+O=TemP)Q5#@lr*Re7hg4SD#YO+_1-+Npz{N*nyU`?PVW_B!1s^mfeN%M6j|TqYcm2{yg*>6Wk@>=566&p$G(sXwnjJ)m&GS!8($Zhm;H%~QHJIfV_W#iz$uVS$bzmg7soj&7 zr6O}PtAS`^QXW7eHsQ^!gVCE*HSH=kWnM*x732^y4c%-OfCr=`ZbHQ-1=H|)Qh8sz z1GB4Xd1U3;TP+~N-F8_}>P(eCI)0w=c3!KhI#A-E6a)y2CoXRZlEk^Gic7J`g=JFg z1D(cH%}tUL+ycSU&>licyoQRcU?|ip*q~3rV**Wj_uxjxPJ%#{mo0!2@-&i7;v0>2 zc5R!RZH%30Rs)O>_?x04PJ^=%AKh>^85%dAD9Pz!7-o}fM_!@~PW(7whU~U~En){y ztatOC#5i}lAc#{&;|_>BZN`YAanpGZ-k!dM2Et&;k#?8z@c){Of`&G4I+=35_6~js z0tw4KXAB!2R&Ja$!WPe*V=W9|%ezYG8Y8qJ z+_sBez797EkZ+l#na-)EA=ero95<8Ln3hWTn~OeMha9ds`27-0g)-CCKF#TEI<+{k z=?|fB^T7*QiPV~;%?R-cy$7|R3W$phqnjp7R34Tgt+>WgrAP1J%#GKbz;uREyLLtm zcuOTCfv=5>`s0$3V3-9SX8jZVAD>DOrI<#^vfNw?n9X=DryEYLo>67I;NbnnHgySf3Z-T`P>5PY>CcZy>W@vJeEIJm50CM zRb`bl*_fH_(n{_Kq}pk^Z}_P><)v_zP{^ z$;@~`4!koiwW`Hb$hVBj%EZgolGuTA^<$7T1c9otce)#;R#jXwkH0X%AK9oWV7R+~ zfhD`wuSi+Vq{>=v;D-f<(PFg8pX46qG`con26BRP$c|vob}lqmpnGyBXgK1KBaC5~ z?TXl-6r|or{&b0P?hOsIK*Le7nv&`=lVONOs}`hqS3V+S8U`Gh zIguKKT$&VhH`B~)e5bJV?ADAU*A)gKu)D#V?Y^yP}I8FlaSqdSO8*wL{48nL9*>r^LGN2*jKV;P~DYb!Zd z$+B|yQJ=WnvBBVx+X)y9bu{a0v&{wOn?hN(y9xTGR+r6b(86|wZU%ld$=R?UJQ{(| z9(gJttE93D%&vr7)RuALSrWeS;6OkOeSqM_1AJaXe~y5HfvDsLsqWb{2n)|WPpY8i zAh8L32rvRYRL6OY&Zw!w#{dkoMhjwPYxn)e(vaPV{RSr4EHNAKG#SjtS>r`Ftmna& z*R;*5*cxJUX>){glX_;oEQogE4SOryC{EkwjLK^4c?8>_Ou2Ol%Bff{hH}I2F>bq3G7tej>oB>5ncuNy0tI@AOL(H%i^%Yo;e<1d#1W?Br)+W~5j2yAt{YubT>Z0AWBxgljW^J3^?K?*cc z5;vzc2NWc1tEW|3w7h^&X^1%t=gH1-j2Sg$Xkh;!h2#AV1rS>dENjaXkL&$o?80@eoi3TVF2YEZ?yybtEj>H1G|bL=+@D|je@!a zrM7ud_HcUyj8QN&SqfEL!1KZjNw#geRqTXWMWap_TQm*&7wib=U#E&Uek3%ziP3r^ z_TZlBx;N>NA6r&Yi*=up1=FkXITNefyl=(9oW!cDc`+iZ7W)B4mCczG!^elXRJY*R zOkGyc5_R_(j~HfhRM>VSvB#ao%z_htS4!t(HEG_%&I`XG$UmEh#fyF8 z{DmAtdox%Fq;CpX+5392naY7)WB@sNQLNgU<+hxfmwL-Ys3NwQYaQU@F zOQuZN-_!}D)O**izg2E=A>F0g|VpbVGhzh$Zq{2xH@*ailVgp8744T+Rvx>`W12;m>^T09_ zD=Qb&0pgt(?1fi{rPWyMnJkah;4{NqGPr%rH{{LOYhPp-Hl*d)tg(z5VD6mN&3p#}&Ct)wIQti7No zsY78HjdX0FPJ%X3XY{vAG@RG9f%cYEPu=pm*He#r>e)cOBsEZPex*-gI*Rm-rZ-SO zft&pm&0Mqdj!iTGZ|{Rvyyn8uu-DubeC9Qm?zfVjSKzfW5N+h`i$gR$Z@<7jv|AX7 zhN2O3?|JI6iS|bm2NY&RGr08wCC%i=(G0H>)GJ>4NgC8*v7KdpMPa7HU>?Llpieqi z%JdNj@|o%I!RP_nFXVv_;Z7c+_bbfUM2DgyLkr!gn>Q?)QBQ}>1Us@eQ+xhlqGhb2 zY&;y!*Yz}lA4lxtNZ|2EzU@68Wgm|UJRXh5qqy=Y#AD1xI-KZ18e31}>S_E;ux&!r zZJ>z~T`MZg8!K*6et`e>7ZAGx~dycy2%nF+H^4>GKvHh~sG#rqd~(&Y(`Tl={+{G?31w zL+BhDLFdy1T1M080-8_Dsg^E8>5EX}65PF%*3f12F0G(1=yLj+uB4ynD$$0n7NhAJ zaRgl}jt1vSX_cs=>qHG*FV3VJ#D#RDxQ1?qKDt$`rq$wkx=p-Gw~J5c4)GPOkwkY& zm+qFG=^ojS*2fn;u-NAMOeXj%7@Q3V`PBwa;JDf z{Fx+8kdKNN#Y?1UntWKij2>v3FK-Zk!I?wL0XcDAlK{No9LZw^{sfTZ^c`EJ>Kfu@mAkK8-GWu zM^g4S8Wd@J{4Q|#-{2gr*ZdAbx&qbEP${~t|tKN%_vO;F)yp9(TQu%~%ozr-(p;LBgdZ}D+% z!`XJR17wBGQ<>-pY@Rr#pV5&U=(rSSM`Xs$&X7V_ht2d03`uvREWcrzM8lRSzIug1 zhI-Yk0gbkUQuef6#4iFp#u?L?Sg zEzqBhbTDnD(exQjqR;6l`WMZkFX<%uicW!+Jcqu4_WYKvqkq%w^dEYbzN44udwQFG zfWG>P{z*UM&0kRJSNf5DqaCzOq|tVfOFKlAc8VTCirzwt0m2c5A}nTzbR&6}P!{US z7dxRrvrxmKQbDad!?fnk4XjX6+vGfmKqu@1HD)-9q1Sr{r*j+K|;eUG`{@e zjI|u(7iUI(&DmGDhj}B8ks+LEa~8 &Vg=(aSYvv@X`wq&~BmW-e+Qwo1bD$VGa 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 diff --git a/report-activity/target/classes/com/adc/da/wkflow/business_main/service/impl/BusProcessNameServiceImpl.class b/report-activity/target/classes/com/adc/da/wkflow/business_main/service/impl/BusProcessNameServiceImpl.class index 2a53838c8ba821c8b35a0bb8789f8f0fe126ac02..fa630bbeabfc5c296f6a72d43165831649659263 100644 GIT binary patch delta 25 gcmdn2w_a~U0uKjEL{xAfBZJ!HKt|!s^*md+0A*_jSO5S3 delta 33 pcmZ3lw^?sP0uK*|lY3x9aG;MfBZJ!HKt|!oK0HF3dwCXd0RX4o31|QS diff --git a/report-activity/target/classes/com/adc/da/wkflow/business_main/vo/ApproveDataVO.class b/report-activity/target/classes/com/adc/da/wkflow/business_main/vo/ApproveDataVO.class index a6aae9cb8ba6f16b6af0977c540cf4f969d1b3cd..7ec682baf228ff602404ededddec4a7ae1649bd9 100644 GIT binary patch literal 6045 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 diff --git a/report-activity/target/classes/com/adc/da/wkflow/enums/FlowTypeEnum.class b/report-activity/target/classes/com/adc/da/wkflow/enums/FlowTypeEnum.class index 73fb2f400df862074c1e5e2c5b5d9b181662f2a2..e654eceebc938927464c42e77077b3cb391bdba8 100644 GIT binary patch literal 2597 zcmb_e%~w-b5dU5BzVdtsz5)^oY9R#@KAtFAE0ih}ENxIQNCCC&BSegb1VbXnbGm5H zanaUo7wxL8r{~yJYoQVPp~rRqj2^4@Kj^A<=Dt^rkOd2q+?jjl&di-V^P3BQ{QK)Y z0KHfVLczF+37pokUq{?T3nrPI;hiZa?=hKXGQ(unByyI?ITPpczJaiT4-9;0z%?+( z8wu8%H_&PzY2X5{77Vl*xM(27t4jvj4O}*mHn7NojE<~;GCdog5NM4hvWt#8pK#_~ zXXWyRbaur_W(teT&InB>uPr5qY1K#iGcnfJW@4V979Scs5gQUvue#|%QoxQ~a<95h z+RZFD@q8|oSs*Jl?arlXQ(MXc9OdkMnGj!OJjOyYKjp!wraiLNvjA(vymAF;I_|^C^yf0ktaI7} zRUJ)B0X%rkcW*Jm|A)0eWjyaDE|0lOvRpcr=%oHc+OJHYos)H>Bpz;t{_O!`fZ%V& zvxQtDIg;WY*i{-(H#ds~haZCd7Oo&C5Z+EJS~!Gd3rCT+5JA*J2a`@FT}--}^x%Mn z;~1n1St#JDfaswPeXw!k@!h+RzF2$wfeY z{qe0&OO-9O%H4wkA#b;1t49lMQmI#-_xXe0zxnHjZy$d4%hU7t-LTNkN;{vu7@Syv z>SqG)387~qk1=mM%Dv{(=CCRB!l2fgK z>IOyutxW{Ea1c01t7hW-F;^k(pyECPw`nEl?+BpDJ&p7a;V_-U`n|;2!nBp>2Gsjd zSij;q{ntohd0IFkV|bk;Dna~XRwV!+Af0_l+@P&+w4-qyTC}SOJsMJqFrp!~h+s6N z6=6n0dJ#K*B0cYzJoTPx1aheo4 z<3y=)#;NiwI9WP4;3ge!RFf+j5n6W8=%mp_qnpN?G%9e6?nxa$l(XXy=j^D_pP_F~ zOrwmH6AHzykoO*w2W~OC!WIT zYf2&K-PwQ@>lo|2HxM|i)GAFkv8S_EIdD`BsdrEry@Q=!K?|w3uPfr#lRpI?6Ofo| zkmlV~P=_F}p9>Xk?DBfWZ5;cWr}m)h~WMWK53kiNhuN$U}KLXcH;yrUyP zKS5P&_=hZfMEMzGukSe<7*Jy h5niL#$*URE1wn$QiDBxCbCj40AEaYANxBs{^&duuAwmEE delta 1175 zcmZuv$x;(h6g@B9oqlP$5W^G#0fERI0tn6n1{F{gF%EzOgVWNbOSIhKMk*^8RSdhY8ikV=wwZufilgM<84rUP za?#{s*h4kW3Y?RZ5rOjp7X(HHE_#G9flD5;xU5m5aYf^*#x;#`Ihc^VNsU^K>l!yS zZpy|j7gGv4GdQNlvtuIz3Qf5g)w2BUYe-G!URe){_lkrjA2XO$NG>cUhkUf-wvR5{ z@ll68KI#P;1R4dB0?lagaR3KhO#8TtdkU&sA+|NY^nGD|>&26w&!6QM>{zM`-9BoN z;CYWibaQQf^TT33>+RzoFP|#d*@4WUk6I*hRnGccHH)PCtAqqFa-TaPkzyj%m`Fh; zQj>|41(d`=LwxrT5sgr2(Pk>-x0(D_JG=^PeXbIakrIk~46E-}jcN>PL|>_#~%Q9*Z= ztZNMNcgJ}O7P!ZFmM3v-nLY7snMBUh5E zk1K@z6wdY$r9Np!#ptxXfxFXb+(-+YI(cadhXQi$vs+>81!YVW%spK2qR7sR>I;&O z6eN4w$WumpvLO3tL3YtLwjs9^AV+Xa27)bI)&0g}+!VWmZAh_Uoh)aXLzd#V$MB_9 zG3;U+6Q)7w{LtDQt!9p;!U+~R2J0^e$8pi`!s1V{^zq+h=WvhrgA7M{eD=5!S*ei%863^=ico8qPJ-4C;1qL0 GIQWurC#pA}w7_-!3nYq>y<76%B&DvnG+^kPnQhtem zMvEqkg_;!>D;);%q-K@oDb3S$1!|y5*wd<~PMJ3SfT}5q&cXTNor3a^6FuB))(sA= z3b&W&XGFOjMbkVh@`xUq=QPg;onx8sAodH^#QNGVxV*?qicWzaDzij*cKm&-e>c6pcgg5#_K`!&0~ zZz4b7Lzj;X`q-c~27O}Cr^b9{+|LdAg0+(L%Oqd9oM4Fi2cxZC!Mv!hcKMnnxq-_% zzEMQRO{yC2@-5#fWDvf0`GFr@)*Gsy_*tQP$&FopVXe!r{HFQcZDmNn~hW2CFtpPa$Np099w7#*4krY zgCq|X!OFa%x^YfBWhD$7yv*FpL1-CMI*A|@P_bb!B?OPdIXDF)l zBfg!bI7H>PdK}-Wr_GM__)*`uf3m_P18Ay*Tv7v&~+~H3g6077QzS~$q9ZMMS_b&m0~=prI->* z*-iS>PP*2f;dI~#I?7ykVgg;Lp)0kNaT(>zrW*^WU@_gL_q}LjcV4A8&GeCR?<-^7 zFRgs~s}2lM6%15;**n+Sn_IfKwX@PkNpp~N*p{dfjFc{Wsv`$;i1fKwwdPO`lX6Q{ zlEbB#C_R+sNREXe#9`9U%|$7)D`9iK{r4q|fAd33Q~UtELAf3zTEso*~{Z3QKL+fwWK(Cdx~mF(THIix1DXgu$?0DV~K7Nacs@0 znhBbTnn{|;n$vWeDVnL8(~;MA8+rc{vMoY0O>f0Dn(1H-(bR0BjaX(#ny8ZNl608K z86uWE1XUygh2^NZEJOK-&|c*kx-AyJSbnPKoWhxofP!+bLfRiR7q&@vw-zv1f_r#9 zGxVCv0KvO^y>qxia38O44!0BB&)Xx1cNW~=8<4|x?)@y0o&U#_YGF$MlS)Q^Ndp5% zd3!EpuO=xq{2zY;&7%A)IX7w-5Zz3%h@zarjSSl${|aHwl7kRuD@#@frDDpF8S%MD a{1Q32Sf=I@E-jR~y__qyx(m3&cz**-kCyHL delta 1839 zcmb7^X?PSx5Qg8`&2G=mPQqqLkRc%?oFN+%JIaj0jJz>(g*TK*U0?bz|u*ldf4*K&w+h5;Xua*^WiIAul;JFCT`=yEjZRF!uvQlPhM}{7BL(w4(M;I_A&% zB&*QNub1sjv-(TXeo3sidKosq@|#w}?*=`*&HmPj_I80!<>~$4La)}}!P^@!6JADl z!^@8JRl%`Srk7Vt^@c^HPWx^C;Gj*FWXjL%YTymeTx=L#ZRWu2?xFzcg%sN_tMo{0 zZ*Qd2Al^rOLD@kAj!!j1;{bg*K~{r)^cQ{i249uD%@CLC_}1Xxgl~|OmI7&moj?i% zVrex5hp$G(0&ZX}CPb?V86>gFirqjpVIQ$z4Yu4#k101;9Vf#OO-J0IznXeJHett9 z4H3DJ88cmT4Nj8!Wv(fKvUH&AI^00xW9o1!K|{f=O5!GIRMy5dtI6?Ec7#sI4Xq{j z?{wTWH&jjIxDc{j>qzpvBu!#rH@t@YnC;q5L6W9Uvn8Y-##^yh(L70urC5huvGk}@ z;HFp8(l0tj=2w?=G!4ZzB18_3WX_c-Zb1_|lP|?App>SZPBY@8XvqXxaWRElMQizU z6fu`5izsF}ZAs9MEwq;b=)gWYiZDxz3_2SPWk_|uX4m!PaKEHGoXAPiw~!H$Bm<;( zj-fc2fzrKPY8k{}q1ZwscnYTyhzpxtoW>9lK`A?h(@+_J39R4@hDiexjH660hJ?TX z8J;0nLLH zI7dpMe>}U3q}#0q`g%r_6jq5t1cK3SZdRqNnNg>8k|J+=cH?-|Tu48;Tzu{u7rgWuGS} WS4s2YT%E-=T+4NbxAVA9@BRX=c6<5& diff --git a/report-activity/target/classes/com/adc/da/wkflow/listener/SCBG/reEditAfter.class b/report-activity/target/classes/com/adc/da/wkflow/listener/SCBG/reEditAfter.class index ccd9f8dc6ee323a0e3d53a9e1caf63e56e166965..b03338d8b2d8abb0cf0d47954c9face242430993 100644 GIT binary patch delta 1403 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 VW$u@7X$F^ZIadsr%em87{{S-_AKU-{ delta 1406 zcmb7@c~Dh#6vscm_jug5u;Ck9*GdoZmU$-&uaQGjC5` z%dWq=wgF=~;BYiCiw1{Ank%K2$?|}Ps?qZ zXNYT_ju4H(3?iQWz4q? zdWYR|-@9Sn)11x@MTr;pkMZ`|!Flf!x9HJ)z#i$RZfUfD zQROSkZ)aqi*xB-_qBW6b(HZ$}Zaas0PUPU0JiC<&iOqLMwNtQ;Qo)7p=p-%>T;z^P z;^Bf1caKQoOu=K_aY-EPlHQ4n=l?Ms+0WGSZz`!WzLnycZb=8F+oe?hf4q(!matUL z&2TaZ{7JS&opK_7Q2D#8$4|W+_&ArJL_0E@ANYkI$zr+K!{p?AnfnD?7~vu=re(mq Ig*C?d2h$=fb^rhX diff --git a/report-activity/target/classes/com/adc/da/wkflow/listener/SCBG/twoApplyAfter.class b/report-activity/target/classes/com/adc/da/wkflow/listener/SCBG/twoApplyAfter.class deleted file mode 100644 index a60b5401b434338687e453ec768e0ee0c08d5157..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6686 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 E05veZ+yDRo diff --git a/report-activity/target/classes/com/adc/da/wkflow/util/ImpulseSenderUtils$1.class b/report-activity/target/classes/com/adc/da/wkflow/util/ImpulseSenderUtils$1.class index 9ec4e6431c917b41d4adfad7016548a6f5680aaf..8105b0d367d80dded646b821058d0ba03ea5eddd 100644 GIT binary patch delta 347 zcmY+8&oaYM7{z}{Z*r4J2&&>wwG`1RW(?hQRW-U$V>($-Z(?O@+sPZ)SnCW63lHE0 z%y<}lH#>{(ob$`%o;knHm)rULdH(=TI0{Hu@$p&pC9N4;*HjH`7^xYlYc@5FN&C^N zPF}mowq_?}mo#LCFl3KrNQ?d4vuaV>z=4rNnt99mcGT@%Hp(Nr+f(CVHnMQXL-R>O z);}8z`*B?c1Tx5q6VqrC9uc$Rb3#v)B*8^~Z>JAa>?!&UC5U9MZ= p&x>zQQxOZoO@S}a6fPBuoaaSyOH*%I=Apo<)J=gWlS(?i^ABzLBS`=N diff --git a/report-activity/target/classes/com/adc/da/wkflow/util/ImpulseSenderUtils.class b/report-activity/target/classes/com/adc/da/wkflow/util/ImpulseSenderUtils.class index 80b7453c3173ba5cd831d379922bc04a1e975ed6..294a1788051e76f75b8ab7a2b662a1fb3360937d 100644 GIT binary patch delta 2633 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