From 8caeb17c27473a748f97ced5ba6e78b5ad63c01d Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期五, 17 十一月 2023 15:00:59 +0800
Subject: [PATCH] Changes
---
modules/mainPart/src/main/java/com/zt/life/modules/project/dao/SoftwareTestOrderDao.java | 2 +-
web/src/views/modules/project/Project.vue | 2 +-
modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderService.java | 7 ++++---
web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue | 12 ++++++++----
web/src/views/modules/project/Project-select.vue | 6 +++---
modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderDao.xml | 2 +-
6 files changed, 18 insertions(+), 13 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 35d1e1e..b3cf03f 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
@@ -20,5 +20,5 @@
public interface SoftwareTestOrderDao extends BaseDao<SoftwareTestOrder> {
List<SoftwareTestOrder> getList(Map<String, Object> params);
- List<DictIstance> dictList(String dictType, String projectCode);
+ List<DictIstance> dictList(String dictType, String projectCode,String softName);
}
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 8e806f8..463b19e 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
@@ -153,11 +153,12 @@
} else {
Project project = projectService.get(projectId);
String projectCode = project.getCode();
- List<?> testItemResult = baseDao.dictList("testItem_type", projectCode);
+ String softName =project.getSoftwareName();
+ List<?> testItemResult = baseDao.dictList("testItem_type", projectCode,softName);
List<?> measuredList = testItemResult;
data.setMeasuredList((List<SoftwareTestOrderMeasured>) measuredList);
- List<?> productLibraryResult = baseDao.dictList("product_library_file", projectCode);
+ List<?> productLibraryResult = baseDao.dictList("product_library_file", projectCode,null);
List<?> deliverableList = productLibraryResult;
data.setDeliverableList((List<SoftwareTestOrderDeliverable>) deliverableList);
}
@@ -234,7 +235,7 @@
String sortwareTypeStr = getShowDictList.getShowDictList(dataObj.getProject().getSoftwareType(), "software_type", false);
dataObj.getSoftwareTestOrder().setSortwareTypeStr(sortwareTypeStr);
- String testBasisStr = getShowDictList.getShowDictList(dataObj.getSoftwareTestOrder().getTestBasis(), "test_basis", false);
+ String testBasisStr = getShowDictList.getShowDictList(dataObj.getSoftwareTestOrder().getTestBasis(), "test_basis", true);
dataObj.getSoftwareTestOrder().setTestBasisStr(testBasisStr);
String testStandardStr = getShowDictList.getShowDictList(dataObj.getSoftwareTestOrder().getTestStandard(), "test_standard", true);
diff --git a/modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderDao.xml b/modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderDao.xml
index 82e47d0..fd42f3c 100644
--- a/modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderDao.xml
@@ -20,7 +20,7 @@
<select id="dictList" resultType="com.zt.core.sys.dto.DictIstance">
SET @row_number = 0;
- SELECT dd.dict_label as name,
+ SELECT concat('${softName}', dd.dict_label) AS name,
(@row_number := @row_number + 1) AS no,
case when '${dictType}'='product_library_file' then concat(dd.REMARK,'-${projectCode}') else
'1.0.0' end as identify
diff --git a/web/src/views/modules/project/Project-select.vue b/web/src/views/modules/project/Project-select.vue
index 31d8f11..a3c8618 100644
--- a/web/src/views/modules/project/Project-select.vue
+++ b/web/src/views/modules/project/Project-select.vue
@@ -13,9 +13,9 @@
<el-form-item style="width:12%">
<zt-dict v-model="dataForm.criticalLevel" placeholder="鍏抽敭绛夌骇" dict="critical_level" clearable></zt-dict>
</el-form-item>
- <el-form-item style="width:12%">
+ <!-- <el-form-item style="width:12%">
<zt-dict v-model="dataForm.testLevel" placeholder="娴嬭瘯绾у埆" dict="test_level" clearable></zt-dict>
- </el-form-item>
+ </el-form-item>-->
<el-form-item style="width:12%">
<zt-dict v-model="dataForm.softwareType" placeholder="杞欢绫诲瀷" dict="software_type" clearable></zt-dict>
</el-form-item>
@@ -40,7 +40,7 @@
<el-table-column prop="softwareIdentity" label="椤圭洰鏍囪瘑"/>
<zt-table-column-dict prop="secretClass" label="瀵嗙骇" dict="secret_class"/>
<zt-table-column-dict prop="criticalLevel" label="鍏抽敭绛夌骇" dict="critical_level"/>
- <zt-table-column-dict prop="testLevel" label="娴嬭瘯绾у埆" dict="test_level"/>
+ <!--<zt-table-column-dict prop="testLevel" label="娴嬭瘯绾у埆" dict="test_level"/>-->
<zt-table-column-dict prop="softwareType" label="杞欢绫诲瀷" dict="software_type"/>
<el-table-column prop="projectLeader" label="椤圭洰璐熻矗浜�"/>
<zt-table-column-dict prop="isContract" label="鏄惁绛剧讲鍚堝悓" dict="is_or_not"/>
diff --git a/web/src/views/modules/project/Project.vue b/web/src/views/modules/project/Project.vue
index 403f348..c368ee6 100644
--- a/web/src/views/modules/project/Project.vue
+++ b/web/src/views/modules/project/Project.vue
@@ -42,7 +42,7 @@
<el-table-column prop="softwareIdentity" label="椤圭洰鏍囪瘑"/>
<zt-table-column-dict prop="secretClass" label="瀵嗙骇" dict="secret_class"/>
<zt-table-column-dict prop="criticalLevel" label="鍏抽敭绛夌骇" dict="critical_level"/>
- <zt-table-column-dict prop="testLevel" label="娴嬭瘯绾у埆" dict="test_level"/>
+ <!-- <zt-table-column-dict prop="testLevel" label="娴嬭瘯绾у埆" dict="test_level"/>-->
<zt-table-column-dict prop="softwareType" label="杞欢绫诲瀷" dict="software_type"/>
<el-table-column prop="projectLeader" label="椤圭洰璐熻矗浜�"/>
<zt-table-column-dict prop="isContract" label="鏄惁绛剧讲鍚堝悓" dict="is_or_not"/>
diff --git a/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue b/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue
index ccf1d4a..b1e8a9b 100644
--- a/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue
+++ b/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue
@@ -226,10 +226,10 @@
<div class="" style="width: 100%;">
<div class="el-flex " style="height: 40px">
<div style="width: 70%">
- <span>{{ dataForm.softwareTestOrder.write }}</span>
+ <span>{{ dataForm.softwareTestOrder.entrustSign }}</span>
</div>
<div class="el-flex">
- {{ dataForm.softwareTestOrder.deliveryDate | filterTime('YYYY骞碝M鏈圖D鏃�') }}
+ {{ dataForm.softwareTestOrder.entrustSignDate | filterTime('YYYY骞碝M鏈圖D鏃�') }}
</div>
</div>
</div>
@@ -342,10 +342,10 @@
<div class="" style="width: 100%;">
<div class="el-flex" style="height: 40px">
<div style="width: 70%">
- <span>{{ dataForm.write }}</span>
+ <span>{{ dataForm.contractSign }}</span>
</div>
<div class="el-flex">
- {{ dataForm.softwareTestOrder.deliveryDate | filterTime('YYYY骞碝M鏈圖D鏃�') }}
+ {{ dataForm.softwareTestOrder.contractSignDate | filterTime('YYYY骞碝M鏈圖D鏃�') }}
</div>
</div>
</div>
@@ -415,6 +415,10 @@
testCost:'',
articleNature:'',
sampleStatus:'',
+ entrustSign:'',
+ entrustSignDate:'',
+ contractSign:'',
+ contractSignDate:''
},
project: {
code: '',
--
Gitblit v1.9.1