Merge branch '0.8.X' of https://gitee.com/hdka/klp-oa into 0.8.X

klp-crm/src/main/java/com/klp/crm/domain/vo/CrmOrderVo.java

@@ -107,7 +107,12 @@ public class CrmOrderVo {
     @ExcelProperty(value = "备注")
     private String remark;
 
-    //联查客户名称
-    private String customerName;
+
+//    @ExcelProperty(value = "客户编号")
+    private String customerCode;
+//    @ExcelProperty(value = "联系人")
+    private String contactPerson;
+//    @ExcelProperty(value = "地址")
+    private String address;
 
 }

klp-crm/src/main/resources/mapper/CrmOrderMapper.xml

@@ -27,25 +27,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
     <select id="selectVoPagePlus" resultType="com.klp.crm.domain.vo.CrmOrderVo">
         SELECT
-            order_id AS orderId,
-            order_code AS orderCode,
-            order_type AS orderType,
-            customer_id AS customerId,
-            order_amount AS orderAmount,
-            salesman,
-            delivery_date AS deliveryDate,
-            pre_order_status AS preOrderStatus,
-            audit_user AS auditUser,
-            audit_time AS auditTime,
-            order_status AS orderStatus,
-            finance_status AS financeStatus,
-            unpaid_amount AS unpaidAmount,
-            remark,
-            create_by AS createBy,
-            create_time AS createTime,
-            update_by AS updateBy,
-            update_time AS updateTime,
-            cu.customer_name AS customerName
+            co.order_id AS orderId,
+            co.order_code AS orderCode,
+            co.order_type AS orderType,
+            co.customer_id AS customerId,
+            co.order_amount AS orderAmount,
+            co.salesman,
+            co.delivery_date AS deliveryDate,
+            co.pre_order_status AS preOrderStatus,
+            co.audit_user AS auditUser,
+            co.audit_time AS auditTime,
+            co.order_status AS orderStatus,
+            co.finance_status AS financeStatus,
+            co.unpaid_amount AS unpaidAmount,
+            co.remark,
+            co.create_by AS createBy,
+            co.create_time AS createTime,
+            co.update_by AS updateBy,
+            co.update_time AS updateTime,
+            cu.customer_code AS customerCode,
+            cu.contact_person AS contactPerson,
+            cu.address AS address
         FROM crm_order co
                LEFT JOIN crm_customer cu ON co.customer_id = cu.customer_id
         ${ew.customSqlSegment}