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

src/main/java/com/huiju/estateagents/service/impl/TaSalesBatchServiceImpl.java

     @Autowired
     private ITaBuildingService taBuildingService;
 
+    @Autowired
+    private TaRaiseServiceImpl taRaiseService;
+
     @Override
     public IPage<TaSalesBatch> selectByCondition(IPage<TaSalesBatch> page, String salesBatchName, String buildingId, Integer status, Integer orgId, List<TaPersonBuilding> taPersonBuildingListByUserId) {
         return taSalesBatchMapper.selectByCondition(page, salesBatchName, buildingId, status, orgId, taPersonBuildingListByUserId);
         Long totalHouses = null;
         BigDecimal totalRealHeat = null;
         BigDecimal totalHeat = null;
+        BigDecimal raiseRealNumber = null;
+        BigDecimal raiseNumber = null;
 
         // 获取房源预选数量
         Map<String, Object> result = taSalesBatchMapper.getTotalHousesAndHeat(salesBatchId);
             totalHouses = (Long) result.get("totalHouses");
             totalRealHeat = (BigDecimal) result.get("totalRealHeat");
             totalHeat = (BigDecimal) result.get("totalHeat");
+            raiseRealNumber = (BigDecimal) result.get("raiseRealNumber");
+            raiseNumber = (BigDecimal) result.get("raiseNumber");
         }
 
+        // 获取认筹信息
+        QueryWrapper<TaRaise> taRaiseQueryWrapper = new QueryWrapper<>();
+        taRaiseQueryWrapper.eq("sales_batch_id",salesBatch.getSalesBatchId());
+        taRaiseQueryWrapper.eq("status",CommConstant.STATUS_NORMAL);
+        TaRaise taRaise = taRaiseService.getOne(taRaiseQueryWrapper);
+
         JSONObject obj = new JSONObject();
         obj.put("preselectionStartTime", salesBatch.getPreselectionStartTime());
         obj.put("preselectionEndTime", salesBatch.getPreselectionEndTime());
         obj.put("salesNumber", totalHouses == null ? 0 : totalHouses);
         obj.put("preselectionNumber", totalRealHeat == null ? 0 : totalRealHeat);
         obj.put("heatNumber", totalHeat == null ? 0 : totalHeat);
+        obj.put("raiseRealNumber", raiseRealNumber == null ? 0 : raiseRealNumber);
+        obj.put("raiseNumber", raiseNumber == null ? 0 : raiseNumber);
+        obj.put("raiseStartTime", taRaise.getRaiseStartTime());
+        obj.put("raiseEndTime", taRaise.getRaiseEndTime());
         responseBean.addSuccess(obj);
         return responseBean;
     }

src/main/resources/mapper/TaSalesBatchMapper.xml

         SELECT
             count( * ) totalHouses,
             sum( t.real_heat ) totalRealHeat,
-            sum( t.heat) totalHeat
+            sum( t.heat) totalHeat,
+            sum( t.raise_real_heat ) totalRaiseRealHeat,
+	        sum( t.raise_heat ) totalRaiseHeat
         FROM
             ta_housing_resources t
         WHERE