From 6af5b3def3f511a19c7ccff6f223ef239b178d48 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期四, 16 十一月 2023 15:57:26 +0800
Subject: [PATCH] Changes
---
zt/core/src/main/resources/mapper/sys/SysUserDao.xml | 3 +++
modules/mainPart/src/main/java/com/zt/life/modules/project/model/Project.java | 3 ---
modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrder.java | 1 -
zt/core/src/main/java/com/zt/modules/sys/service/SysUserService.java | 4 ++++
modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderService.java | 22 ++++++++++++++--------
web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue | 4 ++--
core/src/main/java/com/zt/life/sys/controller/UserExtController.java | 9 +++++++++
zt/core/src/main/java/com/zt/modules/sys/dao/SysUserDao.java | 1 +
8 files changed, 33 insertions(+), 14 deletions(-)
diff --git a/core/src/main/java/com/zt/life/sys/controller/UserExtController.java b/core/src/main/java/com/zt/life/sys/controller/UserExtController.java
index 15a6e40..a6647fb 100644
--- a/core/src/main/java/com/zt/life/sys/controller/UserExtController.java
+++ b/core/src/main/java/com/zt/life/sys/controller/UserExtController.java
@@ -25,6 +25,8 @@
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
+import java.util.List;
+
/**
* 鐢ㄦ埛绠＄悊
*
@@ -82,4 +84,11 @@
return Result.ok();
}
+ @GetMapping("getUsersList")
+ @ApiOperation("杩斿洖鐢ㄦ埛鍒楄〃")
+ @LogOperation("杩斿洖鐢ㄦ埛鍒楄〃")
+ public Result<List<String>> getUsersList() {
+ return Result.ok(sysUserService.getUsersList());
+ }
+
}
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/model/Project.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/model/Project.java
index efa86b0..1fcbcf6 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/model/Project.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/model/Project.java
@@ -60,9 +60,6 @@
@ApiModelProperty(value = "鍏抽敭绛夌骇")
private Integer criticalLevel;
- @ApiModelProperty(value = "娴嬭瘯绾у埆")
- private Integer testLevel;
-
@ApiModelProperty(value = "杞欢绫诲瀷")
private String softwareType;
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrder.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrder.java
index ee3f3dc..dfedc37 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrder.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrder.java
@@ -164,7 +164,6 @@
@ApiModelProperty(value = "鍏抽敭绛夌骇")
private Integer criticalLevel;
- @TableField(exist = false)
@ApiModelProperty(value = "娴嬭瘯绾у埆")
private Integer testLevel;
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 aaa5e63..80d1e5e 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
@@ -210,29 +210,35 @@
dataObj.getSoftwareTestOrder().setTestType22(testType22);
//閫氱敤瀛楀吀鍒楄〃瀛楃涓茬敓鎴�
- String criticalLevelStr = getShowDictList.getShowDictList(dataObj.getProject().getCriticalLevel().toString(),"critical_level");
+ String criticalLevelStr = getShowDictList.getShowDictList(dataObj.getProject().getCriticalLevel().toString(), "critical_level");
dataObj.getSoftwareTestOrder().setCriticalLevelStr(criticalLevelStr);
+ for (SoftwareTestOrderMeasured measured : dataObj.getMeasuredList()) {
+ String value = measured.getIsMeasured();
+ String isMeasuredStr = getShowDictList.getShowDictList(value, "is_or_not");
+ SoftwareTestOrderMeasured newMeasured = new SoftwareTestOrderMeasured();
+ }
- String sortwareTypeStr = getShowDictList.getShowDictList(dataObj.getProject().getSoftwareType(),"software_type");
+ String sortwareTypeStr = getShowDictList.getShowDictList(dataObj.getProject().getSoftwareType(), "software_type");
dataObj.getSoftwareTestOrder().setSortwareTypeStr(sortwareTypeStr);
- String testBasisStr = getShowDictList.getShowDictList(dataObj.getSoftwareTestOrder().getTestBasis(),"test_basis");
+ String testBasisStr = getShowDictList.getShowDictList(dataObj.getSoftwareTestOrder().getTestBasis(), "test_basis");
dataObj.getSoftwareTestOrder().setTestBasisStr(testBasisStr);
- String testStandardStr = getShowDictList.getShowDictList(dataObj.getSoftwareTestOrder().getTestStandard(),"test_standard");
+ String testStandardStr = getShowDictList.getShowDictList(dataObj.getSoftwareTestOrder().getTestStandard(), "test_standard");
dataObj.getSoftwareTestOrder().setTestStandardStr(testStandardStr);
- String testLevelStr = getShowDictList.getShowDictList(dataObj.getProject().getTestLevel().toString(),"test_level");
+ String testLevelStr = getShowDictList.getShowDictList(dataObj.getSoftwareTestOrder().getTestLevel().toString(), "test_level");
dataObj.getSoftwareTestOrder().setTestLevelStr(testLevelStr);
- String otherRequireStr = getShowDictList.getShowDictList(dataObj.getSoftwareTestOrder().getOtherRequire(),"other_require");
+ String test =dataObj.getSoftwareTestOrder().getOtherRequire();
+ String otherRequireStr = getShowDictList.getShowDictList(test, "other_require");
dataObj.getSoftwareTestOrder().setOtherRequireStr(otherRequireStr);
- String articleNatureStr = getShowDictList.getShowDictList(dataObj.getSoftwareTestOrder().getArticleNature(),"article_nature");
+ String articleNatureStr = getShowDictList.getShowDictList(dataObj.getSoftwareTestOrder().getArticleNature(), "article_nature");
dataObj.getSoftwareTestOrder().setArticleNatureStr(articleNatureStr);
- String sampleStatusStr = getShowDictList.getShowDictList(dataObj.getSoftwareTestOrder().getSampleStatus(),"sample_status");
+ String sampleStatusStr = getShowDictList.getShowDictList(dataObj.getSoftwareTestOrder().getSampleStatus(), "is_or_not");
dataObj.getSoftwareTestOrder().setSampleStatusStr(sampleStatusStr);
WordFile wordFile = new WordFile();
diff --git a/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue b/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue
index 8e7f53c..f90fcec 100644
--- a/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue
+++ b/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue
@@ -184,7 +184,7 @@
</div>
<div class="el-border-left" style="width: 98%">
<el-form-item style="padding-left:5%;margin-bottom:0">
- <zt-dict v-model="dataForm.project.testLevel" :radio="true" dict="test_level"></zt-dict>
+ <zt-dict v-model="dataForm.softwareTestOrder.testLevel" :radio="true" dict="test_level"></zt-dict>
</el-form-item>
</div>
</div>
@@ -217,7 +217,7 @@
<div class="el-border-left" style="width: 98%;">
<el-form-item label="鏄惁鐩朇NAS绔�" label-width="130px" style="padding-left:5%;margin-bottom:0">
<zt-dict v-model="dataForm.softwareTestOrder.otherRequire" :radio="true"
- dict="is_stamp"></zt-dict>
+ dict="other_require"></zt-dict>
</el-form-item>
</div>
</div>
diff --git a/zt/core/src/main/java/com/zt/modules/sys/dao/SysUserDao.java b/zt/core/src/main/java/com/zt/modules/sys/dao/SysUserDao.java
index 60034ee..7680c70 100644
--- a/zt/core/src/main/java/com/zt/modules/sys/dao/SysUserDao.java
+++ b/zt/core/src/main/java/com/zt/modules/sys/dao/SysUserDao.java
@@ -54,4 +54,5 @@
void updatePassword(SysUser entity);
Integer checkTestHome(String systemId, Long userId);
+ List<String> getUsersList();
}
diff --git a/zt/core/src/main/java/com/zt/modules/sys/service/SysUserService.java b/zt/core/src/main/java/com/zt/modules/sys/service/SysUserService.java
index 08b9197..dc3b049 100644
--- a/zt/core/src/main/java/com/zt/modules/sys/service/SysUserService.java
+++ b/zt/core/src/main/java/com/zt/modules/sys/service/SysUserService.java
@@ -321,4 +321,8 @@
Integer num = baseDao.checkTestHome(systemId,userId);
return num;
}
+
+ public List<String> getUsersList() {
+ return baseDao.getUsersList();
+ }
}
diff --git a/zt/core/src/main/resources/mapper/sys/SysUserDao.xml b/zt/core/src/main/resources/mapper/sys/SysUserDao.xml
index b52d51f..7297c62 100644
--- a/zt/core/src/main/resources/mapper/sys/SysUserDao.xml
+++ b/zt/core/src/main/resources/mapper/sys/SysUserDao.xml
@@ -242,6 +242,9 @@
)
)
</select>
+ <select id="getUsersList" resultType="java.lang.String">
+ select nick_name from sys_user
+ </select>
<update id="updatePassword">
update
--
Gitblit v1.9.1