From e252bb2890832fd3d404cb23f2ebab5c62c5e8b2 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Wed, 26 Oct 2022 11:43:23 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E7=9F=A5=E8=AF=86=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/problemKnowledgeBaseList.vue | 6 +++++- .../components/problemKnowledgeBaseListView.vue | 6 +++++- .../components/problemKnowledgeBaseRelease.vue | 15 ++++++++++++++- 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue index 375192fd7..35b7746c7 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue @@ -96,9 +96,13 @@ {{item.standNumber}}
- + {{item.targetMarket_dicText}}
+
+ + {{item.showPermissions_dicText}} +
{{item.createTime}} diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseListView.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseListView.vue index 4c0f51f27..511849faa 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseListView.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseListView.vue @@ -38,9 +38,13 @@ {{queryForm.standNumber}}
- + {{queryForm.targetMarket_dicText}}
+
+ + {{queryForm.showPermissions_dicText}} +
{{queryForm.createTime}} diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue index 16bc05889..edf3c31da 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue @@ -65,6 +65,9 @@
{{item.contentOne}}
+
+ {{item.showPermissions_dicText}} +
{{item.releaseStatus == 'Draft'?$t('draft'):$t('HaveReleased')}}
@@ -322,11 +325,21 @@ .text-text-right { padding: 19px 19px; - width: calc(100% - 300px); + width: calc(100% - 420px); box-sizing: border-box; /*margin-left: 38px;*/ } + .text-text-right-text-Two { + width: 120px; + height: 100%; + text-align: center; + position: absolute; + right: 300px; + top: 50%; + transform: translate-Y(-50%); + } + .text-text-right-text-One { width: 120px; height: 100%; From 6fbee100fba8593012392a0c26676cc7fb9c7894 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Wed, 26 Oct 2022 15:14:14 +0800 Subject: [PATCH 02/12] =?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/assets/ditu.png | Bin 0 -> 30410 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 jero-web/src/assets/ditu.png diff --git a/jero-web/src/assets/ditu.png b/jero-web/src/assets/ditu.png new file mode 100644 index 0000000000000000000000000000000000000000..c1c236dec4f1549a8cbea18d934251300c7529dd GIT binary patch literal 30410 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 EAI%KdZ~y=R literal 0 HcmV?d00001 From bf2b51820d12d8ade4d1af1c6ba48c8f81f75692 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Wed, 26 Oct 2022 15:52:05 +0800 Subject: [PATCH 03/12] =?UTF-8?q?61777-=E6=B3=95=E8=A7=84=E6=8A=80?= =?UTF-8?q?=E6=9C=AF=E8=AF=84=E4=BC=B0=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9D=83=E9=99=90=E5=AE=8C=E5=96=84=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LawsTechnologyEvaluationEOServiceImpl.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) 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 cefc08e86..0b39ff36e 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 @@ -712,17 +712,19 @@ public class LawsTechnologyEvaluationEOServiceImpl extends ServiceImpl flowDetailQueryWrap = new QueryWrapper<>(); flowDetailQueryWrap.lambda().eq(LawsTechnologyEvaluationFlowDetailEO::getEvaluatorId,currentUser.getId()); List flowDetailEOList = this.lawsTechnologyEvaluationFlowDetailEOService.list(flowDetailQueryWrap); - if(CollectionUtils.isNotEmpty(flowDetailEOList)){ - List lawsTechnologyEvaluationIdList = flowDetailEOList.stream().map(LawsTechnologyEvaluationFlowDetailEO::getLawsTechnologyEvaluationId).distinct().collect(Collectors.toList()); - queryWrapper.and(query -> { - query.eq("create_by",currentUser.getUsername()); + + queryWrapper.and(query -> { + query.eq("create_by",currentUser.getUsername()); + if(CollectionUtils.isNotEmpty(flowDetailEOList)){ + List lawsTechnologyEvaluationIdList = flowDetailEOList.stream().map(LawsTechnologyEvaluationFlowDetailEO::getLawsTechnologyEvaluationId).distinct().collect(Collectors.toList()); query.or(q -> { for (String lawsTechnologyEvaluationId : lawsTechnologyEvaluationIdList) { q.or().like("id",lawsTechnologyEvaluationId); } }); - }); - } + } + }); + } } From 04e6792f0b3c83fde46a40f9236eaaf92bb6b2e5 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 27 Oct 2022 10:07:13 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=9C=88=E6=8A=A5?= =?UTF-8?q?=E5=A1=AB=E5=86=99=201.=20=E4=B8=BB=E9=A1=B5=E9=9D=A2=E5=8E=BB?= =?UTF-8?q?=E6=8E=89=E4=B8=BB=E8=A6=81=E5=86=85=E5=AE=B9=E8=A1=8C=202.=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?=EF=BC=8C=E5=9C=A8=E4=BA=A7=E8=BD=A6=E5=AE=9E=E6=96=BD=E6=97=A5?= =?UTF-8?q?=E6=9C=9F=EF=BC=8C=E6=94=B9=E4=B8=BA=E3=80=80=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E6=97=A5=E6=9C=9F=EF=BC=8C=E5=AE=9E=E6=96=BD=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=203.=20=E6=95=B0=E6=8D=AE=E5=AD=97=E5=85=B8=E5=AF=B9=E9=BD=90(?= =?UTF-8?q?=E4=B8=AD=E6=96=87)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../report/enums/DictCodeReportEnum.java | 1 + .../LawsMonthlyReportWriteEOServiceImpl.java | 6 ++--- .../jero/modules/report/util/WordUtil.java | 26 +++++++++---------- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/enums/DictCodeReportEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/enums/DictCodeReportEnum.java index 5e6d09401..edb196464 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/enums/DictCodeReportEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/enums/DictCodeReportEnum.java @@ -10,6 +10,7 @@ public enum DictCodeReportEnum { APPLYCAR("适用车型","car_type"), APPLYSCOPE("适用范围","fa3_gui1_yue4_bao4_-_shi4_yong4_fan4_wei2"), STATE("状态","state"), + STATE_REPORT("状态","fa3_gui1_yue4_bao4_tian2_xie3_-_-_zhuang4_tai4"), USEMETHOD("用法","yong4_fa3"); 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 d2abd92d2..8da692939 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 @@ -891,9 +891,9 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl Date: Thu, 27 Oct 2022 10:14:41 +0800 Subject: [PATCH 05/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=9C=88=E6=8A=A5=E7=9A=84=E5=AD=97=E6=AE=B5=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/modules/defaultTemplate.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 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 1bca8ea51..e9fb33a95 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue @@ -164,7 +164,7 @@
{{$t('ImplementationDate')}} + :title="$t('releaseDate')">{{$t('releaseDate')}}
@@ -179,7 +179,7 @@
{{$t('vehicleInProductionDate')}} + :title="$t('implemenDate')">{{$t('implemenDate')}}
@@ -340,14 +340,14 @@ productionCarImplementTime: [ { max: 500, - message: this.$t('vehicleInProductionDate') + this.$t('cannotExceed') + 500 + this.$t('Characters'), + message: this.$t('implemenDate') + this.$t('cannotExceed') + 500 + this.$t('Characters'), trigger: 'blur' } ], newCarImplementTime: [ { max: 500, - message: this.$t('ImplementationDate') + this.$t('cannotExceed') + 500 + this.$t('Characters'), + message: this.$t('releaseDate') + this.$t('cannotExceed') + 500 + this.$t('Characters'), trigger: 'blur' } ], From ddc97405ccc05f56e8b665fcc89f28ad138fae9a Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 27 Oct 2022 10:57:00 +0800 Subject: [PATCH 06/12] =?UTF-8?q?=E9=A1=B5=E7=9C=89=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=9C=9F=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/LawsMonthlyReportWriteEOServiceImpl.java | 2 +- .../java/com/jero/modules/report/util/WordUtil.java | 11 +++++++++-- 2 files changed, 10 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 8da692939..a2ac6c7c5 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 @@ -1257,7 +1257,7 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl Date: Thu, 27 Oct 2022 11:09:33 +0800 Subject: [PATCH 07/12] =?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 --- .../regulationReport/components/RegulationMonthlyFill.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue index 2be197f75..7ea6a4afa 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue @@ -92,14 +92,14 @@ @click="viewClick(record)"> {{$t('view')}} + {{$t('edit')}} + {{$t('deleteLib')}} From 6580ac32acc400a5589c4313496853388547eee9 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 27 Oct 2022 11:10:03 +0800 Subject: [PATCH 08/12] =?UTF-8?q?=E6=9C=88=E6=8A=A5=E5=A1=AB=E5=86=99?= =?UTF-8?q?=E4=B8=8D=E8=AE=BE=E7=BD=AE=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LawsMonthlyReportWriteEOServiceImpl.java | 139 ++---------------- 1 file changed, 14 insertions(+), 125 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 a2ac6c7c5..2e6fb60b0 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 @@ -296,14 +296,14 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl queryWrapper = QueryGenerator.initQueryWrapper(lawsMonthlyReportWriteEOTemp, req.getParameterMap()); queryWrapper.orderByDesc("memories_chapter_one","memories_chapter","create_time"); + //新需求月报填写不设置去权限, 所有的人都可以查看-------------------------------------------------------------------------------------- //管理员查看全部数据,其余人只能查看自己的数据 - LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - List rolesList = sysBaseApi.getRolesByUsername(currentUser.getUsername()); - if(!rolesList.contains(ProjectRoleEnum.ADMIN.getCode())){ - queryWrapper.in("create_by",currentUser.getUsername()); - } -// Page page = new Page(pageNo, pageSize); -// Page pageInfo = this.page(page, queryWrapper); +// LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); +// List rolesList = sysBaseApi.getRolesByUsername(currentUser.getUsername()); +// if(!rolesList.contains(ProjectRoleEnum.ADMIN.getCode())){ +// queryWrapper.in("create_by",currentUser.getUsername()); +// } + //------------------------------------------------------------------------------------- //所有的月报 @@ -439,119 +439,6 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl getPageInfo(LawsMonthlyReportWriteEO lawsMonthlyReportWriteEOTemp, -// Integer pageNo, -// Integer pageSize, -// HttpServletRequest req) { -// QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(lawsMonthlyReportWriteEOTemp, req.getParameterMap()); -// queryWrapper.orderByDesc("memories_chapter_one","memories_chapter","create_time"); -// //管理员查看全部数据,其余人只能查看自己的数据 -// LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); -// List rolesList = sysBaseApi.getRolesByUsername(currentUser.getUsername()); -// if(!rolesList.contains(ProjectRoleEnum.ADMIN.getCode())){ -// queryWrapper.in("create_by",currentUser.getUsername()); -// } -// Page page = new Page(pageNo, pageSize); -// Page pageInfo = this.page(page, queryWrapper); -// //法规月报id -// List lawsMonthlyReportIdList = pageInfo.getRecords().stream().map(LawsMonthlyReportWriteEO::getId).collect(Collectors.toList()); -// List userIdList = pageInfo.getRecords().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); -// } -// -// //获取章节目录 -// List lawsMonthlyReportTitleTemplateEOList = lawsMonthlyReportTitleTemplateEOService.list(); -// -// //新征求意见清单模板 -// List newOpinionTemplateEOList = new ArrayList<>(); -// if(lawsMonthlyReportIdList.size() != 0){ -// LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); -// wrapper.in(NewOpinionTemplateEO::getLawsMonthlyReportWriteId,lawsMonthlyReportIdList); -// newOpinionTemplateEOList = iNewOpinionTemplateEOService.list(wrapper); -// } -// -// -// //新发布标准清单模板 -// List newStandardTemplateEOList = new ArrayList<>(); -// if(lawsMonthlyReportIdList.size() != 0){ -// LambdaQueryWrapper qrapperTemp = new LambdaQueryWrapper<>(); -// qrapperTemp.in(NewStandardTemplateEO::getLawsMonthlyReportWriteId,lawsMonthlyReportIdList); -// newStandardTemplateEOList = iNewStandardTemplateEOService.list(qrapperTemp); -// } -// -// -// for (LawsMonthlyReportWriteEO lawsMonthlyReportWriteEO : pageInfo.getRecords()) { -// //处理法规联系人 -// lawsContact(userList, lawsMonthlyReportWriteEO,lawsMonthlyReportWriteEOTemp.getCut()); -// //处理章节目录 -// if(StringUtils.isNotBlank(lawsMonthlyReportWriteEO.getMemoriesChapter())){ -// List lawsMonthlyReportTitleTemplateEOS = lawsMonthlyReportTitleTemplateEOList.stream() -// .filter(e -> lawsMonthlyReportWriteEO.getMemoriesChapter().equals(e.getId())).collect(Collectors.toList()); -// if(CutEnum.CN.getValue().equals(lawsMonthlyReportWriteEOTemp.getCut()) && lawsMonthlyReportTitleTemplateEOS.size() != 0){ -// lawsMonthlyReportWriteEO.setMemoriesChapterName(lawsMonthlyReportTitleTemplateEOS.get(0).getTitleCn()); -// }else if(CutEnum.EN.getValue().equals(lawsMonthlyReportWriteEOTemp.getCut()) && lawsMonthlyReportTitleTemplateEOS.size() != 0){ -// lawsMonthlyReportWriteEO.setMemoriesChapterName(lawsMonthlyReportTitleTemplateEOS.get(0).getTitleEn()); -// } -// } -// //处理章节目录对应的一级目录 -// if(StringUtils.isNotBlank(lawsMonthlyReportWriteEO.getMemoriesChapterOne())){ -// List 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())){ -// //新征求意见清单模板 -// List collect = newOpinionTemplateEOList.stream() -// .filter(e -> lawsMonthlyReportWriteEO.getId().equals(e.getLawsMonthlyReportWriteId())).collect(Collectors.toList()); -// lawsMonthlyReportWriteEO.setNewOpinionTemplateEOList(collect); -// -// }else if(ContentTemplateEnum.NEW_RELEASE_STANDARD_MANIFEST_TEMPLATE.getValue().equals(lawsMonthlyReportWriteEO.getContentTemplate())){ -// //新发布标准清单模板 -// List collect = newStandardTemplateEOList.stream() -// .filter(e -> lawsMonthlyReportWriteEO.getId().equals(e.getLawsMonthlyReportWriteId())).collect(Collectors.toList()); -// lawsMonthlyReportWriteEO.setNewStandardTemplateEOList(collect); -// } -// -// //处理导出状态 -// String exportState = lawsMonthlyReportWriteEO.getExportState(); -// if(StringUtils.isNotBlank(exportState)){ -// if(ExportStateEnum.NOT_EXPORT.getValue().equals(exportState)){ -// if(CutEnum.CN.getValue().equals(lawsMonthlyReportWriteEOTemp.getCut())){ -// lawsMonthlyReportWriteEO.setExportStateName(ExportStateEnum.NOT_EXPORT.getName()); -// }else{ -// lawsMonthlyReportWriteEO.setExportStateName(ExportStateEnum.NOT_EXPORT.getNameEn()); -// } -// }else if(ExportStateEnum.HAS_BEEN_EXPORT.getValue().equals(exportState)){ -// if(CutEnum.CN.getValue().equals(lawsMonthlyReportWriteEOTemp.getCut())){ -// lawsMonthlyReportWriteEO.setExportStateName(ExportStateEnum.HAS_BEEN_EXPORT.getName()); -// }else{ -// lawsMonthlyReportWriteEO.setExportStateName(ExportStateEnum.HAS_BEEN_EXPORT.getNameEn()); -// } -// } -// } -// } -// return pageInfo; -// } private void lawsContact(List userList, LawsMonthlyReportWriteEO lawsMonthlyReportWriteEO,String cut) { String lawsContact = lawsMonthlyReportWriteEO.getLawsContact(); @@ -588,12 +475,14 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl rolesList = sysBaseApi.getRolesByUsername(currentUser.getUsername()); - if(!rolesList.contains(ProjectRoleEnum.ADMIN.getCode())){ - wrapper.in(LawsMonthlyReportWriteEO::getCreateBy,currentUser.getUsername()); - } +// LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); +// List rolesList = sysBaseApi.getRolesByUsername(currentUser.getUsername()); +// if(!rolesList.contains(ProjectRoleEnum.ADMIN.getCode())){ +// wrapper.in(LawsMonthlyReportWriteEO::getCreateBy,currentUser.getUsername()); +// } + //---------------------------------------------------------------------------------------- List lawsMonthlyReportWriteEOS = this.list(wrapper); if(lawsMonthlyReportWriteEOS.size() == 0){ From b511a20216dff73808f5baec0548be4c2daa2101 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 27 Oct 2022 14:19:30 +0800 Subject: [PATCH 09/12] =?UTF-8?q?=E6=9C=88=E6=8A=A5=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E4=B8=8E=E6=A0=87=E9=A2=98=E6=A8=A1=E6=9D=BF=E9=A1=BA=E5=BA=8F?= =?UTF-8?q?=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LawsMonthlyReportWriteEOServiceImpl.java | 28 +++++++++++++------ .../jero/modules/report/util/WordUtil.java | 2 +- 2 files changed, 20 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 2e6fb60b0..cd0701450 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 @@ -611,10 +611,11 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl lawsMonthlyReportWriteEOS, @@ -763,7 +764,15 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl lawsMonthlyReportWriteEOS, List lawsMonthlyReportTitleTemplateEOS, List reportTitleOneList, @@ -799,12 +808,13 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl reportTitleTwoList = lawsMonthlyReportTitleTemplateEOS.stream().filter(e -> e.getParentId().equals(lawsMonthlyReportTitleTemplateEO.getId())).collect(Collectors.toList()); - + //二级目录按sort正序排序 + Collections.sort(reportTitleTwoList);//正序排序 for (LawsMonthlyReportTitleTemplateEO monthlyReportTitleTemplateEO : reportTitleTwoList) { int reportCount = 1; @@ -822,7 +832,7 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl reportTitleTwoList = lawsMonthlyReportTitleTemplateEOS.stream().filter(e -> e.getParentId().equals(lawsMonthlyReportTitleTemplateEO.getId())).collect(Collectors.toList()); - + Collections.sort(reportTitleTwoList);//正序排序 for (LawsMonthlyReportTitleTemplateEO monthlyReportTitleTemplateEO : reportTitleTwoList) { int reportCount = 1; 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 f4678b253..93fddedfd 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 @@ -406,7 +406,7 @@ public class WordUtil { paragraph.setAlignment(ParagraphAlignment.CENTER); XWPFRun run = paragraph.createRun(); run.setText("NIO Internal"); - run.setFontSize(18); + run.setFontSize(12); run.setFontFamily("Blue Sky Standard Regular"); // run.setFontFamily("Blue Sky Noto Regular"); run.setBold(true); From 0b1313372089ce8a19e1122d8e799abc6d59dae2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Thu, 27 Oct 2022 14:23:10 +0800 Subject: [PATCH 10/12] =?UTF-8?q?=E7=A9=BA=E6=8C=87=E9=92=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarFileCompareItemCommentServiceImpl.java | 104 +++++++++--------- 1 file changed, 54 insertions(+), 50 deletions(-) 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 2a5b0ced8..f7268d40f 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 @@ -314,36 +314,38 @@ public class SarFileCompareItemCommentServiceImpl extends ServiceImpl 1) { - for (int j = 0; j < leftSplit.length; j++) { - if (ObjectUtils.isNotEmpty(leftSplit[j])) { - ByteArrayOutputStream byteArrayOut = new ByteArrayOutputStream(); - if (j > 0) { - Row row2 = sheet.getRow(j + i); - if (ObjectUtils.isEmpty(row2)) { - row2 = sheet.createRow(j + i); + if (StringUtils.isNotEmpty(text)){ + log.info("-------------- 开始开始拆分左侧图片、文字、表格 :" + text + "-----------------"); + String rowDataAndPath = getSplitContent(request, text); + log.info("-------------- 左侧图片、文字、表格 拆分成功 :"+ rowDataAndPath +"-----------------"); + leftSplit = rowDataAndPath.split("---"); + if (leftSplit.length > 1) { + for (int j = 0; j < leftSplit.length; j++) { + if (ObjectUtils.isNotEmpty(leftSplit[j])) { + ByteArrayOutputStream byteArrayOut = new ByteArrayOutputStream(); + if (j > 0) { + Row row2 = sheet.getRow(j + i); + if (ObjectUtils.isEmpty(row2)) { + row2 = sheet.createRow(j + i); + } + log.info("-------------- 开始开始处理左侧图片、表格 -----------------"); + handleSpecificData(workbook, dir, patriarch, cellStyleLink, byteArrayOut, row2, i, j, leftSplit[j], 3); + log.info("-------------- 左侧图片、表格 处理成功 -----------------"); + } else { + log.info("-------------- 开始开始处理左侧图片、表格 -----------------"); + handleSpecificData(workbook, dir, patriarch, cellStyleLink, byteArrayOut, row, i, j, leftSplit[j], 3); + log.info("-------------- 左侧图片、表格 处理成功 -----------------"); } - log.info("-------------- 开始开始处理左侧图片、表格 -----------------"); - handleSpecificData(workbook, dir, patriarch, cellStyleLink, byteArrayOut, row2, i, j, leftSplit[j], 3); - log.info("-------------- 左侧图片、表格 处理成功 -----------------"); - } else { - log.info("-------------- 开始开始处理左侧图片、表格 -----------------"); - handleSpecificData(workbook, dir, patriarch, cellStyleLink, byteArrayOut, row, i, j, leftSplit[j], 3); - log.info("-------------- 左侧图片、表格 处理成功 -----------------"); } } + sarFileCompareExcelMergeCell.setLeftStart(i); + sarFileCompareExcelMergeCell.setLeftEnd(i + leftSplit.length - 1); + sarFileCompareExcelMergeCell.setRightStart(0); + sarFileCompareExcelMergeCell.setRightEnd(0); + mergeCells.add(sarFileCompareExcelMergeCell); + } else { + row.createCell(3).setCellValue(rowDataAndPath); } - sarFileCompareExcelMergeCell.setLeftStart(i); - sarFileCompareExcelMergeCell.setLeftEnd(i + leftSplit.length - 1); - sarFileCompareExcelMergeCell.setRightStart(0); - sarFileCompareExcelMergeCell.setRightEnd(0); - mergeCells.add(sarFileCompareExcelMergeCell); - } else { - row.createCell(3).setCellValue(rowDataAndPath); } } } @@ -354,34 +356,36 @@ public class SarFileCompareItemCommentServiceImpl extends ServiceImpl 1) { - for (int j = 0; j < rightSplit.length; j++) { - if (ObjectUtils.isNotEmpty(rightSplit[j])) { - ByteArrayOutputStream byteArrayOut = new ByteArrayOutputStream(); - if (j > 0) { - Row row2 = sheet.getRow(j + i); - if (ObjectUtils.isEmpty(row2)) { - row2 = sheet.createRow(j + i); + if (StringUtils.isNotEmpty(text)) { + log.info("-------------- 开始开始拆分右侧图片、文字、表格 :"+ text +" -----------------"); + String rowDataAndPath = getSplitContent(request, text); + log.info("-------------- 右侧图片、文字、表格 拆分成功 :"+ rowDataAndPath +" -----------------"); + rightSplit = rowDataAndPath.split("---"); + if (rightSplit.length > 1) { + for (int j = 0; j < rightSplit.length; j++) { + if (ObjectUtils.isNotEmpty(rightSplit[j])) { + ByteArrayOutputStream byteArrayOut = new ByteArrayOutputStream(); + if (j > 0) { + Row row2 = sheet.getRow(j + i); + if (ObjectUtils.isEmpty(row2)) { + row2 = sheet.createRow(j + i); + } + log.info("-------------- 开始处理右侧图片、表格 -----------------"); + handleSpecificData(workbook, dir, patriarch, cellStyleLink, byteArrayOut, row2, i, j, rightSplit[j], 7); + log.info("-------------- 右侧图片、表格 处理成功 -----------------"); + } else { + log.info("-------------- 开始处理右侧图片、表格 -----------------"); + handleSpecificData(workbook, dir, patriarch, cellStyleLink, byteArrayOut, row, i, j, rightSplit[j], 7); + log.info("-------------- 右侧图片、表格 处理成功 -----------------"); } - log.info("-------------- 开始处理右侧图片、表格 -----------------"); - handleSpecificData(workbook, dir, patriarch, cellStyleLink, byteArrayOut, row2, i, j, rightSplit[j], 7); - log.info("-------------- 右侧图片、表格 处理成功 -----------------"); - } else { - log.info("-------------- 开始处理右侧图片、表格 -----------------"); - handleSpecificData(workbook, dir, patriarch, cellStyleLink, byteArrayOut, row, i, j, rightSplit[j], 7); - log.info("-------------- 右侧图片、表格 处理成功 -----------------"); } } + sarFileCompareExcelMergeCell.setRightStart(i); + sarFileCompareExcelMergeCell.setRightEnd(i + rightSplit.length - 1); + mergeCells.add(sarFileCompareExcelMergeCell); + } else { + row.createCell(7).setCellValue(rowDataAndPath); } - sarFileCompareExcelMergeCell.setRightStart(i); - sarFileCompareExcelMergeCell.setRightEnd(i + rightSplit.length - 1); - mergeCells.add(sarFileCompareExcelMergeCell); - } else { - row.createCell(7).setCellValue(rowDataAndPath); } } } From 73f67a1d3b4fdbfc138070dd26689ce5f717c908 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 27 Oct 2022 14:51:43 +0800 Subject: [PATCH 11/12] =?UTF-8?q?=E6=9C=88=E6=8A=A5=E5=AF=BC=E5=87=BA--?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AD=97=E5=85=B8=E6=8D=A2=E8=A1=8C?= 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 93fddedfd..f74979de8 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 @@ -1292,7 +1292,7 @@ public class WordUtil { blank = ""; break; case "Enterprise": - blank = " "; + blank = " "; break; case "Vehicle": blank = " "; @@ -1301,7 +1301,7 @@ public class WordUtil { blank = "\r\n"; break; case "New Car Model": - blank = " "; + blank = " "; break; case "Models In Production": blank = ""; @@ -1316,10 +1316,10 @@ public class WordUtil { blank = ""; break; case "Draft": - blank = " "; + blank = " "; break; case "Public Notice": - blank = " "; + blank = " "; break; case "Release": blank = ""; @@ -1334,10 +1334,10 @@ public class WordUtil { blank = ""; break; case "Mandatory": - blank = " "; + blank = " "; break; case "Voluntary": - blank = " "; + blank = "\r\n"; break; case "Mandatory if fitted": blank = ""; From 5701e0e59f8682301d378d90a96edc169e8985aa Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 27 Oct 2022 15:06:16 +0800 Subject: [PATCH 12/12] =?UTF-8?q?=E4=B8=BB=E8=A6=81=E5=86=85=E5=AE=B9--?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E9=A1=B5=E8=BE=B9=E8=B7=9D,=20=E5=86=85?= =?UTF-8?q?=E5=AE=B9=E9=A2=84=E7=95=99=E7=A9=BA=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/LawsMonthlyReportWriteEOServiceImpl.java | 4 ++-- .../src/main/java/com/jero/modules/report/util/WordUtil.java | 4 ++-- 2 files changed, 4 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 cd0701450..877e7d373 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 @@ -832,7 +832,7 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl