Your Name лет назад: 3
Родитель
Сommit
b4b6f45ff1

+ 2 - 2
java110-db/src/main/resources/mapper/community/RepairServiceDaoImplMapper.xml

@@ -180,7 +180,7 @@
             and t.repair_name like '%${repairName}%'
         </if>
         <if test="repairNameLike !=null and repairNameLike != ''">
-            and t.repair_name like concat('%',${repairNameLike},'%')
+            and t.repair_name like concat('%',#{repairNameLike},'%')
         </if>
         <if test="appointmentTime !=null ">
             and t.appointment_time= #{appointmentTime}
@@ -327,7 +327,7 @@
             and t.repair_name like '%${repairName}%'
         </if>
         <if test="repairNameLike !=null and repairNameLike != ''">
-            and t.repair_name like concat('%',${repairNameLike},'%')
+            and t.repair_name like concat('%',#{repairNameLike},'%')
         </if>
         <if test="appointmentTime !=null ">
             and t.appointment_time= #{appointmentTime}

+ 3 - 0
service-report/src/main/java/com/java110/report/bmo/search/impl/SearchRoomBMOImpl.java

@@ -73,6 +73,9 @@ public class SearchRoomBMOImpl implements ISearchRoomBMO {
         if (tmpRoomDtos == null || tmpRoomDtos.size() < 1) {
             return;
         }
+        for(RoomDto tmpRoomDto : tmpRoomDtos){
+            tmpRoomDto.setRoomName(tmpRoomDto.getFloorNum()+"-"+tmpRoomDto.getUnitNum()+"-"+tmpRoomDto.getRoomNum());
+        }
         roomDtos.addAll(tmpRoomDtos);
     }
 }