diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEO.java index c29dff603..f80c908d7 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/entity/AuthDummyInventoryInfoEO.java @@ -167,4 +167,11 @@ public class AuthDummyInventoryInfoEO implements Serializable { @ApiModelProperty(value = "责任部门") @TableField(exist = false) private String firstLevelDutyTerritory; + + /**清单名称**/ + @TableField(exist = false) + private String authDummyInventoryBaseName; + /**清单创建人**/ + @TableField(exist = false) + private String creatUser; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/mapper/AuthDummyInventoryInfoEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/mapper/AuthDummyInventoryInfoEOMapper.java index 156072cb8..3d048f678 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/mapper/AuthDummyInventoryInfoEOMapper.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/mapper/AuthDummyInventoryInfoEOMapper.java @@ -14,4 +14,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface AuthDummyInventoryInfoEOMapper extends BaseMapper { + List queryListByStandId(String id); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/mapper/xml/AuthDummyInventoryInfoEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/mapper/xml/AuthDummyInventoryInfoEOMapper.xml index f9e8d3f9e..679da41de 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/mapper/xml/AuthDummyInventoryInfoEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/mapper/xml/AuthDummyInventoryInfoEOMapper.xml @@ -18,4 +18,18 @@ + \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/IAuthDummyInventoryInfoEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/IAuthDummyInventoryInfoEOService.java index f13e5a99e..bef148978 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/IAuthDummyInventoryInfoEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/IAuthDummyInventoryInfoEOService.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject; import com.jero.common.api.vo.Result; import com.jero.modules.authDummy.entity.AuthDummyInventoryInfoEO; import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.modules.dummy.entity.DummyInventoryInfoEO; import com.jero.modules.project.entity.ProjectCertificationInventoryEO; import com.jero.modules.system.entity.SysCategory; import org.springframework.web.multipart.MultipartFile; @@ -147,4 +148,6 @@ public interface IAuthDummyInventoryInfoEOService extends IService acquireAdd(JSONObject json); List dataUniqueCheck(List addList, String cut, List result, String authDummyInventoryBaseId); + + List queryListByStandId(String id); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java index 091cf57c6..4cfc8486b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryInfoEOServiceImpl.java @@ -2250,4 +2250,11 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl queryListByStandId(String id) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + List dataList = this.getBaseMapper().queryListByStandId(id); + return dataList; + } } 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 60906b7e7..245af74d9 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 @@ -22,11 +22,14 @@ import com.jero.common.constant.enums.YesOrNoEnum; import com.jero.common.es.JeroElasticsearchTemplate; import com.jero.common.exception.JeroBootException; import com.jero.common.system.query.QueryRuleEnum; +import com.jero.common.system.vo.DictModel; import com.jero.common.system.vo.LoginUser; import com.jero.common.util.DateUtils; import com.jero.common.util.oss.CosBootUtil; import com.jero.generater.modules.online.cgform.entity.OnlCgformField; import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServiceImpl; +import com.jero.modules.authDummy.entity.AuthDummyInventoryInfoEO; +import com.jero.modules.authDummy.service.IAuthDummyInventoryInfoEOService; import com.jero.modules.collection.entity.OnlCgformCollection; import com.jero.modules.collection.service.IOnlCgformCollectionService; import com.jero.modules.document.entity.BussDocumentLibraryEO; @@ -45,6 +48,8 @@ import com.jero.modules.document.vo.QueryConditionVO; import com.jero.modules.domain.entity.DomainUserRel; import com.jero.modules.domain.service.DomainUserRelService; import com.jero.modules.domain.service.impl.DomainManageServiceImpl; +import com.jero.modules.dummy.entity.DummyInventoryInfoEO; +import com.jero.modules.dummy.service.IDummyInventoryInfoEOService; import com.jero.modules.feishu.enums.TemplateInfoEnum2; import com.jero.modules.feishu.service.IFeishuService; import com.jero.modules.feishu.vo.FeishuMsgVo; @@ -59,6 +64,15 @@ import com.jero.modules.oss.service.IOSSFileService; import com.jero.modules.phone.entity.RecentBrowse; import com.jero.modules.phone.enums.BrowseTypeEnum; import com.jero.modules.phone.service.IRecentBrowseService; +import com.jero.modules.project.entity.ProjectCertificationInventoryEO; +import com.jero.modules.project.entity.ProjectLawsInventoryEO; +import com.jero.modules.project.entity.ProjectLibraryBase; +import com.jero.modules.project.enums.CertificationInventoryFlowStatusEnum; +import com.jero.modules.project.enums.ComplianceFlowStatusEnum; +import com.jero.modules.project.service.IProjectCertificationInventoryEOService; +import com.jero.modules.project.service.IProjectLawsInventoryEOService; +import com.jero.modules.project.service.IProjectLibraryBaseService; +import com.jero.modules.project.service.impl.ProjectLawsInventoryEOServiceImpl; import com.jero.modules.searchcenter.enums.ModuleTypeFlagEnum; import com.jero.modules.split.common.FileUnZip; import com.jero.modules.split.entity.SarFileSplitInfoEO; @@ -71,9 +85,11 @@ import com.jero.modules.system.entity.SysCategory; import com.jero.modules.system.entity.SysCategoryTreeVO; import com.jero.modules.system.entity.SysDictItem; import com.jero.modules.system.entity.SysUser; +import com.jero.modules.system.enums.DicCodeEnum; import com.jero.modules.system.mapper.SysUserMapper; import com.jero.modules.system.service.ISysAnnouncementService; import com.jero.modules.system.service.ISysDepartService; +import com.jero.modules.system.service.ISysDictService; import com.jero.modules.system.service.ISysUserService; import com.jero.modules.system.service.impl.SysCategoryServiceImpl; import com.jero.modules.system.service.impl.SysDictItemServiceImpl; @@ -200,6 +216,22 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl fieldList = onlCgformFieldService.getFieldList(ModuleEnum.DOCUMENT_LIBRARY.getValue()); //普通数据字典 @@ -2812,6 +2845,217 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl> user2ProjectMap, String userId, String projectId) { + if (user2ProjectMap.containsKey(userId)) { + List proList = user2ProjectMap.get(userId); + if (!proList.contains(projectId)) { + proList.add(projectId); + } + } else { + List proList = new ArrayList<>(); + proList.add(projectId); + user2ProjectMap.put(userId, proList); + } + } + + private void notifyUpdateMsg(String id ,String serialNumber) { + Map> user2ProjectMap = new HashMap<>(); + Set projectIds = new HashSet<>(); + //法规清单 + List pliList = projectLawsInventoryEOService.queryProjectLawsInventoryInfoByStandId(id); + for (ProjectLawsInventoryEO pli : pliList) { + if (!((pli.getDesignFlowStatus().equals(ComplianceFlowStatusEnum.CONFORMITY.getValue()) + || pli.getDesignFlowStatus().equals(ComplianceFlowStatusEnum.UNINVOLVED.getValue())) + && (pli.getVerifyFlowStatus().equals(ComplianceFlowStatusEnum.CONFORMITY.getValue()) + || pli.getVerifyFlowStatus().equals(ComplianceFlowStatusEnum.UNINVOLVED.getValue())))) { + if(StringUtils.isNotBlank(pli.getRegulationOwnerId())){ + addProjectByUser(user2ProjectMap,pli.getRegulationOwnerId(),pli.getProjectLibraryId()); + projectIds.add(pli.getProjectLibraryId()); + } + if(StringUtils.isNotBlank(pli.getDesignDutyId())){ + addProjectByUser(user2ProjectMap,pli.getDesignDutyId(),pli.getProjectLibraryId()); + projectIds.add(pli.getProjectLibraryId()); + } + if(StringUtils.isNotBlank(pli.getVerifyDutyId())){ + addProjectByUser(user2ProjectMap,pli.getVerifyDutyId(),pli.getProjectLibraryId()); + projectIds.add(pli.getProjectLibraryId()); + } + } + } + //认证清单 + List pciList = projectCertificationInventoryEOService.queryProjectCertificationInventoryByStandId(id); + for (ProjectCertificationInventoryEO pci : pciList) { + if ((!pci.getFlowStatus().equals(CertificationInventoryFlowStatusEnum.REVIEW_AND_PASS.getValue()) + || !pci.getFlowStatus().equals(CertificationInventoryFlowStatusEnum.UNINVOLVED.getValue()))) { + if(StringUtils.isNotBlank(pci.getDutyPerson())){ + addProjectByUser(user2ProjectMap,pci.getDutyPerson(),pci.getProjectLibraryId()); + projectIds.add(pci.getProjectLibraryId()); + } + } + } + Map projectNameMap = new HashMap<>(); + List regionList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode()); + List projectList = projectLibraryBaseService.getListByIds(new ArrayList<>(projectIds)); + for (ProjectLibraryBase plb : projectList) { + String market = plb.getTargetMarket(); + List strlist = new LinkedList<>(); + for (String s : market.split(",")) { + List collect = regionList.stream().filter(e -> e.getValue().equals(s)).collect(Collectors.toList()); + if (!collect.isEmpty()) { + strlist.add(collect.get(0).getTextEn()); + } + } + if (!strlist.isEmpty()) { + market = StringUtils.join(strlist, ","); + } + plb.setTargetMarket(market); + projectNameMap.put(plb.getId(),plb.getShowName()); + } + for (String userId : user2ProjectMap.keySet()) { + List userList = new ArrayList<>(); + userList.add(userId); + StringBuilder proSb = new StringBuilder(); + List projectIdList = user2ProjectMap.get(userId); + for (int i = 0; i < projectIdList.size(); i++) { + if (i == projectIdList.size() - 1) { + proSb.append(projectNameMap.get(projectIdList.get(i))); + } else { + proSb.append(projectNameMap.get(projectIdList.get(i))).append(","); + } + } + String contentInfoFei = "The standard " + serialNumber + " in " + proSb.toString() + + " has been modified, please check in time to confirm the impact of the modification."; + String contentInfoFeiCn = proSb.toString() + " 中的标准 " + serialNumber + " 已被修改，请及时查看确认修改影响。"; + try { + //跳转文档详情 + String url = backUrl + "/projectLibrary"; + FeishuMsgVo feishuMsgVo = new FeishuMsgVo(); + feishuMsgVo.setTitle(MessageTypeEnum.READ.getNameCn()+"/"+MessageTypeEnum.READ.getName()); + feishuMsgVo.setUrl(url); + feishuMsgVo.setContentEn(contentInfoFei); + feishuMsgVo.setContent(contentInfoFeiCn); + Map params = new HashMap<>(); + params.put("contentInfoFeiCn",contentInfoFeiCn); + params.put("contentInfoFeiEn",contentInfoFei); + params.put("userIdList",userList); + params.put("back_url",url); + params.put("back_url_phone",backUrlPhone + "/phoneDocumentDetails?id=" + id); + params.put("titleCn",TemplateInfoEnum2.SUBSCRIPTION_INFORM.getNameCn()); + params.put("titleEn",TemplateInfoEnum2.SUBSCRIPTION_INFORM.getNameEn()); + iFeishuService.sendMessageSubscriptionNotification(TemplateInfoEnum2.SUBSCRIPTION_INFORM.getValue(),params); + } catch (Exception e) { + log.error("文档修改飞书消息推送失败"); + } + } + //市场法规清单 + Map> user2DiiMap = new HashMap<>(); + List diiList = dummyInventoryInfoEOService.queryListByStandId(id); + for (DummyInventoryInfoEO dii : diiList) { + if(user2DiiMap.containsKey(dii.getCreatUser())){ + List diiEOList = user2DiiMap.get(dii.getCreatUser()); + diiEOList.add(dii); + }else{ + List diiEOList = new ArrayList<>(); + diiEOList.add(dii); + user2DiiMap.put(dii.getCreatUser(),diiEOList); + } + } + for (String userId : user2DiiMap.keySet()) { + List userList = new ArrayList<>(); + SysUser user = sysUserService.getUserByName(userId); + userList.add(user.getId()); + StringBuilder proSb = new StringBuilder(); + List diiEoList = user2DiiMap.get(userId); + for (int i = 0; i < diiEoList.size(); i++) { + if (i == diiEoList.size() - 1) { + proSb.append(diiEoList.get(i).getDummyInventoryBaseName()); + } else { + proSb.append(diiEoList.get(i).getDummyInventoryBaseName()).append(","); + } + } + String contentInfoFei = "The standard " + serialNumber + " in " + proSb.toString() + + " has been modified, please check in time to confirm the impact of the modification."; + String contentInfoFeiCn = proSb.toString() + " 中的标准 " + serialNumber + " 已被修改，请及时查看确认修改影响。"; + try { + //跳转文档详情 + String url = backUrl + "/virtualList"; + FeishuMsgVo feishuMsgVo = new FeishuMsgVo(); + feishuMsgVo.setTitle(MessageTypeEnum.READ.getNameCn()+"/"+MessageTypeEnum.READ.getName()); + feishuMsgVo.setUrl(url); + feishuMsgVo.setContentEn(contentInfoFei); + feishuMsgVo.setContent(contentInfoFeiCn); + Map params = new HashMap<>(); + params.put("contentInfoFeiCn",contentInfoFeiCn); + params.put("contentInfoFeiEn",contentInfoFei); + params.put("userIdList",userList); + params.put("back_url",url); + params.put("back_url_phone",backUrlPhone + "/phoneDocumentDetails?id=" + id); + params.put("titleCn",TemplateInfoEnum2.SUBSCRIPTION_INFORM.getNameCn()); + params.put("titleEn",TemplateInfoEnum2.SUBSCRIPTION_INFORM.getNameEn()); + iFeishuService.sendMessageSubscriptionNotification(TemplateInfoEnum2.SUBSCRIPTION_INFORM.getValue(),params); + } catch (Exception e) { + log.error("文档修改飞书消息推送失败"); + } + } + //市场认证清单 + + Map> user2AdiiMap = new HashMap<>(); + List adiiList = authDummyInventoryInfoEOService.queryListByStandId(id); + for (AuthDummyInventoryInfoEO adii : adiiList) { + if(user2AdiiMap.containsKey(adii.getCreatUser())){ + List adiiEOList = user2AdiiMap.get(adii.getCreatUser()); + adiiEOList.add(adii); + }else{ + List adiiEOList = new ArrayList<>(); + adiiEOList.add(adii); + user2AdiiMap.put(adii.getCreatUser(),adiiEOList); + } + } + for (String userId : user2AdiiMap.keySet()) { + List userList = new ArrayList<>(); + SysUser user = sysUserService.getUserByName(userId); + userList.add(user.getId()); + StringBuilder proSb = new StringBuilder(); + List diiEoList = user2AdiiMap.get(userId); + for (int i = 0; i < diiEoList.size(); i++) { + if (i == diiEoList.size() - 1) { + proSb.append(diiEoList.get(i).getAuthDummyInventoryBaseName()); + } else { + proSb.append(diiEoList.get(i).getAuthDummyInventoryBaseName()).append(","); + } + } + String contentInfoFei = "The standard " + serialNumber + " in " + proSb.toString() + + " has been modified, please check in time to confirm the impact of the modification."; + String contentInfoFeiCn = proSb.toString() + " 中的标准 " + serialNumber + " 已被修改，请及时查看确认修改影响。"; + try { + //跳转文档详情 + String url = backUrl + "/virtualAuthenticationList"; + FeishuMsgVo feishuMsgVo = new FeishuMsgVo(); + feishuMsgVo.setTitle(MessageTypeEnum.READ.getNameCn()+"/"+MessageTypeEnum.READ.getName()); + feishuMsgVo.setUrl(url); + feishuMsgVo.setContentEn(contentInfoFei); + feishuMsgVo.setContent(contentInfoFeiCn); + Map params = new HashMap<>(); + params.put("contentInfoFeiCn",contentInfoFeiCn); + params.put("contentInfoFeiEn",contentInfoFei); + params.put("userIdList",userList); + params.put("back_url",url); + params.put("back_url_phone",backUrlPhone + "/phoneDocumentDetails?id=" + id); + params.put("titleCn",TemplateInfoEnum2.SUBSCRIPTION_INFORM.getNameCn()); + params.put("titleEn",TemplateInfoEnum2.SUBSCRIPTION_INFORM.getNameEn()); + iFeishuService.sendMessageSubscriptionNotification(TemplateInfoEnum2.SUBSCRIPTION_INFORM.getValue(),params); + } catch (Exception e) { + log.error("文档修改飞书消息推送失败"); + } + } } private void homeDocumentDynamic(String cut, diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEO.java index e6a62aa7c..aef032bf4 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEO.java @@ -339,6 +339,14 @@ public class DummyInventoryInfoEO implements Serializable { @TableField(exist = false) private String firstLevelDutyTerritory; + /**清单名称**/ + @TableField(exist = false) + private String dummyInventoryBaseName; + /**清单创建人**/ + @TableField(exist = false) + private String creatUser; + + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/mapper/DummyInventoryInfoEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/mapper/DummyInventoryInfoEOMapper.java index fe8851a35..e370dbde4 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/mapper/DummyInventoryInfoEOMapper.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/mapper/DummyInventoryInfoEOMapper.java @@ -14,4 +14,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface DummyInventoryInfoEOMapper extends BaseMapper { + List queryListByStandId(String id); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/mapper/xml/DummyInventoryInfoEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/mapper/xml/DummyInventoryInfoEOMapper.xml index 17adb3c5e..4a0d62b99 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/mapper/xml/DummyInventoryInfoEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/mapper/xml/DummyInventoryInfoEOMapper.xml @@ -42,4 +42,18 @@ + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/IDummyInventoryInfoEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/IDummyInventoryInfoEOService.java index 328f29093..b19b030da 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/IDummyInventoryInfoEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/IDummyInventoryInfoEOService.java @@ -106,4 +106,6 @@ public interface IDummyInventoryInfoEOService extends IService queryListByStandId(String id); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java index d8fbb7cfc..a80e799b3 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java @@ -3276,4 +3276,10 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl queryListByStandId(String id) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + List dataList = this.getBaseMapper().queryListByStandId(id); + return dataList; + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryEOService.java index fa799af82..fe012e2f3 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectCertificationInventoryEOService.java @@ -347,4 +347,6 @@ public interface IProjectCertificationInventoryEOService extends IService params); List connectPlatform(String id,String cut); + + List queryProjectCertificationInventoryByStandId(String id); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java index 17828c496..9246a402d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java @@ -104,6 +104,7 @@ public interface IProjectLawsInventoryEOService extends IService queryProjectLawsInventoryInfoById(Map params); + List queryProjectLawsInventoryInfoByStandId(String standId); void copyInfoByIds(String ids,String operateType); 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 5062b405c..b277f7ce0 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 @@ -7515,25 +7515,12 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl queryProjectCertificationInventoryByStandId(String id) { + QueryWrapper wra = new QueryWrapper<>(); + wra.lambda().eq(ProjectCertificationInventoryEO::getBussDocumentLibraryId, id); + return this.list(wra); + } // @Override // public void listPlatform(Map params) { 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 ea558e7ca..635dbae2c 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 @@ -1560,10 +1560,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl docList = bussDocumentLibraryEOService.listByIds(standIdList); for (ProjectLawsInventoryEO projectLawsInventoryEO : list) { //处理编号，法规清单中若状态为符合时则编号标题不再随文档库变化 - if ((!projectLawsInventoryEO.getDesignFlowStatus().equals(ComplianceFlowStatusEnum.CONFORMITY.getValue()) - || !projectLawsInventoryEO.getVerifyFlowStatus().equals(ComplianceFlowStatusEnum.CONFORMITY.getValue()) - || !projectLawsInventoryEO.getDesignFlowStatus().equals(ComplianceFlowStatusEnum.UNINVOLVED.getValue()) - || !projectLawsInventoryEO.getVerifyFlowStatus().equals(ComplianceFlowStatusEnum.UNINVOLVED.getValue())) + if (!((projectLawsInventoryEO.getDesignFlowStatus().equals(ComplianceFlowStatusEnum.CONFORMITY.getValue()) + || projectLawsInventoryEO.getDesignFlowStatus().equals(ComplianceFlowStatusEnum.UNINVOLVED.getValue())) + && + (projectLawsInventoryEO.getVerifyFlowStatus().equals(ComplianceFlowStatusEnum.CONFORMITY.getValue()) + || projectLawsInventoryEO.getVerifyFlowStatus().equals(ComplianceFlowStatusEnum.UNINVOLVED.getValue()))) && StringUtils.isNotBlank(projectLawsInventoryEO.getStandId())) { BussDocumentLibraryEO docObj = null; for (BussDocumentLibraryEO obj : docList) { @@ -2993,6 +2994,13 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl().success("调用成功！"); } + @Override + public List queryProjectLawsInventoryInfoByStandId(String standId) { + QueryWrapper wra = new QueryWrapper<>(); + wra.lambda().eq(ProjectLawsInventoryEO::getStandId, standId); + return this.list(wra); + } + @Override public List queryProjectLawsInventoryInfoById(Map params) {