Merge branch 'master' of http://49.4.53.36:3000/hotel/hotel-saas-backend

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/BusRoomBookingOrdersMapper.xml

@@ -13,7 +13,7 @@
             #{roomId}
         </foreach>
     </select>
-    
+
     <select id="conflictBookingTime" resultType="org.jeecg.modules.business.entity.BusBookingRooms">
         select DISTINCT CONCAT(IFNULL(r.prefix,''),r.`name`) as room_id from
         (
@@ -38,6 +38,7 @@
 
     <select id="getPage" resultType="org.jeecg.modules.business.vo.RoomLivingQueryVo">
         SELECT DISTINCT
+        r.room_id,
         tb.living_order_id,
         o.living_order_no,
         CONCAT( ifnull( rm.`prefix`, '' ), rm.`name` ) AS room_name,
@@ -74,4 +75,4 @@
             where (o.living_order_no like '%#{keyw}%' or rm.`name` like '%#{keyw}%' or tb.customer_name like '%#{keyw}%')
         </if>
     </select>
-</mapper>
+</mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/vo/RoomLivingQueryVo.java

@@ -15,4 +15,5 @@ public class RoomLivingQueryVo {
     private BigDecimal xf;
     private BigDecimal sk;
     private Integer feeType;
+    private String roomId;
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/kc/controller/KcStockController.java

@@ -192,7 +192,7 @@ private  IKcDepositoryInGoodsService kcDepositoryInGoodsService;
 						}
 					}
 				}
-			} else if (kcStock.getType().equals(1)) {
+			} else if (kcStock.getType().equals(1)||kcStock.getType().equals(3)) {
 				KcDepositoryInGoods kcDepositoryInGoods = kcDepositoryInGoodsService.getById(kcStockDetail.getSupplierInGoodsId());
 				if (kcDepositoryInGoods != null) {
 					KcGoods kcGoods = kcGoodsService.getById(kcDepositoryInGoods.getGoodsId());