Changes

jinlin

2023-11-17 8caeb17c27473a748f97ced5ba6e78b5ad63c01d

Changes

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

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

 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

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

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

 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年MM月DD日') }}
                    {{ dataForm.softwareTestOrder.entrustSignDate | filterTime('YYYY年MM月DD日') }}
                  </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年MM月DD日') }}
                    {{ dataForm.softwareTestOrder.contractSignDate | filterTime('YYYY年MM月DD日') }}
                  </div>
                </div>
              </div>
@@ -415,6 +415,10 @@
          testCost:'',
          articleNature:'',
          sampleStatus:'',
          entrustSign:'',
          entrustSignDate:'',
          contractSign:'',
          contractSignDate:''
        },
        project: {
          code: '',