From 3d45934c74977a4c80be29007418430b0463c7c1 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Tue, 31 Oct 2023 10:06:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B8=82=E5=9C=BA=E6=B3=95=E8=A7=84=E6=B8=85?= =?UTF-8?q?=E5=8D=95-=E5=8E=86=E5=8F=B2=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_third_record.sql | 1 + .../cert/collect/mapper/ParamsCollectManifestEOMapper.java | 3 ++- .../cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml | 2 +- .../service/impl/ParamsCollectManifestEOServiceImpl.java | 2 +- .../jero/modules/dummy/entity/DummyInventoryInfoHistoryEO.java | 3 +++ .../dummy/service/impl/DummyInventoryBaseEOServiceImpl.java | 3 ++- .../service/impl/DummyInventoryInfoHistoryEOServiceImpl.java | 1 + jero-web/src/components/UpdateLog/versionUpdatedRecordList.vue | 3 ++- .../virtualList/components/virtualListDetails.vue | 1 + 9 files changed, 14 insertions(+), 5 deletions(-) diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index c22b3b7a6..bf99cbc43 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -1387,6 +1387,7 @@ CREATE TABLE `dummy_inventory_info_history` ( `design_remark` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '设计备注', `buss_document_library_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文档库id', `duty_depart` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '责任部门', + `market_list_version_update_log_id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '市场清单版本更新log表id', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestEOMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestEOMapper.java index 89190530f..4571e69bf 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestEOMapper.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/ParamsCollectManifestEOMapper.java @@ -32,7 +32,8 @@ public interface ParamsCollectManifestEOMapper extends BaseMapper queryByParamManifestId(@Param("paramsManifestId") String paramsManifestIdString); IPage selectpage(@Param("page") IPage page, @Param("sqlJoin") String sqlJoin, @Param("paramsManifestEO")ParamsManifestEO paramsManifestEO); - List selectList(@Param("sqlJoin") String sqlJoin, @Param("paramsManifestEO")ParamsManifestEO paramsManifestEO); + + List getListInfo(@Param("sqlJoin") String sqlJoin, @Param("paramsManifestEO")ParamsManifestEO paramsManifestEO); List queryByProjectId(@Param("projectId") String projectId); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml index 101cffaa2..d4b74d554 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsCollectManifestEOMapper.xml @@ -149,7 +149,7 @@ ) temp ${sqlJoin} - select * from ( select pcm.* diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index 41aeef896..dcaf163db 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -826,7 +826,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl paramsCollectManifestEOS = paramsCollectManifestEOMapper.selectList(sqlJoinSb.toString(), paramsManifestEO);// 查询固定列 + List paramsCollectManifestEOS = paramsCollectManifestEOMapper.getListInfo(sqlJoinSb.toString(), paramsManifestEO);// 查询固定列 // IPage pageInfo = paramsCollectManifestEOMapper.selectpage(page, sqlJoinSb.toString(), paramsManifestEO); // 查询固定列 // List list = pageInfo.getRecords(); // 查询固定列 List paramsConfigEOList = paramsConfigEOService.queryList(paramsManifestId); // 查询配置列 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoHistoryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoHistoryEO.java index 2f9cf99d4..92a9a1577 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoHistoryEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoHistoryEO.java @@ -243,6 +243,9 @@ public class DummyInventoryInfoHistoryEO implements Serializable { @ApiModelProperty(value = "责任部门") private java.lang.String dutyDepart; + @ApiModelProperty(value = "市场清单版本更新log表id") + private java.lang.String marketListVersionUpdateLogId; + @TableField(exist = false) private String xin1Che1Xing2Shi2Shi1Ri4Qi1String; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java index 1749f783d..fcfa46069 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java @@ -356,6 +356,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl getPageInfo(Page page,DummyInventoryInfoHistoryEO dummyInventoryInfoHistoryEO) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(DummyInventoryInfoHistoryEO::getDummyInventoryBaseId,dummyInventoryInfoHistoryEO.getDummyInventoryBaseId()); + wrapper.eq(DummyInventoryInfoHistoryEO::getMarketListVersionUpdateLogId,dummyInventoryInfoHistoryEO.getMarketListVersionUpdateLogId()); Page historyEOPage = this.page(page, wrapper); treeDict(dummyInventoryInfoHistoryEO, historyEOPage.getRecords()); diff --git a/jero-web/src/components/UpdateLog/versionUpdatedRecordList.vue b/jero-web/src/components/UpdateLog/versionUpdatedRecordList.vue index c600af84d..a5c7cb8a6 100644 --- a/jero-web/src/components/UpdateLog/versionUpdatedRecordList.vue +++ b/jero-web/src/components/UpdateLog/versionUpdatedRecordList.vue @@ -123,7 +123,8 @@ versionNum:row.versionNum, id: row.listId, title: '市场清单详情', - isColophon: 'yes' + isColophon: 'yes', + marketListVersionUpdateLogId:row.id } }) window.open(newUrl.href, '_blank') diff --git a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue index 5ab29158b..1f52918cc 100644 --- a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue +++ b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue @@ -1333,6 +1333,7 @@ let url = '' if (this.$route.query.isColophon && this.$route.query.isColophon == 'yes') { url = '/dummy/dummyInventoryInfoHistoryEO/page' + query.marketListVersionUpdateLogId = this.$route.query.marketListVersionUpdateLogId } else { url = this.url.list }