diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleInvoiceChRecordController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleInvoiceChRecordController.java
index 0ea600170..303ec7a18 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleInvoiceChRecordController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleInvoiceChRecordController.java
@@ -55,7 +55,7 @@ public class EmisSettleInvoiceChRecordController extends BaseController
/**
* 查询渠道开票记录表列表
*/
- @PreAuthorize("@ss.hasPermi('emis:emisSettleInvoiceChRecord:list')")
+// @PreAuthorize("@ss.hasPermi('emis:emisSettleInvoiceChRecord:list')")
@GetMapping("/list")
public TableDataInfo list(EmisSettleInvoiceChRecord emisSettleInvoiceChRecord)
{
diff --git a/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml
index 2de79b5fc..92e2a6b4b 100644
--- a/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSettleBillMapper.xml
@@ -126,6 +126,13 @@
and update_site = #{updateSite}
+
+ and create_time = ]]> #{params.beginCreateTime}
+
+
+ and create_time #{params.endCreateTime}
+
+
and open_bill_status != '1'
diff --git a/emis-biz/src/main/resources/mapper/EmisSettleInvoiceChRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleInvoiceChRecordMapper.xml
index ab0a6ebee..5145fccd4 100644
--- a/emis-biz/src/main/resources/mapper/EmisSettleInvoiceChRecordMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSettleInvoiceChRecordMapper.xml
@@ -385,11 +385,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- update emis_settle_invoice_ch_record set del_flag='0' where id = #{id}
+ update emis_settle_invoice_ch_record set del_flag='1' where id = #{id}
- update emis_settle_invoice_ch_record set del_flag='0' where id in
+ update emis_settle_invoice_ch_record set del_flag='1' where id in
#{id}
diff --git a/emis-biz/src/main/resources/mapper/EmisSettleInvoiceRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleInvoiceRecordMapper.xml
index ac6c55926..d5bf54d98 100644
--- a/emis-biz/src/main/resources/mapper/EmisSettleInvoiceRecordMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSettleInvoiceRecordMapper.xml
@@ -27,12 +27,12 @@
-
+
-
+
@@ -46,6 +46,10 @@
+
+
+
+
diff --git a/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml
index efaf4fba6..148b28bd1 100644
--- a/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml
@@ -192,6 +192,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and a.send_date #{params.endSendDate}
+
+ and b.create_time = ]]> #{params.beginCreateTime}
+
+
+ and b.create_time #{params.endCreateTime}
+
+
and (
a.salesmen=#{params.privEmpName}
diff --git a/emis-biz/src/main/resources/mapper/EmisSiteAccountMapper.xml b/emis-biz/src/main/resources/mapper/EmisSiteAccountMapper.xml
index a4908cce8..85cbca2fd 100644
--- a/emis-biz/src/main/resources/mapper/EmisSiteAccountMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSiteAccountMapper.xml
@@ -242,11 +242,11 @@
- update emis_site_account set del_flag='0' where id = #{id}
+ update emis_site_account set del_flag='1' where id = #{id}
- update emis_site_account set del_flag='0' where id in
+ update emis_site_account set del_flag='1' where id in
#{id}