导单

watero-rst-core/src/main/java/com.iamberry.rst.core/dm/DmDealer.java

@@ -45,6 +45,8 @@ public class DmDealer  implements  Serializable{
     private Date coopAgreeBeforeDate;
     //合同结束日期
     private Date coopAgreeEndDate;
+    //店铺名称
+    private String storeName;
 
     //对接人
     private List<DealerContact> dealerContactList = new ArrayList<>();
@@ -214,4 +216,12 @@ public class DmDealer  implements  Serializable{
     public void setCoopAgreeEndDate(Date coopAgreeEndDate) {
         this.coopAgreeEndDate = coopAgreeEndDate;
     }
+
+    public String getStoreName() {
+        return storeName;
+    }
+
+    public void setStoreName(String storeName) {
+        this.storeName = storeName;
+    }
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/dm/mapper/dmDealerMapper.xml

@@ -64,19 +64,23 @@
 
     <select id="listDmDealerPage" resultMap="BaseResultMap" parameterType="DmDealer" >
         select
-        <include refid="Base_List" />,
+            <include refid="Base_List" />,
         cax.coop_agree_before_date,
         cax2.coop_agree_end_date,
         SUM(fr.fr_amount) AS  frAmount,
         sa.admin_name AS adminName
         from tb_rst_dm_dealer t
         LEFT JOIN (
-          SELECT ca.dealer_id,MIN(ca.coop_agree_before_date) AS coop_agree_before_date FROM tb_rst_dm_cooperation_agree ca GROUP BY ca.dealer_id
+            SELECT ca.dealer_id,MIN(ca.coop_agree_before_date) AS coop_agree_before_date FROM tb_rst_dm_cooperation_agree ca GROUP BY ca.dealer_id
         )cax ON cax.dealer_id = t.dealer_id
         LEFT JOIN (
-        SELECT ca2.dealer_id,MAX(ca2.coop_agree_end_date) AS coop_agree_end_date FROM tb_rst_dm_cooperation_agree ca2 GROUP BY ca2.dealer_id
+            SELECT ca2.dealer_id,MAX(ca2.coop_agree_end_date) AS coop_agree_end_date FROM tb_rst_dm_cooperation_agree ca2 GROUP BY ca2.dealer_id
         )cax2 ON cax2.dealer_id = t.dealer_id
         LEFT JOIN tb_rst_dm_financial_receipt fr ON t.dealer_id = fr.dealer_id
+
+      /*  LEFT JOIN tb_rst_dm_dealer_channel dc ON t.dealer_id = dc.dealer_id
+        LEFT JOIN tb_rst_store_info si ON t.dealer_id = si.dealer_id
+*/
         LEFT JOIN tb_rst_sys_admin sa ON t.create_id = sa.admin_id
         <where>
             <if test="dealerId != null ">

watero-rst-web/src/main/webapp/WEB-INF/views/dm/dealer/dealer_list.ftl

@@ -54,6 +54,7 @@
                 <option value="1" <#if dmDealer.dealerType??><#if dmDealer.dealerType == 1 >selected="selected"</#if></#if>>个人</option>
                 <option value="2" <#if dmDealer.dealerType??><#if dmDealer.dealerType == 2 >selected="selected"</#if></#if>>企业</option>
             </select>
+
             <select class="my-select" name="dealerSelfOperated" id="dealerSelfOperated" style="height: 36px;width: 132px;margin: 0px;padding: 12px 10px 6px 15px;margin-bottom: 10px;">
                 <option value="">是否自营</option>
                 <option value="1" <#if dmDealer.dealerSelfOperated??><#if dmDealer.dealerSelfOperated == 1 >selected="selected"</#if></#if>>自营</option>
@@ -62,6 +63,7 @@
 
             <input type="text" class="my-input trim_input"  style="width:120px;margin-right: 0px; margin-bottom: 8px;" value="${dmDealer.dealerName!}" placeholder="客户名称" id="dealerName" name="dealerName">
             <input type="text" class="my-input trim_input"  style="width:120px;margin-right: 0px; margin-bottom: 8px;" value="${dmDealer.dealerIndustry!}" placeholder="客户行业" id="dealerIndustry" name="dealerIndustry">
+            <input type="text" class="my-input trim_input"  style="width:120px;margin-right: 0px; margin-bottom: 8px;" value="${dmDealer.dealerIndustry!}" placeholder="店铺名称" id="dealerIndustry" name="dealerIndustry">
 
             <button type="submit" class="btn" style="background: #50a2ea;border: 1px solid #50a2ea;color: #fff;height: 35px;margin-top: -8px;"><i class="Hui-iconfont">&#xe665;</i> 查询</button>