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 2025-05-11 11:17:42 +08:00
parent e92655c7da
commit 38a642610c
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
emis-biz/src/main/resources/mapper/EmisSettlePayRecordMapper.xml
View File

@ -95,7 +95,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="recType != null and recType != ''"> and rec_type = #{recType}</if> <if test="recType != null and recType != ''"> and rec_type = #{recType}</if>
<if test="payMan != null and payMan != ''"> and pay_man like concat('%', #{payMan}, '%')</if> <if test="payMan != null and payMan != ''"> and pay_man like concat('%', #{payMan}, '%')</if>
<if test="payManCode != null and payManCode != ''"> and pay_man_code like concat('%', #{payManCode}, '%')</if> <if test="payManCode != null and payManCode != ''"> and pay_man_code like concat('%', #{payManCode}, '%')</if>
<if test="settleBillNo != null and settleBillNo != ''"> and settle_bill_no = #{settleBillNo}</if>
<if test="blAudit != null and blAudit != ''"> and bl_audit = #{blAudit}</if> <if test="blAudit != null and blAudit != ''"> and bl_audit = #{blAudit}</if>
<if test="auditDate != null "> and audit_date = #{auditDate}</if> <if test="auditDate != null "> and audit_date = #{auditDate}</if>
<if test="auditManCode != null and auditManCode != ''"> and audit_man_code = #{auditManCode}</if> <if test="auditManCode != null and auditManCode != ''"> and audit_man_code = #{auditManCode}</if>
@ -153,13 +153,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</if> </if>
<if test="params.billCode != null and params.billCode != ''"> <if test="params.billCode != null and params.billCode != ''">
and settle_bill_no in( and pay_id in(
select bill_no from emis_settle_sub_bill b select pay_id from emis_settle_pay_rel espr
where del_flag='0' where espr.del_flag='0'
and ( FIND_IN_SET(b.`bill_code`,#{params.billCode}) or b.bill_code like concat('%', #{params.billCode}, '%') ) and FIND_IN_SET(espr.`bill_code`,#{params.billCode})
) )
</if> </if>
<if test="settleBillNo != null and settleBillNo != ''">
and pay_id in(
select pay_id from emis_settle_pay_bill_rel espbr
where espbr.del_flag='0'
and FIND_IN_SET(espbr.settle_bill_no,#{settleBillNo})
)
</if>
<if test="params.privSiteCode != null and params.privSiteCode != '88888'"> <if test="params.privSiteCode != null and params.privSiteCode != '88888'">
and settle_bill_no in( and settle_bill_no in(

12
emis-biz/src/main/resources/mapper/EmisSpecialCalcWeightMapper.xml
View File

@ -154,8 +154,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where del_flag='0' where del_flag='0'
<if test="id != null"> and id!=#{id} </if> <if test="id != null"> and id!=#{id} </if>
and prod_code = #{prodCode} and prod_code = #{prodCode}
and and (
(
( begin_weight <![CDATA[< ]]> #{beginWeight} and #{beginWeight} <![CDATA[<= ]]> end_weight ) ( begin_weight <![CDATA[< ]]> #{beginWeight} and #{beginWeight} <![CDATA[<= ]]> end_weight )
or ( begin_weight <![CDATA[< ]]> #{endWeight} and #{endWeight} <![CDATA[<= ]]> end_weight ) or ( begin_weight <![CDATA[< ]]> #{endWeight} and #{endWeight} <![CDATA[<= ]]> end_weight )
) )
@ -171,11 +170,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="getValidSpecialCalcWeight" resultMap="EmisSpecialCalcWeightResult"> <select id="getValidSpecialCalcWeight" resultMap="EmisSpecialCalcWeightResult">
select id, prod_code, prod_name, country, trans_line_code, status, carry_type, begin_weight, end_weight, begin_date, end_date, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site select id, prod_code, prod_name, country, trans_line_code, status, carry_type, begin_weight, end_weight, begin_date, end_date, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
from emis_special_calc_weight a from emis_special_calc_weight a
where del_flag='0' where del_flag='0' and prod_code = #{prodCode}
and prod_code = #{prodCode} and ( begin_weight <![CDATA[ < ]]> #{weight} and #{weight} <![CDATA[ <= ]]> end_weight )
and ( begin_weight <![CDATA[< ]]> #{weight} and #{weight} <![CDATA[<= ]]> end_weight ) and ( begin_date <![CDATA[ < ]]> #{sendDate} and #{sendDate} <![CDATA[ <= ]]> end_date )
and ( begin_date <![CDATA[< ]]> #{sendDate} and #{sendDate} <![CDATA[<= ]]> end_date ) limit 1
limit 1
</select> </select>
</mapper> </mapper>