modules/mainPart/src/main/java/com/zt/life/modules/project/controller/SoftwareTestOrderController.java
@@ -14,6 +14,7 @@ import com.zt.common.validator.group.UpdateGroup; import com.zt.life.modules.project.dto.SoftwareTestOrderDto; import com.zt.life.modules.project.model.SoftwareTestOrder; import com.zt.life.modules.project.model.SoftwareTestOrderDeliverable; import com.zt.life.modules.project.model.SoftwareTestOrderMeasured; import com.zt.life.modules.project.service.ProjectService; import com.zt.life.modules.project.service.SoftwareTestOrderDeliverableService; @@ -27,6 +28,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import springfox.documentation.annotations.ApiIgnore; import java.util.List; /** @@ -80,9 +83,17 @@ projectId = softwareTestOrder.getProjectId(); data.setTestAgencyInfo(testAgencyInfoService.get(orderId)); data.setSoftwareTestOrderDeliverableList(softwareTestOrderDeliverableService.childrenTables(orderId)); data.setSoftwareTestOrderMeasuredList(softwareTestOrderMeasuredService.childrenTables(orderId)); } else { List<SoftwareTestOrderDeliverable> deliverableList = softwareTestOrderDeliverableService.childrenTables(orderId); if (deliverableList.isEmpty()) { deliverableList = softwareTestOrderService.deliverableDict(); } data.setSoftwareTestOrderDeliverableList(deliverableList); List<SoftwareTestOrderMeasured> measuredList = softwareTestOrderMeasuredService.childrenTables(orderId); if (measuredList.isEmpty()) { measuredList = softwareTestOrderService.MeasuredDict(); } data.setSoftwareTestOrderMeasuredList(measuredList);} else { data.setTestAgencyInfo(testAgencyInfoService.get(10000L)); } if (projectId != null) { modules/mainPart/src/main/java/com/zt/life/modules/project/dao/SoftwareTestOrderDao.java
@@ -2,6 +2,8 @@ import com.zt.common.dao.BaseDao; import com.zt.life.modules.project.model.SoftwareTestOrder; import com.zt.life.modules.project.model.SoftwareTestOrderDeliverable; import com.zt.life.modules.project.model.SoftwareTestOrderMeasured; import org.apache.ibatis.annotations.Mapper; @@ -19,5 +21,7 @@ public interface SoftwareTestOrderDao extends BaseDao<SoftwareTestOrder> { List<SoftwareTestOrder> getList(Map<String, Object> params); List<SoftwareTestOrderDeliverable> getdeliverableDictList(); List<SoftwareTestOrderMeasured> getMeasuredDictList(); } modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrder.java
@@ -39,7 +39,10 @@ private String testBasis; @ApiModelProperty(value = "测试类型") private String testType; private String testType1; @ApiModelProperty(value = "测试类型") private String testType2; @ApiModelProperty(value = "测试标准") private String testStandard; @@ -193,6 +196,7 @@ private String isMeasured; public String getEntrustUnitName() { return entrustUnitName; } modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrderDeliverable.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.ApiModel; @@ -26,11 +27,13 @@ @ApiModelProperty(value = "委托单ID") private Long orderId; @ApiModelProperty(value = "名称") private String name; @ApiModelProperty(value = "标识/版本") private String identify; @TableField(exist = false) @ApiModelProperty(value = "字典标签/名称") private String dictLabel; } 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.ApiModel; @@ -28,8 +29,6 @@ @ApiModelProperty(value = "委托单ID") private Long orderId; @ApiModelProperty(value = "名称") private String name; @ApiModelProperty(value = "标识/版本") private String identify; @@ -37,4 +36,8 @@ @ApiModelProperty(value = "是否被测件") private String isMeasured; @TableField(exist = false) @ApiModelProperty(value = "字典标签/名称") private String dictLabel; } modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderService.java
@@ -98,4 +98,12 @@ return true; } public List<SoftwareTestOrderDeliverable> deliverableDict() { return baseDao.getdeliverableDictList(); } public List<SoftwareTestOrderMeasured> MeasuredDict() { return baseDao.getMeasuredDictList(); } } modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderDao.xml
@@ -18,4 +18,34 @@ </if> </select> <select id="getMeasuredDictList" resultType="com.zt.life.modules.project.model.SoftwareTestOrderMeasured"> SELECT dd.* FROM sys_dict_type dt JOIN sys_dict_data dd ON dt.ID = dd.DICT_TYPE_ID WHERE dt.DICT_TYPE = 'testItem_type'; <where> <if test="whereSql!=null"> and ${whereSql} </if> </where> <if test="orderBySql!=null"> ORDER BY ${orderBySql} </if> </select> <select id="getdeliverableDictList" resultType="com.zt.life.modules.project.model.SoftwareTestOrderDeliverable"> SELECT dd.* FROM sys_dict_type dt JOIN sys_dict_data dd ON dt.ID = dd.DICT_TYPE_ID WHERE dt.DICT_TYPE = 'product_library_file'; <where> <if test="whereSql!=null"> and ${whereSql} </if> </where> <if test="orderBySql!=null"> ORDER BY ${orderBySql} </if> </select> </mapper> web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue
@@ -150,10 +150,10 @@ </div> <div class="el-border-left" style="width: 98%"> <el-form-item style="width: 40%;padding-left:5%;"> <zt-dict-checkbox v-model="dataForm.softwareTestOrder.testType" column="2" dict="test_type1" clearable></zt-dict-checkbox> <zt-dict-checkbox v-model="dataForm.softwareTestOrder.testType1" column="2" dict="test_type1" clearable></zt-dict-checkbox> </el-form-item> <el-form-item style="width: 60%;padding-left: 15%;border-left: 1px solid rgba(0,0,0,.2);"> <zt-dict-checkbox v-model="dataForm.softwareTestOrder.testType" dict="test_type2" clearable></zt-dict-checkbox> <zt-dict-checkbox v-model="dataForm.softwareTestOrder.testType2" dict="test_type2" clearable></zt-dict-checkbox> </el-form-item> </div> </div>
