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 c872cd2..8e457e4 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml
@@ -30,7 +30,7 @@
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(
+ JOIN(
SELECT customerName,id
FROM business_site_executive_info
JOIN(
@@ -58,6 +58,12 @@
and lab.organize_name like concat('%', #{request.laboratoryName}, '%')
+
+ and id in
+
+ #{item}
+
+
order by sel.update_time desc
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 c872cd2..8e457e4 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml
@@ -30,7 +30,7 @@
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(
+ JOIN(
SELECT customerName,id
FROM business_site_executive_info
JOIN(
@@ -58,6 +58,12 @@
and lab.organize_name like concat('%', #{request.laboratoryName}, '%')
+
+ and id in
+
+ #{item}
+
+
order by sel.update_time desc
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java
index 1f43869..4f849b4 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java
@@ -165,8 +165,9 @@
page.setCurrent(1);
page.setSearchCount(false);
page.setSize(Integer.MAX_VALUE);
+ setSiteExecuteLogRequestEmpty(request);
// 获取列表
- Page siteExecutiveLogListPage = this.baseMapper.siteExecutiveLogListPage(page, request);
+ Page siteExecutiveLogListPage =this.siteExecutiveLogListPage(page,request);
siteExecutiveLogList = siteExecutiveLogListPage.getRecords();
} else {
siteExecutiveLogList = this.listByIds(request.getIds());
@@ -181,6 +182,13 @@
}
+ private void setSiteExecuteLogRequestEmpty(SiteExecuteLogRequest request){
+ request.setLogNo(null);
+ request.setCustomerName(null);
+ request.setRecorderName(null);
+ request.setLaboratoryName(null);
+ }
+
private void populateBusinessSiteExecutiveLogDetail(BusinessOrder businessOrder, BusinessSiteExecutiveLogDetail businessSiteExecutiveLogDetail) {
businessSiteExecutiveLogDetail.setCustomerAddress(businessOrder.getCustomerAddress());
businessSiteExecutiveLogDetail.setCustomerName(businessOrder.getCustomerName());