diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml index b0d6d83..b282ac7 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml @@ -27,9 +27,21 @@ SELECT - sel.id as id,su.name AS recorderName,lab.organize_name as laboratoryName,sel.executive_address as executiveAddress,sel.log_no as logNo,record_time AS recordTime,sel.create_time AS createTime + sel.id as id,sel.log_name AS logName,su.name AS recorderName,lab.organize_name as laboratoryName,sel.executive_address as executiveAddress,sel.log_no as logNo,record_time AS recordTime,sel.create_time AS createTime,customerName FROM business_site_executive_log sel + LEFT JOIN( + SELECT customerName,id + FROM business_site_executive_info + JOIN( + SELECT customer_name AS customerName,id AS customerId + FROM customer_info + + and customer_name like concat('%', #{request.customerName}, '%') + + )cs ON customer_id=cs.customerId + WHERE is_del = 0 + ) bsei ON bsei.id = sel.site_executive_id LEFT JOIN ( SELECT id, organize_name FROM meter_organize diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java index 1915916..cf23fce 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java @@ -16,6 +16,9 @@ @ApiModelProperty(value = "记录人", dataType = "String") private String recorderName; + @ApiModelProperty(value = "委托方名称", dataType = "String") + private String customerName; + @ApiModelProperty(value = "实验室", dataType = "String") private String laboratoryName; diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml index b0d6d83..b282ac7 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml @@ -27,9 +27,21 @@