demand: 临时额度界面自测微调

committer: heyu

emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTempCreditSalesmenServiceImpl.java

@@ -57,9 +57,6 @@ public class EmisTempCreditSalesmenServiceImpl implements IEmisTempCreditSalesme
         // 校验临时额度时间连续性
         validateTempCreditTimeContinuity(emisTempCreditSalesmen);
 
-        // 设置销售员
-        emisTempCreditSalesmen.setSalesmen(creditInfo.getSalesmen());
-
         int rows = emisTempCreditSalesmenMapper.insertEmisTempCreditSalesmen(emisTempCreditSalesmen);
         return rows;
     }

emis-biz/src/main/resources/mapper/EmisTempCreditCustomerMapper.xml

@@ -30,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="startDate != null "> and t.start_date = #{startDate}</if>
             <if test="endDate != null "> and t.end_date = #{endDate}</if>
             <if test="transType != null  and transType != ''"> and FIND_IN_SET(#{transType},c.trans_type)</if>
-            <if test="customerName != null and customerName != ''"> and d.customer_name like concat('%', #{customerName}, '%')</if>
+            <if test="customerName != null and customerName != ''"> and d.customer_name = #{customerName}</if>
             and t.del_flag = '0'
         </where>
         order by t.create_time desc

emis-biz/src/main/resources/mapper/EmisTempCreditSalesmenMapper.xml

@@ -5,7 +5,6 @@
     <resultMap type="com.xdadan.erp.emis.domain.EmisTempCreditSalesmen" id="EmisTempCreditSalesmenResult" extends="com.xdadan.erp.emis.mapper.EmisBaseMapper.EmisBaseResult">
         <result property="id" column="id"/>
         <result property="accCode" column="acc_code"/>
-        <result property="salesmen" column="salesmen"/>
         <result property="tempCreditMoneyAdjust" column="temp_credit_money_adjust"/>
         <result property="startDate" column="start_date"/>
         <result property="endDate" column="end_date"/>
@@ -13,15 +12,15 @@
     </resultMap>
 
     <sql id="selectEmisTempCreditSalesmenVo">
-        select t.id, t.acc_code, t.salesmen, t.temp_credit_money_adjust,
+        select t.id, t.acc_code, t.temp_credit_money_adjust,
                t.start_date, t.end_date, t.del_flag, t.create_by, t.create_time,
-               t.update_by, t.update_time, t.remark, t.create_site, t.update_site,c.trans_type
+               t.update_by, t.update_time, t.remark, t.create_site, t.update_site, c.trans_type, c.salesmen
         from emis_temp_credit_salesmen t
         left join emis_credit_salesmen c on t.acc_code = c.acc_code and c.del_flag = '0'
     </sql>
 
     <select id="selectCreditSalesmenInfo" parameterType="com.xdadan.erp.emis.domain.EmisCreditSalesmen" resultType="com.xdadan.erp.emis.domain.EmisCreditSalesmen">
-        select id, acc_code, salesmen, credit_money, use_money, over_term_money,
+        select id, acc_code, credit_money, use_money, over_term_money,
                in_term_money, currency, trans_type, start_date, end_date, bl_open,
                remark, tenant_id, del_flag, create_by, create_time, update_by,
                update_time, create_site, update_site
@@ -39,12 +38,13 @@
             <if test="accCode != null and accCode != ''">
                 AND t.acc_code = #{accCode}
             </if>
-            <if test="salesmen != null and salesmen != ''">
+
-                AND t.salesmen = #{salesmen}
-            </if>
             <if test="tempCreditMoneyAdjust != null ">
                 AND t.temp_credit_money_adjust = #{tempCreditMoneyAdjust}
             </if>
+            <if test="salesmen != null and salesmen != ''">
+                AND c.salesmen = #{salesmen}
+            </if>
             <if test="transType != null  and transType != ''">
                 AND FIND_IN_SET(#{transType},c.trans_type)</if>
             <if test="startDate != null">
@@ -66,7 +66,6 @@
         insert into emis_temp_credit_salesmen
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="accCode != null">acc_code,</if>
-            <if test="salesmen != null">salesmen,</if>
             <if test="tempCreditMoneyAdjust != null">temp_credit_money_adjust,</if>
             <if test="startDate != null">start_date,</if>
             <if test="endDate != null">end_date,</if>
@@ -81,7 +80,6 @@
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="accCode != null">#{accCode},</if>
-            <if test="salesmen != null">#{salesmen},</if>
             <if test="tempCreditMoneyAdjust != null">#{tempCreditMoneyAdjust},</if>
             <if test="startDate != null">#{startDate},</if>
             <if test="endDate != null">#{endDate},</if>
@@ -100,7 +98,6 @@
         update emis_temp_credit_salesmen
         <trim prefix="SET" suffixOverrides=",">
             <if test="accCode != null">acc_code = #{accCode},</if>
-            <if test="salesmen != null">salesmen = #{salesmen},</if>
             <if test="tempCreditMoneyAdjust != null">temp_credit_money_adjust = #{tempCreditMoneyAdjust},</if>
             <if test="startDate != null">start_date = #{startDate},</if>
             <if test="endDate != null">end_date = #{endDate},</if>