From 1ddf2274982b91e0814f691e53290b9df6a22fc0 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Thu, 4 Aug 2022 09:58:39 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E5=B8=83=E5=B1=80=E7=9F=A5=E8=AF=86?= =?UTF-8?q?=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/countryCardRelease.vue | 9 +- .../components/countryCardReleaseAdd.vue | 230 ++++++++++++++++++ 2 files changed, 236 insertions(+), 3 deletions(-) create mode 100644 jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardReleaseAdd.vue diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue index 16f764ed2..e39f8816f 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue @@ -96,17 +96,20 @@ + + + \ No newline at end of file From 4a433711cdfa33674257e74835632f45c2ef61a4 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Thu, 4 Aug 2022 09:59:24 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=A1=B9=E6=94=B6?= =?UTF-8?q?=E9=9B=86=E6=B8=85=E5=8D=95=E6=B7=BB=E5=8A=A0=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/ParameterLibraryAdd/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-web/src/components/ParameterLibraryAdd/index.vue b/jero-web/src/components/ParameterLibraryAdd/index.vue index f64e2d323..537bd69ab 100644 --- a/jero-web/src/components/ParameterLibraryAdd/index.vue +++ b/jero-web/src/components/ParameterLibraryAdd/index.vue @@ -240,7 +240,7 @@ export default { let postDate = { paramsInfoPublishEOList: this.selectedRowKeysDate, paramsManifestId: this.paramsManifest.id, - projectId: this.$route.query.id + projectId: this.$route.query.projectId } postAction(`params/collectManifest/add`, postDate).then(res => { if (res.success) { From 5c414cf52c40aa8f51134e4fba0363dde0ed4409 Mon Sep 17 00:00:00 2001 From: liyawei Date: Thu, 4 Aug 2022 10:07:49 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E9=A1=B9=E6=94=B6=E9=9B=86-=E6=89=B9=E9=87=8F=E5=88=A0?= =?UTF-8?q?=E9=99=A4-=E4=BF=AE=E6=94=B9bug=EF=BC=9A=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E6=9C=AA=E6=94=B6=E9=9B=86=E5=8F=AA=E5=89=A9=E5=B7=B2=E4=B8=8A?= =?UTF-8?q?=E6=8A=A5=E5=8F=82=E6=95=B0=E5=90=8E=E6=B8=85=E5=8D=95=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E6=9C=AA=E6=94=B9=E5=8F=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ParamsCollectManifestEOController.java | 7 ++-- .../IParamsCollectManifestEOService.java | 11 +++++- .../ParamsCollectManifestEOServiceImpl.java | 37 ++++++++++++++++++- 3 files changed, 49 insertions(+), 6 deletions(-) diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java index 6ee8b20a4..35994b066 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java @@ -23,7 +23,6 @@ import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.util.Arrays; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -173,15 +172,15 @@ public class ParamsCollectManifestEOController extends JeroController deleteBatch(@RequestParam(name="ids",required=true) String ids) { - boolean isSuccess = paramsCollectManifestEOService.deleteByIds(Arrays.asList(ids.split(","))); + public Result deleteBatch(ParamsCollectManifestVO paramsCollectManifestVO) { + boolean isSuccess = paramsCollectManifestEOService.deleteBatch(paramsCollectManifestVO); if (isSuccess) { return Result.OK("批量删除成功！"); } else { diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java index 8ba0fa9e6..fac103ab5 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java @@ -43,13 +43,22 @@ public interface IParamsCollectManifestEOService extends IService ids); + + /** + * 批量删除-参数项收集页面级 + * + * @param paramsCollectManifestVO + * @return + */ + boolean deleteBatch(ParamsCollectManifestVO paramsCollectManifestVO); + /** * 通过id查询 * diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index 91bfb3d99..9da886739 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -235,7 +235,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl ids = Arrays.asList(paramsCollectManifestVO.getIds().split(",")); + String paramsManifestId = paramsCollectManifestVO.getParamsManifestId(); + + // 删除参数项 + boolean isSuccess = removeByIds(ids); + // 关联删除配置数据 + paramsConfigDataEOService.deleteByParamsCollectManifestIdList(ids); + + // 判断清单收集状态 + Map map = isCollectFinished(paramsManifestId); + Boolean finish = (Boolean) map.get("finish"); + Date time = (Date) map.get("time"); + if (finish) { + // 更新清单状态和完成时间 + ParamsManifestEO updateParamsManifestEO = new ParamsManifestEO(); + updateParamsManifestEO.setId(paramsManifestId); + updateParamsManifestEO.setState(ManifestStateEnum.FINISHED.getValue()); + updateParamsManifestEO.setFinishTime(time); + boolean isSuccess2 = paramsManifestEOService.updateById(updateParamsManifestEO); + if (isSuccess2) { + webSocketServer.sendMessage(); + } + } + + return isSuccess; + } + /** * 通过id查询 * From f7b55b5f32ff64693259b1439a7d5a9f0ec97070 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Thu, 4 Aug 2022 10:39:56 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=8E=A8=E9=80=81=E6=8C=89=E9=92=AE=E4=B8=BA=E5=88=86?= =?UTF-8?q?=E4=BA=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 1 + jero-web/src/common/lang/zh-cn.js | 1 + jero-web/src/views/documentManage/library/index.vue | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index cddee045e..355390f1c 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1233,4 +1233,5 @@ module.exports = { displayInformation:'Display information', addComparison:'Add comparison', showOrNot:'Show or not', + share:'share', } \ 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 2b024825c..fd8e3409e 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1336,4 +1336,5 @@ module.exports = { displayInformation:'展示信息', addComparison:'添加对比', showOrNot:'是否展示', + share:'分享', } \ No newline at end of file diff --git a/jero-web/src/views/documentManage/library/index.vue b/jero-web/src/views/documentManage/library/index.vue index cd12fa778..b5caea42c 100644 --- a/jero-web/src/views/documentManage/library/index.vue +++ b/jero-web/src/views/documentManage/library/index.vue @@ -18,7 +18,7 @@
- {{$t('Push')}} + {{$t('share')}}
From b6e70054b80d2033ce825441cfdd122e88a96f55 Mon Sep 17 00:00:00 2001 From: liyawei Date: Thu, 4 Aug 2022 11:56:03 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E6=B8=85=E5=8D=95-=E5=8F=82=E6=95=B0=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E5=AD=97=E6=AE=B5-=E4=BF=AE=E6=94=B9bug?= =?UTF-8?q?=EF=BC=9A=E5=88=A0=E9=99=A4=E6=A8=A1=E6=9D=BF=E5=90=8E=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E4=B8=8D=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_third_record.sql | 7 ++++ .../cert/collect/entity/ParamsManifestEO.java | 2 +- .../mapper/xml/ParamsManifestEOMapper.xml | 2 +- .../service/IParamsManifestEOService.java | 3 ++ .../impl/ParamsManifestEOServiceImpl.java | 34 +++++++++++++++++++ .../impl/ParamsReportEOServiceImpl.java | 33 +++++++++++++----- .../impl/ParamsTemplateEOServiceImpl.java | 17 +++++++--- 7 files changed, 83 insertions(+), 15 deletions(-) diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index f20a9f262..e1434cab5 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -506,6 +506,7 @@ INSERT INTO `laws_weilai`.`sys_permission`(`id`, `parent_id`, `name`, `url`, `co INSERT INTO `laws_weilai`.`sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `menu_en`) VALUES ('1552484136976973825', '1539426795780005889', '新增', NULL, NULL, NULL, NULL, 2, 'report:exportTemplate:add', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'admin', '2022-07-28 10:40:37', NULL, NULL, 0, 0, '1', 0, 'Add'); UPDATE `laws_weilai`.`sys_permission` SET `parent_id` = '1516964175944798210', `name` = '上报库管理', `url` = '/escalationlibrary', `component` = 'parameter/escalationlibrary/index', `component_name` = NULL, `redirect` = NULL, `menu_type` = 1, `perms` = 'params:report:page', `perms_type` = '1', `sort_no` = 3.00, `always_show` = 0, `icon` = NULL, `is_route` = 1, `is_leaf` = 0, `keep_alive` = 0, `hidden` = 0, `description` = NULL, `create_by` = 'admin', `create_time` = '2022-06-22 10:05:03', `update_by` = 'admin', `update_time` = '2022-07-28 10:52:00', `del_flag` = 0, `rule_flag` = 0, `status` = '1', `internal_or_external` = 0, `menu_en` = 'Escalation library management' WHERE `id` = '1539429224550457346'; UPDATE `laws_weilai`.`sys_permission` SET `parent_id` = '1516964175944798210', `name` = '参数导出模板管理', `url` = '/Parameterexport', `component` = 'parameter/parameterexport/index', `component_name` = NULL, `redirect` = NULL, `menu_type` = 1, `perms` = 'report:exportTemplate:page', `perms_type` = '1', `sort_no` = 2.00, `always_show` = 0, `icon` = NULL, `is_route` = 1, `is_leaf` = 0, `keep_alive` = 0, `hidden` = 0, `description` = NULL, `create_by` = 'admin', `create_time` = '2022-06-22 09:55:24', `update_by` = 'admin', `update_time` = '2022-07-28 10:40:02', `del_flag` = 0, `rule_flag` = 0, `status` = '1', `internal_or_external` = 0, `menu_en` = 'Parameter export template management' WHERE `id` = '1539426795780005889'; +INSERT INTO `laws_weilai`.`sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `menu_en`) VALUES ('1554745894282264577', '1552487412749369345', '保存', NULL, NULL, NULL, NULL, 2, 'report:detail:export:save', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'admin', '2022-08-03 16:28:02', NULL, NULL, 0, 0, '1', 0, 'Save'); -- 角色表-增加对外报告管理员角色 2022-7-28 已同步生产环境 INSERT INTO `sys_role` VALUES ('1552536424587862017', '对外报告管理员', 'ExternalReportsManager', '对外报告文件夹列表的管理员', 'admin', '2022-7-28 14:08:23', NULL, NULL, NULL, NULL); @@ -692,3 +693,9 @@ CREATE TABLE `laws_weilai`.`problem_knowledge_base_collect` ( `collect_status` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '收藏状态', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '问题知识库收藏表' ROW_FORMAT = Dynamic; + +-- 参数清单 添加字段 2022-08-04 +ALTER TABLE `laws_weilai`.`params_manifest` + ADD COLUMN `params_template_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数模板名称' AFTER `params_template_publish_version`; +ALTER TABLE `laws_weilai`.`params_manifest_history` + ADD COLUMN `params_template_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数模板名称' AFTER `source_params_manifest_id`; \ No newline at end of file diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestEO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestEO.java index 0e5fa32ec..9d9cb0d9b 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestEO.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestEO.java @@ -94,7 +94,7 @@ public class ParamsManifestEO implements Serializable { @ApiModelProperty(value = "对应参数模板发布版本") private Integer paramsTemplatePublishVersion; - @TableField(exist = false) + @ApiModelProperty(value = "参数模板名称") private String paramsTemplateName; @TableField(exist = false) diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml index a27b4ca68..12e46fcfd 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsManifestEOMapper.xml @@ -43,7 +43,7 @@ pm.project_id as project_id, pm.params_template_id as params_template_id, pm.params_template_publish_version as params_template_publish_version, - pt.params_template_name as params_template_name + if (pt.params_template_name is not null, pt.params_template_name, pm.params_template_name) as params_template_name diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestEOService.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestEOService.java index ea5d647c5..cbfd3c68c 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestEOService.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestEOService.java @@ -87,4 +87,7 @@ public interface IParamsManifestEOService extends IService { List> labelListForProjectDetails(String projectId); Map getStatisticsForProjectDetails(String paramsManifestId, String cut); + + // 参数模板删除时，记录参数模板名称到清单 + boolean setTemplateName(List paramsTemplateIds); } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java index 18b513804..66829d8f5 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java @@ -705,6 +705,40 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl paramsTemplateIds) { + List updateManifestEOList = new ArrayList<>(); + + // 查询被删除模板信息 + LambdaQueryWrapper paramsTemplateEOLambdaQueryWrapper = new LambdaQueryWrapper<>(); + paramsTemplateEOLambdaQueryWrapper.in(ParamsTemplateEO::getId, paramsTemplateIds); + List paramsTemplateEOList = paramsTemplateEOService.list(paramsTemplateEOLambdaQueryWrapper); + List paramsTemplateIdList = paramsTemplateEOList.stream().map(ParamsTemplateEO::getId).collect(Collectors.toList()); + + // 查询被删除模板的所有清单 + LambdaQueryWrapper paramsManifestEOLambdaQueryWrapper = new LambdaQueryWrapper<>(); + paramsManifestEOLambdaQueryWrapper.in(ParamsManifestEO::getParamsTemplateId, paramsTemplateIdList); + List paramsManifestEOList = list(paramsManifestEOLambdaQueryWrapper); + + paramsTemplateEOList.forEach(templateEO-> { + // 查询使用该模板的所有清单 + List paramsManifestEOS = paramsManifestEOList.stream() + .filter(e-> templateEO.getId().equals(e.getParamsTemplateId())) + .collect(Collectors.toList()); + + paramsManifestEOS.forEach(manifestEO -> { + ParamsManifestEO updateManifestEO = new ParamsManifestEO(); + updateManifestEO.setId(manifestEO.getId()); + updateManifestEO.setParamsTemplateName(templateEO.getParamsTemplateName()); + updateManifestEO.setFinishTime(manifestEO.getFinishTime()); + + updateManifestEOList.add(updateManifestEO); + }); + + }); + return updateBatchById(updateManifestEOList); + } + private void getData(List> data, double quantity, String percentage) { Map map = new HashMap<>(); map.put("quantity", quantity); diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportEOServiceImpl.java index 20b992308..76c937679 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/report/service/impl/ParamsReportEOServiceImpl.java @@ -1,5 +1,6 @@ package com.jero.modules.cert.report.service.impl; +import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -14,6 +15,7 @@ import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.stream.Collectors; /** * @Description: 上报库 @@ -132,18 +134,31 @@ public class ParamsReportEOServiceImpl extends ServiceImpl updateEOList = new ArrayList<>(); List paramsManifestEOList = paramsManifestEOMapper.listInfoAll(oldParamsManifestIdList); + List paramsManifestIdList = paramsManifestEOList.stream().map(ParamsManifestVO::getId).collect(Collectors.toList()); + List paramsManifestVersionList = paramsManifestEOList.stream().map(ParamsManifestVO::getVersion).collect(Collectors.toList()); + + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.in(ParamsReportEO::getOldParamsManifestId, paramsManifestIdList) + .in(ParamsReportEO::getVersion, paramsManifestVersionList); + List paramsReportEOList = list(queryWrapper); + paramsManifestEOList.forEach(paramsManifestVO -> { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(ParamsReportEO::getOldParamsManifestId, paramsManifestVO.getId()) - .eq(ParamsReportEO::getVersion, paramsManifestVO.getVersion()); - ParamsReportEO paramsReportEO = getOne(queryWrapper); - ParamsReportEO updateEO = new ParamsReportEO(); - updateEO.setId(paramsReportEO.getId()); - updateEO.setTitle(paramsManifestVO.getTitle()); - updateEO.setProjectName(paramsManifestVO.getProjectName()); + List paramsReportEOS = paramsReportEOList.stream() + .filter(e-> paramsManifestVO.getId().equals(e.getOldParamsManifestId()) && paramsManifestVO.getVersion().equals(e.getVersion())) + .collect(Collectors.toList()); + + if (CollectionUtil.isNotEmpty(paramsReportEOS)) { + ParamsReportEO paramsReportEO = paramsReportEOS.get(0); + + ParamsReportEO updateEO = new ParamsReportEO(); + updateEO.setId(paramsReportEO.getId()); + updateEO.setTitle(paramsManifestVO.getTitle()); + updateEO.setProjectName(paramsManifestVO.getProjectName()); + + updateEOList.add(updateEO); + } - updateEOList.add(updateEO); }); return updateBatchById(updateEOList); diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsTemplateEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsTemplateEOServiceImpl.java index 8e69d4f13..4d44a3fa7 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsTemplateEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsTemplateEOServiceImpl.java @@ -2,6 +2,7 @@ package com.jero.modules.cert.template.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.system.vo.LoginUser; +import com.jero.modules.cert.collect.service.IParamsManifestEOService; import com.jero.modules.cert.template.entity.CertCategoryParamsInfoEO; import com.jero.modules.cert.template.entity.ParamsInfoEO; import com.jero.modules.cert.template.entity.ParamsTemplateEO; @@ -16,10 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.transaction.Transactional; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.UUID; +import java.util.*; /** * @Description: 参数模板表 @@ -37,6 +35,9 @@ public class ParamsTemplateEOServiceImpl extends ServiceImpl Date: Thu, 4 Aug 2022 13:44:30 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B4=A3=E4=BB=BB?= =?UTF-8?q?=E9=A2=86=E5=9F=9F=E5=90=8E=E4=BF=9D=E7=95=99=E9=AB=98=E7=BA=A7?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/tableCollection/index.vue | 11 ++++++++++- .../components/ParameterItemCollectionList.vue | 3 +++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue index 40b343d06..90d9d638b 100644 --- a/jero-web/src/components/tableCollection/index.vue +++ b/jero-web/src/components/tableCollection/index.vue @@ -322,6 +322,8 @@ xs: { span: 24 }, sm: { span: 7 } }, + queryParamQuery:{}, + queryParam:{}, querySdtList: [], // 工程接口人 Dateline: {}, getquerySdtId: '', // 当前工程接口人的id @@ -331,6 +333,9 @@ }, mounted() { this.getHeader() + eventBUs.$on('getTableList', search => { + this.queryParamQuery = search + }) }, watch: { currentPersonRole: { @@ -565,7 +570,9 @@ if (!(result.some(val => val.value == res.result.userType))) { res.result.userType = result[0] ? result[0].value : '' } + this.queryParam = {...this.queryParamQuery} this.getTableList(res.result.userType) + } else { this.getTableList(result[0].value) } @@ -650,6 +657,7 @@ }, getTableListReset() { this.formInline = {} + this.queryParam = {} let params = { paramsManifestId: this.$route.query.id, pageNo: this.pageNo, @@ -735,7 +743,8 @@ userTypes: this.currentPersonRole || currentPersonRole, paramsManifestId: paramsManifestid, ...this.formInline, - ...currentPersonRole + ...currentPersonRole, + ...this.queryParam } this.loading = true getAction(url, params).then((res) => { diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index 0ff67a9de..fbaf24817 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -424,6 +424,7 @@ + + \ No newline at end of file From ec5b57fa3916c461a6b8c240f264ee967dae516c Mon Sep 17 00:00:00 2001 From: liyawei Date: Thu, 4 Aug 2022 14:17:00 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E4=B8=8A=E6=8A=A5?= =?UTF-8?q?=E5=BA=93-=E5=8F=82=E6=95=B0=E9=A1=B9=E6=9F=A5=E7=9C=8B-?= =?UTF-8?q?=E4=BF=9D=E5=AD=98-=E5=8F=AF=E4=BB=A5=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=A0=87=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ParamsCollectManifestEOServiceImpl.java | 12 ++++++++++++ .../impl/ParamsReportDetailEOServiceImpl.java | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index 9da886739..9efca35d4 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -1936,6 +1936,18 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl