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-11 14:00:08 +08:00
parent 231f5ec5dd
commit d14d8feb44
3 changed files with 15 additions and 22 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

@ -531,7 +531,7 @@ public class EmisSettleSubBillController extends EmisBaseController
// 目的地是中国时需要 4天后才可以确认
if("0086".equals(oldSubBill.getWaybillDetail().getReceiveCountry())
if(!"0086".equals(oldSubBill.getWaybillDetail().getSendCountry()) && "0086".equals(oldSubBill.getWaybillDetail().getReceiveCountry())
&& (
"2".equals(oldSubBill.getWaybillDetail().getPaymentType())
|| "4".equals(oldSubBill.getWaybillDetail().getPaymentType())

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

@ -83,10 +83,10 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
if(!CollectionUtils.isEmpty(listQuote)){
for (EmisCommissionQuote quoteItem:listQuote) {
List<EmisCommissionExpression> exprList=quoteItem.getExprList();
// 按票计算方式
if("1".equals(quoteItem.getCalcType())){
}

33
emis-biz/src/main/resources/mapper/EmisCommissionQuoteMapper.xml
View File

@ -43,27 +43,20 @@
<if test="quoteId != null "> and quote_id = #{quoteId}</if>
<if test="quoteCode != null and quoteCode != ''"> and quote_code like concat('%', #{quoteCode}, '%')</if>
<if test="quoteName != null and quoteName != ''"> and quote_name like concat('%', #{quoteName}, '%')</if>
<if test="fromCountry != null and fromCountry != ''"> and from_country like concat('%', #{fromCountry}, '%')</if>
<if test="country != null and country != ''"> and country like concat('%', #{country}, '%')</if>
<if test="feeType != null and feeType != ''"> and fee_type like concat('%', #{feeType}, '%')</if>
<if test="calcType != null and calcType != ''"> and calc_type like concat('%', #{calcType}, '%')</if>
<if test="postType != null and postType != ''"> and post_type like concat('%', #{postType}, '%')</if>
<if test="transType != null and transType != ''"> and trans_type like concat('%', #{transType}, '%')</if>
<if test="blOpen != null and blOpen != ''"> and bl_open like concat('%', #{blOpen}, '%')</if>
<if test="empCode != null and empCode != ''"> and emp_code like concat('%', #{empCode}, '%')</if>
<if test="fromCountry != null and fromCountry != ''"> and FIND_IN_SET(#{fromCountry},from_country)</if>
<if test="country != null and country != ''"> and FIND_IN_SET(#{country},country)</if>
<if test="feeType != null and feeType != ''"> and fee_type=#{feeType}</if>
<if test="calcType != null and calcType != ''"> and calc_type=#{calcType}</if>
<if test="postType != null and postType != ''"> and post_type=#{postType}</if>
<if test="transType != null and transType != ''"> and trans_type=#{transType}</if>
<if test="blOpen != null and blOpen != ''"> and bl_open=#{blOpen}</if>
<if test="empCode != null and empCode != ''"> and emp_code=#{empCode}</if>
<if test="empName != null and empName != ''"> and emp_name like concat('%', #{empName}, '%')</if>
<if test="startDate != null "> and start_date = #{startDate}</if>
<if test="endDate != null "> and end_date = #{endDate}</if>
<if test="priorityLevel != null "> and priority_level = #{priorityLevel}</if>
<if test="remark != null and remark != ''"> and remark like concat('%', #{remark}, '%')</if>
<if test="tenantId != null and tenantId != ''"> and tenant_id like concat('%', #{tenantId}, '%')</if>
<if test="delFlag != null and delFlag != ''"> and del_flag like concat('%', #{delFlag}, '%')</if>
<if test="createBy != null and createBy != ''"> and create_by like concat('%', #{createBy}, '%')</if>
<if test="createTime != null "> and create_time = #{createTime}</if>
<if test="updateBy != null and updateBy != ''"> and update_by like concat('%', #{updateBy}, '%')</if>
<if test="updateTime != null "> and update_time = #{updateTime}</if>
<if test="createSite != null and createSite != ''"> and create_site like concat('%', #{createSite}, '%')</if>
<if test="updateSite != null and updateSite != ''"> and update_site like concat('%', #{updateSite}, '%')</if>
<if test="params.sendDate != null ">
and start_date <![CDATA[ <= ]]> now() and end_date <![CDATA[ > ]]> now() and bl_open='1'
</if>
</where>
order by create_time desc
</select>