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-09-23 17:27:14 +08:00
parent 07d124a2f0
commit ec1865db85
7 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -106,7 +106,7 @@ public class EmisSettleSubBillController extends EmisBaseController
{
List<Map> list=null;
if(!StringUtils.isEmpty(emisSettleSubBill.getSettleBillNo())){
list = emisSettleSubBillService.selectHasPayeMapList(WaybillHelper.formatQueryValue(emisSettleSubBill.getSettleBillNo()));
list = emisSettleSubBillService.selectHasPayMapList(WaybillHelper.formatQueryValue(emisSettleSubBill.getSettleBillNo()));
}else{
list = new ArrayList<>();
}

2
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java
View File

@ -599,8 +599,6 @@ public class EmisWaybill extends BaseEntity
@TableField(exist = false)
private String problemTypeName;
// 最近一条扫描记录
@TableField(exist = false)
private EmisTmsScanRecord lastScanRecord;

5
emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisSettlePayRelMapper.java
View File

@ -14,6 +14,7 @@ import java.util.List;
import java.util.Map;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.xdadan.erp.emis.domain.EmisSettleInvoiceRel;
import com.xdadan.erp.emis.domain.EmisSettlePayRel;
/**
* @ClassName EmisSettlePayRelMapper
@ -30,10 +31,10 @@ public interface EmisSettlePayRelMapper extends BaseMapper<EmisSettlePayRel>
*/
public EmisSettlePayRel selectEmisSettlePayRelById(Long id);
public List<EmisSettlePayRel> selectHasPayListBySettleBillNo(String settleBillNo);
public List<Map> selectHasPayMapList(String settleBillNo);
/**
* 查询列表
*

2
emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisSettleSubBillService.java
View File

@ -41,7 +41,7 @@ public interface IEmisSettleSubBillService
public List<Map> selectHasOpenInvoiceMapList(String settleBillNo);
public List<Map> selectHasPayeMapList(String settleBillNo);
public List<Map> selectHasPayMapList(String settleBillNo);
/**

2
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleSubBillServiceImpl.java
View File

@ -75,7 +75,7 @@ public class EmisSettleSubBillServiceImpl implements IEmisSettleSubBillService
@Override
public List<Map> selectHasPayeMapList(String settleBillNo)
public List<Map> selectHasPayMapList(String settleBillNo)
{
return emisSettlePayRelMapper.selectHasPayMapList(settleBillNo);
}

4
emis-biz/src/main/resources/mapper/EmisSettleInvoiceRelMapper.xml
View File

@ -90,7 +90,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND FIND_IN_SET( x2.settle_bill_no, #{settleBillNo})
)
AND EXISTS (
select 1 from emis_settle_sub_bill essb where a.bill_no=essb.bill_no and essb.del_flag='0' and essb.settle_bill_no=#{settleBillNo}
select 1 from emis_settle_sub_bill essb where a.bill_no=essb.bill_no and essb.del_flag='0' and FIND_IN_SET( essb.settle_bill_no, #{settleBillNo})
)
</select>
@ -109,7 +109,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND FIND_IN_SET( x2.settle_bill_no, #{settleBillNo})
)
AND EXISTS (
select 1 from emis_settle_sub_bill essb where a.bill_no=essb.bill_no and essb.del_flag='0' and essb.settle_bill_no=#{settleBillNo}
select 1 from emis_settle_sub_bill essb where a.bill_no=essb.bill_no and essb.del_flag='0' and FIND_IN_SET( essb.settle_bill_no, #{settleBillNo})
)
group by bill_no
</select>

22
emis-biz/src/main/resources/mapper/EmisSettlePayRelMapper.xml
View File

@ -34,6 +34,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
order by create_time desc
</select>
<select id="selectHasPayListBySettleBillNo" parameterType="String" resultMap="EmisSettlePayRelResult">
select id, pay_id, bill_no, pay_money, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
from emis_settle_pay_rel a
where del_flag='0'
AND pay_id IN (
SELECT x1.pay_id FROM
emis_settle_pay_record x1,
emis_settle_bill x2
WHERE
x1.del_flag = '0'
AND x2.del_flag = '0'
AND FIND_IN_SET( x2.settle_bill_no, x1.settle_bill_no )
AND FIND_IN_SET( x2.settle_bill_no, #{settleBillNo})
)
AND EXISTS (
select 1 from emis_settle_sub_bill essb where a.bill_no=essb.bill_no and essb.del_flag='0' and FIND_IN_SET( essb.settle_bill_no, #{settleBillNo})
)
</select>
<select id="selectHasPayMapList" parameterType="String" resultType="map">
select bill_no as billNo, sum(pay_money) sumMoney
from emis_settle_pay_rel a
@ -49,7 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND FIND_IN_SET( x2.settle_bill_no, #{settleBillNo})
)
AND EXISTS (
select 1 from emis_settle_sub_bill essb where a.bill_no=essb.bill_no and essb.del_flag='0' and essb.settle_bill_no=#{settleBillNo}
select 1 from emis_settle_sub_bill essb where a.bill_no=essb.bill_no and essb.del_flag='0' and FIND_IN_SET( essb.settle_bill_no, #{settleBillNo})
)
group by bill_no
</select>