Changes

jinlin

2023-11-16 6af5b3def3f511a19c7ccff6f223ef239b178d48

Changes

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

}

 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;


 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;


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

 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="是否盖CNAS章" 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>

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

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

 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