bug

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

@@ -380,7 +380,9 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
                 String floorName = row.getCell(3).getStringCellValue().trim();
                 String roomName = row.getCell(4).getStringCellValue().trim();
                 BigDecimal price = BigDecimal.valueOf(row.getCell(5).getNumericCellValue());
-                Integer heat = Integer.valueOf((row.getCell(6).getNumericCellValue() + "").substring(0, 1));
+                String heatString = String.valueOf(row.getCell(6).getNumericCellValue());
+                String split = heatString.substring(0, heatString.indexOf("."));
+                Integer heat = Integer.valueOf(split);
                 Integer status = row.getCell(7).getStringCellValue().trim().equals("是") ? 1 : 0;
 
                 int currentRow = j + 1;
@@ -408,7 +410,7 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
                 String houseInfo = termName + blockName + unitName + floorName + roomName;
                 if (temHousingList.contains(houseInfo)) {
                     logger.info("存在重复房源:{}", houseInfo);
-                    responseBean.addError("第" + currentRow + "行存在重复房源");
+                    responseBean.addError("第" + currentRow + "行存在重复房源,请删除重复房源后再次上传文件。");
                     return responseBean;
                 }
 
@@ -425,7 +427,7 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
                 TaHousingResources oldTaHouseingResources = taHousingResourcesMapper.selectOne(taHousingResourcesQueryWrapper);
                 if (null != oldTaHouseingResources) {
                     logger.info("数据库存在重复房源:{}", houseInfo);
-                    responseBean.addError("第" + currentRow + "行与系统已录入房源" + oldTaHouseingResources.getHouseId() + "重复");
+                    responseBean.addError("第" + currentRow + "行与系统已录入房源" + oldTaHouseingResources.getHouseId() + "重复，请删除重复房源后再次上传文件。（注意，要检查本楼盘下所有批次的房源）。");
                     return responseBean;
                 }
 

src/main/resources/mapper/TaHousingResourcesMapper.xml

@@ -127,7 +127,7 @@
         SELECT
             t.* ,
             a.apartment_name,
-            u.user_name
+            u.user_name as update_name
         FROM
             ta_housing_resources t
         LEFT JOIN ta_building_apartment a ON t.apartment_id = a.apartment_id
@@ -139,7 +139,7 @@
         <if test="apartmentId != null and apartmentId != ''">
             AND t.apartment_id = #{apartmentId}
         </if>
-        <if test="status != null and status != ''">
+        <if test="status != null">
             AND t.status = #{status}
         </if>
         <if test="houseId != null and houseId != ''">