From 0339de1ea2ddfb101510ddc7b347ee0552cd6a2b Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期三, 15 十一月 2023 09:19:02 +0800
Subject: [PATCH] Changes
---
modules/mainPart/src/main/java/com/zt/life/modules/project/dao/SoftwareTestOrderDao.java | 5 +-
modules/mainPart/src/main/java/com/zt/life/modules/project/service/ProjectService.java | 7 ---
modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrderDeliverable.java | 7 +--
web/src/main.js | 12 +++---
modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrderMeasured.java | 6 --
modules/mainPart/src/main/java/com/zt/life/modules/project/dto/SoftwareTestOrderDto.java | 1
modules/mainPart/src/main/java/com/zt/life/modules/project/model/DictList.java | 26 +++++++++++++
modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderService.java | 13 +++++-
web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue | 4 +-
modules/mainPart/src/main/java/com/zt/life/modules/project/controller/SoftwareTestOrderController.java | 2
modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderDao.xml | 23 ++++-------
11 files changed, 60 insertions(+), 46 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/SoftwareTestOrderController.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/SoftwareTestOrderController.java
index d362da1..524ccf5 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/SoftwareTestOrderController.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/SoftwareTestOrderController.java
@@ -83,7 +83,7 @@
@GetMapping("getDto")
@ApiOperation("淇℃伅")
public Result<SoftwareTestOrderDto> getDto(Long projectId,Long orderId) {
- SoftwareTestOrderDto data = softwareTestOrderService.getDto(orderId, projectId);
+ SoftwareTestOrderDto data = softwareTestOrderService.getDto(projectId, orderId);
return Result.ok(data);
}
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 48eb70b..9322e4c 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,9 @@
package com.zt.life.modules.project.dao;
import com.zt.common.dao.BaseDao;
+import com.zt.life.modules.project.model.DictList;
import com.zt.life.modules.project.model.SoftwareTestOrder;
import com.zt.life.modules.project.model.SoftwareTestOrderDeliverable;
-import com.zt.life.modules.project.model.SoftwareTestOrderMeasured;
import org.apache.ibatis.annotations.Mapper;
@@ -21,6 +21,5 @@
public interface SoftwareTestOrderDao extends BaseDao<SoftwareTestOrder> {
List<SoftwareTestOrder> getList(Map<String, Object> params);
- List<SoftwareTestOrderDeliverable> getdeliverableDictList();
- List<SoftwareTestOrderMeasured> getMeasuredDictList();
+ List<DictList> dictList(String dictType);
}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/dto/SoftwareTestOrderDto.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/dto/SoftwareTestOrderDto.java
index 752f8f7..0b88ba8 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/dto/SoftwareTestOrderDto.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/dto/SoftwareTestOrderDto.java
@@ -19,6 +19,7 @@
private SoftwareTestOrder softwareTestOrder;
private Project project;
private TestAgencyInfo TestAgencyInfo;
+
@ApiModelProperty(value = "琚祴浠�")
private List<SoftwareTestOrderMeasured> measuredList = new ArrayList<>();
@ApiModelProperty(value = "浜や粯浠�")
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
new file mode 100644
index 0000000..4a49861
--- /dev/null
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/model/DictList.java
@@ -0,0 +1,26 @@
+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 8e99ace..9db7d03 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
@@ -1,14 +1,10 @@
package com.zt.life.modules.project.model;
-import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.zt.common.entity.BusiEntity;
-import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
-
-import java.util.Date;
/**
* software_test_order_deliverable
@@ -19,7 +15,7 @@
@Data
@EqualsAndHashCode(callSuper=false)
@TableName("software_test_order_deliverable")
-public class SoftwareTestOrderDeliverable extends BusiEntity {
+public class SoftwareTestOrderDeliverable extends DictList {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "搴忓彿")
@@ -34,4 +30,5 @@
@ApiModelProperty(value = "浜や粯鐗╁悕绉�")
private String name;
+
}
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 b0afcf6..5035ac7 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
@@ -1,14 +1,10 @@
package com.zt.life.modules.project.model;
-import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.zt.common.entity.BusiEntity;
-import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
-
-import java.util.Date;
/**
* software_test_order_measured
@@ -19,7 +15,7 @@
@Data
@EqualsAndHashCode(callSuper=false)
@TableName("software_test_order_measured")
-public class SoftwareTestOrderMeasured extends BusiEntity {
+public class SoftwareTestOrderMeasured extends DictList {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "濮旀墭鍗旾D")
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/service/ProjectService.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/service/ProjectService.java
index 7bcbc33..bb5e4b0 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/service/ProjectService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/service/ProjectService.java
@@ -40,12 +40,5 @@
super.deleteLogic(ids);
}
-/*
- public List<String> getCode() {
- return baseDao.getCode();
- }
- public Project getProject(String code) {
- return baseDao.getProject(code);
- }*/
}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderService.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderService.java
index e409b16..78589a9 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderService.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderService.java
@@ -8,6 +8,7 @@
import com.zt.life.export.service.WordFileService;
import com.zt.life.modules.project.dao.SoftwareTestOrderDao;
import com.zt.life.modules.project.dto.SoftwareTestOrderDto;
+import com.zt.life.modules.project.model.DictList;
import com.zt.life.modules.project.model.SoftwareTestOrder;
import com.zt.life.modules.project.model.SoftwareTestOrderDeliverable;
import com.zt.life.modules.project.model.SoftwareTestOrderMeasured;
@@ -120,7 +121,7 @@
return true;
}
- public SoftwareTestOrderDto getDto(Long orderId, Long projectId) {
+ public SoftwareTestOrderDto getDto(Long projectId,Long orderId) {
SoftwareTestOrderDto data = new SoftwareTestOrderDto();
if (orderId != null) {
data.setId(orderId);
@@ -137,8 +138,14 @@
List<SoftwareTestOrderMeasured> measuredList = softwareTestOrderMeasuredService.childrenTables(orderId);
data.setMeasuredList(measuredList);
} else {
- List<SoftwareTestOrderDeliverable> deliverableList = baseDao.getdeliverableDictList();
- List<SoftwareTestOrderMeasured> measuredList = baseDao.getMeasuredDictList();
+ List<?> testItemResult = baseDao.dictList("testItem_type");
+ List<?> measuredList = testItemResult;
+ data.setMeasuredList((List<SoftwareTestOrderMeasured>) measuredList);
+
+ List<?> productLibraryResult = baseDao.dictList("product_library_file");
+ List<?> deliverableList = productLibraryResult;
+ data.setDeliverableList((List<SoftwareTestOrderDeliverable>) deliverableList);
+
data.setTestAgencyInfo(testAgencyInfoService.get(10000L));
}
if (projectId != null) {
diff --git a/modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderDao.xml b/modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderDao.xml
index 54e642d..d5df0b8 100644
--- a/modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderDao.xml
@@ -18,22 +18,17 @@
</if>
</select>
- <select id="getMeasuredDictList" resultType="com.zt.life.modules.project.model.SoftwareTestOrderMeasured">
- SELECT dd.dict_label as name,'1.0.0' as identify
+ <select id="dictList" resultType="com.zt.life.modules.project.model.DictList">
+ SELECT dd.dict_label as name, '1.0.0' as identify
FROM sys_dict_type dt
JOIN sys_dict_data dd ON dt.ID = dd.DICT_TYPE_ID
- WHERE dt.DICT_TYPE = 'testItem_type'
- and IS_DELETE = 0
- ORDER BY sort
- </select>
-
- <select id="getdeliverableDictList" resultType="com.zt.life.modules.project.model.SoftwareTestOrderDeliverable">
- SELECT dd.dict_label as name,'1.0.0' as identify
- FROM sys_dict_type dt
- JOIN sys_dict_data dd ON dt.ID = dd.DICT_TYPE_ID
- WHERE dt.DICT_TYPE = 'product_library_file'
- and IS_DELETE = 0
- ORDER BY sort
+ <where>
+ dd.IS_DELETE = 0
+ <if test="dictType != null and dictType != ''">
+ and dt.DICT_TYPE = #{dictType}
+ </if>
+ </where>
+ ORDER BY dd.sort
</select>
</mapper>
diff --git a/web/src/main.js b/web/src/main.js
index e06ac81..19465e6 100644
--- a/web/src/main.js
+++ b/web/src/main.js
@@ -102,12 +102,12 @@
let minutes = ' '
let seconds = ' '
if (data != null) {
- year = data.getFullYear()
- months = (data.getMonth() + 1).toString().padStart(2, '0')
- days = data.getDate()
- hours = (data.getHours() + 1).toString().padStart(2, '0')
- minutes = (data.getMinutes() + 1).toString().padStart(2, '0')
- seconds = (data.getSeconds() + 1).toString().padStart(2, '0')
+ // year = data.getFullYear()
+ // months = (data.getMonth() + 1).toString().padStart(2, '0')
+ // days = data.getDate()
+ // hours = (data.getHours() + 1).toString().padStart(2, '0')
+ // minutes = (data.getMinutes() + 1).toString().padStart(2, '0')
+ // seconds = (data.getSeconds() + 1).toString().padStart(2, '0')
}
return format.replace('YYYY', year).replace('MM', months).replace('DD', days).replace('hh', hours).replace('mm', minutes).replace('ss', seconds);
})
diff --git a/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue b/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue
index 3e8bf73..ec4c9b8 100644
--- a/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue
+++ b/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue
@@ -106,7 +106,7 @@
@cell-click="handleCellClick"
stripe>
<el-table-column type="index" align="center" width="80" label="搴忓彿"/>
- <el-table-column prop="dictLabel" min-width="300" label="鍚嶇О"></el-table-column>
+ <el-table-column prop="name" min-width="300" label="鍚嶇О"></el-table-column>
<el-table-column align="center" width="180" label="鏍囪瘑/鐗堟湰">
<template slot-scope="scope">
<span v-if="editingCell && editingCell.row === scope.row && editingCell.column.property === scope.column.property">
@@ -333,7 +333,7 @@
<el-table class="el-software" height="230" border :data="dataForm.deliverableList"
stripe>
<el-table-column type="index" align="center" width="80" label="搴忓彿"/>
- <el-table-column prop="dictLabel" min-width="300" label="鍚嶇О"></el-table-column>
+ <el-table-column prop="name" min-width="300" label="鍚嶇О"></el-table-column>
<el-table-column prop="identify" align="center" width="380" label="鏍囪瘑/鐗堟湰"></el-table-column>
</el-table>
</div>
--
Gitblit v1.9.1