Merge remote-tracking branch 'origin/master'

collect-fees/collect-fees-service/src/main/java/com/tofly/fees/userprofilemgt/entity/DaCustomerSelect.java

@@ -41,8 +41,9 @@ import java.util.Date;
 @ColumnWidth(30)
 public class DaCustomerSelect extends Model<DaCustomerSelect> {
 
-    @ColumnWidth(50)
+    @ColumnWidth(20)
     @ExcelProperty("所属公司")
+    @ExcelIgnore
     private String companyBranch;
     @ColumnWidth(20)
     @ExcelProperty("所属片区")
@@ -119,7 +120,7 @@ public class DaCustomerSelect extends Model<DaCustomerSelect> {
     @ExcelProperty("证件类别")
     @ExcelIgnore
     private String certType;
-    @ColumnWidth(50)
+    @ColumnWidth(20)
     @ExcelProperty("证件号码")
     private String certNo;
 }

collect-fees/collect-fees-service/src/main/resources/mapper/userprofilemgt/DaCustomerMapper.xml

@@ -32,10 +32,14 @@
         select  distinct a.customer_no customerNo,a.customer_no_old customerNoOld ,a.COMPANY_BRANCH companyBranch,a.MR_AREA mrArea,a.MR_BOOK mrBook,  c.name mrAreaName ,d.name mrBookName, a.customer_name
         customerName,a.customer_address customerAddress,a.customer_phone customerPhone,a.apply_datetime
         applyDatetime,a.created_datetime createdDatetime,a.created_oname createdOname,nvl(a.meternumber,0) meterNumber
-        ,a.customer_state customerState,a.CERT_TYPE certType,a.CERT_NO certNo, e.last_reading lastReading,e.this_reading thisReading,b.METER_CARD_ID meterCardId  from tf_ywys_da_customer
-        a inner join tf_ywys_da_meter b on a.CUSTOMER_NO=b.CUSTOMER_NO
+        ,a.customer_state customerState,a.CERT_TYPE certType,a.CERT_NO certNo, e.last_reading lastReading,e.this_reading thisReading,b.METER_CARD_ID meterCardId
+        ,f.name priceName,g.name meterTypeName
+        from tf_ywys_da_customer a inner join tf_ywys_da_meter b on a.CUSTOMER_NO=b.CUSTOMER_NO
         left join tf_ywys_bm_mr_area c on a.mr_area=c.code left join tf_ywys_bm_mr_book d on a.mr_book=d.code
-        left join tf_ywys_bw_meter_read_plan e on a.customer_no=e.customer_no where 1=1
+        left join tf_ywys_bw_meter_read_plan e on a.customer_no=e.customer_no
+        left join tf_ywys_bm_price f on b.price_code=f.code
+        left join tf_ywys_bm_meter_type g on b.meter_type=g.code
+        where 1=1
 
         <!--模糊查询 -->
         <if test="searchText != null and searchText != ''">