From 86b6785e74bf268885e8663380b3e3c0cb0c4bad Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期四, 16 十一月 2023 16:44:10 +0800
Subject: [PATCH] Changes
---
zt/core/src/main/resources/mapper/sys/SysUserDao.xml | 4 ++--
modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrder.java | 4 ----
modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrderMeasured.java | 4 ++++
zt/core/src/main/java/com/zt/modules/sys/service/SysUserService.java | 2 +-
modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderService.java | 3 ++-
core/src/main/java/com/zt/life/sys/controller/UserExtController.java | 2 +-
zt/core/src/main/java/com/zt/modules/sys/dao/SysUserDao.java | 2 +-
7 files changed, 11 insertions(+), 10 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 a6647fb..e65ffa0 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
@@ -87,7 +87,7 @@
@GetMapping("getUsersList")
@ApiOperation("杩斿洖鐢ㄦ埛鍒楄〃")
@LogOperation("杩斿洖鐢ㄦ埛鍒楄〃")
- public Result<List<String>> getUsersList() {
+ public Result<SysUser> getUsersList() {
return Result.ok(sysUserService.getUsersList());
}
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 dfedc37..f7803b0 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
@@ -226,10 +226,6 @@
String criticalLevelStr;
@TableField(exist = false)
- @ApiModelProperty(value = "鏄惁琚祴浠跺瓧绗︿覆")
- String isMeasuredStr;
-
- @TableField(exist = false)
@ApiModelProperty(value = "杞欢绫诲瀷瀛楃涓�")
String sortwareTypeStr;
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 2d544f6..b1a2fe2 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,5 +1,6 @@
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.ApiModelProperty;
@@ -33,6 +34,9 @@
@ApiModelProperty(value = "鏄惁琚祴浠�")
private String isMeasured;
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鏄惁琚祴浠跺瓧绗︿覆")
+ String isMeasuredStr;
public SoftwareTestOrderMeasured() {
}
}
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 80d1e5e..b488403 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
@@ -216,9 +216,10 @@
for (SoftwareTestOrderMeasured measured : dataObj.getMeasuredList()) {
String value = measured.getIsMeasured();
String isMeasuredStr = getShowDictList.getShowDictList(value, "is_or_not");
- SoftwareTestOrderMeasured newMeasured = new SoftwareTestOrderMeasured();
+ measured.setIsMeasuredStr(isMeasuredStr);
}
+
String sortwareTypeStr = getShowDictList.getShowDictList(dataObj.getProject().getSoftwareType(), "software_type");
dataObj.getSoftwareTestOrder().setSortwareTypeStr(sortwareTypeStr);
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 7680c70..a48d573 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,5 +54,5 @@
void updatePassword(SysUser entity);
Integer checkTestHome(String systemId, Long userId);
- List<String> getUsersList();
+ SysUser 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 dc3b049..bda0d1f 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
@@ -322,7 +322,7 @@
return num;
}
- public List<String> getUsersList() {
+ public SysUser 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 7297c62..a21b4c7 100644
--- a/zt/core/src/main/resources/mapper/sys/SysUserDao.xml
+++ b/zt/core/src/main/resources/mapper/sys/SysUserDao.xml
@@ -242,8 +242,8 @@
)
)
</select>
- <select id="getUsersList" resultType="java.lang.String">
- select nick_name from sys_user
+ <select id="getUsersList" resultType="com.zt.core.sys.model.SysUser">
+ select nick_name,user_id from sys_user
</select>
<update id="updatePassword">
--
Gitblit v1.9.1