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-14 06:12:53 +08:00
parent 718f6090e7
commit b3bb3a8c3d
3 changed files with 67 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisCommissionQuoteMapper.java
View File

@ -37,6 +37,16 @@ public interface EmisCommissionQuoteMapper extends BaseMapper<EmisCommissionQuot
public List<EmisCommissionQuote> selectEmisCommissionQuoteList(EmisCommissionQuote emisCommissionQuote);
/**
* 获取有效的报价
* @param emisCommissionQuote
* @return
*/
public List<EmisCommissionQuote> selectValidQuoteList(EmisCommissionQuote emisCommissionQuote);
/**
* 检查是否重复
*

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

@ -141,8 +141,9 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
emisCommissionQuote.setPostType("1");
emisCommissionQuote.setCountry(country);
emisCommissionQuote.setFromCountry(fromCountry);
// 获取提成方案
List<EmisCommissionQuote> listQuote = emisCommissionQuoteMapper.selectEmisCommissionQuoteList(emisCommissionQuote);
List<EmisCommissionQuote> listQuote = emisCommissionQuoteMapper.selectValidQuoteList(emisCommissionQuote);
if(!CollectionUtils.isEmpty(listQuote)){
for (EmisCommissionQuote quoteItem:listQuote) {
List<EmisCommissionExpression> exprList=quoteItem.getExprList();
@ -245,11 +246,11 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
String fromCountry=waybill.getSendCountry();
EmisCommissionQuote emisCommissionQuote = new EmisCommissionQuote();
emisCommissionQuote.setPostType("1");
emisCommissionQuote.setPostType("2");
emisCommissionQuote.setCountry(country);
emisCommissionQuote.setFromCountry(fromCountry);
// 获取提成方案
List<EmisCommissionQuote> listQuote = emisCommissionQuoteMapper.selectEmisCommissionQuoteList(emisCommissionQuote);
List<EmisCommissionQuote> listQuote = emisCommissionQuoteMapper.selectValidQuoteList(emisCommissionQuote);
if(!CollectionUtils.isEmpty(listQuote)){
for (EmisCommissionQuote quoteItem:listQuote) {
List<EmisCommissionExpression> exprList=quoteItem.getExprList();
@ -351,7 +352,6 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
return;
}
String takePieceEmployeeCode=waybill.getTakePieceEmployeeCode();
String operateEmployeeCode=waybill.getOperateEmployeeCode();
String billMonth= DateUtils.parseDateToStr(DateUtils.YYYY_MM,waybill.getSendDate());
@ -359,12 +359,14 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
String fromCountry=waybill.getSendCountry();
EmisCommissionQuote emisCommissionQuote = new EmisCommissionQuote();
emisCommissionQuote.setPostType("1");
emisCommissionQuote.setPostType("3");
emisCommissionQuote.setCountry(country);
emisCommissionQuote.setFromCountry(fromCountry);
emisCommissionQuote.setEmpCode(takePieceEmployeeCode);
// 获取提成方案
List<EmisCommissionQuote> listQuote = emisCommissionQuoteMapper.selectEmisCommissionQuoteList(emisCommissionQuote);
List<EmisCommissionQuote> listQuote = emisCommissionQuoteMapper.selectValidQuoteList(emisCommissionQuote);
if(!CollectionUtils.isEmpty(listQuote)){
for (EmisCommissionQuote quoteItem:listQuote) {
List<EmisCommissionExpression> exprList=quoteItem.getExprList();
@ -473,11 +475,11 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
String fromCountry=waybill.getSendCountry();
EmisCommissionQuote emisCommissionQuote = new EmisCommissionQuote();
emisCommissionQuote.setPostType("1");
emisCommissionQuote.setPostType("4");
emisCommissionQuote.setCountry(country);
emisCommissionQuote.setFromCountry(fromCountry);
// 获取提成方案
List<EmisCommissionQuote> listQuote = emisCommissionQuoteMapper.selectEmisCommissionQuoteList(emisCommissionQuote);
List<EmisCommissionQuote> listQuote = emisCommissionQuoteMapper.selectValidQuoteList(emisCommissionQuote);
if(!CollectionUtils.isEmpty(listQuote)){
for (EmisCommissionQuote quoteItem:listQuote) {
List<EmisCommissionExpression> exprList=quoteItem.getExprList();
@ -575,11 +577,11 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
String fromCountry=waybill.getSendCountry();
EmisCommissionQuote emisCommissionQuote = new EmisCommissionQuote();
emisCommissionQuote.setPostType("1");
emisCommissionQuote.setPostType("5");
emisCommissionQuote.setCountry(country);
emisCommissionQuote.setFromCountry(fromCountry);
// 获取提成方案
List<EmisCommissionQuote> listQuote = emisCommissionQuoteMapper.selectEmisCommissionQuoteList(emisCommissionQuote);
List<EmisCommissionQuote> listQuote = emisCommissionQuoteMapper.selectValidQuoteList(emisCommissionQuote);
if(!CollectionUtils.isEmpty(listQuote)){
for (EmisCommissionQuote quoteItem:listQuote) {
List<EmisCommissionExpression> exprList=quoteItem.getExprList();
@ -680,15 +682,16 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
String fromCountry=waybill.getSendCountry();
EmisCommissionQuote emisCommissionQuote = new EmisCommissionQuote();
emisCommissionQuote.setPostType("1");
emisCommissionQuote.setPostType("6");
emisCommissionQuote.setCountry(country);
emisCommissionQuote.setFromCountry(fromCountry);
emisCommissionQuote.setEmpName(salesmen);
emisCommissionQuote.getParams().put("sendDate",waybill.getSendDate());
emisCommissionQuote.getParams().put("validDate",waybill.getSendDate());
// 获取提成方案
List<EmisCommissionQuote> listQuote = emisCommissionQuoteMapper.selectEmisCommissionQuoteList(emisCommissionQuote);
List<EmisCommissionQuote> listQuote = emisCommissionQuoteMapper.selectValidQuoteList(emisCommissionQuote);
if(!CollectionUtils.isEmpty(listQuote)){
for (EmisCommissionQuote quoteItem:listQuote) {
List<EmisCommissionExpression> exprList=quoteItem.getExprList();
@ -787,11 +790,14 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
String fromCountry=waybill.getSendCountry();
EmisCommissionQuote emisCommissionQuote = new EmisCommissionQuote();
emisCommissionQuote.setPostType("1");
emisCommissionQuote.setPostType("7");
emisCommissionQuote.setCountry(country);
emisCommissionQuote.setFromCountry(fromCountry);
emisCommissionQuote.getParams().put("validDate",waybill.getSendDate());
// 获取提成方案
List<EmisCommissionQuote> listQuote = emisCommissionQuoteMapper.selectEmisCommissionQuoteList(emisCommissionQuote);
List<EmisCommissionQuote> listQuote = emisCommissionQuoteMapper.selectValidQuoteList(emisCommissionQuote);
if(!CollectionUtils.isEmpty(listQuote)){
for (EmisCommissionQuote quoteItem:listQuote) {
List<EmisCommissionExpression> exprList=quoteItem.getExprList();
@ -894,11 +900,13 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
String fromCountry=waybill.getSendCountry();
EmisCommissionQuote emisCommissionQuote = new EmisCommissionQuote();
emisCommissionQuote.setPostType("1");
emisCommissionQuote.setPostType("8");
emisCommissionQuote.setCountry(country);
emisCommissionQuote.setFromCountry(fromCountry);
emisCommissionQuote.getParams().put("validDate",waybill.getSendDate());
// 获取提成方案
List<EmisCommissionQuote> listQuote = emisCommissionQuoteMapper.selectEmisCommissionQuoteList(emisCommissionQuote);
List<EmisCommissionQuote> listQuote = emisCommissionQuoteMapper.selectValidQuoteList(emisCommissionQuote);
if(!CollectionUtils.isEmpty(listQuote)){
for (EmisCommissionQuote quoteItem:listQuote) {
List<EmisCommissionExpression> exprList=quoteItem.getExprList();

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

@ -40,6 +40,9 @@
<include refid="selectEmisCommissionQuoteVo"/>
<where>
del_flag='0'
<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>
@ -56,10 +59,37 @@
<if test="transLineCode != null and transLineCode != ''"> and trans_line_code=#{transLineCode} </if>
<if test="prodCode != null and prodCode != ''"> and FIND_IN_SET(#{prodCode},prod_code) </if>
<if test="params.sendDate != null ">
and start_date <![CDATA[ <= ]]> #{params.sendDate} and end_date <![CDATA[ > ]]> #{params.sendDate} and bl_open='1'
</where>
order by create_time desc
</select>
<select id="selectValidQuoteList" parameterType="EmisCommissionQuote" resultMap="EmisCommissionQuoteResult">
<include refid="selectEmisCommissionQuoteVo"/>
<where>
del_flag='0'
and bl_open='1'
<if test="params.validDate != null ">
and start_date <![CDATA[ <= ]]> #{params.validDate} and end_date <![CDATA[ > ]]> #{params.validDate}
</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')</if>
<if test="country != null and country != ''"> and ( FIND_IN_SET(#{country},country) or country='-1' ) </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 ( 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} </if>
<if test="prodCode != null and prodCode != ''"> and FIND_IN_SET(#{prodCode},prod_code) </if>
</where>
order by create_time desc
</select>