From a8131c1716125b26af7181721661b3a3a36e5a89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= Date: Mon, 3 Apr 2023 10:38:18 +0800 Subject: [PATCH 01/14] =?UTF-8?q?=E8=BD=A6=E5=9E=8B=E5=8F=8A=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=A4=87=E6=A1=88-=E7=8E=B0=E5=9C=A8=E5=8D=87?= =?UTF-8?q?=E7=BA=A7=E8=A6=81=E6=B1=82-=E7=BF=BB=E8=AF=91=E6=8D=A2?= =?UTF-8?q?=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vehicleinformation/components/upgradeRequirements.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue index 621c91ba3..f94553c1b 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/upgradeRequirements.vue @@ -9,7 +9,7 @@ {{$t('templateDownload')}} - @@ -369,4 +369,8 @@ button { color: #00B3BE; border-color: #00B3BE; } + +.table { + white-space: break-spaces; +} \ No newline at end of file From 977940e5c5c364d496e1291d0db2c7ec4d6b735c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Mon, 3 Apr 2023 10:41:34 +0800 Subject: [PATCH 02/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E6=B8=85=E5=8D=95-=E7=BC=96=E8=BE=91-=E5=88=87=E6=8D=A2?= =?UTF-8?q?=E8=87=B3=E6=9C=89=E4=BA=BA=E5=91=98=E7=9A=84=E8=B4=A3=E4=BB=BB?= =?UTF-8?q?=E9=A2=86=E5=9F=9F=EF=BC=8C=E8=B4=A3=E4=BB=BB=E4=BA=BA=E6=B2=A1?= =?UTF-8?q?=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../certificationList/components/addModel.vue | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue index fb7c4627c..d881e97b0 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue @@ -457,7 +457,7 @@ :query="{db_field_name:'dutyPerson',db_field_txt:$t('personLiable')}" :personneQuery="formInline" :isSingleChoice="true" - v-if="visible" + v-if="personnelVisible" @change="PersonnelSelectionChange" :disabled="disabled" v-model="formInline.dutyPersonName"/> @@ -509,6 +509,7 @@ formInline: {}, confirmLoading: false, visible: false, + personnelVisible:false, yearNameDataList: [], rules: { serialNumber: [ @@ -631,6 +632,7 @@ addModel() { this.visible = true + this.personnelVisible = true this.title = this.$t('add') this.formInline = {} this.getRegulationNo() @@ -643,6 +645,7 @@ editModel(value) { this.formInline = {} this.visible = true + this.personnelVisible = true this.formInline = JSON.parse(JSON.stringify(value)) // if (this.formInline.deliverableType) { // this.formInline.deliverableType = this.formInline.deliverableType.split(',') @@ -659,6 +662,7 @@ }, handleCancel() { this.visible = false + this.personnelVisible = false }, handleSubmit() { this.$refs.ruleForm.validate(valid => { @@ -709,6 +713,7 @@ this.$message.success(this.$t('OperationSuccessful')) } this.visible = false + this.personnelVisible = false this.$emit('addModelForm') } else { this.$message.warning(res.message) @@ -831,9 +836,14 @@ this.formInline.dutyPersonName = res.result.engineeringInterfacePersonList[0].name this.formInline.dutyPerson = res.result.engineeringInterfacePersonList[0].value } + this.formInline = {...this.formInline} } else if (this.engineeringInterfacePersonList.length == 0) { this.formInline.sdt = undefined } + this.personnelVisible = false + this.$nextTick(()=>{ + this.personnelVisible = true + }) } else { this.$nextTick(() => { this.formInline.dataList[index].engineeringInterfacePersonList = res.result.engineeringInterfacePersonList || [] From 4de9342a2433f9cc592f29ada5fb9efe60d88152 Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Mon, 3 Apr 2023 10:42:42 +0800 Subject: [PATCH 03/14] =?UTF-8?q?=E5=B8=82=E5=9C=BA=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E6=B8=85=E5=8D=95-=E5=AF=BC=E5=87=BA=E7=BB=93=E6=9E=9C?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AuthDummyInventoryInfoEOServiceImpl.java | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) 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 0099558a7..a1ee275aa 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 @@ -12,6 +12,7 @@ import com.jero.common.constant.enums.CutEnum; import com.jero.common.exception.JeroBootException; import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.vo.LoginUser; +import com.jero.common.util.oss.CosBootUtil; import com.jero.modules.authDummy.entity.AuthDummyInventoryBaseEO; import com.jero.modules.authDummy.entity.AuthDummyInventoryInfoEO; import com.jero.modules.authDummy.entity.AuthDummyInventoryInfoEOEn; @@ -36,6 +37,7 @@ import com.jero.modules.project.enums.ProjectInventoryFieldEnum; import com.jero.modules.split.common.FileUnZip; import com.jero.modules.system.entity.SysCategory; import com.jero.modules.system.entity.SysDictItem; +import com.jero.modules.system.enums.SysCategoryValueTypeEnum; import com.jero.modules.system.mapper.SysCategoryMapper; import com.jero.modules.system.mapper.SysDictItemMapper; import com.jero.modules.system.service.ISysDictItemService; @@ -86,6 +88,8 @@ import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import static com.jero.modules.document.service.impl.BussDocumentLibraryEOServiceImpl.copyFile; + /** * @Description: 认证虚拟清单详情表 * @Author: jero-boot @@ -791,6 +795,8 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl fileInfos = this.iOSSFileService.getFileInfos(deliverableTemplateIds); OutputStream os = null; try { response.setContentType("application/force-download"); @@ -808,6 +814,8 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl dataList, List fileInfos,String path) throws IOException{ + if(fileInfos.size() != 0){ + for(AuthDummyInventoryInfoEO aii : dataList){ + String deliverableTemplate = aii.getDeliverableTemplate(); + String serialNumber = aii.getSerialNumber(); + if(StringUtils.isBlank(serialNumber)){ + continue; + } + List deliverableTemplateFileList = new ArrayList<>(); + List deliveryResultList = new ArrayList<>(); + List oSSFileList = new ArrayList<>(); + if(StringUtils.isNotBlank(deliverableTemplate)){ + deliverableTemplateFileList = fileInfos.stream().filter(e -> deliverableTemplate.contains(e.getId())).collect(Collectors.toList()); + oSSFileList.addAll(deliverableTemplateFileList); + } + if(oSSFileList.size() != 0){ + String fileNowPath = path + "/" + serialNumber; + File file = new File(fileNowPath); + if (file.exists()) { + file.delete(); + } + file.mkdirs(); + for (OSSFile ossFile : oSSFileList) { + String url = ossFile.getUrl(); + if(StringUtils.isNotBlank(url)){ + //判断文件是否存在 + boolean b = CosBootUtil.doesObjectExist(url); + if(b){ + InputStream download = CosBootUtil.download(url); + copyFile(download, fileNowPath + File.separator + ossFile.getFileName()); + } + } + } + } + } + + } + } + /** * 数据导入 * @param file From 4c521696904d94ddafa6df3e6259d9702f44ad0a Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Mon, 3 Apr 2023 10:42:58 +0800 Subject: [PATCH 04/14] update --- .../service/impl/AuthDummyInventoryInfoEOServiceImpl.java | 1 - 1 file changed, 1 deletion(-) 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 a1ee275aa..5ca1943bc 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 @@ -877,7 +877,6 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl deliverableTemplateFileList = new ArrayList<>(); - List deliveryResultList = new ArrayList<>(); List oSSFileList = new ArrayList<>(); if(StringUtils.isNotBlank(deliverableTemplate)){ deliverableTemplateFileList = fileInfos.stream().filter(e -> deliverableTemplate.contains(e.getId())).collect(Collectors.toList()); From 45c07abab3d161429e370ae3bd0743e496fa3c08 Mon Sep 17 00:00:00 2001 From: cuijiaming <1410452759@qq.com> Date: Mon, 3 Apr 2023 11:03:02 +0800 Subject: [PATCH 05/14] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E5=92=8C=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95=20=20=20=E7=BC=96?= =?UTF-8?q?=E8=BE=91/=E6=B7=BB=E5=8A=A0=E6=97=B6=EF=BC=8C=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E5=B7=A5=E7=A8=8B=E6=8E=A5=E5=8F=A3=E4=BA=BA=20=20?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=9A=84=E6=98=AF=E7=9B=B8=E5=85=B3=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E5=90=8D=E5=8D=95=E4=B8=AD=E7=9A=843=E5=88=97?= =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E6=8E=A5=E5=8F=A3=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectRelatedPersonnelServiceImpl.java | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java index 4de2a9337..ac746250e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java @@ -470,6 +470,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl> lawEngineerList = new ArrayList<>(); List> certificationEngineerList = new ArrayList<>(); List> engineeringInterfacePersonList = new ArrayList<>(); + List> studioPersonList = new ArrayList<>(); //项目的studio用户 LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); @@ -510,6 +511,19 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl sysUserList = new ArrayList<>(); @@ -558,6 +572,33 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl map = new HashMap<>(); + map.put("name",sysUser.getUsername()); + map.put("value",sysUser.getId()); + engineeringInterfacePersonList.add(map); + } + } + } + } + if(StringUtils.isNotBlank(projectRelatedPersonnel.getEngineerAttSet())){ + String[] engineerAttSetArr = projectRelatedPersonnel.getEngineerAttSet().split(","); + for (String engineerAttSet : engineerAttSetArr) { + for (SysUser sysUser : sysUserList) { + if(StringUtils.equals(engineerAttSet,sysUser.getId())){ + Map map = new HashMap<>(); + map.put("name",sysUser.getUsername()); + map.put("value",sysUser.getId()); + engineeringInterfacePersonList.add(map); + } + } + } + } + if (StringUtils.isNotBlank(studioEngineer)) { for (SysUser sysUser : sysUserList) { if (StringUtils.equals(studioEngineer, sysUser.getId())) { From b8aacc21d7b97db66770426f87b68447c33ce4ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= Date: Mon, 3 Apr 2023 11:21:21 +0800 Subject: [PATCH 06/14] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E5=A4=87=E6=A1=88-=E7=94=A8=E6=88=B7=E5=91=8A=E7=9F=A5?= =?UTF-8?q?=E5=86=85=E5=AE=B9=E5=8F=8A=E6=96=B9=E5=BC=8F-=E8=A1=A8?= =?UTF-8?q?=E5=8D=95-=E5=AF=B9=E9=BD=90-=E9=97=B4=E9=9A=94=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../upgradeactivityrecord/components/usernotification.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue index 0ebe13f88..f4d08f015 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue @@ -364,6 +364,7 @@ h1{ width: calc(100% - 130px); display: inline-block; margin-top: 2px; + height: 40px; } .box-input { From a1423e1519024e3c22a7ec195252760f48340110 Mon Sep 17 00:00:00 2001 From: cuijiaming <1410452759@qq.com> Date: Mon, 3 Apr 2023 11:29:44 +0800 Subject: [PATCH 07/14] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=97=B6=E7=9A=84=E6=9D=83=E9=99=90=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...rojectCertificationInventoryEOServiceImpl.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) 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 df42fb0d9..642624eb8 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 @@ -3073,6 +3073,21 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl adds = new ArrayList<>(); + for (ProjectCertificationInventoryEO pci: datas) { + if (ObjectUtils.isNotEmpty(pci.getSdt())) { + setProjectCertificationInventoryPermission(pci.getSdt(), pci.getProjectLibraryId(), pci.getId(), now, adds, ProjectUserLocationEnum.PROJECT_CERTIFICATION_INVENTORY_SDT.getValue()); + } + if (ObjectUtils.isNotEmpty(pci.getDutyPerson())) { + setProjectCertificationInventoryPermission(pci.getDutyPerson(), pci.getProjectLibraryId(), pci.getId(), now, adds, ProjectUserLocationEnum.PROJECT_CERTIFICATION_INVENTORY_DP.getValue()); + } + } + if (ObjectUtils.isNotEmpty(adds)) { + projectUserPermissionService.saveBatch(adds); + } } } } From 483e921cc5499b9747fb7388e29c0b865f85278f Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Mon, 3 Apr 2023 11:42:21 +0800 Subject: [PATCH 08/14] =?UTF-8?q?=E5=B8=82=E5=9C=BA=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E6=B8=85=E5=8D=95=EF=BC=8C=E5=AF=BC=E5=85=A5=E5=A4=84=E7=90=86?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AuthDummyInventoryInfoEOServiceImpl.java | 66 ++++++++++++++++++- 1 file changed, 65 insertions(+), 1 deletion(-) 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 5ca1943bc..1fb69f13c 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 @@ -43,6 +43,7 @@ import com.jero.modules.system.mapper.SysDictItemMapper; import com.jero.modules.system.service.ISysDictItemService; import com.jero.modules.system.service.impl.SysCategoryServiceImpl; import com.jero.modules.system.service.impl.SysDictItemServiceImpl; +import com.xkcoding.http.util.StringUtil; import lombok.SneakyThrows; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.MapUtils; @@ -1335,7 +1336,15 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl nowFileList = new ArrayList<>(); - nowFileList = FileUnZip.readFileByFilename(zipEntryName, fileName,authDummyInventoryInfoEO.getCut(),errorMsg,msgList,nameCn,nameEn); + nowFileList = this.readFileByFilename( + zipEntryName, + authDummyInventoryInfoEO.getSerialNumber() + "/" + fileName, + authDummyInventoryInfoEO.getCut(), + errorMsg, + msgList, + nameCn, + nameEn + ); if (nowFileList.size() == 0) { // if(CutEnum.CN.getValue().equals(projectCertificationInventoryEO.getCut())){ @@ -1366,6 +1375,61 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl readFileByFilename(String path, + String filename, + String cut, + String errorMsg, + List msgList, + String nameCn, + String nameEn) { + String filenameOne = ""; + String filenameTwo = ""; + if(filename.contains("/")){ + filenameOne = filename.split("/")[0]; + filenameTwo = filename.split("/")[1]; + } + List resultlist = new ArrayList<>(); + if (StringUtil.isNotEmpty(path) && StringUtils.isNotBlank(filenameOne)){ + File file = new File(path); + if (file.isDirectory()) { + File[] files = file.listFiles(); + for (File fi : files) { + if(fi.isDirectory()){ + File[] filesTemp = fi.listFiles(); + for (File fileTemp : filesTemp) { + // 对文件进行过滤 + if (fileTemp.getName().equals(filenameTwo) && fi.getPath().contains(filenameOne)) { + resultlist.add(fileTemp); + } + } + }else{ + // 对文件进行过滤 + if (fi.getName().equals(filenameTwo) && fi.getPath().contains(filenameOne)) { + resultlist.add(fi); + } + } + } + } + } + if(resultlist.size() == 0){ + String name = ""; + if(filename.contains("/")){ + name = filenameTwo; + }else{ + name = filename; + } + if(CutEnum.CN.getValue().equals(cut)){ + errorMsg += nameCn + name + "格式不正确或者压缩包中没有" + name + "文件,请参考模板下载中的说明"; + }else{ + errorMsg += nameEn + name + " Incorrect format or not present in compressed package " + name + " file please refer to the description in template download;"; + } + if(msgList != null){ + msgList.add(errorMsg); + } + } + return resultlist; + } + private String getTreeId(List categoryList, AuthDummyInventoryInfoEO authDummyInventoryInfoEOTemp, List treeNameList, String value) { StringBuilder sb = new StringBuilder(); From 99b945f95c42d4f422b62ca233a83a8688a64150 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= Date: Mon, 3 Apr 2023 11:42:58 +0800 Subject: [PATCH 09/14] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E6=94=AF=E6=8C=81-?= =?UTF-8?q?=E5=AF=B9=E5=A4=96=E6=8A=A5=E5=91=8A=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E5=88=97=E5=AE=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/externalReports/index.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jero-web/src/views/externalReports/index.vue b/jero-web/src/views/externalReports/index.vue index 06aa39799..4211f5e67 100644 --- a/jero-web/src/views/externalReports/index.vue +++ b/jero-web/src/views/externalReports/index.vue @@ -385,7 +385,7 @@ ellipsis: true, dataIndex: 'fileName', scopedSlots: { customRender: 'fileName' }, - width: 200 + width: 270 }, { title: this.$t('fileDeclaration'), @@ -393,7 +393,7 @@ ellipsis: true, dataIndex: 'fileDescription', scopedSlots: { customRender: 'projectName' }, - width: 300 + width: 390 }, { title: this.$t('uploadedBy'), @@ -412,7 +412,7 @@ align: 'left', ellipsis: true, dataIndex: 'createTime', - width: 250 + width: 245 }, { title: this.$t('operation'), From 3613ed66232d8cbb3f39213f1e16034ba92d11ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= Date: Mon, 3 Apr 2023 11:44:32 +0800 Subject: [PATCH 10/14] =?UTF-8?q?=E6=97=A5=E5=BF=97=E4=B8=AD=E5=BF=83-?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=97=A5=E5=BF=97-=E8=A1=A8=E6=A0=BC?= =?UTF-8?q?=E5=B1=85=E5=B7=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/system/DataLogList.vue | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/jero-web/src/views/system/DataLogList.vue b/jero-web/src/views/system/DataLogList.vue index 3ad660f5c..415e63866 100644 --- a/jero-web/src/views/system/DataLogList.vue +++ b/jero-web/src/views/system/DataLogList.vue @@ -41,6 +41,7 @@ size="middle" rowKey="id" :columns="columns" + :components="drag(columns,'columns')" :dataSource="dataSource" :pagination="ipagination" :loading="loading" @@ -61,10 +62,11 @@ import DataLogModal from './modules/DataLogModal' import {JeroListMixin} from '@/mixins/JeroListMixin' import JEllipsis from "@/components/jero/JEllipsis"; + import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header' export default { name: 'DataLogList', - mixins: [JeroListMixin], + mixins: [JeroListMixin, ResizeHeader, ResizeColumnProvide], components: { JEllipsis, DataLogModal @@ -76,28 +78,28 @@ columns: [ { title: this.$t('tableName'), - align: 'center', + align: 'left', dataIndex: 'dataTable', width: "120" }, { title: this.$t('DataID'), - align: 'center', + align: 'left', dataIndex: 'dataId', width: "120" }, { title: this.$t('VersionNumber'), - align: 'center', + align: 'left', dataIndex: 'dataVersion', width: "50" }, { title: this.$t('DataContent'), - align: 'center', + align: 'left', dataIndex: 'dataContent', width: "150", scopedSlots: {customRender: 'dataContent'}, }, { title: this.$t('creator'), - align: 'center', + align: 'left', dataIndex: 'createBy', width: "100" }, From b9a02809d91ad35a5eb4727616cf55a07a17712d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Mon, 3 Apr 2023 13:44:25 +0800 Subject: [PATCH 11/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9OTA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/ota/enums/OtaTitleEnum.java | 2 +- .../impl/OtaBaSjSjxtbhServiceImpl.java | 33 +++++++++++++++---- .../impl/OtaBaSjSjyxpgServiceImpl.java | 4 +-- 3 files changed, 29 insertions(+), 10 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java index 1e72122b2..6c63e7c5a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaTitleEnum.java @@ -183,7 +183,7 @@ public enum OtaTitleEnum { CSRJSJ("csrjsj", "初始软件包的完整性数据", "0", "", 500), SJBYZSJ("sjbyzsj", "升级包完整性验证数据", "0", "", 500), SJBDX("sjbdx", "升级包大小", "0", "", 50), - SFCFSJ("sfcfsj", "是否差分升级", "0", "", 50), + SFCFSJ("sfcfsj", "是否差分升级", "2", "", 0), SJMDLX("sjmdlx", "升级目的类型", "0", "", 50), GNBGMS("gnbgms", "功能变更描述", "0", "", 500), SYTJBG("sytjbg", "适用条件变更", "0", "", 500), diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjxtbhServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjxtbhServiceImpl.java index 1b88b984f..ddfe59dee 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjxtbhServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjxtbhServiceImpl.java @@ -74,6 +74,9 @@ public class OtaBaSjSjxtbhServiceImpl extends ServiceImpl setDefault(String otaId) { + List list = this.getByOtaId(otaId); + Date now = new Date(); + OtaBaSjSjxtbh bh = new OtaBaSjSjxtbh(); + bh.setOtaId(otaId); + bh.setSjkzqmc("ADC ADAS主控制器"); + bh.setCreateTime(now); + bh.setId(UUID.randomUUID().toString().replace("-", "")); + list.add(bh); + saveBatch(list); + return list; + } + public void deleteByOtaId(String otaId) { List list = this.getByOtaId(otaId); List ids = new ArrayList<>(); @@ -183,6 +199,9 @@ public class OtaBaSjSjxtbhServiceImpl extends ServiceImpl upLoadFiles = ImportFileUtil.importZip(file, cut, uploadPath); - parseFileList(upLoadFiles, otaId, cut,errMsg); + parseFileList(upLoadFiles, otaId, cut, errMsg); } @Override - public void parseFileList(List upLoadFiles, String otaId, String cut, StringBuilder errMsg) throws Exception{ + public void parseFileList(List upLoadFiles, String otaId, String cut, StringBuilder errMsg) throws Exception { File upFile = null; for (File f : upLoadFiles) { if (f.getName().equals("本次升级的系统名称与变更参数.xlsx")) { @@ -221,7 +240,7 @@ public class OtaBaSjSjxtbhServiceImpl extends ServiceImpl newList = parseFile(upFile, otaId, cut,errMsg); + List newList = parseFile(upFile, otaId, cut, errMsg); List oldList = getByOtaId(otaId); if (ObjectUtils.isEmpty(oldList)) { oldList = new ArrayList<>(); @@ -233,7 +252,7 @@ public class OtaBaSjSjxtbhServiceImpl extends ServiceImpl parseFile(File upFile, String otaId, String cut, StringBuilder errMsg) throws Exception{ + private List parseFile(File upFile, String otaId, String cut, StringBuilder errMsg) throws Exception { Date now = new Date(); List list = new ArrayList<>(); Workbook wb = ImportFileUtil.readExcel(upFile); @@ -270,7 +289,7 @@ public class OtaBaSjSjxtbhServiceImpl extends ServiceImpl Date: Mon, 3 Apr 2023 14:10:25 +0800 Subject: [PATCH 12/14] =?UTF-8?q?67717=20=E6=B3=95=E8=A7=84=E6=B8=85?= =?UTF-8?q?=E5=8D=95-=E7=94=9F=E6=88=90=E5=90=88=E8=A7=84=E6=8A=A5?= =?UTF-8?q?=E5=91=8A=E4=BF=AE=E6=94=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_2nd_period.sql | 6 +- .../entity/ProjectLawsInventoryEO.java | 6 ++ .../ProjectLawsInventoryEOServiceImpl.java | 58 ++++++++++++++----- 3 files changed, 54 insertions(+), 16 deletions(-) diff --git a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql index b39f68ad5..14e6f0379 100644 --- a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql +++ b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql @@ -470,4 +470,8 @@ ALTER TABLE `auth_dummy_inventory_info` MODIFY COLUMN `config_item` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '配置项' AFTER `inspection_item`, MODIFY COLUMN `wvta_id` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'WVTA ID' AFTER `config_item`, MODIFY COLUMN `duty_territory` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '责任领域' AFTER `serial_number`, - MODIFY COLUMN `deliverable_template` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '交付物模板' AFTER `auth_dummy_inventory_base_id`; \ No newline at end of file + MODIFY COLUMN `deliverable_template` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '交付物模板' AFTER `auth_dummy_inventory_base_id`; + +-- 项目库-法规清单，增加字段 流程最后结束的时间（导出合规性报告时使用） 2023-4-03 未同步生产环境 +ALTER TABLE `project_laws_inventory` + ADD COLUMN `process_end_time` datetime NULL COMMENT '流程最后结束的时间' AFTER `stand_id`; \ No newline at end of file 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 8ebc4d8d4..855583737 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 @@ -505,4 +505,10 @@ public class ProjectLawsInventoryEO implements Serializable { /**设计符合性确认-流程实例id*/ @TableField(exist = false) private String designPId; + + /**流程结束时间 最后的时间*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "流程结束时间 最后的时间") + private Date processEndTime; } 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 759b95ce3..e2542b7ae 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 @@ -9280,6 +9280,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl lawsInventoryQueryWrapper = new QueryWrapper<>(); lawsInventoryQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getId,id); - ProjectLawsInventoryEO projectLawsInventoryEO = this.baseMapper.selectOne(lawsInventoryQueryWrapper); + ProjectLawsInventoryEO projectLawsInventory = this.baseMapper.selectOne(lawsInventoryQueryWrapper); + List projectLawsInventoryEOList = new ArrayList<>(); + projectLawsInventoryEOList.add(projectLawsInventory); + this.dataDispose( + projectLawsInventoryEOList, + currentUser, + Integer.parseInt(ProjectRoleEnum.STUDIO_ENGINEER.getValue()), + CutEnum.EN.getValue() + ); + + ProjectLawsInventoryEO projectLawsInventoryEO = projectLawsInventoryEOList.get(0); params.put("projectLawsInventoryEO",projectLawsInventoryEO); - QueryWrapper taskInventoryQueryWrapper = new QueryWrapper<>(); + /*QueryWrapper taskInventoryQueryWrapper = new QueryWrapper<>(); taskInventoryQueryWrapper.lambda().eq(ProjectTaskInventoryEO::getProjectLawsInventoryId,id); ProjectTaskInventoryEO projectTaskInventoryEO = projectTaskInventoryEOService.getBaseMapper().selectOne(taskInventoryQueryWrapper); - params.put("projectTaskInventoryEO",projectTaskInventoryEO); + params.put("projectTaskInventoryEO",projectTaskInventoryEO);*/ QueryWrapper libraryBaseQueryWrapper = new QueryWrapper<>(); libraryBaseQueryWrapper.lambda().eq(ProjectLibraryBase::getId,projectLawsInventoryEO.getProjectLibraryId()); @@ -9314,14 +9326,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl taskFeedbackQueryWrapper = new QueryWrapper<>(); + /*QueryWrapper taskFeedbackQueryWrapper = new QueryWrapper<>(); taskFeedbackQueryWrapper.lambda().eq(ProjectTaskInventoryFeedbackEO::getActiProcInstId,pId); List projectTaskInventoryFeedbackEOList = projectTaskInventoryFeedbackEOService.getBaseMapper().selectList(taskFeedbackQueryWrapper); if(CollectionUtils.isNotEmpty(projectTaskInventoryFeedbackEOList)){ List fileIdList = projectTaskInventoryFeedbackEOList.stream().map(ProjectTaskInventoryFeedbackEO::getFileId).distinct().collect(Collectors.toList()); String fileId = StringUtils.join(fileIdList,","); List fileList = iOSSFileService.getFileInfos(fileId); + if(CollectionUtils.isNotEmpty(fileList)){ + fileList.forEach(file -> { + Map fileMap = new HashMap<>(); + fileMap.put("ITEM_FILENAME", StringUtils.isNotEmpty(file.getFileName()) ? file.getFileName() : ""); + fileMap.put("ITEM_FILEPATH", StringUtils.isNotEmpty(file.getUrl()) ? file.getUrl() : ""); + *//*fileMap.put("item.fileName", file.getFileName()); + fileMap.put("item.filePath", file.getUrl());*//* + dataList.add(fileMap); + }); + } + }*/ + params.put("actiProcInstId",pId); + List processHistoryEOList = processHistoryEOService.queryList(params); + if(CollectionUtils.isNotEmpty(processHistoryEOList)){ + List fileIdList = processHistoryEOList.stream().map(ProcessHistoryEO::getApprovalFile).distinct().collect(Collectors.toList()); + String fileId = StringUtils.join(fileIdList,","); + List fileList = iOSSFileService.getFileInfos(fileId); if(CollectionUtils.isNotEmpty(fileList)){ fileList.forEach(file -> { Map fileMap = new HashMap<>(); From 9c4de2acc94cebc00b54c6a334cb9fdaa4c1ab9b Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Mon, 3 Apr 2023 14:40:01 +0800 Subject: [PATCH 13/14] =?UTF-8?q?67736=20=E4=B8=AD=E8=8B=B1=E6=96=87?= =?UTF-8?q?=E5=88=87=E6=8D=A2=E6=8A=80=E6=9C=AF=E9=A2=86=E5=9F=9F=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=9F=A5=E8=AF=A2=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SysCategoryController.java | 16 +++++------ .../system/service/ISysCategoryService.java | 2 +- .../service/impl/SysCategoryServiceImpl.java | 8 ++++-- .../jero/modules/system/util/TreeUtils.java | 27 ++++++++++++++----- .../BussDocumentLibraryEOServiceImpl.java | 17 +++++++++--- .../impl/FileSplitItemsEOServiceImpl.java | 5 +++- 6 files changed, 52 insertions(+), 23 deletions(-) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java index bcba55d30..bb040d777 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java @@ -581,17 +581,17 @@ public class SysCategoryController { * @return */ @GetMapping("/getSysCategoryTree") - public Result getSysCategoryTree() { - return Result.OK(sysCategoryService.getSysCategoryTree(null)); + public Result getSysCategoryTree(@RequestParam Map params) { + return Result.OK(sysCategoryService.getSysCategoryTree(null,params)); } /** * 只查询交付物类型的树形数据字典 * @return */ @GetMapping("/getDeliverableTree") - public Result getDeliverableTree() { + public Result getDeliverableTree(@RequestParam Map params) { String flag = "deliverable_template"; - return Result.OK(sysCategoryService.getSysCategoryTree(flag)); + return Result.OK(sysCategoryService.getSysCategoryTree(flag,params)); } /** @@ -599,9 +599,9 @@ public class SysCategoryController { * @return */ @GetMapping("/getEvaluationMethodTree") - public Result getevaluationMethodTree() { + public Result getevaluationMethodTree(@RequestParam Map params) { String flag = "evaluation_method"; - return Result.OK(sysCategoryService.getSysCategoryTree(flag)); + return Result.OK(sysCategoryService.getSysCategoryTree(flag,params)); } /** @@ -609,8 +609,8 @@ public class SysCategoryController { * @return */ @GetMapping("/getCertificationDeliverableTree") - public Result getCertificationDeliverableTree() { + public Result getCertificationDeliverableTree(@RequestParam Map params) { String flag = "ren4_zheng4_-_jiao1_fu4_wu4_lei4_xing2"; - return Result.OK(sysCategoryService.getSysCategoryTree(flag)); + return Result.OK(sysCategoryService.getSysCategoryTree(flag,params)); } } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysCategoryService.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysCategoryService.java index 4f6a0d863..fa5a31c59 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysCategoryService.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysCategoryService.java @@ -67,7 +67,7 @@ public interface ISysCategoryService extends IService { * 获取树形结构 * @return */ - List getSysCategoryTree(String flag); + List getSysCategoryTree(String flag,Map params); /** * 获取树形结构，中英文可切换 diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java index 3e51539c0..d25f88f18 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java @@ -267,7 +267,11 @@ public class SysCategoryServiceImpl extends ServiceImpl getSysCategoryTree(String flag) { + public List getSysCategoryTree(String flag,Map params) { + String cut = CutEnum.CN.getValue(); + if(params != null){ + cut = ObjectUtil.isNotEmpty(params.get("cut")) ? (String) params.get("cut") : CutEnum.CN.getValue(); + } try { //只查询技术领域的technology_territory String dictId = ""; @@ -288,7 +292,7 @@ public class SysCategoryServiceImpl extends ServiceImpl tree = new ArrayList<>(); if(CollectionUtils.isNotEmpty(list)){ - tree = TreeUtils.getSysCategoryTree(list); + tree = TreeUtils.getSysCategoryTree(list,cut); } return tree; }catch (Exception ex){ diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/util/TreeUtils.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/util/TreeUtils.java index 1102b9124..a71340a51 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/util/TreeUtils.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/util/TreeUtils.java @@ -7,6 +7,7 @@ import org.springframework.stereotype.Component; import java.util.LinkedList; import java.util.List; +import java.util.Map; /** *生成树形结构工具类 @@ -20,7 +21,7 @@ public class TreeUtils { */ private static final String TREE_ROOT_CODE = "0"; - public static List getSysCategoryTree(List sysCategoryList) { + public static List getSysCategoryTree(List sysCategoryList, String cut) { List sysCategoryTreeVOList = new LinkedList(); for (SysCategory sysCategory : sysCategoryList) { if (TREE_ROOT_CODE.equals(sysCategory.getPid())) { @@ -29,9 +30,15 @@ public class TreeUtils { sysCategoryTreeVO.setKey(sysCategory.getId()); sysCategoryTreeVO.setValue(sysCategory.getId()); sysCategoryTreeVO.setDictId(sysCategory.getSysDictId()); - sysCategoryTreeVO.setTitle(sysCategory.getName()); + String title = ""; + if(StringUtils.equals(cut,CutEnum.CN.getValue())){ + title = sysCategory.getName(); + }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){ + title = sysCategory.getEnName(); + } + sysCategoryTreeVO.setTitle(title); sysCategoryTreeVO.setParentId(sysCategory.getPid()); - sysCategoryTreeVO.setChildren(getSysCategoryTreeChild(sysCategory.getId(), sysCategoryList)); + sysCategoryTreeVO.setChildren(getSysCategoryTreeChild(sysCategory.getId(), sysCategoryList,cut)); sysCategoryTreeVOList.add(sysCategoryTreeVO); } } @@ -53,14 +60,14 @@ public class TreeUtils { sysCategoryTreeVO.setTitle(sysCategory.getEnName()); } sysCategoryTreeVO.setParentId(sysCategory.getPid()); - sysCategoryTreeVO.setChildren(getSysCategoryTreeChild(sysCategory.getId(), sysCategoryList)); + sysCategoryTreeVO.setChildren(getSysCategoryTreeChild(sysCategory.getId(), sysCategoryList,cut)); sysCategoryTreeVOList.add(sysCategoryTreeVO); } } return sysCategoryTreeVOList; } - private static List getSysCategoryTreeChild(String id, List sysCategoryList) { + private static List getSysCategoryTreeChild(String id, List sysCategoryList,String cut) { List childrenList = new LinkedList(); for (SysCategory sysCategory : sysCategoryList) { if (id.equals(sysCategory.getPid())) { @@ -69,9 +76,15 @@ public class TreeUtils { sysCategoryTreeVO.setId(sysCategory.getId()); sysCategoryTreeVO.setKey(sysCategory.getId()); sysCategoryTreeVO.setValue(sysCategory.getId()); - sysCategoryTreeVO.setTitle(sysCategory.getName()); + String title = ""; + if(StringUtils.equals(cut,CutEnum.CN.getValue())){ + title = sysCategory.getName(); + }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){ + title = sysCategory.getEnName(); + } + sysCategoryTreeVO.setTitle(title); sysCategoryTreeVO.setParentId(sysCategory.getPid()); - sysCategoryTreeVO.setChildren(getSysCategoryTreeChild(sysCategory.getId(), sysCategoryList)); + sysCategoryTreeVO.setChildren(getSysCategoryTreeChild(sysCategory.getId(), sysCategoryList,cut)); childrenList.add(sysCategoryTreeVO); } } 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 03805e41e..70fb733e2 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 @@ -79,6 +79,7 @@ import com.jero.modules.tag.entity.OnlCgformArea; import com.jero.modules.tag.service.impl.OnlCgformAreaServiceImpl; import lombok.SneakyThrows; import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections.map.HashedMap; import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.poi.hssf.usermodel.HSSFCell; @@ -474,7 +475,9 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl sysCategoryTree = sysCategoryService.getSysCategoryTree(null); + Map params = new HashedMap(); + params.put("cut",cut); + List sysCategoryTree = sysCategoryService.getSysCategoryTree(null,params); List> list = new ArrayList<>(); for (OnlCgformField onlCgformField : fieldList) { if(CutEnum.CN.getValue().equals(cut)){ @@ -529,7 +532,9 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl YesOrNoEnum.YES.getValue().equals(StringUtils.valueOf(e.getIsQuery()))).collect(Collectors.toList()); } //树形数据字典 - List sysCategoryTree = sysCategoryService.getSysCategoryTree(null); + Map params = new HashedMap(); + params.put("cut",cut); + List sysCategoryTree = sysCategoryService.getSysCategoryTree(null,params); List> list = new ArrayList<>(); for (OnlCgformField onlCgformField : fieldList) { Map map = new HashMap<>(); @@ -673,7 +678,9 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl sysCategoryTree = sysCategoryService.getSysCategoryTree(null); + Map params = new HashedMap(); + params.put("cut",cut); + List sysCategoryTree = sysCategoryService.getSysCategoryTree(null,params); // List> result = new ArrayList<>(); // for (OnlCgformArea onlCgformAreaTemp : areaList) { // String areaName = ""; @@ -766,7 +773,9 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl sysCategoryTree = sysCategoryService.getSysCategoryTree(null); + Map params = new HashedMap(); + params.put("cut",cut); + List sysCategoryTree = sysCategoryService.getSysCategoryTree(null,params); List> result = new ArrayList<>(); for (OnlCgformArea onlCgformAreaTemp : areaList) { String areaName = ""; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java index c69175bd9..b01182986 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java @@ -55,6 +55,7 @@ import com.jero.modules.system.service.ISysUserService; import com.jero.modules.system.service.impl.SysCategoryServiceImpl; import com.jero.modules.system.service.impl.SysDictItemServiceImpl; import com.jero.modules.system.util.UserUtils; +import org.apache.commons.collections.map.HashedMap; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.ObjectUtils; @@ -2957,7 +2958,9 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsQuery()))).collect(Collectors.toList()); } //树形数据字典 - List sysCategoryTree = sysCategoryService.getSysCategoryTree(null); // 查询所有 并以树结构返回 + Map params = new HashedMap(); + params.put("cut",cut); + List sysCategoryTree = sysCategoryService.getSysCategoryTree(null,params); // 查询所有 并以树结构返回 List> list = new ArrayList<>(); for (OnlCgformField onlCgformField : fieldList) { Map map = new HashMap<>(); From b005a367d5ec6f5539939548339105287b2787e7 Mon Sep 17 00:00:00 2001 From: cuijiaming <1410452759@qq.com> Date: Mon, 3 Apr 2023 14:52:35 +0800 Subject: [PATCH 14/14] bug67150 --- .../AuthDummyInventoryInfoEOServiceImpl.java | 28 ++++++------- ...ctCertificationInventoryEOServiceImpl.java | 40 +++++++++---------- 2 files changed, 34 insertions(+), 34 deletions(-) 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 1fb69f13c..3563262d5 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 @@ -1108,13 +1108,13 @@ public class AuthDummyInventoryInfoEOServiceImpl extends ServiceImpl