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-15 08:07:17 +08:00
parent 85b3d2f88f
commit fa91607137
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -495,12 +495,12 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
}
}else{
log.error("网点客服未配置表达式");
log.error("未配置表达式");
}
}
}else{
log.error("网点客服无报价");
log.error("无报价");
}
}

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

@ -75,8 +75,8 @@
</if>
<if test="quoteName != null and quoteName != ''"> and quote_name like concat('%', #{quoteName}, '%')</if>
<if test="fromCountry != null and fromCountry != ''"> and ( FIND_IN_SET(#{fromCountry},from_country) or from_country='-1' or from_country is null)</if>
<if test="country != null and country != ''"> and ( FIND_IN_SET(#{country},country) or country='-1' or country is null) </if>
<if test="fromCountry != null and fromCountry != ''"> and ( FIND_IN_SET(#{fromCountry},from_country) or from_country='-1' or from_country is null or from_country='')</if>
<if test="country != null and country != ''"> and ( FIND_IN_SET(#{country},country) or country='-1' or country is null or 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>
@ -85,8 +85,8 @@
<if test="empCode != null and empCode != ''"> and ( FIND_IN_SET(#{empCode},emp_code) or emp_code='-1')</if>
<if test="empName != null and empName != ''"> and ( FIND_IN_SET(#{empName},emp_name) or emp_name='全部') </if>
<if test="transLineCode != null and transLineCode != ''"> and ( trans_line_code=#{transLineCode} or trans_line_code is null) </if>
<if test="prodCode != null and prodCode != ''"> and ( FIND_IN_SET(#{prodCode},prod_code) or prod_code is null) </if>
<if test="transLineCode != null and transLineCode != ''"> and ( trans_line_code=#{transLineCode} or trans_line_code is null or trans_line_code='') </if>
<if test="prodCode != null and prodCode != ''"> and ( FIND_IN_SET(#{prodCode},prod_code) or prod_code is null or prod_code='') </if>
</where>
order by create_time desc