Changes

jinlin

2023-11-16 86b6785e74bf268885e8663380b3e3c0cb0c4bad

Changes

 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());
    }


 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;


 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() {
    }
}

 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);


 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();
}

 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();
    }
}

 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">