From 0a2f2734721d2bbfca05d6d7194ff967a27d51b8 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Mon, 8 Aug 2022 14:26:52 +0800 Subject: [PATCH 01/17] =?UTF-8?q?=E9=97=AE=E9=A2=98=E7=9F=A5=E8=AF=86?= =?UTF-8?q?=E5=BA=93-=E5=88=97=E8=A1=A8=E6=95=B0=E6=8D=AE=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=9D=83=E9=99=90=E3=80=82=20=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E7=9F=A5=E8=AF=86=E5=BA=93=E5=B1=95=E7=A4=BA=E6=9D=83=E9=99=90?= =?UTF-8?q?-=E5=A4=84=E7=90=86=E6=95=B0=E6=8D=AE=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProblemKnowledgeBaseEOController.java | 1 + .../entity/ProblemKnowledgeBaseUserEO.java | 4 ++ .../IProblemKnowledgeBaseEOService.java | 7 ++++ .../IProblemKnowledgeBaseUserEOService.java | 7 ++++ .../ProblemKnowledgeBaseEOServiceImpl.java | 42 +++++++++++++++++++ ...ProblemKnowledgeBaseUserEOServiceImpl.java | 36 ++++++++++++++++ 6 files changed, 97 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseEOController.java index 6441dc9e3..59bd50731 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseEOController.java @@ -53,6 +53,7 @@ public class ProblemKnowledgeBaseEOController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(problemKnowledgeBaseEO, req.getParameterMap()); + this.problemKnowledgeBaseEOService.createQueryPermission(queryWrapper); queryWrapper.orderByDesc("create_time"); Page page = new Page(pageNo, pageSize); IPage pageList = problemKnowledgeBaseEOService.page(page, queryWrapper); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseUserEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseUserEO.java index 4865c5bdd..0faa4094e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseUserEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseUserEO.java @@ -4,6 +4,7 @@ import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.math.BigDecimal; 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 lombok.Data; @@ -70,5 +71,8 @@ public class ProblemKnowledgeBaseUserEO implements Serializable { @Excel(name = "用户id", width = 15) @ApiModelProperty(value = "用户id") private java.lang.String userId; + /**用户姓名*/ + @TableField(exist = false) + private String userName; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseEOService.java index 93645bb8f..b62c1331a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseEOService.java @@ -1,5 +1,6 @@ package com.jero.modules.problemKnowledgeBase.service; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseEO; import com.baomidou.mybatisplus.extension.service.IService; @@ -68,4 +69,10 @@ public interface IProblemKnowledgeBaseEOService extends IService datas,String cut); + + /** + * 创建查询权限 + * @param queryWrapper + */ + void createQueryPermission(QueryWrapper queryWrapper); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseUserEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseUserEOService.java index 6a1521524..a3086262e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseUserEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseUserEOService.java @@ -58,4 +58,11 @@ public interface IProblemKnowledgeBaseUserEOService extends IService queryList(); + + /** + * 处理数据 + * @param datas + * @param cut + */ + void disposeData(List datas,String cut); } 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 d6c5e73ad..57a0f9ada 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 @@ -129,6 +129,7 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl queryList(ProblemKnowledgeBaseEO problemKnowledgeBaseEO, HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(problemKnowledgeBaseEO, req.getParameterMap()); + this.createQueryPermission(queryWrapper); queryWrapper.orderByDesc("create_time"); List result = this.list(queryWrapper); this.disposeData(result,problemKnowledgeBaseEO.getCut()); @@ -182,6 +183,12 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl collectEOList = this.problemKnowledgeBaseCollectEOService.list(collectQueryWrapper); + //查询出数据的所有的权限用户 + QueryWrapper permissionUserQueryWrapper = new QueryWrapper<>(); + permissionUserQueryWrapper.lambda().in(ProblemKnowledgeBaseUserEO::getProblemKnowledgeBaseId,probleKnowledgeBaseIdList); + List permissionUserEOList = this.problemKnowledgeBaseUserEOService.list(permissionUserQueryWrapper); + this.problemKnowledgeBaseUserEOService.disposeData(permissionUserEOList,cut); + datas.forEach(data -> { if(StringUtils.isNotEmpty(data.getShowPermissions())){ data.setShowPermissions_dicText(ShowPermissionsEnum.getTextByValue(data.getShowPermissions(),cut)); @@ -239,7 +246,42 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl permissionUserEOS = permissionUserEOList.stream().filter(permissionUserEO -> { + boolean flag = false; + if (StringUtils.equals(data.getId(), permissionUserEO.getProblemKnowledgeBaseId())) { + flag = true; + } + return flag; + }).collect(Collectors.toList()); + + if(CollectionUtils.isNotEmpty(permissionUserEOS)){ + data.setPermissionUserList(permissionUserEOS); + } }); } } + + @Override + public void createQueryPermission(QueryWrapper queryWrapper) { + /** + * 查询权限 + * 公开：所有人都可以看到。 + * 私密：只有配置了的权限用户可以看到。 + */ + LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + QueryWrapper userPermissionQueryWrapper = new QueryWrapper<>(); + userPermissionQueryWrapper.lambda().eq(ProblemKnowledgeBaseUserEO::getUserId,currentUser.getId()); + List problemKnowledgeBaseUserEOList = problemKnowledgeBaseUserEOService.list(userPermissionQueryWrapper); + + List problemKnowledgeBaseIdList = problemKnowledgeBaseUserEOList.stream().map(ProblemKnowledgeBaseUserEO::getProblemKnowledgeBaseId).distinct().collect(Collectors.toList()); + + queryWrapper.lambda().and(query -> { + query.eq(ProblemKnowledgeBaseEO::getShowPermissions,ShowPermissionsEnum.OPEN.getValue()). + or(o -> { + o.eq(ProblemKnowledgeBaseEO::getShowPermissions,ShowPermissionsEnum.PRIVACY.getValue()); + o.in(ProblemKnowledgeBaseEO::getId,problemKnowledgeBaseIdList); + }); + }); + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseUserEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseUserEOServiceImpl.java index f5f56bd8e..4f3679dcf 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseUserEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseUserEOServiceImpl.java @@ -3,9 +3,16 @@ package com.jero.modules.problemKnowledgeBase.service.impl; import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseUserEO; import com.jero.modules.problemKnowledgeBase.mapper.ProblemKnowledgeBaseUserEOMapper; import com.jero.modules.problemKnowledgeBase.service.IProblemKnowledgeBaseUserEOService; +import com.jero.modules.system.entity.SysUser; +import com.jero.modules.system.service.ISysUserService; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; import java.util.Date; +import java.util.stream.Collectors; + import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; @@ -20,6 +27,9 @@ import org.springframework.transaction.annotation.Transactional; @Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) public class ProblemKnowledgeBaseUserEOServiceImpl extends ServiceImpl implements IProblemKnowledgeBaseUserEOService { + @Autowired + private ISysUserService sysUserService; + /** * 保存 * @@ -89,4 +99,30 @@ public class ProblemKnowledgeBaseUserEOServiceImpl extends ServiceImpl queryList() { return list(); } + + @Override + public void disposeData(List datas, String cut) { + if(CollectionUtils.isNotEmpty(datas)){ + List userIdList = datas.stream().map(ProblemKnowledgeBaseUserEO::getUserId).distinct().collect(Collectors.toList()); + + List userList = sysUserService.querySysUserListByIdList(userIdList); + + datas.forEach(data -> { + if(CollectionUtils.isNotEmpty(userList)){ + String userName = ""; + for (SysUser user : userList) { + if (StringUtils.equals(data.getUserId(), user.getId())) { + userName = user.getUsername(); + break; + } + } + + if(StringUtils.isNotEmpty(userName)){ + data.setUserName(userName); + } + } + }); + + } + } } From e583b57369b96014e87f4ccddbfe096c6c04daef Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Mon, 8 Aug 2022 14:30:49 +0800 Subject: [PATCH 02/17] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E5=AF=B9=E6=AF=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/documentTools/documentComparison/index.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jero-web/src/views/documentTools/documentComparison/index.vue b/jero-web/src/views/documentTools/documentComparison/index.vue index f7abb8e7b..4a09cfb6d 100644 --- a/jero-web/src/views/documentTools/documentComparison/index.vue +++ b/jero-web/src/views/documentTools/documentComparison/index.vue @@ -176,7 +176,7 @@ align: 'center', width: 170, ellipsis: true, - dataIndex: 'releaseState' + dataIndex: 'releaseStateTitle' }, { title: this.$t('remarks'), @@ -301,9 +301,9 @@ onOk() { let releaseState = '' if (record.releaseState == 'draft') { - releaseState = 'published' - } else { releaseState = 'draft' + } else { + releaseState = 'published' } let query = { releaseState: releaseState, From 844ef210ad3e1da167e27e62b49c6ea2da2a223d Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Mon, 8 Aug 2022 14:37:05 +0800 Subject: [PATCH 03/17] =?UTF-8?q?=E9=A2=84=E6=8A=A5=E5=A1=AB=E5=86=99--?= =?UTF-8?q?=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LawsMonthlyReportWriteEOServiceImpl.java | 18 ++++++++++++++---- 1 file changed, 14 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 4401d668d..9b92dc342 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 @@ -132,14 +132,24 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); + wrapper.in(NewOpinionTemplateEO::getLawsMonthlyReportWriteId,lawsMonthlyReportWriteEO.getId()); + iNewOpinionTemplateEOService.remove(wrapper); + //新增 List newOpinionTemplateEOList = lawsMonthlyReportWriteEO.getNewOpinionTemplateEOList(); - iNewOpinionTemplateEOService.updateBatchById(newOpinionTemplateEOList); + iNewOpinionTemplateEOService.saveBatch(newOpinionTemplateEOList); }else if (ContentTemplateEnum.NEW_RELEASE_STANDARD_MANIFEST_TEMPLATE.getValue().equals(lawsMonthlyReportWriteEO.getContentTemplate())){ - //新发布标准清单模板 + //新发布标准清单模板(先删除在新增) + //删除 + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.in(NewStandardTemplateEO::getLawsMonthlyReportWriteId,lawsMonthlyReportWriteEO.getId()); + iNewStandardTemplateEOService.remove(lambdaQueryWrapper); + //新增 List newStandardTemplateEOList = lawsMonthlyReportWriteEO.getNewStandardTemplateEOList(); - iNewStandardTemplateEOService.updateBatchById(newStandardTemplateEOList); + iNewStandardTemplateEOService.saveBatch(newStandardTemplateEOList); } } From b49f58ae6f3c3c5180e6dafa5442cd8335b65277 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Mon, 8 Aug 2022 14:41:09 +0800 Subject: [PATCH 04/17] =?UTF-8?q?=E7=BF=BB=E8=AF=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 18 ++++++++++-------- jero-web/src/common/lang/zh-cn.js | 2 ++ .../parameter/ParameterTemplate/index.vue | 2 +- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 5c3ca92c9..b140fafa0 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -408,8 +408,8 @@ module.exports = { NewLabelItem: 'Newly Added Tag Item', editLabelItem: 'Edit Tag Item', NodeQuickLookup: 'Node Quick Lookup', - AreAllLabelsRead: 'Are All Labels Read', - AllLabelsRead: 'Labels Read', + AreAllLabelsRead: 'Are All Mark as Read', + AllLabelsRead: 'Mark as Read', SubscriptionNotification: 'Subscription Notification', warningInformation: 'Warning Information', ForwardPush: 'Forward Push', @@ -608,7 +608,7 @@ module.exports = { engineeringInterfacePerson: 'Engineering Interface', typeOfDeliverables: 'Deliverable Type', deliverableTemplate: 'Deliverable Template', - entryName: 'Project', + entryName: 'Project Name', targetMarket: 'Target Market', projectStatus: 'Development', StudioEngineer: 'R&H Studio', @@ -801,7 +801,7 @@ module.exports = { parameterBatch: 'Parameter Batch', releaseVersion: 'Release Version', parameterTemplate: 'Parameter Template', - contentDescription: 'Content Description', + contentDescription: 'Description', WhetherMergeParameters: 'Whether to merge parameters', merge: 'Merge', nonjoinder: 'Nonjoinder', @@ -884,10 +884,10 @@ module.exports = { toTrack: 'To be tracked', Launch: 'Launch', maintainProgress: 'Maintain', - redSchedule: 'Red: not in conformity, and there is no acceptable scheme and schedule', - yellowSchedule: 'Yellow: non conformance / to be tracked, with acceptable scheme and schedule', - greenRequirements: 'Green: confirm that it meets or meets the current requirements', - blueUndeterminedState: 'Blue: undetermined state', + redSchedule: 'Red: unqualified without available solutions or timeline. ', + yellowSchedule: 'Yellow: unqualified and with available solutions and timeline. ', + greenRequirements: 'Green: qualified and confirmed.', + blueUndeterminedState: 'Blue: pending', authenticationMessage: 'Homo Parameter Task', taskRegulationComplianceTask: 'Regulation Compliance Task', accept: 'Accept', @@ -1242,4 +1242,6 @@ module.exports = { Adjustareasofresponsibility:'Adjust areas of responsibility', regulatoryTechnicalAssessment:'Regulatory Technical Assessment', punctuationmark:'Only English punctuation marks other than the # sign can be entered', + created: 'Created', + updated:'Updated', } \ 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 8ccc785e9..60585341d 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1345,4 +1345,6 @@ module.exports = { Adjustareasofresponsibility:'调整责任领域', regulatoryTechnicalAssessment:'法规技术评估', punctuationmark:'只能输入除#号外的英文标点符号', + created: '创建时间', + updated:'更新时间', } \ No newline at end of file diff --git a/jero-web/src/views/parameter/ParameterTemplate/index.vue b/jero-web/src/views/parameter/ParameterTemplate/index.vue index dde4540c1..3a4eb070c 100644 --- a/jero-web/src/views/parameter/ParameterTemplate/index.vue +++ b/jero-web/src/views/parameter/ParameterTemplate/index.vue @@ -177,7 +177,7 @@ export default { // scopedSlots: { customRender: 'titleName' } }, { - title: this.$t('createTime'), + title: this.$t('created'), align: 'center', dataIndex: 'createTime', width: 160, From bffaae0b59761d7d5fd6158791f3c9866d7dd4fe Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Mon, 8 Aug 2022 15:09:09 +0800 Subject: [PATCH 05/17] =?UTF-8?q?=E9=97=AE=E9=A2=98=E7=9F=A5=E8=AF=86?= =?UTF-8?q?=E5=BA=93-=E5=88=86=E7=B1=BB=E7=BB=B4=E6=8A=A4-=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=8E=A5=E5=8F=A3=E5=AE=8C=E5=96=84=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SysUserServiceImpl.java | 6 ++- ...blemKnowledgeBaseClassifyEOController.java | 2 + .../ProblemKnowledgeBaseEOController.java | 2 +- .../ProblemKnowledgeBaseClassifyEO.java | 3 ++ .../entity/ProblemKnowledgeBaseEO.java | 8 +++ ...ProblemKnowledgeBaseClassifyEOService.java | 6 +++ .../IProblemKnowledgeBaseEOService.java | 2 +- ...lemKnowledgeBaseClassifyEOServiceImpl.java | 33 ++++++++++++ .../ProblemKnowledgeBaseEOServiceImpl.java | 51 ++++++++++++++++++- 9 files changed, 108 insertions(+), 5 deletions(-) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java index 304aa6215..3f4c2adcb 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java @@ -459,7 +459,11 @@ public class SysUserServiceImpl extends ServiceImpl impl userIdList = userIdList.stream().distinct().collect(Collectors.toList()); QueryWrapper sysUserQueryWrapper = new QueryWrapper<>(); sysUserQueryWrapper.lambda().in(SysUser::getId,userIdList); - List sysUsers = this.baseMapper.selectList(sysUserQueryWrapper); + List sysUsers = new ArrayList<>(); + if(CollectionUtils.isNotEmpty(userIdList)){ + sysUsers = this.baseMapper.selectList(sysUserQueryWrapper); + } + return sysUsers; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseClassifyEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseClassifyEOController.java index 54aa4c3e3..842aaafe4 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseClassifyEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseClassifyEOController.java @@ -56,6 +56,7 @@ public class ProblemKnowledgeBaseClassifyEOController extends JeroController page = new Page(pageNo, pageSize); IPage pageList = problemKnowledgeBaseClassifyEOService.page(page, queryWrapper); + this.problemKnowledgeBaseClassifyEOService.disposeData(pageList.getRecords()); return Result.OK(pageList); } @@ -69,6 +70,7 @@ public class ProblemKnowledgeBaseClassifyEOController extends JeroController> queryList() { List list = problemKnowledgeBaseClassifyEOService.queryList(); + this.problemKnowledgeBaseClassifyEOService.disposeData(list); return Result.OK(list); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseEOController.java index 59bd50731..41b5dcb78 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/ProblemKnowledgeBaseEOController.java @@ -53,7 +53,7 @@ public class ProblemKnowledgeBaseEOController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(problemKnowledgeBaseEO, req.getParameterMap()); - this.problemKnowledgeBaseEOService.createQueryPermission(queryWrapper); + this.problemKnowledgeBaseEOService.createQueryPermission(queryWrapper,problemKnowledgeBaseEO); queryWrapper.orderByDesc("create_time"); Page page = new Page(pageNo, pageSize); IPage pageList = problemKnowledgeBaseEOService.page(page, queryWrapper); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseClassifyEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseClassifyEO.java index 2ce96532e..994abea87 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseClassifyEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseClassifyEO.java @@ -4,6 +4,7 @@ import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.math.BigDecimal; 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 lombok.Data; @@ -70,5 +71,7 @@ public class ProblemKnowledgeBaseClassifyEO implements Serializable { @Excel(name = "负责人id", width = 15) @ApiModelProperty(value = "负责人id") private java.lang.String chargePersonId; + @TableField(exist = false) + private java.lang.String chargePersonIdName; } 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 492a10074..dd152f332 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 @@ -73,8 +73,12 @@ public class ProblemKnowledgeBaseEO implements Serializable { @Excel(name = "问题分类", width = 15) @ApiModelProperty(value = "问题分类") private java.lang.String problemType; + /**问题分类展示名称*/ + @TableField(exist = false) + private java.lang.String problemTypeName; /**市场*/ + @Dict(dicCode = "region") @Excel(name = "市场", width = 15) @ApiModelProperty(value = "市场") private java.lang.String targetMarket; @@ -171,4 +175,8 @@ public class ProblemKnowledgeBaseEO implements Serializable { /**中英文切换*/ @TableField(exist = false) private String cut; + + /**模糊搜索全部输入字段条件*/ + @TableField(exist = false) + private String searchStr; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseClassifyEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseClassifyEOService.java index 486f3ea5e..00564d0f1 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseClassifyEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseClassifyEOService.java @@ -58,4 +58,10 @@ public interface IProblemKnowledgeBaseClassifyEOService extends IService queryList(); + + /** + * 处理数据 + * @param datas + */ + void disposeData(List datas); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseEOService.java index b62c1331a..4b538190c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/IProblemKnowledgeBaseEOService.java @@ -74,5 +74,5 @@ public interface IProblemKnowledgeBaseEOService extends IService queryWrapper); + void createQueryPermission(QueryWrapper queryWrapper,ProblemKnowledgeBaseEO problemKnowledgeBaseEO); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseClassifyEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseClassifyEOServiceImpl.java index 1c473bc11..4949d9f5f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseClassifyEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseClassifyEOServiceImpl.java @@ -3,9 +3,16 @@ package com.jero.modules.problemKnowledgeBase.service.impl; import com.jero.modules.problemKnowledgeBase.entity.ProblemKnowledgeBaseClassifyEO; import com.jero.modules.problemKnowledgeBase.mapper.ProblemKnowledgeBaseClassifyEOMapper; import com.jero.modules.problemKnowledgeBase.service.IProblemKnowledgeBaseClassifyEOService; +import com.jero.modules.system.entity.SysUser; +import com.jero.modules.system.service.ISysUserService; +import com.jero.modules.system.util.StringUtils; +import org.apache.commons.collections4.CollectionUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; import java.util.Date; +import java.util.stream.Collectors; + import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; @@ -19,6 +26,8 @@ import org.springframework.transaction.annotation.Transactional; @Service @Transactional(value = "transactionManager", readOnly = false, propagation = Propagation.REQUIRED, rollbackFor = Throwable.class) public class ProblemKnowledgeBaseClassifyEOServiceImpl extends ServiceImpl implements IProblemKnowledgeBaseClassifyEOService { + @Autowired + private ISysUserService sysUserService; /** * 保存 @@ -89,4 +98,28 @@ public class ProblemKnowledgeBaseClassifyEOServiceImpl extends ServiceImpl queryList() { return list(); } + + @Override + public void disposeData(List datas) { + if (CollectionUtils.isNotEmpty(datas)) { + List userIdList = datas.stream().map(ProblemKnowledgeBaseClassifyEO::getChargePersonId).distinct().collect(Collectors.toList()); + + List userList = this.sysUserService.querySysUserListByIdList(userIdList); + + datas.forEach(data -> { + if(CollectionUtils.isNotEmpty(userList)){ + List sysUsers = userList.stream().filter(user -> { + boolean flag = false; + if (StringUtils.equals(data.getId(), user.getId())) { + flag = true; + } + return flag; + }).collect(Collectors.toList()); + if(CollectionUtils.isNotEmpty(sysUsers)){ + data.setChargePersonIdName(sysUsers.get(0).getUsername()); + } + } + }); + } + } } 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 57a0f9ada..b4155d784 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 @@ -14,9 +14,11 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.util.Date; import java.util.stream.Collectors; +import java.util.stream.Stream; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.transaction.annotation.Propagation; @@ -42,6 +44,8 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl queryList(ProblemKnowledgeBaseEO problemKnowledgeBaseEO, HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(problemKnowledgeBaseEO, req.getParameterMap()); - this.createQueryPermission(queryWrapper); + this.createQueryPermission(queryWrapper,problemKnowledgeBaseEO); queryWrapper.orderByDesc("create_time"); List result = this.list(queryWrapper); this.disposeData(result,problemKnowledgeBaseEO.getCut()); @@ -167,6 +171,11 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl probleKnowledgeBaseIdList = datas.stream().map(ProblemKnowledgeBaseEO::getId).distinct().collect(Collectors.toList()); //查询出数据的所有点赞数量 QueryWrapper praiseQueryWrapper = new QueryWrapper<>(); @@ -189,6 +198,16 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl permissionUserEOList = this.problemKnowledgeBaseUserEOService.list(permissionUserQueryWrapper); this.problemKnowledgeBaseUserEOService.disposeData(permissionUserEOList,cut); + List problemKnowledgeBaseClassifyEOList = new ArrayList<>(); + if(StringUtils.isNotEmpty(problemTypeSb.toString())){ + Stream problemTypeList = Arrays.asList(problemTypeSb.toString().substring(0, problemTypeSb.toString().length() - 1).split(",")).stream().distinct(); + QueryWrapper classifyEOQueryWrapper = new QueryWrapper<>(); + classifyEOQueryWrapper.lambda().in(ProblemKnowledgeBaseClassifyEO::getId,problemTypeList); + problemKnowledgeBaseClassifyEOList = this.problemKnowledgeBaseClassifyEOService.list(classifyEOQueryWrapper); + } + + + List finalProblemKnowledgeBaseClassifyEOList = problemKnowledgeBaseClassifyEOList; datas.forEach(data -> { if(StringUtils.isNotEmpty(data.getShowPermissions())){ data.setShowPermissions_dicText(ShowPermissionsEnum.getTextByValue(data.getShowPermissions(),cut)); @@ -258,12 +277,28 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl { + boolean flag = false; + for (String type : problemTypeArr) { + if (StringUtils.equals(type, problemKnowledgeBaseClassifyEO.getId())) { + flag = true; + } + } + return flag; + }).map(ProblemKnowledgeBaseClassifyEO::getProblemLabel).collect(Collectors.joining(",")); + + data.setProblemTypeName(problemTypeName); + } }); } } @Override - public void createQueryPermission(QueryWrapper queryWrapper) { + public void createQueryPermission(QueryWrapper queryWrapper,ProblemKnowledgeBaseEO problemKnowledgeBaseEO) { /** * 查询权限 * 公开：所有人都可以看到。 @@ -283,5 +318,17 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl { + query.like(ProblemKnowledgeBaseEO::getTitle,searchStr); + query.or().like(ProblemKnowledgeBaseEO::getProblemType,searchStr); + query.or().like(ProblemKnowledgeBaseEO::getTargetMarket,searchStr); + query.or().like(ProblemKnowledgeBaseEO::getStandNumber,searchStr); + query.or().like(ProblemKnowledgeBaseEO::getStandTitle,searchStr); + query.or().like(ProblemKnowledgeBaseEO::getContent,searchStr); + }); + } } } From cda720cf992d2c962f8d2f046d62197930db9f68 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Mon, 8 Aug 2022 15:39:45 +0800 Subject: [PATCH 06/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/parameter/ParameterTemplate/index.vue | 2 +- .../src/views/parameter/parameterexport/components/addModel.vue | 2 +- jero-web/src/views/parameter/parameterlist/index.vue | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/jero-web/src/views/parameter/ParameterTemplate/index.vue b/jero-web/src/views/parameter/ParameterTemplate/index.vue index 3a4eb070c..79ca621a9 100644 --- a/jero-web/src/views/parameter/ParameterTemplate/index.vue +++ b/jero-web/src/views/parameter/ParameterTemplate/index.vue @@ -184,7 +184,7 @@ export default { ellipsis: true, }, { - title: this.$t('updateTime'), + title: this.$t('updated'), align: 'center', width: 160, ellipsis: true, diff --git a/jero-web/src/views/parameter/parameterexport/components/addModel.vue b/jero-web/src/views/parameter/parameterexport/components/addModel.vue index c45d83779..fe3bb5fb9 100644 --- a/jero-web/src/views/parameter/parameterexport/components/addModel.vue +++ b/jero-web/src/views/parameter/parameterexport/components/addModel.vue @@ -90,7 +90,7 @@ {{$t('submit')}} - + diff --git a/jero-web/src/views/parameter/parameterlist/index.vue b/jero-web/src/views/parameter/parameterlist/index.vue index fcd04a8e2..dc7764ed3 100644 --- a/jero-web/src/views/parameter/parameterlist/index.vue +++ b/jero-web/src/views/parameter/parameterlist/index.vue @@ -184,7 +184,7 @@ export default { ellipsis: true, }, { - title: this.$t('createTime'), + title: this.$t('created'), align: 'center', dataIndex: 'createTime', width: 180, From 2aa1df437dd6c0f61b930529682c176b5f939ff3 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Mon, 8 Aug 2022 15:50:13 +0800 Subject: [PATCH 07/17] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=84=8F=E8=A7=81?= =?UTF-8?q?=E6=94=B6=E9=9B=86-=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=8E=92=E5=BA=8F=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/LawsOpinionGatherEOController.java | 1 + 1 file changed, 1 insertion(+) 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 0c1c4b174..4b67a1d10 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 @@ -56,6 +56,7 @@ public class LawsOpinionGatherEOController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(lawsOpinionGatherEO, req.getParameterMap()); + queryWrapper.orderByDesc("start_time"); Page page = new Page(pageNo, pageSize); IPage pageList = lawsOpinionGatherEOService.page(page, queryWrapper); this.lawsOpinionGatherEOService.disposeData(pageList.getRecords(),cut); From daa39562b4e4de561259b8976950f05e45597415 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Mon, 8 Aug 2022 15:52:50 +0800 Subject: [PATCH 08/17] =?UTF-8?q?57184-=E6=B3=95=E8=A7=84=E6=8A=80?= =?UTF-8?q?=E6=9C=AF=E8=AF=84=E4=BC=B0=E5=88=86=E9=A1=B5=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=EF=BC=8C=E6=8C=89=E7=85=A7=E5=8F=91=E8=B5=B7=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E5=80=92=E5=BA=8F=E6=8E=92=E5=BA=8F=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/LawsTechnologyEvaluationEOController.java | 1 + 1 file changed, 1 insertion(+) 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 5ffbd090c..7ab5d17ce 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 @@ -59,6 +59,7 @@ public class LawsTechnologyEvaluationEOController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(lawsTechnologyEvaluationEO, req.getParameterMap()); + queryWrapper.orderByDesc("start_time"); Page page = new Page(pageNo, pageSize); IPage pageList = lawsTechnologyEvaluationEOService.page(page, queryWrapper); this.lawsTechnologyEvaluationEOService.disposeData(pageList.getRecords(),cut); From 14e7da88a20733954de7bd40e057a8db4ac56752 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Mon, 8 Aug 2022 16:01:37 +0800 Subject: [PATCH 09/17] =?UTF-8?q?57351=E7=AB=A0=E8=8A=82=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E9=95=BF=E5=BA=A6=E4=BF=AE=E6=94=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_third_record.sql | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index 29ddf01c0..c8ef61563 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -827,6 +827,9 @@ CREATE TABLE `sar_file_compare_res_comment` ( PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; - +-- 法规技术评估-条款信息评估结果表 字段增加长度 2022-08-08 +ALTER TABLE `laws_weilai`.`laws_technology_evaluation_item_result` + MODIFY COLUMN `technical_file_name` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '技术文件名称' AFTER `evaluation_methods`, + MODIFY COLUMN `section` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '章节' AFTER `technical_file_name`; From 02fe0b4daf808a52c983cd2c85e983324089c4a0 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Mon, 8 Aug 2022 16:04:34 +0800 Subject: [PATCH 10/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/exporthistory/index.vue | 2 +- .../commponts/conventionalmodle.vue | 22 ++++++++++--------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/jero-web/src/components/exporthistory/index.vue b/jero-web/src/components/exporthistory/index.vue index cd59122b3..ecd48eb3d 100644 --- a/jero-web/src/components/exporthistory/index.vue +++ b/jero-web/src/components/exporthistory/index.vue @@ -40,7 +40,7 @@ :dataSource='areaTable' :pagination='false' :loading='loading' - :scroll='{x: 600}' + :scroll="{x: '100%',y:'calc(100vh - 130px)'}" :rowSelection='{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}' @change='handleTableChange'> diff --git a/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue b/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue index 765546dd3..b8481bf71 100644 --- a/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue +++ b/jero-web/src/views/parameter/managementdetails/commponts/conventionalmodle.vue @@ -78,7 +78,7 @@ - +
@@ -122,18 +122,20 @@ export default { data() { return { formInline: { + }, confirmLoading: false, description:false, dictOptions:[], visible: false, + combineFlag:false, required:false, disabled:false, rules: { separator:[ { required: true, message: this.$t('PleaseEnter')+this.$t('MergeSeparator'), trigger: 'change' }, { - pattern: /[`~!@$%^&*()_\-+=<>?:"{}|,.\/;'\\[\]·~！@￥%……&*（）——\-+={}|《》？：“”【】、；‘'，。、]/, + pattern: /[`~!@$%^&*()_\-+=<>?:"{}|.\/;'\\[\]·~！@￥%……&*（）——\-+={}|《》？：“”【】、；‘'。、]/, message: this.$t('punctuationmark'), trigger: 'blur' } @@ -166,11 +168,11 @@ export default { }, mounted() { this.getNameList() - if(this.formInline.combineFlag == '1'){ - this.required = false - }else{ - this.required = true - } + // if(this.formInline.combineFlag == '1'){ + // this.required = false + // }else{ + // this.required = true + // } }, methods: { uploadSuccess(data) { @@ -196,11 +198,10 @@ export default { }) }, flagChange(value){ - console.log(value.target.value) if(value.target.value == 2){ - this.required = false + this.combineFlag = true }else{ - this.required = true + this.combineFlag = false } }, getNameList() { @@ -217,6 +218,7 @@ export default { this.title = this.$t('ConventionalExport') this.formInline = {} this.formInline.separator = ',' + this.formInline.combineFlag = '1', this.formInline = {...this.formInline} this.getConfigure() this.$nextTick(() => { From 79a5914a4d2e9be39d85b4f610a23f7a661cec9b Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Mon, 8 Aug 2022 16:29:10 +0800 Subject: [PATCH 11/17] =?UTF-8?q?=E9=97=AE=E9=A2=98=E7=9F=A5=E8=AF=86?= =?UTF-8?q?=E5=BA=93-=E5=AD=97=E6=AE=B5=E9=95=BF=E5=BA=A6=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_third_record.sql | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index c8ef61563..7e60712c5 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -831,5 +831,8 @@ CREATE TABLE `sar_file_compare_res_comment` ( ALTER TABLE `laws_weilai`.`laws_technology_evaluation_item_result` MODIFY COLUMN `technical_file_name` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '技术文件名称' AFTER `evaluation_methods`, MODIFY COLUMN `section` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '章节' AFTER `technical_file_name`; - - +-- 问题知识库 字段长度修改 2022-08-08 +ALTER TABLE `laws_weilai`.`problem_knowledge_base` + MODIFY COLUMN `buss_document_library_id` varchar(4000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文档库id' AFTER `target_market`, + MODIFY COLUMN `stand_number` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标准编号' AFTER `buss_document_library_id`, + MODIFY COLUMN `stand_title` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标准标题' AFTER `stand_number`; From 3cc4215e319fed347e917d964c643a1fe206a086 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Mon, 8 Aug 2022 16:40:22 +0800 Subject: [PATCH 12/17] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E5=AF=B9=E6=AF=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 2 + jero-web/src/common/lang/zh-cn.js | 2 + .../classificationMaintenanceAdd.vue | 41 ++- .../classificationMaintenanceModel.vue | 21 +- .../components/listAddModel.vue | 315 ++++++++++++++++++ .../components/problemKnowledgeBaseAdd.vue | 255 +++++++++++--- .../components/problemKnowledgeBaseList.vue | 22 +- 7 files changed, 590 insertions(+), 68 deletions(-) create mode 100644 jero-web/src/views/businessSupport/problemKnowledgeBase/components/listAddModel.vue diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index b140fafa0..d69a1a14d 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1244,4 +1244,6 @@ module.exports = { punctuationmark:'Only English punctuation marks other than the # sign can be entered', created: 'Created', updated:'Updated', + OpenOne:'Open', + Privacy:'Privacy', } \ 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 60585341d..06f48e3e8 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1345,6 +1345,8 @@ module.exports = { Adjustareasofresponsibility:'调整责任领域', regulatoryTechnicalAssessment:'法规技术评估', punctuationmark:'只能输入除#号外的英文标点符号', + OpenOne:'公开', + Privacy:'私密', created: '创建时间', updated:'更新时间', } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/classificationMaintenanceAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/classificationMaintenanceAdd.vue index 5efb6b6bd..b1d02eb16 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/classificationMaintenanceAdd.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/classificationMaintenanceAdd.vue @@ -32,12 +32,12 @@ * {{$t('personCharge')}}
- + + v-model="formInline.chargePersonIdName"/>
@@ -48,7 +48,8 @@ + + \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue index bb5cacdb6..f2bc6ff04 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseAdd.vue @@ -3,7 +3,7 @@
- + {{$t('newlyAdded')}} @@ -19,28 +19,28 @@ * {{$t('displayPermission')}}
- + + @change="showPermissionsChange" + v-model="formInline.showPermissions"> - - {{ item.projectName}} + :value="item.value"> + + {{ item.name}}
- +
* {{$t('authorizedUser')}}
- + * {{$t('title')}}
- + {{$t('problemClassification')}}
- - + + + + + {{item.problemLabel}} + + + @@ -88,13 +92,13 @@ * {{$t('market')}} - - + + :triggerChange="false" :dictCode="'region'"/> @@ -105,10 +109,10 @@
{{$t('standardNo')}}
- + @@ -150,10 +154,10 @@ - {{ (formInline.enclosure === 'null' || formInline.enclosure === '' + @click="clickButtonToUpload('accessoryFile')"> + {{ (formInline.accessoryFile === 'null' || formInline.accessoryFile === '' || - formInline.enclosure == null) ? $t('clickUpload') : $t('viewUploadedFiles') + formInline.accessoryFile == null) ? $t('clickUpload') : $t('viewUploadedFiles') }} @@ -161,9 +165,14 @@ +
+ {{$t('submit')}} +
+ {{$t('pleaseWaitWhileRunning')}} + @@ -175,6 +184,7 @@ import 'quill/dist/quill.core.css' import 'quill/dist/quill.snow.css' import 'quill/dist/quill.bubble.css' + import listAddModel from './listAddModel' import { quillEditor } from 'vue-quill-editor' export default { @@ -182,14 +192,72 @@ components: { PersonnelSelection, uploadFile, - quillEditor + quillEditor, + listAddModel }, data() { return { formInline: {}, - rules: {}, + loading: false, + problemTypeList: [], + rules: { + showPermissions: [ + { + required: true, + message: this.$t('displayPermission') + this.$t('cannotEmpty'), + trigger: 'change' + } + ], + studioEngineerName: [ + { + required: true, + message: this.$t('authorizedUser') + this.$t('cannotEmpty'), + trigger: 'change' + } + ], + title: [ + { + required: true, + message: this.$t('title') + this.$t('cannotEmpty'), + trigger: 'blur' + }, + { + max: 100, + message: this.$t('title') + this.$t('cannotExceed') + 100 + this.$t('Characters'), + trigger: 'blur' + } + ], + problemType: [ + { + required: true, + message: this.$t('problemClassification') + this.$t('cannotEmpty'), + trigger: 'change' + } + ], + targetMarket: [ + { + required: true, + message: this.$t('market') + this.$t('cannotEmpty'), + trigger: 'change' + } + ] + }, + url: { + add: '/problemKnowledgeBase/problemKnowledgeBaseEO/add', + edit: '/problemKnowledgeBase/problemKnowledgeBaseEO/edit' + }, + isDisplay: false, disabled: false, - projectNameList: [], + projectNameList: [ + { + value: 'Open', + name: this.$t('OpenOne') + }, + { + value: 'Privacy', + name: this.$t('Privacy') + } + ], content: '

I am Example

', editorOption: { // Some Quill options... @@ -203,34 +271,92 @@ }, mounted() { document.title = this.$t('problemKnowledgeBase') + this.$t('newlyAdded') + this.getBase() + if (this.$route.query.id) { + this.queryById() + } }, methods: { + getBase() { + getAction('/problemKnowledgeBase/problemKnowledgeBaseClassifyEO/list', {}).then((res) => { + if (res.success) { + this.problemTypeList = res.result || [] + } else { + this.problemTypeList = [] + } + }) + }, + queryById() { + let query = { + id: this.$route.query.id + } + getAction('/problemKnowledgeBase/problemKnowledgeBaseEO/queryById', query).then((res) => { + if (res.success) { + this.formInline = res.result || {} + this.formInline = { ...this.formInline } + if (this.formInline.showPermissions == 'Privacy'){ + this.isDisplay = true + }else{ + this.isDisplay = false + } + } else { + this.formInline = {} + } + }) + }, + backClick() { + this.$router.push({ + path: '/problemknowledgeBase' + }) + } + , + showPermissionsChange(event) { + if (event == 'Open') { + this.isDisplay = false + } else { + this.isDisplay = true + } + } + , onEditorBlur(quill) { console.log('editor blur!', quill) - }, + } + , onEditorFocus(quill) { console.log('editor focus!', quill) - }, + } + , onEditorReady(quill) { console.log('editor ready!', quill) - }, + } + , onEditorChange({ quill, html, text }) { console.log('editor change!', quill, html, text) this.content = html - }, + } + , PersonnelSelectionChange(value, id) { this.formInline[value] = id this.formInline = { ...this.formInline } - }, + } + , handleInput(value) { this.$nextTick(() => { this.formInline = { ...this.formInline } this.$refs.ruleForm.validateField([value]) }) - }, + } + , bringInDocumentInformationClick() { - - }, + this.$refs.listAddModelRef.addModel(this.formInline) + } + , + listAddModelForm(id, number) { + this.formInline.standNumber = number + this.formInline.bussDocumentLibraryId = id + this.formInline = { ...this.formInline } + } + , clickButtonToUpload(item) { this.$refs.uploadFile.perentHandleFunc() this.$refs.uploadFile.visible = true @@ -242,7 +368,8 @@ this.$refs.uploadFile.perentHandleFunc() } }) - }, + } + , /** 上传文件的回调 */ uploadSuccess(data) { let attIdList = [] @@ -255,6 +382,47 @@ this.formInline[this.uploadName] = attIdList.join(',') this.formInline = { ...this.formInline } } + , + submit() { + this.$refs.ruleForm.validate(valid => { + if (valid) { + let formInline = JSON.parse(JSON.stringify(this.formInline)) + this.loading = true + this.confirmLoading = true + let url = '' + if (this.formInline.id) { + url = this.url.edit + } else { + url = this.url.add + } + formInline.permissionUserList = [] + if (formInline.showPermissions == 'Privacy') { + let studioEngineer = formInline.studioEngineer.split(',') + studioEngineer.forEach(res => { + formInline.permissionUserList.push({ + userId: res + }) + }) + } + postAction(url, formInline).then((res) => { + if (res.success) { + this.$message.success(this.$t('OperationSuccessful')) + this.loading = false + if (this.$route.query.id) { + + } else { + this.$router.push({ + path: '/problemknowledgeBase' + }) + } + } else { + this.loading = false + this.$message.warning(this.$t('operationFailed')) + } + }) + } + }) + } } } @@ -381,4 +549,13 @@ .box-button { height: 38px; } + + .submit-button { + width: 100%; + margin-top: 20px; + text-align: right; + padding: 0 32px; + box-sizing: border-box; + } + \ 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 6036c6576..a5cae60f5 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue @@ -99,7 +99,7 @@ downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download', pageNo: 1, url: { - getInfoList: 'search/document/getFullTextInfoList' + getInfoList: '/problemKnowledgeBase/problemKnowledgeBaseEO/page' } } }, @@ -108,10 +108,13 @@ }, methods: { onSearch() { - + this.pageNo = 1 + this.getList() }, ResetSearch() { - + this.searchContent = '' + this.pageNo = 1 + this.getList() }, classificationClick() { this.$refs.classificationMaintenanceModelRef.getData() @@ -124,11 +127,14 @@ window.open(newUrl.href, '_blank') }, newlyAddedClick() { - let newUrl = this.$router.resolve({ - path: '/problemKnowledgeBaseAdd', - query: {} + this.$router.push({ + path: '/problemKnowledgeBaseAdd' }) - window.open(newUrl.href, '_blank') + // let newUrl = this.$router.resolve({ + // path: '/problemKnowledgeBaseAdd', + // query: {} + // }) + // window.open(newUrl.href, '_blank') }, pageOnChange(page, pageSize) { this.pageNo = page @@ -144,7 +150,7 @@ pageNo: this.pageNo, pageSize: this.pageSize } - postAction(this.url.getInfoList, query).then((res) => { + getAction(this.url.getInfoList, query).then((res) => { if (res.success) { this.conList = res.result.records this.total = res.result.total From eedb9de0224fd1b930b2ad75a2baf2a067bf884c Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Mon, 8 Aug 2022 17:10:21 +0800 Subject: [PATCH 13/17] =?UTF-8?q?country=5Fcard-=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=8F=91=E5=B8=83-=E8=8E=B7=E5=8F=96=E9=80=82=E7=94=A8?= =?UTF-8?q?=E5=B8=82=E5=9C=BA=E4=B8=8B=E6=8B=89=E9=80=89=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E3=80=82=20=E5=88=86=E7=B1=BB-=E5=A4=84=E7=90=86=E5=9B=9E?= =?UTF-8?q?=E6=98=BE=E8=B4=A3=E4=BB=BB=E4=BA=BA=E5=90=8D=E7=A7=B0=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/system/enums/DicCodeEnum.java | 52 +++++++++++++++++++ .../CountryCardManageReleaseEOController.java | 13 +++++ .../ICountryCardManageReleaseEOService.java | 8 +++ ...CountryCardManageReleaseEOServiceImpl.java | 37 +++++++++++++ ...lemKnowledgeBaseClassifyEOServiceImpl.java | 35 +++++++++---- 5 files changed, 135 insertions(+), 10 deletions(-) create mode 100644 jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/DicCodeEnum.java diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/DicCodeEnum.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/DicCodeEnum.java new file mode 100644 index 000000000..d109cf276 --- /dev/null +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/enums/DicCodeEnum.java @@ -0,0 +1,52 @@ +package com.jero.modules.system.enums; + +/** + * 数据字典code枚举类 + */ +public enum DicCodeEnum { + REGION("适用地区","0","region"), + ; + + String name; + String value; + String code; + + private DicCodeEnum(String name, String value, String code) { + this.name = name; + this.value = value; + this.code = code; + } + + 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; + } + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } + + public static String getTextByValue(String value) { + DicCodeEnum[] values = values(); + for (DicCodeEnum dicCodeEnum : values) { + if (dicCodeEnum.value.equals(value)) { + return dicCodeEnum.name; + } + } + return null; + } +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardManageReleaseEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardManageReleaseEOController.java index ae2e63e86..2830d355d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardManageReleaseEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardManageReleaseEOController.java @@ -8,6 +8,7 @@ import javax.servlet.http.HttpServletResponse; import com.alibaba.fastjson.JSONObject; import com.jero.common.api.vo.Result; import com.jero.common.system.query.QueryGenerator; +import com.jero.common.system.vo.DictModel; import com.jero.modules.problemKnowledgeBase.entity.CountryCardManageReleaseEO; import com.jero.modules.problemKnowledgeBase.service.ICountryCardManageReleaseEOService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -185,4 +186,16 @@ public class CountryCardManageReleaseEOController extends JeroController> getApplyMarketList() { + Result> result = this.countryCardManageReleaseEOService.getApplyMarketList(); + return result; + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardManageReleaseEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardManageReleaseEOService.java index 68de81566..90fd6f872 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardManageReleaseEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardManageReleaseEOService.java @@ -1,6 +1,8 @@ package com.jero.modules.problemKnowledgeBase.service; import com.alibaba.fastjson.JSONObject; +import com.jero.common.api.vo.Result; +import com.jero.common.system.vo.DictModel; import com.jero.modules.problemKnowledgeBase.entity.CountryCardManageReleaseEO; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; @@ -72,4 +74,10 @@ public interface ICountryCardManageReleaseEOService extends IService> getApplyMarketList(); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseEOServiceImpl.java index a0a0f6c04..e39493645 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseEOServiceImpl.java @@ -2,17 +2,22 @@ package com.jero.modules.problemKnowledgeBase.service.impl; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.jero.common.api.vo.Result; +import com.jero.common.system.vo.DictModel; import com.jero.modules.problemKnowledgeBase.entity.CountryCardManageReleaseDetailEO; import com.jero.modules.problemKnowledgeBase.entity.CountryCardManageReleaseEO; import com.jero.modules.problemKnowledgeBase.enums.ReleaseStatusEnum; import com.jero.modules.problemKnowledgeBase.mapper.CountryCardManageReleaseEOMapper; import com.jero.modules.problemKnowledgeBase.service.ICountryCardManageReleaseDetailEOService; import com.jero.modules.problemKnowledgeBase.service.ICountryCardManageReleaseEOService; +import com.jero.modules.system.enums.DicCodeEnum; +import com.jero.modules.system.service.ISysDictService; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Date; @@ -34,6 +39,8 @@ public class CountryCardManageReleaseEOServiceImpl extends ServiceImpl> getApplyMarketList() { + List result = new ArrayList<>(); + + //获取所有的适用地区 + List dictModelList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode()); + + //获取已经创建了country Card的适用地区，该接口只返回，在country Card里面没有的适用地区。 + List countryCardManageReleaseEOList = this.list(); + if(CollectionUtils.isEmpty(countryCardManageReleaseEOList)){ + result = dictModelList; + }else { + for (DictModel dictModel : dictModelList) { + boolean flag = true; + for (CountryCardManageReleaseEO countryCardManageReleaseEO : countryCardManageReleaseEOList) { + if(StringUtils.equals(dictModel.getValue(),countryCardManageReleaseEO.getApplyMarket())){ + flag = false; + break; + } + } + + if(flag){ + result.add(dictModel); + } + } + } + + return Result.OK(result); + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseClassifyEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseClassifyEOServiceImpl.java index 4949d9f5f..c8359bbdc 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseClassifyEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseClassifyEOServiceImpl.java @@ -9,6 +9,9 @@ import com.jero.modules.system.util.StringUtils; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.util.Date; import java.util.stream.Collectors; @@ -102,21 +105,33 @@ public class ProblemKnowledgeBaseClassifyEOServiceImpl extends ServiceImpl datas) { if (CollectionUtils.isNotEmpty(datas)) { - List userIdList = datas.stream().map(ProblemKnowledgeBaseClassifyEO::getChargePersonId).distinct().collect(Collectors.toList()); + + StringBuffer userIdSb = new StringBuffer(); + for (ProblemKnowledgeBaseClassifyEO data : datas) { + userIdSb.append(data.getChargePersonId() + ","); + } + List userIdList = new ArrayList<>(); + if(StringUtils.isNotEmpty(userIdSb.toString())){ + userIdList = Arrays.asList(userIdSb.toString().substring(0,userIdSb.length()-1).split(",")); + } List userList = this.sysUserService.querySysUserListByIdList(userIdList); datas.forEach(data -> { if(CollectionUtils.isNotEmpty(userList)){ - List sysUsers = userList.stream().filter(user -> { - boolean flag = false; - if (StringUtils.equals(data.getId(), user.getId())) { - flag = true; - } - return flag; - }).collect(Collectors.toList()); - if(CollectionUtils.isNotEmpty(sysUsers)){ - data.setChargePersonIdName(sysUsers.get(0).getUsername()); + String chargePersonId = data.getChargePersonId(); + if(StringUtils.isNotEmpty(chargePersonId)){ + String[] chargePersonIdArr = chargePersonId.split(","); + String chargePersonIdName = userList.stream().filter(user -> { + boolean flag = false; + for (String chargePerson : chargePersonIdArr) { + if(StringUtils.equals(user.getId(),chargePerson)){ + flag = true; + } + } + return flag; + }).map(SysUser::getUsername).collect(Collectors.joining(",")); + data.setChargePersonIdName(chargePersonIdName); } } }); From 30f5341748c8eb85654121c0109455ab6172ea34 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Mon, 8 Aug 2022 17:14:24 +0800 Subject: [PATCH 14/17] update --- .../service/impl/ProblemKnowledgeBaseEOServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 b4155d784..680113bf6 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 @@ -200,7 +200,7 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl problemKnowledgeBaseClassifyEOList = new ArrayList<>(); if(StringUtils.isNotEmpty(problemTypeSb.toString())){ - Stream problemTypeList = Arrays.asList(problemTypeSb.toString().substring(0, problemTypeSb.toString().length() - 1).split(",")).stream().distinct(); + List problemTypeList = Arrays.asList(problemTypeSb.toString().substring(0, problemTypeSb.toString().length() - 1).split(",")).stream().distinct().collect(Collectors.toList()); QueryWrapper classifyEOQueryWrapper = new QueryWrapper<>(); classifyEOQueryWrapper.lambda().in(ProblemKnowledgeBaseClassifyEO::getId,problemTypeList); problemKnowledgeBaseClassifyEOList = this.problemKnowledgeBaseClassifyEOService.list(classifyEOQueryWrapper); From 6f47ffebaa69b276a491cc0a868db49c391a8093 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Mon, 8 Aug 2022 17:24:28 +0800 Subject: [PATCH 15/17] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=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 | 4 +- .../components/problemKnowledgeBaseView.vue | 130 ++++++++++++++---- 2 files changed, 109 insertions(+), 25 deletions(-) diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue index a5cae60f5..6e291a5a3 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue @@ -162,7 +162,9 @@ titleClick(item) { let newUrl = this.$router.resolve({ path: '/problemKnowledgeBaseView', - query: {} + query: { + id: item.id + } }) window.open(newUrl.href, '_blank') } diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseView.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseView.vue index 2d85b178d..c90f35272 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseView.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseView.vue @@ -21,30 +21,23 @@ - {{queryForm[item.value]}}fdgdgdfg + {{queryForm[item.value]}} -
- sfdsfdsf的防控流感的飞机过来看的结果东法兰克感觉地方给了地方国家的分开两个就地方孤苦伶仃附件给领导反馈 - 独守空房了就收到付款了的角色发看来都是风景但是考虑附件第三方库老师积分迪斯科浪费绝对是分类的课时费 - 是反抗拉萨的飞机罗斯福就点十六分就但是发 - 迪斯科浪费电视机分厘卡的设计分类的水库附近的说服力但是积分的历史房价多少发了多少给京东方管理看豆腐干豆腐干看 - a fjsd fklsdjfk s是否考虑技术的反抗类毒素就发的撒开了房间但是发离开打扫房间是开了房间都是老师JFK了的身份圣诞快乐就是的反抗类毒素解放迪斯科浪费是 - 考虑到房价打开拉萨附近分离技术的领导是否打开拉萨范德萨发了开始就发的考虑是否就但是考虑发及代理商开发就十分大师傅看 -
+
- 123456 + {{this.queryForm.browsingHistoryCount}} - - - 123456 + + + {{this.queryForm.praiseCount}} - - - 123456 + + + {{this.queryForm.collectCount}}
@@ -107,7 +100,8 @@