Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents into dev

src/main/java/com/huiju/estateagents/controller/TaRaiseRecordController.java

@@ -108,7 +108,7 @@ public class TaRaiseRecordController extends BaseController {
                 return responseBean;
             }
 
-            recordRequestBO.setOrgId(getOrgId(request));
+            recordRequestBO.setOrgId(84);
             responseBean = iTaRaiseRecordService.listRaiseRecordByCondition(recordRequestBO, pageNumber, pageSize);
             logger.info("TaRaiseRecordController.listRaiseRecordByCondition 返回：{}", JSONObject.toJSONString(responseBean));
         } catch (Exception e) {
@@ -139,7 +139,7 @@ public class TaRaiseRecordController extends BaseController {
 
         ResponseBean responseBean = new ResponseBean();
         try {
-            orderRequestBO.setOrgId(getOrgId(request));
+            orderRequestBO.setOrgId(84);
             responseBean = iTaRaiseRecordService.listRaiseOrderByCondition(orderRequestBO, pageNumber, pageSize);
             logger.info("TaRaiseRecordController.listOrderByCondition 返回：{}", JSONObject.toJSONString(responseBean));
         } catch (Exception e) {

src/main/java/com/huiju/estateagents/entity/TaRaise.java

@@ -139,4 +139,10 @@ public class TaRaise implements Serializable {
 
     @TableField(exist = false)
     private List<String> checkValue;
+
+    /**
+     * 出售房源数
+     */
+    @TableField(exist = false)
+    private Integer salesNumber;
 }

src/main/resources/mapper/TaPreselectionMapper.xml

@@ -4,19 +4,19 @@
 
     <select id="listPresecretByCondition" resultType="com.huiju.estateagents.entity.TaPreselection">
         SELECT
-        t.*,
-        t2.sales_number,t2.sales_batch_name,t2.remark,
-        t2.sales_number,
-        t2.remark,
-        t3.building_name,
-        ( SELECT sum( th.real_heat ) FROM ta_housing_resources th WHERE th.sales_batch_id = t2.sales_batch_id AND th.`status` = 1 ) real_heat
+            t.*,
+            t2.sales_number,t2.sales_batch_name,t2.remark,
+            t2.sales_number,
+            t2.remark,
+            t3.building_name,
+            ( SELECT sum( th.real_heat ) FROM ta_housing_resources th WHERE th.sales_batch_id = t2.sales_batch_id AND th.`status` = 1 ) real_heat
         FROM
-        ta_preselection t
+            ta_preselection t
         LEFT JOIN ta_sales_batch t2 ON t.sales_batch_id = t2.sales_batch_id
         LEFT JOIN ta_building t3 ON t.building_id = t3.building_id
         WHERE
-        t.org_id = #{orgId}
-        AND t.STATUS != - 1
+            t.org_id = #{orgId}
+            AND t.STATUS != - 1
         <if test="buildingId != null and buildingId != ''">
             and t2.building_id = #{buildingId}
         </if>

src/main/resources/mapper/TaRaiseMapper.xml

@@ -6,6 +6,7 @@
         SELECT
             t.*,
             t2.sales_batch_name,
+            t2.sales_number,
             t2.remark,
             t3.building_name,
             ( SELECT sum( th.raise_real_heat ) FROM ta_housing_resources th WHERE th.sales_batch_id = t2.sales_batch_id AND th.`status` = 1 ) raise_real_heat