From c508848729ec640f6e607550295eae8815ec1041 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Fri, 13 Jan 2023 14:38:30 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E8=A7=84=E7=AC=A6=E5=90=88=E6=80=A7?= =?UTF-8?q?=E7=9C=8B=E6=9D=BF--=E8=AF=84=E4=BC=B0=E7=BB=93=E6=9E=9C?= =?UTF-8?q?=E4=B8=AD=E7=9B=B8=E5=85=B3=E9=A1=B9=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/xml/LawsComplianceBoardMapper.xml | 3 +- .../impl/LawsComplianceBoardServiceImpl.java | 48 +++++++++++++++++++ 2 files changed, 50 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/LawsComplianceBoardMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/LawsComplianceBoardMapper.xml index 002a6acae..ba76e12e3 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/LawsComplianceBoardMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/LawsComplianceBoardMapper.xml @@ -99,7 +99,8 @@ pti.verify_person_charge_feedback as "verifyPersonChargeFeedback", plb.studio_engineer as "studioEngineer", plb.target_market as "targetMarket", - pti.id as "projectTaskInventoryId" + pti.id as "projectTaskInventoryId", + plb.project_version as projectVersion FROM project_laws_inventory pli LEFT JOIN project_task_inventory pti ON ( pli.id = pti.project_laws_inventory_id ) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/LawsComplianceBoardServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/LawsComplianceBoardServiceImpl.java index 671006907..a137c5f57 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/LawsComplianceBoardServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/LawsComplianceBoardServiceImpl.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.constant.enums.CutEnum; 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.modules.document.enums.FieldTypeEnum; import com.jero.modules.document.service.IBussDocumentLibraryEOService; @@ -24,7 +25,9 @@ import com.jero.modules.project.mapper.ProjectTaskInventoryDetailEOMapper; import com.jero.modules.project.service.ILawsComplianceBoardService; import com.jero.modules.system.entity.SysCategory; import com.jero.modules.system.entity.SysDictItem; +import com.jero.modules.system.enums.DicCodeEnum; import com.jero.modules.system.service.ISysDictItemService; +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; @@ -72,6 +75,9 @@ public class LawsComplianceBoardServiceImpl implements ILawsComplianceBoardServi @Autowired private ISysUserService sysUserService; + @Autowired + private ISysDictService sysDictService; + @Override public IPage queryPageList(Map params) { int pageNo = Integer.parseInt(params.get("pageNo").toString()); @@ -181,6 +187,20 @@ public class LawsComplianceBoardServiceImpl implements ILawsComplianceBoardServi String cut = (String) params.get("cut"); List> complianceResultList = this.lawsComplianceBoardMapper.queryComplianceResultList(params); if(CollectionUtils.isNotEmpty(complianceResultList)){ + for (Map map : complianceResultList) { + //处理相关项目名称 + String projectName = String.valueOf(map.get("projectName")); + String yearName = String.valueOf(map.get("yearName")); + String targetMarket = String.valueOf(map.get("targetMarket")); + String projectVersion = String.valueOf(map.get("projectVersion")); + List regionList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode()); + targetMarket = getTargetMarket(cut, regionList, targetMarket); + if(ObjectUtils.isEmpty(map.get("projectVersion"))){ + map.put("projectName",projectName+"-"+yearName+"-"+targetMarket); + }else{ + map.put("projectName",projectName+"-"+yearName+"-"+targetMarket+"-"+projectVersion); + } + } List projectLawsInventoryIdList = complianceResultList.stream().map(map-> (String) map.get("id")).collect(Collectors.toList()); QueryWrapper taskDetailQueryWrapper = new QueryWrapper<>(); taskDetailQueryWrapper.lambda().in(ProjectTaskInventoryDetailEO::getProjectTaskInventoryId,projectLawsInventoryIdList); @@ -215,6 +235,34 @@ public class LawsComplianceBoardServiceImpl implements ILawsComplianceBoardServi return result; } + private String getTargetMarket(String cut, List regionList, String targetMarket) { + //适用地区 + List dictModelList = new ArrayList<>(); + String region = ""; + if(com.jero.modules.system.util.StringUtils.isNotBlank(targetMarket)){ + for (String s : targetMarket.split(",")) { + List dictModelListTemp = regionList.stream() + .filter(e -> s.equals(e.getValue())).collect(Collectors.toList()); + dictModelList.addAll(dictModelListTemp); + } + + if(dictModelList.size() != 0){ + StringBuilder sb = new StringBuilder(); + for (DictModel dictModel : dictModelList) { + if(CutEnum.CN.getValue().equals(cut)){ + sb.append(dictModel.getText()+","); + }else{ + sb.append(dictModel.getTextEn()+","); + } + } + if(com.jero.modules.system.util.StringUtils.isNotBlank(sb)){ + region = sb.substring(0,sb.length()-1); + } + } + } + return region; + } + /** * 创建任务清单列表数据 * @param complianceResultList