傅行帆 5 jaren geleden
bovenliggende
commit
a1d8ac53aa

+ 1
- 1
src/main/java/com/huiju/estateagents/controller/TaPreselectionRecordController.java Bestand weergeven

@@ -82,7 +82,7 @@ public class TaPreselectionRecordController extends BaseController {
82 82
         try {
83 83
 
84 84
             // 校验参数
85
-            if (null != taPreselectionRecord.getHouseId() || StringUtils.isBlank(taPreselectionRecord.getPersonId()) ||
85
+            if (null == taPreselectionRecord.getHouseId() || StringUtils.isBlank(taPreselectionRecord.getPersonId()) ||
86 86
                 taPreselectionRecord.getOrgId() == null) {
87 87
                 logger.info("taPreselectionRecordAdd 参数错误");
88 88
                 responseBean.addError("参数错误");

+ 11
- 11
src/main/java/com/huiju/estateagents/service/impl/TaHousingResourcesServiceImpl.java Bestand weergeven

@@ -475,18 +475,18 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
475 475
                     price = new BigDecimal(row.getCell(5).getStringCellValue());
476 476
                 }
477 477
 
478
-                Integer heat = 0;
479
-                try {
480
-                    String heatString = String.valueOf(row.getCell(6).getNumericCellValue());
481
-                    String split = heatString.substring(0, heatString.indexOf("."));
482
-                    heat = Integer.valueOf(split);
483
-                } catch (Exception e) {
484
-                    String heatString = row.getCell(6).getStringCellValue();
485
-                    heat = Integer.valueOf(heatString);
486
-                }
478
+//                Integer heat = 0;
479
+//                try {
480
+//                    String heatString = String.valueOf(row.getCell(6).getNumericCellValue());
481
+//                    String split = heatString.substring(0, heatString.indexOf("."));
482
+//                    heat = Integer.valueOf(split);
483
+//                } catch (Exception e) {
484
+//                    String heatString = row.getCell(6).getStringCellValue();
485
+//                    heat = Integer.valueOf(heatString);
486
+//                }
487 487
 
488 488
 
489
-                Integer status = row.getCell(7).getStringCellValue().trim().equals("是") ? 1 : 0;
489
+                Integer status = row.getCell(6).getStringCellValue().trim().equals("是") ? 1 : 0;
490 490
 
491 491
                 int currentRow = j + 1;
492 492
                 if (com.baomidou.mybatisplus.core.toolkit.StringUtils.isEmpty(termName)) {
@@ -543,7 +543,7 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
543 543
                 taHousingResources.setFloorName(floorName);
544 544
                 taHousingResources.setRoomName(roomName);
545 545
                 taHousingResources.setPrice(price);
546
-                taHousingResources.setHeat(heat);
546
+//                taHousingResources.setHeat(heat);
547 547
                 taHousingResources.setStatus(status);
548 548
                 list.add(taHousingResources);
549 549
             }