Merge remote-tracking branch 'origin/dev' into dev

topsun-xt/src/main/webapp/biz/topsun/customer/customerDetail.js

@@ -3,7 +3,12 @@ var baoshenEmailGridManager = null;
 var customerEmailGridManager = null;
 var customerRelatedGridManager = null;
 var customerPayInfoGridManager = null;
+var provinceCode = null;
+var cityCode = null;
+var countyCode = null;
 $(document).ready(function () {
+    provinceCode = getPrimaryProvinceCode();
+    cityCode = getSecondProvinceCode();
     initializeTab();
     initializeUI();
     initializeSelectMethod();
@@ -26,6 +31,8 @@ function initializeTab() {
 }
 
 function initializeSelectMethod() {
+
+
     $('#selectedMonthlySettlementMethod').searchbox({
         type: "monthlySettlementMethod",
         name: "monthlySettlementMethodApplyCode",
@@ -33,10 +40,64 @@ function initializeSelectMethod() {
             $('#selectedMonthlySettlementMethod').val(data.method)
         }
     })
-}
 
 
+    $('#selectProvince').searchbox({
+        type: "province",
+        name: "provinceCode",
+        onChange: function (value, data) {
+            $('#selectProvince').val(data.provinceName)
+            provinceCode = data.provinceCode;
+            $('#primaryProvinceCode').val(data.provinceCode);
+        }
+    })
+
 
+    $('#selectCity').searchbox({
+        type: "province",
+        name: "cityCode",
+        getParam: function () {
+            /*var provinceCode=$('#provinceCode').val();
+            if(provinceCode==''){
+                Public.tip('请先选择省份!');
+                return false;
+            }*/
+            if (provinceCode == null || provinceCode == '' || getPrimaryProvinceCode() == null || getPrimaryProvinceCode() == '') {
+                Public.tip('请先选择省份!');
+                return false;
+            }
+            return {provinceCode: provinceCode};
+        },
+        onChange: function (value, data) {
+            $('#selectCity').val(data.provinceName)
+            cityCode = data.provinceCode
+            $('#secondProvinceCode').val(data.provinceCode);
+        }
+
+    })
+
+    $('#selectCounty').searchbox({
+        type: "province",
+        name: "cityCode",
+        getParam: function () {
+            // var provinceCode=$('#provinceCode').val();
+            // if(provinceCode==''){
+            //     Public.tip('请先选择地级市!');
+            //     return false;
+            // }
+            if (cityCode == null || cityCode == '' || getSecondProvinceCode() == null || getSecondProvinceCode() == '') {
+                Public.tip('请先选择地级市!');
+                return false;
+            }
+            return {provinceCode: cityCode};
+        },
+        onChange: function (value, data) {
+            $('#selectCounty').val(data.provinceName)
+            countyCode = data.provinceCode;
+            $('#provinceCode').val(data.provinceCode);
+        }
+    })
+}
 
 
 function loadContactListGrid() {
@@ -162,7 +223,12 @@ function loadBaoshenEmailListGrid() {
                 },
             },
             {
-                display: "是否开启邮件发送", name: "sendEmailTextView", width: 300, minWidth: 60, type: "string", align: "left",
+                display: "是否开启邮件发送",
+                name: "sendEmailTextView",
+                width: 300,
+                minWidth: 60,
+                type: "string",
+                align: "left",
                 editor: {
 
                     type: 'dictionary',
@@ -256,7 +322,12 @@ function loadCustomerEmailListGrid() {
                 }
             },
             {
-                display: "是否开启邮件发送", name: "sendEmailTextView", width: 300, minWidth: 60, type: "string", align: "left",
+                display: "是否开启邮件发送",
+                name: "sendEmailTextView",
+                width: 300,
+                minWidth: 60,
+                type: "string",
+                align: "left",
                 editor: {
 
                     type: 'dictionary',
@@ -567,3 +638,13 @@ function saveData() {
 function closeDispatchTabItem() {
     UICtrl.closeCurrentTab();
 }
+
+function getPrimaryProvinceCode() {
+    var provinceCode = $('#primaryProvinceCode').val();
+    return provinceCode;
+}
+
+function getSecondProvinceCode() {
+    var cityCode = $('#secondProvinceCode').val();
+    return cityCode;
+}

topsun-xt/src/main/webapp/biz/topsun/customer/customerDetail.jsp

@@ -42,6 +42,9 @@
                 <x:hidden name="customerId"/>
                 <x:hidden name="customerBankId"/>
                 <x:hidden name="customerOrderId"/>
+                <x:hidden name="provinceCode"/>
+                <x:hidden name="primaryProvinceCode"/>
+                <x:hidden name="secondProvinceCode"/>
                 <x:inputC name="customerCode" label="客户编码" labelCol="1" fieldCol="2"/>
                 <x:inputC name="customerName" label="客户全称" required="true" labelCol="1" fieldCol="2"/>
                 <x:inputC name="paymentRequest" label="请款要求" labelCol="1" fieldCol="2"/>
@@ -49,10 +52,13 @@
                 <x:inputC name="customerWorkTime" label="客户工作时间" wrapper="dateTime" labelCol="1" fieldCol="2"/>
                 <x:inputC name="customerEnName" label="英文名称" labelCol="1" required="true" fieldCol="2"/>
                 <x:inputC name="customerEnShortName" label="英文名简称" labelCol="1" fieldCol="2"/>
-                <x:inputC name="provinceInfo" label="所属地区" maxLength="32" labelCol="1" fieldCol="2" readonly="true"/>
-                <x:hidden name="provinceCode"></x:hidden>
                 <x:selectC name="customerLevel" label="客户等级" dictionary="customerLevel" labelCol="1" fieldCol="2"/>
 
+
+                <x:inputC name="province" label="客户所在省份" wrapper="select" id="selectProvince" labelCol="1" fieldCol="2" />
+                <x:inputC name="city" label="(地级)市、地区、盟、自治州" wrapper="select" id="selectCity" labelCol="1" fieldCol="2" />
+                <x:inputC name="county" label="县、(县级)市、(市辖)区" wrapper="select" id="selectCounty" labelCol="1" fieldCol="2" />
+
                 <x:inputC name="deduction" label="扣款百分比" maxLength="32" labelCol="1" fieldCol="2"/>
                 <x:selectC name="signedBack" label="是否要求签回货单" dictionary="signedBack" labelCol="1" fieldCol="2"/>
                 <x:selectC name="customerSysOrder" label="是否用客户系统货单" dictionary="customerSysOrder" labelCol="1" fieldCol="2"/>

topsun/src/main/java/com/huigou/topsun/customer/application/CustomerBaseInfoApplication.java

@@ -7,13 +7,14 @@ import com.huigou.topsun.customer.domain.Province;
 import com.huigou.topsun.customer.domain.vo.CustomerVo;
 
 import java.util.List;
+import java.util.Map;
 
 public interface CustomerBaseInfoApplication {
 
 //    Province findByProvinceParentId(String provinceCode);
 
 
-    List<Province> findByProvinceCode(String provinceCode);
+    Map<String,String> findByProvinceCode(String provinceCode);
 
     CustomerVo findCustomerByCustomerId(String customerId);
 

topsun/src/main/java/com/huigou/topsun/customer/application/Impl/CustomerApplicationImpl.java

@@ -208,12 +208,19 @@ public class CustomerApplicationImpl extends BaseApplication implements Customer
                         returnCustomerListVo.setCustomerContactVoList(customerContactVoList);
 //                        BeanUtil.copyProperties(returnCustomerListVo,customerContactVo);
                         String provinceCode = customerListVo.getProvinceCode();
-                        List<Province> provinceList = customerBaseInfoApplication.findByProvinceCode(provinceCode);
-                        StringBuffer provinceInfoList = new StringBuffer();
-                        for (Province province : provinceList) {
-                            provinceInfoList.append(province.getProvinceName());
+                        Map<String,String> provinceMap = customerBaseInfoApplication.findByProvinceCode(provinceCode);
+                        StringBuffer provinceInfoStringBuffer = new StringBuffer();
+                        if (provinceMap.get("grandParentProvince")!=null) {
+                            provinceInfoStringBuffer.append(provinceMap.get("grandParentProvince"));
                         }
-                        String provinceInfo = provinceInfoList.toString();
+                        if (provinceMap.get("parentProvince")!=null) {
+                            provinceInfoStringBuffer.append(provinceMap.get("parentProvince"));
+                        }
+                        if (provinceMap.get("province")!=null) {
+                            provinceInfoStringBuffer.append(provinceMap.get("province"));
+                        }
+
+                        String provinceInfo = provinceInfoStringBuffer.toString();
                         BeanUtils.copyProperties(customerListVo, returnCustomerListVo);
                         returnCustomerListVo.setBelongArea(provinceInfo);
                     }

topsun/src/main/java/com/huigou/topsun/customer/application/Impl/CustomerBaseInfoApplicationImpl.java

@@ -10,8 +10,9 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @Service
 public class CustomerBaseInfoApplicationImpl extends BaseApplication implements CustomerBaseInfoApplication {
@@ -30,9 +31,9 @@ public class CustomerBaseInfoApplicationImpl extends BaseApplication implements
 
 
     @Override
-    public List<Province> findByProvinceCode(String provinceCode) {
+    public Map<String, String> findByProvinceCode(String provinceCode) {
         Province province = provinceRepository.findByProvinceCode(provinceCode);
-        List<Province> provinceList = new ArrayList<>();
+        Map<String, String> provinceMap = new HashMap<>();
 
         if (province != null) {
             String provinceParentId = province.getProvinceParentId();
@@ -42,13 +43,23 @@ public class CustomerBaseInfoApplicationImpl extends BaseApplication implements
                 //获取上一级信息
                 Province grandParentProvince = provinceRepository.findByProvinceCode(parentProvince.getProvinceParentId());
                 if (grandParentProvince != null) {
-                    provinceList.add(grandParentProvince);
+                    //传入的是三级id
+                    provinceMap.put("primaryProvinceCode", grandParentProvince.getProvinceCode());
+                    provinceMap.put("grandParentProvince", grandParentProvince.getProvinceName());
+                    provinceMap.put("secondProvinceCode",parentProvince.getProvinceName());
+                    provinceMap.put("parentProvince", parentProvince.getProvinceName());
+                    provinceMap.put("province", province.getProvinceName());
+                } else {
+                    //传入的是二级id
+                    provinceMap.put("primaryProvinceCode", parentProvince.getProvinceCode());
+                    provinceMap.put("grandParentProvince", parentProvince.getProvinceName());
+                    provinceMap.put("secondProvinceCode",province.getProvinceCode());
+                    provinceMap.put("parentProvince", province.getProvinceName());
                 }
-                provinceList.add(parentProvince);
             }
         }
-        provinceList.add(province);
-        return provinceList;
+
+        return provinceMap;
     }
 
     @Override
@@ -57,15 +68,37 @@ public class CustomerBaseInfoApplicationImpl extends BaseApplication implements
 
         Customer customer = customerRepository.findCustomerByCustomerId(customerId);
         String provinceCode = customer.getProvinceCode();
-        List<Province> provinceList = findByProvinceCode(provinceCode);
-        StringBuffer provinceInfoList = new StringBuffer();
-        for (Province province : provinceList) {
-            provinceInfoList.append(province.getProvinceName());
-        }
-        String provinceInfo = provinceInfoList.toString();
+        Map<String, String> provinceMap = findByProvinceCode(provinceCode);
         CustomerVo customerVo = new CustomerVo();
+
+        if (provinceMap.containsKey("grandParentProvince")) {
+            String province = provinceMap.get("grandParentProvince");
+            customerVo.setProvince(province);
+        }
+        if (provinceMap.containsKey("parentProvince")) {
+            String city = provinceMap.get("parentProvince");
+            customerVo.setCity(city);
+        }
+        if (provinceMap.containsKey("province")) {
+            String county = provinceMap.get("province");
+            customerVo.setCounty(county);
+        }
+        if (provinceMap.containsKey("primaryProvinceCode")) {
+            String primaryProvinceCode = provinceMap.get("primaryProvinceCode");
+            customerVo.setPrimaryProvinceCode(primaryProvinceCode);
+        }
+        if (provinceMap.containsKey("secondProvinceCode")) {
+            String secondProvinceCode = provinceMap.get("secondProvinceCode");
+            customerVo.setSecondProvinceCode(secondProvinceCode);
+        }
+
+
+//        for (Province province : provinceList) {
+//            provinceInfoList.append(province.getProvinceName());
+//        }
+//        String provinceInfo = provinceInfoList.toString();
         BeanUtils.copyProperties(customer, customerVo);
-        customerVo.setProvinceInfo(provinceInfo);
+
         return customerVo;
     }
 
@@ -85,7 +118,7 @@ public class CustomerBaseInfoApplicationImpl extends BaseApplication implements
     @Override
     public void deleteByCustomerId(String customerId) {
         QueryDescriptor queryDescriptor = this.sqlExecutorDao.getQuery(QUERY_XML_FILE_PATH, "deleteCustomerBank");
-        this.sqlExecutorDao.executeUpdate(queryDescriptor.getSql(),customerId);
+        this.sqlExecutorDao.executeUpdate(queryDescriptor.getSql(), customerId);
     }
 
     @Override
@@ -95,6 +128,4 @@ public class CustomerBaseInfoApplicationImpl extends BaseApplication implements
     }
 
 
-
-
 }

topsun/src/main/java/com/huigou/topsun/customer/controller/CustomerController.java

 package com.huigou.topsun.customer.controller;
 
-import cn.hutool.core.bean.BeanUtil;
 import com.huigou.topsun.customer.application.CustomerBaseInfoApplication;
 import com.huigou.topsun.customer.application.CustomerApplication;
 import com.huigou.topsun.customer.application.CustomerOrderApplication;
@@ -139,25 +138,25 @@ public class CustomerController extends CommonController {
 
     }
 
-    /**
-     * 展示客户省市数据，如果客户的省份编码是省级行政单位，直接返回省份数据，
-     * 如果客户的省份编码是二级或者三级行政单位，则需要返回对应的省级或者市级行政单位
-     *
-     * @return
-     */
-    public String findProvince() {
-        SDO sdo = this.getSDO();
-        //获取省份编码
-        String provinceCode = sdo.getString("provinceCode");
-        List<Province> provinceList = new ArrayList<>();
-        if (!StringUtils.isEmpty(provinceCode)) {
-            provinceList = customerBaseInfoApplication.findByProvinceCode(provinceCode);
-        }
-        List<String> provinceNameList = provinceList.stream().map(province -> province.getProvinceName()).collect(Collectors.toList());
-        Map<Object, Object> map = new HashMap<>();
-        map.put("provinceNameList", provinceNameList);
-        return toResult(map);
-    }
+//    /**
+//     * 展示客户省市数据，如果客户的省份编码是省级行政单位，直接返回省份数据，
+//     * 如果客户的省份编码是二级或者三级行政单位，则需要返回对应的省级或者市级行政单位
+//     *
+//     * @return
+//     */
+//    public String findProvince() {
+//        SDO sdo = this.getSDO();
+//        //获取省份编码
+//        String provinceCode = sdo.getString("provinceCode");
+//        List<Province> provinceList = new ArrayList<>();
+//        if (!StringUtils.isEmpty(provinceCode)) {
+//            provinceList = customerBaseInfoApplication.findByProvinceCode(provinceCode);
+//        }
+//        List<String> provinceNameList = provinceList.stream().map(province -> province.getProvinceName()).collect(Collectors.toList());
+//        Map<Object, Object> map = new HashMap<>();
+//        map.put("provinceNameList", provinceNameList);
+//        return toResult(map);
+//    }
 
     /**
      * 客户详细信息展示

topsun/src/main/java/com/huigou/topsun/customer/domain/vo/CustomerVo.java

@@ -51,9 +51,31 @@ public class CustomerVo implements Serializable {
     private String provinceCode;
 
     /**
-     * 省份信息
+     * 一级省份编码
      */
-    private String provinceInfo;
+    private String primaryProvinceCode;
+    /**
+     * 二级省份编码
+     */
+    private String secondProvinceCode;
+
+    /**
+     * 省份
+     */
+    private String province;
+    /**
+     * 地级市
+     */
+    private String city;
+    /**
+     * 区县
+     */
+    private String county;
+
+//    /**
+//     * 省份信息
+//     */
+//    private String provinceInfo;
 
     /**
      * 客户等级

topsun/src/main/resources/config/content/easysearch/easy-search-province.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<easy-search-mappings>
+
+    <easy-search name="provinceCode" desc="省份">
+        <sql>
+            select p.province_code, p.province_name,p.province_parent_id
+            from province p
+            where p.province_parent_id = 0
+        </sql>
+        <field name="客户所在省份" title="客户所在省份" code="provinceName" width="543"/>
+        <field name="省份编码" title="省份编码" code="provinceCode" width="200" type="hidden"/>
+        <condition column="province_name" name="province_name" symbol="like"
+                   alias="p"/>
+    </easy-search>
+
+    <easy-search name="cityCode" desc="地级市">
+        <sql>
+            select p.province_code, p.province_name,p.province_parent_id
+            from province p
+            where 1=1
+        </sql>
+        <field name="(地级)市、地区、盟、自治州" title="(地级)市、地区、盟、自治州" code="provinceName" width="543"/>
+        <field name="地级市编码" title="地级市编码" code="provinceCode" width="200" type="hidden"/>
+        <condition column="province_parent_id" name="provinceCode" symbol="="
+                   alias="p"/>
+    </easy-search>
+
+    <easy-search name="countyCode" desc="区县">
+        <sql>
+            select p.province_code, p.province_name,p.province_parent_id
+            from province p
+            where 1=1
+        </sql>
+        <field name="县、(县级)市、(市辖)区" title="县、(县级)市、(市辖)区" code="provinceName" width="543"/>
+        <field name="区县编码" title="区县编码" code="provinceCode" width="200" type="hidden"/>
+        <condition column="province_parent_id" name="provinceCode" symbol="="
+                   alias="p"/>
+    </easy-search>
+
+</easy-search-mappings>
\ No newline at end of file