From ba5766f1e6de66275a01ef506f3701cfbe958724 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期三, 15 十一月 2023 16:21:03 +0800
Subject: [PATCH] Changes
---
modules/mainPart/src/main/java/com/zt/life/modules/project/dao/SoftwareTestOrderDao.java | 5 +-
/dev/null | 26 -------------
modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrderDeliverable.java | 27 +++++++------
modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrderMeasured.java | 6 +-
modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderDao.xml | 6 ++-
zt/common/src/main/java/com/zt/core/sys/dto/DictIstance.java | 14 +++++++
6 files changed, 37 insertions(+), 47 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/dao/SoftwareTestOrderDao.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/dao/SoftwareTestOrderDao.java
index 9322e4c..35d1e1e 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/dao/SoftwareTestOrderDao.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/dao/SoftwareTestOrderDao.java
@@ -1,9 +1,8 @@
package com.zt.life.modules.project.dao;
import com.zt.common.dao.BaseDao;
-import com.zt.life.modules.project.model.DictList;
+import com.zt.core.sys.dto.DictIstance;
import com.zt.life.modules.project.model.SoftwareTestOrder;
-import com.zt.life.modules.project.model.SoftwareTestOrderDeliverable;
import org.apache.ibatis.annotations.Mapper;
@@ -21,5 +20,5 @@
public interface SoftwareTestOrderDao extends BaseDao<SoftwareTestOrder> {
List<SoftwareTestOrder> getList(Map<String, Object> params);
- List<DictList> dictList(String dictType);
+ List<DictIstance> dictList(String dictType, String projectCode);
}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/model/DictList.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/model/DictList.java
deleted file mode 100644
index 4a49861..0000000
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/model/DictList.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.zt.life.modules.project.model;
-
-import com.zt.common.entity.BusiEntity;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-@Data
-@EqualsAndHashCode(callSuper=false)
-public class DictList extends BusiEntity {
- @ApiModelProperty(value = "濮旀墭鍗旾D")
- private Long orderId;
-
- @ApiModelProperty(value = "搴忓彿")
- private Integer no;
-
- @ApiModelProperty(value = "琚祴浠跺悕绉�")
- private String name;
-
- @ApiModelProperty(value = "鏍囪瘑/鐗堟湰")
- private String identify;
-
- @ApiModelProperty(value = "鏄惁琚祴浠�")
- private String isMeasured;
-
-}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrderDeliverable.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrderDeliverable.java
index 9db7d03..e2730f0 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrderDeliverable.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrderDeliverable.java
@@ -9,26 +9,27 @@
/**
* software_test_order_deliverable
*
- * @author zt generator
+ * @author zt generator
* @since 1.0.0 2023-11-09
*/
@Data
-@EqualsAndHashCode(callSuper=false)
+@EqualsAndHashCode(callSuper = false)
@TableName("software_test_order_deliverable")
-public class SoftwareTestOrderDeliverable extends DictList {
- private static final long serialVersionUID = 1L;
+public class SoftwareTestOrderDeliverable extends BusiEntity {
+ private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "搴忓彿")
- private Integer no;
+ @ApiModelProperty(value = "搴忓彿")
+ private Integer no;
- @ApiModelProperty(value = "濮旀墭鍗旾D")
- private Long orderId;
+ @ApiModelProperty(value = "濮旀墭鍗旾D")
+ private Long orderId;
- @ApiModelProperty(value = "鏍囪瘑/鐗堟湰")
- private String identify;
+ @ApiModelProperty(value = "鏍囪瘑/鐗堟湰")
+ private String identify;
- @ApiModelProperty(value = "浜や粯鐗╁悕绉�")
- private String name;
+ @ApiModelProperty(value = "浜や粯鐗╁悕绉�")
+ private String name;
-
+ public SoftwareTestOrderDeliverable() {
+ }
}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrderMeasured.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrderMeasured.java
index 5035ac7..2d544f6 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrderMeasured.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrderMeasured.java
@@ -15,7 +15,7 @@
@Data
@EqualsAndHashCode(callSuper=false)
@TableName("software_test_order_measured")
-public class SoftwareTestOrderMeasured extends DictList {
+public class SoftwareTestOrderMeasured extends BusiEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "濮旀墭鍗旾D")
@@ -33,6 +33,6 @@
@ApiModelProperty(value = "鏄惁琚祴浠�")
private String isMeasured;
-
-
+ public SoftwareTestOrderMeasured() {
+ }
}
diff --git a/modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderDao.xml b/modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderDao.xml
index d5df0b8..c41583a 100644
--- a/modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderDao.xml
@@ -18,8 +18,10 @@
</if>
</select>
- <select id="dictList" resultType="com.zt.life.modules.project.model.DictList">
- SELECT dd.dict_label as name, '1.0.0' as identify
+ <select id="dictList" resultType="com.zt.core.sys.dto.DictIstance">
+ SELECT dd.dict_label as name,
+ case when '${dictType}'='product_library_file' then concat(dd.REMARK,'-${projectCode}') else
+ '1.0.0' end as identify
FROM sys_dict_type dt
JOIN sys_dict_data dd ON dt.ID = dd.DICT_TYPE_ID
<where>
diff --git a/zt/common/src/main/java/com/zt/core/sys/dto/DictIstance.java b/zt/common/src/main/java/com/zt/core/sys/dto/DictIstance.java
new file mode 100644
index 0000000..a46e988
--- /dev/null
+++ b/zt/common/src/main/java/com/zt/core/sys/dto/DictIstance.java
@@ -0,0 +1,14 @@
+package com.zt.core.sys.dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@EqualsAndHashCode(callSuper=false)
+public class DictIstance {
+
+ private String name;
+
+ private String identify;
+
+}
--
Gitblit v1.9.1