From e00968962285adf5e0aee9f8b15662ca4b96fc8c Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 21 Apr 2022 16:17:20 +0800 Subject: [PATCH 01/14] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95-?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DummyInventoryInfoEOController.java | 38 +-- .../dummy/entity/DummyInventoryInfoEO.java | 58 ++--- .../service/IDummyInventoryInfoEOService.java | 11 + .../impl/DummyInventoryInfoEOServiceImpl.java | 235 +++++++++++++++++- 4 files changed, 297 insertions(+), 45 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/controller/DummyInventoryInfoEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/controller/DummyInventoryInfoEOController.java index e5fd702b6..9e90000cb 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/controller/DummyInventoryInfoEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/controller/DummyInventoryInfoEOController.java @@ -1,13 +1,10 @@ package com.jero.modules.dummy.controller; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.constant.enums.CutEnum; import com.jero.common.system.base.controller.JeroController; -import com.jero.common.system.query.QueryGenerator; import com.jero.modules.dummy.entity.DummyInventoryInfoEO; import com.jero.modules.dummy.service.IDummyInventoryInfoEOService; import io.swagger.annotations.Api; @@ -146,16 +143,17 @@ public class DummyInventoryInfoEOController extends JeroController dataList, List categoryList, List dictItemList, @@ -1278,4 +1289,224 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl dataList = new ArrayList<>(); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(dummyInventoryInfoEO,request.getParameterMap()); + if(StringUtils.isNotBlank(dummyInventoryInfoEO.getIds())){ + queryWrapper.in("id",Arrays.asList(dummyInventoryInfoEO.getIds().split(","))); + } + //导出的数据 + dataList = this.list(queryWrapper); + + //文件 + List fileInfos = getOssFiles(dataList); + //数据转换(文件名称,技术领域,对应标准) + dataTransition(dataList, fileInfos); + + OutputStream os = null; + try { + response.setContentType("application/force-download"); + Workbook workbook = new XSSFWorkbook(); + String path = uploadpath + "/tempZip"; + File fileTemp = new File(path); + if (fileTemp.exists()) { + fileTemp.delete(); + } + fileTemp.mkdirs(); + //文件 + exportFile(dataList,fileInfos); + //excel + OutputStream excelOS = new FileOutputStream(path + File.separator + "虚拟清单.xlsx"); + ExportParams exportParams = new ExportParams(); + exportParams.setType(ExcelType.XSSF); + workbook = ExcelExportUtil.exportExcel(exportParams, DummyInventoryInfoEO.class, dataList); + workbook.write(excelOS); + excelOS.flush(); + + ZipUtil.zip(path, path + ".zip"); + //文件 + FileInputStream fis = new FileInputStream(path + ".zip"); + os = response.getOutputStream(); + + int len = 0; + while ((len = fis.read()) != -1) { + os.write(len); + } + os.flush(); + fis.close(); + } catch (IOException e) { + if(CutEnum.CN.getValue().equals(dummyInventoryInfoEO.getCut())){ + throw new JeroBootException("下载文件失败"); + }else{ + throw new JeroBootException("Failed to download file"); + } + } finally { + IOUtils.closeQuietly(os); + File file = new File(uploadpath + "/tempZip"); + FileUtil.deleteContents(file); + } + } + + /** + * 数据转换(文件名称,技术领域,对应标准) + * @param dataList + * @param fileInfos + */ + private void dataTransition(List dataList, List fileInfos) { + //技术领域 + List sysCategoryList = sysCategoryService.list(); + //文档库数据 + List correspondingStandardIdList = new ArrayList<>(); + for (DummyInventoryInfoEO inventoryInfoEO : dataList) { + String correspondingStandard = inventoryInfoEO.getCorrespondingStandard(); + if(StringUtils.isNotBlank(correspondingStandard)){ + correspondingStandardIdList.addAll(Arrays.asList(correspondingStandard.split(","))); + } + } + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.in(BussDocumentLibraryEO::getId,correspondingStandardIdList); + List bussDocumentLibraryEOList = iBussDocumentLibraryEOService.list(lambdaQueryWrapper); + + for (DummyInventoryInfoEO inventoryInfoEO : dataList) { + String correspondingStandard = inventoryInfoEO.getCorrespondingStandard(); + String technologyTerritory = inventoryInfoEO.getTechnologyTerritory(); + String designDeliverableTemplate = inventoryInfoEO.getDesignDeliverableTemplate(); + String prehomoDeliverableTemplate = inventoryInfoEO.getPrehomoDeliverableTemplate(); + String verifyDeliverableTemplate = inventoryInfoEO.getVerifyDeliverableTemplate(); + //对应标准 + if(StringUtils.isNotBlank(correspondingStandard)){ + StringBuilder sb = new StringBuilder(); + for (String s : correspondingStandard.split(",")) { + List collect = bussDocumentLibraryEOList.stream() + .filter(e -> s.equals(e.getId())).collect(Collectors.toList()); + if(collect.size() != 0){ + sb.append(collect.get(0).getSerialNumber() + ","); + }else{ + sb.append(s + ","); + } + } + if(StringUtils.isNotBlank(sb)){ + String substring = sb.substring(0, sb.length() - 1); + inventoryInfoEO.setCorrespondingStandard(substring); + } + } + //技术领域 + if(StringUtils.isNotBlank(technologyTerritory)){ + StringBuilder sb = new StringBuilder(); + for (String s : technologyTerritory.split(",")) { + List collect = sysCategoryList.stream() + .filter(e -> s.equals(e.getId())).collect(Collectors.toList()); + if(collect.size() != 0){ + sb.append(collect.get(0).getName()+","); + } + } + if(StringUtils.isNotBlank(sb)){ + String substring = sb.substring(0, sb.length() - 1); + inventoryInfoEO.setTechnologyTerritory(substring); + } + } + //设计交付物模板 + if(StringUtils.isNotBlank(designDeliverableTemplate)){ + String designDeliverableTemplateName = template(fileInfos, designDeliverableTemplate); + inventoryInfoEO.setDesignDeliverableTemplateName(designDeliverableTemplateName); + } + //设计交付物模板 + if(StringUtils.isNotBlank(prehomoDeliverableTemplate)){ + String prehomoDeliverableTemplateName = template(fileInfos, prehomoDeliverableTemplate); + inventoryInfoEO.setPrehomoDeliverableTemplateName(prehomoDeliverableTemplateName); + + } + //设计交付物模板 + if(StringUtils.isNotBlank(verifyDeliverableTemplate)){ + String verifyDeliverableTemplateName = template(fileInfos, verifyDeliverableTemplate); + inventoryInfoEO.setVerifyDeliverableTemplateName(verifyDeliverableTemplateName); + } + } + } + + /** + * 模板名称转换 + * @param fileInfos + * @param value + * @return + */ + private String template(List fileInfos, String value) { + StringBuilder sb = new StringBuilder(); + for (String s : value.split(",")) { + List collect = fileInfos.stream().filter(e -> s.equals(e.getId())).collect(Collectors.toList()); + if(collect.size() != 0){ + sb.append(collect.get(0).getFileName()+","); + } + } + String substring = ""; + if(StringUtils.isNotBlank(sb)){ + substring = sb.substring(0, sb.length() - 1); + } + return substring; + } + + /** + * 获取文件 + * @param dataList + * @return + */ + private List getOssFiles(List dataList) { + List fileIdList = new ArrayList<>(); + List design = dataList.stream().map(DummyInventoryInfoEO::getDesignDeliverableTemplate).collect(Collectors.toList()); + List prehomo = dataList.stream().map(DummyInventoryInfoEO::getPrehomoDeliverableTemplate).collect(Collectors.toList()); + List verify = dataList.stream().map(DummyInventoryInfoEO::getVerifyDeliverableTemplate).collect(Collectors.toList()); + fileIdList.addAll(design); + fileIdList.addAll(prehomo); + fileIdList.addAll(verify); + + //查询所有的文件 + List fileInfos = new ArrayList<>(); + if(fileIdList.size() != 0){ + fileInfos = iOSSFileService.getFileInfos(StringUtils.join(fileIdList, ",")); + } + return fileInfos; + } + + private void exportFile(List dataList,List fileInfos) throws IOException { + if(fileInfos.size() != 0){ + for (DummyInventoryInfoEO inventoryInfoEO : dataList) { + String designDeliverableTemplate = inventoryInfoEO.getDesignDeliverableTemplate(); + String prehomoDeliverableTemplate = inventoryInfoEO.getPrehomoDeliverableTemplate(); + String verifyDeliverableTemplate = inventoryInfoEO.getVerifyDeliverableTemplate(); + String serialNumber = inventoryInfoEO.getSerialNumber(); + if(StringUtils.isBlank(serialNumber)){ + continue; + } + List designFileList = fileInfos.stream().filter(e -> designDeliverableTemplate.contains(e.getId())).collect(Collectors.toList()); + List prehomoFileList = fileInfos.stream().filter(e -> prehomoDeliverableTemplate.contains(e.getId())).collect(Collectors.toList()); + List verifyFileList = fileInfos.stream().filter(e -> verifyDeliverableTemplate.contains(e.getId())).collect(Collectors.toList()); + List oSSFileList = new ArrayList<>(); + oSSFileList.addAll(designFileList); + oSSFileList.addAll(prehomoFileList); + oSSFileList.addAll(verifyFileList); + if(oSSFileList.size() != 0){ + String fileNowPath = uploadpath + "/tempZip/" + serialNumber; + File file = new File(fileNowPath); + if (file.exists()) { + file.delete(); + } + file.mkdirs(); + for (OSSFile ossFile : oSSFileList) { + String url = ossFile.getUrl(); + copyFile(url, fileNowPath + File.separator + ossFile.getFileName()); + } + } + } + } + } + } From 0e7a4538b0c910543859739c7b595195b00eaed5 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Thu, 21 Apr 2022 16:26:22 +0800 Subject: [PATCH 02/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=AB=98=E7=BA=A7?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E7=9A=84=E4=BC=A0=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 2 ++ jero-web/src/common/lang/zh-cn.js | 2 ++ .../virtualList/components/virtualListDetails.vue | 8 ++++---- .../projectManagement/components/listOfRegulations.vue | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 1aa911c5c..70169359a 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -699,4 +699,6 @@ module.exports = { regulatoryTaskConfirmation:'Regulatory task confirmation', certificationStart:'Certification start', certificationEnd:'Certification end', + directoryName:'Directory name', + batch:'batch', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index f442c1729..9fba3311c 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -703,4 +703,6 @@ module.exports = { regulatoryTaskConfirmation:'法规任务确认', certificationStart:'认证开始', certificationEnd:'认证结束', + directoryName:'目录名称', + batch:'批次', } \ No newline at end of file diff --git a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue index d0263207f..e4289c263 100644 --- a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue +++ b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue @@ -455,13 +455,13 @@ // fieldList | array |✔| 需要查询的列集合示例如下，type类型有:date/datetime/string/int/number fieldList: [ { - type: 'date', + type: '', value: 'shi4Yong4Fan4Wei2', text: this.$t('scopeOfApplication'), dictCode: 'apply_scope'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框 }, { - type: 'date', + type: '', value: 'status', text: this.$t('status'), dictCode: 'state'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框 @@ -472,13 +472,13 @@ text: this.$t('correspondingStandard') }, { - type: 'date', + type: '', value: 'region', text: this.$t('zoneOfApplication'), dictCode: 'region'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框 }, { - type: 'date', + type: '', value: 'implementType', text: this.$t('implementationCategory'), dictCode: 'implement_type'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框 diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index fd6498229..01754cf33 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -519,7 +519,7 @@ export default { text: this.$t('correspondingStandard') }, { - type: 'date', + type: '', value: 'implementType', text: this.$t('implementationCategory'), dictCode: 'implement_type'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框 From 0a64be9cc60bf2f018c31db588a819ac396d44c2 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Thu, 21 Apr 2022 16:53:07 +0800 Subject: [PATCH 03/14] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E7=9A=84=E8=AE=A4=E8=AF=81=E7=9B=AE=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 2 + jero-web/src/common/lang/zh-cn.js | 2 + .../components/virtualListDetails.vue | 2 +- .../projectManagement/components/TaskList.vue | 7 +- .../components/certificationDirectory.vue | 220 ++++++++++++++++++ 5 files changed, 231 insertions(+), 2 deletions(-) create mode 100644 jero-web/src/views/projectManagement/components/certificationDirectory.vue diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 70169359a..770ded951 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -701,4 +701,6 @@ module.exports = { certificationEnd:'Certification end', directoryName:'Directory name', batch:'batch', + uploadTime:'Upload time', + enclosure:'enclosure', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 9fba3311c..0ed991b77 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -705,4 +705,6 @@ module.exports = { certificationEnd:'认证结束', directoryName:'目录名称', batch:'批次', + uploadTime:'上传时间', + enclosure:'附件', } \ No newline at end of file diff --git a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue index e4289c263..cdd9c086b 100644 --- a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue +++ b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue @@ -462,7 +462,7 @@ }, { type: '', - value: 'status', + value: 'state', text: this.$t('status'), dictCode: 'state'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框 }, diff --git a/jero-web/src/views/projectManagement/components/TaskList.vue b/jero-web/src/views/projectManagement/components/TaskList.vue index f909ade5a..6fe7f565c 100644 --- a/jero-web/src/views/projectManagement/components/TaskList.vue +++ b/jero-web/src/views/projectManagement/components/TaskList.vue @@ -53,12 +53,17 @@ > + + + \ No newline at end of file From c8bed232b46446b7f2183a898e680ce65a4ca823 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Thu, 21 Apr 2022 17:13:51 +0800 Subject: [PATCH 04/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E8=AE=A4=E8=AF=81=E4=BB=BB=E5=8A=A1=E8=AE=A1=E5=88=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/virtualListDetails.vue | 2 +- .../components/ProjectDetails.vue | 73 ++++--------------- 2 files changed, 14 insertions(+), 61 deletions(-) diff --git a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue index cdd9c086b..986ad9608 100644 --- a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue +++ b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue @@ -49,7 +49,7 @@ {{$t('standard')}} + v-model="queryParam.serialNumber"> diff --git a/jero-web/src/views/projectManagement/components/ProjectDetails.vue b/jero-web/src/views/projectManagement/components/ProjectDetails.vue index f4eaaa4c7..9e7013fde 100644 --- a/jero-web/src/views/projectManagement/components/ProjectDetails.vue +++ b/jero-web/src/views/projectManagement/components/ProjectDetails.vue @@ -90,59 +90,11 @@
-
+
-
法规清单确认打扫房间十大科技孵化开具收费电视
-
2021-10-13
-
-
- -
- -
-
法规清单确认
-
2021-10-13
-
-
- -
- -
-
法规清单确认
-
2021-10-13
-
-
- -
- -
-
法规清单确认
-
2021-10-13
-
-
- -
- -
-
法规清单确认
-
2021-10-13
-
-
- -
- -
-
法规清单确认
-
2021-10-13
-
-
- -
- -
-
法规清单确认
-
2021-10-13
+
{{item.name}}
+
{{item.time}}
@@ -196,8 +148,9 @@ queryById: 'project/projectLibraryBase/queryById', add: 'project/projectLibraryBase/add', edit: 'project/projectLibraryBase/edit', - queryByprojectId:'project/projectTaskPlanning/queryByprojectId', - } + queryByProjectId: 'project/projectTaskPlanning/queryByProjectId' + }, + regulatoryCertificationTaskPlanList: [] } }, mounted() { @@ -215,12 +168,12 @@ } }) }, - getSetting(){ - getAction(this.url.queryByprojectId, { id: this.$route.query.id }).then((res) => { + getSetting() { + getAction(this.url.queryByProjectId, { projectId: this.$route.query.id }).then((res) => { if (res.success) { - console.log(res) + this.regulatoryCertificationTaskPlanList = res.result || [] } else { - + this.regulatoryCertificationTaskPlanList = [] } }) }, @@ -258,9 +211,9 @@ addModelList() { this.getForm() }, - settingClick(){ - this.$refs.settingListRef.edit() - }, + settingClick() { + this.$refs.settingListRef.edit() + } } } From ba765005961bbb5604cc77bdb729611fba0fc770 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 21 Apr 2022 17:44:13 +0800 Subject: [PATCH 05/14] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dummy/controller/DummyInventoryInfoEOController.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/controller/DummyInventoryInfoEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/controller/DummyInventoryInfoEOController.java index 9e90000cb..22b8a4293 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/controller/DummyInventoryInfoEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/controller/DummyInventoryInfoEOController.java @@ -200,11 +200,7 @@ public class DummyInventoryInfoEOController extends JeroController importData(@RequestParam(value = "file", required = false) MultipartFile file, DummyInventoryInfoEO dummyInventoryInfoEO) { - try { - dummyInventoryInfoEOService.importData(file,dummyInventoryInfoEO); - } catch (Exception e) { - return Result.error("导入失败"); - } + dummyInventoryInfoEOService.importData(file,dummyInventoryInfoEO); return Result.OK("导入成功"); } From 122ecc6ffaffc264cba38909b1dfa79890b45bc7 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Thu, 21 Apr 2022 17:49:48 +0800 Subject: [PATCH 06/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E7=9A=84=E9=BB=98=E8=AE=A4=E6=98=BE=E7=A4=BA=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/ImportFile/index.vue | 12 ++++++++---- jero-web/src/views/documentManage/library/index.vue | 2 +- .../virtualList/components/virtualListDetails.vue | 7 +++++-- .../projectManagement/components/ProjectDetails.vue | 9 +++++++-- .../components/TaskParameterCollection.vue | 5 ++++- .../components/listOfRegulations.vue | 5 ++++- .../components/listOfRelevantPersonnel.vue | 9 +++++---- .../projectManagement/components/settingList.vue | 12 ++---------- 8 files changed, 36 insertions(+), 25 deletions(-) diff --git a/jero-web/src/components/ImportFile/index.vue b/jero-web/src/components/ImportFile/index.vue index 6dff278bb..fb7d3cd1d 100644 --- a/jero-web/src/components/ImportFile/index.vue +++ b/jero-web/src/components/ImportFile/index.vue @@ -4,8 +4,8 @@ class="upload-text" :multiple="false" :headers="tokenHeader" :action="importUrl+'?cut='+cut" - @change="handleImportZip" - accept=".zip"> + @change="handleImport" + :accept="accept"> {{$t('import')}} @@ -28,7 +28,11 @@ isTrue:{ type: Boolean, default: false - } + }, + accept:{ + type: String, + default: '' + }, }, data() { return { @@ -47,7 +51,7 @@ } }, methods: { - handleImportZip(info) { + handleImport(info) { this.spinning = true if (info.file.status !== 'uploading') { console.log(info.file, info.fileList) diff --git a/jero-web/src/views/documentManage/library/index.vue b/jero-web/src/views/documentManage/library/index.vue index 5bda5e60b..c6e4c4b0d 100644 --- a/jero-web/src/views/documentManage/library/index.vue +++ b/jero-web/src/views/documentManage/library/index.vue @@ -25,7 +25,7 @@ {{$t('templateDownload')}}
- +
diff --git a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue index 986ad9608..399543c6b 100644 --- a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue +++ b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue @@ -88,7 +88,7 @@ {{$t('DocumentStandard')}}
- +
@@ -304,7 +304,7 @@ title: this.$t('correspondingStandard'), align: 'center', ellipsis: true, - dataIndex: 'correspondingStandard_dictText' + dataIndex: 'correspondingStandardName' }, { title: this.$t('zoneOfApplication'), @@ -622,6 +622,9 @@ } }) }, + getPersonnelList(){ + this.getList() + }, batSettingList() { this.getList() }, diff --git a/jero-web/src/views/projectManagement/components/ProjectDetails.vue b/jero-web/src/views/projectManagement/components/ProjectDetails.vue index 9e7013fde..421540153 100644 --- a/jero-web/src/views/projectManagement/components/ProjectDetails.vue +++ b/jero-web/src/views/projectManagement/components/ProjectDetails.vue @@ -123,7 +123,7 @@ - +
@@ -148,7 +148,9 @@ queryById: 'project/projectLibraryBase/queryById', add: 'project/projectLibraryBase/add', edit: 'project/projectLibraryBase/edit', - queryByProjectId: 'project/projectTaskPlanning/queryByProjectId' + queryByProjectId: 'project/projectTaskPlanning/queryByProjectId', + addSettingUrl:'project/projectTaskPlanning/add', + editSettingUrl:'project/projectTaskPlanning/edit', }, regulatoryCertificationTaskPlanList: [] } @@ -177,6 +179,9 @@ } }) }, + settingListForm(){ + this.getSetting() + }, mainEcharts() { var myChart = echarts.init(document.getElementById('main')) myChart.setOption({ diff --git a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue index 57b5574e0..3c61dbeb6 100644 --- a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue +++ b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue @@ -29,7 +29,7 @@ {{$t('templateDownload')}}
- +
@@ -145,6 +145,9 @@ }, handleDel(){ + }, + getPersonnelList(){ + }, }, } diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 01754cf33..e363f6ae0 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -65,7 +65,7 @@
- +
@@ -701,6 +701,9 @@ export default { } }) }, + getPersonnelList(){ + this.getList() + }, initiateListConfirmationcClick() { if (this.selectedRowKeys && this.selectedRowKeys.length > 0) { let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys)) diff --git a/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue b/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue index 3d7e39d46..2e3a46ebf 100644 --- a/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue +++ b/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue @@ -18,7 +18,7 @@ {{$t('export')}}
- +
{ + postAction(this.url.editSettingUrl, query).then((res) => { if (res.success) { this.$message.success(this.$t('OperationSuccessful')) this.visible = false this.confirmLoading = false - this.$emit('batSettingList') + this.$emit('settingListForm') } else { this.$message.warning(this.$t('operationFailed')) this.confirmLoading = false @@ -183,12 +181,6 @@ this.formInline = {} this.visible = false }, - handleInput(value) { - this.$nextTick(() => { - this.formInline = { ...this.formInline } - this.$refs.ruleForm.validateField([value]) - }) - }, dateChange(item) { this.formInline[item.db_field_name] = this.formInline[item.db_field_name] ? moment(this.formInline[item.db_field_name]).format('YYYY-MM-DD') : '' } From 402694f6d937cb24026562c06a74746a6b467113 Mon Sep 17 00:00:00 2001 From: xiejunyu Date: Thu, 21 Apr 2022 17:58:17 +0800 Subject: [PATCH 07/14] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E8=AE=A1=E5=88=92=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ProjectTaskPlanningController.java | 10 +++++----- .../project/service/IProjectTaskPlanningService.java | 2 +- .../service/impl/ProjectTaskPlanningServiceImpl.java | 5 +++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectTaskPlanningController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectTaskPlanningController.java index c7a504ef0..7dc8eb7cc 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectTaskPlanningController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectTaskPlanningController.java @@ -68,9 +68,9 @@ public class ProjectTaskPlanningController extends JeroController> queryList() { - List list = projectTaskPlanningService.queryList(); - return Result.OK(list); + public Result queryList(@RequestParam(name="projectId",required=true) String projectId) { + ProjectTaskPlanning projectTaskPlanning = projectTaskPlanningService.queryList(projectId); + return Result.OK(projectTaskPlanning); } /** @@ -137,8 +137,8 @@ public class ProjectTaskPlanningController extends JeroController queryById(@RequestParam(name="id",required=true) String projectId) { + @GetMapping(value = "/queryByProjectId") + public Result queryByProjectId(@RequestParam(name="projectId",required=true) String projectId) { List projectTaskPlanning = projectTaskPlanningService.queryByProjectId(projectId); if(projectTaskPlanning==null) { return Result.error("未找到对应数据"); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectTaskPlanningService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectTaskPlanningService.java index fb5564f53..a084d82f7 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectTaskPlanningService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectTaskPlanningService.java @@ -59,5 +59,5 @@ public interface IProjectTaskPlanningService extends IService queryList(); + ProjectTaskPlanning queryList(String projectId); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskPlanningServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskPlanningServiceImpl.java index 81e944a71..29bc183a3 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskPlanningServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskPlanningServiceImpl.java @@ -138,7 +138,8 @@ public class ProjectTaskPlanningServiceImpl extends ServiceImpl queryList() { - return list(); + public ProjectTaskPlanning queryList(String projectId) { + ProjectTaskPlanning projectTaskPlanning = projectTaskPlanningMapper.getByProjectId(projectId); + return projectTaskPlanning; } } From 479f46b772ec17c4e60d948f0ee2de6c2cb8aedf Mon Sep 17 00:00:00 2001 From: liyawei Date: Thu, 21 Apr 2022 18:22:32 +0800 Subject: [PATCH 08/14] =?UTF-8?q?websocket=E5=BC=82=E5=B8=B8[TEXT=5FFULL?= =?UTF-8?q?=5FWRITING]=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/message/websocket/WebSocket.java | 33 +++++++++++-------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/websocket/WebSocket.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/websocket/WebSocket.java index 910cc459b..3edaa541d 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/websocket/WebSocket.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/websocket/WebSocket.java @@ -1,8 +1,11 @@ package com.jero.modules.message.websocket; -import java.util.HashMap; -import java.util.Map; -import java.util.concurrent.CopyOnWriteArraySet; +import com.alibaba.fastjson.JSONObject; +import com.jero.boot.starter.redis.client.JeroRedisClient; +import com.jero.common.base.BaseMap; +import com.jero.common.constant.WebsocketConst; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; import javax.annotation.Resource; import javax.websocket.OnClose; @@ -11,15 +14,10 @@ import javax.websocket.OnOpen; import javax.websocket.Session; import javax.websocket.server.PathParam; import javax.websocket.server.ServerEndpoint; - -import com.jero.boot.starter.redis.client.JeroRedisClient; -import com.jero.common.base.BaseMap; -import com.jero.common.constant.WebsocketConst; -import org.springframework.stereotype.Component; - -import com.alibaba.fastjson.JSONObject; - -import lombok.extern.slf4j.Slf4j; +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; +import java.util.concurrent.CopyOnWriteArraySet; /** * @Author scott @@ -78,7 +76,7 @@ public class WebSocket { if (session != null && session.isOpen()) { try { log.info("【websocket消息】 单点消息:" + message); - session.getAsyncRemote().sendText(message); + session.getBasicRemote().sendText(message); } catch (Exception e) { e.printStackTrace(); } @@ -90,7 +88,14 @@ public class WebSocket { */ public void pushMessage(String message) { try { - webSockets.forEach(ws -> ws.session.getAsyncRemote().sendText(message)); + for (WebSocket ws : webSockets) { + try { + ws.session.getBasicRemote().sendText(message); + } catch (IOException e) { + e.printStackTrace(); + continue; + } + } } catch (Exception e) { e.printStackTrace(); } From 4b90f6308b5bb144d1ad8e823fbd6457df09c89a Mon Sep 17 00:00:00 2001 From: liyawei Date: Thu, 21 Apr 2022 18:23:19 +0800 Subject: [PATCH 09/14] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF-=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cert/template/controller/ParamsTemplateEOController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsTemplateEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsTemplateEOController.java index 8c3a45679..86dc3537d 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsTemplateEOController.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsTemplateEOController.java @@ -57,7 +57,7 @@ public class ParamsTemplateEOController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(paramsTemplateEO, req.getParameterMap()); LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.like(StringUtils.isNotEmpty(paramsTemplateEO.getParamsTemplateName()), ParamsTemplateEO::getParamsTemplateName, paramsTemplateEO.getParamsTemplateName()) - .like(StringUtils.isNotEmpty(paramsTemplateEO.getDescription()), ParamsTemplateEO::getDescription, paramsTemplateEO.getDescription()) + .eq(StringUtils.isNotEmpty(paramsTemplateEO.getRegion()), ParamsTemplateEO::getRegion, paramsTemplateEO.getRegion()) .eq(StringUtils.isNotEmpty(paramsTemplateEO.getState()), ParamsTemplateEO::getState, paramsTemplateEO.getState()) .orderByDesc(ParamsTemplateEO::getUpdateTime); Page page = new Page(pageNo, pageSize); From 714efbcf08c361891c7be16aa020aafaa66ed4c9 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Thu, 21 Apr 2022 18:35:25 +0800 Subject: [PATCH 10/14] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=B3=95=E8=A7=84/?= =?UTF-8?q?=E8=AE=A4=E8=AF=81=E4=BB=BB=E5=8A=A1=E8=AE=A1=E5=88=92=E3=80=81?= =?UTF-8?q?=E8=AE=BE=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/ImportFile/index.vue | 2 +- .../components/ProjectDetails.vue | 22 +++++++++----- .../components/listOfRelevantPersonnel.vue | 2 +- .../components/settingList.vue | 30 ++++++++++++++----- 4 files changed, 39 insertions(+), 17 deletions(-) diff --git a/jero-web/src/components/ImportFile/index.vue b/jero-web/src/components/ImportFile/index.vue index fb7d3cd1d..b949dc0b7 100644 --- a/jero-web/src/components/ImportFile/index.vue +++ b/jero-web/src/components/ImportFile/index.vue @@ -37,7 +37,7 @@ data() { return { tokenHeader: {'X-Access-Token': Vue.ls.get(ACCESS_TOKEN)}, - importUrl: window._CONFIG['domianURL'] + this.url.importZipUrl, + importUrl: window._CONFIG['domianURL'] +'/'+ this.url.importZipUrl, cut: '', } }, diff --git a/jero-web/src/views/projectManagement/components/ProjectDetails.vue b/jero-web/src/views/projectManagement/components/ProjectDetails.vue index 421540153..acca2d371 100644 --- a/jero-web/src/views/projectManagement/components/ProjectDetails.vue +++ b/jero-web/src/views/projectManagement/components/ProjectDetails.vue @@ -100,7 +100,7 @@
- +
@@ -149,8 +149,9 @@ add: 'project/projectLibraryBase/add', edit: 'project/projectLibraryBase/edit', queryByProjectId: 'project/projectTaskPlanning/queryByProjectId', - addSettingUrl:'project/projectTaskPlanning/add', - editSettingUrl:'project/projectTaskPlanning/edit', + addSettingUrl: 'project/projectTaskPlanning/add', + editSettingUrl: 'project/projectTaskPlanning/edit', + settingQueryForm: '/project/projectTaskPlanning/list' }, regulatoryCertificationTaskPlanList: [] } @@ -179,8 +180,8 @@ } }) }, - settingListForm(){ - this.getSetting() + settingListForm() { + this.getSetting() }, mainEcharts() { var myChart = echarts.init(document.getElementById('main')) @@ -273,7 +274,6 @@ .process-content { margin-top: 4px; - height: 60px; position: relative; .process-content-content { @@ -293,13 +293,14 @@ font-size: 14px; font-weight: 400; color: #040B29; - max-width: 94px; + max-width: 155px; text-overflow: ellipsis; white-space: nowrap; overflow: hidden; } .process-content-right-button { + max-width: 155px; font-size: 12px; font-weight: 400; color: #6F7385; @@ -318,7 +319,7 @@ } .process-content-right-xian { - height: 1px; + height: 2px; width: calc(100% - 27px); background: #E6E6E9; position: absolute; @@ -353,8 +354,13 @@ .process-content-right-top { max-width: 70px !important; + white-space: inherit !important; + overflow: hidden !important; } + .process-content-right-button { + max-width: 70px !important; + } } .text-field-right-color { diff --git a/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue b/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue index 2e3a46ebf..39cad2064 100644 --- a/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue +++ b/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue @@ -246,7 +246,7 @@ list: '/project/projectRelatedPersonnel/list', edit: '/project/projectRelatedPersonnel/edit', exportData: '/project/projectRelatedPersonnel/exportXls', - importZipUrl:'project/projectRelatedPersonnel/importExcel', + importZipUrl:'/project/projectRelatedPersonnel/importExcel', }, selectedRowKeys: [] } diff --git a/jero-web/src/views/projectManagement/components/settingList.vue b/jero-web/src/views/projectManagement/components/settingList.vue index 6584d4d82..619dee8e4 100644 --- a/jero-web/src/views/projectManagement/components/settingList.vue +++ b/jero-web/src/views/projectManagement/components/settingList.vue @@ -135,7 +135,7 @@ + + + \ No newline at end of file diff --git a/jero-web/src/views/parameter/template.vue b/jero-web/src/views/parameter/template.vue new file mode 100644 index 000000000..bb70bffa8 --- /dev/null +++ b/jero-web/src/views/parameter/template.vue @@ -0,0 +1,396 @@ + + + + + \ No newline at end of file From aef19b32b392517f8878b5fdce0a165c6b09971f Mon Sep 17 00:00:00 2001 From: xiejunyu Date: Thu, 21 Apr 2022 18:59:35 +0800 Subject: [PATCH 12/14] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E8=AE=A1=E5=88=92=E8=AE=BE=E7=BD=AE=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectLibraryBaseController.java | 3 +- .../service/IProjectLibraryBaseService.java | 3 +- .../impl/ProjectLibraryBaseServiceImpl.java | 7 +- .../impl/ProjectTaskPlanningServiceImpl.java | 90 ++++++++++++------- 4 files changed, 67 insertions(+), 36 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java index b8db3e277..dec40b212 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java @@ -16,6 +16,7 @@ import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.text.ParseException; import java.util.Arrays; import java.util.List; import java.util.Map; @@ -70,7 +71,7 @@ public class ProjectLibraryBaseController extends JeroController add(@Validated @RequestBody ProjectLibraryBase projectLibraryBase) { + public Result add(@Validated @RequestBody ProjectLibraryBase projectLibraryBase) throws ParseException { projectLibraryBaseService.add(projectLibraryBase); return Result.OK("添加成功！"); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryBaseService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryBaseService.java index a1696c568..dedae398b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryBaseService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryBaseService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.jero.modules.project.entity.ProjectLibraryBase; +import java.text.ParseException; import java.util.List; import java.util.Map; @@ -21,7 +22,7 @@ public interface IProjectLibraryBaseService extends IService * @param projectLibraryBase * @return */ - void add(ProjectLibraryBase projectLibraryBase); + void add(ProjectLibraryBase projectLibraryBase) throws ParseException; /** * 更新 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java index 501162bc0..c0a79ebdb 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java @@ -18,6 +18,7 @@ import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.text.ParseException; import java.util.*; import java.util.stream.Collectors; @@ -40,6 +41,8 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl timeNodeVOS = new ArrayList<>(); TimeNodeVO listConfirmationVO = new TimeNodeVO(); - listConfirmationVO.setName(ProjectTaskPlanningNameEnum.LIST_CONFIRMATION.getName()); - listConfirmationVO.setTime(projectTaskPlanning.getListConfirmation()); - timeNodeVOS.add(listConfirmationVO); - TimeNodeVO legalTaskConfirmationVO = new TimeNodeVO(); - legalTaskConfirmationVO.setName(ProjectTaskPlanningNameEnum.LEGAL_TASK_CONFIRMATION.getName()); - legalTaskConfirmationVO.setTime(projectTaskPlanning.getLegalTaskConfirmation()); - timeNodeVOS.add(legalTaskConfirmationVO); - - TimeNodeVO designDeadlineVO = new TimeNodeVO(); - designDeadlineVO.setName(ProjectTaskPlanningNameEnum.DESIGN_DEADLINE.getName()); - designDeadlineVO.setTime(projectTaskPlanning.getDesignDeadline()); - timeNodeVOS.add(designDeadlineVO); - - TimeNodeVO prehomoDeadlineVO = new TimeNodeVO(); - prehomoDeadlineVO.setName(ProjectTaskPlanningNameEnum.PREHOMO_DEADLINE.getName()); - prehomoDeadlineVO.setTime(projectTaskPlanning.getPrehomoDeadline()); - timeNodeVOS.add(prehomoDeadlineVO); - - TimeNodeVO attestationStartTimeVO = new TimeNodeVO(); - attestationStartTimeVO.setName(ProjectTaskPlanningNameEnum.ATTESTATION_START_TIME.getName()); - attestationStartTimeVO.setTime(projectTaskPlanning.getAttestationStartTime()); - timeNodeVOS.add(attestationStartTimeVO); - - TimeNodeVO attestationEndTimeVO = new TimeNodeVO(); - attestationEndTimeVO.setName(ProjectTaskPlanningNameEnum.ATTESTATION_END_TIME.getName()); - attestationEndTimeVO.setTime(projectTaskPlanning.getAttestationEndTime()); - timeNodeVOS.add(attestationEndTimeVO); - - TimeNodeVO verifyDeadlineVO = new TimeNodeVO(); - verifyDeadlineVO.setName(ProjectTaskPlanningNameEnum.VERIFY_DEADLINE.getName()); - verifyDeadlineVO.setTime(projectTaskPlanning.getVerifyDeadline()); - timeNodeVOS.add(verifyDeadlineVO); + if(StringUtils.isNotBlank(projectTaskPlanning.getListConfirmation().toString())) { + listConfirmationVO.setName(ProjectTaskPlanningNameEnum.LIST_CONFIRMATION.getName()); + listConfirmationVO.setTime(projectTaskPlanning.getListConfirmation()); + timeNodeVOS.add(listConfirmationVO); + } + if(!StringUtils.isEmpty(projectTaskPlanning.getLegalTaskConfirmation().toString())) { + TimeNodeVO legalTaskConfirmationVO = new TimeNodeVO(); + legalTaskConfirmationVO.setName(ProjectTaskPlanningNameEnum.LEGAL_TASK_CONFIRMATION.getName()); + legalTaskConfirmationVO.setTime(projectTaskPlanning.getLegalTaskConfirmation()); + timeNodeVOS.add(legalTaskConfirmationVO); + } + if(StringUtils.isNotBlank(projectTaskPlanning.getDesignDeadline().toString())) { + TimeNodeVO designDeadlineVO = new TimeNodeVO(); + designDeadlineVO.setName(ProjectTaskPlanningNameEnum.DESIGN_DEADLINE.getName()); + designDeadlineVO.setTime(projectTaskPlanning.getDesignDeadline()); + timeNodeVOS.add(designDeadlineVO); + } + if(StringUtils.isNotBlank(projectTaskPlanning.getPrehomoDeadline().toString())) { + TimeNodeVO prehomoDeadlineVO = new TimeNodeVO(); + prehomoDeadlineVO.setName(ProjectTaskPlanningNameEnum.PREHOMO_DEADLINE.getName()); + prehomoDeadlineVO.setTime(projectTaskPlanning.getPrehomoDeadline()); + timeNodeVOS.add(prehomoDeadlineVO); + } + if(StringUtils.isNotBlank(projectTaskPlanning.getAttestationStartTime().toString())) { + TimeNodeVO attestationStartTimeVO = new TimeNodeVO(); + attestationStartTimeVO.setName(ProjectTaskPlanningNameEnum.ATTESTATION_START_TIME.getName()); + attestationStartTimeVO.setTime(projectTaskPlanning.getAttestationStartTime()); + timeNodeVOS.add(attestationStartTimeVO); + } + if(StringUtils.isNotBlank(projectTaskPlanning.getAttestationEndTime().toString())) { + TimeNodeVO attestationEndTimeVO = new TimeNodeVO(); + attestationEndTimeVO.setName(ProjectTaskPlanningNameEnum.ATTESTATION_END_TIME.getName()); + attestationEndTimeVO.setTime(projectTaskPlanning.getAttestationEndTime()); + timeNodeVOS.add(attestationEndTimeVO); + } + if(StringUtils.isNotBlank(projectTaskPlanning.getVerifyDeadline().toString())) { + TimeNodeVO verifyDeadlineVO = new TimeNodeVO(); + verifyDeadlineVO.setName(ProjectTaskPlanningNameEnum.VERIFY_DEADLINE.getName()); + verifyDeadlineVO.setTime(projectTaskPlanning.getVerifyDeadline()); + timeNodeVOS.add(verifyDeadlineVO); + } // 排序 Collections.sort(timeNodeVOS, listConfirmationVO); @@ -142,4 +154,18 @@ public class ProjectTaskPlanningServiceImpl extends ServiceImpl Date: Thu, 21 Apr 2022 19:02:37 +0800 Subject: [PATCH 13/14] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93-=E6=B3=95?= =?UTF-8?q?=E8=A7=84=E6=B8=85=E5=8D=95=E8=A1=A8-=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E8=B0=83=E7=94=A8=20=E5=A4=84=E7=90=86=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E6=95=B0=E6=8D=AE=20=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/config/shiro/ShiroConfig.java | 2 + .../ProjectLawsInventoryEOController.java | 14 ++++++ .../entity/ProjectLawsInventoryEO.java | 4 +- .../project/enums/OperatorTypeEnum.java | 8 ++++ .../project/enums/RequestSourceEnum.java | 43 +++++++++++++++++++ .../project/job/InventoryAffirmJob.java | 2 +- .../IProjectLawsInventoryEOService.java | 8 ++++ .../ProjectLawsInventoryEOServiceImpl.java | 39 ++++++++++++++++- 8 files changed, 116 insertions(+), 4 deletions(-) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/RequestSourceEnum.java diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java index 6db7c1945..1bc155e90 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java +++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java @@ -139,6 +139,8 @@ public class ShiroConfig { filterChainDefinitionMap.put("/opensso/**", "anon"); //单点登录 + filterChainDefinitionMap.put("/project/projectLawsInventoryEO/processCall", "anon"); // 项目库-法规清单 工作流处理数据接口排除 + // 添加自己的过滤器并且取名为jwt Map filterMap = new HashMap(1); //如果cloudServer为空 则说明是单体 需要加载跨域配置 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java index eb62adacb..ce518e310 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java @@ -5,6 +5,8 @@ import java.util.List; import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + +import com.alibaba.fastjson.JSONObject; import com.jero.common.api.vo.Result; import com.jero.common.system.query.QueryGenerator; import com.jero.modules.project.entity.ProjectLawsInventoryEO; @@ -192,4 +194,16 @@ public class ProjectLawsInventoryEOController extends JeroController processCall(@RequestBody JSONObject jsonObject){ + return this.projectLawsInventoryEOService.processCall(jsonObject); + } + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java index 898193217..d91a25ee8 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java @@ -326,12 +326,12 @@ public class ProjectLawsInventoryEO implements Serializable { /**法规工程师提交状态 ：0通过 1驳回 */ @ApiModelProperty(value = "法规工程师提交状态") - @TableField(updateStrategy = FieldStrategy.IGNORED) +// @TableField(updateStrategy = FieldStrategy.IGNORED) private String regulationOwnerSubmitStatus; //这两个只要有一个是拒绝 那么该数据的清单确认状态就为拒绝 /**认证工程师提交状态 ：0通过 1驳回 */ @ApiModelProperty(value = "认证工程师提交状态") - @TableField(updateStrategy = FieldStrategy.IGNORED) +// @TableField(updateStrategy = FieldStrategy.IGNORED) private String homologationEngineerSubmitStatus; @TableField(exist = false) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/OperatorTypeEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/OperatorTypeEnum.java index d17ed6bc1..c1ba47c5f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/OperatorTypeEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/OperatorTypeEnum.java @@ -6,6 +6,14 @@ package com.jero.modules.project.enums; public enum OperatorTypeEnum { INVENTORY_AFFIRM("清单确认，studio工程师发起","0"), SUBMIT_OR_REJECTED("法规、认证工程师提交或拒绝","1"), + + /** + * 工作流调用后台操作类型 + */ + ADD("添加","add"), + UPDATE_STATUS("修改状态","updateStatus"), + DELETE("删除","delete"), + QUERY("查询","query"), ; String name; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/RequestSourceEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/RequestSourceEnum.java new file mode 100644 index 000000000..07584e6f4 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/RequestSourceEnum.java @@ -0,0 +1,43 @@ +package com.jero.modules.project.enums; + +/** + * 请求来源枚举类 + */ +public enum RequestSourceEnum { + WORK_FLOW("工作流后台","workFlow"), + ; + + String name; + String value; + + private RequestSourceEnum(String name, String value) { + this.name = name; + this.value = value; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public static String getTextByValue(String value) { + RequestSourceEnum[] values = values(); + for (RequestSourceEnum requestSourceEnum : values) { + if (requestSourceEnum.value.equals(value)) { + return requestSourceEnum.name; + } + } + return null; + } +} 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 166c9eab0..eff8ac413 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 @@ -78,7 +78,7 @@ public class InventoryAffirmJob implements Job { for (ProjectLibraryBase projectLibraryBase : projectLibraryBaseList) { QueryWrapper projectNameInfoEOQueryWrapper = new QueryWrapper<>(); - projectNameInfoEOQueryWrapper.lambda().eq(ProjectNameInfoEO::getId,projectLibraryBase.getProjectName()); + projectNameInfoEOQueryWrapper.lambda().eq(ProjectNameInfoEO::getId,projectLibraryBase.getProjectNameId()); ProjectNameInfoEO projectNameInfoEO = projectNameInfoEOMapper.selectOne(projectNameInfoEOQueryWrapper); List threeDaysUserIdList = new ArrayList<>(); 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 a94b417ec..74144b866 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 @@ -1,5 +1,6 @@ package com.jero.modules.project.service; +import com.alibaba.fastjson.JSONObject; import com.jero.common.api.vo.Result; import com.jero.modules.project.entity.ProjectLawsInventoryEO; import com.baomidou.mybatisplus.extension.service.IService; @@ -78,4 +79,11 @@ public interface IProjectLawsInventoryEOService extends IService matchRelevantPeople(Map params); + + /** + * 流程调用 + * @param jsonObject + * @return + */ + Result processCall(JSONObject jsonObject); } 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 33e115801..d800e755a 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 @@ -571,7 +571,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl projectNameInfoEOQueryWrapper = new QueryWrapper<>(); - projectNameInfoEOQueryWrapper.lambda().eq(ProjectNameInfoEO::getId,projectLibraryBase.getProjectName()); + projectNameInfoEOQueryWrapper.lambda().eq(ProjectNameInfoEO::getId,projectLibraryBase.getProjectNameId()); ProjectNameInfoEO projectNameInfoEO = projectNameInfoEOMapper.selectOne(projectNameInfoEOQueryWrapper); //消息内容 @@ -865,4 +865,41 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl processCall(JSONObject jsonObject) { + String requestSource = jsonObject.getString("requestSource"); + if(StringUtils.isEmpty(requestSource)){ + throw new JeroBootException("请求来源不能为空！"); + } + if(!StringUtils.equals(requestSource,RequestSourceEnum.WORK_FLOW.getValue())){ + throw new JeroBootException("来源有误，没有权限调用该接口！"); + } + + String operatorType = jsonObject.getString("operatorType"); + if(StringUtils.isEmpty(operatorType)){ + throw new JeroBootException("操作类型不能为空！"); + } + + if(StringUtils.equals(operatorType,OperatorTypeEnum.UPDATE_STATUS.getValue())){ + ProjectLawsInventoryEO projectLawsInventoryEO = JSONObject.parseObject(jsonObject.toString(), ProjectLawsInventoryEO.class); + this.baseMapper.updateById(projectLawsInventoryEO); + } + if(StringUtils.equals(operatorType,OperatorTypeEnum.ADD.getValue())){ + + } + if(StringUtils.equals(operatorType,OperatorTypeEnum.DELETE.getValue())){ + + } + if(StringUtils.equals(operatorType,OperatorTypeEnum.QUERY.getValue())){ + + } + + return new Result<>().success("调用成功！"); + } } From 0beb2e7d3a5020c2de75d42b812cb7203681c6ce Mon Sep 17 00:00:00 2001 From: xiejunyu Date: Thu, 21 Apr 2022 19:02:51 +0800 Subject: [PATCH 14/14] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E8=AE=A1=E5=88=92=E8=AE=BE=E7=BD=AE=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ProjectTaskPlanningServiceImpl.java | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskPlanningServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskPlanningServiceImpl.java index db3533eae..72bff50c7 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskPlanningServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskPlanningServiceImpl.java @@ -13,7 +13,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.text.ParseException; -import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Collections; import java.util.Date; @@ -158,14 +157,14 @@ public class ProjectTaskPlanningServiceImpl extends ServiceImpl