diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleSubBillController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleSubBillController.java
index edcd287b0..b2664b9a2 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleSubBillController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleSubBillController.java
@@ -74,7 +74,6 @@ public class EmisSettleSubBillController extends EmisBaseController
{
startPage();
-
setPrivParams(emisSettleSubBill);
if(!StringUtils.isEmpty(emisSettleSubBill.getBillCode())){
@@ -120,8 +119,6 @@ public class EmisSettleSubBillController extends EmisBaseController
@GetMapping("/getQueryStatInfoMap")
public AjaxResult getQueryStatInfoMap(EmisSettleSubBill emisSettleSubBill)
{
-
-
setPrivParams(emisSettleSubBill);
if(!org.apache.commons.lang3.StringUtils.isEmpty(emisSettleSubBill.getBillCode())){
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCommissionProfitServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCommissionProfitServiceImpl.java
index 17c222b60..459b8dd9f 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCommissionProfitServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCommissionProfitServiceImpl.java
@@ -89,7 +89,6 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
}
-
}
}
}
diff --git a/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml
index e17cae4d7..e601fd5b7 100644
--- a/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml
@@ -199,6 +199,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and b.bl_merge=#{blMerge}
+
+ and b.payment_status=#{paymentStatus}
+
+
+
+ and b.open_bill_status=#{openBillStatus}
+
@@ -345,6 +352,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and b.bl_merge=#{blMerge}
+
+ and b.payment_status=#{paymentStatus}
+
+
+
+ and b.open_bill_status=#{openBillStatus}
+
+
and b.bl_merge='0'
and b.bl_confirm_center='1'
@@ -481,6 +496,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and b.bl_merge=#{blMerge}
+
+ and b.payment_status=#{paymentStatus}
+
+
+
+ and b.open_bill_status=#{openBillStatus}
+
+
and b.bl_merge='0'
and b.bl_confirm_center='1'