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 8aa2a12..0c6d4a5 100644 --- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml @@ -61,14 +61,14 @@ SELECT - orderId,sampleId,sampleName,sampleModel,manufacturingNo,appendixDescn,measureContent,remark,sampleStatus,customerName,measurePeriod, - validDeadline,measureLastTime,sampleNo,orderNo + orderId,id,sampleName,sampleModel,manufacturingNo,appendixDescn,measureContent,remark,sampleStatus,customerName,measurePeriod, + validDeadline,measureLastTime,sampleNo,orderNo,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 - "measurePeriod", - valid_deadline AS validDeadline,measure_last_time AS "measureLastTime",create_time,id,measure_content AS - "measureContent" - FROM customer_sample_info - WHERE customer_id=#{request.customerId} - - AND sample_no like concat('%',#{request.sampleNo},'%') - - - AND sample_name like concat('%',#{request.sampleName},'%') - + 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 + "measurePeriod",id, + valid_deadline AS validDeadline,measure_last_time AS "measureLastTime",create_time,measure_content AS + "measureContent",customer_no AS "customerNo" + FROM customer_sample_info + WHERE customer_id=#{request.customerId} + + AND sample_no like concat('%',#{request.sampleNo},'%') + + + AND sample_name like concat('%',#{request.sampleName},'%') + )csi JOIN ( SELECT sample_status AS "sampleStatus",sample_id as "sampleId",order_id AS "orderId",order_code AS "orderNo" @@ -142,7 +142,7 @@ - SELECT sampleId,sampleName,sampleModel,manufacturingNo,appendixDescn,measureContent,remark,customerName,measurePeriod, - validDeadline,measureLastTime,sampleNo,customerNo + SELECT id,sampleName,sampleModel,manufacturingNo,appendixDescn,measureContent,remark,customerName,measurePeriod, + validDeadline,measureLastTime,sampleNo,customerNo,powerVoltage 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 "measurePeriod",valid_deadline AS validDeadline,measure_last_time AS - "measureLastTime",create_time,id as "sampleId",measure_content AS - "measureContent",customer_no AS "customerNo" + "measureLastTime",create_time,id,measure_content AS + "measureContent",customer_no AS "customerNo",power_voltage AS "powerVoltage" FROM customer_sample_info WHERE is_del=0 @@ -84,7 +84,7 @@ AND customer_no=#{request.customerNo} )csi - WHERE sampleId NOT IN + WHERE id NOT IN ( SELECT sample_id FROM business_order_sample_relation bosr @@ -109,22 +109,22 @@ SELECT - orderId,sampleId,sampleName,sampleModel,manufacturingNo,appendixDescn,measureContent,remark,sampleStatus,customerName,measurePeriod, + orderId,id,sampleName,sampleModel,manufacturingNo,appendixDescn,measureContent,remark,sampleStatus,customerName,measurePeriod, validDeadline,measureLastTime,sampleNo,orderNo,customerNo FROM ( SELECT sample_name AS "sampleName",sample_no AS "sampleNo",sample_model AS "sampleModel",manufacturing_no AS 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 dfcff9e..dc5bb04 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 @@ -17,7 +17,7 @@ private String customerName; @ApiModelProperty(value = "样品id", dataType = "String") - private Long sampleId; + private Long id; @ApiModelProperty(value = "样品名称", dataType = "String") private String sampleName; @@ -37,6 +37,9 @@ @ApiModelProperty(value = "附件说明", dataType = "String") private String appendixDescn; + @ApiModelProperty(value = "电源电压", dataType = "String") + private String powerVoltage; + @ApiModelProperty(value = "检定要求", dataType = "Integer") private String measureContent;