From 2822f98548c54afd6d2982826741aabe64a673ec Mon Sep 17 00:00:00 2001 From: wangchengjun <616865598@qq.com> Date: Wed, 15 Jun 2022 17:45:29 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=8B=86=E5=88=86=E4=B8=AD=E7=A9=BA?= =?UTF-8?q?=E8=A1=8C=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../split/service/impl/FileSpiltService.java | 29 ++++++++++++++----- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java index 9a89bcfbd..de7e73bee 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java @@ -306,7 +306,9 @@ public class FileSpiltService { SarFileSplitMenuEO sarFileSplitMenuEO = getTreeList(nowStart.get(i), treeList, generalCatalogueId, sarFileSplitInfoEO, treeListDisplay++, itemName, enumByValue); treeList.add(sarFileSplitMenuEO); message.setMenuId(sarFileSplitMenuEO.getId()); - addItermsConditionsText(message, itemValList, paragraphString.substring(nowStart.get(i).length())); + if(!StringUtils.isEmpty(itemName)){ + addItermsConditionsText(message, itemValList, paragraphString.substring(nowStart.get(i).length())); + } messageList.add(message); nowStart = getNewNowStart(nowStart.get(i)); menuCanAdd = true; @@ -544,7 +546,9 @@ public class FileSpiltService { SarFileSplitMenuEO sarFileSplitMenuEO = getTreeList(nowStart.get(i), treeList, generalCatalogueId, sarFileSplitInfoEO, treeListDisplay++, itemName, enumByValue); treeList.add(sarFileSplitMenuEO); message.setMenuId(sarFileSplitMenuEO.getId()); - addItermsConditionsText(message, itemValList, paragraphString.substring(nowStart.get(i).length())); + if(!StringUtils.isEmpty(itemName)){ + addItermsConditionsText(message, itemValList, paragraphString.substring(nowStart.get(i).length())); + } messageList.add(message); nowStart = getNewNowStart(nowStart.get(i)); menuCanAdd = true; @@ -728,7 +732,9 @@ public class FileSpiltService { SarFileSplitMenuEO sarFileSplitMenuEO = getTreeList(nowStart.get(i), treeList, generalCatalogueId, sarFileSplitInfoEO, treeListDisplay++, itemName, enumByValue); treeList.add(sarFileSplitMenuEO); message.setMenuId(sarFileSplitMenuEO.getId()); - addItermsConditionsText(message, itemValList, paragraphString.substring(nowStart.get(i).length())); + if(!StringUtils.isEmpty(itemName)){ + addItermsConditionsText(message, itemValList, paragraphString.substring(nowStart.get(i).length())); + } messageList.add(message); nowStart = getNewNowStartUS(nowStart.get(i)); menuCanAdd = true; @@ -1102,7 +1108,9 @@ public class FileSpiltService { SarFileSplitMenuEO sarFileSplitMenuEO = getTreeList(name, treeList, generalCatalogueId, sarFileSplitInfoEO, treeListDisplay++, itemName, enumByValue); treeList.add(sarFileSplitMenuEO); message.setMenuId(sarFileSplitMenuEO.getId()); - addItermsConditionsText(message, itemValList, paragraphString.substring(nowStart.get(i).length())); + if(!StringUtils.isEmpty(itemName)){ + addItermsConditionsText(message, itemValList, paragraphString.substring(nowStart.get(i).length())); + } messageList.add(message); nowStart = getNewNowStartJapanTwo(lastStrTemp, secondStrTemp, nowStart.get(i)); menuCanAdd = true; @@ -1276,7 +1284,10 @@ public class FileSpiltService { SarFileSplitMenuEO sarFileSplitMenuEO = getTreeList(nowStart.get(i), treeList, generalCatalogueId, sarFileSplitInfoEO, treeListDisplay++, itemName, enumByValue); treeList.add(sarFileSplitMenuEO); message.setMenuId(sarFileSplitMenuEO.getId()); - addItermsConditionsText(message, itemValList, paragraphString.substring(nowStart.get(i).length())); +// addItermsConditionsText(message, itemValList, paragraphString.substring(nowStart.get(i).length())); + if(!StringUtils.isEmpty(itemName)){ + addItermsConditionsText(message, itemValList, paragraphString.substring(nowStart.get(i).length())); + } messageList.add(message); nowStart = getNewNowStartEU(nowStart.get(i)); menuCanAdd = true; @@ -1453,7 +1464,9 @@ public class FileSpiltService { SarFileSplitMenuEO sarFileSplitMenuEO = getTreeList(name, treeList, generalCatalogueId, sarFileSplitInfoEO, treeListDisplay++, itemName, enumByValue); treeList.add(sarFileSplitMenuEO); message.setMenuId(sarFileSplitMenuEO.getId()); - addItermsConditionsText(message, itemValList, paragraphString.substring(nowStart.get(i).length())); + if(!StringUtils.isEmpty(itemName)){ + addItermsConditionsText(message, itemValList, paragraphString.substring(nowStart.get(i).length())); + } messageList.add(message); nowStart = getNewNowStartKmvssArticle(lastStr, nowStart.get(i)); menuCanAdd = true; @@ -1676,7 +1689,9 @@ public class FileSpiltService { SarFileSplitMenuEO sarFileSplitMenuEO = getTreeList(name, treeList, generalCatalogueId, sarFileSplitInfoEO, treeListDisplay++, itemName, enumByValue); treeList.add(sarFileSplitMenuEO); message.setMenuId(sarFileSplitMenuEO.getId()); - addItermsConditionsText(message, itemValList, paragraphString.substring(nowStart.get(i).length())); + if(!StringUtils.isEmpty(itemName)){ + addItermsConditionsText(message, itemValList, paragraphString.substring(nowStart.get(i).length())); + } messageList.add(message); nowStart = getNewNowStartKmvssTable(catalogerArr, nowStart.get(i), menuLevel); menuCanAdd = true; From 96145964c6138987ac43319b00e753a9d5b7bb78 Mon Sep 17 00:00:00 2001 From: xiejunyu Date: Wed, 15 Jun 2022 17:53:58 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E8=8B=B1=E6=96=87=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E7=BF=BB=E8=AF=91=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ParamsCollectManifestEOServiceImpl.java | 2 +- .../BussDocumentLibraryEOServiceImpl.java | 36 +++++++++---------- .../impl/DummyInventoryBaseEOServiceImpl.java | 14 ++++---- .../project/job/InventoryAffirmJob.java | 6 ++-- .../jero/modules/project/job/PrehomoJob.java | 4 +-- .../project/job/VerifyComplianceJob.java | 8 ++--- .../project/job/designComplianceJob.java | 8 ++--- .../ProjectLawsInventoryEOServiceImpl.java | 10 +++--- ...ojectTaskInventoryDetailEOServiceImpl.java | 12 ++++--- .../ProjectTaskInventoryEOServiceImpl.java | 14 ++++---- 10 files changed, 58 insertions(+), 56 deletions(-) diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index f91ee4a94..570120588 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -1067,7 +1067,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImplthe link,"; - String contentInfo = connectBuilder.substring(0, connectBuilder.toString().length()-1) + " and other parameter items, please enter " + href + " to handle it."; + String contentInfo = connectBuilder.substring(0, connectBuilder.toString().length()-1) + " and other parameter items, please enter " + href + " and fill in the relevant information."; // 发送系统消息 SysAnnouncement sysAnnouncement = new SysAnnouncement(); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index 1adc12ed4..595f18294 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -2578,8 +2578,8 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.in(DummyInventoryInfoEO::getDummyInventoryBaseId,dummyInventoryBaseEO.getId()); List dummyInventoryInfoEOList = iDummyInventoryInfoEOService.list(lambdaQueryWrapper); - String contentLog = null; + String contentLog = ""; if(dummyContentChangeEOList.size() == 0){ //没有添加过需要进行第一次添加 @@ -418,11 +418,13 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl updateLogList = dummyLogEOService.list(logEOQueryWrapper); if(CollectionUtils.isNotEmpty(updateLogList)){ - contentLog = updateLogList.stream().map(e -> e.getLogContent()).collect(Collectors.joining("

")); + List contentLogList = updateLogList.stream().map(e -> e.getLogContent()).collect(Collectors.toList()); + for(int i=0 ; i < contentLogList.size() ;i++){ + contentLog += "（"+ (i+1) +"）" + contentLogList.get(i) + "
"; + } } } - //列表,维护清单不同的字段,addSerialNumber,deleteSerialNumber都为空->证明是没有更新的数据,不发送消息,数据不处理 if(MapUtils.isNotEmpty(baseDiff) || StringUtils.isNotEmpty(contentLog)) { //向订阅该领域管理的人发消息和飞书 @@ -1130,8 +1132,8 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl"+ contentLog; } return contentInfo; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java index 9ac30797f..973a8c568 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java @@ -127,7 +127,7 @@ public class InventoryAffirmJob implements Job { // XXX . String msgContentEN = "The remaining processing time for the regulation list confirmation of" + projectNameInfoEO.getProjectName() - + " is 3 days. Please check and handle it in time."; + + " are 3 days. Please check and handle it in time."; //飞书跳转链接 String hrefFeishu = backUrl + JumpLinkEnum.INVENTORY_AFFIRM_LINK.getLink() + projectLibraryBase.getId() + JumpLinkEnum.INVENTORY_AFFIRM_LINK.getType(); @@ -148,9 +148,9 @@ public class InventoryAffirmJob implements Job { currentDaysUserIdList = currentDaysUserIdList.stream().distinct().collect(Collectors.toList()); /*String msgContentCN = "您" + projectLibraryBase.getProjectName() + "(项目名称)法规清单的任务今天即将结束,请及时查看处理*/ - String msgContentEN = "The the regulation list confirmation of " + String msgContentEN = "The the regulation list confirmation for " + projectNameInfoEO.getProjectName() - + " is coming to an end today. Please check and deal with it in time"; + + " will expire today. Please check and address it in a timely manner."; //飞书跳转链接 String hrefFeishu = backUrl + JumpLinkEnum.INVENTORY_AFFIRM_LINK.getLink() + projectLibraryBase.getId() + JumpLinkEnum.INVENTORY_AFFIRM_LINK.getType(); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/PrehomoJob.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/PrehomoJob.java index 32183fc67..f5489d989 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/PrehomoJob.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/PrehomoJob.java @@ -133,7 +133,7 @@ public class PrehomoJob implements Job { //The remaining processing time for the Pre-Homo confirmation of GB 7258 in XXX (project name) is 3 days. Please check and handle it in time. String msgContentEN = "The remaining processing time for the Pre-Homo confirmation of " + projectLawsInventoryEO.getSerialNumber() + " in " + projectNameInfoEO.getProjectName() - + " is 3 days. Please check and handle it in time."; + + " are 3 days. Please check and handle it in time."; //飞书跳转链接 String hrefFeishu = backUrl + JumpLinkEnum.PREHOMO_AFFIRM_LINK.getLink() + projectLibraryBase.getId() + JumpLinkEnum.PREHOMO_AFFIRM_LINK.getType(); @@ -157,7 +157,7 @@ public class PrehomoJob implements Job { //The the Pre-Homo confirmation of GB 7258 in XXX (project name) is coming to an end today. Please check and deal with it in time String msgContentEN = "The the Pre-Homo confirmation of " + projectLawsInventoryEO.getSerialNumber() + " in " + projectNameInfoEO.getProjectName() - + " is coming to an end today. Please check and deal with it in time."; + + " will expire today. Please check and address it in time."; //飞书跳转链接 String hrefFeishu = backUrl + JumpLinkEnum.PREHOMO_AFFIRM_LINK.getLink() + projectLibraryBase.getId() + JumpLinkEnum.PREHOMO_AFFIRM_LINK.getType(); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/VerifyComplianceJob.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/VerifyComplianceJob.java index 052617f47..32a1ea3b8 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/VerifyComplianceJob.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/VerifyComplianceJob.java @@ -130,9 +130,9 @@ public class VerifyComplianceJob implements Job { //您XXX（项目名称）中GB 7258的验证符合性确认剩余处理时间还有3天，请及时查看处理 //The remaining processing time for the Verify compliance confirmation of GB 7258 in XXX (project name) is 3 days. Please check and handle it in time. - String msgContentEN = "The remaining processing time for the Verify compliance confirmation of " + String msgContentEN = "The remaining processing time for the validation compliance confirmation of " + projectLawsInventoryEO.getSerialNumber() + " in " + projectNameInfoEO.getProjectName() - + " is 3 days. Please check and handle it in time."; + + " are 3 days. Please check and handle it in time."; //飞书跳转链接 String hrefFeishu = backUrl + JumpLinkEnum.VERIFY_AFFIRM_LINK.getLink() + projectLibraryBase.getId() + JumpLinkEnum.VERIFY_AFFIRM_LINK.getType(); @@ -154,9 +154,9 @@ public class VerifyComplianceJob implements Job { //您XXX（项目名称）中GB 7258的验证符合性确认任务今天即将结束，请及时查看处理 //The the Verify compliance confirmation of GB 7258 in XXX (project name) is coming to an end today. Please check and deal with it in time - String msgContentEN = "The the Verify compliance confirmation of " + String msgContentEN = "The the validation compliance confirmation of " + projectLawsInventoryEO.getSerialNumber() + " in " + projectNameInfoEO.getProjectName() - + " is coming to an end today. Please check and deal with it in time."; + + " will expire today. Please check and address it in time."; //飞书跳转链接 String hrefFeishu = backUrl + JumpLinkEnum.VERIFY_AFFIRM_LINK.getLink() + projectLibraryBase.getId() + JumpLinkEnum.VERIFY_AFFIRM_LINK.getType(); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/designComplianceJob.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/designComplianceJob.java index 100ab9d79..d50c58f77 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/designComplianceJob.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/designComplianceJob.java @@ -128,9 +128,9 @@ public class designComplianceJob implements Job { threeDaysUserIdList = threeDaysUserIdList.stream().distinct().collect(Collectors.toList()); //您XXX（项目名称）中GB 7258的设计符合性确认剩余处理时间还有3天，请及时查看处理 - String msgContentEN = "The remaining processing time for the design compliance confirmation of " + String msgContentEN = "The remaining processing time for the design compliance confirmation for " + projectLawsInventoryEO.getSerialNumber() + " in " + projectNameInfoEO.getProjectName() - + " is 3 days. Please check and handle it in time."; + + " are 3 days. Please check and address it in a timely manner."; //飞书跳转链接 String hrefFeishu = backUrl + JumpLinkEnum.DESIGN_AFFIRM_LINK.getLink() + projectLibraryBase.getId() + JumpLinkEnum.DESIGN_AFFIRM_LINK.getType(); @@ -151,9 +151,9 @@ public class designComplianceJob implements Job { currentDaysUserIdList = currentDaysUserIdList.stream().distinct().collect(Collectors.toList()); //您XXX（项目名称）中GB 7258的设计符合性确认任务今天即将结束，请及时查看处理 - String msgContentEN = "The the design compliance confirmation of " + String msgContentEN = "The the design compliance confirmation for " + projectLawsInventoryEO.getSerialNumber() + " in " + projectNameInfoEO.getProjectName() - + " is coming to an end today. Please check and deal with it in time."; + + " will expire today. Please check and address it in time."; //飞书跳转链接 String hrefFeishu = backUrl + JumpLinkEnum.DESIGN_AFFIRM_LINK.getLink() + projectLibraryBase.getId() + JumpLinkEnum.DESIGN_AFFIRM_LINK.getType(); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index d63cd43fb..b8a0705aa 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -1085,8 +1085,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl Date: Wed, 15 Jun 2022 18:00:38 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF-=E8=8B=B1=E6=96=87=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../4.数据库变更记录/李雅玮sql变更记录.sql | 6 +- .../enums/CollectManifestRoleIdEnum.java | 2 +- .../ParamsCollectManifestEOServiceImpl.java | 65 +++++++++++++++-- .../impl/ParamsManifestEOServiceImpl.java | 16 +++-- .../cert/template/entity/ParamsInfoEO.java | 2 +- .../service/IParamsInfoEOService.java | 1 - .../service/impl/ParamsInfoEOServiceImpl.java | 64 +++++++++++++---- .../vo/CertCategoryParamsInfoEnImport.java | 71 +++++++++++++++++++ .../cert/template/vo/ParamsInfoCnImport.java | 2 +- .../cert/template/vo/ParamsInfoEnExport.java | 2 +- .../cert/template/vo/ParamsInfoEnImport.java | 2 +- .../system/mapper/SysDictItemMapper.java | 2 +- .../impl/FileSplitItemsEOServiceImpl.java | 1 - 13 files changed, 203 insertions(+), 33 deletions(-) create mode 100644 jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/vo/CertCategoryParamsInfoEnImport.java diff --git a/SynologyDrive/4.数据库变更记录/李雅玮sql变更记录.sql b/SynologyDrive/4.数据库变更记录/李雅玮sql变更记录.sql index 38b7e6d0d..3f2798162 100644 --- a/SynologyDrive/4.数据库变更记录/李雅玮sql变更记录.sql +++ b/SynologyDrive/4.数据库变更记录/李雅玮sql变更记录.sql @@ -45,4 +45,8 @@ ALTER TABLE `laws_weilai`.`params_collect_manifest_history` CHANGE COLUMN `file_template` `file_template_connect_id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '附件模板' AFTER `control_verify`; ALTER TABLE `laws_weilai`.`params_report_detail` - CHANGE COLUMN `file_template` `file_template_connect_id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '附件模板' AFTER `control_verify`; \ No newline at end of file + CHANGE COLUMN `file_template` `file_template_connect_id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '附件模板' AFTER `control_verify`; + +---2022-06-15 +ALTER TABLE `laws_weilai`.`sys_user_role` + MODIFY COLUMN `role_id` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '角色id' AFTER `user_id`; \ No newline at end of file diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestRoleIdEnum.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestRoleIdEnum.java index a81e532a9..cad81c249 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestRoleIdEnum.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/enums/CollectManifestRoleIdEnum.java @@ -15,7 +15,7 @@ import java.util.List; * @Date: Created in 10:56 2022/6/11 */ public enum CollectManifestRoleIdEnum { - STUDIO_ID("R&H Studio","R&H Studio","studio","1534019911296118786",1), +// STUDIO_ID("R&H Studio","R&H Studio","studio","1534019911296118786",1), ADMIN_ID("R&H Manager","R&H Manager","manager","1534020391015444481",2), MANAGER_ID("系统管理员","Administrator","admin","f6817f48af4fb3af11b9e8bf182f618b",3); diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index 570120588..44429e9b7 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -37,7 +37,9 @@ import com.jero.modules.feishu.service.IFeishuService; import com.jero.modules.ocr.util.LineHumpUtil; import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.service.IOSSFileService; +import com.jero.modules.project.entity.ProjectLibraryBase; import com.jero.modules.project.entity.ProjectRelatedPersonnel; +import com.jero.modules.project.mapper.ProjectLibraryBaseMapper; import com.jero.modules.project.service.IProjectRelatedPersonnelService; import com.jero.modules.system.entity.SysAnnouncement; import com.jero.modules.system.entity.SysDictItem; @@ -109,6 +111,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl userRoles = sysUserRoleService.list(new QueryWrapper().lambda().eq(SysUserRole::getUserId, loginUser.getId())); // 查询用户所有角色 - List userRoleIds = new ArrayList<>(); // 用户管理员/领导/studio角色 + List userRoleIds = new ArrayList<>(); // 用户管理员/领导 if (CollectionUtil.isNotEmpty(userRoles)) { List roleIdList = CollectManifestRoleIdEnum.getIdList(); List userRoleIdList = userRoles.stream().map(SysUserRole::getRoleId).collect(Collectors.toList()); userRoleIds = roleIdList.stream().filter(e->userRoleIdList.contains(e)).collect(Collectors.toList()); } - if (CollectionUtil.isEmpty(userRoleIds) && !homoList.contains(loginUser.getUsername()) + // TODO 查询当前登录用户角色 是否是当前项目的studio + List studioList = new ArrayList<>(); + List projectLibraryBaseList = projectLibraryBaseMapper.queryById(projectId); + if (CollectionUtil.isNotEmpty(projectLibraryBaseList)) { + studioList = projectLibraryBaseList.stream().map(ProjectLibraryBase::getStudioEngineerName).collect(Collectors.toList()); + } + + if (CollectionUtil.isEmpty(userRoleIds) && !studioList.contains(loginUser.getUsername()) + && !homoList.contains(loginUser.getUsername()) && !sdtList.contains(loginUser.getUsername()) && !dreListOfPCM.contains(loginUser.getUsername())) { @@ -860,6 +872,17 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl map = new HashMap<>(); + if (CutEnum.CN.getValue().equals(cut)) { + map.put("label", CollectManifestUserTypeEnum.STUDIO.getName()); + } else { + map.put("label", CollectManifestUserTypeEnum.STUDIO.getEnName()); + } + map.put("value", CollectManifestUserTypeEnum.STUDIO.getValue()); + userTypeList.add(map); + } + if (CollectionUtil.isNotEmpty(userRoleIds)) { List collectManifestRoleIdEnumList = CollectManifestRoleIdEnum.getByIdList(userRoleIds); for (CollectManifestRoleIdEnum collectManifestRoleIdEnum : collectManifestRoleIdEnumList) { @@ -912,6 +935,9 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl paramsCollectManifestEOList = listByIds(Arrays.asList(paramsCollectManifestIdStr)); List sdtList = paramsCollectManifestEOList.stream().map(ParamsCollectManifestEO::getSdt).distinct().collect(Collectors.toList()); + if (CollectionUtil.isEmpty(sdtList)) { + throw new JeroBootException("没有可下发的工程接口人！"); + } for(String sdt : sdtList) { StringBuilder connectBuilder = new StringBuilder(); @@ -1083,7 +1128,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl paramsConfigIdList = Arrays.asList(paramsConfigIds.split(",")); @@ -1153,6 +1201,10 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(ParamsManifestEO::getTitle, oldParamsManifestEO.getTitle()); - queryWrapper.eq(ParamsManifestEO::getProjectId, oldParamsManifestEO.getProjectId()); - List paramsManifestEOList = list(queryWrapper); - if (CollectionUtil.isNotEmpty(paramsManifestEOList)) { - throw new JeroBootException("标题已存在！"); + ParamsManifestEO oldParamsManifestEO = getById(paramsManifestEO.getId()); + if (!oldParamsManifestEO.getTitle().equals(paramsManifestEO.getTitle())) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(ParamsManifestEO::getTitle, paramsManifestEO.getTitle()); + queryWrapper.eq(ParamsManifestEO::getProjectId, oldParamsManifestEO.getProjectId()); + List paramsManifestEOList = list(queryWrapper); + if (CollectionUtil.isNotEmpty(paramsManifestEOList)) { + throw new JeroBootException("标题已存在！"); + } } ParamsManifestEO updateEO = new ParamsManifestEO(); diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/entity/ParamsInfoEO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/entity/ParamsInfoEO.java index 6c1162f49..dabf60f86 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/entity/ParamsInfoEO.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/entity/ParamsInfoEO.java @@ -100,7 +100,7 @@ public class ParamsInfoEO implements Serializable { private String description; /**认证类别*/ - @Excel(name = "认证类别", width = 15, dicCode = "cert_category") + @Excel(name = "*认证类别", width = 15, dicCode = "cert_category") @Dict(dicCode = "cert_category") @ApiModelProperty(value = "认证类别") private String certCategory; diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/IParamsInfoEOService.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/IParamsInfoEOService.java index 7ff7c338f..84bb61e12 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/IParamsInfoEOService.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/IParamsInfoEOService.java @@ -97,7 +97,6 @@ public interface IParamsInfoEOService extends IService { String paramsTemplateId, String cut); - int deleteByParamsTemplateIds(String paramsTemplateIds); List selectListByParamsTemplateIds(String paramsTemplateIds); diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java index d447a460c..faaa6d9ca 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java @@ -13,6 +13,7 @@ import com.jero.common.api.vo.Result; import com.jero.common.constant.enums.CutEnum; import com.jero.common.constant.enums.IsMustEnum; import com.jero.common.exception.JeroBootException; +import com.jero.common.util.oss.CosBootUtil; import com.jero.modules.cert.template.entity.CertCategoryParamsInfoEO; import com.jero.modules.cert.template.entity.ParamsInfoEO; import com.jero.modules.cert.template.enums.ControlTypeEnum; @@ -34,6 +35,7 @@ import com.jero.modules.system.service.impl.SysCategoryServiceImpl; import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; +import org.apache.poi.ss.formula.functions.T; import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.jeecgframework.poi.excel.ExcelExportUtil; @@ -313,10 +315,12 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl bussExportMap = new HashMap<>(); bussExportMap.put("title", bussExportParams); - bussExportMap.put("entity", ParamsInfoEO.class); + if (CutEnum.CN.getValue().equals(cut)) { + bussExportMap.put("entity", ParamsInfoEO.class); bussExportMap.put("data", new ArrayList()); } else if (CutEnum.EN.getValue().equals(cut)) { + bussExportMap.put("entity", ParamsInfoEnExport.class); bussExportMap.put("data", new ArrayList()); } sheetsList.add(bussExportMap); @@ -332,10 +336,12 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl certExportMap = new HashMap<>(); certExportMap.put("title", certExportParams); - certExportMap.put("entity", CertCategoryParamsInfoEO.class); + if (CutEnum.CN.getValue().equals(cut)) { + certExportMap.put("entity", CertCategoryParamsInfoEO.class); certExportMap.put("data", new ArrayList()); } else if (CutEnum.EN.getValue().equals(cut)) { + certExportMap.put("entity", CertCategoryParamsInfoEnExport.class); certExportMap.put("data", new ArrayList()); } sheetsList.add(certExportMap); @@ -613,15 +619,15 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl result = ExcelImportUtil.importExcelMore(excelfile,ParamsInfoCnImport.class, params); - paramsInfoEOList = result.getList(); + if (CutEnum.EN.getValue().equals(cut)) { + ExcelImportResult resultEn = ExcelImportUtil.importExcelMore(excelfile,ParamsInfoEnImport.class, params); + List paramsInfoEOListEn = resultEn.getList(); + copyParamsInfoList(paramsInfoEOListEn, paramsInfoEOList); + } else { + ExcelImportResult result = ExcelImportUtil.importExcelMore(excelfile, ParamsInfoCnImport.class, params); + paramsInfoEOList = result.getList(); + } } else { // 认证类别参数表 if (certCategoryMap.containsKey(sheetName)) { - ExcelImportResult result = ExcelImportUtil.importExcelMore(excelfile, CertCategoryParamsInfoCnImport.class, params); - List list = result.getList(); + List list = new ArrayList<>(); + if (CutEnum.EN.getValue().equals(cut)) { + ExcelImportResult resultEn = ExcelImportUtil.importExcelMore(excelfile, CertCategoryParamsInfoEnImport.class, params); + List listEn = resultEn.getList(); + copycertCategoryParamsInfoList(listEn, list); + } else { + ExcelImportResult result = ExcelImportUtil.importExcelMore(excelfile, CertCategoryParamsInfoCnImport.class, params); + list = result.getList(); + } if (CollectionUtil.isNotEmpty(list)) { for (CertCategoryParamsInfoCnImport certCategoryParamsInfoEO : list){ //判断此行数据是否全部为空,是则不读取 @@ -822,6 +841,27 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl sourceList, List targetList) { + if (CollectionUtil.isNotEmpty(sourceList)) { + sourceList.forEach(item -> { + ParamsInfoCnImport target = new ParamsInfoCnImport(); + BeanUtils.copyProperties(item, target); + targetList.add(target); + }); + } + } + // 集合复制 + private void copycertCategoryParamsInfoList(List sourceList, List targetList) { + if (CollectionUtil.isNotEmpty(sourceList)) { + sourceList.forEach(item -> { + CertCategoryParamsInfoCnImport target = new CertCategoryParamsInfoCnImport(); + BeanUtils.copyProperties(item, target); + targetList.add(target); + }); + } + } + @Override public Result importParamsInfoData(List paramsInfoEOList, Map> certCategoryParamsInfoEOListMap, @@ -1129,7 +1169,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl { @Select("SELECT * FROM sys_dict_item WHERE DICT_ID = #{mainId} order by sort_order asc, item_value asc") public List selectItemsByMainId(String mainId); - @Select("SELECT sys_dict_item.* FROM sys_dict_item LEFT JOIN sys_dict ON sys_dict_item.dict_id = sys_dict.id WHERE DICT_CODE = #{dictCode} order by sort_order asc, item_value asc") + @Select("SELECT sys_dict_item.* FROM sys_dict_item LEFT JOIN sys_dict ON sys_dict_item.dict_id = sys_dict.id WHERE sys_dict_item.DEL_FLAG = 0 and DICT_CODE = #{dictCode} order by sort_order asc, item_value asc") public List selectItemsByDictCode(String dictCode); @Select("SELECT sys_dict_item.* FROM sys_dict_item LEFT JOIN sys_dict ON sys_dict_item.dict_id = sys_dict.id WHERE DICT_CODE = #{dictCode} order by sys_dict_item.sort_order asc") diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java index baf54bd45..17b066d6f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java @@ -3300,7 +3300,6 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl Date: Wed, 15 Jun 2022 18:16:04 +0800 Subject: [PATCH 4/5] =?UTF-8?q?[update]=20=E7=A6=85=E9=81=93bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/projectManagement/dialog/ParameterTemplateAdd.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue b/jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue index 5f0510409..34acd779a 100644 --- a/jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue +++ b/jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue @@ -217,6 +217,7 @@ export default { if (valid) { this.flag = true this.spinLoading = true + this.confirmLoading = true let postDate = { title: this.formData.title, paramsTemplateId: this.paramsTemplateId || this.selectedRowKeys[0], @@ -241,6 +242,7 @@ export default { ).finally(() => { this.flag = false this.spinLoading = false + this.confirmLoading = false this.newVisible = false }) } else { @@ -257,12 +259,14 @@ export default { ).finally(() => { this.flag = false this.spinLoading = false + this.confirmLoading = false this.newVisible = false }) } } else { // this.$message.warning(this.$t('changeTheTitle')) this.spinLoading = false + this.confirmLoading = false } }) } From 2f12194ef04b507fb1ca90592c0d73a0efe9bad2 Mon Sep 17 00:00:00 2001 From: xiejunyu Date: Wed, 15 Jun 2022 18:17:36 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E5=8F=91=E5=B8=83=E9=A3=9E=E4=B9=A6=E6=B6=88=E6=81=AF=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dummy/service/impl/DummyInventoryBaseEOServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java index b0c904751..a71c6ec1c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java @@ -1117,10 +1117,10 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl"; - contentInfoTemp = "The " + baseName + " virtual list you subscribed to has been updated as follows : " + "
"; + contentInfoTemp = "The " + baseName + " virtual list you subscribed to has been updated as follows : " ; //拼接维护清单的消息 contentInfo = setContentInfo(contentInfo, baseDiff,contentLog); - contentInfoTemp = setContentInfo(contentInfoTemp, baseDiff,contentLog); + contentInfoTemp = setContentInfo(contentInfoTemp, baseDiff,contentLog).replace("
"," "); //封装消息的实体类 SysAnnouncement sysAnnouncement = bussDocumentLibraryEOService.getSysAnnouncement(userIdList, content, contentInfo); sysAnnouncementService.saveAnnouncement(sysAnnouncement);