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

Merge pull request 'demand: TMS系统 - 提成管理 - 员工提成方案配置 增加根据日期查询功能 员工提成方案配置新增/修改/批量修改增加验重逻辑' (#119) from develop into master

Browse Source 
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/119
This commit is contained in:
heyu 2025-07-14 17:26:33 +08:00
commit db0788ae77
2 changed files with 56 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCommissionQuoteServiceImpl.java
View File

@ -212,6 +212,15 @@ public class EmisCommissionQuoteServiceImpl implements IEmisCommissionQuoteServi
if (emisCommissionQuote.getBlOpen() == null) {
emisCommissionQuote.setBlOpen(dbQuote.getBlOpen());
}
if (emisCommissionQuote.getTransLineCode() == null) {
emisCommissionQuote.setTransLineCode(dbQuote.getTransLineCode());
}
if (emisCommissionQuote.getProdCode() == null) {
emisCommissionQuote.setProdCode(dbQuote.getProdCode());
}
if (emisCommissionQuote.getBlOpen() == null) {
emisCommissionQuote.setBlOpen(dbQuote.getBlOpen());
}
if (emisCommissionQuote.getEmpCode() == null) {
emisCommissionQuote.setEmpCode(dbQuote.getEmpCode());
}

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

@ -261,73 +261,56 @@
<where>
del_flag='0'
<if test="quoteId != null and quoteId != ''">
and quote_id != #{quoteId}
and quote_id != #{quoteId}
</if>
and (
(start_date <![CDATA[ <= ]]> #{startDate} and #{startDate} <![CDATA[ < ]]> end_date)
or
(start_date <![CDATA[ < ]]> #{endDate} and #{endDate} <![CDATA[ <= ]]> end_date)
or
(start_date <![CDATA[ >= ]]> #{startDate} and end_date <![CDATA[ <= ]]> #{endDate})
start_date &lt;= #{endDate} and end_date &gt;= #{startDate}
)
and (
emp_code = #{empCode}
or FIND_IN_SET(#{empCode}, emp_code)
or FIND_IN_SET(emp_code, #{empCode})
or emp_code='-1'
)
and (
emp_name = #{empName}
or FIND_IN_SET(#{empName}, emp_name)
or FIND_IN_SET(emp_name, #{empName})
or emp_name='全部'
)
and fee_type=#{feeType}
and bl_open=#{blOpen}
and calc_type=#{calcType}
and post_type=#{postType}
and (
trans_type = #{transType}
or FIND_IN_SET(#{transType}, trans_type)
or FIND_IN_SET(trans_type, #{transType})
)
and (
from_country = #{fromCountry}
or FIND_IN_SET(#{fromCountry}, from_country)
or FIND_IN_SET(from_country, #{fromCountry})
or from_country='-1'
)
and (
country = #{country}
or FIND_IN_SET(#{country}, country)
or FIND_IN_SET(country, #{country})
or country='-1'
)
and (
trans_line_code = #{transLineCode}
or FIND_IN_SET(#{transLineCode}, trans_line_code)
or FIND_IN_SET(trans_line_code, #{transLineCode})
or trans_line_code='-1'
)
and (
prod_code = #{prodCode}
or FIND_IN_SET(#{prodCode}, prod_code)
or FIND_IN_SET(prod_code, #{prodCode})
or prod_code='-1'
)
<if test="empCode != null and empCode != ''">
and (
emp_code = #{empCode}
or FIND_IN_SET(#{empCode}, emp_code)
or FIND_IN_SET(emp_code, #{empCode})
or emp_code='-1'
)
</if>
<if test="empName != null and empName != ''">
and (
emp_name = #{empName}
or FIND_IN_SET(#{empName}, emp_name)
or FIND_IN_SET(emp_name, #{empName})
or emp_name='全部'
)
</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}
or FIND_IN_SET(#{transType}, trans_type)
or FIND_IN_SET(trans_type, #{transType})
)
</if>
<if test="fromCountry != null and fromCountry != ''">
and (
from_country = #{fromCountry}
or FIND_IN_SET(#{fromCountry}, from_country)
or FIND_IN_SET(from_country, #{fromCountry})
or from_country='-1'
)
</if>
<if test="country != null and country != ''">
and (
country = #{country}
or FIND_IN_SET(#{country}, country)
or FIND_IN_SET(country, #{country})
or country='-1'
)
</if>
<if test="transLineCode != null and transLineCode != ''">
and (
trans_line_code = #{transLineCode}
or FIND_IN_SET(#{transLineCode}, trans_line_code)
or FIND_IN_SET(trans_line_code, #{transLineCode})
or trans_line_code='-1'
)
</if>
<if test="prodCode != null and prodCode != ''">
and (
prod_code = #{prodCode}
or FIND_IN_SET(#{prodCode}, prod_code)
or FIND_IN_SET(prod_code, #{prodCode})
or prod_code='-1'
)
</if>
</where>
order by create_time desc
</select>