奖品收货地址

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/sweet/integralActivityDraw/list.html

@@ -104,7 +104,14 @@
                 },
                 {
                     field: 'receivingAddress',
-                    title: '收货人姓名地址'
+                    title: '收货人地址',
+                    formatter: function (value, row) {
+                        var receivingProvince = row.receivingProvince;
+                        var receivingCity = row.receivingCity;
+                        var receivingCounty = row.receivingCounty;
+                        var receivingAddress = row.receivingAddress;
+                        return receivingProvince + ' ' + receivingCity + ' ' + receivingCounty + ' ' + receivingAddress;
+                    }
                 },
                 {
                     field: 'receivingStatus',

liquidnet-bus-do/liquidnet-service-sweet-do/src/main/resources/com.liquidnet.service.sweet.mapper/SweetIntegralActivityDrawMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.liquidnet.service.sweet.mapper.SweetIntegralActivityDrawMapper">
 
     <select id="selectExcelList" resultType="com.liquidnet.service.sweet.dto.SweetActivityDrawListDao">
-        select a.*
+        select a.*, CONCAT(a.receiving_province,a.receiving_city,a.receiving_county,a.receiving_address) as receiving_address
         from sweet_integral_activity_draw as a
         left join sweet_integral_activity_prize as b on b.prize_id = a.prize_id
         left join sweet_integral_activity as c on a.integral_activity_id = c.integral_activity_id