From 33e87fea976dc0fe400a90fffc62866b931c8c58 Mon Sep 17 00:00:00 2001 From: bupengxiang Date: Wed, 10 May 2023 18:03:27 +0800 Subject: [PATCH] =?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=E5=AF=B9=E6=8E=A5=20+=20=E4=BF=9D=E5=AF=86?= =?UTF-8?q?=E7=BB=93=E6=9D=9F=E6=97=B6=E9=97=B4=E5=AE=9A=E6=97=B6=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adc/da/report/Timer/secrecyDDLTimer.java | 39 ++++++++++++++++++ .../adc/da/report/dao/mysql/ReportDao.java | 7 ++++ .../impl/IpowerApplyActServiceImpl.java | 1 + .../adc/da/report/vo/PowerApplyActPageVO.java | 7 ++++ .../java/com/adc/da/report/vo/ReportVo.java | 2 + .../mapper/mysql/PowerApplyActMapper.xml | 12 +++++- .../mapper/mysql/ReportManageMapper.xml | 6 +++ .../adc/da/report/eo/ReportLabelEntity.class | Bin 3042 -> 3760 bytes .../impl/IpowerApplyActServiceImpl.class | Bin 6504 -> 6504 bytes .../da/report/vo/PowerApplyActPageVO.class | Bin 16617 -> 17887 bytes .../mapper/mysql/PowerApplyActMapper.xml | 12 +++++- .../da/sys/controller/UserEOController.java | 20 +++++---- .../adc/da/sys/dao/mysql/UserOrgEODao.java | 1 - .../define/ActivitDefineController.java | 6 +-- .../service/ActivitDefineService.java | 38 ++++++++++++++--- .../task/TodoTaskController.java | 39 +++++++++++++++--- .../impl/BusProcessNameServiceImpl.java | 8 +++- .../com/adc/da/wkflow/enums/FlowTypeEnum.java | 6 +-- .../listener/powerApply/oneApplyAfter.java | 2 +- .../listener/powerApply/reEditAfter.java | 2 +- .../listener/powerApply/startAfter.java | 3 +- .../listener/powerApply/twoApplyAfter.java | 5 ++- .../define/ActivitDefineController.class | Bin 16396 -> 16388 bytes .../service/ActivitDefineService.class | Bin 4938 -> 4839 bytes .../task/TodoTaskController$1.class | Bin 1573 -> 1573 bytes .../task/TodoTaskController.class | Bin 50546 -> 50999 bytes .../impl/BusProcessNameServiceImpl.class | Bin 5935 -> 6061 bytes .../adc/da/wkflow/enums/FlowTypeEnum.class | Bin 2573 -> 2573 bytes .../listener/powerApply/oneApplyAfter.class | Bin 5952 -> 5996 bytes .../listener/powerApply/reEditAfter.class | Bin 6183 -> 6227 bytes .../listener/powerApply/startAfter.class | Bin 5709 -> 5753 bytes .../listener/powerApply/twoApplyAfter.class | Bin 5932 -> 6245 bytes 32 files changed, 180 insertions(+), 36 deletions(-) create mode 100644 adc-da-report/src/main/java/com/adc/da/report/Timer/secrecyDDLTimer.java diff --git a/adc-da-report/src/main/java/com/adc/da/report/Timer/secrecyDDLTimer.java b/adc-da-report/src/main/java/com/adc/da/report/Timer/secrecyDDLTimer.java new file mode 100644 index 0000000..40d5615 --- /dev/null +++ b/adc-da-report/src/main/java/com/adc/da/report/Timer/secrecyDDLTimer.java @@ -0,0 +1,39 @@ +package com.adc.da.report.Timer; + +import com.adc.da.report.dao.mysql.ReportDao; +import com.adc.da.report.eo.ReportEntity; +import com.adc.da.util.utils.CollectionUtils; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.EnableScheduling; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * 定时任务，扫描全部报告的 保密到期日期。 + * 当日日期 = 保密到期日期，则报告涉密等级自动改为 “公开（内部公开）” + * @Author： bpx + * @Date：2022/4/8; + */ +@Component +@EnableScheduling +@Slf4j +public class secrecyDDLTimer { + + @Autowired + ReportDao reportDao; + + @Scheduled(cron="0 0/10 * * * ?") + public void timingOpen() { + log.info("**********************保密到期定时任务开始**********************"); + List entity = reportDao.selectDDL(); + if (CollectionUtils.isNotEmpty(entity)){ + entity.forEach(e -> { + e.setConfidentialLevel("公开（内部公开）"); + }); + } + log.info("**********************保密到期定时任务结束**********************"); + } +} diff --git a/adc-da-report/src/main/java/com/adc/da/report/dao/mysql/ReportDao.java b/adc-da-report/src/main/java/com/adc/da/report/dao/mysql/ReportDao.java index aec54ae..9c79032 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/dao/mysql/ReportDao.java +++ b/adc-da-report/src/main/java/com/adc/da/report/dao/mysql/ReportDao.java @@ -65,4 +65,11 @@ public interface ReportDao extends BaseMapper { void saveReportAct(@Param("Vo") TtReportManageAct ttReportManageAct); ReportDetailVo reportDetail(@Param("reportId") String reportId); + + /** + * 查询保密到期的报告 + * @return + */ + List selectDDL(); + } diff --git a/adc-da-report/src/main/java/com/adc/da/report/service/impl/IpowerApplyActServiceImpl.java b/adc-da-report/src/main/java/com/adc/da/report/service/impl/IpowerApplyActServiceImpl.java index 56ff25a..4e02fa3 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/service/impl/IpowerApplyActServiceImpl.java +++ b/adc-da-report/src/main/java/com/adc/da/report/service/impl/IpowerApplyActServiceImpl.java @@ -71,6 +71,7 @@ public class IpowerApplyActServiceImpl extends ServiceImpl powerApplyList; } diff --git a/adc-da-report/src/main/java/com/adc/da/report/vo/ReportVo.java b/adc-da-report/src/main/java/com/adc/da/report/vo/ReportVo.java index e59301c..e78ba38 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/vo/ReportVo.java +++ b/adc-da-report/src/main/java/com/adc/da/report/vo/ReportVo.java @@ -121,6 +121,8 @@ public class ReportVo { */ private String createUserId; + private String createUserName; + /** * 创建人 */ diff --git a/adc-da-report/src/main/resources/mybatis/mapper/mysql/PowerApplyActMapper.xml b/adc-da-report/src/main/resources/mybatis/mapper/mysql/PowerApplyActMapper.xml index 4fa7d5b..9c4a516 100644 --- a/adc-da-report/src/main/resources/mybatis/mapper/mysql/PowerApplyActMapper.xml +++ b/adc-da-report/src/main/resources/mybatis/mapper/mysql/PowerApplyActMapper.xml @@ -114,13 +114,21 @@ where a.data_id = #{dataId} 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 0cc9fd2..a9b513e 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 @@ -49,12 +49,15 @@ eo.fileid, eo.confidentialLevel, eo.privacyLevel, + eo.createUserId, + u.usname as createUserName, pa.report_id, pa.user_id FROM TT_REPORT_MANAGE eo LEFT JOIN tr_report_user ru ON eo.id = ru.reportId LEFT JOIN power_apply pa ON pa.report_id = eo.id + LEFT JOIN ts_user u on u.USID = eo.createUserId WHERE eo.DEL_FLAG = 0 @@ -261,4 +264,7 @@ WHERE rm.id = #{reportId} AND rm.del_flag = 0 + diff --git a/adc-da-report/target/classes/com/adc/da/report/eo/ReportLabelEntity.class b/adc-da-report/target/classes/com/adc/da/report/eo/ReportLabelEntity.class index 066487cbe9394ea184c272949ec1aa51475aa30c..3b939e379f2658b7fa682cd898f325c86d9bc6db 100644 GIT binary patch literal 3760 zcma)9+iw(A82`=g%+BoY^g?NiTTwwOw%gY60*YHu6p9quf)uJCiqq~$2e!NG?ktM> zYB*LPBfw?RGHQy`w<;&h;R13?Orw!!JG|Ex97A%GJaJdw`P%c*@KME`5 zx`C;=mCBm8>{r&pVx{4&U0)`pUM)51p5Ns2&ia&_EmD_t%`Y_q17>u+%5AbM@!8^8 za*Oor!s&Bo4LG%+TB${|wD|F^G$;d(g+WPdNNed!;;>!vmxGchaulSH>5^ZM=7eA% zBk(0fGtgfTYN20R3Tkz_e{S}u0po;$o+FG!r*an3Tne$f2$kB|SNy}`R-JxVf> zFpxSJmc!^d1J90ajdC}b@g>IXNTtZQ_05IlV4<~RJ=1Ph|13yCOEpz*!0f_(Q2i5+OPR*K}0|4#N|LmdT?xftCa?_ zBx_9)#SBkMqa0jyXok|NYefe;_&?sgiCL;?yO5{Wh3e3}FcrMr@Jn=IsQt!M%U6Px zXnOntlUKR7p6l!wPje1a?`?k4xa{0}hl6St7aPu@Z@KXnV{w@Ss6T!-m{ zJenrgei4SX*W{mAP#u8799}?)NDbID*nap>qQ`caubGOp@d}p0z z*E)6i#yUrp&cmH`T3zeZl^^Tet8{Xr=y)0*aL+O<-%aGdgk|2G_!X(oVI^-){DRc{ zWPTmCIudXeCb<;Mso#*znYXd+2HdHfxsLP(N2XwrB~wV{Ea6Gr#=s5qVn90sLZA@+jWViH5|rCLJmG$Zn%twMKHmva>RoGNi?Vmnq9#YBN*+0F?R66|=H(*b#qvuV* zX9}hea%N0%B*B`LEm(@g+$td_XKj$&LQ0WRO%gLsshypZbX?mK8=u4)&f**`wU~w_ zLJ5ZTExba9k{s&uc$JXJhJ6y}30Yis-~yqP3jSAc?h;`#_=drN!!YhruysxdVhGj- z!v>FeFDhnBwXwB0H)CUF`(EZ2e+L3Z=p&y~ofBN4pEAA=|AgN2KcH`*e;wN-HQWXU zG|Y0}Hn3g8S%C*N>!lIDb97PGe>A z%L6En+en88FrPDT!P=~GNNL=srJD6R(tP$tn$O;ddcEam%7}WdO;yd?Of|4&z{)_B V0hYiUWJ=&t^SOSLzVQpd{};AnwPpYS literal 3042 zcma)8ZF3V<6n<{9n{3*&gwPhkn;?~Gl9nK%Lef@wX*JlE+BXG}vPsr}^O6s;;R^{R8` z+!YA96@lc;UHiVBtJ<}-+@fE1Yik98)Izi7yBp4m+i*)&=Tfca`L^$RwT8ghOxfGW zm27Xrt$5Ac#={bC8k^N-BWG{R<(6#f6)Uu5-nXkwN5JqOZgLyllX|hTL}{sAoSR=> z60qvdrdRii^!V(aEGP%2U8gF2h-vLr8E~{}mz=6JWGPB96Ah>C+SL`O-e8o=#j671 znn2$bhV0ule?`V%itmmafBpH@-*n4);5Pg)Qv@E?9Oc-+NV*%C#ucx^!1v9#HD|85 zQF7|aHwnF0=9@NOCRhQ}@Yh|UJfecME9G3p&S~#+j+a|dD9p$RrkElBA%pAX^O`S% z>fuS<%Y)g_o{f*}b}YU37ZS6MzwTA$?Yh0;_{4~h((;Z+dD?z7;(Xq;tCShs`Reu3 zU8n39(l?2$_j1_#H^+t^`z0<$a&NZ=V-^ zyL@lf-c&%dkJtu$plsKsq`xHB?Z&#!Rd^&_q&xEq#n~zPOFB|_8qKON5LV8_hTHF2 z!`p9IzNdSL3gd3g^(Uz?l3o$GxD$(@&vxfzH%IFBEPBm)*_n2$ETbWfxT%5DLzc;|h(_GXL>%|Pr1XxSXdyj8Bt}mJSo0v#aa>1MAknt3 zOG#irv0N{=sQTLdQg#@VVsCCbH5SKMmvroI-oVcS(J(kT=_>b-M2Ykv_I{Fkik!m@ zGLJYoieo$xz~H`@`z!q8{Rv(W)ZG`a;xJBOnAfk-VhE>|<(B5iO{5X07SZK8N|79Q z!QIUK2=Tqr8RHsJ%wsr1S}IV0qG!1anGmj>%Aro>Q(cvr$S%s^PUUo0tb*!Bj^Qk-1SWd1LH%^rnnw z*#8Lev6QieXiLJ%n-sC~k(4QABF~U~guaxSitG@I<)aje<*igy3R!_rG-b7fjK_2+ zjCSeh4BXO=ZfD?YSBVtFl(}mNm2&;d>ZeNGBJyH`BPvyR$1?t zNJUY{5nLu^;R@f(A|AE=L4OoipJOPBDgIjGISy$uwv$8vXr6!?a?EHzx%1x_SrZaT z8AxbXAi9)VJs`VboGyr##c`D)&L^_i7~%{~L}+L^Q5ZKSR3eTh3hPXRmB>CqbZiSf zcO>7+8}cG$1UHsUj=qZJO?Ab*C?zXps;i^jp`O$a22h8wfFiEZ9g}nM15zRMaG#;q zVNQs1gjPa5$ssaF%2Z%}fyfIo41y^H0fZ1QDBeDYBx4X}OQ0oVyvz#3B0I#|lAT-% z(@oA^jU8^&RXK3Z|BT)nPZ3Y{ZJ}R6$St`~)2zGxWJ1$1N$=;fg=F_Rpa diff --git a/adc-da-report/target/classes/com/adc/da/report/service/impl/IpowerApplyActServiceImpl.class b/adc-da-report/target/classes/com/adc/da/report/service/impl/IpowerApplyActServiceImpl.class index fb77a023109ebf3b8a623be0036871df3894bc3d..33ba974b93debd01e8e4c1b56a9f268917d9300a 100644 GIT binary patch delta 60 zcmaE1^ulO^s~D#@gEWILgC>LjWIwUJijfSg3{eaU4ADT57zRs*SO!mqIEEmGc!p$# O1co$*#LYV5HcSAnNerz3 delta 60 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 TqW_DT@KCsuSJAJ2{ImZHb!B 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 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 cf2db9c..fc52406 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 @@ -25,6 +25,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.codec.binary.Base64; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; @@ -51,6 +52,7 @@ public class UserEOController extends BaseController { @Resource private IUserEoService userEOService; + @Autowired private UserOrgEODao userOrgEODao; @Value("${isPassEncrypted}") @@ -123,15 +125,17 @@ public class UserEOController extends BaseController { 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); + if (StringUtils.isNotEmpty(orgId)){ + 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); } - userOrgEODao.insertBatch(userOrgEOS); return Result.success(); } diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/dao/mysql/UserOrgEODao.java b/adc-da-sys/src/main/java/com/adc/da/sys/dao/mysql/UserOrgEODao.java index 40beafe..be17835 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/dao/mysql/UserOrgEODao.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/dao/mysql/UserOrgEODao.java @@ -1,7 +1,6 @@ package com.adc.da.sys.dao.mysql; import com.adc.da.sys.entity.UserOrgEO; -import com.adc.da.sys.entity.UserRoleEO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; 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 45f96ee..894d313 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 @@ -231,7 +231,7 @@ public class ActivitDefineController { @PostMapping("/batchStartProcess") public Wrapper batchStartProcess(@RequestBody List startProcessEOList) { List busProcessNames = new ArrayList<>(); - StringBuilder stringBuilder = new StringBuilder(); + StringBuilder taskIds = new StringBuilder(); for (StartProcessEO startProcessEO : startProcessEOList) { startProcessEO.setLoginUserId(UserUtils.getUserId()); @@ -266,7 +266,7 @@ public class ActivitDefineController { task.setAssignee(userId); taskService.saveTask(task); - stringBuilder.append(","+task.getId()); + taskIds.append(","+task.getId()); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); if(StringUtils.isEmpty(bpnId)) { @@ -310,7 +310,7 @@ public class ActivitDefineController { } ibusprocessnameService.saveBatch(busProcessNames); - String substring = stringBuilder.toString().substring(1, stringBuilder.length() - 1); + String substring = taskIds.toString().substring(1, taskIds.length()); return WrapMapper.ok(substring); } 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 301d737..9ff49d7 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 @@ -11,13 +11,16 @@ import com.adc.da.report.service.IReportLabelService; import com.adc.da.report.service.ITtReportManageActService; import com.adc.da.util.utils.CollectionUtils; import com.adc.da.util.utils.StringUtils; +import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import org.slf4j.Logger; 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; @Service @@ -48,15 +51,34 @@ public class ActivitDefineService { reportId = UUID.randomUUID().toString().replace("-",""); } if ("1".equals(prcType)){ + //预览 PowerApplyAct powerApplyAct = JSONObject.parseObject(dataJson, PowerApplyAct.class); - powerApplyAct.setId(UUID.randomUUID().toString().replaceAll("-","")); powerApplyAct.setDataId(reportId); powerApplyAct.setTaskId(taskId); powerApplyAct.setPrcId(prcId); powerApplyAct.setDelFlag(0); powerApplyAct.setCreateDate(new Date()); iPowerApplyActService.saveOrUpdateSingle(powerApplyAct); - }else if ("4".equals(prcType)){ + } else if("2".equals(prcType)){ + //预览 + 下载 + PowerApplyAct powerApplyAct = JSONObject.parseObject(dataJson, PowerApplyAct.class); + powerApplyAct.setDataId(reportId); + powerApplyAct.setTaskId(taskId); + powerApplyAct.setPrcId(prcId); + powerApplyAct.setDelFlag(0); + powerApplyAct.setCreateDate(new Date()); + iPowerApplyActService.saveOrUpdateSingle(powerApplyAct); + }else if("3".equals(prcType)){ + //下载 + PowerApplyAct powerApplyAct = JSONObject.parseObject(dataJson, PowerApplyAct.class); + powerApplyAct.setDataId(reportId); + powerApplyAct.setTaskId(taskId); + powerApplyAct.setPrcId(prcId); + powerApplyAct.setDelFlag(0); + powerApplyAct.setCreateDate(new Date()); + iPowerApplyActService.saveOrUpdateSingle(powerApplyAct); + } else if ("4".equals(prcType)){ + //上传 TtReportManageAct ttReportManageAct = JSONObject.parseObject(dataJson, TtReportManageAct.class); ttReportManageAct.setDataId(reportId); ttReportManageAct.setTaskId(taskId); @@ -68,11 +90,15 @@ public class ActivitDefineService { //修改报表标签关系表(先删后增) iReportLabelService.deleteReportLabelByReportId(new String[]{reportId}); if (CollectionUtils.isNotEmpty(ttReportManageAct.getLabelList())){ - ttReportManageAct.getLabelList().forEach((label) -> { + List labelList = new ArrayList<>(); + for (String label : ttReportManageAct.getLabelList()) { + JSONArray objects = JSONObject.parseArray(label); + String lastLabel =(String)objects.get(objects.size()-1); ReportLabelEntity reportLabelEntity = new ReportLabelEntity(com.adc.da.util.utils.UUID.randomUUID10() - ,ttReportManageAct.getDataId(), label); - reportLabelDao.insert(reportLabelEntity); - }); + ,ttReportManageAct.getDataId(), label,lastLabel); + labelList.add(reportLabelEntity); + } + iReportLabelService.saveBatch(labelList); } } 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 21b2e10..91315fa 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 @@ -213,14 +213,14 @@ public class TodoTaskController { private ReportEntity selectReport(String prcType, String dataId) { ReportEntity reportEntity = new ReportEntity(); if ("1".equals(prcType)){ - //下载 - reportEntity = reportDao.selectById(dataId); - }else if ("2".equals(prcType)){ //预览 reportEntity = reportDao.selectById(dataId); - } else if ("3".equals(prcType)){ + }else if ("2".equals(prcType)){ //下载 + 预览 reportEntity = reportDao.selectById(dataId); + } else if ("3".equals(prcType)){ + //下载 + reportEntity = reportDao.selectById(dataId); }else if("4".equals(prcType)){ //上传 TtReportManageAct ttReportManageAct = ttReportManageActDao.selectByDataId(dataId); @@ -376,6 +376,11 @@ public class TodoTaskController { busProcessApprove.setDataId(reportId); ibusProcessApproveService.save(busProcessApprove); taskService.complete(busMes.getTaskId()); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(BusProcessName::getPrcId,task.getProcessInstanceId()); + BusProcessName one = iBusProcessNameService.getOne(wrapper); + one.setDataId(reportId); + iBusProcessNameService.updateById(one); } } else { throw new AdcDaBaseException("缺少任务id，无法完成任务"); @@ -541,6 +546,7 @@ public class TodoTaskController { String pId = busProcessNew.getPId(); String dataId = busProcessNew.getDataId(); if ("1".equals(prcType)){ + //预览 PowerApplyActPageVO powerApplyAct = new PowerApplyActPageVO(); if (StringUtils.isBlank(pId)){ powerApplyAct = powerApplyActDao.selectListBydataId(dataId); @@ -550,7 +556,30 @@ public class TodoTaskController { String string = JSONArray.toJSONString(powerApplyAct); //去对应的 数据表查数据 busProcessNewVO.setDataJson(string); - }else if("4".equals(prcType)){ + }else if ("2".equals(prcType)){ + //预览 + 下载 + PowerApplyActPageVO powerApplyAct = new PowerApplyActPageVO(); + if (StringUtils.isBlank(pId)){ + powerApplyAct = powerApplyActDao.selectListBydataId(dataId); + }else { + powerApplyAct = powerApplyActDao.selectListByPrcId(pId); + } + String string = JSONArray.toJSONString(powerApplyAct); + //去对应的 数据表查数据 + busProcessNewVO.setDataJson(string); + }else if ("3".equals(prcType)){ + //下载 + PowerApplyActPageVO powerApplyAct = new PowerApplyActPageVO(); + if (StringUtils.isBlank(pId)){ + powerApplyAct = powerApplyActDao.selectListBydataId(dataId); + }else { + powerApplyAct = powerApplyActDao.selectListByPrcId(pId); + } + String string = JSONArray.toJSONString(powerApplyAct); + //去对应的 数据表查数据 + busProcessNewVO.setDataJson(string); + } else if("4".equals(prcType)){ + //上传 TtReportManageAct ttReportManageAct = new TtReportManageAct(); if (StringUtils.isBlank(pId)){ ttReportManageAct = ttReportManageActDao.selectByDataId(dataId); 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 dcd5441..ce4ee1a 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,7 +43,13 @@ public class BusProcessNameServiceImpl extends ServiceImpl result = new HashMap<>(); String prcName = ""; String prcNum = ""; - if(StringUtils.equals(FlowTypeEnum.XZSQ.getValue(), prcType)){ + if(StringUtils.equals(FlowTypeEnum.YLSQ.getValue(), prcType)){ + prcName = FlowTypeEnum.YLSQ.getPrcName(); + prcNum = FlowTypeEnum.YLSQ.getPrcNum(); + }else if(StringUtils.equals(FlowTypeEnum.YLXZSQ.getValue(), prcType)){ + prcName = FlowTypeEnum.YLXZSQ.getPrcName(); + prcNum = FlowTypeEnum.YLXZSQ.getPrcNum(); + }else if(StringUtils.equals(FlowTypeEnum.XZSQ.getValue(), prcType)){ prcName = FlowTypeEnum.XZSQ.getPrcName(); prcNum = FlowTypeEnum.XZSQ.getPrcNum(); }else if (StringUtils.equals(FlowTypeEnum.SCBGLC.getValue(), prcType)){ 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 e6946e1..1260b2c 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,9 +5,9 @@ package com.adc.da.wkflow.enums; */ public enum FlowTypeEnum { - XZSQ("1","下载申请","QXSQ","下载申请",""), - YLSQ("2","预览申请","QXSQ","预览申请",""), - YLXZSQ("3","预览+下载申请","QXSQ","预览+下载申请",""), + YLSQ("1","预览申请","QXSQ","预览申请",""), + YLXZSQ("2","预览+下载申请","QXSQ","预览+下载申请",""), + XZSQ("3","下载申请","QXSQ","下载申请",""), SCBGLC("4","上传审批","SCBG","上传审批",""), ; diff --git a/report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/oneApplyAfter.java b/report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/oneApplyAfter.java index 25f3860..6280d15 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/oneApplyAfter.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/oneApplyAfter.java @@ -28,7 +28,7 @@ public class oneApplyAfter implements TaskListener { IBusProcessApproveService approveService = SpringContextUtil.getBean(IBusProcessApproveService.class); //查询task任务 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(PowerApplyAct::getTaskId, delegateTask.getId()); + queryWrapper.eq(PowerApplyAct::getPrcId, delegateTask.getProcessInstanceId()); queryWrapper.eq(PowerApplyAct::getDelFlag, 0); List powerApplyActs = powerApplyActDao.selectList(queryWrapper); PowerApplyAct powerApplyAct = new PowerApplyAct(); diff --git a/report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/reEditAfter.java b/report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/reEditAfter.java index ab1b0b7..6f1403b 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/reEditAfter.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/reEditAfter.java @@ -30,7 +30,7 @@ public class reEditAfter implements TaskListener { IBusProcessApproveService approveService = SpringContextUtil.getBean(IBusProcessApproveService.class); //查询task任务 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(PowerApplyAct::getTaskId, delegateTask.getId()); + queryWrapper.eq(PowerApplyAct::getPrcId, delegateTask.getProcessInstanceId()); queryWrapper.eq(PowerApplyAct::getDelFlag, 0); List powerApplyActs = powerApplyActDao.selectList(queryWrapper); PowerApplyAct powerApplyAct = new PowerApplyAct(); diff --git a/report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/startAfter.java b/report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/startAfter.java index 607d91e..8cc567e 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/startAfter.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/startAfter.java @@ -27,7 +27,7 @@ public class startAfter implements TaskListener { IBusProcessApproveService approveService = SpringContextUtil.getBean(IBusProcessApproveService.class); //查询task任务 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(PowerApplyAct::getTaskId, delegateTask.getId()); + queryWrapper.eq(PowerApplyAct::getPrcId, delegateTask.getProcessInstanceId()); queryWrapper.eq(PowerApplyAct::getDelFlag, 0); List powerApplyActs = powerApplyActDao.selectList(queryWrapper); PowerApplyAct powerApplyAct = new PowerApplyAct(); @@ -46,6 +46,7 @@ public class startAfter implements TaskListener { //审批结果 LambdaQueryWrapper approveWrapper = new LambdaQueryWrapper<>(); approveWrapper.eq(BusProcessApprove::getTaskId, delegateTask.getId()); +// approveWrapper.eq(BusProcessApprove::getPrcId, delegateTask.getProcessInstanceId()); List list = approveService.list(approveWrapper); String fromValsJson = list.get(0).getFromValsJson(); JSONObject object = JSONObject.parseObject(fromValsJson); diff --git a/report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/twoApplyAfter.java b/report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/twoApplyAfter.java index 0637841..0a6eac5 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/twoApplyAfter.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/listener/powerApply/twoApplyAfter.java @@ -30,11 +30,12 @@ public class twoApplyAfter implements TaskListener { IBusProcessApproveService approveService = SpringContextUtil.getBean(IBusProcessApproveService.class); //查询task任务 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(PowerApplyAct::getTaskId, delegateTask.getId()); + queryWrapper.eq(PowerApplyAct::getPrcId, delegateTask.getProcessInstanceId()); + queryWrapper.eq(PowerApplyAct::getDelFlag, 0); List powerApplyActs = powerApplyActDao.selectList(queryWrapper); PowerApplyAct powerApplyAct = new PowerApplyAct(); if (powerApplyActs.size()>0){ - powerApplyAct = powerApplyActs.get(0); + powerApplyAct = powerApplyActs.get(0); } //构建工作流代办 BusProcessNew busProcessNew = new BusProcessNew(); 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 ab08e70459c64beb34e3a65aa42aa6367f9c4545..892f21265573652f51a52c274aeb3b98a47bec68 100644 GIT binary patch delta 109 zcmeBaU~Fk%+%R8|gS{lNINLL&c=K98K^4vq3@i*13=B*!Hy<~>$Fz941ta6*$tx`H ztG{H}!myPA2$)_n$}=2iU}WH6ddR2%WHB)aFx_NSWK?2cW_mn%os}y$Pz9q3M8)QR HR(z}gQ^+4+ delta 118 zcmZo^VC-pN+%R8|kGHs_C^IkJsWdYuCADbtazQ~A&QA<13=#|sOs_W|G`+{f#FDaj zz6B%W)5!}g@2kIN*ut=t0SK60Gs-g@XJBODV0z4`0Aw*S2r%7dRAf|QU}kzcd6|_f QH&6wm3Pi=`Z&rM)0JWYXNdN!< 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 2dc8c07d395ee1290eef2f1b43b896cb8c3b1b9a..5a316fb40a399b77ae193d29e3c0b63044b5c6d5 100644 GIT binary patch delta 2086 zcmbW1X?Rmb6o%hvlT30m#nMvnYL%iz+M-mT2o?p4q7+(1mI4CeZ5nAYw3x&yZgJl? zyl%Mfh`XYp1x3Ie6>%5$9rwpS{!pJsJ(B{8{PRiX-0z+_^UaxazPTIr*)lM*;m=iT zfEs>s7)84^9S(~)F~Ufa4k^+OC(&um$ze_jv)ExEr-nJrK2O)2;czAyhXT&B=4@-u zaX6RrEIMCvfkPk5T)>5v^r9#ib4i#>!(0~5aJl9Rhf=$^)GjWyi%U7*nq2&qQLbW% zU3s;}k8%yy+PUi-uIC2LQin>~quj_%QEuiIYi_kE-R5vRcUW_$<}Qc3xyP=%*I_8j zZ2Wz~6=u2Se$4}q{hZ7pahXQJU@9??8%c#Ovl2U4q9VR(WkHCe+-x(wZ{QmFkD7*_L? z;Gu@6S>ulh4chA&!&=rE*7L04IcuKhSG8_CQq2m6p@Ty@n2Weh2Y~*zz z875=6j2gv0eqE@<-xMm&9LiyuO*Z5W!x2o7)c;#a&6|d|c-!y}?`qyNyw7GuaV{=b z#au^hapm}i5BN}OVEBlS4WIC-;WIwhd|~*KuMA)FjU*83SXk|~#QX`NUjFsL-ldu? zhHqJA_|BSozBl~98pDrl_Lu0H<-PvduBVMf|2XQU!d|)~xnhg{S%o91c=|9e?fCV>w%zqnvj-lPium;7=W z12auB@3pjuxKmzde4Lk#wK70%*(muOXaZI*g0P)Maj>9}JjdjGV>x6eUmfFi@=448 zrd(kRHtEEIAiN6Aw$nWH6Q z66BvK$rgy~4gaCS{+aRn78P{SYb^z}Avfd(v+UxA_RCTzFM%w*-B5lPMOlj7&}#b3 zT1iQkzEw}q&kc36YaYu~N0B=?i&@J5p^ELuRbI5)|L59)ip@p4_fT!}t9q9g$Pvo6 zAHkp9yDF1jO{JWts#d$9EQ7ikEZ>;08}4Rb#Zu}mlH0$Qfwd7g(#4Qk$CY1}>Of1D z{jEQ`nxV707-k8EyAe0KlA2oMYS(l#B99r%{#qfWDtC1^2gs`%d{lZ7!1ilZh9UA8 zMwsFBV+3WQufd|QVWO^4qOY-{t_h;AX`-)rqOB7|SDn;xhG^+r4&@Tjk1vY3O*C`A zh$JhLSSO-*Nt(P-ws=Qm@QJkldlA5|Oje31$}m+GGflZnSD7-JR3$Ui2xh87n60KT zN6lrfI-XlQ}ukWEX@Vnq|afDpI3*m3uCBl3F delta 2110 zcma)7>30)V6#q?@nRN2fhG>CEgz9ObO_I!&h~bee=@S}lsf z9TY_!Q9;~A#Fbi1%OaqHC?bkGii#^A^zaXGj>r2Z6@eUXOvYfI!-bo8_?w+bEypbmq$I46;p1*T?&jleK6G(nTHfl! zZMdEL+#%skC+@=C{A{I+Rk+7P^*`XmgLp`SA>(1JJ$jh8@@`AlodfLyu?y zUN6I2*u`)eE|;*IVGrJ>;9~`hG>$n(wlPe^Bnj{EgLfG!F@?Z5yDtfQ8TR2lhW&V7 z!Uqfo@FCeviN*A!o>1Z$^pZIu4!ZGCj)X&QUfaj`M8aW)Pw^Sgx5Alg9JLP`A>ng| zFR+>6OHQir6~kmyNcfuJ2);409rJotJN^)|<%Am7l(1TI{R1uDBXJ4dMTPmy8!RZ7vc`iQOuCHy9!U;q;TR=9xS=eEN| zv=C$HMUi0R_mMd88v+62h!g2|ys4XjRQUj95LXP)(JeYlXW=_NKt~tsES;5PdL)QW zqm+|iAr5f+dm;G!X&6~Ku5nkAMy3;BC>89*Rm8E39jZ}7l7Q)$K^7E4*atf`2AnWz zb4DzhTjFu`A$t#8<)T;YgP4Zoad@)Q$VtQP6}|Q}26@HOG(05O(m2m6TKjN*8o6F^ z2L{jY#gH_H`nSUC6}RC63pQbyXIOC>Y#o*wb?$r@+2)0crS}EglGT`lo2-uc{GG#8pA{y!c-c=bQ;5K8o>fgKnu#T6hSN})K`+l z8p3ETVY`9Q-AE5sHzB%{`aVRFj}S7yqYfz!(A5;an3N&Z(nMDxOb0WGBVhVLGt z!~s7+_OnfhPoSPStEp=s&Sr9Rh_j=S_$*k5oW#PD=)_zSbL|v^X9M{G4fM@P(Eu&{ z?q()Jf1P$SjBf{u=l7w6z$-23#U*uwYM^u*$}E`MO^y~59gk^SP370XO;`-0$?}H$ znHZ;v_n8gx;(de^FWyaCaSaxt+G>`TWkH?WjRkIy=e1`1MW+`0I+A~)Pp0;d;TQZ! Sdv!0#e6Lnh`}g5~toaLt&fEtm#1Z4OU+OS(66> delta 25 fcmZ3=vy^9p5G$j^WMS4AM(N1~tm#1Z4OU+ORn`Wp 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 fbd77a13b18526d39ae466a10ab3047b4c23d953..6023ef92180911a2af742bf9381730d7b4936f71 100644 GIT binary patch delta 3379 zcmX|EdwkCI9)EvskIlBQHJLlxuo=14kdV!onM-lpi7av#qPaYCIkT2a_1J8P9G79y zj%PL-VF#g-Tj{1cCDKWXQjzL>?R5I*`F%g1&-eGayx;Hd@AZ9dWJ~D^DY`E`;-B!K zDnL`3mmz|X8drwegnSy|Yn9&N9tv+!g1peE5(KTGK;P{2NczIJHvN@R`|!^prP$pu zAR?d~ejvhAhK+<0^d1yjjMRvLGW1~_Lf?*o5rGj_g5v-A1Iw_7F{l6``%p3@w6qj^ z4;K9X%3hQg0Z=;QeixvDZ`j;n-nkS-^XNgEPf4_Z`jD4~(n1w>@SlkXAmDD$S8rZh%J=o3w=ZOwE43WeX$9)jN`J)s z(bOW>xmG(c^U#>`(VW&GnbzV_T8Gi}GRDz*%%%-kN*j?)|L_+qSWFRxs6(%!DeXi& z6}dKdV*TJK^8F&_i|#!F1a9 z+M?}t-mTtutLDC}#n)P2bk>&$cVN_~%VfR1U%*4)#yZ97566-PRgzYbfe*nA;kT zSgz@~xDVa97LvI(`f^?0H%k{)<P;OW17>;LkV{pGv#e;>gi5aBTJ&;w4D+nungP{NrbkL6A+o*O2F;#enziakD_Kt+{C{*RgQJqISaL1q~KYbe@C^o{Z%@#Q{4Nn|K;_@YC4OGjW8U!D*g@bNs9WHXT=aE^hKX z+~Eb}VK0TaXDDY-ZC*rCyqH=JE7}hM%K}oK3U%d0NQJXgM#Z zd|pA@c_kIGk4kwJ9pM~0!?|>xSJP*lN0&LDZtxoVmDe%x%N)WR{8N@!Q1}ifoI*F- ztEj^}oep=oxr+RWD|0D%zYD$YMm~The9$Sm!j1YbC(9!k!$&cVk6|{y>GboK`Pt=M zuZ1{?K)lpOFR6opQV-*$K4wTmWJ)8vC{f6hXl#%s*eXp?CNVf7u{bHs@sY&gdufSV zazE9QR@6~iQ=+t?C!{USlXkR19weW{(>iHS+oS`PN=NdZmxt(*bfPQLg}#wT=x6Ch zze@spB#|3PcaD)Henfh5qV(caN#TLgn@310kCT3!Dg8NH9_3f%F)on-{GJTtYw|b# zNd`%{43?%cM25;Rd0a+Hnv9YuZj~;h|Ow)Gqw04mh+CygQ5SgWu8n_&C^VZJPG3WBuTL+RrYv>ONnQ^lzL{$Ue9bP^JGZ5XQ}M- z^8*5XI)NUH3Q?!ZB)EJ$o zvAR~9Yl+6`7ur&f^RmN84^4V+ZsJtI)Cbrl#2$ebPSHarUi_w_7^F?&w61 z=_F6EPWIH*DV}CJ)zeO=`{Q>s4)o4Ou+BlKrlY>jMU*Z;oO;npGZ3!}(MuO$pf169 z&BP4NLZ&{47j+r(bU8NY3hdSwa6o-HrmJvXbMUR^;)dqoSIwu|x`rC-T1wP))JI>Y z$-160bpz$-M#|Gov{^S(p;xz%U$@fRT0rM@8(q^vx~@Cvw(erq*SM+{@x8j6+p3@A zwV1o;9v-bFJW)$ITlexNE#pEh=Qnj9U(o$hO%F(@R!F!WmMA?Uar%bDyMxq4k4t|& zA!GGTcNpJx2koRR(s#t0t*2y@o|c_@MoRUp9Mp62slF?>^gWH%_Z?>+X+41dLY(%qKze^qxC|vrC_l2#wbh0MC*gu*4LL*zMcm9FO^TDw6U&c8e;58 zw6bxCxACslQy69wkY*Dx$tGcrO~wM7;_6Ms3pNdFY&y2s4D7O*D79HQX0vhH=HLT+ z78flY*K96s**sF4Pt|P!g_+l1zCVd-WFyp`cjcD39+$fwSNdukcs?-4b)Jj5w%WJl zKvBeI1lkq^+g1n37SyzDsBPO3ZH2xm2iMmtbAXj2$o4s~%3XB7%k(-T?EqTZAz#d) zxpvG&kNdVC8WZ@ryVHnKrSXn4 z^1>*;(x`C8nlM^hX%stST^PMwX%v(r87T5it4LAz2c>f1OFA4|?FDHs9o+ru?mejy qf_&b?5x$(meM7n+M7yGvK7vS1@LfNg5x5E=l7m{Z+LwOhm;VC9az~Z` delta 3156 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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 fa630bbeabfc5c296f6a72d43165831649659263..1cfe475ff47ea8cd59731ff5082ce888f108b0c1 100644 GIT binary patch delta 2012 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 QMT0u~q}re@;Td!IFUWj;g8%>k delta 1712 zcmbW1dwh;%7{|Z&yZ7DwywC1!uV+q^$mc_Bb2c?)4#lK|P(}w$hO%rmEVaBjRg^=X zQYa}&rG(YS9Gi}a&ZUy1bJ9_f&~?8veX9TZeBS4}e%F0p_wTx|!~Gs;y`^<@+wsax zK&Gngavr6cTU{m*)!e3;teN5xPpKy!GZVOryRA9PLow534s#O-aF1r5OA@6C_}pv7 zeVX|$9;Gh#^MFMQ?BRtLEwboAiypEfy4W6l*uo_V1bM_0MhO+-G0ifUGkDx(IZrq| zY4uYME5ba@Gp>l0mg-rDRSv6N)==j19M3zHTV3I>)-JBIqS9f#O|QZl8yq%Ty~$y- znUeUa&d95s6?F%**W1H0IRCzSpC4I?PvqST` zpB`Tx*Mpw^{`hv`orYb!p~&_N1KIviy*TU52%D2bycOZ?I4Nn!3Je>0M`#W2Qe}9L z_r>J{&2Gbod}R2TJ$_rKdD3>nC+szR%05M=Ul?lFt8adZ<}<^7d+>9oK#+4MFG&Fx2j#;W5hU4s2gh%C%8a9d86y>zTw3^Zm2M{&M1D^9fZS7eS@ zZA41~gwiWes|5t;B{Dv?SeFX~n`#GobD>y@i|8X>IsRmCUTR$>k?Rdkbu!jb-{RD2 z9QIqLv{GSzXv!qj%io<+9JNfd<)NT*PBK|^F@1$Gtg`7xe_{1hCYLZkF4<6}Gmt^@ zpqi;BT*_tgp!!J%2a_we%jFjVr}3EJHS0<{}qYymA@F)g(kY zB*b|P$Eedu;~H5^WQ1HQ{ZxqjQz1r5h-$h~r|3ot-L>K`S2{rkax}$^7s`;5LJ)D8K#7z?`l6;w3FK|5Zt3M@ z^a*5Vl+$vBxVD!surRITKGDtF&aXW|bZUmzs+`sfNQui{PEv-~CT4|#*$wRx4$Bvi zFKUej^4W&36ymnd5_*bm=d~}V!vZ=9&h$FQa4W%Qd1uFP6Tw+trx>my_#E%t7!FrT z*;yqkmT8XY8m6g&YnVy|$C#oLVvHDBUgy~HVS;O@23FGOZ>s-ysqC6dB?!}cx(xBU zR?uy;BpVkS>ga!_T6L58nJ5mnv31bLXevEXiEe|V^p@Wd8Pzy$mdyaSsASPDN+qgV iDv4C4irrH7r^(z*=XUPkPG+36X8*%_l%=w#X8Z+v{cz9# diff --git a/report-activity/target/classes/com/adc/da/wkflow/listener/powerApply/reEditAfter.class b/report-activity/target/classes/com/adc/da/wkflow/listener/powerApply/reEditAfter.class index 9b7928dc9c5dd23bd080bed628a5ea4e2622f0b3..d2dbb8c4e67d8557513a85d455dbc5226e240ac1 100644 GIT binary patch delta 1765 zcmZuwd013c6#pHDnfK<+Wq^l3C}jAB8EAlMU^GYd71w@uaN&>Un|IFd+12ZfHAp+F~=39tH zl@ANBP>V$d7F&ozm4zj!(dbz%p3@9VHF{p77px%Ri~8s?z4($3ZY;OS$WR`vGVrp6 zRJ>y0Rjf9#M(fv1)OxWN>nw_piS?T3brTy*)LGbwO+G~84GWvGMVoJ$*lJ>%iS2sn zEiK+Q@s2Kb6OA0aYhs69eb2;Bt#_F^=w`fcqTa-O6T1z3VB$jydHBe{#|HKo*jw9P z(%h|Re8P@3ZI*$3YzC`0@Tq~%oJ!AHS1%MeSw^;JzryGEf-v5hW*pD`G6p-N-S{d7 z2VCr~TMH=cz}KWz_y+X~2XTll-x~N%;d>lb_yI?pRpu4GeF{I~sKQV9**Rc#%KJs( zSAF0&{H}0Ji$Apar$&Ei^tVR;X!Nf}$I(FI6EQfcP>dsjT<4&f?W9B-L4{MOXYLB8 zaYhh1wzP1Z!dc;!!w^vtAuc76s25me6H2<3mrpF4T%yD+9f?{WhKi|U?`nBn+8&aDRJs~1KNlA0LRAIYr-!|-4 z*vcRaVsqs(XK(D%$W%d^b1XK^sj)8~*n^`b$mdv$7d7{FO9gr7JiSZQFg zfeHgt3`_;go2%;Qbs)pe4xwE&QeA;%NY1d^hpo8CAWeUUeRbG$y93E9=*{1W zM#VM*$^6FhTg`wS%o^;c?r2{VLQXa6iF55vVZ4?2TDx-?uOsea2f}zc@pX3BFkV!L zmKT|3r3WukRW+fiXhJnUOm%(u_^2>dw=f=5$8o!mR1fZ)PpT8~`J~zrpHC{4xQpG$ z6i>{g7@t*m>o^Hmy%BlC>>Jjj`xaK~`v2jUp$OtW?(17kfO#5ic~=q@WhI|P0sjqr xFD~5A-3UyV6lx11Eu^I+BMCEUx8?q09MQ+|1X5>VHl93Z&P7ve1y<_4{{S65gggKM delta 1770 zcmbVMd013c6#tzW9{0_gJ1{&3bU}l{ODrtK18z95OklZ% zNL0JA0uO4jQs5yA(Wtht3J+_vT5ol0dE>xO|RZD!<9;aDfI z-a;&%u~36r6C3op(ZsVZ)M1mw;yDxbnytaa^CmW1Xv7vb!tjEHt=Oj3?IxN`?9lp) zTD)Z9Wqr~uT6x7x#!d}hHL**tubKKFTd~_jvx)U4_6Y1X@w$afydm(Wz*_=u*A1q# zjWb!<$L0EGr3ChKCHUw9?+CoB=7nzxABl?yi7MTZXbQY1@jgDND-a$^`Ou49kp@2U z;$tTl*U$nIJMjqTbs@Ck|-Y;$-<9rmrn zcY4G3_(9@FjegSTXN`W*=vOU%)9UXU{edG)eAJ6$5_vdCNKsMFUh06+B`EPHnmK!k z<2XSG%P-2EC2p2^!74-XV&aVU=@H=m584lqRZGJB{!(%(svM;naX z($bSEo)$+Rh&2aSAc zwwxPga6oljW>HMtFwanm@v%O(tRyc`UY=cCUXfdz7s#Hef)R15He!U~BU~D%yv|rI zkiTwFWWK}833aA3B${+dcVLgIiAtgF>QK}g>Y*0eqsI^DAtPjQPo2E-6tK)@tv|0^ zNf_}Bpp6V17{xL?WbBNK8Ot^YjK(FbacqoXuWZ#fdZoWJp&nf(`CSQ{;n%op8@AMe z=yS+Y9^YabrB?ZZLCv&`Zx$%8ok^py7{`n*nvC(7z^pcn!$e%hNp_==xEz!C_VlK7 zT!9?Ei~T7XlW`?ym%~lF3R8FjW)NX2rolutS}+~CaA7Zh31+aL#RGXg57ZR6gE)o) z%tQb@F>K1mEO;mmX}Fqg5x9oai|1f%Aqq~1DC7`rbVaA>X2XqQ_MZ-;6;*Hvln9gx zTq{r}P%cm*aGk&$fl8niD-j_;CCcBad$7%1B{(gZSprojkj4^ona&_C2fP;M;RY@W zcZU{mA^0LvMtnW`k9MRd)FWvfyAI^Xv7+zb7GC=#E%nXe)t_Jws7Jr$h<2v0MMQ!< zFr*n_>D}}e9OWnI(1?Fs`O$5!Vd6pNYK-7D*&bYvbC)BP@en&Dg!?g0wa*LTSjK7g z`5_#`INiP=gk6nXa%^CWW?IB+2h)7U9ZZ#sQ-kePg{-96LqprAG47z6(1@OYQ~kfB zGCGoy%(MlWIrgvyT)3SN>qPKBXPYu`BZBOpn;HXg5@&Hw$YXUqj%@xP<6by%6Tfue rX40jz_@mQ>x{)7#+{t<(zhB4$dKd1-Jy?Xr?b`kS(w>6xw0`*)p9g+T diff --git a/report-activity/target/classes/com/adc/da/wkflow/listener/powerApply/startAfter.class b/report-activity/target/classes/com/adc/da/wkflow/listener/powerApply/startAfter.class index cad0f23fabe9602fceb9d4825e8dfaaca61cff46..ba16a7f209dc7affd493e15749278cbf14dfa113 100644 GIT binary patch delta 1704 zcmZXT3w+IG7{|Zw+0J?Y=YRfNXMar7lGP_+bBSSOiHuf4?ozRAsVrMFmQ<%)3Wf5Q zqC`n#YtUl`J#J8Bo_RXoz$Ze)^Q0?`63Wj)%_5sdJZak{Eg6}_F#%3G4qIN+C{x%uACgdXa2MN(o{ zU$VkcO8Fhi4dEI#I;;}b{BV}i-h%LAWqDnadiL!s`=jV0td^pcXn(UR z)LH>PazqAVhxO<#*g4}s53UePk;|3h)y+GUG&?1zs3dt%ij}^B`UanU2B&z_-R3IA zTkj54IbPj510thWJOm~~dEWbZHb%i*~-|;gl zA}xee`8PS23q=cS5&K2AbX!$&@jUhjZtb>-;jMx*-L^5jPH;Q7eGD%boaJ_i;RR6| z{>wB=Zfck&39ex(6Kt3wCd4Q)+PNKL&xZ-laxaPDeo>i1ZBjXMQ$y83a1B*+!8J*x z39ezPC%7i5U{uCU`9?YoakHzqbc+-lXEr+W|CLsQDPc@?N0PBllA$S82?=)U33BCk wOjbRPvEt!loUAM|aix4JpyEj39 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 bh54Yg^oRH`H}MfZIwtM;FX>M1vbyI1pzh`U delta 1953 zcma)+cYG8@6vw}FC9}7;xm=d!ng}F7NC*%D0pdZFA}ELzG-5|Z6v0G@C>G8xc4ZMo z0i%coP|?W25yfb%Sh07-E;g{BSkO0@fPBEHd7Q7gKy#tyBF)7%npv(WT@~eOt})`ZQ3712nPZd9tSCNn&2YVDo=q;Z zY;NF2gXWtfHyL!ZK?@98Xof}RvFHqvo(eIb7kJFSB=H)oA1SOhbGvKh6SB2T(HJTk>=M9H9 zc}r2~Pjw38V!`2U-f?)B_Y@U=Zm41}&HD}?81)a?;P8<_9~<lbw#1dB@zz5u+d>FziNJS_}zH%2k$5%lP1=Un=t*9Q71TT zlRJg@lV-ob9vsJThbPq5PMPT_C5uz-QY#<_RZxU_+w<4kBeRC9kfNWzJ}0lCGFq&x zu*#AuQrbVsIXe^@80TQ~A?D4CJB`i;;$x$pK?&)Bfcz`Cd6ILU+vhOA$ zUSu_GQnao1BBg2CDJjeLEx3chyR=~2U{A1TrPwt^UbPqUB5CpiR5zl9%1YQ?(q6-E zAUqlUXtfvi>@*$4p{N(#ZoN~A&I!kJR#TA3_Oji=6kXh|OW2N|!g+vhDT?mIZrx7A zO5N^)yNha?;vl7NiHIeCi-le+O;UE;9$qX(>3pKSJS$Dl0QXDCLYR=wFy4_zgnV4V z`E;a+&XiHW5DF!%T^LJOj-nfrDP}q)oI?+0Q_5U=Qco|I(VLZ&OAGatX6q-7Qo%<0 zvzY-Z=`m0hQ>g|rNDXDM+LtOdmOV2$ys;%utvQs8F^2slml4t0p93VHt{TRH93<6{ zuPQlMTnSO6dNYngB==>i8;4RYbun7m9L9L*ld)2`hjRp$xVnKOlj3u=_Gj*~xIc?{wNS&K1IqS8Z*wU{_@hlxpIqJ{0G9c(8H+hox{ zmhhhfBAQb)Q#4aGr^-WBqp8)LrkSS2Cuz0?#CBHshlZwZyY}f?@`E)}bNcTLl94mS zOjt>nh})dWOw%4x>Uk0%^NzjUBSo(