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

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

@@ -143,16 +143,22 @@ public class TaSalesBatchServiceImpl extends ServiceImpl<TaSalesBatchMapper, TaS
 
         // 获取认筹信息
         QueryWrapper<TaRaise> taRaiseQueryWrapper = new QueryWrapper<>();
-        taRaiseQueryWrapper.eq("sales_batch_id",salesBatch.getSalesBatchId());
-        taRaiseQueryWrapper.eq("status",CommConstant.STATUS_NORMAL);
+        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("raiseRealNumber", raiseRealNumber == null ? 0 : raiseRealNumber);
+        obj.put("preselectionEndTime", salesBatch.getPreselectionEndTime());
+        obj.put("raiseRealNumber", raiseRealNumber == null ? 0 : raiseRealNumber);
         obj.put("raiseNumber", raiseNumber == null ? 0 : raiseNumber);
-        obj.put("raiseStartTime", taRaise.getRaiseStartTime());
-        obj.put("raiseEndTime", taRaise.getRaiseEndTime());
+        if(taRaise != null){
+            obj.put("raiseStartTime", taRaise.getRaiseStartTime());
+            obj.put("raiseEndTime", taRaise.getRaiseEndTime());
+        }else{
+            obj.put("raiseStartTime", "");
+            obj.put("raiseEndTime", "");
+        }
         obj.put("salesNumber", totalHouses == null ? 0 : totalHouses);
         obj.put("preselectionNumber", totalRealHeat == null ? 0 : totalRealHeat);
         obj.put("heatNumber", totalHeat == null ? 0 : totalHeat);