From 1249ac088787abb46bc60a241531e2b4fcc961fe Mon Sep 17 00:00:00 2001 From: jinlin <jinlin> Date: 星期一, 13 十一月 2023 10:38:57 +0800 Subject: [PATCH] Changes --- modules/mainPart/src/main/java/com/zt/life/modules/project/dao/SoftwareTestOrderDao.java | 4 ++ modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrderDeliverable.java | 9 +++- modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrder.java | 6 ++ modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrderMeasured.java | 7 ++- modules/mainPart/src/main/java/com/zt/life/modules/project/service/SoftwareTestOrderService.java | 8 ++++ web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue | 4 +- modules/mainPart/src/main/java/com/zt/life/modules/project/controller/SoftwareTestOrderController.java | 17 +++++++- modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderDao.xml | 30 +++++++++++++++ 8 files changed, 74 insertions(+), 11 deletions(-) diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/SoftwareTestOrderController.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/SoftwareTestOrderController.java index e22ab0a..88146dc 100644 --- a/modules/mainPart/src/main/java/com/zt/life/modules/project/controller/SoftwareTestOrderController.java +++ b/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) { diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/dao/SoftwareTestOrderDao.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/dao/SoftwareTestOrderDao.java index e282e25..3483955 100644 --- a/modules/mainPart/src/main/java/com/zt/life/modules/project/dao/SoftwareTestOrderDao.java +++ b/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(); } 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 f3208fc..04ffe2f 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 @@ -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; } diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrderDeliverable.java b/modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrderDeliverable.java index 0253771..fef4f1c 100644 --- a/modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrderDeliverable.java +++ b/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 = "濮旀墭鍗旾D") private Long orderId; - - @ApiModelProperty(value = "鍚嶇О") - private String name; + @ApiModelProperty(value = "鏍囪瘑/鐗堟湰") private String identify; + @TableField(exist = false) + @ApiModelProperty(value = "瀛楀吀鏍囩/鍚嶇О") + private String dictLabel; + } 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 20da857..27e69af 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.ApiModel; @@ -28,8 +29,6 @@ @ApiModelProperty(value = "濮旀墭鍗旾D") 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; + } 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 4711f7f..b69fe1c 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 @@ -98,4 +98,12 @@ return true; } + + public List<SoftwareTestOrderDeliverable> deliverableDict() { + return baseDao.getdeliverableDictList(); + } + + public List<SoftwareTestOrderMeasured> MeasuredDict() { + return baseDao.getMeasuredDictList(); + } } diff --git a/modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderDao.xml b/modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderDao.xml index e90c64c..c5ccaa5 100644 --- a/modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderDao.xml +++ b/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> diff --git a/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue b/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue index 4154fa8..12c828e 100644 --- a/web/src/views/modules/project/SoftwareTestOrder-AddOrUpdate.vue +++ b/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> -- Gitblit v1.9.1