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/rooms/DTO/CesGoodsUnitDeleteBatchDTO.java

@@ -0,0 +1,8 @@
+package org.jeecg.modules.rooms.DTO;
+
+import lombok.Data;
+
+@Data
+public class CesGoodsUnitDeleteBatchDTO {
+    private String idsStr;
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/rooms/controller/CesGoodsUnitController.java

@@ -7,6 +7,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.jeecg.common.Enum.ResultCode;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.modules.rooms.DTO.CesGoodsUnitDeleteBatchDTO;
 import org.jeecg.modules.rooms.DTO.CesGoodsUnitDto;
 import org.jeecg.modules.rooms.DTO.CesGoodsUnitSearchDto;
 import org.jeecg.modules.rooms.DTO.CesRoomLayoutRemoveDto;
@@ -82,7 +83,7 @@ public class CesGoodsUnitController {
     @AutoLog(value = "修改单位")
     @ApiOperation(value="修改单位", notes="修改单位")
     @PutMapping(value = "/modify")
-    public Result modifyCesRoomLayout(@RequestBody CesGoodsUnitDto dto){
+    public Result modifyCesGoodsUnit(@RequestBody CesGoodsUnitDto dto){
         if(StringUtils.isBlank(dto.getId())){
             return Result.error(ResultCode.PARAM_MISS,"数据ID 必传！");
         }
@@ -120,12 +121,12 @@ public class CesGoodsUnitController {
     @AutoLog(value = "批量删除单位")
     @ApiOperation(value="批量删除单位", notes="批量删除单位")
     @PostMapping(value = "/deleteBatch")
-    public Result deleteBatch(String idsStr){
-        if(StringUtils.isBlank(idsStr)){
+    public Result deleteBatch(@RequestBody CesGoodsUnitDeleteBatchDTO dto){
+        if(StringUtils.isBlank(dto.getIdsStr())){
             return Result.error(ResultCode.PARAM_MISS,"数据IDStr 必传！");
         }
         try{
-            List<String> ids = Arrays.stream(idsStr.split(",")).collect(Collectors.toList());
+            List<String> ids = Arrays.stream(dto.getIdsStr().split(",")).collect(Collectors.toList());
             return  cesGoodsUnitService.deleteBatch(ids);
         }catch (Exception e){
             return Result.error(e.getMessage());

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/rooms/controller/CesStockTypeController.java

@@ -7,7 +7,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.jeecg.common.Enum.ResultCode;
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.util.CommonUtils;
 import org.jeecg.modules.rooms.DTO.CesStockTypeDto;
 import org.jeecg.modules.rooms.Enum.CouponEnums;
 import org.jeecg.modules.rooms.service.CesStockTypeServiceImpl;
@@ -57,10 +56,7 @@ public class CesStockTypeController {
             return Result.error(ResultCode.PARAM_MISS);
         }
         try{
-
-            return stockTypeService.getTopTypes(hotelId)
-
-                    ;
+            return stockTypeService.getTopTypes(hotelId);
         }catch (Exception e){
             return Result.error(e.getMessage());
         }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/rooms/service/CesGoodsUnitServiceImpl.java

@@ -45,10 +45,11 @@ public class CesGoodsUnitServiceImpl extends ServiceImpl<CesGoodsUnitMapper, Ces
      */
     public Result list(CesGoodsUnitSearchDto  searchDto){
         QueryWrapper<CesGoodsUnit> queryWrapper = new QueryWrapper<>();
-        if(StringUtils.isBlank(searchDto.getName())){
+        if(!StringUtils.isBlank(searchDto.getName())){
             queryWrapper.like(CesGoodsUnit.NAME, CommonUtils.escapeChar(searchDto.getName()));
         }
         queryWrapper.eq(CesGoodsUnit.HOTEL_ID,searchDto.getHotelId());
+        queryWrapper.eq(CesGoodsUnit.INVALID,false);
         queryWrapper.orderByDesc(CesGoodsUnit.CREATEAT);
 
         IPage<CesGoodsUnit> dataPage = cesGoodsUnitMapper.selectPage(new Page<>(searchDto.getPageNo().intValue(),searchDto.getPageSize().intValue()),queryWrapper);

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/rooms/service/CesStockTypeServiceImpl.java

@@ -45,7 +45,6 @@ public class CesStockTypeServiceImpl extends ServiceImpl<CesStockTypeMapper, Ces
         //查询数据
         List<CesStockType> list = stockTypeMapper.selectList(Wrappers.<CesStockType>lambdaQuery()
                 .eq(CesStockType::getHotelId,hotelId)
-                .eq(CesStockType::getState,true)
                 .eq(CesStockType::getInvalid,false));
         list.forEach(v -> {
             nodeList.add(new TreeNode<>(v.getId(),v.getParentId(),v.getName(),0));