From 329a31c4cf0246121f9c657dcfefc3cab92506ec Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Wed, 17 Aug 2022 11:31:49 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=95=B4=E5=90=88=E5=AF=BC=E5=87=BA--?= =?UTF-8?q?=E4=B8=AD=E8=8B=B1=E6=96=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jero/modules/report/util/WordUtil.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 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 e85f66024..b8775839e 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 @@ -404,7 +404,7 @@ public class WordUtil { //第1行 if(CutEnum.CN.getValue().equals(cut)){ //第1行 - setCell(table.getRow(0), "技术领域",technologyTerritoryName); + setCell(table.getRow(0), "相关领域",technologyTerritoryName); //第2行 setCell(table.getRow(1), "适用车型",applyCarName); //第3行 @@ -420,16 +420,16 @@ public class WordUtil { //第8行 setCell(table.getRow(7), "在产车实施日期",productionCarImplementTime); //第9行 - setCell(table.getRow(8), "主要内容中文",contentCn); + setCell(table.getRow(8), "主要内容",contentCn); //第10行 - setCell(table.getRow(9), "NIO工作进展中文",workProgressCn); + setCell(table.getRow(9), "NIO工作进展",workProgressCn); //第11行 setCell(table.getRow(10), "法规联系人",lawsContact); //第12行 setCell(table.getRow(11), "链接",link); }else{ //第1行 - setCell(table.getRow(0), "Technical Field",technologyTerritoryName); + setCell(table.getRow(0), "Related Areas",technologyTerritoryName); //第2行 setCell(table.getRow(1), "Vehicle Type",applyCarName); //第3行 @@ -445,9 +445,9 @@ public class WordUtil { //第8行 setCell(table.getRow(7), "New Vehicle Execution Date",productionCarImplementTime); //第9行 - setCell(table.getRow(8), "Main Content (English)",contentEn); + setCell(table.getRow(8), "Main Content",contentEn); //第10行 - setCell(table.getRow(9), "NIO Work Progress (English)",workProgressEn); + setCell(table.getRow(9), "NIO Work Progress",workProgressEn); //第11行 setCell(table.getRow(10), "Regulatory Contact",lawsContact); //第12行 From 1a8f2475c750637759704a4034f0dc680838b333 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Wed, 17 Aug 2022 11:51:35 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=9C=88=E6=8A=A5=E6=95=B4=E5=90=88?= =?UTF-8?q?=E5=AF=BC=E5=87=BA--=E5=8F=91=E7=BB=99=E8=81=94=E7=B3=BB?= =?UTF-8?q?=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LawsMonthlyReportWriteEOServiceImpl.java | 41 ++++++++++++++++--- .../jero/modules/report/util/WordUtil.java | 28 +++++++++++-- 2 files changed, 59 insertions(+), 10 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 dc389d037..f0dd7cfef 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 @@ -421,6 +421,9 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl lawsMonthlyReportWriteEOS = this.list(wrapper); + //法规联系人 + List loginUserList = getlawsContact(lawsMonthlyReportWriteEOS); + List lawsMonthlyReportIdList = lawsMonthlyReportWriteEOS.stream().map(LawsMonthlyReportWriteEO::getId).collect(Collectors.toList()); //新征求意见清单模板 @@ -471,7 +474,7 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl getlawsContact(List lawsMonthlyReportWriteEOS) { + List userIdList = lawsMonthlyReportWriteEOS.stream().map(LawsMonthlyReportWriteEO::getLawsContact).collect(Collectors.toList()); + //法规联系人 + List userIds = new ArrayList<>(); + for (String s : userIdList) { + if(StringUtils.isNotBlank(s)){ + if(s.contains(",")){ + userIds.addAll(Arrays.asList(s.split(","))); + }else{ + userIds.add(s); + } + } + } + List jsonObjects = sysBaseApi.queryUsersByIds(StringUtils.join(userIds, ",")); + List userList = new ArrayList<>(); + for (JSONObject jsonObject : jsonObjects) { + LoginUser loginUser = JSONObject.parseObject(jsonObject.toJSONString(), LoginUser.class); + userList.add(loginUser); + } + return userList; + } + /** *创建word文件 @@ -522,7 +547,8 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl lawsMonthlyReportWriteEOS, - List lawsMonthlyReportTitleTemplateEOS){ + List lawsMonthlyReportTitleTemplateEOS, + List loginUserList){ //一级菜单 List parentIdList = lawsMonthlyReportTitleTemplateEOS.stream().map(LawsMonthlyReportTitleTemplateEO::getParentId).distinct().collect(Collectors.toList()); LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); @@ -591,13 +617,15 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl reportTitleOneList, String titleCN, XWPFDocument document, - String cut) { + String cut, + List loginUserList) { //数据字典 List sysDictItems = sysDictItemServiceImpl.selectItemsAll(); @@ -761,7 +790,7 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl sysDictItems, List categoryList, - String cut) { + String cut, + List loginUserList) { String technologyTerritory = lawsMonthlyReportWriteEO.getTechnologyTerritory();//技术领域 String applyCar = lawsMonthlyReportWriteEO.getApplyCar();//适用车型 String applyScope = lawsMonthlyReportWriteEO.getApplyScope();//适用范围 @@ -363,7 +364,8 @@ public class WordUtil { String contentEn = lawsMonthlyReportWriteEO.getContentEn();//主要内容英文 String workProgressCn = lawsMonthlyReportWriteEO.getWorkProgressCn();//NIO工作进展中文 String workProgressEn = lawsMonthlyReportWriteEO.getWorkProgressEn();//NIO工作进展英文 - String lawsContact = lawsMonthlyReportWriteEO.getLawsContact();//法规联系人 + String lawsContactTemp = lawsMonthlyReportWriteEO.getLawsContact();//法规联系人 + String lawsContact = getLawsContact(loginUserList, lawsContactTemp); String link = lawsMonthlyReportWriteEO.getLink();//链接 String technologyTerritoryName = ""; if(org.apache.commons.lang3.StringUtils.isNotBlank(technologyTerritory)){ @@ -679,5 +681,23 @@ public class WordUtil { tableRow.getCell(0).setText(fieldName); tableRow.getCell(1).setText(technologyTerritory); } + + private static String getLawsContact(List userList, String lawsContact) { + if(com.jero.modules.system.util.StringUtils.isNotBlank(lawsContact)){ + List collect = userList.stream().filter(e -> lawsContact.contains(e.getId())).collect(Collectors.toList()); + StringBuilder sb = new StringBuilder(); + for (String s : lawsContact.split(",")) { + List loginUserList = collect.stream().filter(e -> e.getId().equals(s)).collect(Collectors.toList()); + if(loginUserList.size() != 0){ + sb.append(loginUserList.get(0).getUsername()+","); + } + } + if(com.jero.modules.system.util.StringUtils.isNotBlank(sb)){ + String substring = sb.substring(0, sb.length() - 1); + return substring; + } + } + return null; + } } From e9138be454268b630310531b6747bef4c58e7caf Mon Sep 17 00:00:00 2001 From: liyawei Date: Wed, 17 Aug 2022 12:16:05 +0800 Subject: [PATCH 3/5] =?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-=E5=B7=A5=E7=A8=8B=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E4=BA=BA=E9=80=89=E6=8B=A9=E6=B8=85=E7=A9=BA=E4=B8=8B?= =?UTF-8?q?=E6=8B=89=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/tableCollection/index.vue | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue index fdafa80b7..14e5ad760 100644 --- a/jero-web/src/components/tableCollection/index.vue +++ b/jero-web/src/components/tableCollection/index.vue @@ -455,6 +455,7 @@ console.log(res) if (res.data.success) { _this.$message.success(_this.$t('OperationSuccessful')) + // this.$refs['ruleFormOne'].resetFields() _this.areaVisiblezr = false this.getLoginUserType() } else { @@ -495,6 +496,7 @@ console.log(res) if (res.data.success) { _this.$message.success(_this.$t('OperationSuccessful')) + this.$refs['ruleForm'].resetFields() _this.areaVisible = false this.getLoginUserType() } else { @@ -518,23 +520,25 @@ }, // 点击工程接口人的详情人员 有权限 areaOfResponsibility(record) { - this.areaVisible = true + // this.$refs.ruleForm.clearValidate() this.$nextTick(() => { this.Dateline = { ...this.Dateline } this.getquerySdtList(record) this.$refs.ruleForm.clearValidate() }) + this.areaVisible = true }, // 点击责任领域的详情人员 有权限 ondataValueTobe(record) { - this.areaVisiblezr = true + // this.$refs.ruleForm.clearValidate() this.$nextTick(() => { this.Dateline = { ...this.Dateline } this.getquerySdtId = record.id this.$refs.ruleFormOne.clearValidate() }) + this.areaVisiblezr = true }, dataValueTobeinitiated() { this.$message.warning(this.$t('certifiedEngineer') + this.$t('and') + this.$t('Statusis') + this.$t('CollectionInitiated') + this.$t('ReturnedPerson') + this.$t('alteration') + this.$t('toHavePermission')) From 87f9de09e8044ac7dfd91c351997b0c95bab529e Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Wed, 17 Aug 2022 13:47:09 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=9C=88=E6=8A=A5=E6=A0=87=E9=A2=98?= =?UTF-8?q?=E5=88=A0=E9=99=A4--=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...onthlyReportTitleTemplateEOController.java | 16 ++++++++++++ ...wsMonthlyReportTitleTemplateEOService.java | 7 +++++ ...nthlyReportTitleTemplateEOServiceImpl.java | 26 +++++++++++++++++++ 3 files changed, 49 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportTitleTemplateEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportTitleTemplateEOController.java index a4ec13edc..b7d24803b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportTitleTemplateEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportTitleTemplateEOController.java @@ -134,6 +134,22 @@ public class LawsMonthlyReportTitleTemplateEOController extends JeroController verifyDelete(@RequestParam(name="ids",required=true) String ids) { + String flag = this.lawsMonthlyReportTitleTemplateEOService.verifyDelete(Arrays.asList(ids.split(","))); + return Result.OK(flag); + } + + + /** * 通过id查询 * diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/ILawsMonthlyReportTitleTemplateEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/ILawsMonthlyReportTitleTemplateEOService.java index 6a2b744c1..6b3701ac6 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/ILawsMonthlyReportTitleTemplateEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/ILawsMonthlyReportTitleTemplateEOService.java @@ -48,6 +48,13 @@ public interface ILawsMonthlyReportTitleTemplateEOService extends IService ids); + /** + * 目录删除验证 + * @param ids + * @return + */ + String verifyDelete(List ids); + /** * 通过id查询 * diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportTitleTemplateEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportTitleTemplateEOServiceImpl.java index c2c35988f..20950cba4 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportTitleTemplateEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportTitleTemplateEOServiceImpl.java @@ -121,6 +121,32 @@ public class LawsMonthlyReportTitleTemplateEOServiceImpl extends ServiceImpl ids) { + //标题下存在内容或子标题时不能删除 + //1. 判断是否存在子标题 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(LawsMonthlyReportTitleTemplateEO::getParentId,ids); + List list = this.list(wrapper); + if(list.size() != 0){ + //不能删除 + return "false"; + } + //2. 判断是否存在内容 memories_chapter + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.in(LawsMonthlyReportWriteEO::getMemoriesChapter,ids); + List lawsMonthlyReportWriteEOS = lawsMonthlyReportWriteEOService.list(lambdaQueryWrapper); + if(lawsMonthlyReportWriteEOS.size() != 0){ + //不能删除 + return "false"; + } + return "true"; + } + /** * 通过id查询 * From e8bf04edb39c636eab8ec7819e295630b12f1782 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Wed, 17 Aug 2022 13:58:11 +0800 Subject: [PATCH 5/5] =?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/common/lang/en-us.js | 1 + jero-web/src/common/lang/zh-cn.js | 1 + .../regulationReport/components/modules/fillTable.vue | 9 +++++++++ 3 files changed, 11 insertions(+) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 72d278ab7..4839ad2e8 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1261,4 +1261,5 @@ module.exports = { currentlyTheFirstOneThatCannotMovedUp:'Currently the first one that cannot be moved up', currentlyTheLastOneCannotmovedDown:'Currently the last one cannot be moved down', weilaiRegulationMonthlyReport:'Weilai Regulation Monthly Report', + thereTitleWhichCannotBeDeleted:'There are new contents under this title, which cannot be deleted', } \ 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 bdd85ecab..89622c213 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1363,4 +1363,5 @@ module.exports = { currentlyTheFirstOneThatCannotMovedUp:'当前已是第一个无法进行上移', currentlyTheLastOneCannotmovedDown:'当前已是最后一个无法进行下移', weilaiRegulationMonthlyReport:'蔚来法规月报', + thereTitleWhichCannotBeDeleted:'该标题下存在新增内容,不能删除', } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue index 3a8d0b8d0..cd49be66e 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/fillTable.vue @@ -205,6 +205,15 @@ this.$message.warning(this.$t('thereWhichCannotDeleted')) return } + getAction('/report/lawsMonthlyReportTitleTemplateEO/verifyDelete', { ids: val.id }).then((res) => { + if (res.result == 'true') { + this.deleteBatch(val) + } else { + this.$message.warning(this.$t('thereTitleWhichCannotBeDeleted')) + } + }) + }, + deleteBatch(val) { let _this = this this.$confirm({ content: _this.$t('ConfirmDelete'),