From d151af2234de4534f5c1091c0656e40bd398d3f5 Mon Sep 17 00:00:00 2001 From: bupengxiang Date: Tue, 16 May 2023 13:53:41 +0800 Subject: [PATCH 01/10] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=20=E7=9B=91=E6=8E=A7?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=AE=A1=E6=89=B9=E6=AD=A5=E9=AA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/IReportServiceImpl.class | Bin 33895 -> 33904 bytes .../com/adc/da/report/vo/ReportDetailVo.class | Bin 12270 -> 12979 bytes .../mapper/mysql/ReportManageMapper.xml | 3 ++- .../task/TaskController.java | 1 + .../task/TaskController$1.class | Bin 1922 -> 1922 bytes .../task/TaskController.class | Bin 14595 -> 14619 bytes 6 files changed, 3 insertions(+), 1 deletion(-) diff --git a/adc-da-report/target/classes/com/adc/da/report/service/impl/IReportServiceImpl.class b/adc-da-report/target/classes/com/adc/da/report/service/impl/IReportServiceImpl.class index 42e5fdea7cb7b5935e9a61bbe407aeab80f2db66..95858978bb8510775217c6ca030fc200798a7149 100644 GIT binary patch delta 13096 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 H)sg=IE!9j1 delta 13160 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 Ug?y~1j%~k!sQD^x!=SJIFNvt%HUIzs literal 12270 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 map.put("orgName",userById.getOrgEOList().get(0).getOrgName()); } + map.put("name",historicTaskInstance.get("name")); map.put("assignee", enUserName+"(" + consigner + " 委托)"); map.put("assigneeId", busProcessEntrust.getEnUserId()); map.put("prcType",one.getPrcType()); diff --git a/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TaskController$1.class b/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TaskController$1.class index 8efaceb526c58d7e38498242e7015ea62f65f7c2..911f3d98714fd61cb81d9cf3aacaa0449e831883 100644 GIT binary patch delta 41 wcmZqTZ{pwZoR#tRo-3)=>uoGH6605|InVE_OC delta 41 wcmZqTZ{pwZoR#s`2t3)=>uoGH6605@h1S^xk5 diff --git a/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TaskController.class b/report-activity/target/classes/com/adc/da/wkflow/business_activiti/task/TaskController.class index ec7b55e44bbdd2cc36f2f6a8355e69160c9f0f9e..d72afbea7ef0c990f1d79f5f6f0349f26fe9b841 100644 GIT binary patch delta 5584 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 delta 5463 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 From 2b22e95e3b112ccafcc770aff36cee8a8cbe6171 Mon Sep 17 00:00:00 2001 From: bupengxiang Date: Tue, 16 May 2023 14:52:20 +0800 Subject: [PATCH 02/10] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=20=E8=8D=89=E7=A8=BF?= =?UTF-8?q?=E5=88=A0=E9=99=A4=EF=BC=8C=E5=88=A0=E9=99=A4=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../da/report/dao/mysql/PowerApplyActDao.java | 2 ++ .../dao/mysql/TtReportManageActDao.java | 3 ++ .../mapper/mysql/PowerApplyActMapper.xml | 4 +++ .../mapper/mysql/TtReportManageActMapper.xml | 4 +++ .../report/dao/mysql/PowerApplyActDao.class | Bin 1996 -> 2056 bytes .../dao/mysql/TtReportManageActDao.class | Bin 1518 -> 1578 bytes .../mapper/mysql/PowerApplyActMapper.xml | 4 +++ .../mapper/mysql/TtReportManageActMapper.xml | 4 +++ .../task/TodoTaskController.java | 33 +++++++++++++++++- .../task/TodoTaskController$1.class | Bin 1573 -> 1573 bytes .../task/TodoTaskController.class | Bin 56771 -> 57335 bytes 11 files changed, 53 insertions(+), 1 deletion(-) diff --git a/adc-da-report/src/main/java/com/adc/da/report/dao/mysql/PowerApplyActDao.java b/adc-da-report/src/main/java/com/adc/da/report/dao/mysql/PowerApplyActDao.java index ebdcda5..d514fba 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/dao/mysql/PowerApplyActDao.java +++ b/adc-da-report/src/main/java/com/adc/da/report/dao/mysql/PowerApplyActDao.java @@ -54,4 +54,6 @@ public interface PowerApplyActDao extends BaseMapper { List selectActListBydataId(@Param("dataId")String dataId); int batchDel(@Param("ids") List ids); + + boolean deleteByDataId(String dataId); } 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 931ccdb..d663cfb 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 @@ -47,4 +47,7 @@ public interface TtReportManageActDao extends BaseMapper { List selectByDataId(String dataId); TtReportManageAct selectByPrcId(String prcId); + + boolean deleteByDataId(String dataId); + } 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 9c4a516..4ca2bcd 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 @@ -67,6 +67,10 @@ #{id} + + UPDATE power_apply_act set del_flag = 1 + where data_id = #{dataId} + diff --git a/adc-da-report/src/main/resources/mybatis/mapper/mysql/TtReportManageActMapper.xml b/adc-da-report/src/main/resources/mybatis/mapper/mysql/TtReportManageActMapper.xml index 00a1a60..0799f1a 100644 --- a/adc-da-report/src/main/resources/mybatis/mapper/mysql/TtReportManageActMapper.xml +++ b/adc-da-report/src/main/resources/mybatis/mapper/mysql/TtReportManageActMapper.xml @@ -90,6 +90,10 @@ + + UPDATE set del_flag = 1 + where data_id = #{dataId} + 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 f892965..2e917a3 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 @@ -894,16 +894,47 @@ public class TodoTaskController { @ApiOperation(value = "删除草稿", notes = "删除草稿") @GetMapping("/deleteDraft") - public Wrapper deleteDraft(String id) { + public Wrapper deleteDraft(String id,String prcType,String dataId) { //iBusProcessNameService.removeById(id); //2022-10-11修改为逻辑删除 如果物理删除，会影响发号器计算的编号数量。导致编号重复。 BusProcessName busProcessName = new BusProcessName(); busProcessName.setId(id); busProcessName.setSubmitStatus(SubmitStatusEnum.DELETE.getValue()); this.iBusProcessNameService.updateById(busProcessName); + deleteData(prcType,dataId); return WrapMapper.ok("删除成功"); } + /** + * 删除业务数据 + * @param prcType + * @param dataId + */ + private void deleteData(String prcType, String dataId) { + if ("".equals(prcType)){ + //预览 + powerApplyActDao.deleteByDataId(dataId); + }else if ("1".equals(prcType)){ + //预览 + powerApplyActDao.deleteByDataId(dataId); + } else if ("2".equals(prcType)){ + //预览 + 下载 + powerApplyActDao.deleteByDataId(dataId); + }else if ("3".equals(prcType)){ + //下载 + powerApplyActDao.deleteByDataId(dataId); + } else if("4".equals(prcType)){ + //上传 + ttReportManageActDao.deleteByDataId(dataId); + + }else if("5".equals(prcType)){ + //编辑 + ttReportManageActDao.deleteByDataId(dataId); + }else { + throw new AdcDaBaseException("没有流程类型"+prcType); + } + } + @ApiOperation(value = "已发流程", notes = "已发流程") @PostMapping("/issuedProcess") public Page IssuedProcess(@RequestBody TaskCommonQuery taskCommonQuery) { 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 7debd005060cdb201cf7271cd98af6ef71a87f77..f84279cf0bca0be4bab0b61be97d83fd412f490d 100644 GIT binary patch delta 25 fcmZ3=vy^9p5G&)I$-=BLjQ1xOu%-jqH&}fEZyE^q delta 25 fcmZ3=vy^9p5G&)}$-=BLj0Ywcu%-jqH&}fEYa0lf 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 a075105a322140ff3de80da85670eb169c771f17..fd59f91cd5a994e824290cb90a8630bdee0ad66b 100644 GIT binary patch delta 22173 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 T-qdf!a^EECen`~)u6O(&sp_{V From 770bbdfff45fa783bb05234caaa1a778ba8451c8 Mon Sep 17 00:00:00 2001 From: bupengxiang Date: Tue, 16 May 2023 14:58:47 +0800 Subject: [PATCH 03/10] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=20=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E8=8D=89=E7=A8=BF=E6=97=B6=EF=BC=8C=E5=88=A0=E9=99=A4=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../task/TodoTaskController.java | 31 +----------- .../service/IBusProcessNewService.java | 6 +++ .../impl/BusProcessNewServiceImpl.java | 47 +++++++++++++++++- .../task/TodoTaskController$1.class | Bin 1573 -> 1573 bytes .../task/TodoTaskController.class | Bin 57335 -> 56960 bytes .../service/IBusProcessNewService.class | Bin 1336 -> 1433 bytes .../impl/BusProcessNewServiceImpl.class | Bin 5501 -> 6677 bytes 7 files changed, 53 insertions(+), 31 deletions(-) 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 2e917a3..9c09a6e 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 @@ -901,39 +901,12 @@ public class TodoTaskController { busProcessName.setId(id); busProcessName.setSubmitStatus(SubmitStatusEnum.DELETE.getValue()); this.iBusProcessNameService.updateById(busProcessName); - deleteData(prcType,dataId); + //删除业务数据 + iBusProcessNewService.deleteData(prcType,dataId); return WrapMapper.ok("删除成功"); } - /** - * 删除业务数据 - * @param prcType - * @param dataId - */ - private void deleteData(String prcType, String dataId) { - if ("".equals(prcType)){ - //预览 - powerApplyActDao.deleteByDataId(dataId); - }else if ("1".equals(prcType)){ - //预览 - powerApplyActDao.deleteByDataId(dataId); - } else if ("2".equals(prcType)){ - //预览 + 下载 - powerApplyActDao.deleteByDataId(dataId); - }else if ("3".equals(prcType)){ - //下载 - powerApplyActDao.deleteByDataId(dataId); - } else if("4".equals(prcType)){ - //上传 - ttReportManageActDao.deleteByDataId(dataId); - }else if("5".equals(prcType)){ - //编辑 - ttReportManageActDao.deleteByDataId(dataId); - }else { - throw new AdcDaBaseException("没有流程类型"+prcType); - } - } @ApiOperation(value = "已发流程", notes = "已发流程") @PostMapping("/issuedProcess") diff --git a/report-activity/src/main/java/com/adc/da/wkflow/business_main/service/IBusProcessNewService.java b/report-activity/src/main/java/com/adc/da/wkflow/business_main/service/IBusProcessNewService.java index f621790..a58c672 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/business_main/service/IBusProcessNewService.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/business_main/service/IBusProcessNewService.java @@ -31,4 +31,10 @@ public interface IBusProcessNewService extends IService { List selectEOByTaskId(String prcId); BusProcessNew selectEOByDataId(String prcId); + /** + * 删除业务数据 + * @param prcType + * @param dataId + */ + void deleteData(String prcType, String dataId); } diff --git a/report-activity/src/main/java/com/adc/da/wkflow/business_main/service/impl/BusProcessNewServiceImpl.java b/report-activity/src/main/java/com/adc/da/wkflow/business_main/service/impl/BusProcessNewServiceImpl.java index 58b2745..1c89be6 100644 --- a/report-activity/src/main/java/com/adc/da/wkflow/business_main/service/impl/BusProcessNewServiceImpl.java +++ b/report-activity/src/main/java/com/adc/da/wkflow/business_main/service/impl/BusProcessNewServiceImpl.java @@ -1,13 +1,18 @@ package com.adc.da.wkflow.business_main.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.adc.da.report.dao.mysql.PowerApplyActDao; +import com.adc.da.report.dao.mysql.TtReportManageActDao; +import com.adc.da.util.exception.AdcDaBaseException; import com.adc.da.wkflow.business_main.entity.BusProcessNew; import com.adc.da.wkflow.business_main.mapper.BusProcessNewMapper; import com.adc.da.wkflow.business_main.service.IBusProcessNewService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.activiti.engine.TaskService; import org.activiti.engine.task.Task; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.Comparator; @@ -26,8 +31,14 @@ import java.util.stream.Collectors; @Service public class BusProcessNewServiceImpl extends ServiceImpl implements IBusProcessNewService { + @Autowired private TaskService taskService; + @Autowired + private PowerApplyActDao powerApplyActDao; + + @Autowired + private TtReportManageActDao ttReportManageActDao; /* * @Author yuzhong * @Description @@ -78,4 +89,36 @@ public class BusProcessNewServiceImpl extends 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 YJN2$u?tT41EcbJw?vF&>QN8Q`07PqbRR910 delta 22045 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 delta 58 zcmbQqy@N~m)W2Q(7#J8#806R)q}dr{*coIu3L7wQ?qzmhWMrFsj%AS$0}}%$Pze)* K1cM})mI45lSqf?Z diff --git a/report-activity/target/classes/com/adc/da/wkflow/business_main/service/impl/BusProcessNewServiceImpl.class b/report-activity/target/classes/com/adc/da/wkflow/business_main/service/impl/BusProcessNewServiceImpl.class index 66407fa4c0ca0ef1698882e7a9b4c5648fccdbd4..71b4efb04faa10b0ac2c7899ceb8c4859387b934 100644 GIT binary patch literal 6677 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 GKJ-80(tS7p delta 1486 zcmb`G>08uQ6vsdJHw?dF<_5zyltRFmv89AziJAg36(%8z7FH7F#1erHgQYFB*}lWSgRJY-s;b<8*R#ysdd*4jWafOnM5Oy0Rb%(&`SiNS~6=T!{#^R7uk@`x7w97d6*5X5zUdz6ri<;&6uVW5mA^%9TW5}!ReEo+G*jId0P4yH>Vk044!OYCj@q%X zU-%3a0}EUVr>UHy$~Hh{HK0YZAjW+> H!lVBJQVYa4 From 103ff19650140080aee7e8f15c44f79d8f370ad9 Mon Sep 17 00:00:00 2001 From: bupengxiang Date: Tue, 16 May 2023 15:07:52 +0800 Subject: [PATCH 04/10] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E7=94=A8=E6=88=B7=20=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../da/sys/controller/UserEOController.java | 3 --- .../adc/da/sys/service/UserEOServiceImpl.java | 17 ++++++++--------- .../da/sys/controller/UserEOController.class | Bin 13041 -> 13041 bytes .../da/sys/service/UserEOServiceImpl.class | Bin 18531 -> 18719 bytes .../impl/BusProcessNewServiceImpl.class | Bin 6677 -> 6750 bytes 5 files changed, 8 insertions(+), 12 deletions(-) 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 634da53..6de1ddd 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 @@ -112,10 +112,7 @@ public class UserEOController extends BaseController { if (userEOService.getUserByLoginName(eo.getAccount(), eo.getUsid()) != null) { return Result.error("用户名已存在！"); } - - userEOService.save(eo); - return Result.success(); } diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/UserEOServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/UserEOServiceImpl.java index 4ec759d..32eaa3a 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/service/UserEOServiceImpl.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/UserEOServiceImpl.java @@ -76,7 +76,6 @@ public class UserEOServiceImpl implements IUserEoService { @Override @Transactional(rollbackFor = Exception.class) public void save(UserEO eo) { - // TODO 组织机构和角色 SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); if (StringUtils.isEmpty(eo.getUsid())) { eo.setDelFlag(0); @@ -116,14 +115,14 @@ public class UserEOServiceImpl implements IUserEoService { userRoleEODao.insert(userRoleEO); }); -// // 插入组织关联表 暂时用不上,页面不维护组织机构 -// eo.getOrgList().forEach(c -> { -// UserOrgEO userOrgEO = new UserOrgEO(); -// userOrgEO.setUserId(eo.getUsid()); -// userOrgEO.setOrgId(c.getOrgCode()); -// userOrgEODao.insert(userOrgEO); -// }); - + String[] split = eo.getOrgId().split(","); + // 插入组织关联表 暂时用不上,页面不维护组织机构 + for (String s : split) { + UserOrgEO userOrgEO = new UserOrgEO(); + userOrgEO.setUserId(eo.getUsid()); + userOrgEO.setOrgId(s); + userOrgEODao.insert(userOrgEO); + } } /** 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 0bd01484547012f6d0a674d9bbc0abb707f4a76f..ab709c7d84a30fdc8067bb69ceb0a84119b724ec 100644 GIT binary patch delta 351 zcmWO2NhpK?7{>AcCk}(8^d&`+WSf}CML8)~7sWwRa&RD%ELlc&rA*_qma>#&Nu$qX zCnw7oLP8vExy{MN!E=3oPjAorhU>%i{^v}i!+yy$4Tpz#dP!r{`ppVD#)-vCBC}R7 zdnsyxXcldEj>qU-C4x2KItgr$!6r`jaB)N-`xJ3NF^80DUd9&X_^Dx=24xzRX;#Lq zOsg_I*m&5Xp8#WWuY5v2DW8)sYreuRtFjH*mdqa~3U2W|x72Z`4i7Z(NDHsD@kBc>bn#{d^6t%dV))PlKDFVCRK9i9k3FBC qY?wZBu(V{FN>!_3ifU%;kSo$K`$PkxVbP#yNHk)FT%A^Jf$twl&uB&f delta 351 zcmWO2NhpMI9LDkQD-M>V^d?1-G`5(?ML8)~mnjaC(i|MfBot=IdXV+Cq(qc;!sNA+ za=(%;JN-jPyhe(`~A3o+<_;D(Plq8Oe5M$0zT3iw0^UK(Zj?sLJ~7p zFncj-o){KvPma&%S|Nfp;W~+Ikcpo>4sdcp5r-6WLL*OfO=&blxb4N zqfCo3UUu}MO%J;a$w%cA@=5uud`a_V_F0wrWm~d9yl_u=#wq8V*`0ZRM(Kt6T&m9% z$y}4l4H*Q<R65GDyQA(T)hg@hUmN)1gZf?`Ba2py@CU_o#Mu>yi#TM$JN z!M$*%!e7ue~ z-oml{$9C=}q8{>mh@R#t22Tx<@D!7$>36!xGfbWt;#oY~4pAds6rxnF(2ahI-omRwptdS?TZEW5=){L2KwyK) zcvOqWw0K;L-x&Nvhz9eNFh9vpX;H1s+q8IEi@0*zt{Uu!kdL1U@h;vS=GY#7*5K#D zG=`s#ke`1W<`?;Hov>Gnm$cXy;+J{9!LOM7YKX@3B31FV5WmiE7^QGZSXrGn##Y|zIP4&Lx^UmN#9d$f7G$>Yw;%(G5)~d4?{GM*Bboi5G~Mgf6?zp zTKv`IkM;YBj#y*zK}GG5$)B41nUbHI{DsMXGx_f(e`)epIt=!n#b2BJjmiJeG5^%Y zZ?#xq^1rm@JCncH`VS_@{;kB1CjX?mKChL-3c(SRkD7eUhJg~fY;MFvO- z!n{hQqDL~NsUgiwX|9dYkYq^E1A+KjJT-$lJdg2<@0A2o?W?U_WYTBn9A*(oLqa7*~Q*tgi{wPGX#*dHt4hJ zw~d4T>Nl;0{*VEi8qx+1#

2JvZZ5gO7gDff4%3wMgvt)=2wPctKx8w|M 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 diff --git a/report-activity/target/classes/com/adc/da/wkflow/business_main/service/impl/BusProcessNewServiceImpl.class b/report-activity/target/classes/com/adc/da/wkflow/business_main/service/impl/BusProcessNewServiceImpl.class index 71b4efb04faa10b0ac2c7899ceb8c4859387b934..34892b2de947b743cc7ed422194934add5b3ad59 100644 GIT binary patch delta 987 zcmYL{d2Ccw6vlsdy4=_IuJ(1hOdB;;6G-I`#-+7NO=xwhF+@QM#t;Gy?F+Qj8Ju}j ztblc2Dk^wIZ~;X`aAg@4MXeyND7fK*3X0+`?khs$y^Yb_obP<+=G=3>lY17`@2>CL zI=FEFsAtfnft;krB|^?&w!=l1_BvebFvm41b4v`&^SFdQk3+ara+&p)Te!lbiYue0 zRKLsh%#R{iVA(>Co6(Y6?Bhj}TRo~-Y+;FkK5n!0c85D$?qsP=TIO*VcRMV1xW{3I z!@c%)rN@2tc9mqcX`|FoY>Yn-Y~_vJf&#lB+1i?XBbdC%O=6mS`-~I<(yoQ=~ZlIlTCb1v4!Ua z{;BD7m^GbeofU*L(jD2-VqWlh(YTj6ZLu zi|tojKuRx(Hi!fH?a{+T;X%PL-BKRYg%vAAtzKO*t@3yrPN2+Gtuae`6epUmZ`4Ot z?kH(7(P=bux;{`jUyRX%RSCVV>R2((uux1i7}Nc+F=EmX+ZT(80$o(Sr6Hh%>BN{p zEnSQ>f*OsER#KeJEGBay0afxN`@x>!I<@Zsxtp#I+P~ VwXtismg|Pt4cy30|FSi#{RhH@@XP=J delta 991 zcmYL|X>3$g6vuyeioI{%ySCG5>9moA`T=cgbWmHdVA7_gA2etU1rrU5)0qdf({^y? zwG{;h_YDQT)?F4i+%1kPDyUUd+!fqG5piE|---7&Bg`*`;D4ygg#YQ&i zW$wZGr`cqWpHV!^s36js$ppC|n^<_fA1uhEa;3#Q7vXsWnbWqQ@qX_iZ^*n^0s0t+XN*&iNQpCAn5Lm&*;ttig$QdFg2O!iziaacq$PeO3&-n z&EYaV#hXz79;YZyvuZAtQd|@(DW?pR!BQ z%x8kK|4Yuw`hKS$n6`IE=#zY|_<}EO+*gvX72mK+(5@$kYjh?wsjyVZQ2n=jC#a~c zn=zKAH_<;o-qF?LCxdBrYrYp0&G!Sr#M(N&r?f(kmaH!NfjtGkbR;Bx)Rob7RX-_y z=66L8X~`e9+MkME`t-JFqxievl^-C+{Uey96Xh}8TwbC(Du%^Gy}P1o{NXqpK^aF< zZHgUembjLq^qlcq!!5>YrNwmHRJmLnr$=Hjy}j~O(Xo#ms`IhQVwSPG#K~j6`l^@+ z>DH>z#w1~UV$7q41sq1VS%Ng}rl%9=XAT*2dImZ3EoQ)M`H)%8MS5!W^x}wXr_d{_ zKU4oWb9WxQ742 fU;Jw3Jm1(g6mfx(3%Q7k$JlZ%=ZbyoejfM_JfZL) From a5e11115d38746b9703686def7f0640f97711585 Mon Sep 17 00:00:00 2001 From: Mzaxd Date: Tue, 16 May 2023 15:10:12 +0800 Subject: [PATCH 05/10] =?UTF-8?q?ci:menu=E6=96=B0=E5=A2=9E=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E5=8F=8A=E7=9B=B8=E5=BA=94=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adc/da/sys/controller/MenuEOController.java | 7 ++++--- .../main/java/com/adc/da/sys/entity/MenuEO.java | 13 +++++++++++++ .../src/main/java/com/adc/da/sys/vo/MenuVO.java | 14 ++++++++++++++ .../mybatis/mapper/sys/mysql/MenuEOMapper.xml | 3 ++- 4 files changed, 33 insertions(+), 4 deletions(-) diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/controller/MenuEOController.java b/adc-da-sys/src/main/java/com/adc/da/sys/controller/MenuEOController.java index 284b9e6..1b63841 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/controller/MenuEOController.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/controller/MenuEOController.java @@ -160,20 +160,21 @@ public class MenuEOController extends BaseController { RoleEO roleEO = roleEOService.selectByPrimaryKey(roleId); if ("管理员".equals(roleEO.getName())) { menuVOs.forEach(menuVO -> { - menuVO.setBelong(IsBelongEnum.BELONG.getValue()); + if (!"1".equals(menuVO.getIsButton())) { + menuVO.setBelong(IsBelongEnum.BELONG.getValue()); + } }); }else{ List roleMenuEOList =roleMenuEOService.queryByList(roleMenuEOPage); for (MenuVO menuVO : menuVOs) { for (RoleMenuEO roleMenuEO : roleMenuEOList){ - if (StringUtils.equals(menuVO.getId(),roleMenuEO.getMenuId())){ + if (StringUtils.equals(menuVO.getId(),roleMenuEO.getMenuId()) && !"1".equals(menuVO.getIsButton())){ menuVO.setBelong(IsBelongEnum.BELONG.getValue()); break; } } } } - } //List levelMenus = menuEOService.changeMenu(menuVOs); diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/entity/MenuEO.java b/adc-da-sys/src/main/java/com/adc/da/sys/entity/MenuEO.java index 3a5bfd5..e3a4901 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/entity/MenuEO.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/entity/MenuEO.java @@ -79,6 +79,19 @@ public class MenuEO extends TreeEntity implements Serializable { */ private String isUrl; + /** + * 1代表是按钮 + */ + private String isButton; + + public String getIsButton() { + return isButton; + } + + public void setIsButton(String isButton) { + this.isButton = isButton; + } + public String getIsUrl() { return isUrl; } diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/vo/MenuVO.java b/adc-da-sys/src/main/java/com/adc/da/sys/vo/MenuVO.java index 91664a4..3ab7680 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/vo/MenuVO.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/vo/MenuVO.java @@ -65,6 +65,20 @@ public class MenuVO extends TreeVO { */ private String isUrl; + /** + * + * @return + */ + private String isButton; + + public String getIsButton() { + return isButton; + } + + public void setIsButton(String isButton) { + this.isButton = isButton; + } + public String getIsUrl() { return isUrl; } diff --git a/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/MenuEOMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/MenuEOMapper.xml index 01b556e..ef876cd 100644 --- a/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/MenuEOMapper.xml +++ b/adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/MenuEOMapper.xml @@ -18,11 +18,12 @@ + - id, del_flag, name, parent_id, parent_ids, href, icon,iconHref,iconClick,iconClickHref, is_show, permission, remarks, sort, ext_info,is_url + id, del_flag, name, parent_id, parent_ids, href, icon,iconHref,iconClick,iconClickHref, is_show, permission, remarks, sort, ext_info,is_url,is_button From ba11a47341ba2ac4532e57565c71bdaa01c98739 Mon Sep 17 00:00:00 2001 From: bupengxiang Date: Tue, 16 May 2023 15:34:19 +0800 Subject: [PATCH 06/10] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=20=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E4=BF=AE=E6=94=B9=E7=BC=96=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/adc/da/sys/service/OrgEOService.java | 2 +- .../da/sys/controller/UserEOController.class | Bin 13041 -> 13041 bytes .../da/sys/service/UserEOServiceImpl.class | Bin 18719 -> 18719 bytes 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/OrgEOService.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/OrgEOService.java index 407756f..e959ff9 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sys/service/OrgEOService.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/OrgEOService.java @@ -17,7 +17,6 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.List; -import java.util.UUID; @Service("orgEOService") @Transactional @@ -71,6 +70,7 @@ public class OrgEOService extends ServiceImpl implements IOrgEo orgEO.setId(orgEO.getOrgCode()); baseMapper.insert(orgEO); }else{ + orgEO.setId(orgEO.getOrgCode()); baseMapper.updateById(orgEO); } return Result.success(); 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 ab709c7d84a30fdc8067bb69ceb0a84119b724ec..90e30587035e71432895995142276be4758f39aa 100644 GIT binary patch delta 355 zcmWO2ODIHP7{>Ac5sN`mI!RF^jmyMDHp)ub+Dx&Klq@WW#-)aFUy&HcMr_a^*U_1A zNh!ITCb@;3TlTZEvG8o)-_!R#?-y^4w}zgaNnXQ4xBccc4Tq0(`pIM5`Ynt)CP-zH zOy;a;(NfX^$t>Dk#e>Gs3JC;-t7Nc70qeL3@1*dd5BSszU*z(w vtA6aovTVbgqFB{Ds#ebo4FqV!vSaQAcCk}(8G)Yk;*(N4(QBKO$MRAan=HNgiOO~1JN}0xIEoCXm(lq)^ zc5NSKz0T0CjBBs7#YG zEy}bi)2>V(7H)PJAjr7fE1#54$>-%Ony<3Unru_%mjx1pLE#CB8?E4T$4{&oo=Y&mIm(B;elqJXycU*p6TR;9^TAg!M**RI6m}%Pi^=joo`+B uV=WY>8g?Ifm|8MJwW`%HO)axl*colu`$dDI5z&xnSTt&eo!w@Ak?$XDZ)p$! diff --git a/adc-da-sys/target/classes/com/adc/da/sys/service/UserEOServiceImpl.class b/adc-da-sys/target/classes/com/adc/da/sys/service/UserEOServiceImpl.class index 18fe9e5a62030cd1ca506760c5c0e2f1e6acdfa8..f005a645a72077abd891cade689900cbf62af94a 100644 GIT binary patch delta 873 zcmWNPdrX#P7{-6s`$il*z$c2Rsh=_|($A2CfG371p)@p-j56aOIz&MfQS+NH%}6Fr zc@j}@sHsyoTkGqz75%}cEoW+5%TZJ3)PLOC+RU7PSl)ZLXYYR3c0bp3KUaU3`n&W+ zVS4K_;#kgT-ee+Wr12JctY8V{_PtFNtJuK%G_#uBRN{>EQO!AO_=+|BN-cL;%R|=j zm^%Jrz2c}>5{;Thi_+PyCG1ccAL>1Js+zDGj5V{1D?nLfFuhHob^?6D81|Wo{iM=K zItQ4`Ar{eP_MF)`Vn+H2bH+7hd>wV3VO(%&nH^EzFp_WGcbPR&KNuTu!K^9`x_`13 zxyxB0{bYaLfvd#w3yEB_`PT_?Bhs6lpw!=q=BA+`Lw}INpA>S7H@Hm&cP!aW>bd7` z%)X?*TzAf<5s&SHe~IUb*?sB~a|g!rKT(30BvRxtLq0irfnqIm4|4}qQbx2_;s0UO!LcEYk$bG}ZD(=PP--awDhqehQeU3&@A=PHWxomX5G*knqRDVt5% KVoI|qm!AW4(8R_7 delta 873 zcmWNPX>8P06vcn%|98>_p&bfkk!4^~p~7J4LKlT9!%~nmP%TZBtu19~3l!Rd;E<^( zDb^IE4;q#ti_m~ZV;l)2rhLFalmJ3vBB())@P!Y=L=a;F@#ZBj@1B#~d(M65Xt$1b z>&s|Pd?BeUVh9zC=5?}pgJLR~$6~vys9`BhETfg>?6AsFOD}btW+h)!&rMeG2dlZy z8XnQWQyP^@lQL=6^K4NLTQ!eus^A^HMNGA9*LuTRiE{<0NLHgX~RSi%7la*P;#ZbR&yF+})y) zyY9xcOM2jX3Y!Q1V*?(O#=j=_KbKL|KT;5o7$uLed?xD|3KgJCQFp)SqUO5Ki`Qv^ zd#IQQp&ZQDy?9JYFKNVYEvCMw36eh=L@ak z8?EMo8n~)PZmWsATBjs!&|o#IK$|pEEvi?WHrshmTlA6M))8%0pSJ0H#q^`L>)w3D z^_SZ9MDKbbz3)xZPOn@YUbS|4F?D)f`q1lFmv=?Gz1!O3r)aOAseOJ}`~6(?__aFd zZ&rgJ)5nRirD1P&5~)gNm{JJY&u41@#TsdzMwzFu`I$hCCbC}HmWCH-*Cd>#)2kWu zsg$quig}uu=y>&xrcWkC5i&J}@p_S53r~@z5>>9X$Rnys|mLjmB&; Nrp1_6W7>?l{6D6H#Et*} From 4063bb9fda830cf2f1ecdb0bd2b13657ef268530 Mon Sep 17 00:00:00 2001 From: Mzaxd Date: Tue, 16 May 2023 15:51:16 +0800 Subject: [PATCH 07/10] =?UTF-8?q?feat:=E9=A2=84=E8=A7=88=E4=B8=8B=E8=BD=BD?= =?UTF-8?q?=E6=9D=83=E9=99=90=E5=A2=9E=E5=8A=A0=E5=88=A4=E6=96=ADEmployeeT?= =?UTF-8?q?ypeID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../da/report/constant/PowerApplyConstants.java | 5 +++++ .../report/service/impl/IReportServiceImpl.java | 17 +++++++++++++---- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/adc-da-report/src/main/java/com/adc/da/report/constant/PowerApplyConstants.java b/adc-da-report/src/main/java/com/adc/da/report/constant/PowerApplyConstants.java index b3d3aeb..70f24be 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/constant/PowerApplyConstants.java +++ b/adc-da-report/src/main/java/com/adc/da/report/constant/PowerApplyConstants.java @@ -51,4 +51,9 @@ public class PowerApplyConstants { * 有预览和下载全部报告权限的levelId */ public static final Double SPECIAL_LEVEL_FOUL = 4.0; + + /** + * 有预览和下载全部报告权限的Employee_TYPE_ID + */ + public static final Double EMPLOYEE_TYPE_ID_ONE = 1.0; } diff --git a/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java b/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java index 22b6f55..e54a37a 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java +++ b/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java @@ -458,11 +458,14 @@ public class IReportServiceImpl extends ServiceImpl //设置权限 UserEO userEo = userEODao.selectById(UserUtils.getUserId()); String levelId = userEo.getLevelId() == null ? "0.8" : userEo.getLevelId(); + String employeeTypeId = userEo.getEmployeeTypeId() == null ? "0.8" : userEo.getEmployeeTypeId(); //用户级别 double level = Double.parseDouble(levelId); + double employeeType = Double.parseDouble(employeeTypeId); //总监拥有全部报告的预览和下载权力 if (level == SPECIAL_LEVEL_ONE || level == SPECIAL_LEVEL_TWO || - level == SPECIAL_LEVEL_THREE || level == SPECIAL_LEVEL_FOUL) { + level == SPECIAL_LEVEL_THREE || level == SPECIAL_LEVEL_FOUL || + employeeType == EMPLOYEE_TYPE_ID_ONE) { list.getRecords().forEach(reportVo -> { reportVo.setPower(PREVIEW_DOWNLOAD); }); @@ -632,9 +635,15 @@ public class IReportServiceImpl extends ServiceImpl //校验权限 //总监(levelId) UserEO userEo = userEODao.selectById(userId); - Double levelId = Double.parseDouble(userEo.getLevelId() == null ? "1.0" : userEo.getLevelId()); - if (levelId.equals(SPECIAL_LEVEL_ONE) || levelId.equals(SPECIAL_LEVEL_TWO) || - levelId.equals(SPECIAL_LEVEL_THREE) || levelId.equals(SPECIAL_LEVEL_FOUL)) { + String levelId = userEo.getLevelId() == null ? "0.8" : userEo.getLevelId(); + String employeeTypeId = userEo.getEmployeeTypeId() == null ? "0.8" : userEo.getEmployeeTypeId(); + //用户级别 + double level = Double.parseDouble(levelId); + double employeeType = Double.parseDouble(employeeTypeId); + //总监拥有全部报告的预览和下载权力 + if (level == SPECIAL_LEVEL_ONE || level == SPECIAL_LEVEL_TWO || + level == SPECIAL_LEVEL_THREE || level == SPECIAL_LEVEL_FOUL || + employeeType == EMPLOYEE_TYPE_ID_ONE) { return true; } //本人 From f59b25a85cc54c13159adfb6f8bbf5a000091ee6 Mon Sep 17 00:00:00 2001 From: Mzaxd Date: Tue, 16 May 2023 16:05:37 +0800 Subject: [PATCH 08/10] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D[=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=8A=A5=E9=94=99]Bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 编辑报告-部门为空的时候，编辑按钮报错 --- .../da/report/service/impl/IReportServiceImpl.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java b/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java index e54a37a..3f4bf17 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java +++ b/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java @@ -689,11 +689,13 @@ public class IReportServiceImpl extends ServiceImpl ReportDetailVo reportDetailVo = reportDao.reportDetail(reportId); //设置部门名称 String department = reportDetailVo.getDepartment(); - String[] idArray = department.split(","); - List orgEOList = orgEOService.query().in("ID", idArray).list(); - if (CollectionUtils.isNotEmpty(orgEOList)) { - String departmentName = orgEOList.stream().map(OrgEO::getOrgName).collect(Collectors.joining(",")); - reportDetailVo.setDepartmentName(departmentName); + if (StrUtil.isNotBlank(department)) { + String[] idArray = department.split(","); + List orgEOList = orgEOService.query().in("ID", idArray).list(); + if (CollectionUtils.isNotEmpty(orgEOList)) { + String departmentName = orgEOList.stream().map(OrgEO::getOrgName).collect(Collectors.joining(",")); + reportDetailVo.setDepartmentName(departmentName); + } } //设置标签列表 From 89e829781e32663aafa56941973d4bc7c8bad904 Mon Sep 17 00:00:00 2001 From: bupengxiang Date: Tue, 16 May 2023 16:17:24 +0800 Subject: [PATCH 09/10] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=20isAct?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/mysql/ReportManageMapper.xml | 4 ++-- .../mapper/mysql/ReportManageMapper.xml | 4 ++-- .../da/sys/controller/MenuEOController.class | Bin 9257 -> 9328 bytes .../com/adc/da/sys/entity/MenuEO.class | Bin 2776 -> 2981 bytes .../com/adc/da/sys/service/OrgEOService.class | Bin 4955 -> 4967 bytes .../classes/com/adc/da/sys/vo/MenuVO.class | Bin 2943 -> 3148 bytes .../mybatis/mapper/sys/mysql/MenuEOMapper.xml | 3 ++- 7 files changed, 6 insertions(+), 5 deletions(-) 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 4bf88c4..e58e00d 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 @@ -228,7 +228,7 @@ ORDER BY updateDate desc