Browse Source

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

gqx 2 years ago
parent
commit
4c5fe7a704
16 changed files with 701 additions and 5 deletions
  1. 2 3
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/BusMeetingRoomScheduleServiceImpl.java
  2. 9 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/rooms/DTO/CesServiceTypeSearchDto.java
  3. 13 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/rooms/controller/CesAllDayPriceRuleController.java
  4. 21 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/rooms/controller/CesHydropowerCoalController.java
  5. 21 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/rooms/controller/CesServiceMaintenanceController.java
  6. 21 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/rooms/controller/CesServiceTypeController.java
  7. 82 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/rooms/entity/CesHydropowerCoal.java
  8. 96 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/rooms/entity/CesServiceMaintenance.java
  9. 65 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/rooms/entity/CesServiceType.java
  10. 16 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/rooms/mapper/CesHydropowerCoalMapper.java
  11. 16 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/rooms/mapper/CesServiceMaintenanceMapper.java
  12. 16 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/rooms/mapper/CesServiceTypeMapper.java
  13. 37 2
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/rooms/service/CesAllDayPriceRuleServiceImpl.java
  14. 45 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/rooms/service/CesHydropowerCoalServiceImpl.java
  15. 111 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/rooms/service/CesServiceMaintenanceServiceImpl.java
  16. 130 0
      jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/rooms/service/CesServiceTypeServiceImpl.java

+ 2 - 3
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/BusMeetingRoomScheduleServiceImpl.java

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.apache.commons.collections.map.HashedMap;
 import org.apache.commons.lang3.ObjectUtils;
 import org.jeecg.common.api.vo.Result;
@@ -12,9 +13,7 @@ import org.jeecg.modules.business.dto.BusMeetingRoomScheduleDetailDto;
 import org.jeecg.modules.business.dto.BusMeetingRoomScheduleDto;
 import org.jeecg.modules.business.entity.*;
 import org.jeecg.modules.business.enums.CouponsKeyEnum;
-import org.jeecg.modules.business.mapper.BusMeetingRoomScheduleDetailMapper;
 import org.jeecg.modules.business.mapper.BusMeetingRoomScheduleMapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.jeecg.modules.business.vo.BusMeetingKeyValueVo;
 import org.jeecg.modules.business.vo.BusMeetingRoomScheduleDetailVo;
 import org.jeecg.modules.business.vo.BusMeetingRoomScheduleVo;
@@ -68,6 +67,7 @@ public class BusMeetingRoomScheduleServiceImpl extends ServiceImpl<BusMeetingRoo
         /**
          * 创建主表
          */
+
         BusMeetingRoomSchedule roomSchedule = new BusMeetingRoomSchedule();
 
         BeanUtil.copyProperties(dto,roomSchedule);
@@ -95,7 +95,6 @@ public class BusMeetingRoomScheduleServiceImpl extends ServiceImpl<BusMeetingRoo
             details.add(detail);
         });
         meetingRoomScheduleDetailService.saveBatchDetail(details);
-
         return Result.ok("创建成功!");
     }
 

+ 9 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/rooms/DTO/CesServiceTypeSearchDto.java

@@ -0,0 +1,9 @@
+package org.jeecg.modules.rooms.DTO;
+
+import lombok.Data;
+import org.jeecg.common.api.dto.BasePage;
+
+@Data
+public class CesServiceTypeSearchDto  extends BasePage {
+    private String hotelId;
+}

+ 13 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/rooms/controller/CesAllDayPriceRuleController.java

@@ -130,7 +130,20 @@ public class CesAllDayPriceRuleController  extends JeecgController<CesAllDayPric
         }catch (Exception e){
             return Result.error(e.getMessage());
         }
+    }
 
+    @ApiOperation(value="获取", notes="获取")
+    @PostMapping(value = "/fetch")
+    public Result fetch(String hotelId){
+        if(StringUtils.isBlank(hotelId)){
+            return Result.error(ResultCode.PARAM_MISS);
+        }
+        try{
+            return cesAllDayPriceRuleService.fetch(hotelId);
+        }catch (Exception e){
+            return Result.error(e.getMessage());
+        }
     }
+
 }
 

+ 21 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/rooms/controller/CesHydropowerCoalController.java

@@ -0,0 +1,21 @@
+package org.jeecg.modules.rooms.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 水电煤设置 前端控制器
+ * </p>
+ *
+ * @author fendo
+ * @since 2023-03-16
+ */
+@Controller
+@RequestMapping("/rooms/cesHydropowerCoal")
+public class CesHydropowerCoalController {
+
+}
+

+ 21 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/rooms/controller/CesServiceMaintenanceController.java

@@ -0,0 +1,21 @@
+package org.jeecg.modules.rooms.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 服务维修 前端控制器
+ * </p>
+ *
+ * @author fendo
+ * @since 2023-03-16
+ */
+@Controller
+@RequestMapping("/rooms/cesServiceMaintenance")
+public class CesServiceMaintenanceController {
+
+}
+

+ 21 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/rooms/controller/CesServiceTypeController.java

@@ -0,0 +1,21 @@
+package org.jeecg.modules.rooms.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 维修服务类型表 前端控制器
+ * </p>
+ *
+ * @author fendo
+ * @since 2023-03-16
+ */
+@Controller
+@RequestMapping("/rooms/cesServiceType")
+public class CesServiceTypeController {
+
+}
+

+ 82 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/rooms/entity/CesHydropowerCoal.java

@@ -0,0 +1,82 @@
+package org.jeecg.modules.rooms.entity;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 水电煤设置
+ * </p>
+ *
+ * @author fendo
+ * @since 2023-03-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("ces_hydropower_coal")
+public class CesHydropowerCoal extends Model<CesHydropowerCoal> {
+
+    private static final long serialVersionUID = 1L;
+
+    private String id;
+
+    private String hotelId;
+
+    private String name;
+
+    private Boolean appState;
+
+    private BigDecimal price;
+
+    private String bandId;
+
+    /**
+     * 创建时间
+     */
+    @TableField("creatAt")
+    private LocalDateTime creatAt;
+
+    /**
+     * 修改时间
+     */
+    @TableField("updateAt")
+    private LocalDateTime updateAt;
+
+    /**
+     * 逻辑删除字段
+     */
+    private Boolean invalid;
+
+
+    public static final String ID = "id";
+
+    public static final String HOTEL_ID = "hotel_id";
+
+    public static final String NAME = "name";
+
+    public static final String APP_STATE = "app_state";
+
+    public static final String PRICE = "price";
+
+    public static final String BAND_ID = "band_id";
+
+    public static final String CREATAT = "creatAt";
+
+    public static final String UPDATEAT = "updateAt";
+
+    public static final String INVALID = "invalid";
+
+    @Override
+    public Serializable pkVal() {
+        return this.id;
+    }
+
+}

+ 96 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/rooms/entity/CesServiceMaintenance.java

@@ -0,0 +1,96 @@
+package org.jeecg.modules.rooms.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 服务维修
+ * </p>
+ *
+ * @author fendo
+ * @since 2023-03-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("ces_service_maintenance")
+public class CesServiceMaintenance extends Model<CesServiceMaintenance> {
+
+    private static final long serialVersionUID = 1L;
+
+    private String id;
+
+    /**
+     * 酒店
+     */
+    private String hotelId;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 类型 1服务 2维修
+     */
+    private Integer type;
+
+    /**
+     * 服务模块 1 物品 2内容
+     */
+    private Integer moduleType;
+
+    /**
+     * 分类ID
+     */
+    private String classify;
+
+    /**
+     * 创建时间
+     */
+    @TableField("creatAt")
+    private LocalDateTime creatAt;
+
+    /**
+     * 修改时间
+     */
+    @TableField("updateAt")
+    private LocalDateTime updateAt;
+
+    /**
+     * 逻辑删除字段
+     */
+    private Boolean invalid;
+
+
+    public static final String ID = "id";
+
+    public static final String HOTEL_ID = "hotel_id";
+
+    public static final String NAME = "name";
+
+    public static final String TYPE = "type";
+
+    public static final String MODULE_TYPE = "module_type";
+
+    public static final String CLASSIFY = "classify";
+
+    public static final String CREATAT = "creatAt";
+
+    public static final String UPDATEAT = "updateAt";
+
+    public static final String INVALID = "invalid";
+
+    @Override
+    public Serializable pkVal() {
+        return this.id;
+    }
+
+}

+ 65 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/rooms/entity/CesServiceType.java

@@ -0,0 +1,65 @@
+package org.jeecg.modules.rooms.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 维修服务类型表
+ * </p>
+ *
+ * @author fendo
+ * @since 2023-03-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("ces_service_type")
+public class CesServiceType extends Model<CesServiceType> {
+
+    private static final long serialVersionUID = 1L;
+
+    private String id;
+
+    /**
+     * name
+     */
+    private String name;
+
+    private String hotelId;
+
+    @TableField("createAt")
+    private LocalDateTime createAt;
+
+    @TableField("updateAt")
+    private LocalDateTime updateAt;
+
+    /**
+     * 逻辑删除字段
+     */
+    private Boolean invalid;
+
+
+    public static final String ID = "id";
+
+    public static final String NAME = "name";
+    public static final String HOTEL_ID = "hotel_id";
+
+    public static final String CREATEAT = "createAt";
+
+    public static final String UPDATEAT = "updateAt";
+
+    public static final String INVALID = "invalid";
+
+    @Override
+    public Serializable pkVal() {
+        return this.id;
+    }
+
+}

+ 16 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/rooms/mapper/CesHydropowerCoalMapper.java

@@ -0,0 +1,16 @@
+package org.jeecg.modules.rooms.mapper;
+
+import org.jeecg.modules.rooms.entity.CesHydropowerCoal;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 水电煤设置 Mapper 接口
+ * </p>
+ *
+ * @author fendo
+ * @since 2023-03-16
+ */
+public interface CesHydropowerCoalMapper extends BaseMapper<CesHydropowerCoal> {
+
+}

+ 16 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/rooms/mapper/CesServiceMaintenanceMapper.java

@@ -0,0 +1,16 @@
+package org.jeecg.modules.rooms.mapper;
+
+import org.jeecg.modules.rooms.entity.CesServiceMaintenance;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 服务维修 Mapper 接口
+ * </p>
+ *
+ * @author fendo
+ * @since 2023-03-16
+ */
+public interface CesServiceMaintenanceMapper extends BaseMapper<CesServiceMaintenance> {
+
+}

+ 16 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/rooms/mapper/CesServiceTypeMapper.java

@@ -0,0 +1,16 @@
+package org.jeecg.modules.rooms.mapper;
+
+import org.jeecg.modules.rooms.entity.CesServiceType;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 维修服务类型表 Mapper 接口
+ * </p>
+ *
+ * @author fendo
+ * @since 2023-03-16
+ */
+public interface CesServiceTypeMapper extends BaseMapper<CesServiceType> {
+
+}

+ 37 - 2
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/rooms/service/CesAllDayPriceRuleServiceImpl.java

@@ -2,7 +2,9 @@ package org.jeecg.modules.rooms.service;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.apache.commons.collections.map.HashedMap;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.jeecg.common.api.vo.Result;
@@ -18,6 +20,7 @@ import javax.annotation.Resource;
 import javax.transaction.Transactional;
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -31,10 +34,15 @@ import java.util.List;
 public class CesAllDayPriceRuleServiceImpl extends ServiceImpl<CesAllDayPriceRuleMapper, CesAllDayPriceRule> implements IService<CesAllDayPriceRule> {
 
     @Resource
-    CesAllDayPriceRuleMapper cesAllDayPriceRuleMapper;
+    private CesAllDayPriceRuleMapper cesAllDayPriceRuleMapper;
     @Resource
-    CesAllDayRuleMinuteServiceImpl cesAllDayRuleMinuteService;
+    private CesAllDayRuleMinuteServiceImpl cesAllDayRuleMinuteService;
 
+    /**
+     * 修改全天房设置
+     * @param cesAllDayPriceRuleDto
+     * @return
+     */
     @Transactional(rollbackOn = Exception.class)
     public Result modifyWholeDayUnifyPrice(CesAllDayPriceRuleDto cesAllDayPriceRuleDto) {
         CesAllDayPriceRule cesAllDayPriceRule = cesAllDayPriceRuleMapper.selectById(cesAllDayPriceRuleDto.getId());
@@ -61,4 +69,31 @@ public class CesAllDayPriceRuleServiceImpl extends ServiceImpl<CesAllDayPriceRul
         }
         return Result.ok("成功!");
     }
+
+
+    /**
+     * 查询
+     * @param hotelId
+     * @return
+     */
+    public Result fetch(String hotelId){
+        Map<String,Object> map =new HashedMap();
+        CesAllDayPriceRule cesAllDayPriceRule =  cesAllDayPriceRuleMapper.selectOne(Wrappers.<CesAllDayPriceRule>lambdaQuery().eq(CesAllDayPriceRule::getHotelId,hotelId).eq(CesAllDayPriceRule::getInvalid,false));
+        if(ObjectUtils.isEmpty(cesAllDayPriceRule)) return Result.ok("欧克");
+
+        //分钟加收
+        if (CouponEnums.ALLDAYROOMRULETIMEOUT.MINUTE.code() == cesAllDayPriceRule.getTimeOutRule().intValue()){
+            //按房型设置下
+            if(CouponEnums.ALLDAYROOMRULETYPEDETAILS.LAYOUT.code() == cesAllDayPriceRule.getRuleType().intValue()){
+                List<CesAllDayRuleMinute> cesAllDayRuleMinutes =  cesAllDayRuleMinuteService.getRuleMinutesByHotelId(hotelId);
+                map.put("cesAllMinutes",cesAllDayRuleMinutes);
+            }
+        }
+        map.put("cesAllDayPriceRule",cesAllDayPriceRule);
+        return Result.ok(map);
+    }
+
+
+
+
 }

+ 45 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/rooms/service/CesHydropowerCoalServiceImpl.java

@@ -0,0 +1,45 @@
+package org.jeecg.modules.rooms.service;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.rooms.entity.CesHydropowerCoal;
+import org.jeecg.modules.rooms.mapper.CesHydropowerCoalMapper;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * <p>
+ * 水电煤设置 服务实现类
+ * </p>
+ *
+ * @author fendo
+ * @since 2023-03-16
+ */
+@Service
+public class CesHydropowerCoalServiceImpl extends ServiceImpl<CesHydropowerCoalMapper, CesHydropowerCoal> implements IService<CesHydropowerCoal> {
+
+    @Resource
+    private CesHydropowerCoalMapper cesHydropowerCoalMapper;
+
+
+    public Result fetch(String hotelId){
+        List<CesHydropowerCoal> list = cesHydropowerCoalMapper.selectList(Wrappers.<CesHydropowerCoal>lambdaQuery().eq(CesHydropowerCoal::getHotelId,hotelId).eq(CesHydropowerCoal::getInvalid,false));
+        return Result.ok(list);
+    }
+
+    /**
+     * 修改水电煤设置
+     * @param hydropowerCoals
+     * @return
+     */
+    public Result modify(List<CesHydropowerCoal> hydropowerCoals){
+            saveOrUpdateBatch(hydropowerCoals);
+            return Result.ok("成功!");
+    }
+
+
+}

+ 111 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/rooms/service/CesServiceMaintenanceServiceImpl.java

@@ -0,0 +1,111 @@
+package org.jeecg.modules.rooms.service;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.lang3.ObjectUtils;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.rooms.entity.CesServiceMaintenance;
+import org.jeecg.modules.rooms.mapper.CesServiceMaintenanceMapper;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * <p>
+ * 服务维修 服务实现类
+ * </p>
+ *
+ * @author fendo
+ * @since 2023-03-16
+ */
+@Service
+public class CesServiceMaintenanceServiceImpl extends ServiceImpl<CesServiceMaintenanceMapper, CesServiceMaintenance> implements IService<CesServiceMaintenance> {
+        @Resource
+        private CesServiceMaintenanceMapper cesServiceMaintenanceMapper;
+
+
+    /**
+     *
+     * @param maintenance
+     * @return
+     */
+    public Result create(CesServiceMaintenance maintenance){
+        QueryWrapper<CesServiceMaintenance> queryWrapper =new QueryWrapper<>();
+        queryWrapper.eq(CesServiceMaintenance.NAME,maintenance.getName());
+        queryWrapper.eq(CesServiceMaintenance.HOTEL_ID,maintenance.getHotelId());
+        queryWrapper.eq(CesServiceMaintenance.INVALID,false);
+
+        CesServiceMaintenance exit = cesServiceMaintenanceMapper.selectOne(queryWrapper);
+        if(!ObjectUtils.isEmpty(exit)) return Result.error("名称重复!");
+
+        maintenance.setCreatAt(LocalDateTime.now());
+        maintenance.setUpdateAt(LocalDateTime.now());
+        maintenance.setInvalid(false);
+        save(maintenance);
+        return Result.ok("成功!");
+    }
+
+    /**
+     * 修改
+     * @param maintenance
+     * @return
+     */
+    public Result modify(CesServiceMaintenance maintenance){
+        CesServiceMaintenance serviceMaintenance = cesServiceMaintenanceMapper.selectOne(Wrappers.<CesServiceMaintenance>lambdaQuery().eq(CesServiceMaintenance::getId,maintenance.getId()));
+       if(ObjectUtils.isEmpty(serviceMaintenance)) return Result.error("数据未找到!");
+       if(!serviceMaintenance.getName().equals(maintenance.getName())){
+           QueryWrapper<CesServiceMaintenance> queryWrapper =new QueryWrapper<>();
+           queryWrapper.eq(CesServiceMaintenance.NAME,maintenance.getName());
+           queryWrapper.eq(CesServiceMaintenance.HOTEL_ID,maintenance.getHotelId());
+           queryWrapper.eq(CesServiceMaintenance.INVALID,false);
+           queryWrapper.ne(CesServiceMaintenance.ID,serviceMaintenance.getId());
+           CesServiceMaintenance cesServiceMaintenance = cesServiceMaintenanceMapper.selectOne(queryWrapper);
+           if(!ObjectUtils.isEmpty(cesServiceMaintenance)) return Result.error("有重复名称的数据!");
+       }
+
+        serviceMaintenance.setUpdateAt(LocalDateTime.now());
+        saveOrUpdate(serviceMaintenance);
+        return Result.ok("成功!");
+    }
+
+
+    /**
+     * 删除
+     * @param id
+     * @return
+     */
+    public Result delete(String id,String hotelId){
+        CesServiceMaintenance serviceMaintenance = cesServiceMaintenanceMapper.selectOne(Wrappers.<CesServiceMaintenance>lambdaQuery().eq(CesServiceMaintenance::getId,id).eq(CesServiceMaintenance::getHotelId,hotelId).eq(CesServiceMaintenance::getInvalid,false));
+        if(ObjectUtils.isEmpty(serviceMaintenance)) return Result.error("数据未找到!");
+        serviceMaintenance.setUpdateAt(LocalDateTime.now());
+        serviceMaintenance.setInvalid(true);
+        saveOrUpdate(serviceMaintenance);
+        return Result.ok("删除成功!");
+    }
+
+
+    /**
+     * 批量删除
+     * @param ids
+     * @return
+     */
+    public Result deleteBatch(List<String> ids,String hotelId){
+        List<CesServiceMaintenance> list = cesServiceMaintenanceMapper.selectList(Wrappers.<CesServiceMaintenance>lambdaQuery().eq(CesServiceMaintenance::getInvalid,false).eq(CesServiceMaintenance::getHotelId,hotelId).in(CesServiceMaintenance::getId,ids));
+        if(CollectionUtil.isEmpty(list)) return Result.ok("删除成功!");
+        list.forEach(v -> {
+            v.setUpdateAt(LocalDateTime.now());
+            v.setInvalid(true);
+        });
+
+        saveOrUpdateBatch(list);
+        return Result.ok("删除成功!");
+    }
+
+
+
+}

+ 130 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/rooms/service/CesServiceTypeServiceImpl.java

@@ -0,0 +1,130 @@
+package org.jeecg.modules.rooms.service;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.collections.map.HashedMap;
+import org.apache.commons.lang3.ObjectUtils;
+import org.jeecg.common.api.dto.BasePage;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.rooms.DTO.CesServiceTypeSearchDto;
+import org.jeecg.modules.rooms.entity.CesRooms;
+import org.jeecg.modules.rooms.entity.CesServiceMaintenance;
+import org.jeecg.modules.rooms.entity.CesServiceType;
+import org.jeecg.modules.rooms.mapper.CesServiceTypeMapper;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.time.LocalDateTime;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 维修服务类型表 服务实现类
+ * </p>
+ *
+ * @author fendo
+ * @since 2023-03-16
+ */
+@Service
+public class CesServiceTypeServiceImpl extends ServiceImpl<CesServiceTypeMapper, CesServiceType> implements IService<CesServiceType> {
+    @Resource
+    private CesServiceTypeMapper serviceTypeMapper;
+
+
+    public Result fetch(CesServiceTypeSearchDto dto){
+        QueryWrapper<CesServiceType> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq(CesServiceType.HOTEL_ID,dto.getHotelId());
+        queryWrapper.eq(CesServiceType.INVALID,false);
+        IPage<CesServiceType> dataPage = serviceTypeMapper.selectPage(new Page<>(dto.getPageNo().intValue(),dto.getPageSize().intValue()),queryWrapper);
+        Map<String,Object> map = new HashMap<>();
+        map.put("records",dataPage.getRecords());
+        map.put("total",dataPage.getTotal());
+        return Result.OK(map);
+    }
+
+    /**
+     * 创建
+     * @param cesServiceType
+     * @return
+     */
+    public Result create(CesServiceType cesServiceType){
+        QueryWrapper<CesServiceType> queryWrapper =new QueryWrapper<>();
+        queryWrapper.eq(CesServiceType.NAME,cesServiceType.getName());
+        queryWrapper.eq(CesServiceType.HOTEL_ID,cesServiceType.getHotelId());
+        queryWrapper.eq(CesServiceType.INVALID,false);
+
+        CesServiceType exit = serviceTypeMapper.selectOne(queryWrapper);
+        if(!ObjectUtils.isEmpty(exit)) return Result.error("名称重复!");
+
+        cesServiceType.setCreateAt(LocalDateTime.now());
+        cesServiceType.setUpdateAt(LocalDateTime.now());
+        cesServiceType.setInvalid(false);
+        save(cesServiceType);
+        return Result.ok("成功!");
+    }
+
+
+
+    /**
+     * 修改
+     * @param cesServiceType
+     * @return
+     */
+    public Result modify(CesServiceType cesServiceType){
+        CesServiceType type = serviceTypeMapper.selectOne(Wrappers.<CesServiceType>lambdaQuery().eq(CesServiceType::getId,cesServiceType.getId()));
+        if(ObjectUtils.isEmpty(type)) return Result.error("数据未找到!");
+        if(!type.getName().equals(type.getName())){
+            QueryWrapper<CesServiceType> queryWrapper =new QueryWrapper<>();
+            queryWrapper.eq(CesServiceType.NAME,type.getName());
+            queryWrapper.eq(CesServiceType.HOTEL_ID,type.getHotelId());
+            queryWrapper.eq(CesServiceType.INVALID,false);
+            queryWrapper.ne(CesServiceType.ID,type.getId());
+            CesServiceType serviceType = serviceTypeMapper.selectOne(queryWrapper);
+            if(!ObjectUtils.isEmpty(serviceType)) return Result.error("有重复名称的数据!");
+        }
+        cesServiceType.setUpdateAt(LocalDateTime.now());
+        saveOrUpdate(cesServiceType);
+        return Result.ok("成功!");
+    }
+
+    /**
+     * 删除
+     * @param id
+     * @return
+     */
+    public Result delete(String id,String hotelId){
+        CesServiceType cesServiceType = serviceTypeMapper.selectOne(Wrappers.<CesServiceType>lambdaQuery().eq(CesServiceType::getId,id).eq(CesServiceType::getHotelId,hotelId).eq(CesServiceType::getInvalid,false));
+        if(ObjectUtils.isEmpty(cesServiceType)) return Result.error("数据未找到!");
+        cesServiceType.setUpdateAt(LocalDateTime.now());
+        cesServiceType.setInvalid(true);
+        saveOrUpdate(cesServiceType);
+        return Result.ok("删除成功!");
+    }
+
+
+    /**
+     * 批量删除
+     * @param ids
+     * @return
+     */
+    public Result deleteBatch(List<String> ids, String hotelId){
+        List<CesServiceType> list = serviceTypeMapper.selectList(Wrappers.<CesServiceType>lambdaQuery().eq(CesServiceType::getInvalid,false).eq(CesServiceType::getHotelId,hotelId).in(CesServiceType::getId,ids));
+        if(CollectionUtil.isEmpty(list)) return Result.ok("删除成功!");
+        list.forEach(v -> {
+            v.setUpdateAt(LocalDateTime.now());
+            v.setInvalid(true);
+        });
+
+        saveOrUpdateBatch(list);
+        return Result.ok("删除成功!");
+    }
+
+
+}