diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCommissionProfit.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCommissionProfit.java
index 50e22945a..e7ff1a904 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCommissionProfit.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCommissionProfit.java
@@ -83,4 +83,7 @@ public class EmisCommissionProfit extends BaseEntity
/* 岗位类型 */
private String postType;
+ /* 销售联系人 */
+ private String salesmen;
+
}
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCommissionProfitServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCommissionProfitServiceImpl.java
index 64d0ffd44..2729f754f 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCommissionProfitServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCommissionProfitServiceImpl.java
@@ -463,7 +463,10 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
&& existingProfit.getBillMonth().equals(newProfit.getBillMonth())
&& StringUtils.equals(
StringUtils.isEmpty(existingProfit.getPostType()) ? "" : existingProfit.getPostType(),
- StringUtils.isEmpty(newProfit.getPostType()) ? "" : newProfit.getPostType())) {
+ StringUtils.isEmpty(newProfit.getPostType()) ? "" : newProfit.getPostType())
+ && StringUtils.equals(
+ StringUtils.isEmpty(existingProfit.getSalesmen()) ? "" : existingProfit.getSalesmen(),
+ StringUtils.isEmpty(newProfit.getSalesmen()) ? "" : newProfit.getSalesmen())) {
found = true;
break;
}
@@ -474,6 +477,7 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
zeroProfit.setEmpName(existingProfit.getEmpName());
zeroProfit.setBillMonth(existingProfit.getBillMonth());
zeroProfit.setPostType(existingProfit.getPostType());
+ zeroProfit.setSalesmen(existingProfit.getSalesmen());
zeroProfit.setMoney(BigDecimal.ZERO);
zeroProfit.setMonthMoney(BigDecimal.ZERO);
listProfit.add(zeroProfit);
diff --git a/emis-biz/src/main/resources/mapper/EmisCommissionProfitMapper.xml b/emis-biz/src/main/resources/mapper/EmisCommissionProfitMapper.xml
index 36e42e4fe..1b9af206a 100644
--- a/emis-biz/src/main/resources/mapper/EmisCommissionProfitMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisCommissionProfitMapper.xml
@@ -25,10 +25,11 @@
+
- select id, profit_no, emp_code, emp_name, bill_month, money,month_money, real_money, payed_money, bl_confirm_center, confirm_center_date, confirm_center_note, confirm_center_man_code, confirm_center_code, bl_confirm_site, confirm_site_date, confirm_site_man_code, confirm_site_note, confirm_site_code, post_type, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_commission_profit
+ select id, profit_no, emp_code, emp_name, bill_month, money,month_money, real_money, payed_money, bl_confirm_center, confirm_center_date, confirm_center_note, confirm_center_man_code, confirm_center_code, bl_confirm_site, confirm_site_date, confirm_site_man_code, confirm_site_note, confirm_site_code, post_type, salesmen, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_commission_profit
@@ -97,6 +103,7 @@
and emp_name=#{empName}
and bill_month=#{billMonth}
and post_type=#{postType}
+ and salesmen=#{salesmen}
and money = #{money}
and real_money = #{realMoney}
and payed_money = #{payedMoney}
@@ -132,12 +139,18 @@
and (post_type is null or post_type = '')
+
+
+ and salesmen = #{salesmen}
+
+
+ and (salesmen is null or salesmen = '')
limit 1
@@ -165,6 +178,7 @@
confirm_site_note,
confirm_site_code,
post_type,
+ salesmen,
remark,
del_flag,
create_by,
@@ -195,6 +209,7 @@
#{confirmSiteNote},
#{confirmSiteCode},
#{postType},
+ #{salesmen},
#{remark},
#{delFlag},
#{createBy},
@@ -227,6 +242,7 @@
confirm_site_note = #{confirmSiteNote},
confirm_site_code = #{confirmSiteCode},
post_type = #{postType},
+ salesmen = #{salesmen},
remark = #{remark},
del_flag = #{delFlag},
create_by = #{createBy},
@@ -248,6 +264,12 @@
and (post_type is null or post_type = '')
+
+ and salesmen = #{salesmen}
+
+
+ and (salesmen is null or salesmen = '')
+