From 067d7a3bce1a8edbae1b2405f6c67283840f6db7 Mon Sep 17 00:00:00 2001
From: dengzedong <dengzedong@email>
Date: 星期五, 20 九月 2024 16:55:21 +0800
Subject: [PATCH] 项目关联模型关联sql bug 添加pyChineseName
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/entity/ProjectPackageHistoryModelEntity.java | 4 ++++
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/service/impl/MpkFileServiceImpl.java | 1 +
iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/mpk/MpkFileDao.xml | 8 ++------
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/dto/ProjectPackageHistoryModelDTO.java | 4 ++++
4 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/dto/ProjectPackageHistoryModelDTO.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/dto/ProjectPackageHistoryModelDTO.java
index f036a59..b13c8b1 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/dto/ProjectPackageHistoryModelDTO.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/dto/ProjectPackageHistoryModelDTO.java
@@ -31,6 +31,10 @@
*/
private String pyName;
/**
+ * 模型中文名称
+ */
+ private String pyChineseName;
+ /**
* 包名
*/
private String pkgName;
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/entity/ProjectPackageHistoryModelEntity.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/entity/ProjectPackageHistoryModelEntity.java
index faf5c30..8981cd2 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/entity/ProjectPackageHistoryModelEntity.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/entity/ProjectPackageHistoryModelEntity.java
@@ -29,6 +29,10 @@
*/
private String pyName;
/**
+ * 模型中文名称
+ */
+ private String pyChineseName;
+ /**
* 包名
*/
private String pkgName;
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/service/impl/MpkFileServiceImpl.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/service/impl/MpkFileServiceImpl.java
index bda62b1..6ef8959 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/service/impl/MpkFileServiceImpl.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/service/impl/MpkFileServiceImpl.java
@@ -391,6 +391,7 @@
entity.setProjectId(projectId);
entity.setPackageHistoryId(historyId);
entity.setPyName(e.getPyName());
+ entity.setPyChineseName(e.getPyChineseName());
entity.setPkgName(e.getPkgName());
entity.setPyModule(e.getPyModule());
entity.setRemark(e.getRemark());
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/mpk/MpkFileDao.xml b/iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/mpk/MpkFileDao.xml
index 3451506..2abdabd 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/mpk/MpkFileDao.xml
+++ b/iailab-module-model/iailab-module-model-biz/src/main/resources/mapper/mpk/MpkFileDao.xml
@@ -109,6 +109,7 @@
<select id="getProjectModel" resultMap="mpkFile">
SELECT
t3.*,
+ t4.id method_id,
t4.method_name,
t4.data_length,
t4.model,
@@ -127,12 +128,7 @@
FROM
(
SELECT
- t2.id,
- t2.py_name,
- t2.pkg_name,
- t2.py_module,
- t2.remark,
- t2.create_date
+ t2.*
FROM
t_mpk_project_model t1
LEFT JOIN t_mpk_file t2 ON t1.model_id = t2.id
--
Gitblit v1.9.3