From 45fe8f49ac28b4dc5f34a2c14d540e66b6faca62 Mon Sep 17 00:00:00 2001 From: caoyang Date: Fri, 15 Apr 2022 20:40:53 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=8B=86=E5=88=86=E6=9D=83=E9=99=90?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/SplitTable/index.vue | 2 +- .../src/views/documentManage/splitting/index.vue | 4 ++-- .../splitting/modules/ImportResult.vue | 6 +++--- .../splitting/modules/SplitText.vue | 15 +++++++++++---- 4 files changed, 17 insertions(+), 10 deletions(-) diff --git a/jero-web/src/components/SplitTable/index.vue b/jero-web/src/components/SplitTable/index.vue index 652fad818..7a564e16b 100644 --- a/jero-web/src/components/SplitTable/index.vue +++ b/jero-web/src/components/SplitTable/index.vue @@ -21,7 +21,7 @@ {{ol.text}} - + {{ol.text}} diff --git a/jero-web/src/views/documentManage/splitting/index.vue b/jero-web/src/views/documentManage/splitting/index.vue index ca6457b1d..e3c7ef46f 100644 --- a/jero-web/src/views/documentManage/splitting/index.vue +++ b/jero-web/src/views/documentManage/splitting/index.vue @@ -5,11 +5,11 @@
-
+
{{ $t('SplitText') }}
-
+
{{ $t('ImportResults') }}
diff --git a/jero-web/src/views/documentManage/splitting/modules/ImportResult.vue b/jero-web/src/views/documentManage/splitting/modules/ImportResult.vue index 06305470c..3797d0309 100644 --- a/jero-web/src/views/documentManage/splitting/modules/ImportResult.vue +++ b/jero-web/src/views/documentManage/splitting/modules/ImportResult.vue @@ -129,9 +129,9 @@ spinning:false, //loading标识 type:'', url:{ - tableHeader: 'document/bussDocumentLibraryEO/getHeaderOrConditionForSplit', //表格头部字段 - seachList: 'document/bussDocumentLibraryEO/getHeaderOrConditionForOcr', //搜索字段 - tableList: 'document/bussDocumentLibraryEO/ocrPageInfo', //表格数据 + tableHeader: 'document/bussDocumentLibraryEO/getHeaderOrConditionForSplitResult', //表格头部字段 + seachList: 'document/bussDocumentLibraryEO/getHeaderOrConditionForSplitResult', //搜索字段 + tableList: 'split/sarFileSplitInfo/splitResultPageInfo', //表格数据 }, OperationList:[], upload1:this.$t('upload1'), diff --git a/jero-web/src/views/documentManage/splitting/modules/SplitText.vue b/jero-web/src/views/documentManage/splitting/modules/SplitText.vue index 85bccf04f..25ca164ac 100644 --- a/jero-web/src/views/documentManage/splitting/modules/SplitText.vue +++ b/jero-web/src/views/documentManage/splitting/modules/SplitText.vue @@ -75,6 +75,10 @@ import search from '@/components/search/index' import TableData from '@/components/SplitTable/DocTable' import eventBUs from '../../../../common/event' + import Vue from 'vue' + import { ACCESS_TOKEN } from '@/store/mutation-types' + import axios from 'axios' + export default { name: 'split', @@ -125,12 +129,14 @@ ], spinning:false, //loading标识 url:{ - tableHeader: 'document/bussDocumentLibraryEO/getHeaderOrConditionForSplit', //表格头部字段 - seachList: 'document/bussDocumentLibraryEO/getHeaderOrConditionForOcr', //搜索字段 - tableList: 'document/bussDocumentLibraryEO/ocrPageInfo', //表格数据 + tableHeader: 'document/bussDocumentLibraryEO/getHeaderOrConditionForSplitResult', //表格头部字段 + seachList: 'document/bussDocumentLibraryEO/getHeaderOrConditionForSplitResult', //搜索字段 + tableList: 'split/sarFileSplitInfo/splitFilePageInfo', //表格数据 }, type:'doc', - OperationList:[] + OperationList:[], + token:Vue.ls.get(ACCESS_TOKEN), + cut:'', } }, props:{ @@ -142,6 +148,7 @@ }, mounted() { this.visible=this.splitVisible + // console.log('visibleSplit',this.visible) }, methods:{ From c2a5e4cf6905ca143e10f1941723ae615a38f8d1 Mon Sep 17 00:00:00 2001 From: zer0Black <694429613@qq.com> Date: Fri, 15 Apr 2022 22:44:11 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E3=80=90review=E3=80=91=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E4=BB=A3=E7=A0=81=E5=AE=A1=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/tag/controller/OnlCgformAreaController.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformAreaController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformAreaController.java index dc6fe5246..9f796268e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformAreaController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformAreaController.java @@ -94,6 +94,7 @@ public class OnlCgformAreaController extends JeroController add(@Validated @RequestBody OnlCgformArea onlCgformArea) { int count=onlCgformAreaService.queryExitAreaName(onlCgformArea); if (count > 0) { + // TODO Cut属性一定能拿到？拿不到的时候显示中文还是英文？现在对吗？测试了吗？ //中英切换提示语 if(CutEnum.CN.getValue().equals(onlCgformArea.getCut())) { return Result.error("同一所属模块下,展示区域名称不能重复！"); @@ -118,9 +119,11 @@ public class OnlCgformAreaController extends JeroController edit(@Validated @RequestBody OnlCgformArea onlCgformArea) { + // TODO 编辑的时候不考虑ID？现在还能编辑成功？ int count=onlCgformAreaService.queryExitAreaName(onlCgformArea); if (count > 0) { //中英切换提示语 + // TODO Cut属性一定能拿到？拿不到的时候显示中文还是英文？现在对吗？测试了吗？ if(CutEnum.CN.getValue().equals(onlCgformArea.getCut())) { return Result.error("同一所属模块下,展示区域名称不能重复！"); }else{ @@ -148,6 +151,7 @@ public class OnlCgformAreaController extends JeroController 0) { //中英切换提示语 + // TODO 只改一半？编辑和新增改了，删除不改？ if(CutEnum.CN.getValue().equals("cut")) { return Result.error("该展示区域有关联数据，无法删除！"); }else{ From 74a2d8eb18e66579d410d8ec7914d6e7b1769c71 Mon Sep 17 00:00:00 2001 From: zer0Black <694429613@qq.com> Date: Fri, 15 Apr 2022 22:52:22 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E3=80=90review=E3=80=91=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E5=AE=A1=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/tag/controller/OnlCgformAreaController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformAreaController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformAreaController.java index 9f796268e..204fd1aa5 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformAreaController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformAreaController.java @@ -119,7 +119,7 @@ public class OnlCgformAreaController extends JeroController edit(@Validated @RequestBody OnlCgformArea onlCgformArea) { - // TODO 编辑的时候不考虑ID？现在还能编辑成功？ + // TODO 编辑的时候不考虑ID？不试试现在还能编辑成功？ int count=onlCgformAreaService.queryExitAreaName(onlCgformArea); if (count > 0) { //中英切换提示语 From f98f129c75a05ca3cb636174ab3088e716f2f8de Mon Sep 17 00:00:00 2001 From: xiejunyu Date: Fri, 15 Apr 2022 23:04:28 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=B1=95=E7=A4=BA=E5=8C=BA=E5=9F=9F?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E8=AF=AD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/tag/controller/OnlCgformAreaController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformAreaController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformAreaController.java index 204fd1aa5..da8576b05 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformAreaController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformAreaController.java @@ -152,7 +152,7 @@ public class OnlCgformAreaController extends JeroController 0) { //中英切换提示语 // TODO 只改一半？编辑和新增改了，删除不改？ - if(CutEnum.CN.getValue().equals("cut")) { + if(CutEnum.CN.getValue().equals(cut)) { return Result.error("该展示区域有关联数据，无法删除！"); }else{ return Result.error("This exhibition area has associated data and cannot be deleted!"); From e809556e31619abaeb1ce0112b7b80a5b8ef8bc8 Mon Sep 17 00:00:00 2001 From: xiejunyu Date: Fri, 15 Apr 2022 23:24:30 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=B1=95=E7=A4=BA=E5=8C=BA=E5=9F=9F?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E9=87=8D=E5=A4=8D=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/OnlCgformAreaController.java | 28 +++++++++++++------ 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformAreaController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformAreaController.java index da8576b05..d694171a2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformAreaController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformAreaController.java @@ -1,5 +1,6 @@ package com.jero.modules.tag.controller; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; @@ -120,15 +121,24 @@ public class OnlCgformAreaController extends JeroController edit(@Validated @RequestBody OnlCgformArea onlCgformArea) { // TODO 编辑的时候不考虑ID？不试试现在还能编辑成功？ - int count=onlCgformAreaService.queryExitAreaName(onlCgformArea); - if (count > 0) { - //中英切换提示语 - // TODO Cut属性一定能拿到？拿不到的时候显示中文还是英文？现在对吗？测试了吗？ - if(CutEnum.CN.getValue().equals(onlCgformArea.getCut())) { - return Result.error("同一所属模块下,展示区域名称不能重复！"); - }else{ - return Result.error("Under the same module, the display area name cannot be duplicate!"); - } + + QueryWrapper queryWrapper=new QueryWrapper<>(); + queryWrapper.eq("show_area", onlCgformArea.getShowArea()).eq("is_model", onlCgformArea.getIsModel()); + List existAreaList=onlCgformAreaService.list(queryWrapper); + if(!existAreaList.isEmpty()){//有同名数据 + if(existAreaList.get(0).getId().equals(onlCgformArea.getId())) {//已存在同名的数据,就是正在编辑的这个 + onlCgformAreaService.editById(onlCgformArea); + return Result.OK("编辑成功！"); + }else { + //中英切换提示语 + // TODO Cut属性一定能拿到？拿不到的时候显示中文还是英文？现在对吗？测试了吗？ + if (CutEnum.CN.getValue().equals(onlCgformArea.getCut())) { + + return Result.error("同一所属模块下,展示区域名称不能重复！"); + } else { + return Result.error("Under the same module, the display area name cannot be duplicate!"); + } + } }else { onlCgformAreaService.editById(onlCgformArea); return Result.OK("编辑成功！"); From 6665240380a16fbd433c660f2ee7b55ca7d5651a Mon Sep 17 00:00:00 2001 From: xiejunyu Date: Sat, 16 Apr 2022 00:56:38 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93=E5=88=97?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectLibraryBaseController.java | 25 +++-------- .../project/entity/ProjectLibraryBase.java | 16 -------- .../impl/ProjectLibraryBaseServiceImpl.java | 41 ++++++++++++++++++- 3 files changed, 45 insertions(+), 37 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java index be7b73a69..decdee3e6 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLibraryBaseController.java @@ -46,23 +46,9 @@ public class ProjectLibraryBaseController extends JeroController queryPageList(@RequestBody Map params) { IPage pageList= projectLibraryBaseService.queryPageList(params); - List records =convertData(pageList.getRecords(),params.get("cut").toString()); - return Result.OK(records); - } - public List convertData(List records, String cut){ - //分页列表数据中英切换 - if(CutEnum.EN.getValue().equals(cut)) { - for (ProjectLibraryBase data : records) { - data.setTargetMarketName(data.getTargetMarketEnName()); - data.setProjectStatusName(data.getProjectStatusEnName()); - data.setStudioEngineerName(data.getStudioEngineerEnName()); - data.setCertificationEngineerName(data.getCertificationEngineerEnName()); - data.setDigitalPlatformName(data.getDigitalPlatformEnName()); - data.setVehiclePlatformName(data.getVehiclePlatformEnName()); - } - } - return records; + return Result.OK(params.get("cut").toString(),pageList); } + /** * 列表查询 * @@ -143,12 +129,11 @@ public class ProjectLibraryBaseController extends JeroController queryById(@RequestParam(name="id",required=true) String id, @RequestParam(name="cut",required=true) String cut) { -// List data = projectLibraryBaseService.queryById(id); - List records =convertData(projectLibraryBaseService.queryById(id),cut); - if(records==null) { + List data = projectLibraryBaseService.queryById(id); + if(data==null) { return Result.error("未找到对应数据"); } - return Result.OK(records); + return Result.OK(cut,data); } /** 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 8313d13fa..4f80924c6 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 @@ -37,18 +37,10 @@ public class ProjectLibraryBase implements Serializable { /**目标市场*/ @Dict(dicCode = "region") private java.lang.String targetMarket; - @TableField(exist = false) - private java.lang.String targetMarketName; - @TableField(exist = false) - private java.lang.String targetMarketEnName; /**项目状态*/ @Dict(dicCode = "project_status") private java.lang.String projectStatus; - @TableField(exist = false) - private java.lang.String projectStatusName; - @TableField(exist = false) - private java.lang.String projectStatusEnName; /**studio工程师*/ private java.lang.String studioEngineer; @@ -67,18 +59,10 @@ public class ProjectLibraryBase implements Serializable { /**车型平台*/ @Dict(dicCode = "vehicle_platform") private java.lang.String vehiclePlatform; - @TableField(exist = false) - private java.lang.String vehiclePlatformName; - @TableField(exist = false) - private java.lang.String vehiclePlatformEnName; /**数字平台*/ @Dict(dicCode = "digital_platform") private java.lang.String digitalPlatform; - @TableField(exist = false) - private java.lang.String digitalPlatformName; - @TableField(exist = false) - private java.lang.String digitalPlatformEnName; /**IPD信息*/ private java.lang.String ipdInfo; 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 f3aef4cfe..a1f5e9be2 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,5 +1,6 @@ package com.jero.modules.project.service.impl; +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; @@ -7,13 +8,20 @@ import com.jero.common.system.vo.LoginUser; import com.jero.modules.project.entity.ProjectLibraryBase; import com.jero.modules.project.mapper.ProjectLibraryBaseMapper; import com.jero.modules.project.service.IProjectLibraryBaseService; +import com.jero.modules.system.entity.SysUser; +import com.jero.modules.system.mapper.SysDictItemMapper; +import com.jero.modules.system.mapper.SysUserMapper; +import com.jero.modules.system.util.StringUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** * @Description: 项目库基础表 @@ -26,6 +34,12 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl result = projectLibraryBaseMapper.queryPageList(page, params); List records = result.getRecords(); - + disposeData(records); return result; } + public void disposeData(List records){ + for (ProjectLibraryBase projectLibraryBase:records) { + List sysUsers = new ArrayList<>(); + //认证工程师多个id查询 + String certificationEngineerId = projectLibraryBase.getCertificationEngineer(); + if (StringUtils.isNotEmpty(certificationEngineerId)) { + QueryWrapper userqueryWrapper = new QueryWrapper<>(); + userqueryWrapper.in("id ", certificationEngineerId); + sysUsers = sysUserMapper.selectList(userqueryWrapper); + } + if(CollectionUtils.isNotEmpty(sysUsers)) { + if(StringUtils.isNotEmpty(certificationEngineerId)){ + String certificationEngineerName=sysUsers.stream().filter(e -> certificationEngineerId.equals(e.getId())). + map(SysUser::getRealname).collect(Collectors.joining(",")); + projectLibraryBase.setCertificationEngineerName(certificationEngineerName); + } + } + + } + + + + + } + }