From dffe45c58b196aaa93fb3066f573525c8d7cd68b Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Fri, 15 Jul 2022 14:19:50 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=9B=9E=E6=BB=9A=E6=A0=B9=E6=8D=AEid?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=96=87=E6=A1=A3=E5=BA=93=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/BussDocumentLibraryEOServiceImpl.java | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) 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 847538ce3..655b5e6f3 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 @@ -450,13 +450,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl { - boolean showFlag = false; - if(YesOrNoEnum.YES.getValue().equals(StringUtils.valueOf(e.getIsQuery())) || e.getDbFieldName().equals("id")){ - showFlag = true; - } - return showFlag; - }).collect(Collectors.toList()); + fieldList = fieldList.stream().filter(e -> YesOrNoEnum.YES.getValue().equals(StringUtils.valueOf(e.getIsQuery()))).collect(Collectors.toList()); if(CutEnum.CN.getValue().equals(cut)){ fieldList = fieldList.stream().filter(e->!"title_en".equals(e.getDbFieldName())).collect(Collectors.toList()); }else{ @@ -3637,8 +3631,6 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl Date: Fri, 15 Jul 2022 14:31:45 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=8A=80=E6=9C=AF?= =?UTF-8?q?=E8=AF=84=E4=BC=B0-=E6=A0=B9=E6=8D=AE=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E5=BA=93id=EF=BC=8C=E6=9F=A5=E8=AF=A2=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E5=BA=93=E6=95=B0=E6=8D=AE=E6=8E=A5=E5=8F=A3=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LawsTechnologyEvaluationEOController.java | 8 +++ .../ILawsTechnologyEvaluationEOService.java | 2 + ...LawsTechnologyEvaluationEOServiceImpl.java | 70 ++++++++++++++++++- 3 files changed, 77 insertions(+), 3 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationEOController.java index fb3f82b0e..5ffbd090c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationEOController.java @@ -210,4 +210,12 @@ public class LawsTechnologyEvaluationEOController extends JeroController> result = this.lawsTechnologyEvaluationEOService.importItemExcel(file,cut,request); return Result.OK(result); } + + @ApiOperation(value="根据id查询明细数据", notes="根据id查询明细数据") + @PostMapping(value = "/queryPageDummyById") + @ResponseBody + public Result queryPageDummyById(@RequestBody Map parameter) { + List> result = this.lawsTechnologyEvaluationEOService.queryPageDummyById(parameter); + return Result.OK(result); + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationEOService.java index 5c4cd6ce8..a0b58fab0 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationEOService.java @@ -86,4 +86,6 @@ public interface ILawsTechnologyEvaluationEOService extends IService> importItemExcel(MultipartFile file, String cut, HttpServletRequest request)throws Exception; + + List> queryPageDummyById(Map parameter); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java index 333d1ad29..97fcc3cb4 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java @@ -28,12 +28,9 @@ import com.jero.modules.system.service.impl.SysDictItemServiceImpl; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; -import org.apache.poi.hssf.usermodel.HSSFCellStyle; -import org.apache.poi.hssf.usermodel.HSSFRichTextString; import org.apache.poi.hssf.usermodel.HSSFSheet; import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.ss.usermodel.*; -import org.apache.poi.ss.util.CellRangeAddress; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -401,6 +398,73 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl> queryPageDummyById(Map parameter) { + String cut = (String) parameter.get("cut");//中英文切换标识 + String id = (String) parameter.get("id"); + //文档库字段 + List fieldList = onlCgformFieldService.getFieldList(ModuleEnum.DOCUMENT_LIBRARY.getValue()); + + List fileFieldStrList = fieldList.stream() + .filter(e -> FieldTypeEnum.FILE.getValue().equals(e.getFieldShowType())).map(OnlCgformField::getDbFieldName) + .collect(Collectors.toList()); + + List> result = this.bussDocumentLibraryEOMapper.queryListByIds(id); + + //树形数据字典 + List categoryList = this.sysCategoryService.list(); + //过滤出树形字段 + List treeFieldList = fieldList.stream() + .filter(e -> FieldTypeEnum.TREE.getValue().equals(e.getFieldShowType())) + .collect(Collectors.toList()); + + //数据字典 + List sysDictItems = this.sysDictItemServiceImpl.selectItemsAll(); + //下拉选处理数据字典 + for (Map record : result) { + Map record1 = (Map) record; + String technology_territory = (String)record1.get("technology_territory"); + + List connectIdList = new ArrayList<>(); + + for (Map.Entry entry : record1.entrySet()) { + //下拉选处理数据字典 + this.bussDocumentLibraryEOService.dictItem(sysDictItems, entry, cut, fieldList,null); + this.bussDocumentLibraryEOService.treeDictItem(categoryList, entry, treeFieldList, cut,null); + if(fileFieldStrList.contains(entry.getKey())){ + if(entry.getValue()!=null){ + connectIdList.add(entry.getValue().toString()); + } + } + } + record1.put("technology_territory_id",technology_territory); + + if(CollectionUtils.isNotEmpty(connectIdList)){ + //根据id查询当前文档库数据是否有拆分数据。 + QueryWrapper splitInfoEOQueryWrapper = new QueryWrapper<>(); + splitInfoEOQueryWrapper.lambda().in(SarFileSplitInfoEO::getConnectId,connectIdList); + List sarFileSplitInfoList = new ArrayList<>(); + + List sarFileSplitInfoListTemp = sarFileSplitInfoService.list(splitInfoEOQueryWrapper); + if (CollectionUtils.isNotEmpty(sarFileSplitInfoListTemp)){ + sarFileSplitInfoListTemp.forEach(splitInfo -> { + //查询出已回传的数据 + String flag = ""; // 1 已回传 0未回传。 + if(StringUtils.isNotEmpty(splitInfo.getFileId())){ + flag = "1"; + sarFileSplitInfoList.add(splitInfo); + }else { + flag = "0"; + } + splitInfo.setFlag(flag); + }); + record1.put("sarFileSplitInfoList",sarFileSplitInfoList); + } + } + } + return result; + } + private String getTreeName(String cut, List categoryList, List technologyTerritoryList) { StringBuilder sb = new StringBuilder(); for (String technologyTerritory : technologyTerritoryList) { From 055f6c14bc91f3e2b5073fb53b3a7f57ab7dfc56 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Fri, 15 Jul 2022 15:14:45 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=8A=80=E6=9C=AF=E8=AF=84=E4=BC=B0=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/initiatingProcess.vue | 16 ++++++++-------- .../components/standardDecompositionSheet.vue | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue index 09874fbdd..63c70236c 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue @@ -347,15 +347,15 @@ id: this.formInline.standId } this.loading = true - let url = '' - if (this.isTrue) { - url = this.url.addModelListOne - } else { - url = this.url.addModelList - } - postAction(url, query).then((res) => { + // let url = '' + // if (this.isTrue) { + // url = this.url.addModelListOne + // } else { + // url = this.url.addModelList + // } + postAction('/lawsTechnologyEvaluation/lawsTechnologyEvaluationEO/queryPageDummyById', query).then((res) => { if (res.success) { - let content = res.result.records || [] + let content = res.result || [] this.selectedRowKeysRecord.push({ standId: content[0].id, serialNumber: content[0].serial_number, diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/standardDecompositionSheet.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/standardDecompositionSheet.vue index 0496bf0a7..6394fc303 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/standardDecompositionSheet.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/standardDecompositionSheet.vue @@ -275,7 +275,7 @@ } .title-text { - width: 33px; + width: 73px; color: #000F16; display: inline-block; font-weight: 500; From 28d9dac6c2d371f53d9d14e1ffc5fbb5ba15eb83 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Fri, 15 Jul 2022 15:51:41 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=8A=80=E6=9C=AF=E8=AF=84=E4=BC=B0=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/businessSupport/technologyAssessment/index.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/jero-web/src/views/businessSupport/technologyAssessment/index.vue b/jero-web/src/views/businessSupport/technologyAssessment/index.vue index 6521ae1c7..93a0137a8 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/index.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/index.vue @@ -382,6 +382,7 @@ id: row.id, processBackground: row.processBackground, serialNumber: row.serialNumber, + lawsTechnologyEvaluationId:row.id, standId: row.standId, remark:row.remark }