aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-11-13 09:27:39 +08:00
parent 38c63cc627
commit 530c9e7a3d
3 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleSubBillController.java
View File

@ -74,7 +74,6 @@ public class EmisSettleSubBillController extends EmisBaseController
{ {
startPage(); startPage();
setPrivParams(emisSettleSubBill); setPrivParams(emisSettleSubBill);
if(!StringUtils.isEmpty(emisSettleSubBill.getBillCode())){ if(!StringUtils.isEmpty(emisSettleSubBill.getBillCode())){
@ -120,8 +119,6 @@ public class EmisSettleSubBillController extends EmisBaseController
@GetMapping("/getQueryStatInfoMap") @GetMapping("/getQueryStatInfoMap")
public AjaxResult getQueryStatInfoMap(EmisSettleSubBill emisSettleSubBill) public AjaxResult getQueryStatInfoMap(EmisSettleSubBill emisSettleSubBill)
{ {
setPrivParams(emisSettleSubBill); setPrivParams(emisSettleSubBill);
if(!org.apache.commons.lang3.StringUtils.isEmpty(emisSettleSubBill.getBillCode())){ if(!org.apache.commons.lang3.StringUtils.isEmpty(emisSettleSubBill.getBillCode())){

1
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCommissionProfitServiceImpl.java
View File

@ -89,7 +89,6 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
} }
} }
} }
} }

23
emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml
View File

@ -199,6 +199,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="blMerge != null and blMerge != ''"> and b.bl_merge=#{blMerge}</if> <if test="blMerge != null and blMerge != ''"> and b.bl_merge=#{blMerge}</if>
<if test="paymentStatus != null and paymentStatus != ''">
and b.payment_status=#{paymentStatus}
</if>
<if test="openBillStatus != null and openBillStatus != ''">
and b.open_bill_status=#{openBillStatus}
</if>
<if test="params.mergeStatus != null and params.mergeStatus == 1"> <if test="params.mergeStatus != null and params.mergeStatus == 1">
@ -345,6 +352,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="blMerge != null and blMerge != ''"> and b.bl_merge=#{blMerge}</if> <if test="blMerge != null and blMerge != ''"> and b.bl_merge=#{blMerge}</if>
<if test="paymentStatus != null and paymentStatus != ''">
and b.payment_status=#{paymentStatus}
</if>
<if test="openBillStatus != null and openBillStatus != ''">
and b.open_bill_status=#{openBillStatus}
</if>
<if test="params.mergeStatus != null and params.mergeStatus == 1"> <if test="params.mergeStatus != null and params.mergeStatus == 1">
and b.bl_merge='0' and b.bl_merge='0'
and b.bl_confirm_center='1' and b.bl_confirm_center='1'
@ -481,6 +496,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="blMerge != null and blMerge != ''"> and b.bl_merge=#{blMerge}</if> <if test="blMerge != null and blMerge != ''"> and b.bl_merge=#{blMerge}</if>
<if test="paymentStatus != null and paymentStatus != ''">
and b.payment_status=#{paymentStatus}
</if>
<if test="openBillStatus != null and openBillStatus != ''">
and b.open_bill_status=#{openBillStatus}
</if>
<if test="params.mergeStatus != null and params.mergeStatus == 1"> <if test="params.mergeStatus != null and params.mergeStatus == 1">
and b.bl_merge='0' and b.bl_merge='0'
and b.bl_confirm_center='1' and b.bl_confirm_center='1'