顾绍勇 5 лет назад
Родитель
Сommit
a5290fd837
1 измененных файлов: 11 добавлений и 5 удалений
  1. 11
    5
      src/main/java/com/huiju/estateagents/service/impl/TaSalesBatchServiceImpl.java

+ 11
- 5
src/main/java/com/huiju/estateagents/service/impl/TaSalesBatchServiceImpl.java Просмотреть файл

143
 
143
 
144
         // 获取认筹信息
144
         // 获取认筹信息
145
         QueryWrapper<TaRaise> taRaiseQueryWrapper = new QueryWrapper<>();
145
         QueryWrapper<TaRaise> taRaiseQueryWrapper = new QueryWrapper<>();
146
-        taRaiseQueryWrapper.eq("sales_batch_id",salesBatch.getSalesBatchId());
147
-        taRaiseQueryWrapper.eq("status",CommConstant.STATUS_NORMAL);
146
+        taRaiseQueryWrapper.eq("sales_batch_id", salesBatch.getSalesBatchId());
147
+        taRaiseQueryWrapper.eq("status", CommConstant.STATUS_NORMAL);
148
         TaRaise taRaise = taRaiseService.getOne(taRaiseQueryWrapper);
148
         TaRaise taRaise = taRaiseService.getOne(taRaiseQueryWrapper);
149
 
149
 
150
         JSONObject obj = new JSONObject();
150
         JSONObject obj = new JSONObject();
151
         obj.put("preselectionStartTime", salesBatch.getPreselectionStartTime());
151
         obj.put("preselectionStartTime", salesBatch.getPreselectionStartTime());
152
-        obj.put("preselectionEndTime", salesBatch.getPreselectionEndTime());        obj.put("raiseRealNumber", raiseRealNumber == null ? 0 : raiseRealNumber);
152
+        obj.put("preselectionEndTime", salesBatch.getPreselectionEndTime());
153
+        obj.put("raiseRealNumber", raiseRealNumber == null ? 0 : raiseRealNumber);
153
         obj.put("raiseNumber", raiseNumber == null ? 0 : raiseNumber);
154
         obj.put("raiseNumber", raiseNumber == null ? 0 : raiseNumber);
154
-        obj.put("raiseStartTime", taRaise.getRaiseStartTime());
155
-        obj.put("raiseEndTime", taRaise.getRaiseEndTime());
155
+        if(taRaise != null){
156
+            obj.put("raiseStartTime", taRaise.getRaiseStartTime());
157
+            obj.put("raiseEndTime", taRaise.getRaiseEndTime());
158
+        }else{
159
+            obj.put("raiseStartTime", "");
160
+            obj.put("raiseEndTime", "");
161
+        }
156
         obj.put("salesNumber", totalHouses == null ? 0 : totalHouses);
162
         obj.put("salesNumber", totalHouses == null ? 0 : totalHouses);
157
         obj.put("preselectionNumber", totalRealHeat == null ? 0 : totalRealHeat);
163
         obj.put("preselectionNumber", totalRealHeat == null ? 0 : totalRealHeat);
158
         obj.put("heatNumber", totalHeat == null ? 0 : totalHeat);
164
         obj.put("heatNumber", totalHeat == null ? 0 : totalHeat);