diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml index 0c6d4a5..1708c25 100644 --- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml @@ -110,7 +110,7 @@ resultType="com.casic.missiles.dto.customer.sample.MultiItemSampleListResponse"> SELECT orderId,id,sampleName,sampleModel,manufacturingNo,appendixDescn,measureContent,remark,sampleStatus,customerName,measurePeriod, - validDeadline,measureLastTime,sampleNo,orderNo,customerNo + validDeadline,measureLastTime,sampleNo,orderCode,customerNo FROM ( SELECT sample_name AS "sampleName",sample_no AS "sampleNo",sample_model AS "sampleModel",manufacturing_no AS "manufacturingNo",appendix_descn AS "appendixDescn",remark,customer_name AS "customerName",measure_period AS @@ -127,7 +127,7 @@ )csi JOIN ( - SELECT sample_status AS "sampleStatus",sample_id as "sampleId",order_id AS "orderId",order_code AS "orderNo" + SELECT sample_status AS "sampleStatus",sample_id as "sampleId",order_id AS "orderId",order_code AS "orderCode" FROM business_order_sample_relation bosr JOIN ( SELECT id,order_code @@ -143,7 +143,7 @@ resultType="com.casic.missiles.dto.customer.sample.MultiItemSampleListResponse"> SELECT orderId,id,sampleName,sampleModel,manufacturingNo,appendixDescn,measureContent,remark,sampleStatus,customerName,measurePeriod, - validDeadline,measureLastTime,sampleNo,orderNo,customerNo + validDeadline,measureLastTime,sampleNo,orderCode,customerNo FROM ( SELECT sample_name AS "sampleName",sample_no AS "sampleNo",sample_model AS "sampleModel",manufacturing_no AS "manufacturingNo",appendix_descn AS "appendixDescn",remark,customer_name AS "customerName",measure_period AS @@ -164,7 +164,7 @@ )csi JOIN ( - SELECT sample_status AS "sampleStatus",sample_id as "sampleId",order_id AS "orderId",order_code AS "orderNo" + SELECT sample_status AS "sampleStatus",sample_id as "sampleId",order_id AS "orderId",order_code AS "orderCode" FROM business_order_sample_relation bosr JOIN ( SELECT id,order_code,customer_no diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml index 0c6d4a5..1708c25 100644 --- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml @@ -110,7 +110,7 @@ resultType="com.casic.missiles.dto.customer.sample.MultiItemSampleListResponse"> SELECT orderId,id,sampleName,sampleModel,manufacturingNo,appendixDescn,measureContent,remark,sampleStatus,customerName,measurePeriod, - validDeadline,measureLastTime,sampleNo,orderNo,customerNo + validDeadline,measureLastTime,sampleNo,orderCode,customerNo FROM ( SELECT sample_name AS "sampleName",sample_no AS "sampleNo",sample_model AS "sampleModel",manufacturing_no AS "manufacturingNo",appendix_descn AS "appendixDescn",remark,customer_name AS "customerName",measure_period AS @@ -127,7 +127,7 @@ )csi JOIN ( - SELECT sample_status AS "sampleStatus",sample_id as "sampleId",order_id AS "orderId",order_code AS "orderNo" + SELECT sample_status AS "sampleStatus",sample_id as "sampleId",order_id AS "orderId",order_code AS "orderCode" FROM business_order_sample_relation bosr JOIN ( SELECT id,order_code @@ -143,7 +143,7 @@ resultType="com.casic.missiles.dto.customer.sample.MultiItemSampleListResponse"> SELECT orderId,id,sampleName,sampleModel,manufacturingNo,appendixDescn,measureContent,remark,sampleStatus,customerName,measurePeriod, - validDeadline,measureLastTime,sampleNo,orderNo,customerNo + validDeadline,measureLastTime,sampleNo,orderCode,customerNo FROM ( SELECT sample_name AS "sampleName",sample_no AS "sampleNo",sample_model AS "sampleModel",manufacturing_no AS "manufacturingNo",appendix_descn AS "appendixDescn",remark,customer_name AS "customerName",measure_period AS @@ -164,7 +164,7 @@ )csi JOIN ( - SELECT sample_status AS "sampleStatus",sample_id as "sampleId",order_id AS "orderId",order_code AS "orderNo" + SELECT sample_status AS "sampleStatus",sample_id as "sampleId",order_id AS "orderId",order_code AS "orderCode" FROM business_order_sample_relation bosr JOIN ( SELECT id,order_code,customer_no diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MultiItemSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MultiItemSampleListResponse.java index aa65b1e..7ce824f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MultiItemSampleListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/MultiItemSampleListResponse.java @@ -19,6 +19,9 @@ @ApiModelProperty(value = "委托书id", dataType = "String") private Long orderId; + @ApiModelProperty(value = "委托书编号", dataType = "String") + private String orderCode; + @ApiModelProperty(value = "样品id", dataType = "String") private Long id;