From e6f6b19362d089dfb12e55b87421f0ea5961bbf6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Fri, 23 Sep 2022 16:54:15 +0800 Subject: [PATCH 01/93] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E7=9A=84=E5=A4=87=E6=B3=A8=E5=92=8C=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E7=9A=84=E7=BC=96=E5=8F=B7=E5=90=8D=E7=A7=B0=E9=99=90?= =?UTF-8?q?=E5=88=B6=E5=AD=97=E7=AC=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/parameter/parameterlist/components/addModel.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jero-web/src/views/parameter/parameterlist/components/addModel.vue b/jero-web/src/views/parameter/parameterlist/components/addModel.vue index f3171c4f8..5eb433eda 100644 --- a/jero-web/src/views/parameter/parameterlist/components/addModel.vue +++ b/jero-web/src/views/parameter/parameterlist/components/addModel.vue @@ -392,7 +392,7 @@ export default { ], paramsName: [ { required: true, message: this.$t('pleaseSelect')+this.$t('Paraname'), trigger: 'blur' }, - { min:1, max: 350, message: this.$t('cantExeed')+'350'+this.$t('characters'), trigger: 'blur' }, + { min:1, max: 500, message: this.$t('cantExeed')+'500'+this.$t('characters'), trigger: 'blur' }, ], technologyTerritory: [ { required: true, message: this.$t('pleaseSelect')+this.$t('technicalField'), trigger: 'change' }, @@ -703,8 +703,8 @@ export default { this.$message.warning(this.$t('ParameterName')+this.$t('cannotEmpty')) falg = 0 return - } else if(item.paramsName.length > 350){ - this.$message.warning(this.$t('ParameterName')+this.$t('cantExeed')+'350'+this.$t('Characters')) + } else if(item.paramsName.length > 500){ + this.$message.warning(this.$t('ParameterName')+this.$t('cantExeed')+'500'+this.$t('Characters')) falg = 0 return } From 7c21fe9f95d60cebac340a2e99dc181f89278cb3 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Fri, 23 Sep 2022 17:46:19 +0800 Subject: [PATCH 02/93] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E4=B8=89=E6=9C=9F?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/vue.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-web/vue.config.js b/jero-web/vue.config.js index f8a8eae61..cc121368a 100644 --- a/jero-web/vue.config.js +++ b/jero-web/vue.config.js @@ -92,7 +92,7 @@ module.exports = { } }, */ '/jero-boot': { - target: 'http://10.0.1.14:8080', //请求本地 jero-boot后台项目 + target: 'http://localhost:8080', //请求本地 jero-boot后台项目 // target: 'http://10.10.10.46:8101', //请求本地 jero-boot后台项目 // target: 'http://10.0.1.25:8080', // target: 'http://10.0.1.5:8080', From 19aa3fb757cc9dc8dc4bb119605a22981e4c2ab5 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Sun, 25 Sep 2022 09:47:59 +0800 Subject: [PATCH 03/93] =?UTF-8?q?=E6=B3=95=E8=A7=84=E9=A2=84=E8=AD=A6=20?= =?UTF-8?q?=E6=96=B0=E8=BD=A6=E5=9E=8B=E5=AE=9E=E6=96=BD=E6=97=A5=E6=9C=9F?= =?UTF-8?q?,=E5=9C=A8=E4=BA=A7=E8=BD=A6=E5=AE=9E=E6=96=BD=E6=97=A5?= =?UTF-8?q?=E6=9C=9F,=20=E5=88=B0=E6=9C=9F=E5=BD=93=E5=A4=A9=E5=8F=91?= =?UTF-8?q?=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/warn/service/TimedTaskWarn.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/TimedTaskWarn.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/TimedTaskWarn.java index 25083ab1e..86300e2b0 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/TimedTaskWarn.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/TimedTaskWarn.java @@ -53,6 +53,13 @@ public class TimedTaskWarn implements Job { @Value(value = "${jero.backUrl}") private String backUrl; + /** + * 法规预警定时任务 + * 新车型实施日期,在产车实施日期,提前6个月和提前12个月发消息 + * 新车型实施日期,在产车实施日期, 到期当天发消息 + * @param jobExecutionContext + * @throws JobExecutionException + */ @Override public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException { //获取所有的法规 @@ -110,12 +117,13 @@ public class TimedTaskWarn implements Job { //The implementation date of the standard GB 7258 new model you subscribed to is 2022-01-01, // please pay attention to check if(ObjectUtils.isNotEmpty(xin1Che1Xing2Shi2Shi1Ri4Qi1)){ + String xin1Che1Xing2Shi2Shi1Ri4Qi1Str = sdf.format(xin1Che1Xing2Shi2Shi1Ri4Qi1); //当前时间的前6个月 String beforeTimeSix = beforeTime(6,xin1Che1Xing2Shi2Shi1Ri4Qi1); //当前时间的前12个月 String beforeTimeSixTen = beforeTime(12,xin1Che1Xing2Shi2Shi1Ri4Qi1); - if(currentTime.equals(beforeTimeSix) || currentTime.equals(beforeTimeSixTen)){ + if(currentTime.equals(beforeTimeSix) || currentTime.equals(beforeTimeSixTen) || currentTime.equals(xin1Che1Xing2Shi2Shi1Ri4Qi1Str)){ //发送站内消息和飞书消息 String format = sdf.format(xin1Che1Xing2Shi2Shi1Ri4Qi1); String content = "The implementation date of the " + category +" "+ serialNumber @@ -131,11 +139,12 @@ public class TimedTaskWarn implements Job { //The implementation date of the standard GB 7258 in production vehicle you subscribed to is 2022-01-01, // please pay attention to check if(ObjectUtils.isNotEmpty(implementTime)){ + String implementTimeStr = sdf.format(implementTime); //当前时间的前6个月 String beforeTimeSix = beforeTime(6,implementTime); //当前时间的前12个月 String beforeTimeSixTen = beforeTime(12,implementTime); - if(currentTime.equals(beforeTimeSix) || currentTime.equals(beforeTimeSixTen)){ + if(currentTime.equals(beforeTimeSix) || currentTime.equals(beforeTimeSixTen) || currentTime.equals(implementTimeStr)){ //发送站内消息和飞书消息 String format = sdf.format(implementTime); String content = "The implementation date of the " + category +" "+ serialNumber From 9a141a38997286a40a53191722d16060230f1d7e Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Sun, 25 Sep 2022 10:02:06 +0800 Subject: [PATCH 04/93] =?UTF-8?q?=E6=B3=95=E8=A7=84=E9=A2=84=E8=AD=A6--?= =?UTF-8?q?=E6=8C=89=E5=AE=9E=E6=96=BD=E6=97=A5=E6=9C=9F=E6=AD=A3=E5=BA=8F?= =?UTF-8?q?=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BussDocumentLibraryEOServiceImpl.java | 29 ++++++++++++------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index 569e7bd31..e53b0e1b1 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 @@ -3806,17 +3806,26 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl Date: Sun, 25 Sep 2022 10:52:25 +0800 Subject: [PATCH 05/93] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93=E5=AE=9A?= =?UTF-8?q?=E6=97=B6=E4=BB=BB=E5=8A=A1=20=E6=B3=95=E8=A7=84=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E4=B8=BA=E5=8D=B3=E5=B0=86=E5=AE=9E=E6=96=BD=E7=9A=84?= =?UTF-8?q?=E6=B3=95=E8=A7=84=EF=BC=8C=E6=A0=B9=E6=8D=AE=E6=96=B0=E8=BD=A6?= =?UTF-8?q?=E5=9E=8B=E5=AE=9E=E6=96=BD=E6=97=A5=E6=9C=9F=E5=92=8C=E5=9C=A8?= =?UTF-8?q?=E4=BA=A7=E8=BD=A6=E5=AE=9E=E6=96=BD=E6=97=A5=E6=9C=9F,=20?= =?UTF-8?q?=E5=88=B0=E6=9C=9F=E5=90=8E=E8=87=AA=E5=8A=A8=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E4=B8=BA=E7=8E=B0=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/document/enums/LawsStateEnum.java | 41 ++++++++++++ .../document/service/impl/TimedTaskLaws.java | 63 +++++++++++++++++++ 2 files changed, 104 insertions(+) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/enums/LawsStateEnum.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/TimedTaskLaws.java diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/enums/LawsStateEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/enums/LawsStateEnum.java new file mode 100644 index 000000000..9d580bac4 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/enums/LawsStateEnum.java @@ -0,0 +1,41 @@ +package com.jero.modules.document.enums; + +/** + * @description + * 法规状态枚举 + * @date 2022/1/21 15:22 + * @auth zhn + */ +public enum LawsStateEnum { + ACTIVE("现行","1"), + ABOLISH("废止","2"), + THE_UPCOMING("即将实施","3"), + DRAFT("草稿","4"), + BE_REPLACED("被代替","5"); + + + + String name; + String value; + + private LawsStateEnum(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; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/TimedTaskLaws.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/TimedTaskLaws.java new file mode 100644 index 000000000..06a5e1b27 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/TimedTaskLaws.java @@ -0,0 +1,63 @@ +package com.jero.modules.document.service.impl; + +import com.jero.modules.document.entity.BussDocumentLibraryEO; +import com.jero.modules.document.enums.LawsStateEnum; +import org.apache.commons.lang3.ObjectUtils; +import org.apache.commons.lang3.StringUtils; +import org.quartz.Job; +import org.quartz.JobExecutionContext; +import org.quartz.JobExecutionException; +import org.springframework.beans.factory.annotation.Autowired; + +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.List; + +/** + * @description + * @date 2022/9/25 10:03 + * @auth zhn + */ +public class TimedTaskLaws implements Job { + @Autowired + private BussDocumentLibraryEOServiceImpl bussDocumentLibraryEOService; + + /** + * 法规状态为即将实施的法规，根据新车型实施日期和在产车实施日期, 到期后自动更新状态为现行 + * @param jobExecutionContext + * @throws JobExecutionException + */ + @Override + public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + String currentTime = sdf.format(new Date()); + //获取所有的法规 + List bussDocumentLibraryEOList = bussDocumentLibraryEOService.list(); + if(bussDocumentLibraryEOList.size() != 0){ + for (BussDocumentLibraryEO bussDocumentLibraryEO : bussDocumentLibraryEOList) { + String xin1Che1Xing2Shi2Shi1Ri4Qi1Str = ""; + String implementTimestr = ""; + + String state = bussDocumentLibraryEO.getState();//状态 + //新车型实施日期 + Date xin1Che1Xing2Shi2Shi1Ri4Qi1 = bussDocumentLibraryEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1(); + //在产车实施日期 + Date implementTime = bussDocumentLibraryEO.getImplementTime(); + if(ObjectUtils.isNotEmpty(xin1Che1Xing2Shi2Shi1Ri4Qi1)){ + xin1Che1Xing2Shi2Shi1Ri4Qi1Str = sdf.format(xin1Che1Xing2Shi2Shi1Ri4Qi1); + } + if(ObjectUtils.isNotEmpty(implementTime)){ + implementTimestr = sdf.format(implementTime); + } + //法规状态为即将实施的法规，根据新车型实施日期和在产车实施日期, 到期后自动更新状态为现行 + if(StringUtils.isNotBlank(state) && LawsStateEnum.THE_UPCOMING.getValue().equals(state) + && (currentTime.equals(xin1Che1Xing2Shi2Shi1Ri4Qi1Str) || currentTime.equals(implementTimestr))){ + BussDocumentLibraryEO bussDocumentLibraryEOTemp = new BussDocumentLibraryEO(); + bussDocumentLibraryEOTemp.setId(bussDocumentLibraryEO.getId()); + bussDocumentLibraryEOTemp.setState(LawsStateEnum.ACTIVE.getValue()); + bussDocumentLibraryEOService.updateById(bussDocumentLibraryEOTemp); + } + } + } + } +} From 2a114f01498ace96ee678dc65ec2561096191288 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Sun, 25 Sep 2022 13:37:52 +0800 Subject: [PATCH 06/93] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=9C=88=E6=8A=A5?= =?UTF-8?q?=E5=A1=AB=E5=86=99---=E5=A2=9E=E5=8A=A0=E4=B8=80=E7=BA=A7?= =?UTF-8?q?=E7=9B=AE=E5=BD=95,=20=E5=B9=B6=E6=8C=89=E7=9B=AE=E5=BD=95?= =?UTF-8?q?=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_third_record.sql | 4 ++++ .../report/entity/LawsMonthlyReportWriteEO.java | 11 ++++++++++- .../impl/LawsMonthlyReportWriteEOServiceImpl.java | 13 ++++++++++++- 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index 6e71e6449..42b019d1b 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -1159,3 +1159,7 @@ MODIFY COLUMN `remark` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_gener -- 法规清单表修改备注字段长度由300改为1000 2022-09-23 未同步生产环境 ALTER TABLE `laws_weilai`.`project_laws_inventory` MODIFY COLUMN `remark` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注' AFTER `engineering_interface_person`; + +-- 月报填写表 新增一级目录字段2022-09-25 未同步生产环境 +ALTER TABLE `laws_weilai`.`laws_monthly_report_write` +ADD COLUMN `memories_chapter_one` varchar(255) NULL COMMENT '章节目录对应的一级标题' AFTER `source_en`; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportWriteEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportWriteEO.java index b76f1b294..2563e41b4 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportWriteEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportWriteEO.java @@ -71,10 +71,19 @@ public class LawsMonthlyReportWriteEO implements Serializable { @ApiModelProperty(value = "章节目录") private java.lang.String memoriesChapter; - //章节目录名称 + //章节目录名称 @TableField(exist = false) private java.lang.String memoriesChapterName; + /**章节目录一级标题*/ + @ApiModelProperty(value = "章节目录一级标题") + private java.lang.String memoriesChapterOne; + + /**章节目录一级标题中文名称*/ + @ApiModelProperty(value = "章节目录一级标题中文名称") + @TableField(exist = false) + private java.lang.String memoriesChapterOneName; + /**内容模板*/ @Excel(name = "内容模板", width = 15) @ApiModelProperty(value = "内容模板") diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java index f77804cc8..577b4050d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java @@ -102,6 +102,7 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl queryWrapper = QueryGenerator.initQueryWrapper(lawsMonthlyReportWriteEOTemp, req.getParameterMap()); - queryWrapper.orderByDesc("create_time"); + queryWrapper.orderByDesc("memories_chapter_one","memories_chapter","create_time"); //管理员查看全部数据,其余人只能查看自己的数据 LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); List rolesList = sysBaseApi.getRolesByUsername(currentUser.getUsername()); @@ -354,6 +355,16 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl lawsMonthlyReportTitleTemplateEOS = lawsMonthlyReportTitleTemplateEOList.stream() + .filter(e -> lawsMonthlyReportWriteEO.getMemoriesChapterOne().equals(e.getId())).collect(Collectors.toList()); + if(CutEnum.CN.getValue().equals(lawsMonthlyReportWriteEOTemp.getCut()) && lawsMonthlyReportTitleTemplateEOS.size() != 0){ + lawsMonthlyReportWriteEO.setMemoriesChapterOneName(lawsMonthlyReportTitleTemplateEOS.get(0).getTitleCn()); + }else if(CutEnum.EN.getValue().equals(lawsMonthlyReportWriteEOTemp.getCut()) && lawsMonthlyReportTitleTemplateEOS.size() != 0){ + lawsMonthlyReportWriteEO.setMemoriesChapterOneName(lawsMonthlyReportTitleTemplateEOS.get(0).getTitleEn()); + } + } if(ContentTemplateEnum.NEW_REQUEST_LIST_TEMPLATE.getValue().equals(lawsMonthlyReportWriteEO.getContentTemplate())){ //新征求意见清单模板 From edad4c8c80feddeceb5430f930956ca2984a6730 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Sun, 25 Sep 2022 14:14:21 +0800 Subject: [PATCH 07/93] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=9C=88=E6=8A=A5--?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=B1=95=E7=A4=BA=E6=B3=95=E8=A7=84=E8=81=94?= =?UTF-8?q?=E7=B3=BB=E4=BA=BA(=E4=B8=AD=E8=8B=B1=E6=96=87=E5=88=87?= =?UTF-8?q?=E6=8D=A2)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/LawsMonthlyReportWriteEOServiceImpl.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java index 577b4050d..5eacaccbc 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java @@ -344,7 +344,7 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl lawsMonthlyReportTitleTemplateEOS = lawsMonthlyReportTitleTemplateEOList.stream() @@ -400,7 +400,7 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl userList, LawsMonthlyReportWriteEO lawsMonthlyReportWriteEO) { + private void lawsContact(List userList, LawsMonthlyReportWriteEO lawsMonthlyReportWriteEO,String cut) { String lawsContact = lawsMonthlyReportWriteEO.getLawsContact(); if(StringUtils.isNotBlank(lawsContact)){ List collect = userList.stream().filter(e -> lawsContact.contains(e.getId())).collect(Collectors.toList()); @@ -408,7 +408,11 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl loginUserList = collect.stream().filter(e -> e.getId().equals(s)).collect(Collectors.toList()); if(loginUserList.size() != 0){ - sb.append(loginUserList.get(0).getUsername()+","); + if(CutEnum.CN.getValue().equals(cut)){ + sb.append(loginUserList.get(0).getRealname()+","); + }else{ + sb.append(loginUserList.get(0).getUsername()+","); + } } } if(StringUtils.isNotBlank(sb)){ From 827afe009ee64efe68c89a329a67822e4a5a1aeb Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Mon, 26 Sep 2022 09:23:58 +0800 Subject: [PATCH 08/93] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E4=B8=89=E6=9C=9F?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 1 + jero-web/src/common/lang/zh-cn.js | 1 + .../components/RegulationMonthlyFill.vue | 7 +++++++ .../regulationReport/components/modules/fillAdd.vue | 10 +++++++--- 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 799e01e9e..50ba2696a 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1309,4 +1309,5 @@ module.exports = { importLocalDisassemblyOrder:'Import local disassembly order', notExport:'Not export', hasBeenExport:'Has been export', + firstLevelDirectory:'First level directory', } \ 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 a4d0c48ec..9acdc9128 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1410,4 +1410,5 @@ module.exports = { importLocalDisassemblyOrder:'导入本地拆解单', notExport:'未导出', hasBeenExport:'已导出', + firstLevelDirectory:'一级目录', } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue index 008c74166..5fcdfcf2e 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue @@ -136,6 +136,13 @@ pageNo: 1, queryParam: {}, columns: [ + { + title: this.$t('firstLevelDirectory'), + align: 'center', + dataIndex: 'memoriesChapterOneName', + ellipsis: true, + width: 170 + }, { title: this.$t('chapterContents'), align: 'center', diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue index a1fb27251..12be5c8b3 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillAdd.vue @@ -260,6 +260,9 @@ if (value.length > 1) { value.shift() } + if (extra.triggerNode.dataRef && extra.triggerNode.dataRef.parentId) { + this.formInline.memoriesChapterOne = extra.triggerNode.dataRef.parentId + } this.formInline.memoriesChapter = value this.formInline = { ...this.formInline } }, @@ -273,7 +276,7 @@ text = 'solicitOpinionsRef' } else if (this.$refs.releaseStandardRef) { text = 'releaseStandardRef' - }else if (this.$refs.industryTemplateRef) { + } else if (this.$refs.industryTemplateRef) { text = 'industryTemplateRef' } this.$refs[text].getData((val) => { @@ -293,7 +296,8 @@ let query = Object.assign(val, { month: formInline.month, memoriesChapter: formInline.memoriesChapter, - contentTemplate: formInline.contentTemplate + contentTemplate: formInline.contentTemplate, + memoriesChapterOne:formInline.memoriesChapterOne }) postAction(url, query).then((res) => { if (res.success) { @@ -400,7 +404,7 @@ ::v-deep .ant-select-tree-node-content-wrapper { float: right; - margin-top: -2px!important; + margin-top: -2px !important; } ::v-deep .ant-select-tree-title { From 7c497c7c57e94e4100f860214f8f4d4c08ce1e31 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Mon, 26 Sep 2022 14:07:17 +0800 Subject: [PATCH 09/93] =?UTF-8?q?=E9=A2=84=E6=8A=A5=E5=AF=BC=E5=87=BA--?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=9B=AE=E5=BD=95=E7=BA=A7=E5=88=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LawsMonthlyReportWriteEOServiceImpl.java | 45 ++++++++-------- .../jero/modules/report/util/WordUtil.java | 53 +++++++++++++++++-- 2 files changed, 72 insertions(+), 26 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java index 5eacaccbc..fb6b02180 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java @@ -648,8 +648,8 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl lawsMonthlyReportWriteEOS, List lawsMonthlyReportTitleTemplateEOS, @@ -902,8 +902,9 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl新征求意见清单模板, 新发布标准清单模板 @@ -950,13 +951,13 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl style is more prominent in the formats bar + ctStyle.setUiPriority(indentNumber); + + CTOnOff onoffnull = CTOnOff.Factory.newInstance(); + ctStyle.setUnhideWhenUsed(onoffnull); + // style shows up in the formats bar + ctStyle.setQFormat(onoffnull); + // style defines a heading of the given level + CTPPr ppr = CTPPr.Factory.newInstance(); + ppr.setOutlineLvl(indentNumber); + ctStyle.setPPr(ppr); + XWPFStyle style = new XWPFStyle(ctStyle); + // is a null op if already defined + XWPFStyles styles = docxDocument.createStyles(); + style.setType(STStyleType.PARAGRAPH); + styles.addStyle(style); + } + // @SneakyThrows // public static void exportHeardAndFoot(XWPFDocument document){ //// XWPFDocument document = new XWPFDocument(); From a07f0f982291554beaa556b0fe12be8e4c6518dc Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Mon, 26 Sep 2022 17:35:43 +0800 Subject: [PATCH 10/93] =?UTF-8?q?=E6=9C=88=E6=8A=A5=E6=95=B4=E5=90=88?= =?UTF-8?q?=E5=AF=BC=E5=87=BA--=E9=A1=B5=E9=9D=A2=E5=A4=A7=E5=B0=8F?= =?UTF-8?q?=E5=8F=8A=E8=A1=A8=E6=A0=BC=E5=AE=BD=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LawsMonthlyReportWriteEOServiceImpl.java | 15 ++-- .../jero/modules/report/util/WordUtil.java | 73 +++++++++++-------- 2 files changed, 48 insertions(+), 40 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java index fb6b02180..2f9b7629c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java @@ -779,7 +779,7 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl新征求意见清单模板, 新发布标准清单模板 @@ -970,7 +969,7 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl列表实际宽度除以2.54再乘以1440 CTTblWidth ctTblWidth1 = table.getRow(number).getCell(1).getCTTc().addNewTcPr().addNewTcW(); ctTblWidth1.setType(STTblWidth.DXA); - ctTblWidth1.setW(BigInteger.valueOf(6000)); + ctTblWidth1.setW(BigInteger.valueOf(6015)); // XWPFParagraph para = table.getRow(number).getCell(1).getParagraphs().get(0); // XWPFRun run = para.createRun();//对某个段落设置格式 From 6864c1a9fee0bb91dab8686d31c403843e1e16e8 Mon Sep 17 00:00:00 2001 From: liyawei Date: Mon, 26 Sep 2022 17:39:37 +0800 Subject: [PATCH 11/93] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E9=A1=B9=E6=94=B6=E9=9B=86-=E8=A1=A8=E5=A4=B4=E6=A0=87?= =?UTF-8?q?=E8=AF=86=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ParamsCollectManifestEOServiceImpl.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index b247c544d..6ffb1fdef 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -773,7 +773,12 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl map = new HashMap<>(); String dbFieldName = onlCgformField.getDbFieldName(); if ("nio_number".equals(dbFieldName) || "params_name".equals(dbFieldName)) { - map.put("click3", true); + map.put("click5", true); + if("nio_number".equals(dbFieldName)) { + map.put("click4", true); + } else { + map.put("click3", true); + } } if ("description".equals(dbFieldName)) { indexOfDescription = i; From f158dae72de4928825419ba08e0e00cf799eae13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Mon, 26 Sep 2022 17:45:29 +0800 Subject: [PATCH 12/93] =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=94=B6=E9=9B=86?= =?UTF-8?q?=E6=B8=85=E5=8D=95=20=E5=8F=82=E6=95=B0=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E8=B6=85=E8=A1=8C=E7=9C=81=E7=95=A5=20=E7=BC=96=E5=8F=B7=20?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E5=90=8D=E7=A7=B0=E5=9B=BA=E5=AE=9A=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/tableCollection/index.vue | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue index 9c56825ee..6e7bf6b0f 100644 --- a/jero-web/src/components/tableCollection/index.vue +++ b/jero-web/src/components/tableCollection/index.vue @@ -30,6 +30,10 @@ {{$t('See')}} + + + {{ text && text.length > 8 ? text.slice(0, 7) + '...' : text }} + @@ -656,7 +660,7 @@ dataIndex: res.db_field_name, align: 'center', // ellipsis: true, - fixed: res.click3?'left':'', + fixed: res.click5?'left':'', sorter: res.sort, width: 160 }) @@ -674,6 +678,11 @@ customRender: 'ParameterDescription' } } + if(res.click3){ + this.columns[index].scopedSlots = { + customRender: 'paramsNameDescription' + } + } if (res.click) { // 工程接口人列表修改 this.columns[index].scopedSlots = { From befe49b13501f3aa78e7a2cbe54c7c4c78f616b9 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Tue, 27 Sep 2022 11:16:23 +0800 Subject: [PATCH 13/93] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E4=B8=89=E6=9C=9F?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/countryCardView.vue | 43 +++++++++++++++---- 1 file changed, 34 insertions(+), 9 deletions(-) diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue index f31ac4c49..dbf4c5fd1 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue @@ -27,8 +27,10 @@
- - + + + +
{{item2.applyMarket_dictText}} @@ -37,15 +39,22 @@
{{item2.lableName}} + + {{item2.lableName}} + + {{$t('viewFile')}} \ No newline at end of file From c39419061adc47284bda647c4de954fe7ea40b1f Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Tue, 27 Sep 2022 11:26:55 +0800 Subject: [PATCH 14/93] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E4=B8=89=E6=9C=9F?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 1 + jero-web/src/common/lang/zh-cn.js | 1 + .../components/displayInformationModel.vue | 19 ++++++++++++++++++- .../library/docDetail/index.vue | 4 ++-- 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 50ba2696a..82379b72c 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1310,4 +1310,5 @@ module.exports = { notExport:'Not export', hasBeenExport:'Has been export', firstLevelDirectory:'First level directory', + deselectAll:'Deselect All', } \ 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 9acdc9128..cac85b273 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1411,4 +1411,5 @@ module.exports = { notExport:'未导出', hasBeenExport:'已导出', firstLevelDirectory:'一级目录', + deselectAll:'取消全选', } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/displayInformationModel.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/displayInformationModel.vue index abc196c39..39f36a0d8 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/displayInformationModel.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/displayInformationModel.vue @@ -31,6 +31,10 @@
+
+ + {{$t('deselectAll')}} +
{{$t('selectAll')}} @@ -106,6 +110,16 @@ }) }) }, + deselectAllClick(){ + this.dataList.forEach(res => { + res.showOrNot = false + this.dataListOne.forEach(val => { + if (res.id == val.id) { + val.showOrNot = false + } + }) + }) + }, searchQuery() { if (this.queryParam.labelName) { this.dataList = this.dataList.filter(res => { @@ -220,10 +234,13 @@ .operator-text { cursor: pointer; - margin-right: 13px; + margin-right: 56px; font-size: 14px; font-weight: 400; color: #040B29; display: inline-block; } + .operator-text:last-child{ + margin-right: 13px; + } \ No newline at end of file diff --git a/jero-web/src/views/documentManage/library/docDetail/index.vue b/jero-web/src/views/documentManage/library/docDetail/index.vue index cd3ab69b8..0fc6f949e 100644 --- a/jero-web/src/views/documentManage/library/docDetail/index.vue +++ b/jero-web/src/views/documentManage/library/docDetail/index.vue @@ -37,9 +37,9 @@ {{$t('DocumentComparison')}}
+ :title="$t('problemKnowledgeBase')"> - {{$t('KnowledgeDatabase')}} + {{$t('problemKnowledgeBase')}}
From 854708fab03529a0b51ea186633712315628277f Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Tue, 27 Sep 2022 11:54:36 +0800 Subject: [PATCH 15/93] =?UTF-8?q?59996=20=E6=B3=95=E8=A7=84=E6=8A=80?= =?UTF-8?q?=E6=9C=AF=E8=AF=84=E4=BC=B0=EF=BC=8C=E5=AF=BC=E5=87=BA=E7=94=9F?= =?UTF-8?q?=E6=88=90=E7=9A=84excel=E6=96=87=E4=BB=B6=EF=BC=8C=E5=9C=A8offi?= =?UTF-8?q?ce=E6=89=93=E4=B8=8D=E5=BC=80=E9=97=AE=E9=A2=98=E5=A4=84?= =?UTF-8?q?=E7=90=86=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...LawsTechnologyEvaluationComplianceResultEOServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationComplianceResultEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationComplianceResultEOServiceImpl.java index 9bef97e7a..160afc9b7 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationComplianceResultEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationComplianceResultEOServiceImpl.java @@ -183,12 +183,12 @@ public class LawsTechnologyEvaluationComplianceResultEOServiceImpl extends Servi if(org.apache.commons.lang3.StringUtils.equals(cut, CutEnum.CN.getValue())){ title = "相关章节,问题说明,附件"; bottomTitle = "符合性结果："; - fileName = "评估结果 " + ".xlsx"; + fileName = "评估结果" + ".xls"; sheetName = "反馈结果"; }else if(org.apache.commons.lang3.StringUtils.equals(cut,CutEnum.EN.getValue())){ title = "Related section,Problem description,Accessory"; bottomTitle = "Compliance results:"; - fileName = "Evaluation results " + ".xlsx"; + fileName = "Evaluation results" + ".xls"; sheetName = "Feedback result"; } From ae30f93f8a0abbebb08c83130b917ccbb237a125 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Tue, 27 Sep 2022 14:09:43 +0800 Subject: [PATCH 16/93] =?UTF-8?q?59978=20=E6=B3=95=E8=A7=84=E6=84=8F?= =?UTF-8?q?=E8=A7=81=E6=94=B6=E9=9B=86=E6=B5=81=E7=A8=8B=EF=BC=8C=E8=AF=84?= =?UTF-8?q?=E4=BC=B0=E7=BB=93=E6=9E=9C=E6=B7=BB=E5=8A=A0=E3=80=81=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E3=80=81=E5=AF=BC=E5=87=BA=EF=BC=8C=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=9D=A1=E6=AC=BE=E5=86=85=E5=AE=B9=E5=AD=97=E6=AE=B5=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_third_record.sql | 4 ++++ .../entity/LawsOpinionAssessmentResultEO.java | 5 +++++ ...awsOpinionAssessmentResultEOServiceImpl.java | 17 +++++++++-------- 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index 42b019d1b..d1b42bb96 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -1163,3 +1163,7 @@ MODIFY COLUMN `remark` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_gener -- 月报填写表 新增一级目录字段2022-09-25 未同步生产环境 ALTER TABLE `laws_weilai`.`laws_monthly_report_write` ADD COLUMN `memories_chapter_one` varchar(255) NULL COMMENT '章节目录对应的一级标题' AFTER `source_en`; + +-- 法规意见收集-评估结果表 增加字段 条款内容 2022-09-27 未同步生产环境 +ALTER TABLE `laws_weilai`.`laws_opinion_assessment_result` + ADD COLUMN `clause_content` varchar(600) NULL COMMENT '条款内容' AFTER `acti_proc_inst_id`; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/entity/LawsOpinionAssessmentResultEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/entity/LawsOpinionAssessmentResultEO.java index 446d76baa..a35a621f2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/entity/LawsOpinionAssessmentResultEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/entity/LawsOpinionAssessmentResultEO.java @@ -98,4 +98,9 @@ public class LawsOpinionAssessmentResultEO implements Serializable { @ApiModelProperty(value = "流程实例id") private String actiProcInstId; + /**条款内容*/ + @Excel(name = "条款内容", width = 15) + @ApiModelProperty(value = "条款内容") + private String clauseContent; + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionAssessmentResultEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionAssessmentResultEOServiceImpl.java index 5e5acc773..3ba440572 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionAssessmentResultEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionAssessmentResultEOServiceImpl.java @@ -184,11 +184,11 @@ public class LawsOpinionAssessmentResultEOServiceImpl extends ServiceImpl Date: Tue, 27 Sep 2022 15:17:54 +0800 Subject: [PATCH 17/93] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E4=B8=89=E6=9C=9F?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/evaluationResultsClause.vue | 31 +++++-- .../components/evaluationResultsWhole.vue | 86 +++++++++++++++---- 2 files changed, 96 insertions(+), 21 deletions(-) diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue index ad32144fd..900365c82 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue @@ -8,15 +8,21 @@ {{$route.query.serialNumber +' '+$t('regulatoryTechnicalEvaluationResults')}}
+
+
+ + {{$t('initiateSupplementaryProcess')}} +
+
-
- - {{$t('initiateSupplementaryProcess')}} - -
+ + + + +
{{$t('processBackground')}}: {{$route.query.processBackground}} @@ -327,7 +333,7 @@ } .doc-detail-right { - width: 800px; + /*width: 800px;*/ line-height: 68px; display: flex; @@ -353,6 +359,7 @@ .processBackground-text { font-size: 16px; color: #000F16; + margin-top: 16px; } } } @@ -432,6 +439,18 @@ ::v-deep .ant-table-body { background: transparent !important; } + .operator-text-text { + cursor: pointer; + margin-right: 23px; + font-size: 14px; + font-weight: 400; + color: #040B29; + display: inline-block; + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; + text-align: right; + } \ No newline at end of file From 0fe4aea66e886766c33b5004049434894657ee55 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Wed, 28 Sep 2022 14:38:22 +0800 Subject: [PATCH 33/93] =?UTF-8?q?59976=20=E6=B3=95=E8=A7=84=E6=8A=80?= =?UTF-8?q?=E6=9C=AF=E8=AF=84=E4=BC=B0=EF=BC=8C=E6=B5=81=E7=A8=8B=E5=8E=86?= =?UTF-8?q?=E5=8F=B2=E5=9B=9E=E6=98=BE=E5=8F=91=E8=B5=B7=E8=8A=82=E7=82=B9?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9=E3=80=82?= =?UTF-8?q?=20=E5=A2=9E=E5=8A=A0=E9=97=AE=E9=A2=98=E7=9F=A5=E8=AF=86?= =?UTF-8?q?=E5=BA=93=20=E5=9B=BE=E7=89=87=E9=A2=84=E8=A7=88=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=95=B0=E6=8D=AE=E3=80=82=E9=9C=80=E8=A6=81=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E7=94=9F=E4=BA=A7=E7=8E=AF=E5=A2=83=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_third_record.sql | 4 ++++ .../enums/LawsTechnologyEvaluationNodeEnum.java | 1 + 2 files changed, 5 insertions(+) diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index 0a3696166..defff7594 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -1176,3 +1176,7 @@ ALTER TABLE `laws_weilai`.`laws_opinion_gather` update onl_cgform_field set is_query = '1' where id = 'ccf68e6578a0a446a6ac34018f0a477d'; update onl_cgform_field set is_query = '1', is_read_only = '1' where id = '09fa6530229280174071eae0514e0f63'; +-- 配置表，增加问题知识库预览图片配置 2022-09-27 未同步生产环境 +INSERT INTO `laws_weilai`.`sys_config` (`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `config`, `config_name`) VALUES ('4', 'admin', '2022-09-28 14:35:30', NULL, NULL, 'A01', 'http://grp.nioint.com/', 'domianWebImgURL'); + + diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/enums/LawsTechnologyEvaluationNodeEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/enums/LawsTechnologyEvaluationNodeEnum.java index 3cc205f1c..fef65dfea 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/enums/LawsTechnologyEvaluationNodeEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/enums/LawsTechnologyEvaluationNodeEnum.java @@ -9,6 +9,7 @@ import com.jero.common.constant.enums.CutEnum; public enum LawsTechnologyEvaluationNodeEnum { ENGINEER_INITIATED("fggcsfq","法规工程师发起","Engineer initiated"), + ENGINEER_INITIATED_("fqgcsfq","法规工程师发起","Engineer initiated"), APPRAISERS_EVALUATION("pgrqr","评估人评估","Appraiser's evaluation"), SPONSOR_REVIEW("fqrsc","发起人审查","Sponsor review"), ; From b883a9d1806aed2aa09548bdcb70ae2a9561e454 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Wed, 28 Sep 2022 14:53:58 +0800 Subject: [PATCH 34/93] update --- .../problemKnowledgeBase/entity/ProblemKnowledgeBaseEO.java | 5 +++-- .../service/impl/ProblemKnowledgeBaseEOServiceImpl.java | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseEO.java index 95e57c94a..870abb198 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseEO.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.jero.modules.oss.entity.OSSFile; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; @@ -191,7 +192,7 @@ public class ProblemKnowledgeBaseEO implements Serializable { @TableField(exist = false) private List problemTypeNameList; - /**附件展示名称数组*/ + /**附件展示数组*/ @TableField(exist = false) - private List accessoryFileNameList; + private List accessoryFileNameList; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java index 00d3bdef1..aa3e94c37 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java @@ -720,7 +720,7 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl accessoryFiles = accessoryFileList.stream().filter(file -> { + List accessoryFiles = accessoryFileList.stream().filter(file -> { boolean flag = false; for (String accessory : accessoryFileArr) { if (StringUtils.equals(file.getId(), accessory)) { @@ -729,7 +729,7 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl Date: Wed, 28 Sep 2022 15:29:24 +0800 Subject: [PATCH 35/93] =?UTF-8?q?=E6=9C=88=E6=8A=A5=E5=AF=BC=E5=87=BA--?= =?UTF-8?q?=E4=B8=80=E4=BA=8C=E7=BA=A7=E7=9B=AE=E5=BD=95=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E4=B8=8B=E4=B8=80=E9=A1=B5(=E5=8D=95=E7=8B=AC=E5=8D=A0?= =?UTF-8?q?=E7=94=A8=E4=B8=80=E9=A1=B5)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/LawsMonthlyReportWriteEOServiceImpl.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java index 2f9b7629c..bb694f82a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java @@ -38,6 +38,7 @@ import com.jero.modules.system.service.impl.SysCategoryServiceImpl; import com.jero.modules.system.service.impl.SysDictItemServiceImpl; import com.jero.modules.system.util.StringUtils; import org.apache.poi.hssf.usermodel.HeaderFooter; +import org.apache.poi.xwpf.usermodel.BreakType; import org.apache.poi.xwpf.usermodel.ParagraphAlignment; import org.apache.poi.xwpf.usermodel.TOC; import org.apache.poi.xwpf.usermodel.XWPFDocument; @@ -916,6 +917,10 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl 1){ + document.createParagraph().createRun().addBreak(BreakType.PAGE); + } if(StringUtils.isNotBlank(oneTitle)){ WordUtil.exportWord(document, oneNumber+" "+oneTitle, null, ParagraphAlignment.LEFT, 0, 14, false, true, "Blue Sky Noto Regular","0","一级标题"); @@ -939,6 +944,10 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl 1){ + document.createParagraph().createRun().addBreak(BreakType.PAGE); + } if(StringUtils.isNotBlank(twoTitle)){ WordUtil.exportWord(document, twoNumber+" "+twoTitle, null, ParagraphAlignment.LEFT, 0, 12, false, true, "Blue Sky Noto Regular","1","二级标题"); From 42dd0b698e74d2fde172bb4e57d086fdcf739285 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Wed, 28 Sep 2022 15:47:24 +0800 Subject: [PATCH 36/93] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=89=E6=9C=9F?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/PersonnelSelection/index.vue | 163 +++- .../components/problemKnowledgeBaseList.vue | 523 +++++++++++-- .../problemKnowledgeBaseListView.vue | 707 ++++++++++++++++++ .../components/TermInformation.vue | 9 +- 4 files changed, 1329 insertions(+), 73 deletions(-) create mode 100644 jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseListView.vue diff --git a/jero-web/src/components/PersonnelSelection/index.vue b/jero-web/src/components/PersonnelSelection/index.vue index 49b1d73c5..0ed9c5187 100644 --- a/jero-web/src/components/PersonnelSelection/index.vue +++ b/jero-web/src/components/PersonnelSelection/index.vue @@ -31,11 +31,39 @@
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + import { getAction, postAction } from '@/api/manage' + import XEUtils from 'xe-utils' + import VXETable from 'vxe-table' export default { name: 'index', @@ -65,6 +95,7 @@ loading: true, gData: [], autoExpandParent: true, + checkboxList: [], expandedKeys: [], visible: false, treeVisible: false, @@ -83,15 +114,94 @@ }, methods: { + // loadTree(size) { + // this.loading = true + // setTimeout(() => { + // const trerData = JSON.parse(JSON.stringify(this.gData)) + // // 将树结构拍平，构建列表树结构 + // XEUtils.eachTree(trerData, (item, index, items, paths, parent, nodes) => { + // // 层级 + // item._LEVEL = nodes.length - 1 + // // 是否展开 + // item._EXPAND = false + // // 是否可视 + // item._VISIBLE = !item._LEVEL + // // 是否有子节点 + // item._HAS_CHILDREN = item.children && item.children.length > 0 + // // 是否叶子节点 + // item._IS_LEAF = !item._HAS_CHILDREN + // }) + // this.tree = trerData + // this.refreshTree() + // this.loading = false + // }, 200) + // }, + // // 切换树节点的展开、收缩 + // toggleTreeNode(row) { + // if (row._HAS_CHILDREN) { + // this.setTreeExpand(row, !row._EXPAND) + // } + // }, + // setTreeExpand(row, isExpand) { + // const matchObj = XEUtils.findTree(this.tree, item => item === row) + // row._EXPAND = isExpand + // if (matchObj) { + // XEUtils.eachTree(matchObj.item.children, (item, index, items, path, parent) => { + // item._VISIBLE = parent ? parent._EXPAND && parent._VISIBLE : isExpand + // }) + // } + // this.refreshTree() + // }, + // refreshTree() { + // const treeList = XEUtils.toTreeArray(this.tree) + // this.fullList = treeList + // this.gData = treeList.filter(item => item._VISIBLE) + // }, standardClick() { this.treeVisible = false this.departId = '' this.searchModel = '' this.userIds = [] this.userName = [] - this.queryDepartUserTreeList(1) + // let gData = localStorage.getItem('gData') + // if (gData) { + // this.gData = this.toTree(JSON.parse(gData)) + // this.treeVisible = true + // this.loadTree() + // } else { + this.queryDepartUserTreeList(1) + // } this.visible = true }, + //将数据拼成树形结构 + toTree(config) { + // 删除 所有 children,以防止多次调用 + config.forEach(function(item) { + delete item.children + }) + // 将数据存储为 以 id 为 KEY 的 map 索引数据列 + let map = {} + config.forEach((item) => { + item.label = item.name + item.key = item.id + + item.title = item.name + (item.itemName ? ' ' + item.itemName : '') + map[item.id] = item + }) + let val = [] + config.forEach((item) => { + // 以当前遍历项，的pid,去map对象中找到索引的id + let parent = map[item.parentId] + // 如果找到索引，那么说明此项不在顶级当中,那么需要把此项添加到，他对应的父级中 + if (parent) { + (parent.children || (parent.children = [])).push(item) + } else { + //如果没有在map中找到对应的索引ID,那么直接把 当前的item添加到 val结果集中，作为顶级 + val.push(item) + } + }) + return val + }, standardDelete() { this.$emit('input', null) this.$forceUpdate() @@ -103,7 +213,7 @@ // }, onCheck(checkedKeys, info) { - this.userIds = checkedKeys.checked + this.userIds = checkedKeys this.userName = [] if (this.userIds.length > 0) { for (let i = 0; i < this.userIds.length; i++) { @@ -227,6 +337,8 @@ gData = '' } this.confirmLoading = true + //queryDepartUserTreeList + //queryUserTreeList postAction('sys/user/queryDepartUserTreeList', { departId: this.departId, json: gData, @@ -234,7 +346,10 @@ }).then((res) => { this.confirmLoading = false if (res.success) { + this.loading = false + // localStorage.setItem('gData', JSON.stringify(res.result)) this.gData = res.result + // this.gData[0].isLeaf = false this.defaultExpandedKeys = [this.departId] if (num == 1) { if (this.userName && this.userName.length == 0) { @@ -312,4 +427,46 @@ height: calc(100% - 60px); overflow: auto; } + + .my-tree { + padding: 0 10px; + /*border: 1px solid #e8eaec;*/ + } + + .my-tree .my-tree-item { + height: 32px; + line-height: 32px; + } + + .my-tree .my-tree-item.has-child .tree-icon { + visibility: visible; + transition: all 0.3s; + } + + .my-tree .my-tree-item.is-expand .tree-icon { + transform: rotate(90deg); + } + + .my-tree .tree-icon { + cursor: pointer; + width: 20px; + line-height: 20px; + text-align: center; + visibility: hidden; + user-select: none; + } + + .caret-right { + margin-right: 4px; + font-size: 14px; + } + + .checkbox { + margin-right: 8px; + } + + ::v-deep .ant-checkbox-group { + width: 100%; + height: 600px; + } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue index d22898423..a73a4a075 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue @@ -1,20 +1,8 @@ + + \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue index 6d44acfc8..2a792a313 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue @@ -261,16 +261,23 @@ itemId: res.id, itemNum: res.items_num, itemName: res.items_name, - itemContent: res.iterms_conditions + itemContent: res.iterms_conditions, + zhan3_shi4_shun4_xu4: res.zhan3_shi4_shun4_xu4 || '' }) }) } this.dataList = this.ImportFileData.concat(this.dataListData) + this.dataList.sort((a, b) => { + a.zhan3_shi4_shun4_xu4 - b.zhan3_shi4_shun4_xu4 + }) this.dataList = [...this.dataList] }, getPersonnelList(res) { this.ImportFileData = this.ImportFileData.concat(res) this.dataList = this.dataListData.concat(this.ImportFileData) + this.dataList.sort((a, b) => { + a.zhan3_shi4_shun4_xu4 - b.zhan3_shi4_shun4_xu4 + }) this.dataList = [...this.dataList] }, getUUID() { From c2b90c7ff59d36e7e81dc9654032cd0f657b0ca1 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Wed, 28 Sep 2022 15:53:35 +0800 Subject: [PATCH 37/93] =?UTF-8?q?=E6=9C=88=E6=8A=A5=E5=AF=BC=E5=87=BA--?= =?UTF-8?q?=E4=B8=BB=E9=A1=B5=E9=9D=A2=E5=AD=97=E4=BD=93=E5=A4=A7=E5=B0=8F?= =?UTF-8?q?,=E6=AF=8F=E8=A1=8C=E7=BC=A9=E8=BF=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/LawsMonthlyReportWriteEOServiceImpl.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java index bb694f82a..789ae882b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java @@ -736,9 +736,10 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl Date: Wed, 28 Sep 2022 16:07:10 +0800 Subject: [PATCH 38/93] =?UTF-8?q?countryCard=EF=BC=8C=E5=AF=B9=E6=AF=94?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=A4=84=E7=90=86=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E7=9A=84=E5=90=8D=E7=A7=B0=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/CountryCardManageReleaseDetailEO.java | 4 ++++ ...CountryCardManageReleaseDetailEOServiceImpl.java | 13 +++++++++++++ 2 files changed, 17 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/CountryCardManageReleaseDetailEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/CountryCardManageReleaseDetailEO.java index 9aba556d1..cdf33870b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/CountryCardManageReleaseDetailEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/CountryCardManageReleaseDetailEO.java @@ -99,4 +99,8 @@ public class CountryCardManageReleaseDetailEO implements Serializable { /**Country Card模板维护-字典项实体*/ @TableField(exist = false) private List countryCardTempItemEOList; + + @ApiModelProperty(value = "内容附件名称") + @TableField(exist = false) + private String contentFileName; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseDetailEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseDetailEOServiceImpl.java index 84929756b..8356604d4 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseDetailEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseDetailEOServiceImpl.java @@ -2,6 +2,8 @@ package com.jero.modules.problemKnowledgeBase.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.jero.common.system.query.QueryGenerator; +import com.jero.modules.oss.entity.OSSFile; +import com.jero.modules.oss.service.IOSSFileService; import com.jero.modules.problemKnowledgeBase.entity.CountryCardManageReleaseDetailEO; import com.jero.modules.problemKnowledgeBase.entity.CountryCardTempEO; import com.jero.modules.problemKnowledgeBase.entity.CountryCardTempItemEO; @@ -38,6 +40,8 @@ public class CountryCardManageReleaseDetailEOServiceImpl extends ServiceImpl fileInfos = this.iOSSFileService.getFileInfos(fileIds); + String contentFileName = fileInfos.stream().map(OSSFile::getFileName).collect(Collectors.joining(",")); + data.setContentFileName(contentFileName); + } }); } From 3245d425b59b73bdffd296653a71f14fa2224c4c Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Wed, 28 Sep 2022 16:39:13 +0800 Subject: [PATCH 39/93] update --- .../modules/split/service/impl/FileSplitItemsEOServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 3ce420998..c60745cc9 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 @@ -500,7 +500,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl categoryList = sysCategoryService.list(); From 2c829d2860c8cd793f8238ce0e06c4c52072f450 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Wed, 28 Sep 2022 16:52:31 +0800 Subject: [PATCH 40/93] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=89=E6=9C=9F?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 3 + jero-web/src/common/lang/zh-cn.js | 3 + .../components/modules/defaultTemplate.vue | 135 +++++++++--------- .../components/TermInformation.vue | 10 +- .../components/documentDataComparison.vue | 50 ++++++- 5 files changed, 129 insertions(+), 72 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index bd059005d..446ed7756 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1312,4 +1312,7 @@ module.exports = { firstLevelDirectory:'First level directory', deselectAll:'Deselect All', classification:'Classification', + consistentAssessment:'Consistent assessment', + viewConsistentAssessment:'View Consistent Assessment', + viewAll:'View All', } \ 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 fa7a71a7c..c587adabc 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1413,4 +1413,7 @@ module.exports = { firstLevelDirectory:'一级目录', deselectAll:'取消全选', classification:'分类', + consistentAssessment:'一致评估', + viewConsistentAssessment:'查看一致评估', + viewAll:'查看全部', } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue index ace3619da..d989005a2 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue @@ -53,72 +53,6 @@
- -
-
- {{$t('vehicleType')}} -
- - - -
- - - - -
-
- {{$t('scopeOfApplication')}} -
- - - -
- - -
-
- {{$t('status')}} -
- - - -
- - - - -
-
- {{$t('usage')}} -
- - - -
-
@@ -133,6 +67,72 @@
+ + + + + + + + + + + + + + + + + + +
+
+ {{$t('scopeOfApplication')}} +
+ + + +
+ + + + +
+
+ {{$t('status')}} +
+ + + +
+ + + + +
+
+ {{$t('usage')}} +
+ + + +
+ @@ -516,4 +516,7 @@ margin-bottom: 40px; } + .itemModel-multi-one { + border: 1px solid #d9d9d9; + } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue index 2a792a313..0b3afea18 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue @@ -262,21 +262,21 @@ itemNum: res.items_num, itemName: res.items_name, itemContent: res.iterms_conditions, - zhan3_shi4_shun4_xu4: res.zhan3_shi4_shun4_xu4 || '' + display_seq: res.display_seq || '' }) }) } this.dataList = this.ImportFileData.concat(this.dataListData) - this.dataList.sort((a, b) => { - a.zhan3_shi4_shun4_xu4 - b.zhan3_shi4_shun4_xu4 + this.dataList = this.dataList.sort((a, b) => { + return a.display_seq - b.display_seq }) this.dataList = [...this.dataList] }, getPersonnelList(res) { this.ImportFileData = this.ImportFileData.concat(res) this.dataList = this.dataListData.concat(this.ImportFileData) - this.dataList.sort((a, b) => { - a.zhan3_shi4_shun4_xu4 - b.zhan3_shi4_shun4_xu4 + this.dataList = this.dataList.sort((a, b) => { + return a.display_seq - b.display_seq }) this.dataList = [...this.dataList] }, diff --git a/jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue b/jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue index 6a5255d8c..4d0b38763 100644 --- a/jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue +++ b/jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue @@ -105,7 +105,10 @@
- {{$t('preservation')}} + {{$t('consistentAssessment')}} + + {{$t('preservation')}}
@@ -194,6 +197,51 @@ path: '/documentComparison' }) }, + consistentAssessmentClick() { + if (!this.dataLeft.id && !this.dataRight.id) { + this.$message.warning(this.$t('pleaseSelectTheDataCompared')) + return + } + let query = { + itemsIdLeft: this.dataLeft.id, + itemsIdRight: this.dataRight.id, + infoId: this.$route.query.id, + comment: '一致' + } + this.dataLoadingText = this.$t('pleaseWaitWhileRunning') + this.loading = true + postAction('/compare/sarFileCompareItemComment/add', query).then((res) => { + if (res.success) { + this.$message.success(this.$t('OperationSuccessful')) + this.loading = false + this.formInline = {} + this.resultData.textRight.forEach(val => { + if (val.id == this.dataRight.id) { + val.reviewed = 1 + } + }) + this.resultData.textLeft.forEach(val => { + if (val.id == this.dataLeft.id) { + val.reviewed = 1 + } + }) + this.resultData = { ...this.resultData } + let detailLeftColor = document.getElementsByClassName('detail-content-content-right-data-color') + if (detailLeftColor && detailLeftColor.length > 0) { + detailLeftColor[0].classList.remove('detail-content-content-right-data-color') + } + let detailRightColor = document.getElementsByClassName('detail-content-content-right-data-color-right') + if (detailRightColor && detailRightColor.length > 0) { + detailRightColor[0].classList.remove('detail-content-content-right-data-color-right') + } + this.dataLeft = {} + this.dataRight = {} + } else { + this.$message.warning(this.$t('operationFailed')) + this.loading = false + } + }) + }, submit() { if (!this.dataLeft.id && !this.dataRight.id) { this.$message.warning(this.$t('pleaseSelectTheDataCompared')) From 6e08cd43fe2555a05736e01821666a012027b5cc Mon Sep 17 00:00:00 2001 From: CD <1103614279@qq.com> Date: Wed, 28 Sep 2022 16:56:57 +0800 Subject: [PATCH 41/93] =?UTF-8?q?=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarFileCompareItemCommentController.java | 5 +++-- .../service/ISarFileCompareItemCommentService.java | 2 +- .../impl/SarFileCompareItemCommentServiceImpl.java | 10 +++++++--- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareItemCommentController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareItemCommentController.java index 1db0758fb..eea6df830 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareItemCommentController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareItemCommentController.java @@ -166,8 +166,9 @@ public class SarFileCompareItemCommentController extends JeroController queryCompareResult(@RequestParam(name = "infoId", required = true) String infoId) { - SarFileCompareResultVO res = sarFileCompareItemCommentService.queryCompareResult(infoId); + public Result queryCompareResult(@RequestParam(name = "infoId", required = true) String infoId, + @RequestParam(name = "comment", required = false) String comment) { + SarFileCompareResultVO res = sarFileCompareItemCommentService.queryCompareResult(infoId,comment); return Result.OK(res); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/ISarFileCompareItemCommentService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/ISarFileCompareItemCommentService.java index b9f86323e..bdbb7e97a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/ISarFileCompareItemCommentService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/ISarFileCompareItemCommentService.java @@ -65,7 +65,7 @@ public interface ISarFileCompareItemCommentService extends IService queryList(); - SarFileCompareResultVO queryCompareResult(String infoId); + SarFileCompareResultVO queryCompareResult(String infoId,String comment); void exportResXls(HttpServletRequest request,HttpServletResponse response, String infoId, String selectIds, boolean includeComments, String cut); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemCommentServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemCommentServiceImpl.java index f695abd12..4872fd1ba 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemCommentServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/service/impl/SarFileCompareItemCommentServiceImpl.java @@ -11,6 +11,7 @@ import com.jero.modules.compare.service.ISarFileCompareInfoService; import com.jero.modules.compare.service.ISarFileCompareItemCommentService; import com.jero.modules.compare.service.ISarFileCompareItemService; import com.jero.modules.system.util.StringUtils; +import org.apache.commons.lang3.ObjectUtils; import org.apache.poi.hssf.usermodel.HSSFClientAnchor; import org.apache.poi.hssf.usermodel.HSSFPatriarch; import org.apache.poi.hssf.usermodel.HSSFWorkbook; @@ -134,7 +135,7 @@ public class SarFileCompareItemCommentServiceImpl extends ServiceImpl list = queryListByInfoId(infoId); + List list = queryListByInfoId(infoId,comment); Map sfcItemMap = SarFileCompareItemServiceImpl.queryMapByInfoId(infoId); for (SarFileCompareItemComment sfcItemCom : list) { SarFileCompareItemComVO itemComVO = new SarFileCompareItemComVO(); @@ -174,8 +175,11 @@ public class SarFileCompareItemCommentServiceImpl extends ServiceImpl queryListByInfoId(String infoId) { + public List queryListByInfoId(String infoId,String comment) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + if (ObjectUtils.isNotEmpty(comment)) { + queryWrapper.eq(SarFileCompareItemComment::getComment, comment); + } queryWrapper.eq(SarFileCompareItemComment::getInfoId, infoId); queryWrapper.orderBy(true, true, SarFileCompareItemComment::getCreateTime); List list = this.list(queryWrapper); From 270e9d330aadd8a5a82348fc1bd1cbba4532c480 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Wed, 28 Sep 2022 17:02:39 +0800 Subject: [PATCH 42/93] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=89=E6=9C=9F?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/comparisonResults.vue | 36 +++++++++++++++---- 1 file changed, 30 insertions(+), 6 deletions(-) diff --git a/jero-web/src/views/documentTools/documentComparison/components/comparisonResults.vue b/jero-web/src/views/documentTools/documentComparison/components/comparisonResults.vue index 9c66155a9..d90985d0b 100644 --- a/jero-web/src/views/documentTools/documentComparison/components/comparisonResults.vue +++ b/jero-web/src/views/documentTools/documentComparison/components/comparisonResults.vue @@ -9,6 +9,16 @@ {{$t('comparisonResults')}}
+
+ + {{$t('viewConsistentAssessment')}} +
+
+ + {{$t('viewAll')}} +
@@ -65,7 +75,8 @@
-
+
@@ -176,6 +187,7 @@ isDisplay: false, fullCheckbox: false, resultData: {}, + comment: '', language: '', url: { exportData: '/compare/sarFileCompareItemComment/exportResXls' @@ -207,7 +219,8 @@ let query = { selectIds: checkboxList.join(','), includeComments: fullCheckbox, - infoId: this.$route.query.id + infoId: this.$route.query.id, + comment: this.comment } downloadFile(this.url.exportData, this.resultData.serialNumberLeft + ' - ' + this.resultData.serialNumberRight + this.$t('comparisonResults') + '.xls', query, this.Deselect) }, @@ -217,10 +230,19 @@ this.indeterminate = false this.checkAll = false }, + viewConsistentAssessmentClick() { + this.comment = '一致' + this.getData() + }, + viewAllClick() { + this.comment = '' + this.getData() + }, getData() { let query = { id: this.$route.query.id, - infoId: this.$route.query.id + infoId: this.$route.query.id, + comment: this.comment } this.loading = true getAction('/compare/sarFileCompareItemComment/queryCompareResult', query).then((res) => { @@ -536,7 +558,7 @@ .detail-content-content-text-color { border: 1px solid #00B3BE; - background: rgba(0,179,190,0.0300); + background: rgba(0, 179, 190, 0.0300); } .detail-content-left { @@ -577,9 +599,11 @@ border-radius: 4px; float: left; } - .detail-content-bottom-color{ - background: rgba(0,179,190,0.0300); + + .detail-content-bottom-color { + background: rgba(0, 179, 190, 0.0300); } + .detail-content-bottom-left { width: 115px; font-size: 14px; From f0d8fd0e59d409346cd228e3c4b6605f6af1f9f6 Mon Sep 17 00:00:00 2001 From: CD <1103614279@qq.com> Date: Wed, 28 Sep 2022 17:05:25 +0800 Subject: [PATCH 43/93] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=8A=A0=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SarFileCompareItemCommentController.java | 5 +++-- .../compare/service/ISarFileCompareItemCommentService.java | 2 +- .../service/impl/SarFileCompareItemCommentServiceImpl.java | 5 ++++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareItemCommentController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareItemCommentController.java index eea6df830..f1cebbb13 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareItemCommentController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/controller/SarFileCompareItemCommentController.java @@ -179,8 +179,9 @@ public class SarFileCompareItemCommentController extends JeroController list = null; if (includeComments && StringUtils.isEmpty(selectIds)) { //只导出全文评论的情况 @@ -198,6 +198,9 @@ public class SarFileCompareItemCommentServiceImpl extends ServiceImpl Date: Wed, 28 Sep 2022 17:08:53 +0800 Subject: [PATCH 44/93] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=89=E6=9C=9F?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/countryCardView.vue | 32 +++++++++++++++++-- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue index dbf4c5fd1..703474c0d 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue @@ -52,10 +52,14 @@ - - {{$t('viewFile')}} + + + + + + {{$t('viewFile')}} + \ No newline at end of file From e0b606e943db31fabf9bf85043484dcb7f3b7fab Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Wed, 28 Sep 2022 17:24:15 +0800 Subject: [PATCH 45/93] =?UTF-8?q?=E6=9C=88=E6=8A=A5=E5=AF=BC=E5=87=BA--?= =?UTF-8?q?=E8=A1=8C=E9=97=B4=E8=B7=9D(=E6=B3=A8=E9=87=8A=E6=8E=89)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LawsMonthlyReportWriteEOServiceImpl.java | 60 ++++++++++++------- .../jero/modules/report/util/WordUtil.java | 18 +++++- 2 files changed, 55 insertions(+), 23 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java index 789ae882b..fa42b801f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java @@ -648,7 +648,7 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl lawsMonthlyReportWriteEOS, + private void coverCn(List lawsMonthlyReportWriteEOS, String titleCN, XWPFDocument document) { + //封面标识 + String flag = "cover"; String moth = lawsMonthlyReportWriteEOS.get(0).getMonth().replaceAll("-", "年") + "月"; titleCN = "\r\n\r\n" + titleCN + "\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n"; WordUtil.exportWord(document, titleCN, null, ParagraphAlignment.CENTER, 0, 18, - false, false, "Blue Sky Noto Regular",null,null); - WordUtil.exportWord(document, moth, null, ParagraphAlignment.CENTER, 0, 12, - false, true, "Blue Sky Noto Regular",null,null); + false, false, "Blue Sky Noto Regular",null,null,flag); + WordUtil.exportWord(document, moth+"\r\n", null, ParagraphAlignment.CENTER, 0, 12, + false, true, "Blue Sky Noto Regular",null,null,flag); + } + //封面 + private void coverEn(List lawsMonthlyReportWriteEOS, + String titleCN, + XWPFDocument document) { + //封面标识 + String flag = "cover"; + String moth = lawsMonthlyReportWriteEOS.get(0).getMonth().replaceAll("-", "年") + "月"; + + titleCN = "\r\n\r\n" + titleCN + "\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n"; + WordUtil.exportWord(document, titleCN, null, ParagraphAlignment.CENTER, 0, 18, + false, false, "Blue Sky Noto Regular",null,null,flag); + WordUtil.exportWord(document, moth+"\r\n", null, ParagraphAlignment.CENTER, 0, 12, + false, true, "Blue Sky Noto Regular",null,null,flag); } private void wordContent(List lawsMonthlyReportWriteEOS, List lawsMonthlyReportTitleTemplateEOS, @@ -904,8 +920,8 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl新征求意见清单模板, 新发布标准清单模板 @@ -960,13 +976,13 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl Date: Wed, 28 Sep 2022 17:29:03 +0800 Subject: [PATCH 46/93] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=89=E6=9C=9F?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/modules/defaultTemplate.vue | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue index d989005a2..9a91fe34f 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue @@ -107,7 +107,7 @@ {{$t('status')}}
- + {{$t('usage')}}
- + \ No newline at end of file From 4624187856647149077db5197b192f7ceabce4ab Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Wed, 28 Sep 2022 17:34:49 +0800 Subject: [PATCH 47/93] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=89=E6=9C=9F?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/problemKnowledgeBaseListView.vue | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseListView.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseListView.vue index a26329b79..292227312 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseListView.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseListView.vue @@ -470,15 +470,15 @@ font-size: 14px; font-weight: 400; color: #040B29; - display: -webkit-box; - text-overflow: ellipsis; - /*! autoprefixer: off */ - -webkit-box-orient: vertical; - -webkit-line-clamp: 2; - /*! autoprefixer: on;*/ - text-justify: inter-ideograph; + /*display: -webkit-box;*/ + /*text-overflow: ellipsis;*/ + /*!*! autoprefixer: off *!*/ + /*-webkit-box-orient: vertical;*/ + /*-webkit-line-clamp: 2;*/ + /*!*! autoprefixer: on;*!*/ + /*text-justify: inter-ideograph;*/ + /*overflow: hidden;*/ word-break: break-all; - overflow: hidden; } .content-box-content-botton { From 4d3f94e712f48ba4bb92c427ac8f5636dd758aa9 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Wed, 28 Sep 2022 17:37:22 +0800 Subject: [PATCH 48/93] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=89=E6=9C=9F?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/problemKnowledgeBaseListView.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseListView.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseListView.vue index 292227312..81b22a7d4 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseListView.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseListView.vue @@ -102,7 +102,7 @@
- + {{val.createBy}} {{val.createTime}}
From 9b9660fa9ba2b4295568257c65323ab810f4b8c1 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Wed, 28 Sep 2022 17:53:59 +0800 Subject: [PATCH 49/93] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=89=E6=9C=9F?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tabComponents/processCenter/index.vue | 67 ++++++++++++------- 1 file changed, 43 insertions(+), 24 deletions(-) diff --git a/jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue b/jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue index 0a37d733a..fed2e4cf3 100644 --- a/jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue +++ b/jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue @@ -23,25 +23,25 @@
- - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + {{$t('query')}} @@ -73,6 +73,22 @@ {{$t('Processing')}} + + + {{record.serialNumber}} + + + {{record.prcNum}} + + + + + {{record.title}} + + + {{record.prcName}} + +
0) { let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys)) @@ -241,8 +260,8 @@ }) for (let i = 0; i < content.length; i++) { if (content[i].taskDefinitionKey != content[0].taskDefinitionKey) { - this.$message.warning(this.$t('processNodesAreInconsistentPleaseSelectConsistentData')) - return + this.$message.warning(this.$t('processNodesAreInconsistentPleaseSelectConsistentData')) + return } } this.$refs.batchProcessingRef.getData(JSON.parse(JSON.stringify(content))) From b034f1b13949d6f204510f8723d73a9c75da787d Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Wed, 28 Sep 2022 17:56:02 +0800 Subject: [PATCH 50/93] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E5=BE=85=E5=8A=9E=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?-=E5=8D=95=E7=8B=AC=E5=A4=84=E7=90=86=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E6=B5=81=E7=A8=8B=E6=95=B0=E6=8D=AE=E3=80=82?= =?UTF-8?q?=E5=9B=9E=E6=98=BE=E7=BC=96=E5=8F=B7=E3=80=81=E6=A0=87=E9=A2=98?= =?UTF-8?q?=E4=B8=BA=20=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95=E7=9A=84?= =?UTF-8?q?=E7=BC=96=E5=8F=B7=E3=80=81=E6=A0=87=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/entity/ProjectLibraryBase.java | 4 + .../service/IProjectLibraryBaseService.java | 2 + .../impl/ProjectLibraryBaseServiceImpl.java | 45 +++++++++- .../wkflow/controller/TaskController.java | 90 ++++++++++++++++++- .../modules/wkflow/entity/BusProcessName.java | 4 + 5 files changed, 140 insertions(+), 5 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java index 46cdba5bb..b5eeb4c7e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java @@ -105,4 +105,8 @@ public class ProjectLibraryBase implements Serializable { @TableField(exist = false) private String endTime; + + /**目标市场展示名称*/ + @TableField(exist = false) + private java.lang.String targetMarketName; } 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 d031986f3..f6f29e54c 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 @@ -89,4 +89,6 @@ public interface IProjectLibraryBaseService extends IService void exportProjectDetailsStatisticsGroupByTerritoryXls(HttpServletResponse response, HttpServletRequest request, Map params); void checkData(String id, String cut); + + void disposeData(List records,String cut,boolean disposeTargetMarketFlag); } 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 783666259..583d26a56 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 @@ -1,11 +1,13 @@ package com.jero.modules.project.service.impl; +import cn.hutool.core.lang.func.Func1; 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.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.constant.enums.CutEnum; import com.jero.common.exception.JeroBootException; +import com.jero.common.system.vo.DictModel; import com.jero.common.system.vo.LoginUser; import com.jero.modules.cert.collect.service.IParamsManifestEOService; import com.jero.modules.enums.DictCodeEnum; @@ -17,8 +19,10 @@ import com.jero.modules.project.service.IProjectLibraryBaseService; import com.jero.modules.project.service.IProjectLibraryRoleRelEOService; import com.jero.modules.system.entity.SysDictItem; import com.jero.modules.system.entity.SysUser; +import com.jero.modules.system.enums.DicCodeEnum; import com.jero.modules.system.mapper.SysDictItemMapper; import com.jero.modules.system.mapper.SysUserMapper; +import com.jero.modules.system.service.ISysDictService; import com.jero.modules.system.service.impl.SysDictItemServiceImpl; import com.jero.modules.system.util.StringUtils; import org.apache.commons.collections4.CollectionUtils; @@ -93,6 +97,9 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl queryById(String id) { List records = projectLibraryBaseMapper.queryById(id); - disposeData(records); + disposeData(records,"",false); for(ProjectLibraryBase projectLibraryBase: records){ if(StringUtils.isNotBlank(projectLibraryBase.getYearName())){ projectLibraryBase.setProjectName(projectLibraryBase.getProjectName() + "-" + projectLibraryBase.getYearName()); @@ -362,7 +369,7 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl result = projectLibraryBaseMapper.queryPageList(page, params); List records = result.getRecords(); - disposeData(records); + disposeData(records,"",false); for(ProjectLibraryBase projectLibraryBase: records){ if(StringUtils.isNotBlank(projectLibraryBase.getYearName())){ projectLibraryBase.setProjectName(projectLibraryBase.getProjectName() + "-" + projectLibraryBase.getYearName()); @@ -371,7 +378,9 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl records) { + @Override + public void disposeData(List records,String cut,boolean disposeTargetMarketFlag) { + List targetMarketList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode()); for (ProjectLibraryBase projectLibraryBase : records) { List sysUsers = new ArrayList<>(); //认证工程师多个id查询 @@ -402,6 +411,36 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl { + boolean flag = false; + for (String s : targetMarketArr) { + if (StringUtils.equals(s, targetMarket.getValue())) { + flag = true; + } + } + return flag; + }).map(DictModel::getTextEn).collect(Collectors.joining(",")); + }else { + targetMarketName = targetMarketList.stream().filter(targetMarket -> { + boolean flag = false; + for (String s : targetMarketArr) { + if (StringUtils.equals(s, targetMarket.getValue())) { + flag = true; + } + } + return flag; + }).map(DictModel::getText).collect(Collectors.joining(",")); + } + projectLibraryBase.setTargetMarketName(targetMarketName); + } + } + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/TaskController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/TaskController.java index 590fa4d09..f7384161d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/TaskController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/TaskController.java @@ -1,20 +1,29 @@ package com.jero.modules.wkflow.controller; -import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 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.vo.LoginUser; +import com.jero.modules.project.entity.ProjectLawsInventoryEO; +import com.jero.modules.project.entity.ProjectLibraryBase; +import com.jero.modules.project.entity.ProjectNameInfoEO; +import com.jero.modules.project.entity.ProjectYearNameInfoEO; +import com.jero.modules.project.service.IProjectLawsInventoryEOService; +import com.jero.modules.project.service.IProjectLibraryBaseService; +import com.jero.modules.project.service.IProjectNameInfoEOService; +import com.jero.modules.project.service.IProjectYearNameInfoEOService; import com.jero.modules.wkflow.entity.BusMes; import com.jero.modules.wkflow.entity.BusProcessName; import com.jero.modules.wkflow.entity.BusProcessNew; import com.jero.modules.wkflow.entity.TaskCommonQuery; +import com.jero.modules.wkflow.enums.FlowTypeEnum; import com.jero.modules.wkflow.feginClient.impl.TaskFeignClientImpl; import com.jero.modules.wkflow.page.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import me.zhyd.oauth.utils.StringUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -22,6 +31,7 @@ import org.springframework.web.bind.annotation.*; import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; @Slf4j @Api(tags="待办任务") @@ -31,6 +41,14 @@ public class TaskController { @Autowired private TaskFeignClientImpl taskFeignClient; + @Autowired + private IProjectLawsInventoryEOService projectLawsInventoryEOService; + @Autowired + private IProjectLibraryBaseService projectLibraryBaseService; + @Autowired + private IProjectNameInfoEOService projectNameInfoEOService; + @Autowired + private IProjectYearNameInfoEOService projectYearNameInfoEOService; /** * 通用接口 @@ -75,6 +93,7 @@ public class TaskController { List list1 = this.startPage(busProcessNames, taskCommonQuery.getCurrent(), taskCommonQuery.getSize()); Page pageInfo = new Page(); if(busProcessNames!=null){ + this.disposeTaskToConfirm(busProcessNames,taskCommonQuery); pageInfo.setList(list1); pageInfo.setPageNo(taskCommonQuery.getCurrent()); pageInfo.setCount(Long.valueOf(busProcessNames.size())); @@ -89,6 +108,73 @@ public class TaskController { return pageInfo; } + /** + * 处理任务确认流程回显数据 + * @param busProcessNames + */ + public void disposeTaskToConfirm(List busProcessNames,TaskCommonQuery taskCommonQuery){ + List projectLawsInventoryIdList = busProcessNames.stream().filter(busProcessName -> { + boolean flag = false; + if(org.apache.commons.lang3.StringUtils.equals(busProcessName.getPrcType(), FlowTypeEnum.RWQRLC.getValue())){ + flag = true; + } + return flag; + }).map(BusProcessName::getProjectLawsInventoryId).distinct().collect(Collectors.toList()); + List projectLibraryBaseList = new ArrayList<>(); + List projectLawsInventoryEOList = new ArrayList<>(); + + if(CollectionUtils.isNotEmpty(projectLawsInventoryIdList)){ + QueryWrapper lawsInventoryQueryWrap = new QueryWrapper<>(); + lawsInventoryQueryWrap.lambda().in(ProjectLawsInventoryEO::getId,projectLawsInventoryIdList); + projectLawsInventoryEOList = this.projectLawsInventoryEOService.list(lawsInventoryQueryWrap); + + List projectLibraryIdList = projectLawsInventoryEOList.stream().map(ProjectLawsInventoryEO::getProjectLibraryId).distinct().collect(Collectors.toList()); + if(CollectionUtils.isNotEmpty(projectLibraryIdList)){ + QueryWrapper libraryBaseQueryWrap = new QueryWrapper<>(); + libraryBaseQueryWrap.lambda().in(ProjectLibraryBase::getId,projectLibraryIdList); + projectLibraryBaseList = this.projectLibraryBaseService.list(libraryBaseQueryWrap); + this.projectLibraryBaseService.disposeData(projectLibraryBaseList,taskCommonQuery.getCut(),true); + } + for (BusProcessName busProcessName : busProcessNames) { + if(org.apache.commons.lang3.StringUtils.equals(busProcessName.getPrcType(),FlowTypeEnum.RWQRLC.getValue())){ + if(CollectionUtils.isNotEmpty(projectLawsInventoryEOList)){ + List projectLawsInventoryS = projectLawsInventoryEOList.stream().filter(lawsInventory -> { + boolean flag = false; + if(org.apache.commons.lang3.StringUtils.equals(busProcessName.getProjectLawsInventoryId(),lawsInventory.getId())){ + flag = true; + } + return flag; + }).collect(Collectors.toList()); + if(CollectionUtils.isNotEmpty(projectLawsInventoryS) && CollectionUtils.isNotEmpty(projectLibraryBaseList)){ + ProjectLawsInventoryEO projectLawsInventoryEO = projectLawsInventoryS.get(0); + busProcessName.setSerialNumber(projectLawsInventoryEO.getSerialNumber()); + busProcessName.setTitle(projectLawsInventoryEO.getTitle()); + + List projectLibraryBaseS = projectLibraryBaseList.stream().filter(projectLibraryBase -> { + boolean flag = false; + if (org.apache.commons.lang3.StringUtils.equals(projectLibraryBase.getId(), projectLawsInventoryEO.getProjectLibraryId())) { + flag = true; + } + return flag; + }).collect(Collectors.toList()); + if(CollectionUtils.isNotEmpty(projectLibraryBaseS)){ + ProjectLibraryBase projectLibraryBase = projectLibraryBaseS.get(0); + ProjectNameInfoEO projectNameInfoEO = this.projectNameInfoEOService.getOne( + new QueryWrapper().lambda().eq(ProjectNameInfoEO::getId, projectLibraryBase.getProjectNameId()) + ); + ProjectYearNameInfoEO projectYearNameInfoEO = this.projectYearNameInfoEOService.getOne( + new QueryWrapper().lambda().eq(ProjectYearNameInfoEO::getId, projectLibraryBase.getYearNameId()) + ); + + busProcessName.setProjectName(projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + "-" +projectLibraryBase.getTargetMarketName()); + } + } + } + } + } + } + } + @AutoLog(value = "查询草稿") @ApiOperation(value="查询草稿", notes="查询草稿") @PostMapping("/queryTaskDraft") diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/entity/BusProcessName.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/entity/BusProcessName.java index 29eeb524d..2b5bb65a1 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/entity/BusProcessName.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/entity/BusProcessName.java @@ -74,4 +74,8 @@ public class BusProcessName implements Serializable { private String handlingTime; private String projectLawsInventoryId; + + private String serialNumber; + + private String title; } From d0b93b1b7a307f104e826cf99c72ff2439b810ab Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Wed, 28 Sep 2022 23:15:02 +0800 Subject: [PATCH 51/93] =?UTF-8?q?=E6=9C=88=E6=8A=A5=E5=AF=BC=E5=87=BA--?= =?UTF-8?q?=E9=80=82=E7=94=A8=E8=8C=83=E5=9B=B4,=E7=8A=B6=E6=80=81,?= =?UTF-8?q?=E7=94=A8=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/report/enums/ScopeEnum.java | 53 ++++ .../jero/modules/report/enums/StateEnum.java | 40 +++ .../jero/modules/report/enums/UsageEnum.java | 40 +++ .../jero/modules/report/util/WordUtil.java | 238 ++++++++++++++++-- 4 files changed, 348 insertions(+), 23 deletions(-) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/enums/ScopeEnum.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/enums/StateEnum.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/enums/UsageEnum.java diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/enums/ScopeEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/enums/ScopeEnum.java new file mode 100644 index 000000000..a3afde435 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/enums/ScopeEnum.java @@ -0,0 +1,53 @@ +package com.jero.modules.report.enums; + + +/** + * @description + * @date 2022/1/21 15:22 + * @auth zhn + */ +public enum ScopeEnum { + M("M","M","1"), + N("N","N","2"), + COMPANY("企业","","3"), + WHOLE_CAR("整车","","4"), + SYSTEM_PARTS("系统/零部件","","5"), + NEW_CAR("新车型","","6"), + PRODUCTION_CAR("在产车型","","7"); + + + + String nameCn; + String nameEn; + String value; + + private ScopeEnum(String nameCn,String nameEn, String value) { + this.nameCn = nameCn; + this.nameEn = nameEn; + this.value = value; + } + + public String getNameCn() { + return nameCn; + } + + public void setNameCn(String nameCn) { + this.nameCn = nameCn; + } + + public String getNameEn() { + return nameEn; + } + + public void setNameEn(String nameEn) { + this.nameEn = nameEn; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/enums/StateEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/enums/StateEnum.java new file mode 100644 index 000000000..2543ae2f8 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/enums/StateEnum.java @@ -0,0 +1,40 @@ +package com.jero.modules.report.enums; + + +/** + * @description + * @date 2022/1/21 15:22 + * @auth zhn + */ +public enum StateEnum { + DRAFT("草稿","1"), + PUBLICITY("公示稿","2"), + ISSUE("发布稿","3"); + + + + + String name; + String value; + + private StateEnum(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; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/enums/UsageEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/enums/UsageEnum.java new file mode 100644 index 000000000..1558d7471 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/enums/UsageEnum.java @@ -0,0 +1,40 @@ +package com.jero.modules.report.enums; + + +/** + * @description + * @date 2022/1/21 15:22 + * @auth zhn + */ +public enum UsageEnum { + FORCE("强制","1"), + RECOMMEND("推荐","2"), + INSTALLATION_REQUIREMENTS("安装需符合","3"); + + + + + String name; + String value; + + private UsageEnum(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; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java index 76c03477d..3296ff4fa 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java @@ -496,7 +496,7 @@ public class WordUtil { String stateName = dictItem(sysDictItems, state,cut, DictCodeReportEnum.STATE.getValue()); String useMethodName = dictItem(sysDictItems, useMethod,cut, DictCodeReportEnum.USEMETHOD.getValue()); - XWPFTable table = document.createTable(12, 2); + XWPFTable table = document.createTable(11, 2); //表格属性 CTTblPr tablePr = table.getCTTbl().addNewTblPr(); //固定列宽(英文和数字的时候自动换行) @@ -518,52 +518,52 @@ public class WordUtil { //第1行 setCell(table, 0, "相关领域",technologyTerritoryName); //第2行 - setCell(table,1, "适用车型",applyCarName); +// setCell(table,1, "适用车型",applyCarName); //第3行 - setCell(table,2, "适用范围",applyScopeName); + setCellThree(table,1, "适用范围",applyScopeName,sysDictItems,DictCodeReportEnum.APPLYSCOPE.getValue()); //第4行 - setCell(table,3, "状态",stateName); + setCellThree(table,2, "状态",stateName,sysDictItems,DictCodeReportEnum.STATE.getValue()); //第5行 - setCell(table,4, "用法",useMethodName); + setCellThree(table,3, "用法",useMethodName,sysDictItems,DictCodeReportEnum.USEMETHOD.getValue()); //第6行 - setCell(table,5, "实施车型",implementCar); + setCell(table,4, "实施车型",implementCar); //第7行 - setCell(table,6, "新车型实施日期",newCarImplementTime); + setCell(table,5, "新车型实施日期",newCarImplementTime); //第8行 - setCell(table,7, "在产车实施日期",productionCarImplementTime); + setCell(table,6, "在产车实施日期",productionCarImplementTime); //第9行 - setCell(table,8, "主要内容",contentCn); + setCell(table,7, "主要内容",contentCn); //第10行 - setCell(table,9, "NIO工作进展",workProgressCn); + setCell(table,8, "NIO工作进展",workProgressCn); //第11行 - setCell(table,10, "法规联系人",lawsContact); + setCell(table,9, "法规联系人",lawsContact); //第12行 - setCell(table,11, "链接",link); + setCell(table,10, "链接",link); }else{ //第1行 setCell(table,0, "Related Areas",technologyTerritoryName); //第2行 - setCell(table,1,"Vehicle Type",applyCarName); +// setCell(table,1,"Vehicle Type",applyCarName); //第3行 - setCell(table,2,"Scope",applyScopeName); + setCellThree(table,1,"Scope",applyScopeName,sysDictItems,DictCodeReportEnum.APPLYSCOPE.getValue()); //第4行 - setCell(table,3,"Status",stateName); + setCellThree(table,2,"Status",stateName,sysDictItems,DictCodeReportEnum.APPLYSCOPE.getValue()); //第5行 - setCell(table,4,"usage",useMethodName); + setCellThree(table,3,"Usage",useMethodName,sysDictItems,DictCodeReportEnum.APPLYSCOPE.getValue()); //第6行 - setCell(table,5,"Implementation Model",implementCar); + setCell(table,4,"Implementation Model",implementCar); //第7行 - setCell(table,6,"New Type Execution Date",newCarImplementTime); + setCell(table,5,"New Type Execution Date",newCarImplementTime); //第8行 - setCell(table,7,"New Vehicle Execution Date",productionCarImplementTime); + setCell(table,6,"New Vehicle Execution Date",productionCarImplementTime); //第9行 - setCell(table,8,"Main Content",contentEn); + setCell(table,7,"Main Content",contentEn); //第10行 - setCell(table,9,"NIO Work Progress",workProgressEn); + setCell(table,8,"NIO Work Progress",workProgressEn); //第11行 - setCell(table, 10,"Regulatory Contact",lawsContact); + setCell(table,9,"Regulatory Contact",lawsContact); //第12行 - setCell(table, 11,"Link",link); + setCell(table, 10,"Link",link); } // ctTblLayoutType.setType(STTblLayoutType.FIXED); @@ -964,6 +964,7 @@ public class WordUtil { //设置单元格边距 XWPFTableCell cell0 = table.getRow(number).getCell(0); cellPadding(cell0,fieldName); + CTTblWidth ctTblWidth1 = table.getRow(number).getCell(1).getCTTc().addNewTcPr().addNewTcW(); ctTblWidth1.setType(STTblWidth.DXA); ctTblWidth1.setW(BigInteger.valueOf(6015)); @@ -978,6 +979,43 @@ public class WordUtil { cellPadding(cell1,technologyTerritory); } +// XWPFParagraph para = table.getRow(number).getCell(1).getParagraphs().get(0); +// XWPFRun run = para.createRun();//对某个段落设置格式 +// run.addBreak();//换行 +// +// table.getRow(number).getCell(0).setText(fieldName); +// table.getRow(number).getCell(1).setText(technologyTerritory); + + } + private static void setCellThree(XWPFTable table, int number, String fieldName,String technologyTerritory, + List sysDictItems,String code) { + table.getRow(number).setHeight(500); + CTTblWidth ctTblWidth0 = table.getRow(number).getCell(0).getCTTc().addNewTcPr().addNewTcW(); + ctTblWidth0.setType(STTblWidth.DXA); + ctTblWidth0.setW(BigInteger.valueOf(2296));//宽度通过计算得来-->列表实际宽度除以2.54再乘以1440 + //设置单元格边距 + XWPFTableCell cell0 = table.getRow(number).getCell(0); + cellPadding(cell0,fieldName); + + CTTblWidth ctTblWidth1 = table.getRow(number).getCell(1).getCTTc().addNewTcPr().addNewTcW(); + ctTblWidth1.setType(STTblWidth.DXA); + ctTblWidth1.setW(BigInteger.valueOf(6015)); + //设置单元格边距 + XWPFTableCell cell1 = table.getRow(number).getCell(1); + if("链接".equals(fieldName) || "Link".equals(fieldName)){ + //设置超链接 + if(StringUtils.isNotEmpty(technologyTerritory)){ + cellLink(cell1,technologyTerritory); + } + }else{ + if("适用范围".equals(fieldName) || "状态".equals(fieldName) || "用法".equals(fieldName) + || "Scope".equals(fieldName) || "Status".equals(fieldName) || "Usage".equals(fieldName)){ + threeSet(cell1,technologyTerritory,fieldName,sysDictItems,code); + }else{ + cellPadding(cell1,technologyTerritory); + } + } + // XWPFParagraph para = table.getRow(number).getCell(1).getParagraphs().get(0); // XWPFRun run = para.createRun();//对某个段落设置格式 // run.addBreak();//换行 @@ -1046,6 +1084,160 @@ public class WordUtil { } + //适用范围,状态,用法三个字段单独处理 + public static void threeSet(XWPFTableCell cell,String text,String fieldName,List sysDictItems,String code){ + List sysDictItemList = sysDictItems.stream().filter(e -> code.equals(e.getDictCode())).collect(Collectors.toList()); + //1. 设置单元格页边距 + CTTc ctTc = cell.getCTTc(); + CTTcPr cttcpr =ctTc.isSetTcPr() ? ctTc.getTcPr() : ctTc.addNewTcPr(); + CTTcMar ctTcMar = cttcpr.isSetTcMar() ? cttcpr.getTcMar() : cttcpr.addNewTcMar(); + (ctTcMar.isSetLeft() ? ctTcMar.getLeft() : ctTcMar.addNewLeft()).setW(BigInteger.valueOf(119));//左边距 + (ctTcMar.isSetTop() ? ctTcMar.getTop() : ctTcMar.addNewTop()).setW(BigInteger.valueOf(63));//上边距 + + + //2. 设置文本及文本的字体 + //获取 CTP + CTP ctP = (ctTc.sizeOfPArray() == 0) ? + ctTc.addNewP() : ctTc.getPArray(0); + //getParagraph(ctP) 获取 XWPFParagraph + XWPFParagraph par = cell.getParagraph(ctP); + //XWPFRun 设置格式 + XWPFRun run = par.createRun(); + //单元格内容换行 □ ■ + if(StringUtils.isNotEmpty(text)){ + StringBuilder sb = new StringBuilder(); + if("适用范围".equals(fieldName)){ + String itemText = "M,N,企业,整车,系统/零部件,新车型,在产车型"; + setBlank(text, run, sb, itemText); + } + if("Scope".equals(fieldName)){ + String itemText = "M,N,Enterprise,Vehicle,System/Parts,New Car Model,Models In Production"; + setBlank(text, run, sb, itemText); + + } + if("状态".equals(fieldName)){ + String itemText = "草稿,公示稿,发布稿"; + setBlank(text, run, sb, itemText); + } + if("Status".equals(fieldName)){ + String itemText = "Draft,Public Notice,Release"; + setBlank(text, run, sb, itemText); + } + if("用法".equals(fieldName)){ + String itemText = "强制,推荐,安装需符合"; + setBlank(text, run, sb, itemText); + } + if("Usage".equals(fieldName)){ + String itemText = "Constraint,Recommend,Installation Is Compliant"; + setBlank(text, run, sb, itemText); + } + } + + //设置字体样式,大小 + run.setFontSize(10); + run.setFontFamily("Blue Sky Noto Regular"); + + } + + private static void setBlank(String text, XWPFRun run, StringBuilder sb, String itemText) { + for (String value : itemText.split(",")) { + String blank = getBlank(value); + if(text.contains(value)){ + sb.append("■"+value+blank); + }else{ + sb.append("□"+value+blank); + } + } + String[] split = sb.toString().split("\r\n"); + for (int i = 0; i < split.length; i++) { + run.setText(split[i]); + if(i Date: Thu, 29 Sep 2022 09:47:42 +0800 Subject: [PATCH 52/93] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=89=E6=9C=9F?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/countryCardView.vue | 43 +++++++++++++++---- 1 file changed, 35 insertions(+), 8 deletions(-) diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue index 703474c0d..dac938744 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardView.vue @@ -53,11 +53,14 @@ :class="{'content-box-box-text-admin':!item2.lableName || item2.lableName == 'null' || item2.lableName == 'undefined'? true : false}" class="content-box-box-text content-box-box-text-index" v-else-if="item2.lableType == 7 && item2.lableName && index2 != 0"> - - - - - + + + {{item2.contentFileName}} + + + + {{$t('viewFile')}} @@ -102,6 +105,7 @@ import countryCardViewAdd from './countryCardViewAdd' import viewFileModel from '@/components/viewFileModel/index' import { mapGetters } from 'vuex' + import { Base64 } from 'js-base64' export default { name: 'countryCardView', @@ -122,6 +126,7 @@ countryCardViewList: [], applyMarkets: '', header_text: '', + downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download', url: { list: '/problemKnowledgeBase/countryCardTempEO/list', deleteOne: '' @@ -137,6 +142,25 @@ }, methods: { ...mapGetters(['userInfo']), + pdfPreview(fileQuery) { + let fileName = fileQuery.contentFileName + fileQuery.id = fileQuery.lableName + let index1 = fileName.lastIndexOf('.') + let index2 = fileName.length + let fileSuffix = fileName.substring(index1, index2) + if (fileSuffix == '.pdf') { + window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + fileQuery.id+'&userName='+this.userInfo().username)) + } else if (fileSuffix == '.docx' || fileSuffix == '.doc') { + let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix) + window.open(url, '_blank') + } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls' + || fileSuffix == '.png' || fileSuffix == '.jpeg' || fileSuffix == '.gif' || fileSuffix == '.jpg') { + let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix) + window.open(url, '_blank') + } else { + downloadFile('/sys/common/downLoadFile', fileQuery.contentFileName, { id: fileQuery.id }) + } + }, displayInformationClick() { this.$refs.displayInformationModelRef.getData(JSON.parse(JSON.stringify(this.displayList))) }, @@ -149,7 +173,7 @@ this.$refs.countryCardViewAddRef.add(this.countryCardViewList) }, download(item) { - downloadFile('/sys/common/downLoadFile', item.fileName, { id: item.id, userName: this.userInfo().username }) + downloadFile('/sys/common/downLoadFile', item.contentFileName, { id: item.lableName, userName: this.userInfo().username }) }, countryCardViewAddForm(val) { this.countryCardViewList = JSON.parse(JSON.stringify(val)) @@ -222,12 +246,14 @@ if (val.lableType == 3) { res1.list.push({ lableName: val.contentDropDownValue, - lableType: val.lableType + lableType: val.lableType, + contentFileName:val.contentFileName || '' }) } else { res1.list.push({ lableName: val.content, - lableType: val.lableType + lableType: val.lableType, + contentFileName:val.contentFileName || '' }) } } @@ -490,6 +516,7 @@ text-overflow: ellipsis; white-space: nowrap; float: left; + color: #040B29 } .icon-text { From c2b79bf730cf5be36edc31a0cc573a42c807c70c Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Thu, 29 Sep 2022 10:37:42 +0800 Subject: [PATCH 53/93] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=89=E6=9C=9F?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/problemKnowledgeBaseRelease.vue | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue index 48dfda617..67a491e01 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue @@ -158,13 +158,13 @@ }) }, titleClick(item) { - let newUrl = this.$router.resolve({ - path: '/problemKnowledgeBaseView', - query: { - id: item.id - } - }) - window.open(newUrl.href, '_blank') + // let newUrl = this.$router.resolve({ + // path: '/problemKnowledgeBaseView', + // query: { + // id: item.id + // } + // }) + // window.open(newUrl.href, '_blank') }, edit(val) { this.$router.push({ From 6814f4bf70b8c5c79aafcc0cbcfb5a5a36f57a70 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 29 Sep 2022 11:00:24 +0800 Subject: [PATCH 54/93] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E4=B8=AD=E5=BF=83--?= =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93(=E6=8A=80=E6=9C=AF=E9=A2=86?= =?UTF-8?q?=E5=9F=9F=E6=90=9C=E7=B4=A2)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DocumentSearchServiceImpl.java | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java index 7bbdfb98d..bcc454663 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java @@ -350,11 +350,17 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService { String key = entry.getKey(); String value = (String) entry.getValue(); if("technology_territory".equals(key) && ObjectUtils.isNotEmpty(value)){ - Map queryMapNew = new HashMap<>(); - Map queryMapTempNew = new HashMap<>(); - queryMapTempNew.put(key, "*"+value.replaceAll(",","*")+"*"); - queryMapNew.put("wildcard", queryMapTempNew); - must.add(queryMapNew); + JSONArray should = new JSONArray(); + + List> mapList = new ArrayList<>(); + for (String s : value.split(",")) { + Map map = new HashMap(); + map.put(key,"*"+s+"*"); + Map map1 = new HashMap<>(); + map1.put("wildcard",map); + should.add(map1); + } + must.add(should); }else{ Map map = new HashMap<>(); Map queryMap = new HashMap<>(); From cf4256c7960864421f803ca34a07231059123d5d Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Thu, 29 Sep 2022 11:04:02 +0800 Subject: [PATCH 55/93] =?UTF-8?q?=E6=96=87=E6=A1=A3=E7=BF=BB=E8=AF=91?= =?UTF-8?q?=EF=BC=8C=E5=B0=86=E7=BF=BB=E8=AF=91=E5=90=8E=E7=9A=84=E6=96=87?= =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E8=BE=93=E5=87=BAdoc=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../docTranslation/utils/TranslationDocumentUtils.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/docTranslation/utils/TranslationDocumentUtils.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/docTranslation/utils/TranslationDocumentUtils.java index 8e4aa43a5..477950de1 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/docTranslation/utils/TranslationDocumentUtils.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/docTranslation/utils/TranslationDocumentUtils.java @@ -115,8 +115,9 @@ public class TranslationDocumentUtils { //翻译后的文件路径 String translateAfterFilePath = uploadpath + "/tempZip/translationTempFile"; + String translateAfterFileName = sourceOssFile.getFileName().substring(0, sourceOssFile.getFileName().lastIndexOf(".")); try { - translateAfterFile = createTranslateAfterFile(translateAfterFilePath, translateAfterSb.toString(),sourceOssFile.getFileName()); + translateAfterFile = createTranslateAfterFile(translateAfterFilePath, translateAfterSb.toString(),translateAfterFileName); } catch (Exception ex) { ex.printStackTrace(); logger.error("翻译文档-写入文档失败：" + ex.getMessage()); @@ -137,7 +138,7 @@ public class TranslationDocumentUtils { if (!newFilePath.exists()) { newFilePath.mkdirs(); } - translateAfterFilePath = translateAfterFilePath + "/" + fileName; + translateAfterFilePath = translateAfterFilePath + "/" + fileName + ".doc"; File newFile = new File(translateAfterFilePath); if (!newFile.exists()) { newFile.createNewFile(); From 59e828a166520849e544716e337b960924ab545e Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Thu, 29 Sep 2022 14:10:45 +0800 Subject: [PATCH 56/93] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=89=E6=9C=9F?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 1 + jero-web/src/common/lang/zh-cn.js | 1 + .../components/evaluationResultsList.vue | 48 ++++++++++++++++++- .../components/evaluationResultsClause.vue | 39 ++++++++++++--- .../components/evaluationResultsWhole.vue | 32 +++++++++++++ .../technologyAssessment/index.vue | 6 ++- 6 files changed, 117 insertions(+), 10 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 446ed7756..81110e8fe 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1315,4 +1315,5 @@ module.exports = { consistentAssessment:'Consistent assessment', viewConsistentAssessment:'View Consistent Assessment', viewAll:'View All', + endProcess:'End Process', } \ 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 c587adabc..915e962fd 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1416,4 +1416,5 @@ module.exports = { consistentAssessment:'一致评估', viewConsistentAssessment:'查看一致评估', viewAll:'查看全部', + endProcess:'结束流程', } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue index e559e1e27..1e8d605e3 100644 --- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue +++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue @@ -8,6 +8,14 @@ {{$route.query.serialNumber +' '+$t('evaluationResults')}}
+
+
+ + {{$t('endProcess')}} +
+
@@ -70,6 +78,7 @@ import viewFileModel from '@/components/viewFileModel/index' import { getAction, putAction, downloadFile } from '@/api/manage' import { mapGetters } from 'vuex' + import { postAction } from '../../../../api/manage' export default { name: 'evaluationResultsList', @@ -85,6 +94,7 @@ pageNo: 1, dataSource: [], formInline: {}, + administrators:false, userInfoQuery: {}, columns: [ { @@ -143,6 +153,14 @@ mounted() { this.userInfoQuery = this.userInfo() this.getData() + this.administrators = false + if (this.userInfo().userRoleList && this.userInfo().userRoleList.length > 0) { + this.userInfo().userRoleList.forEach(res => { + if (res.roleCode == 'admin') { + this.administrators = true + } + }) + } }, methods: { ...mapGetters(['userInfo']), @@ -232,6 +250,20 @@ }, seeFileClick(item) { this.$refs.viewFileModelRef.clickButtonToUpload(item) + }, + endProcessClick() { + let query = { + ids: this.$route.query.id + } + postAction('/lawsOpinionGather/lawsOpinionGatherEO/batchCompleteTask', query).then((res) => { + if (res.success) { + this.$message.success(this.$t('OperationSuccessful')) + this.pageNo = 1 + this.getList() + } else { + this.$message.warning(this.$t('operationFailed')) + } + }) } } } @@ -239,6 +271,7 @@ \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue index 900365c82..02b4003c7 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue @@ -10,19 +10,26 @@
- + {{$t('initiateSupplementaryProcess')}}
+
+ + {{$t('endProcess')}} +
- - - - - + + + + +
{{$t('processBackground')}}: {{$route.query.processBackground}} @@ -122,6 +129,7 @@ import PersonnelSelection from '@/components/PersonnelSelection/index' import { getAction, postAction, downloadFile } from '@/api/manage' import viewFileModel from '@/components/viewFileModel/index' + import { mapGetters } from 'vuex' export default { name: 'evaluationResultsClause', @@ -228,14 +236,30 @@ ellipsis: true, width: 160 } - ] + ], + userInfoQuery: {} } }, mounted() { document.title = this.$route.query.serialNumber + ' ' + this.$t('regulatoryTechnicalEvaluationResults') + this.userInfoQuery = this.userInfo() this.getList() }, methods: { + ...mapGetters(['userInfo']), + endProcessClick() { + let query = { + ids: this.$route.query.id + } + postAction('/lawsTechnologyEvaluation/lawsTechnologyEvaluationEO/batchCompleteTask', query).then((res) => { + if (res.success) { + this.$message.success(this.$t('OperationSuccessful')) + this.getList() + } else { + this.$message.warning(this.$t('operationFailed')) + } + }) + }, CurrentStandard() { let query = { firstInitiation: '2', @@ -439,6 +463,7 @@ ::v-deep .ant-table-body { background: transparent !important; } + .operator-text-text { cursor: pointer; margin-right: 23px; diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue index 3756367b3..220707ec5 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue @@ -13,6 +13,13 @@ {{$t('initiateSupplementaryProcess')}}
+
+ + {{$t('endProcess')}} +
@@ -77,6 +84,7 @@ import PersonnelSelection from '@/components/PersonnelSelection/index' import { getAction, postAction, downloadFile } from '@/api/manage' import viewFileModel from '@/components/viewFileModel/index' + import { mapGetters } from 'vuex' export default { name: 'evaluationResultsWhole', @@ -88,6 +96,7 @@ return { queryParam: {}, dataSource: [], + administrators:false, url: { list: '/lawsTechnologyEvaluation/lawsTechnologyEvaluationComplianceResultEO/list', exportData: 'lawsTechnologyEvaluation/lawsTechnologyEvaluationComplianceResultEO/exportZip' @@ -121,10 +130,33 @@ } }, mounted() { + this.userInfoQuery = this.userInfo() document.title = this.$route.query.serialNumber + ' ' + this.$t('regulatoryTechnicalEvaluationResults') this.getList() + this.administrators = false + if (this.userInfo().userRoleList && this.userInfo().userRoleList.length > 0) { + this.userInfo().userRoleList.forEach(res => { + if (res.roleCode == 'admin') { + this.administrators = true + } + }) + } }, methods: { + ...mapGetters(['userInfo']), + endProcessClick() { + let query = { + ids: this.$route.query.id + } + postAction('/lawsTechnologyEvaluation/lawsTechnologyEvaluationEO/batchCompleteTask', query).then((res) => { + if (res.success) { + this.$message.success(this.$t('OperationSuccessful')) + this.getList() + } else { + this.$message.warning(this.$t('operationFailed')) + } + }) + }, CurrentStandard() { let query = { firstInitiation: '2', diff --git a/jero-web/src/views/businessSupport/technologyAssessment/index.vue b/jero-web/src/views/businessSupport/technologyAssessment/index.vue index 36d555566..b10acce8b 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/index.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/index.vue @@ -463,7 +463,8 @@ serialNumber: row.serialNumber, lawsTechnologyEvaluationId: row.id, standId: row.standId, - remark: row.remark + remark: row.remark, + createBy:row.createBy } }) window.open(newUrl.href, '_blank') @@ -476,7 +477,8 @@ serialNumber: row.serialNumber, lawsTechnologyEvaluationId: row.id, standId: row.standId, - remark: row.remark + remark: row.remark, + createBy:row.createBy } }) window.open(newUrl.href, '_blank') From 1a3d0f01ca2c96776f627c91f3f60336afa61b91 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Thu, 29 Sep 2022 14:12:30 +0800 Subject: [PATCH 57/93] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=89=E6=9C=9F?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/package.json | 1 + .../components/PersonnelSelection/index.vue | 103 +- .../components/virtualNodeTree/mixin/node.js | 116 ++ .../components/virtualNodeTree/model/node.js | 486 +++++++ .../virtualNodeTree/model/tree-store.js | 342 +++++ .../components/virtualNodeTree/model/util.js | 27 + .../virtualNodeTree/tree-virtual-node.vue | 138 ++ .../src/components/virtualNodeTree/tree.vue | 1133 +++++++++++++++++ 8 files changed, 2272 insertions(+), 74 deletions(-) create mode 100644 jero-web/src/components/virtualNodeTree/mixin/node.js create mode 100644 jero-web/src/components/virtualNodeTree/model/node.js create mode 100644 jero-web/src/components/virtualNodeTree/model/tree-store.js create mode 100644 jero-web/src/components/virtualNodeTree/model/util.js create mode 100644 jero-web/src/components/virtualNodeTree/tree-virtual-node.vue create mode 100644 jero-web/src/components/virtualNodeTree/tree.vue diff --git a/jero-web/package.json b/jero-web/package.json index 0a928ac24..f144b3265 100644 --- a/jero-web/package.json +++ b/jero-web/package.json @@ -21,6 +21,7 @@ "dayjs": "^1.8.0", "dom-align": "1.12.0", "echarts": "^5.0.2", + "element-ui": "^2.15.10", "enquire.js": "^2.1.6", "jquery": "^3.6.0", "js-base64": "^3.7.2", diff --git a/jero-web/src/components/PersonnelSelection/index.vue b/jero-web/src/components/PersonnelSelection/index.vue index 0ed9c5187..bcb3ce1c5 100644 --- a/jero-web/src/components/PersonnelSelection/index.vue +++ b/jero-web/src/components/PersonnelSelection/index.vue @@ -31,35 +31,22 @@
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + import { getAction, postAction } from '@/api/manage' + import virtualNodeTree from '@/components/virtualNodeTree/tree' import XEUtils from 'xe-utils' import VXETable from 'vxe-table' export default { name: 'index', props: ['query', 'value', 'personneQuery', 'isSingleChoice', 'isInput', 'isClass', 'isDelete', 'disabled'], + components: { + virtualNodeTree + }, data() { return { loading: true, @@ -114,60 +105,20 @@ }, methods: { - // loadTree(size) { - // this.loading = true - // setTimeout(() => { - // const trerData = JSON.parse(JSON.stringify(this.gData)) - // // 将树结构拍平，构建列表树结构 - // XEUtils.eachTree(trerData, (item, index, items, paths, parent, nodes) => { - // // 层级 - // item._LEVEL = nodes.length - 1 - // // 是否展开 - // item._EXPAND = false - // // 是否可视 - // item._VISIBLE = !item._LEVEL - // // 是否有子节点 - // item._HAS_CHILDREN = item.children && item.children.length > 0 - // // 是否叶子节点 - // item._IS_LEAF = !item._HAS_CHILDREN - // }) - // this.tree = trerData - // this.refreshTree() - // this.loading = false - // }, 200) - // }, - // // 切换树节点的展开、收缩 - // toggleTreeNode(row) { - // if (row._HAS_CHILDREN) { - // this.setTreeExpand(row, !row._EXPAND) - // } - // }, - // setTreeExpand(row, isExpand) { - // const matchObj = XEUtils.findTree(this.tree, item => item === row) - // row._EXPAND = isExpand - // if (matchObj) { - // XEUtils.eachTree(matchObj.item.children, (item, index, items, path, parent) => { - // item._VISIBLE = parent ? parent._EXPAND && parent._VISIBLE : isExpand - // }) - // } - // this.refreshTree() - // }, - // refreshTree() { - // const treeList = XEUtils.toTreeArray(this.tree) - // this.fullList = treeList - // this.gData = treeList.filter(item => item._VISIBLE) - // }, + handleCheckChange(val, checked, indeterminate) { + console.log(val) + console.log(this.checkboxList) + }, standardClick() { this.treeVisible = false this.departId = '' this.searchModel = '' this.userIds = [] this.userName = [] - // let gData = localStorage.getItem('gData') + let gData = localStorage.getItem('gData') // if (gData) { // this.gData = this.toTree(JSON.parse(gData)) // this.treeVisible = true - // this.loadTree() // } else { this.queryDepartUserTreeList(1) // } @@ -469,4 +420,8 @@ width: 100%; height: 600px; } + + .treeWrap { + height: 600px; + } \ No newline at end of file diff --git a/jero-web/src/components/virtualNodeTree/mixin/node.js b/jero-web/src/components/virtualNodeTree/mixin/node.js new file mode 100644 index 000000000..9c7850718 --- /dev/null +++ b/jero-web/src/components/virtualNodeTree/mixin/node.js @@ -0,0 +1,116 @@ +import { getNodeKey } from '../model/util'; + +export default { + methods: { + creator(parent, nodeTag) { + const node = this[nodeTag]; + + if (parent.isTree) { + this.tree = parent; + } else { + this.tree = parent.tree; + } + + const tree = this.tree; + if (!tree) { + console.warn('Can not find node\'s tree.'); + } + + const props = tree.props || {}; + const childrenKey = props['children'] || 'children'; + + this.$watch(`${nodeTag}.data.${childrenKey}`, () => { + node.updateChildren(); + }); + + if (node.expanded) { + this.expanded = true; + this.childNodeRendered = true; + } + + if (this.tree.accordion) { + this.$on('tree-node-expand', currentNode => { + if (node !== currentNode) { + node.collapse(); + } + }); + } + }, + + getNodeKey(node) { + return getNodeKey(this.tree.nodeKey, node.data); + }, + + handleSelectChange(checked, indeterminate) { + const node = this.node || this.source; + + if (this.oldChecked !== checked && this.oldIndeterminate !== indeterminate) { + this.tree.$emit('check-change', node.data, checked, indeterminate); + } + this.oldChecked = checked; + this.indeterminate = indeterminate; + }, + + handleClick() { + const node = this.node || this.source; + const store = this.tree.store; + + store.setCurrentNode(node); + this.tree.$emit('current-change', store.currentNode ? store.currentNode.data : null, store.currentNode); + this.tree.currentNode = this; + if (this.tree.expandOnClickNode) { + this.handleExpandIconClick(); + } + if (this.tree.checkOnClickNode && !node.disabled) { + this.handleCheckChange(null, { + target: { checked: !node.checked } + }); + } + + this.tree.$emit('node-click', node.data, node, this); + }, + + handleContextMenu(event) { + const node = this.node || this.source; + + if (this.tree._events['node-contextmenu'] && this.tree._events['node-contextmenu'].length > 0) { + event.stopPropagation(); + event.preventDefault(); + } + this.tree.$emit('node-contextmenu', event, node.data, node, this); + }, + + handleExpandIconClick() { + const node = this.node || this.source; + + if (node.isLeaf) return; + if (this.expanded) { + this.tree.$emit('node-collapse', node.data, node, this); + node.collapse(); + } else { + node.expand(); + this.$emit('node-expand', node.data, node, this); + } + }, + + handleCheckChange(_, ev) { + const node = this.node || this.source; + + node.setChecked(ev.target.checked, !this.tree.checkStrictly); + this.$nextTick(() => { + const store = this.tree.store; + this.tree.$emit('check', node.data, { + checkedNodes: store.getCheckedNodes(), + checkedKeys: store.getCheckedKeys(), + halfCheckedNodes: store.getHalfCheckedNodes(), + halfCheckedKeys: store.getHalfCheckedKeys() + }); + }); + }, + + handleChildNodeExpand(nodeData, node, instance) { + this.broadcast('ElTreeNode', 'tree-node-expand', node); + this.tree.$emit('node-expand', nodeData, node, instance); + } + } +}; diff --git a/jero-web/src/components/virtualNodeTree/model/node.js b/jero-web/src/components/virtualNodeTree/model/node.js new file mode 100644 index 000000000..91f461be6 --- /dev/null +++ b/jero-web/src/components/virtualNodeTree/model/node.js @@ -0,0 +1,486 @@ +import objectAssign from 'element-ui/src/utils/merge'; +import { markNodeData, NODE_KEY } from './util'; +import { arrayFindIndex } from 'element-ui/src/utils/util'; + +export const getChildState = node => { + let all = true; + let none = true; + let allWithoutDisable = true; + for (let i = 0, j = node.length; i < j; i++) { + const n = node[i]; + if (n.checked !== true || n.indeterminate) { + all = false; + if (!n.disabled) { + allWithoutDisable = false; + } + } + if (n.checked !== false || n.indeterminate) { + none = false; + } + } + + return { all, none, allWithoutDisable, half: !all && !none }; +}; + +const reInitChecked = function(node) { + if (node.childNodes.length === 0) return; + + const {all, none, half} = getChildState(node.childNodes); + if (all) { + node.checked = true; + node.indeterminate = false; + } else if (half) { + node.checked = false; + node.indeterminate = true; + } else if (none) { + node.checked = false; + node.indeterminate = false; + } + + const parent = node.parent; + if (!parent || parent.level === 0) return; + + if (!node.store.checkStrictly) { + reInitChecked(parent); + } +}; + +const getPropertyFromData = function(node, prop) { + const props = node.store.props; + const data = node.data || {}; + const config = props[prop]; + + if (typeof config === 'function') { + return config(data, node); + } else if (typeof config === 'string') { + return data[config]; + } else if (typeof config === 'undefined') { + const dataProp = data[prop]; + return dataProp === undefined ? '' : dataProp; + } +}; + +let nodeIdSeed = 0; + +export default class Node { + constructor(options) { + this.id = nodeIdSeed++; + this.text = null; + this.checked = false; + this.indeterminate = false; + this.data = null; + this.expanded = false; + this.parent = null; + this.visible = true; + this.isCurrent = false; + // console.log(22, Object.prototype.hasOwnProperty.call(options, name)); + for (let name in options) { + if (Object.prototype.hasOwnProperty.call(options, name)) { + // if (options.hasOwnProperty(name)) { + this[name] = options[name]; + } + } + + // internal + this.level = 0; + this.loaded = false; + this.childNodes = []; + this.loading = false; + + if (this.parent) { + this.level = this.parent.level + 1; + } + + const store = this.store; + if (!store) { + throw new Error('[Node]store is required!'); + } + store.registerNode(this); + + const props = store.props; + if (props && typeof props.isLeaf !== 'undefined') { + const isLeaf = getPropertyFromData(this, 'isLeaf'); + if (typeof isLeaf === 'boolean') { + this.isLeafByUser = isLeaf; + } + } + + if (store.lazy !== true && this.data) { + this.setData(this.data); + + if (store.defaultExpandAll) { + this.expanded = true; + } + } else if (this.level > 0 && store.lazy && store.defaultExpandAll) { + this.expand(); + } + if (!Array.isArray(this.data)) { + markNodeData(this, this.data); + } + if (!this.data) return; + const defaultExpandedKeys = store.defaultExpandedKeys; + const key = store.key; + if (key && defaultExpandedKeys && defaultExpandedKeys.indexOf(this.key) !== -1) { + this.expand(null, store.autoExpandParent); + } + + if (key && store.currentNodeKey !== undefined && this.key === store.currentNodeKey) { + store.currentNode = this; + store.currentNode.isCurrent = true; + } + + if (store.lazy) { + store._initDefaultCheckedNode(this); + } + + this.updateLeafState(); + } + + setData(data) { + if (!Array.isArray(data)) { + markNodeData(this, data); + } + + this.data = data; + this.childNodes = []; + + let children; + if (this.level === 0 && this.data instanceof Array) { + children = this.data; + } else { + children = getPropertyFromData(this, 'children') || []; + } + + for (let i = 0, j = children.length; i < j; i++) { + this.insertChild({ data: children[i] }); + } + } + + get label() { + return getPropertyFromData(this, 'label'); + } + + get key() { + const nodeKey = this.store.key; + if (this.data) return this.data[nodeKey]; + return null; + } + + get disabled() { + return getPropertyFromData(this, 'disabled'); + } + + get nextSibling() { + const parent = this.parent; + if (parent) { + const index = parent.childNodes.indexOf(this); + if (index > -1) { + return parent.childNodes[index + 1]; + } + } + return null; + } + + get previousSibling() { + const parent = this.parent; + if (parent) { + const index = parent.childNodes.indexOf(this); + if (index > -1) { + return index > 0 ? parent.childNodes[index - 1] : null; + } + } + return null; + } + + contains(target, deep = true) { + const walk = function(parent) { + const children = parent.childNodes || []; + let result = false; + for (let i = 0, j = children.length; i < j; i++) { + const child = children[i]; + if (child === target || (deep && walk(child))) { + result = true; + break; + } + } + return result; + }; + + return walk(this); + } + + remove() { + const parent = this.parent; + if (parent) { + parent.removeChild(this); + } + } + + insertChild(child, index, batch) { + if (!child) throw new Error('insertChild error: child is required.'); + + if (!(child instanceof Node)) { + if (!batch) { + const children = this.getChildren(true) || []; + if (children.indexOf(child.data) === -1) { + if (typeof index === 'undefined' || index < 0) { + children.push(child.data); + } else { + children.splice(index, 0, child.data); + } + } + } + objectAssign(child, { + parent: this, + store: this.store + }); + child = new Node(child); + } + + child.level = this.level + 1; + + if (typeof index === 'undefined' || index < 0) { + this.childNodes.push(child); + } else { + this.childNodes.splice(index, 0, child); + } + + this.updateLeafState(); + } + + insertBefore(child, ref) { + let index; + if (ref) { + index = this.childNodes.indexOf(ref); + } + this.insertChild(child, index); + } + + insertAfter(child, ref) { + let index; + if (ref) { + index = this.childNodes.indexOf(ref); + if (index !== -1) index += 1; + } + this.insertChild(child, index); + } + + removeChild(child) { + const children = this.getChildren() || []; + const dataIndex = children.indexOf(child.data); + if (dataIndex > -1) { + children.splice(dataIndex, 1); + } + + const index = this.childNodes.indexOf(child); + + if (index > -1) { + this.store && this.store.deregisterNode(child); + child.parent = null; + this.childNodes.splice(index, 1); + } + + this.updateLeafState(); + } + + removeChildByData(data) { + let targetNode = null; + + for (let i = 0; i < this.childNodes.length; i++) { + if (this.childNodes[i].data === data) { + targetNode = this.childNodes[i]; + break; + } + } + + if (targetNode) { + this.removeChild(targetNode); + } + } + + expand(callback, expandParent) { + const done = () => { + if (expandParent) { + let parent = this.parent; + while (parent.level > 0) { + parent.expanded = true; + parent = parent.parent; + } + } + this.expanded = true; + if (callback) callback(); + }; + + if (this.shouldLoadData()) { + this.loadData((data) => { + if (data instanceof Array) { + if (this.checked) { + this.setChecked(true, true); + } else if (!this.store.checkStrictly) { + reInitChecked(this); + } + done(); + } + }); + } else { + done(); + } + } + + doCreateChildren(array, defaultProps = {}) { + array.forEach((item) => { + this.insertChild(objectAssign({ data: item }, defaultProps), undefined, true); + }); + } + + collapse() { + this.expanded = false; + } + + shouldLoadData() { + return this.store.lazy === true && this.store.load && !this.loaded; + } + + updateLeafState() { + if (this.store.lazy === true && this.loaded !== true && typeof this.isLeafByUser !== 'undefined') { + this.isLeaf = this.isLeafByUser; + return; + } + const childNodes = this.childNodes; + if (!this.store.lazy || (this.store.lazy === true && this.loaded === true)) { + this.isLeaf = !childNodes || childNodes.length === 0; + return; + } + this.isLeaf = false; + } + + setChecked(value, deep, recursion, passValue) { + this.indeterminate = value === 'half'; + this.checked = value === true; + + if (this.store.checkStrictly) return; + + if (!(this.shouldLoadData() && !this.store.checkDescendants)) { + let { all, allWithoutDisable } = getChildState(this.childNodes); + + if (!this.isLeaf && (!all && allWithoutDisable)) { + this.checked = false; + value = false; + } + + const handleDescendants = () => { + if (deep) { + const childNodes = this.childNodes; + for (let i = 0, j = childNodes.length; i < j; i++) { + const child = childNodes[i]; + passValue = passValue || value !== false; + const isCheck = child.disabled ? child.checked : passValue; + child.setChecked(isCheck, deep, true, passValue); + } + const { half, all } = getChildState(childNodes); + if (!all) { + this.checked = all; + this.indeterminate = half; + } + } + }; + + if (this.shouldLoadData()) { + // Only work on lazy load data. + this.loadData(() => { + handleDescendants(); + reInitChecked(this); + }, { + checked: value !== false + }); + return; + } else { + handleDescendants(); + } + } + + const parent = this.parent; + if (!parent || parent.level === 0) return; + + if (!recursion) { + reInitChecked(parent); + } + } + + getChildren(forceInit = false) { // this is data + if (this.level === 0) return this.data; + const data = this.data; + if (!data) return null; + + const props = this.store.props; + let children = 'children'; + if (props) { + children = props.children || 'children'; + } + + if (data[children] === undefined) { + data[children] = null; + } + + if (forceInit && !data[children]) { + data[children] = []; + } + + return data[children]; + } + + updateChildren() { + const newData = this.getChildren() || []; + const oldData = this.childNodes.map((node) => node.data); + + const newDataMap = {}; + const newNodes = []; + + newData.forEach((item, index) => { + const key = item[NODE_KEY]; + const isNodeExists = !!key && arrayFindIndex(oldData, data => data[NODE_KEY] === key) >= 0; + if (isNodeExists) { + newDataMap[key] = { index, data: item }; + } else { + newNodes.push({ index, data: item }); + } + }); + + if (!this.store.lazy) { + oldData.forEach((item) => { + if (!newDataMap[item[NODE_KEY]]) this.removeChildByData(item); + }); + } + + newNodes.forEach(({ index, data }) => { + this.insertChild({ data }, index); + }); + + this.updateLeafState(); + } + + loadData(callback, defaultProps = {}) { + if (this.store.lazy === true && this.store.load && !this.loaded && (!this.loading || Object.keys(defaultProps).length)) { + this.loading = true; + + const resolve = (children) => { + this.loaded = true; + this.loading = false; + this.childNodes = []; + + this.doCreateChildren(children, defaultProps); + + this.updateLeafState(); + if (callback) { + callback.call(this, children); + } + }; + + this.store.load(this, resolve); + } else { + if (callback) { + callback.call(this); + } + } + } +} diff --git a/jero-web/src/components/virtualNodeTree/model/tree-store.js b/jero-web/src/components/virtualNodeTree/model/tree-store.js new file mode 100644 index 000000000..c9df39c83 --- /dev/null +++ b/jero-web/src/components/virtualNodeTree/model/tree-store.js @@ -0,0 +1,342 @@ +import Node from './node'; +import { getNodeKey } from './util'; + +export default class TreeStore { + constructor(options) { + this.currentNode = null; + this.currentNodeKey = null; + + for (let option in options) { + if (Object.prototype.hasOwnProperty.call(options, option)) { + // if (options.hasOwnProperty(option)) { + this[option] = options[option]; + } + } + + this.nodesMap = {}; + + this.root = new Node({ + data: this.data, + store: this + }); + + if (this.lazy && this.load) { + const loadFn = this.load; + loadFn(this.root, (data) => { + this.root.doCreateChildren(data); + this._initDefaultCheckedNodes(); + }); + } else { + this._initDefaultCheckedNodes(); + } + } + + filter(value) { + const filterNodeMethod = this.filterNodeMethod; + const lazy = this.lazy; + const traverse = function(node) { + const childNodes = node.root ? node.root.childNodes : node.childNodes; + + childNodes.forEach((child) => { + child.visible = filterNodeMethod.call(child, value, child.data, child); + + traverse(child); + }); + + if (!node.visible && childNodes.length) { + let allHidden = true; + allHidden = !childNodes.some(child => child.visible); + + if (node.root) { + node.root.visible = allHidden === false; + } else { + node.visible = allHidden === false; + } + } + if (!value) return; + + if (node.visible && !node.isLeaf && !lazy) node.expand(); + }; + + traverse(this); + } + + setData(newVal) { + const instanceChanged = newVal !== this.root.data; + if (instanceChanged) { + this.root.setData(newVal); + this._initDefaultCheckedNodes(); + } else { + this.root.updateChildren(); + } + } + + getNode(data) { + if (data instanceof Node) return data; + const key = typeof data !== 'object' ? data : getNodeKey(this.key, data); + return this.nodesMap[key] || null; + } + + insertBefore(data, refData) { + const refNode = this.getNode(refData); + refNode.parent.insertBefore({ data }, refNode); + } + + insertAfter(data, refData) { + const refNode = this.getNode(refData); + refNode.parent.insertAfter({ data }, refNode); + } + + remove(data) { + const node = this.getNode(data); + + if (node && node.parent) { + if (node === this.currentNode) { + this.currentNode = null; + } + node.parent.removeChild(node); + } + } + + append(data, parentData) { + const parentNode = parentData ? this.getNode(parentData) : this.root; + + if (parentNode) { + parentNode.insertChild({ data }); + } + } + + _initDefaultCheckedNodes() { + const defaultCheckedKeys = this.defaultCheckedKeys || []; + const nodesMap = this.nodesMap; + + defaultCheckedKeys.forEach((checkedKey) => { + const node = nodesMap[checkedKey]; + + if (node) { + node.setChecked(true, !this.checkStrictly); + } + }); + } + + _initDefaultCheckedNode(node) { + const defaultCheckedKeys = this.defaultCheckedKeys || []; + + if (defaultCheckedKeys.indexOf(node.key) !== -1) { + node.setChecked(true, !this.checkStrictly); + } + } + + setDefaultCheckedKey(newVal) { + if (newVal !== this.defaultCheckedKeys) { + this.defaultCheckedKeys = newVal; + this._initDefaultCheckedNodes(); + } + } + + registerNode(node) { + const key = this.key; + if (!key || !node || !node.data) return; + + const nodeKey = node.key; + if (nodeKey !== undefined) this.nodesMap[node.key] = node; + } + + deregisterNode(node) { + const key = this.key; + if (!key || !node || !node.data) return; + + node.childNodes.forEach(child => { + this.deregisterNode(child); + }); + + delete this.nodesMap[node.key]; + } + + getCheckedNodes(leafOnly = false, includeHalfChecked = false) { + const checkedNodes = []; + const traverse = function(node) { + const childNodes = node.root ? node.root.childNodes : node.childNodes; + + childNodes.forEach((child) => { + if ((child.checked || (includeHalfChecked && child.indeterminate)) && (!leafOnly || (leafOnly && child.isLeaf))) { + checkedNodes.push(child.data); + } + + traverse(child); + }); + }; + + traverse(this); + + return checkedNodes; + } + + getCheckedKeys(leafOnly = false) { + return this.getCheckedNodes(leafOnly).map((data) => (data || {})[this.key]); + } + + getHalfCheckedNodes() { + const nodes = []; + const traverse = function(node) { + const childNodes = node.root ? node.root.childNodes : node.childNodes; + + childNodes.forEach((child) => { + if (child.indeterminate) { + nodes.push(child.data); + } + + traverse(child); + }); + }; + + traverse(this); + + return nodes; + } + + getHalfCheckedKeys() { + return this.getHalfCheckedNodes().map((data) => (data || {})[this.key]); + } + + _getAllNodes() { + const allNodes = []; + const nodesMap = this.nodesMap; + for (let nodeKey in nodesMap) { + if (Object.prototype.hasOwnProperty.call(nodesMap, nodeKey)) { + // if (nodesMap.hasOwnProperty(nodeKey)) { + allNodes.push(nodesMap[nodeKey]); + } + } + + return allNodes; + } + + updateChildren(key, data) { + const node = this.nodesMap[key]; + if (!node) return; + const childNodes = node.childNodes; + for (let i = childNodes.length - 1; i >= 0; i--) { + const child = childNodes[i]; + this.remove(child.data); + } + for (let i = 0, j = data.length; i < j; i++) { + const child = data[i]; + this.append(child, node.data); + } + } + + _setCheckedKeys(key, leafOnly = false, checkedKeys) { + const allNodes = this._getAllNodes().sort((a, b) => b.level - a.level); + const cache = Object.create(null); + const keys = Object.keys(checkedKeys); + allNodes.forEach(node => node.setChecked(false, false)); + for (let i = 0, j = allNodes.length; i < j; i++) { + const node = allNodes[i]; + const nodeKey = node.data[key].toString(); + let checked = keys.indexOf(nodeKey) > -1; + if (!checked) { + if (node.checked && !cache[nodeKey]) { + node.setChecked(false, false); + } + continue; + } + + let parent = node.parent; + while (parent && parent.level > 0) { + cache[parent.data[key]] = true; + parent = parent.parent; + } + + if (node.isLeaf || this.checkStrictly) { + node.setChecked(true, false); + continue; + } + node.setChecked(true, true); + + if (leafOnly) { + node.setChecked(false, false); + const traverse = function(node) { + const childNodes = node.childNodes; + childNodes.forEach((child) => { + if (!child.isLeaf) { + child.setChecked(false, false); + } + traverse(child); + }); + }; + traverse(node); + } + } + } + + setCheckedNodes(array, leafOnly = false) { + const key = this.key; + const checkedKeys = {}; + array.forEach((item) => { + checkedKeys[(item || {})[key]] = true; + }); + + this._setCheckedKeys(key, leafOnly, checkedKeys); + } + + setCheckedKeys(keys, leafOnly = false) { + this.defaultCheckedKeys = keys; + const key = this.key; + const checkedKeys = {}; + keys.forEach((key) => { + checkedKeys[key] = true; + }); + + this._setCheckedKeys(key, leafOnly, checkedKeys); + } + + setDefaultExpandedKeys(keys) { + keys = keys || []; + this.defaultExpandedKeys = keys; + + keys.forEach((key) => { + const node = this.getNode(key); + if (node) node.expand(null, this.autoExpandParent); + }); + } + + setChecked(data, checked, deep) { + const node = this.getNode(data); + + if (node) { + node.setChecked(!!checked, deep); + } + } + + getCurrentNode() { + return this.currentNode; + } + + setCurrentNode(currentNode) { + const prevCurrentNode = this.currentNode; + if (prevCurrentNode) { + prevCurrentNode.isCurrent = false; + } + this.currentNode = currentNode; + this.currentNode.isCurrent = true; + } + + setUserCurrentNode(node) { + const key = node[this.key]; + const currNode = this.nodesMap[key]; + this.setCurrentNode(currNode); + } + + setCurrentNodeKey(key) { + if (key === null || key === undefined) { + this.currentNode && (this.currentNode.isCurrent = false); + this.currentNode = null; + return; + } + const node = this.getNode(key); + if (node) { + this.setCurrentNode(node); + } + } +} diff --git a/jero-web/src/components/virtualNodeTree/model/util.js b/jero-web/src/components/virtualNodeTree/model/util.js new file mode 100644 index 000000000..dcc891b1b --- /dev/null +++ b/jero-web/src/components/virtualNodeTree/model/util.js @@ -0,0 +1,27 @@ +export const NODE_KEY = '$treeNodeId'; + +export const markNodeData = function(node, data) { + if (!data || data[NODE_KEY]) return; + Object.defineProperty(data, NODE_KEY, { + value: node.id, + enumerable: false, + configurable: false, + writable: false + }); +}; + +export const getNodeKey = function(key, data) { + if (!key) return data[NODE_KEY]; + return data[key]; +}; + +export const findNearestComponent = (element, componentName) => { + let target = element; + while (target && target.tagName !== 'BODY') { + if (target.__vue__ && target.__vue__.$options.name === componentName) { + return target.__vue__; + } + target = target.parentNode; + } + return null; +}; diff --git a/jero-web/src/components/virtualNodeTree/tree-virtual-node.vue b/jero-web/src/components/virtualNodeTree/tree-virtual-node.vue new file mode 100644 index 000000000..acc2ba88e --- /dev/null +++ b/jero-web/src/components/virtualNodeTree/tree-virtual-node.vue @@ -0,0 +1,138 @@ + + + diff --git a/jero-web/src/components/virtualNodeTree/tree.vue b/jero-web/src/components/virtualNodeTree/tree.vue new file mode 100644 index 000000000..e346d48e3 --- /dev/null +++ b/jero-web/src/components/virtualNodeTree/tree.vue @@ -0,0 +1,1133 @@ + + + + + From 2aeccf6a0d67734c2c12a4fb9d57a8989fa4d33a Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Thu, 29 Sep 2022 14:16:00 +0800 Subject: [PATCH 58/93] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=84=8F=E8=A7=81?= =?UTF-8?q?=E6=94=B6=E9=9B=86=E3=80=81=E6=B3=95=E8=A7=84=E6=8A=80=E6=9C=AF?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E6=89=8B=E5=8A=A8=E5=AE=8C=E6=88=90=E6=8E=A5=E5=8F=A3=E3=80=82?= =?UTF-8?q?=20=E6=B3=95=E8=A7=84=E6=84=8F=E8=A7=81=E6=94=B6=E9=9B=86?= =?UTF-8?q?=E3=80=81=E6=B3=95=E8=A7=84=E6=8A=80=E6=9C=AF=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=EF=BC=8C=E5=88=A0=E9=99=A4=E6=97=B6=E5=90=8C=E6=AD=A5=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E6=B5=81=E7=A8=8B=E5=AE=9E=E4=BE=8B=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LawsOpinionGatherEOController.java | 10 ++- .../job/LawsOpinionGatherJob.java | 5 +- .../service/ILawsOpinionGatherEOService.java | 4 +- .../impl/LawsOpinionGatherEOServiceImpl.java | 62 ++++++++++++-- .../LawsTechnologyEvaluationEOController.java | 15 +++- .../job/LawsTechnologyEvaluationJob.java | 5 +- .../ILawsTechnologyEvaluationEOService.java | 4 +- ...LawsTechnologyEvaluationEOServiceImpl.java | 83 +++++++++++++++++-- .../feginClient/WorkFlowFeignClient.java | 3 + 9 files changed, 166 insertions(+), 25 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/controller/LawsOpinionGatherEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/controller/LawsOpinionGatherEOController.java index 4b67a1d10..6eec32d23 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/controller/LawsOpinionGatherEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/controller/LawsOpinionGatherEOController.java @@ -127,8 +127,8 @@ public class LawsOpinionGatherEOController extends JeroController deleteBatch(@RequestParam(name="ids",required=true) String ids) { - this.lawsOpinionGatherEOService.deleteByIds(Arrays.asList(ids.split(","))); + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids,@RequestParam(name="cut",required=true) String cut) { + this.lawsOpinionGatherEOService.deleteByIds(Arrays.asList(ids.split(",")),cut); return Result.OK("批量删除成功!"); } @@ -184,4 +184,10 @@ public class LawsOpinionGatherEOController extends JeroController batchCompleteTask(@RequestBody JSONObject jsonObject){ + return this.lawsOpinionGatherEOService.batchCompleteTask(jsonObject); + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/job/LawsOpinionGatherJob.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/job/LawsOpinionGatherJob.java index bf1e5ac43..c5d17ad6c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/job/LawsOpinionGatherJob.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/job/LawsOpinionGatherJob.java @@ -34,7 +34,8 @@ public class LawsOpinionGatherJob implements Job { @Override public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException { log.info("法规意见收集流程，定时任务开启 ====================================================="); - QueryWrapper lawsOpinionGatherEOQueryWrapper = new QueryWrapper<>(); + //TODO 2022-09-29 该功能被手动按钮替代 对应禅道bug编号 59979 + /*QueryWrapper lawsOpinionGatherEOQueryWrapper = new QueryWrapper<>(); lawsOpinionGatherEOQueryWrapper.lambda().eq(LawsOpinionGatherEO::getGatherResult, GatherResultEnum.UNDERWAY.getValue()); List lawsOpinionGatherEOList = this.lawsOpinionGatherEOService.list(lawsOpinionGatherEOQueryWrapper); if (CollectionUtils.isNotEmpty(lawsOpinionGatherEOList)) { @@ -58,7 +59,7 @@ public class LawsOpinionGatherJob implements Job { this.lawsOpinionGatherEOService.updateBatchById(updateLawsOpinionGatherEOList); } } - } + }*/ log.info("法规意见收集流程，定时任务结束 ====================================================="); } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/ILawsOpinionGatherEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/ILawsOpinionGatherEOService.java index 710e61bf2..b4a878930 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/ILawsOpinionGatherEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/ILawsOpinionGatherEOService.java @@ -44,7 +44,7 @@ public interface ILawsOpinionGatherEOService extends IService ids); + void deleteByIds(List ids,String cut); /** * 通过id查询 @@ -75,4 +75,6 @@ public interface ILawsOpinionGatherEOService extends IService lawsOpinionGatherEOList,String cut); void workFlowSendMsg(JSONObject jsonObject); + + Result batchCompleteTask(JSONObject jsonObject); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java index 6e51bcfff..491631ca8 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java @@ -28,8 +28,10 @@ import com.jero.modules.system.entity.SysCategory; import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.service.ISysUserService; import com.jero.modules.system.service.impl.SysCategoryServiceImpl; +import com.jero.modules.wkflow.feginClient.WorkFlowFeignClient; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; +import org.jeecg.modules.jmreport.common.constant.CommonConstant; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -64,6 +66,9 @@ public class LawsOpinionGatherEOServiceImpl extends ServiceImpl ids) { - removeByIds(ids); + public void deleteByIds(List ids,String cut) { + QueryWrapper lawsOpinionGatherEOQueryWrapper = new QueryWrapper<>(); + lawsOpinionGatherEOQueryWrapper.lambda().eq(LawsOpinionGatherEO::getGatherResult, GatherResultEnum.UNDERWAY.getValue()); + lawsOpinionGatherEOQueryWrapper.lambda().in(LawsOpinionGatherEO::getId, ids); + List lawsOpinionGatherEOList = this.list(lawsOpinionGatherEOQueryWrapper); - QueryWrapper deleteWrapper = new QueryWrapper(); - deleteWrapper.in("laws_opinion_gather_id",ids); - this.lawsOpinionAssessmentResultEOService.remove(deleteWrapper); + List actiProcInstIdList = lawsOpinionGatherEOList.stream().map(LawsOpinionGatherEO::getActiProcInstId).distinct().collect(Collectors.toList()); + String prcIds = org.apache.commons.lang.StringUtils.join(actiProcInstIdList,","); + Result result = this.workFlowFeignClient.deleteProcessInstanceByPrcIds(prcIds); + if(result.getCode().equals(CommonConstant.SC_OK_200)){ + removeByIds(ids); + QueryWrapper deleteWrapper = new QueryWrapper(); + deleteWrapper.in("laws_opinion_gather_id",ids); + this.lawsOpinionAssessmentResultEOService.remove(deleteWrapper); + }else { + if(StringUtils.equals(cut,CutEnum.CN.getValue())){ + throw new JeroBootException("删除失败，请联系管理员！"); + }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){ + throw new JeroBootException("Delete failed, please contact the administrator!"); + } + } } /** @@ -283,4 +303,36 @@ public class LawsOpinionGatherEOServiceImpl extends ServiceImpl batchCompleteTask(JSONObject jsonObject) { + String ids = jsonObject.getString("ids"); + String cut = jsonObject.getString("cut"); + if(StringUtils.isEmpty(ids)){ + if(StringUtils.equals(cut,CutEnum.CN.getValue())){ + throw new JeroBootException("至少选择一条数据进行手动结束！"); + }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){ + throw new JeroBootException("Select at least one piece of data for manual termination!"); + } + } + + List lawsOpinionGatherIdList = Arrays.asList(ids.split(",")); + QueryWrapper lawsOpinionGatherEOQueryWrapper = new QueryWrapper<>(); + lawsOpinionGatherEOQueryWrapper.lambda().eq(LawsOpinionGatherEO::getGatherResult, GatherResultEnum.UNDERWAY.getValue()); + lawsOpinionGatherEOQueryWrapper.lambda().in(LawsOpinionGatherEO::getId, lawsOpinionGatherIdList); + List lawsOpinionGatherEOList = this.list(lawsOpinionGatherEOQueryWrapper); + if (CollectionUtils.isNotEmpty(lawsOpinionGatherEOList)) { + List actiProcInstIdList = lawsOpinionGatherEOList.stream().map(LawsOpinionGatherEO::getActiProcInstId).distinct().collect(Collectors.toList()); + String actiProcInstIds = org.apache.commons.lang.StringUtils.join(actiProcInstIdList,","); + //将这些流程实例下的待办任务提交 + Result result = this.workFlowFeignClient.completeTaskByPids(actiProcInstIds); + if(result.getCode().equals(CommonConstant.SC_OK_200)){ + lawsOpinionGatherEOList.forEach(lawsOpinionGatherEO -> { + lawsOpinionGatherEO.setGatherResult(GatherResultEnum.COMPLETED.getValue()); + }); + this.updateBatchById(lawsOpinionGatherEOList); + } + } + return new Result<>().success("手动结束成功！"); + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationEOController.java index 9ca5ddf32..ca025a19e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/controller/LawsTechnologyEvaluationEOController.java @@ -130,8 +130,8 @@ public class LawsTechnologyEvaluationEOController extends JeroController deleteBatch(@RequestParam(name="ids",required=true) String ids) { - this.lawsTechnologyEvaluationEOService.deleteByIds(Arrays.asList(ids.split(","))); + public Result deleteBatch(@RequestParam(name="ids",required=true) String ids,@RequestParam(name="cut",required=true) String cut) { + this.lawsTechnologyEvaluationEOService.deleteByIds(Arrays.asList(ids.split(",")),cut); return Result.OK("批量删除成功!"); } @@ -180,8 +180,8 @@ public class LawsTechnologyEvaluationEOController extends JeroController processCall(@RequestBody JSONObject jsonObject){ return this.lawsTechnologyEvaluationEOService.processCall(jsonObject); @@ -218,4 +218,11 @@ public class LawsTechnologyEvaluationEOController extends JeroController> result = this.lawsTechnologyEvaluationEOService.queryPageDummyById(parameter); return Result.OK(result); } + + @AutoLog(value = "法规技术评估-批量完成任务") + @ApiOperation(value="法规技术评估-批量完成任务", notes="法规技术评估-批量完成任务") + @PostMapping(value = "/batchCompleteTask") + public Result batchCompleteTask(@RequestBody JSONObject jsonObject){ + return this.lawsTechnologyEvaluationEOService.batchCompleteTask(jsonObject); + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/job/LawsTechnologyEvaluationJob.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/job/LawsTechnologyEvaluationJob.java index 63f308573..c3877f9e8 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/job/LawsTechnologyEvaluationJob.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/job/LawsTechnologyEvaluationJob.java @@ -38,7 +38,8 @@ public class LawsTechnologyEvaluationJob implements Job { public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException { log.info("法规技术评估流程，定时任务开启 ====================================================="); - QueryWrapper queryWrapper = new QueryWrapper<>(); + //TODO 2022-09-29 该功能被手动按钮替代 对应禅道bug编号 59979 + /*QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.lambda().eq(LawsTechnologyEvaluationEO::getFlowStatus, GatherResultEnum.UNDERWAY.getValue()); List lawsTechnologyEvaluationEOList = this.lawsTechnologyEvaluationEOService.list(queryWrapper); @@ -73,7 +74,7 @@ public class LawsTechnologyEvaluationJob implements Job { } } - } + }*/ log.info("法规技术评估流程，定时任务结束 ====================================================="); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationEOService.java index f13cde5ca..b2bad56ff 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/ILawsTechnologyEvaluationEOService.java @@ -50,7 +50,7 @@ public interface ILawsTechnologyEvaluationEOService extends IService ids); + void deleteByIds(List ids,String cut); /** * 通过id查询 @@ -90,4 +90,6 @@ public interface ILawsTechnologyEvaluationEOService extends IService> queryPageDummyById(Map parameter); void workFlowSendMsg(JSONObject jsonObject); + + Result batchCompleteTask(JSONObject jsonObject); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java index 4ef994acd..567660c55 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsTechnologyEvaluation/service/impl/LawsTechnologyEvaluationEOServiceImpl.java @@ -16,6 +16,7 @@ import com.jero.modules.document.mapper.BussDocumentLibraryEOMapper; import com.jero.modules.document.service.impl.BussDocumentLibraryEOServiceImpl; import com.jero.modules.lawsOpinionGather.enums.GatherResultEnum; import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationEO; +import com.jero.modules.lawsTechnologyEvaluation.entity.LawsTechnologyEvaluationFlowDetailEO; import com.jero.modules.lawsTechnologyEvaluation.mapper.LawsTechnologyEvaluationEOMapper; import com.jero.modules.lawsTechnologyEvaluation.service.*; import com.jero.modules.project.enums.JumpLinkEnum; @@ -31,12 +32,14 @@ import com.jero.modules.system.entity.SysUser; 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.wkflow.feginClient.WorkFlowFeignClient; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import org.apache.poi.hssf.usermodel.HSSFSheet; import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.ss.usermodel.*; +import org.jeecg.modules.jmreport.common.constant.CommonConstant; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -90,6 +93,8 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl ids) { - removeByIds(ids); + public void deleteByIds(List ids,String cut) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().in(LawsTechnologyEvaluationEO::getId, ids); + List lawsTechnologyEvaluationEOList = this.list(queryWrapper); - QueryWrapper deleteWrapper = new QueryWrapper(); - deleteWrapper.in("laws_technology_evaluation_id",ids); - this.lawsTechnologyEvaluationFlowDetailEOService.remove(deleteWrapper); + List lawsTechnologyEvaluationIdList = lawsTechnologyEvaluationEOList.stream().map(LawsTechnologyEvaluationEO::getId).distinct().collect(Collectors.toList()); - this.lawsTechnologyEvaluationItemResultEOService.remove(deleteWrapper); + //获取这些法规技术评估数据的下级流程明细数据。 + QueryWrapper flowDetailEOQueryWrapper = new QueryWrapper<>(); + flowDetailEOQueryWrapper.lambda().in(LawsTechnologyEvaluationFlowDetailEO::getLawsTechnologyEvaluationId,lawsTechnologyEvaluationIdList); + List lawsTechnologyEvaluationFlowDetailEOList = lawsTechnologyEvaluationFlowDetailEOService.list(flowDetailEOQueryWrapper); - this.lawsTechnologyEvaluationResultEOService.remove(deleteWrapper); + if(CollectionUtils.isNotEmpty(lawsTechnologyEvaluationFlowDetailEOList)){ + String prcIds = lawsTechnologyEvaluationFlowDetailEOList.stream().map(LawsTechnologyEvaluationFlowDetailEO::getActiProcInstId).distinct().collect(Collectors.joining(",")); + Result result = this.workFlowFeignClient.deleteProcessInstanceByPrcIds(prcIds); + if(result.getCode().equals(CommonConstant.SC_OK_200)){ + removeByIds(ids); - this.lawsTechnologyEvaluationComplianceResultEOService.remove(deleteWrapper); + QueryWrapper deleteWrapper = new QueryWrapper(); + deleteWrapper.in("laws_technology_evaluation_id",ids); + this.lawsTechnologyEvaluationFlowDetailEOService.remove(deleteWrapper); + + this.lawsTechnologyEvaluationItemResultEOService.remove(deleteWrapper); + + this.lawsTechnologyEvaluationResultEOService.remove(deleteWrapper); + + this.lawsTechnologyEvaluationComplianceResultEOService.remove(deleteWrapper); + }else { + if(StringUtils.equals(cut,CutEnum.CN.getValue())){ + throw new JeroBootException("删除失败，请联系管理员！"); + }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){ + throw new JeroBootException("Delete failed, please contact the administrator!"); + } + } + } } /** @@ -629,6 +657,45 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl batchCompleteTask(JSONObject jsonObject) { + String ids = jsonObject.getString("ids"); + String cut = jsonObject.getString("cut"); + if(StringUtils.isEmpty(ids)){ + if(StringUtils.equals(cut,CutEnum.CN.getValue())){ + throw new JeroBootException("至少选择一条数据进行手动结束！"); + }else if(StringUtils.equals(cut,CutEnum.EN.getValue())){ + throw new JeroBootException("Select at least one piece of data for manual termination!"); + } + } + + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(LawsTechnologyEvaluationEO::getFlowStatus, GatherResultEnum.UNDERWAY.getValue()); + queryWrapper.lambda().in(LawsTechnologyEvaluationEO::getId, Arrays.asList(ids.split(","))); + List lawsTechnologyEvaluationEOList = this.list(queryWrapper); + + if (CollectionUtils.isNotEmpty(lawsTechnologyEvaluationEOList)) { + List lawsTechnologyEvaluationIdList = lawsTechnologyEvaluationEOList.stream().map(LawsTechnologyEvaluationEO::getId).distinct().collect(Collectors.toList()); + + //获取这些法规技术评估数据的下级流程明细数据。 + QueryWrapper flowDetailEOQueryWrapper = new QueryWrapper<>(); + flowDetailEOQueryWrapper.lambda().in(LawsTechnologyEvaluationFlowDetailEO::getLawsTechnologyEvaluationId,lawsTechnologyEvaluationIdList); + List lawsTechnologyEvaluationFlowDetailEOList = lawsTechnologyEvaluationFlowDetailEOService.list(flowDetailEOQueryWrapper); + + if(CollectionUtils.isNotEmpty(lawsTechnologyEvaluationFlowDetailEOList)){ + String actiProcInstIds = lawsTechnologyEvaluationFlowDetailEOList.stream().map(LawsTechnologyEvaluationFlowDetailEO::getActiProcInstId).distinct().collect(Collectors.joining(",")); + Result result = this.workFlowFeignClient.completeLawsTechnologyEvaluationTaskByPids(actiProcInstIds); + if(result.getCode().equals(CommonConstant.SC_OK_200)){ + lawsTechnologyEvaluationEOList.forEach(lawsTechnologyEvaluationEO -> { + lawsTechnologyEvaluationEO.setFlowStatus(GatherResultEnum.COMPLETED.getValue()); + }); + this.updateBatchById(lawsTechnologyEvaluationEOList); + } + } + } + return new Result<>().success("手动结束成功！"); + } + private String getTreeName(String cut, List categoryList, List technologyTerritoryList) { StringBuilder sb = new StringBuilder(); for (String technologyTerritory : technologyTerritoryList) { diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/WorkFlowFeignClient.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/WorkFlowFeignClient.java index 0490604f4..51070cea7 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/WorkFlowFeignClient.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/feginClient/WorkFlowFeignClient.java @@ -178,4 +178,7 @@ public interface WorkFlowFeignClient { @RequestMapping(value = "/bat-wkflow/task/getTaskAssigneeListByPrcIds",method = RequestMethod.GET) List getTaskAssigneeListByPrcIds(@RequestParam("actiProcInstIds") String actiProcInstIds); + + @RequestMapping(value = "/bat-wkflow/deleteProcessInstanceByPrcIds",method = RequestMethod.GET) + Result deleteProcessInstanceByPrcIds(@RequestParam("prcIds") String prcIds); } From 4ede260f0ecb7f9d7e7707c74e44038ae1d3219b Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Thu, 29 Sep 2022 14:19:50 +0800 Subject: [PATCH 59/93] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=89=E6=9C=9F?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/standardDecompositionSheet.vue | 26 +++++++++++-------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/standardDecompositionSheet.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/standardDecompositionSheet.vue index b96b40da0..7390426d6 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/standardDecompositionSheet.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/standardDecompositionSheet.vue @@ -55,9 +55,9 @@ {{$t('informationCategory')}}
+ :placeholder="$t('PleaseSelect')+$t('informationCategory')" + :type="'select'" + :triggerChange="false" :dictCode="'information_category'"/>
@@ -136,7 +136,7 @@ confirmLoading: false, selectedRowKeys: [], sarFileSplitInfoList: [], - informationCategoryList:[], + informationCategoryList: [], url: { list: '/split/sarFileSplitItems/getSplitItemsByPage' }, @@ -244,14 +244,18 @@ } }, searchQuery() { - this.pageNo = 1 - this.replacePage() + if (this.queryParam.info_id) { + this.pageNo = 1 + this.replacePage() + } }, searchReset() { - this.pageNo = 1 this.queryParam = {} this.queryParam.info_id = this.sarFileSplitInfoList && this.sarFileSplitInfoList.length > 0 ? this.sarFileSplitInfoList[0].id : '' - this.replacePage() + if (this.queryParam.info_id) { + this.pageNo = 1 + this.replacePage() + } }, onChange(page, pageSize) { this.pageNo = page @@ -270,15 +274,15 @@ let pageNo = JSON.parse(JSON.stringify(this.pageNo)) let pageSize = JSON.parse(JSON.stringify(this.pageSize)) let queryParam = JSON.parse(JSON.stringify(this.queryParam)) - if (queryParam.technology_territory && queryParam.technology_territory.length > 0){ + if (queryParam.technology_territory && queryParam.technology_territory.length > 0) { queryParam.technology_territory = queryParam.technology_territory.join(',') } let query = { pageNo: pageNo + '', pageSize: pageSize + '', info_id: this.queryParam.info_id, - technology_territory:queryParam.technology_territory, - information_category:queryParam.information_category, + technology_territory: queryParam.technology_territory, + information_category: queryParam.information_category, menu_id: '' } this.loading = true From 71ae922f7bb93a5b7645d951fd845fae607c9da6 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Thu, 29 Sep 2022 14:27:02 +0800 Subject: [PATCH 60/93] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../regulationsKanban/components/addModel.vue | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/jero-web/src/views/regulationsKanban/components/addModel.vue b/jero-web/src/views/regulationsKanban/components/addModel.vue index 5e959a562..cb6a3b8e9 100644 --- a/jero-web/src/views/regulationsKanban/components/addModel.vue +++ b/jero-web/src/views/regulationsKanban/components/addModel.vue @@ -296,8 +296,14 @@ }, verifyTaskClick(val, num, isTrue) { let query = {} + let isDisplay = false switch (num) { case 1: + if (val.designTaskStatus == 'NotDone'){ + isDisplay = true + }else{ + isDisplay = false + } query = { taskIds: val.designTaskId, actiProcInstId: val.designPId, @@ -307,7 +313,7 @@ studioEngineer: val.studioEngineer, serialNumber: val.serialNumber, TaskKey: val.designTaskDefinitionKey, - isDisplay: isTrue, + isDisplay: isDisplay, flowType: 2, Sponsor: 'designInitiatorName', personLiable: 'designDutyName', @@ -323,6 +329,11 @@ } break case 2: + if (val.prehomoTaskStatus == 'NotDone'){ + isDisplay = true + }else{ + isDisplay = false + } query = { taskIds: val.prehomoTaskId, actiProcInstId: val.prehomoPId, @@ -348,6 +359,11 @@ } break case 3: + if (val.verifyTaskStatus == 'NotDone'){ + isDisplay = true + }else{ + isDisplay = false + } query = { taskIds: val.verifyTaskId, actiProcInstId: val.verifyPId, From 5b4c7f8cb004ea208ad5bfd8521239c91d49046b Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Thu, 29 Sep 2022 14:43:28 +0800 Subject: [PATCH 61/93] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../technologyAssessment/components/TermInformation.vue | 6 ++++++ .../processCenter/components/evaluatorFeedbackList.vue | 6 ++++++ .../src/views/projectManagement/components/addModel.vue | 1 + 3 files changed, 13 insertions(+) diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue index 0b3afea18..9e3374a4a 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue @@ -296,6 +296,12 @@ if (dataList[i].evaluationMethods && dataList[i].evaluationMethods instanceof Array) { dataList[i].evaluationMethods = dataList[i].evaluationMethods.join(',') } + Object.keys(dataList[i]).forEach(res=>{ + if (dataList[i][res] && typeof dataList[i][res] == 'string') { + dataList[i][res] = dataList[i][res].replace(/\"/g, '“') + dataList[i][res] = dataList[i][res].replace(/\'/g, '‘') + } + }) dataList[i].lawsTechnologyEvaluationId = this.$route.query.lawsTechnologyEvaluationId || this.getUUID if (!dataList[i].evaluatorIds) { this.$message.warning(this.$t('pleaseCompleteTheEvaluationMethodorEvaluator')) diff --git a/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue b/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue index 529f97588..3b8473872 100644 --- a/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue +++ b/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue @@ -345,6 +345,12 @@ this.$message.warning(this.$t('PleaseCompleteList')) return } + Object.keys(this.dataSource[i]).forEach(res=>{ + if (this.dataSource[i][res] && typeof this.dataSource[i][res] == 'string') { + this.dataSource[i][res] = this.dataSource[i][res].replace(/\"/g, '“') + this.dataSource[i][res] = this.dataSource[i][res].replace(/\'/g, '‘') + } + }) } if (this.$route.query.taskDefinitionKey == 'pgrqr'){ let feedbackTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss') diff --git a/jero-web/src/views/projectManagement/components/addModel.vue b/jero-web/src/views/projectManagement/components/addModel.vue index fd880aadc..47e7685e3 100644 --- a/jero-web/src/views/projectManagement/components/addModel.vue +++ b/jero-web/src/views/projectManagement/components/addModel.vue @@ -348,6 +348,7 @@ this.getNameList() this.formInline.studioEngineerName = this.userInfo().username this.formInline.studioEngineer = this.userInfo().id + this.formInline = {...this.formInline} this.$nextTick(() => { this.$refs.ruleForm.clearValidate() }) From 48652d3efe8e6bb328fce3117ecc5d9a1e5acb7e Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Thu, 29 Sep 2022 14:45:33 +0800 Subject: [PATCH 62/93] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=8A=80=E6=9C=AF?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E8=B0=83=E7=94=A8=E6=9F=A5=E8=AF=A2=E6=96=87?= =?UTF-8?q?=E6=A1=A3=E6=8B=86=E5=88=86=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=A4=84?= =?UTF-8?q?=E7=90=86=E6=95=B0=E6=8D=AE=E4=B8=AD=E5=B8=A6=E8=8B=B1=E6=96=87?= =?UTF-8?q?=E5=8D=95=E5=8F=8C=E5=BC=95=E5=8F=B7=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../split/service/impl/FileSplitItemsEOServiceImpl.java | 6 ++++++ 1 file changed, 6 insertions(+) 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 c60745cc9..44ee566b3 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 @@ -575,6 +575,12 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl Date: Thu, 29 Sep 2022 14:53:57 +0800 Subject: [PATCH 63/93] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/PersonnelSelection/index.vue | 3 ++- jero-web/src/views/projectManagement/components/addModel.vue | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/jero-web/src/components/PersonnelSelection/index.vue b/jero-web/src/components/PersonnelSelection/index.vue index bcb3ce1c5..755e08ff2 100644 --- a/jero-web/src/components/PersonnelSelection/index.vue +++ b/jero-web/src/components/PersonnelSelection/index.vue @@ -51,6 +51,7 @@ style="margin-bottom: 60px;height: 600px" v-if="treeVisible" checkable + checkStrictly :loading="loading" :tree-data="gData" @check="onCheck" @@ -164,7 +165,7 @@ // }, onCheck(checkedKeys, info) { - this.userIds = checkedKeys + this.userIds = checkedKeys.checked this.userName = [] if (this.userIds.length > 0) { for (let i = 0; i < this.userIds.length; i++) { diff --git a/jero-web/src/views/projectManagement/components/addModel.vue b/jero-web/src/views/projectManagement/components/addModel.vue index 47e7685e3..65b190bd4 100644 --- a/jero-web/src/views/projectManagement/components/addModel.vue +++ b/jero-web/src/views/projectManagement/components/addModel.vue @@ -335,6 +335,7 @@ }) this.yearNameDataList = content[0].yearNameDataList || [] this.formInline = value + this.formInline = { ...this.formInline } } } else { this.projectNameList = [] @@ -348,7 +349,7 @@ this.getNameList() this.formInline.studioEngineerName = this.userInfo().username this.formInline.studioEngineer = this.userInfo().id - this.formInline = {...this.formInline} + this.formInline = { ...this.formInline } this.$nextTick(() => { this.$refs.ruleForm.clearValidate() }) From fe1999f7e33d1ee7dcbfe0c74d389e83b4d1fa36 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Thu, 29 Sep 2022 15:04:39 +0800 Subject: [PATCH 64/93] =?UTF-8?q?59990=20=E6=96=87=E6=A1=A3=E7=BF=BB?= =?UTF-8?q?=E8=AF=91=E4=B8=8B=E8=BD=BD=E7=9B=AE=E6=A0=87=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E5=A4=84=E7=90=86=20doc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/DocTranslationEO.java | 3 + .../impl/DocTranslationEOServiceImpl.java | 16 + jero-web/package-lock.json | 387 +++++++++++++++++- .../documentTranslation/index.vue | 3 +- 4 files changed, 398 insertions(+), 11 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/docTranslation/entity/DocTranslationEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/docTranslation/entity/DocTranslationEO.java index 41a793654..e3e6909cf 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/docTranslation/entity/DocTranslationEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/docTranslation/entity/DocTranslationEO.java @@ -127,4 +127,7 @@ public class DocTranslationEO implements Serializable { @ApiModelProperty(value = "目标文件id") private java.lang.String targetFileId; + /**翻译后文件名称*/ + @TableField(exist = false) + private String targetFileName; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/docTranslation/service/impl/DocTranslationEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/docTranslation/service/impl/DocTranslationEOServiceImpl.java index e90b396bd..3425c99e3 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/docTranslation/service/impl/DocTranslationEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/docTranslation/service/impl/DocTranslationEOServiceImpl.java @@ -20,6 +20,7 @@ import com.jero.modules.docTranslation.service.IDocTranslationEOService; import com.jero.modules.docTranslation.utils.TranslationDocumentUtils; import com.jero.modules.document.enums.FieldTypeEnum; import com.jero.modules.oss.entity.OSSFile; +import com.jero.modules.oss.service.IOSSFileService; import me.zhyd.oauth.utils.StringUtils; import org.apache.commons.collections4.CollectionUtils; import org.apache.shiro.SecurityUtils; @@ -47,6 +48,8 @@ public class DocTranslationEOServiceImpl extends ServiceImpl datas,String cut){ if(CollectionUtils.isNotEmpty(datas)){ + String targetFileIds = datas.stream().map(DocTranslationEO::getTargetFileId).distinct().collect(Collectors.joining(",")); + List targetFileList = this.iOSSFileService.getFileInfos(targetFileIds); for (DocTranslationEO data : datas) { String textStatus_dictText = ""; OnlCgformField fileTypeField = this.onlCgformFieldService.queryById(data.getTextStatus()); @@ -166,6 +171,17 @@ public class DocTranslationEOServiceImpl extends ServiceImpl { + boolean flag = false; + if (org.apache.commons.lang3.StringUtils.equals(data.getTargetFileId(), targetFile.getId())) { + flag = true; + } + return flag; + }).map(OSSFile::getFileName).collect(Collectors.joining(",")); + data.setTargetFileName(targetFileName); + } } } } diff --git a/jero-web/package-lock.json b/jero-web/package-lock.json index 5038e50fb..cb4ecb038 100644 --- a/jero-web/package-lock.json +++ b/jero-web/package-lock.json @@ -5,7 +5,6 @@ "requires": true, "packages": { "": { - "name": "jero-web", "version": "2.4.2", "dependencies": { "@antv/data-set": "^0.11.4", @@ -19,6 +18,7 @@ "dayjs": "^1.8.0", "dom-align": "1.12.0", "echarts": "^5.0.2", + "element-ui": "^2.15.10", "enquire.js": "^2.1.6", "jquery": "^3.6.0", "js-base64": "^3.7.2", @@ -26,6 +26,7 @@ "jsencrypt": "^3.0.0-rc.1", "lodash.get": "^4.4.2", "lodash.pick": "^4.4.0", + "mammoth": "^1.4.21", "md5": "^2.2.1", "nprogress": "^0.2.0", "tinymce": "^5.3.2", @@ -40,6 +41,7 @@ "vue-ls": "^3.2.0", "vue-photo-preview": "^1.1.3", "vue-print-nb-jeecg": "^1.0.9", + "vue-quill-editor": "^3.0.6", "vue-router": "^3.0.1", "vue-splitpane": "^1.0.4", "vuedraggable": "^2.20.0", @@ -7447,7 +7449,6 @@ "version": "1.5.2", "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-1.5.2.tgz", "integrity": "sha512-95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ==", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -7797,6 +7798,11 @@ "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz", "integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==" }, + "node_modules/dingbat-to-unicode": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/dingbat-to-unicode/-/dingbat-to-unicode-1.0.1.tgz", + "integrity": "sha512-98l0sW87ZT58pU4i61wa2OHwxbiYSbuxsCBozaVnYX2iCnr3bLM3fIes1/ej7h1YdOKuKt/MLs706TVnALA65w==" + }, "node_modules/dir-glob": { "version": "2.2.2", "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.2.2.tgz", @@ -8019,6 +8025,14 @@ "ignored": "bin/ignored" } }, + "node_modules/duck": { + "version": "0.1.12", + "resolved": "https://registry.npmjs.org/duck/-/duck-0.1.12.tgz", + "integrity": "sha512-wkctla1O6VfP89gQ+J/yDesM0S7B7XLXjKGzXxMDVFg7uEn706niAtyYovKbyq1oT9YwDcly721/iUWoc8MVRg==", + "dependencies": { + "underscore": "^1.13.1" + } + }, "node_modules/duplexer": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz", @@ -8089,6 +8103,38 @@ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.644.tgz", "integrity": "sha512-N7FLvjDPADxad+OXXBuYfcvDvCBG0aW8ZZGr7G91sZMviYbnQJFxdSvUus4SJ0K7Q8dzMxE+Wx1d/CrJIIJ0sw==" }, + "node_modules/element-ui": { + "version": "2.15.10", + "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.15.10.tgz", + "integrity": "sha512-jmD++mU2wKXbisvx4fxOl2mHaU+HWHTAq/3Wf8x9Bwyu4GdDZPLABb+CGi3DWN6fPqdgRcd74aX39DO+YHObLw==", + "dependencies": { + "async-validator": "~1.8.1", + "babel-helper-vue-jsx-merge-props": "^2.0.0", + "deepmerge": "^1.2.0", + "normalize-wheel": "^1.0.1", + "resize-observer-polyfill": "^1.5.0", + "throttle-debounce": "^1.0.1" + }, + "peerDependencies": { + "vue": "^2.5.17" + } + }, + "node_modules/element-ui/node_modules/async-validator": { + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/async-validator/-/async-validator-1.8.5.tgz", + "integrity": "sha512-tXBM+1m056MAX0E8TL2iCjg8WvSyXu0Zc8LNtYqrVeyoL3+esHRZ4SieE9fKQyyU09uONjnMEjrNBMqT0mbvmA==", + "dependencies": { + "babel-runtime": "6.x" + } + }, + "node_modules/element-ui/node_modules/throttle-debounce": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/throttle-debounce/-/throttle-debounce-1.1.0.tgz", + "integrity": "sha512-XH8UiPCQcWNuk2LYePibW/4qL97+ZQ1AN3FNXwZRBNPPowo/NRU5fAlDCSNBJIYCKbioZfuYtMhG4quqoJhVzg==", + "engines": { + "node": ">=4" + } + }, "node_modules/elliptic": { "version": "6.5.4", "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz", @@ -9319,8 +9365,7 @@ "node_modules/extend": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", - "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==", - "dev": true + "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==" }, "node_modules/extend-shallow": { "version": "3.0.2", @@ -9506,6 +9551,11 @@ "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" }, + "node_modules/fast-diff": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.1.2.tgz", + "integrity": "sha512-KaJUt+M9t1qaIteSvjc6P3RbMdXsNhK61GRftR6SNxqmhthcd9MGIi4T+o0jD8LUSpSnSKXE20nLtJ3fOHxQig==" + }, "node_modules/fast-glob": { "version": "2.2.7", "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.7.tgz", @@ -10692,6 +10742,11 @@ "node": ">=0.10.0" } }, + "node_modules/immediate": { + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz", + "integrity": "sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==" + }, "node_modules/import-cwd": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-2.1.0.tgz", @@ -11517,6 +11572,17 @@ "verror": "1.10.0" } }, + "node_modules/jszip": { + "version": "3.10.1", + "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.10.1.tgz", + "integrity": "sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g==", + "dependencies": { + "lie": "~3.3.0", + "pako": "~1.0.2", + "readable-stream": "~2.3.6", + "setimmediate": "^1.0.5" + } + }, "node_modules/killable": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz", @@ -11675,6 +11741,14 @@ "node": ">= 0.8.0" } }, + "node_modules/lie": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz", + "integrity": "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==", + "dependencies": { + "immediate": "~3.0.5" + } + }, "node_modules/lines-and-columns": { "version": "1.1.6", "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz", @@ -11981,6 +12055,16 @@ "loose-envify": "cli.js" } }, + "node_modules/lop": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/lop/-/lop-0.4.1.tgz", + "integrity": "sha512-9xyho9why2A2tzm5aIcMWKvzqKsnxrf9B5I+8O30olh6lQU8PH978LqZoI4++37RBgS1Em5i54v1TFs/3wnmXQ==", + "dependencies": { + "duck": "^0.1.12", + "option": "~0.2.1", + "underscore": "^1.13.1" + } + }, "node_modules/loud-rejection": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz", @@ -12032,6 +12116,35 @@ "semver": "bin/semver.js" } }, + "node_modules/mammoth": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/mammoth/-/mammoth-1.5.1.tgz", + "integrity": "sha512-7ZioZBf/1HjYrm1qZJOO+DD+rYxLvwrHS+HVOwW89hwIp+r6ZqJ/Eq2rXSS+8ezZ3/DuW6FUUp2Dfz6e7B2pBQ==", + "dependencies": { + "argparse": "~1.0.3", + "bluebird": "~3.4.0", + "dingbat-to-unicode": "^1.0.1", + "jszip": "^3.7.1", + "lop": "^0.4.1", + "path-is-absolute": "^1.0.0", + "sax": "~1.1.1", + "underscore": "^1.13.1", + "xmlbuilder": "^10.0.0" + }, + "bin": { + "mammoth": "bin/mammoth" + } + }, + "node_modules/mammoth/node_modules/bluebird": { + "version": "3.4.7", + "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.4.7.tgz", + "integrity": "sha512-iD3898SR7sWVRHbiQv+sHUtHnMvC1o3nW5rAcqnq3uOn07DSAppZYUkIGslDz6gXC7HfunPe7YVBgoEJASPcHA==" + }, + "node_modules/mammoth/node_modules/sax": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/sax/-/sax-1.1.6.tgz", + "integrity": "sha512-8zci48uUQyfqynGDSkUMD7FCJB96hwLnlZOXlgs1l3TX+LW27t3psSWKUxC0fxVgA86i8tL4NwGcY1h/6t3ESg==" + }, "node_modules/map-cache": { "version": "0.2.2", "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz", @@ -12769,6 +12882,11 @@ "node": ">=4" } }, + "node_modules/normalize-wheel": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/normalize-wheel/-/normalize-wheel-1.0.1.tgz", + "integrity": "sha512-1OnlAPZ3zgrk8B91HyRj+eVv+kS5u+Z0SCsak6Xil/kmgEia50ga7zfkumayonZrImffAxPU/5WcyGhzetHNPA==" + }, "node_modules/npm-run-path": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", @@ -13062,6 +13180,11 @@ "node": ">=4" } }, + "node_modules/option": { + "version": "0.2.4", + "resolved": "https://registry.npmjs.org/option/-/option-0.2.4.tgz", + "integrity": "sha512-pkEqbDyl8ou5cpq+VsnQbe/WlEy5qS7xPzMS1U55OCG9KPvwFD46zDbxQIj3egJSFc3D+XhYOPUzz49zQAVy7A==" + }, "node_modules/optionator": { "version": "0.8.3", "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz", @@ -13259,6 +13382,11 @@ "no-case": "^2.2.0" } }, + "node_modules/parchment": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/parchment/-/parchment-1.1.4.tgz", + "integrity": "sha512-J5FBQt/pM2inLzg4hEWmzQx/8h8D0CiDxaG3vyp9rKrQRSDgBlhjdP5jQGgosEajXPSQouXGHOmVdgo7QmJuOg==" + }, "node_modules/parent-module": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", @@ -16427,6 +16555,45 @@ "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz", "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==" }, + "node_modules/quill": { + "version": "1.3.7", + "resolved": "https://registry.npmjs.org/quill/-/quill-1.3.7.tgz", + "integrity": "sha512-hG/DVzh/TiknWtE6QmWAF/pxoZKYxfe3J/d/+ShUWkDvvkZQVTPeVmUJVu1uE6DDooC4fWTiCLh84ul89oNz5g==", + "dependencies": { + "clone": "^2.1.1", + "deep-equal": "^1.0.1", + "eventemitter3": "^2.0.3", + "extend": "^3.0.2", + "parchment": "^1.1.4", + "quill-delta": "^3.6.2" + } + }, + "node_modules/quill-delta": { + "version": "3.6.3", + "resolved": "https://registry.npmjs.org/quill-delta/-/quill-delta-3.6.3.tgz", + "integrity": "sha512-wdIGBlcX13tCHOXGMVnnTVFtGRLoP0imqxM696fIPwIf5ODIYUHIvHbZcyvGlZFiFhK5XzDC2lpjbxRhnM05Tg==", + "dependencies": { + "deep-equal": "^1.0.1", + "extend": "^3.0.2", + "fast-diff": "1.1.2" + }, + "engines": { + "node": ">=0.10" + } + }, + "node_modules/quill/node_modules/clone": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz", + "integrity": "sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==", + "engines": { + "node": ">=0.8" + } + }, + "node_modules/quill/node_modules/eventemitter3": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-2.0.3.tgz", + "integrity": "sha512-jLN68Dx5kyFHaePoXWPsCGW5qdyZQtLYHkxkg02/Mz6g0kYpDx4FyP6XfArhQdlOC4b8Mv+EMxPo/8La7Tzghg==" + }, "node_modules/raf": { "version": "3.4.1", "resolved": "https://registry.npmjs.org/raf/-/raf-3.4.1.tgz", @@ -18953,6 +19120,11 @@ "node": ">=0.10.0" } }, + "node_modules/underscore": { + "version": "1.13.6", + "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.6.tgz", + "integrity": "sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A==" + }, "node_modules/unicode-canonical-property-names-ecmascript": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz", @@ -20058,6 +20230,19 @@ "babel-plugin-transform-runtime": "^6.23.0" } }, + "node_modules/vue-quill-editor": { + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/vue-quill-editor/-/vue-quill-editor-3.0.6.tgz", + "integrity": "sha512-g20oSZNWg8Hbu41Kinjd55e235qVWPLfg4NvsLW6d+DhgBTFbEuMpcWlUdrD6qT3+Noim6DRu18VLM9lVShXOQ==", + "dependencies": { + "object-assign": "^4.1.1", + "quill": "^1.3.4" + }, + "engines": { + "node": ">= 4.0.0", + "npm": ">= 3.0.0" + } + }, "node_modules/vue-ref": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/vue-ref/-/vue-ref-2.0.0.tgz", @@ -21124,6 +21309,14 @@ "resolved": "https://registry.npmjs.org/xe-utils/-/xe-utils-2.4.8.tgz", "integrity": "sha512-/95ZaQK9GJE/EYrpMv9lgKdkEMQwWv4a4TF4dddi4gSzZ33vp/rZvzJNNV9XknaOkMizK9IBSX8CB/nL+SAk0Q==" }, + "node_modules/xmlbuilder": { + "version": "10.1.1", + "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-10.1.1.tgz", + "integrity": "sha512-OyzrcFLL/nb6fMGHbiRDuPup9ljBycsdCypwuyg5AAHvyWzGfChJpCXMG88AGTIMFhGZ9RccFN1e6lhg3hkwKg==", + "engines": { + "node": ">=4.0" + } + }, "node_modules/xtend": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", @@ -27565,8 +27758,7 @@ "deepmerge": { "version": "1.5.2", "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-1.5.2.tgz", - "integrity": "sha512-95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ==", - "dev": true + "integrity": "sha512-95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ==" }, "default-gateway": { "version": "5.0.5", @@ -27837,6 +28029,11 @@ } } }, + "dingbat-to-unicode": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/dingbat-to-unicode/-/dingbat-to-unicode-1.0.1.tgz", + "integrity": "sha512-98l0sW87ZT58pU4i61wa2OHwxbiYSbuxsCBozaVnYX2iCnr3bLM3fIes1/ej7h1YdOKuKt/MLs706TVnALA65w==" + }, "dir-glob": { "version": "2.2.2", "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.2.2.tgz", @@ -28034,6 +28231,14 @@ "minimatch": "^3.0.4" } }, + "duck": { + "version": "0.1.12", + "resolved": "https://registry.npmjs.org/duck/-/duck-0.1.12.tgz", + "integrity": "sha512-wkctla1O6VfP89gQ+J/yDesM0S7B7XLXjKGzXxMDVFg7uEn706niAtyYovKbyq1oT9YwDcly721/iUWoc8MVRg==", + "requires": { + "underscore": "^1.13.1" + } + }, "duplexer": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz", @@ -28099,6 +28304,34 @@ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.644.tgz", "integrity": "sha512-N7FLvjDPADxad+OXXBuYfcvDvCBG0aW8ZZGr7G91sZMviYbnQJFxdSvUus4SJ0K7Q8dzMxE+Wx1d/CrJIIJ0sw==" }, + "element-ui": { + "version": "2.15.10", + "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.15.10.tgz", + "integrity": "sha512-jmD++mU2wKXbisvx4fxOl2mHaU+HWHTAq/3Wf8x9Bwyu4GdDZPLABb+CGi3DWN6fPqdgRcd74aX39DO+YHObLw==", + "requires": { + "async-validator": "~1.8.1", + "babel-helper-vue-jsx-merge-props": "^2.0.0", + "deepmerge": "^1.2.0", + "normalize-wheel": "^1.0.1", + "resize-observer-polyfill": "^1.5.0", + "throttle-debounce": "^1.0.1" + }, + "dependencies": { + "async-validator": { + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/async-validator/-/async-validator-1.8.5.tgz", + "integrity": "sha512-tXBM+1m056MAX0E8TL2iCjg8WvSyXu0Zc8LNtYqrVeyoL3+esHRZ4SieE9fKQyyU09uONjnMEjrNBMqT0mbvmA==", + "requires": { + "babel-runtime": "6.x" + } + }, + "throttle-debounce": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/throttle-debounce/-/throttle-debounce-1.1.0.tgz", + "integrity": "sha512-XH8UiPCQcWNuk2LYePibW/4qL97+ZQ1AN3FNXwZRBNPPowo/NRU5fAlDCSNBJIYCKbioZfuYtMhG4quqoJhVzg==" + } + } + }, "elliptic": { "version": "6.5.4", "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz", @@ -29083,8 +29316,7 @@ "extend": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", - "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==", - "dev": true + "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==" }, "extend-shallow": { "version": "3.0.2", @@ -29233,6 +29465,11 @@ "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" }, + "fast-diff": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.1.2.tgz", + "integrity": "sha512-KaJUt+M9t1qaIteSvjc6P3RbMdXsNhK61GRftR6SNxqmhthcd9MGIi4T+o0jD8LUSpSnSKXE20nLtJ3fOHxQig==" + }, "fast-glob": { "version": "2.2.7", "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.7.tgz", @@ -30202,6 +30439,11 @@ "dev": true, "optional": true }, + "immediate": { + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz", + "integrity": "sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==" + }, "import-cwd": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-2.1.0.tgz", @@ -30829,6 +31071,17 @@ "verror": "1.10.0" } }, + "jszip": { + "version": "3.10.1", + "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.10.1.tgz", + "integrity": "sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g==", + "requires": { + "lie": "~3.3.0", + "pako": "~1.0.2", + "readable-stream": "~2.3.6", + "setimmediate": "^1.0.5" + } + }, "killable": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz", @@ -30952,6 +31205,14 @@ "type-check": "~0.3.2" } }, + "lie": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz", + "integrity": "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==", + "requires": { + "immediate": "~3.0.5" + } + }, "lines-and-columns": { "version": "1.1.6", "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz", @@ -31219,6 +31480,16 @@ "js-tokens": "^3.0.0 || ^4.0.0" } }, + "lop": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/lop/-/lop-0.4.1.tgz", + "integrity": "sha512-9xyho9why2A2tzm5aIcMWKvzqKsnxrf9B5I+8O30olh6lQU8PH978LqZoI4++37RBgS1Em5i54v1TFs/3wnmXQ==", + "requires": { + "duck": "^0.1.12", + "option": "~0.2.1", + "underscore": "^1.13.1" + } + }, "loud-rejection": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz", @@ -31260,6 +31531,34 @@ } } }, + "mammoth": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/mammoth/-/mammoth-1.5.1.tgz", + "integrity": "sha512-7ZioZBf/1HjYrm1qZJOO+DD+rYxLvwrHS+HVOwW89hwIp+r6ZqJ/Eq2rXSS+8ezZ3/DuW6FUUp2Dfz6e7B2pBQ==", + "requires": { + "argparse": "~1.0.3", + "bluebird": "~3.4.0", + "dingbat-to-unicode": "^1.0.1", + "jszip": "^3.7.1", + "lop": "^0.4.1", + "path-is-absolute": "^1.0.0", + "sax": "~1.1.1", + "underscore": "^1.13.1", + "xmlbuilder": "^10.0.0" + }, + "dependencies": { + "bluebird": { + "version": "3.4.7", + "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.4.7.tgz", + "integrity": "sha512-iD3898SR7sWVRHbiQv+sHUtHnMvC1o3nW5rAcqnq3uOn07DSAppZYUkIGslDz6gXC7HfunPe7YVBgoEJASPcHA==" + }, + "sax": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/sax/-/sax-1.1.6.tgz", + "integrity": "sha512-8zci48uUQyfqynGDSkUMD7FCJB96hwLnlZOXlgs1l3TX+LW27t3psSWKUxC0fxVgA86i8tL4NwGcY1h/6t3ESg==" + } + } + }, "map-cache": { "version": "0.2.2", "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz", @@ -31878,6 +32177,11 @@ "sort-keys": "^1.0.0" } }, + "normalize-wheel": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/normalize-wheel/-/normalize-wheel-1.0.1.tgz", + "integrity": "sha512-1OnlAPZ3zgrk8B91HyRj+eVv+kS5u+Z0SCsak6Xil/kmgEia50ga7zfkumayonZrImffAxPU/5WcyGhzetHNPA==" + }, "npm-run-path": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", @@ -32092,6 +32396,11 @@ "is-wsl": "^1.1.0" } }, + "option": { + "version": "0.2.4", + "resolved": "https://registry.npmjs.org/option/-/option-0.2.4.tgz", + "integrity": "sha512-pkEqbDyl8ou5cpq+VsnQbe/WlEy5qS7xPzMS1U55OCG9KPvwFD46zDbxQIj3egJSFc3D+XhYOPUzz49zQAVy7A==" + }, "optionator": { "version": "0.8.3", "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz", @@ -32251,6 +32560,11 @@ "no-case": "^2.2.0" } }, + "parchment": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/parchment/-/parchment-1.1.4.tgz", + "integrity": "sha512-J5FBQt/pM2inLzg4hEWmzQx/8h8D0CiDxaG3vyp9rKrQRSDgBlhjdP5jQGgosEajXPSQouXGHOmVdgo7QmJuOg==" + }, "parent-module": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", @@ -34870,6 +35184,41 @@ "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz", "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==" }, + "quill": { + "version": "1.3.7", + "resolved": "https://registry.npmjs.org/quill/-/quill-1.3.7.tgz", + "integrity": "sha512-hG/DVzh/TiknWtE6QmWAF/pxoZKYxfe3J/d/+ShUWkDvvkZQVTPeVmUJVu1uE6DDooC4fWTiCLh84ul89oNz5g==", + "requires": { + "clone": "^2.1.1", + "deep-equal": "^1.0.1", + "eventemitter3": "^2.0.3", + "extend": "^3.0.2", + "parchment": "^1.1.4", + "quill-delta": "^3.6.2" + }, + "dependencies": { + "clone": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz", + "integrity": "sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==" + }, + "eventemitter3": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-2.0.3.tgz", + "integrity": "sha512-jLN68Dx5kyFHaePoXWPsCGW5qdyZQtLYHkxkg02/Mz6g0kYpDx4FyP6XfArhQdlOC4b8Mv+EMxPo/8La7Tzghg==" + } + } + }, + "quill-delta": { + "version": "3.6.3", + "resolved": "https://registry.npmjs.org/quill-delta/-/quill-delta-3.6.3.tgz", + "integrity": "sha512-wdIGBlcX13tCHOXGMVnnTVFtGRLoP0imqxM696fIPwIf5ODIYUHIvHbZcyvGlZFiFhK5XzDC2lpjbxRhnM05Tg==", + "requires": { + "deep-equal": "^1.0.1", + "extend": "^3.0.2", + "fast-diff": "1.1.2" + } + }, "raf": { "version": "3.4.1", "resolved": "https://registry.npmjs.org/raf/-/raf-3.4.1.tgz", @@ -36915,6 +37264,11 @@ } } }, + "underscore": { + "version": "1.13.6", + "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.6.tgz", + "integrity": "sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A==" + }, "unicode-canonical-property-names-ecmascript": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz", @@ -37268,8 +37622,7 @@ "integrity": "sha512-ERAREN+6k/ywrwT+swcMo4CDIAq6dBjnB0+lhmsSfaip06BGHSBfNKg6yl7/4GJ9Nk2kioUw3llNhEboJuIKmQ==", "requires": { "@types/node": "*", - "viser": "^2.0.0", - "vue": "^2.5.3" + "viser": "^2.0.0" } }, "vm-browserify": { @@ -37814,6 +38167,15 @@ "babel-plugin-transform-runtime": "^6.23.0" } }, + "vue-quill-editor": { + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/vue-quill-editor/-/vue-quill-editor-3.0.6.tgz", + "integrity": "sha512-g20oSZNWg8Hbu41Kinjd55e235qVWPLfg4NvsLW6d+DhgBTFbEuMpcWlUdrD6qT3+Noim6DRu18VLM9lVShXOQ==", + "requires": { + "object-assign": "^4.1.1", + "quill": "^1.3.4" + } + }, "vue-ref": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/vue-ref/-/vue-ref-2.0.0.tgz", @@ -38665,6 +39027,11 @@ "resolved": "https://registry.npmjs.org/xe-utils/-/xe-utils-2.4.8.tgz", "integrity": "sha512-/95ZaQK9GJE/EYrpMv9lgKdkEMQwWv4a4TF4dddi4gSzZ33vp/rZvzJNNV9XknaOkMizK9IBSX8CB/nL+SAk0Q==" }, + "xmlbuilder": { + "version": "10.1.1", + "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-10.1.1.tgz", + "integrity": "sha512-OyzrcFLL/nb6fMGHbiRDuPup9ljBycsdCypwuyg5AAHvyWzGfChJpCXMG88AGTIMFhGZ9RccFN1e6lhg3hkwKg==" + }, "xtend": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", diff --git a/jero-web/src/views/documentTools/documentTranslation/index.vue b/jero-web/src/views/documentTools/documentTranslation/index.vue index 35370e0ee..36096b058 100644 --- a/jero-web/src/views/documentTools/documentTranslation/index.vue +++ b/jero-web/src/views/documentTools/documentTranslation/index.vue @@ -312,7 +312,8 @@ // // }, downloadData(fileQuery) { - downloadFile('/sys/common/downLoadFile', fileQuery.fileName, { id: fileQuery.targetFileId }) + console.log(fileQuery.targetFileName); + downloadFile('/sys/common/downLoadFile', fileQuery.targetFileName, { id: fileQuery.targetFileId }) }, subscribe(record) { let _this = this From 4820821b40fdf77c5b1f0e90d9a401092b4b484f Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Thu, 29 Sep 2022 15:33:03 +0800 Subject: [PATCH 65/93] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../technologyAssessment/components/evaluationResultsWhole.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue index 220707ec5..645eda78a 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue @@ -96,6 +96,7 @@ return { queryParam: {}, dataSource: [], + userInfoQuery:{}, administrators:false, url: { list: '/lawsTechnologyEvaluation/lawsTechnologyEvaluationComplianceResultEO/list', From 69ad8e6b701a43e1d026d1a6305d59a26cf13a3a Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Thu, 29 Sep 2022 15:36:34 +0800 Subject: [PATCH 66/93] update --- .../service/impl/LawsOpinionGatherEOServiceImpl.java | 1 - .../service/impl/FileSplitItemsEOServiceImpl.java | 10 ++++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java index 491631ca8..376cc56a3 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java @@ -116,7 +116,6 @@ public class LawsOpinionGatherEOServiceImpl extends ServiceImpl ids,String cut) { QueryWrapper lawsOpinionGatherEOQueryWrapper = new QueryWrapper<>(); - lawsOpinionGatherEOQueryWrapper.lambda().eq(LawsOpinionGatherEO::getGatherResult, GatherResultEnum.UNDERWAY.getValue()); lawsOpinionGatherEOQueryWrapper.lambda().in(LawsOpinionGatherEO::getId, ids); List lawsOpinionGatherEOList = this.list(lawsOpinionGatherEOQueryWrapper); 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 44ee566b3..de51fcadf 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 @@ -576,10 +576,12 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl Date: Thu, 29 Sep 2022 15:39:49 +0800 Subject: [PATCH 67/93] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/businessSupport/technologyAssessment/index.vue | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/jero-web/src/views/businessSupport/technologyAssessment/index.vue b/jero-web/src/views/businessSupport/technologyAssessment/index.vue index b10acce8b..5cf612ac4 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/index.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/index.vue @@ -464,7 +464,8 @@ lawsTechnologyEvaluationId: row.id, standId: row.standId, remark: row.remark, - createBy:row.createBy + createBy:row.createBy, + gatherResult:row.gatherResult } }) window.open(newUrl.href, '_blank') @@ -478,7 +479,8 @@ lawsTechnologyEvaluationId: row.id, standId: row.standId, remark: row.remark, - createBy:row.createBy + createBy:row.createBy, + gatherResult:row.gatherResult } }) window.open(newUrl.href, '_blank') From 0ae590aabf454c4b6754812b063c21adef1beccc Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Thu, 29 Sep 2022 15:41:56 +0800 Subject: [PATCH 68/93] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/evaluationResultsClause.vue | 2 +- .../components/evaluationResultsWhole.vue | 2 +- .../src/views/businessSupport/technologyAssessment/index.vue | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue index 02b4003c7..667c1dcd1 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue @@ -15,7 +15,7 @@
{{$t('endProcess')}} diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue index 645eda78a..cd25daf21 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue @@ -15,7 +15,7 @@
{{$t('endProcess')}} diff --git a/jero-web/src/views/businessSupport/technologyAssessment/index.vue b/jero-web/src/views/businessSupport/technologyAssessment/index.vue index 5cf612ac4..5da2533c3 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/index.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/index.vue @@ -465,7 +465,7 @@ standId: row.standId, remark: row.remark, createBy:row.createBy, - gatherResult:row.gatherResult + flowStatus:row.flowStatus } }) window.open(newUrl.href, '_blank') @@ -480,7 +480,7 @@ standId: row.standId, remark: row.remark, createBy:row.createBy, - gatherResult:row.gatherResult + flowStatus:row.flowStatus } }) window.open(newUrl.href, '_blank') From af9314bacbac72861d0c739909115edcb0e32180 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Thu, 29 Sep 2022 16:09:51 +0800 Subject: [PATCH 69/93] =?UTF-8?q?=E7=A6=85=E9=81=9360494=20=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E6=96=87=E4=BB=B6=EF=BC=8C=E4=B8=8A=E4=BC=A0gif?= =?UTF-8?q?=E5=8A=A8=E6=80=81=E5=9B=BE=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/oss/service/impl/OSSFileServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java index 94c8d84af..bf1ccd851 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java @@ -253,7 +253,7 @@ public class OSSFileServiceImpl extends ServiceImpl impl String[] fileTypeArr = {".doc", ".DOC", ".txt", ".TXT", ".docx", ".DOCX", ".xls", ".XLS", ".xlsx", ".XLSX", ".pdf", ".PDF", ".png", ".PNG", ".jfif", ".JFIF", ".pjpeg", ".PJPEG", ".jpeg", ".JPEG", ".pjp", ".PJP", - ".jpg", ".JPG", ".swf", ".SWF", ".bmp", ".BMP", ".rar", ".RAR", ".zip", ".ZIP", ".ppt", ".PPT", ".pptx", ".PPTX", ".csv", ".CSV"}; + ".jpg", ".JPG", ".swf", ".SWF", ".bmp", ".BMP", ".rar", ".RAR", ".zip", ".ZIP", ".ppt", ".PPT", ".pptx", ".PPTX", ".csv", ".CSV", ".gif", ".GIF"}; boolean flag = true; for (String fileTypeTemp : fileTypeArr) { if (fileTypeTemp.equalsIgnoreCase(fileType)) { @@ -262,9 +262,9 @@ public class OSSFileServiceImpl extends ServiceImpl impl } if (flag) { if (cut.equals(CutEnum.CN.getValue())) { - throw new JeroBootException("只能够上传pdf/word/excel/csv/ppt/txt/zip/rar/静态图片类型的文件。请重新选择文件！"); + throw new JeroBootException("只能够上传pdf/word/excel/csv/ppt/txt/zip/rar/gif/静态图片类型的文件。请重新选择文件！"); } else { - throw new JeroBootException("Only upload pdf/word/excel/csv/ppt/txt/zip/rar/Static image type file. Please re select the file!"); + throw new JeroBootException("Only upload pdf/word/excel/csv/ppt/txt/zip/rar/gif/Static image type file. Please re select the file!"); } } } From 945e370ea334863d12655643d5ef9d5b63d90e2b Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Thu, 29 Sep 2022 18:03:31 +0800 Subject: [PATCH 70/93] =?UTF-8?q?=E9=97=AE=E9=A2=98=E7=9F=A5=E8=AF=86?= =?UTF-8?q?=E5=BA=93-=E6=96=B0=E5=A2=9E=E3=80=81=E7=BC=96=E8=BE=91?= =?UTF-8?q?=EF=BC=8C=E5=A4=84=E7=90=86=E6=AD=A3=E6=96=87=E6=8F=92=E5=85=A5?= =?UTF-8?q?es=E6=97=B6=EF=BC=8C=E5=8E=BB=E9=99=A4=E5=AF=8C=E6=96=87?= =?UTF-8?q?=E6=9C=AC=E6=A0=87=E7=AD=BE=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProblemKnowledgeBaseEOServiceImpl.java | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java index aa3e94c37..a1e1f7bd9 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java @@ -40,6 +40,8 @@ import com.jero.modules.system.util.StringUtils; import org.apache.commons.collections4.CollectionUtils; import org.apache.shiro.SecurityUtils; import org.jetbrains.annotations.NotNull; +import org.jsoup.Jsoup; +import org.jsoup.nodes.Document; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -117,10 +119,11 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl"); - sbCn.append("正文" + ":" + problemKnowledgeBaseEO.getContent() + " "); + sbCn.append("正文" + ":" + content + " "); }else { sbCn.append("
"); sbCn.append("正文" + ":" + "-- "); @@ -363,8 +370,12 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl"); - sbEn.append("Text" + ":" + problemKnowledgeBaseEO.getContent() + " "); + sbEn.append("Text" + ":" + content + " "); }else { sbEn.append("
"); sbEn.append("Text" + ":" + "-- "); From 672706aeae1d10790b3357826be1a8ca6c6e1876 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 29 Sep 2022 20:30:05 +0800 Subject: [PATCH 71/93] =?UTF-8?q?=E6=9C=88=E6=8A=A5=E5=AF=BC=E5=87=BA--?= =?UTF-8?q?=E5=8D=95=E5=85=83=E6=A0=BC=E5=AD=97=E4=BD=93=E5=A4=A7=E5=B0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/jero/modules/report/util/WordUtil.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java index 3296ff4fa..f6aadd8d1 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java @@ -1079,7 +1079,7 @@ public class WordUtil { run.setText(text); } //设置字体样式,大小 - run.setFontSize(10); + run.setFontSize(11); run.setFontFamily("Blue Sky Noto Regular"); } @@ -1134,7 +1134,7 @@ public class WordUtil { } //设置字体样式,大小 - run.setFontSize(10); + run.setFontSize(11); run.setFontFamily("Blue Sky Noto Regular"); } From 13f3933ca01e446fbc6b469c807956f8dcb0ed43 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Fri, 30 Sep 2022 10:34:39 +0800 Subject: [PATCH 72/93] =?UTF-8?q?=E6=9C=88=E6=8A=A5=E5=AF=BC=E5=87=BA--?= =?UTF-8?q?=E5=B0=81=E9=9D=A2=E5=8D=95=E7=8B=AC=E5=8D=A0=E7=94=A8=E4=B8=80?= =?UTF-8?q?=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/LawsMonthlyReportWriteEOServiceImpl.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java index fa42b801f..c309c19a3 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java @@ -886,6 +886,8 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl lawsMonthlyReportWriteEOS, @@ -900,6 +902,8 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl lawsMonthlyReportWriteEOS, List lawsMonthlyReportTitleTemplateEOS, From 21b20a8a876220bd9de2e972096c6aa2d050e881 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Fri, 30 Sep 2022 11:04:11 +0800 Subject: [PATCH 73/93] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/problemKnowledgeBaseAdd.vue | 5 ++++- .../components/problemKnowledgeBaseListView.vue | 14 ++++++++++---- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue index 62a54c369..8aebde02f 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue @@ -458,6 +458,8 @@ id: this.formInline.bussDocumentLibraryId.split(',')[index] }) }) + } else { + this.formInline.standNumber = [] } this.formInline = { ...this.formInline } } else { @@ -575,7 +577,7 @@ this.$refs.ruleForm.validate(valid => { if (valid) { let formInline = JSON.parse(JSON.stringify(this.formInline)) - if (formInline.standNumber && formInline.standNumber.length > 0){ + if (formInline.standNumber && formInline.standNumber.length > 0) { formInline.standNumber = formInline.standNumber.join(',') } this.loading = true @@ -805,6 +807,7 @@ height: 38px; margin-right: 10px; } + .itemOption { display: inline-block; width: 100%; diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseListView.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseListView.vue index 81b22a7d4..5c4fbfd08 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseListView.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseListView.vue @@ -14,7 +14,7 @@
-
+
@@ -102,7 +102,7 @@
- + {{val.createBy}} {{val.createTime}}
@@ -151,6 +151,10 @@