From c2628ad9389d9678d80015eef0d1fdda4431f458 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Fri, 21 Jul 2023 17:35:51 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E9=A2=84=E8=A7=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProblemKnowledgeBaseEOServiceImpl.java | 2 +- .../views/phoneView/problemKnowledgeBase.vue | 22 +++++++++++-------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java index e08e46211..65a8b074c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java @@ -577,7 +577,7 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl sysConfigs = iSysConfigService.queryList(); if(org.apache.commons.collections.CollectionUtils.isNotEmpty(sysConfigs)){ for (SysConfig sysConfig : sysConfigs) { - if(sysConfig.getConfigName().equals("domainWebImgURL")){ + if(sysConfig.getConfigName().equals("domianWebImgURL")){ String pcUrl = sysConfig.getConfig(); String phoneUrl = sysConfig.getPhoneConfig(); if(ObjectUtils.isNotEmpty(problemKnowledgeBaseEO) && StringUtils.isNotBlank(problemKnowledgeBaseEO.getContent())){ diff --git a/jero-web/src/views/phoneView/problemKnowledgeBase.vue b/jero-web/src/views/phoneView/problemKnowledgeBase.vue index 2d0cca0e9..71064cc97 100644 --- a/jero-web/src/views/phoneView/problemKnowledgeBase.vue +++ b/jero-web/src/views/phoneView/problemKnowledgeBase.vue @@ -24,7 +24,7 @@ -
+
@@ -172,14 +172,13 @@ } }) } - this.$nextTick(() => { - let contentId = document.getElementById('contentId') - contentId.onclick = function(e) { - if (e.target.localName == 'img') { - ImagePreview([e.target.currentSrc]) - } - } - }) + // this.$nextTick(() => { + // let contentId = document.getElementById('contentId') + // console.log(contentId) + // contentId.onclick = function(e) { + // console.log(e) + // } + // }) window.addEventListener('scroll', this.scrolling) window.addEventListener('mousedown', this.handleonmousedown) this.getQueryBy() @@ -205,6 +204,11 @@ // scrolling() { // this.isDisplay = false // }, + contentIdClick(e){ + if (e.target.localName == 'img') { + ImagePreview([e.target.currentSrc]) + } + }, handleonmousedown(e) { if (e.srcElement.type == 'textarea' || e.target.type == 'textarea') { From 88baf88cc2ba1c10952a56deb28e58ce590df26b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Tue, 25 Jul 2023 14:31:27 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/jero/modules/split/common/FileUnZip.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/common/FileUnZip.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/common/FileUnZip.java index d40b912e5..df7092ee9 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/common/FileUnZip.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/common/FileUnZip.java @@ -249,8 +249,11 @@ public class FileUnZip { String filenameOne = ""; String filenameTwo = ""; if(filename.contains("/")){ - filenameOne = filename.split("/")[0]; - filenameTwo = filename.split("/")[1]; + String[] strs = filename.split("/"); + if(strs.length >= 2){ + filenameOne = strs[0]; + filenameTwo = strs[1]; + } } List resultlist = new ArrayList<>(); if (StringUtil.isNotEmpty(path)){ From ddd703792fad9bd6424f6d05e92c4730ce759599 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Wed, 26 Jul 2023 15:21:02 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E6=89=A9=E5=B1=95=E5=8F=98=E6=9B=B4=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ParamsCollectManifestEOServiceImpl.java | 2 +- ...msCollectManifestHistoryEOServiceImpl.java | 29 +++++++++- ...ProjectLawsInventoryEOEditServiceImpl.java | 58 ++++++++++++++++--- ...ctCertificationInventoryEOServiceImpl.java | 9 ++- .../src/components/tableCollection/index.vue | 3 +- 5 files changed, 86 insertions(+), 15 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index 8b4eb5137..c95fa3676 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -3376,7 +3376,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl { // 参数配置 + Map paramsConfigDataVO = new HashMap<>(); Map configMap = new HashMap<>(); String paramsConfigId = paramsConfigEO.getId(); // ParamsConfigDataEO paramsConfigDataEO = paramsConfigDataHistoryEOService.queryByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId); // 参数配置数据 ParamsConfigDataHistoryEO paramsConfigDataHistoryEO = getConfigDataEOByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId, paramsConfigDataEOList); // 参数配置数据 - List paramsConfigDataVOList = getConfigDataVOList(controlType, paramsConfigEO, paramsConfigDataHistoryEO, collectManifestEO); // 重新组合配置数据 + List configDataEOList = paramsConfigDataEOList.stream().filter(e -> paramsConfigId.equals(e.getParamsConfigId()) && paramsCollectManifestId.equals(e.getParamsCollectManifestId())).collect(Collectors.toList()); +// List paramsConfigDataVOList = getConfigDataVOList(controlType, paramsConfigEO, paramsConfigDataHistoryEO, collectManifestEO); // 重新组合配置数据 + if(CollectionUtils.isNotEmpty(configDataEOList)){ + // 匿名比较器排序 + Collections.sort(configDataEOList, new Comparator() { + @Override + public int compare(ParamsConfigDataHistoryEO p1, ParamsConfigDataHistoryEO p2) { + if (p2.getOrderNum() == null || p1.getOrderNum() == null) { + return 0; + } + return p1.getOrderNum().compareTo(p2.getOrderNum()); + } + }); + for (ParamsConfigDataHistoryEO paramsConfigDataEO : configDataEOList) { + List paramsConfigDataVOList = this.getConfigDataVOList(controlType, paramsConfigEO, paramsConfigDataEO, collectManifestEO); // 重新组合配置数据 + paramsConfigDataVO.put(paramsConfigDataEO.getId(), paramsConfigDataVOList); + } + }else{ + ParamsConfigDataHistoryEO paramsConfigDataEO = this.getConfigDataEOByConfigIdAndCollectManifestId(paramsConfigId, paramsCollectManifestId, paramsConfigDataEOList); // 参数配置数据 + List paramsConfigDataVOList = this.getConfigDataVOList(controlType, paramsConfigEO, paramsConfigDataEO, collectManifestEO); // 重新组合配置数据 + String key = UUID.randomUUID().toString().replaceAll("-", ""); + paramsConfigDataVO.put("0+" + key, paramsConfigDataVOList); + } + configMap.put("controlType", controlType); - configMap.put("list", paramsConfigDataVOList); + configMap.put("paramsConfigData",paramsConfigDataVO); manifestMap.put(paramsConfigEO.getId(), configMap); configIdList.add(paramsConfigEO.getId()); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/editImpl/ProjectLawsInventoryEOEditServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/editImpl/ProjectLawsInventoryEOEditServiceImpl.java index 79510975f..ed7db4a64 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/editImpl/ProjectLawsInventoryEOEditServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/editImpl/ProjectLawsInventoryEOEditServiceImpl.java @@ -1,11 +1,17 @@ package com.jero.modules.project.service.editImpl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.jero.common.util.DateUtils; +import com.jero.modules.feishu.enums.TemplateInfoEnum2; import com.jero.modules.project.entity.ProjectLawsInventoryEO; +import com.jero.modules.project.entity.ProjectLibraryBase; import com.jero.modules.project.enums.ComplianceFlowStatusEnum; import com.jero.modules.project.enums.InventoryAffirmNodeEnum; import com.jero.modules.project.enums.TaskStatusEnum; import com.jero.modules.project.service.IProjectLawsInventoryEOService; +import com.jero.modules.project.service.impl.ProjectLibraryBaseServiceImpl; +import com.jero.modules.system.entity.SysUser; +import com.jero.modules.system.service.ISysUserService; import com.jero.modules.todoCenter.entity.ProcessInfoDetailEO; import com.jero.modules.todoCenter.entity.ProcessInfoEO; import com.jero.modules.todoCenter.enums.DesignComplianceFlowNodeKeyEnum; @@ -20,9 +26,7 @@ import org.apache.commons.lang3.StringUtils; 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.*; import java.util.stream.Collectors; /** @@ -38,6 +42,10 @@ public class ProjectLawsInventoryEOEditServiceImpl { private IProcessInfoDetailEOService processInfoDetailEOService; @Autowired private IProcessInfoEOService processInfoEOService; + @Autowired + ProjectLibraryBaseServiceImpl projectLibraryBaseService; + @Autowired + private ISysUserService sysUserService; /** * 处理编辑了法规工程师的逻辑 @@ -87,8 +95,8 @@ public class ProjectLawsInventoryEOEditServiceImpl { List qdqrPidEoList = pidEoList.stream().filter(pidEo -> { boolean flag = ( StringUtils.equals(pidEo.getFlowType(), FlowTypeEnum.QDQR.getValue()) - && StringUtils.equals(pidEo.getTaskDefinitionKey(), InventoryAffirmNodeEnum.REGULATION_OWNER_AUDIT.getKey()) - && StringUtils.equals(pidEo.getStatus(), TaskStatusEnum.NOT_DONE.getValue()) + && StringUtils.equals(pidEo.getTaskDefinitionKey(), InventoryAffirmNodeEnum.REGULATION_OWNER_AUDIT.getKey()) + && StringUtils.equals(pidEo.getStatus(), TaskStatusEnum.NOT_DONE.getValue()) ); return flag; }).collect(Collectors.toList()); @@ -103,8 +111,8 @@ public class ProjectLawsInventoryEOEditServiceImpl { List designFlowPidEoList = pidEoList.stream().filter(pidEo -> { boolean flag = ( StringUtils.equals(pidEo.getFlowType(), FlowTypeEnum.SJFHXSHLC.getValue()) - && StringUtils.equals(pidEo.getTaskDefinitionKey(), DesignComplianceFlowNodeKeyEnum.FGGCSSH.getValue()) - && StringUtils.equals(pidEo.getStatus(), TaskStatusEnum.NOT_DONE.getValue()) + && StringUtils.equals(pidEo.getTaskDefinitionKey(), DesignComplianceFlowNodeKeyEnum.FGGCSSH.getValue()) + && StringUtils.equals(pidEo.getStatus(), TaskStatusEnum.NOT_DONE.getValue()) ); return flag; }).collect(Collectors.toList()); @@ -121,8 +129,8 @@ public class ProjectLawsInventoryEOEditServiceImpl { List verifyFlowPidEoList = pidEoList.stream().filter(pidEo -> { boolean flag = ( StringUtils.equals(pidEo.getFlowType(), FlowTypeEnum.YZFHXSCLC.getValue()) - && StringUtils.equals(pidEo.getTaskDefinitionKey(), VerifyComplianceFlowNodeKeyEnum.FGGCSSH.getValue()) - && StringUtils.equals(pidEo.getStatus(), TaskStatusEnum.NOT_DONE.getValue()) + && StringUtils.equals(pidEo.getTaskDefinitionKey(), VerifyComplianceFlowNodeKeyEnum.FGGCSSH.getValue()) + && StringUtils.equals(pidEo.getStatus(), TaskStatusEnum.NOT_DONE.getValue()) ); return flag; }).collect(Collectors.toList()); @@ -134,6 +142,38 @@ public class ProjectLawsInventoryEOEditServiceImpl { taskIdList.addAll(verifyFlowPidEoList.stream().map(ProcessInfoDetailEO::getTaskId).collect(Collectors.toList())); } +// String regulationOwnerId = oldPliEo.getRegulationOwnerId(); +// // 给旧的法规工程师发消息 +// String endTime = ""; +// if (newPliEo.getInventoryAffirmDueDate() != null) { +// endTime = DateUtils.formatDate(newPliEo.getInventoryAffirmDueDate()); +// } +// Map params = new HashMap<>(); +// params.put("contentCn", "您好，您以下任务已被发起人撤回。"); +// params.put("contentEn", "Hello! Your task has been withdrawn by the initiator."); +// params.put("projectLibraryId", oldPliEo.getProjectLibraryId()); +// params.put("endTime", endTime); +// params.put("userIdList", Arrays.asList(regulationOwnerId.split(","))); +// params.put("serialNumbers", oldPliEo.getSerialNumber()); +// +// ProjectLibraryBase projectLibraryBase = this.projectLibraryBaseService.selectById(oldPliEo.getProjectLibraryId()); +// if (ObjectUtils.isNotEmpty(projectLibraryBase)) { +// String PRN_EN = projectLibraryBase.getProjectNameEn();//项目名称 英文 +// String PRN_CN = projectLibraryBase.getProjectNameCn();//项目名称 中文 +// // 获取待办中心 - 飞书跳转链接 +// Map todoCenterParams = new HashMap<>(); +// todoCenterParams.put("projectNameCn", PRN_CN); +// todoCenterParams.put("projectNameEn", PRN_EN); +// Map hrefFeishuMap = projectLawsInventoryEOService.getToDoCenterLinkHrefFeishu(projectLibraryBase.getId(), todoCenterParams); +// params.put("hrefFeishu_CN", hrefFeishuMap.get("hrefFeishu_CN")); +// params.put("hrefFeishu_EN", hrefFeishuMap.get("hrefFeishu_EN")); +// params.put("hrefFeishu_CN_P", hrefFeishuMap.get("hrefFeishu_CN_P")); +// +// List regulationOwnerUserList = this.sysUserService.querySysUserListByIdList(Arrays.asList(regulationOwnerId.split(","))); +// String regulationOwnerUserName = this.sysUserService.getUsernameByUserId(regulationOwnerUserList, regulationOwnerId); +// params.put("Initiator", regulationOwnerUserName); +// projectLawsInventoryEOService.sendMessageByTemplateId(TemplateInfoEnum2.REGULATION_TASK_CONFIRMATION1.getValue(), params); +// } } } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java index 263506baa..439c27f7e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java @@ -3886,9 +3886,14 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl lawsInventoryEOListTemp = projectLawsInventoryEOList.stream().filter(lawsInventoryEO -> { boolean flag = false; - if (StringUtils.equals(authDummyInventoryInfoEO.getSerialNumber(), lawsInventoryEO.getSerialNumber())) { - flag = true; + String adiSn = authDummyInventoryInfoEO.getSerialNumber(); + BussDocumentLibraryEO bl = iBussDocumentLibraryEOService.getBySerialNumber(adiSn); + if(ObjectUtils.isNotEmpty(bl)){ + if (StringUtils.equals(bl.getId(), lawsInventoryEO.getStandId())) { + flag = true; + } } + return flag; }).collect(Collectors.toList()); diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue index 484df9dd3..556381e2b 100644 --- a/jero-web/src/components/tableCollection/index.vue +++ b/jero-web/src/components/tableCollection/index.vue @@ -781,7 +781,8 @@ } let paramscm = { paramsManifestId: paramsManifestid, - moduleFlag:'参数项收集清单' + moduleFlag:'参数项收集清单', + flag: this.$route.query.it === undefined ? '' : '7' } var jsonHead = [] getAction(url, paramscm).then((res) => {