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/controller/BusCommonController.java

@@ -0,0 +1,4 @@
+package org.jeecg.modules.business.controller;
+
+public class BusCommonController {
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/BusDoorLockController.java

@@ -167,8 +167,8 @@ public class BusDoorLockController extends JeecgController<BusDoorLock, IBusDoor
 			 throw new JeecgBootException("规则选择错误");
 		 }
 
-		 //获取到该酒店下已有门锁信息，删除
-		 busDoorLockService.deleteByHotelId(doorLockDto.hotelId);
+//		 //获取到该酒店下已有门锁信息，删除
+//		 busDoorLockService.deleteByHotelId(doorLockDto.hotelId);
 
 		 //获取酒店所有房间信息
 		 List<CesRooms> rooms = roomsService.getByHotelId(doorLockDto.hotelId);
@@ -177,35 +177,45 @@ public class BusDoorLockController extends JeecgController<BusDoorLock, IBusDoor
 		 if (doorLockDto.radioType.equals("4")){
 			 associationIndex = Integer.parseInt(doorLockDto.front);
 		 }
+
+		 //获取到已添加的门锁信息
+		 List<BusDoorLock> oldList= busDoorLockService.getByHotelId(doorLockDto.hotelId);
+		 List<String> oldListIds = new ArrayList<>();
+		 oldList.forEach(t->{
+			 oldListIds.add(t.getRoomId());
+		 });
+
 		 rooms.forEach((item) ->{
-			 BusDoorLock doorLock = new BusDoorLock();
-			 doorLock.setStatus(1);
-			 doorLock.setDelFlag(CommonConstant.DEL_FLAG_0);
-			 doorLock.setTenantId(user.getRelTenantIds());
-			 doorLock.setHotelId(doorLockDto.hotelId);
-			 doorLock.setBuildId(item.getBuildId());
-			 doorLock.setFloorId(item.getFloorId());
-			 doorLock.setRoomId(item.getId());
-			 String association = "";
-			 String roomNumber = item.getPrefix()+item.getName();
+		 	if (!oldListIds.contains(item.getId())){
+				BusDoorLock doorLock = new BusDoorLock();
+				doorLock.setStatus(1);
+				doorLock.setDelFlag(CommonConstant.DEL_FLAG_0);
+				doorLock.setTenantId(user.getRelTenantIds());
+				doorLock.setHotelId(doorLockDto.hotelId);
+				doorLock.setBuildId(item.getBuildId());
+				doorLock.setFloorId(item.getFloorId());
+				doorLock.setRoomId(item.getId());
+				String association = "";
+				String roomNumber = item.getPrefix()+item.getName();
 
-			 switch (doorLockDto.radioType) {
-				 case "1":
-					 association = roomNumber;
-					 break;
-				 case "2":
-					 association = doorLockDto.front + roomNumber + doorLockDto.after;
-					 break;
-				 case "3":
-					 association = doorLockDto.front + roomNumber.substring(1) + doorLockDto.after;
-					 break;
-				 case "4":
-					 association = associationIndex + "";
-					 associationIndex = associationIndex + 1;
-					 break;
-			 }
-			 doorLock.setAssociationNumber(association);
-			 doorLocks.add(doorLock);
+				switch (doorLockDto.radioType) {
+					case "1":
+						association = roomNumber;
+						break;
+					case "2":
+						association = doorLockDto.front + roomNumber + doorLockDto.after;
+						break;
+					case "3":
+						association = doorLockDto.front + roomNumber.substring(1) + doorLockDto.after;
+						break;
+					case "4":
+						association = associationIndex + "";
+						associationIndex = associationIndex + 1;
+						break;
+				}
+				doorLock.setAssociationNumber(association);
+				doorLocks.add(doorLock);
+			}
 		 });
 		 busDoorLockService.saveBatch(doorLocks);
 		 return Result.OK("添加成功！");

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/BusMarketObjectiveController.java

@@ -0,0 +1,261 @@
+package org.jeecg.modules.business.controller;
+
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import io.netty.util.internal.StringUtil;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.constant.CommonConstant;
+import org.jeecg.common.exception.JeecgBootException;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.util.DateUtils;
+import org.jeecg.common.util.TokenUtils;
+import org.jeecg.common.util.oConvertUtils;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecg.modules.business.entity.BusMarketObjective;
+import org.jeecg.modules.business.entity.BusServiceRepairCategory;
+import org.jeecg.modules.business.service.IBusMarketObjectiveService;
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+
+ /**
+ * @Description: 销售目标
+ * @Author: jeecg-boot
+ * @Date:   2023-03-22
+ * @Version: V1.0
+ */
+@Api(tags="销售目标")
+@RestController
+@RequestMapping("/business/busMarketObjective")
+@Slf4j
+public class BusMarketObjectiveController extends JeecgController<BusMarketObjective, IBusMarketObjectiveService> {
+	@Autowired
+	private IBusMarketObjectiveService busMarketObjectiveService;
+
+	/**
+	 * 分页列表查询
+	 *
+	 * @param busMarketObjective
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "销售目标-分页列表查询")
+	@ApiOperation(value="销售目标-分页列表查询", notes="销售目标-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<BusMarketObjective>> queryPageList(BusMarketObjective busMarketObjective,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="12") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<BusMarketObjective> queryWrapper = QueryGenerator.initQueryWrapper(busMarketObjective, req.getParameterMap());
+		Page<BusMarketObjective> page = new Page<BusMarketObjective>(pageNo, pageSize);
+		IPage<BusMarketObjective> pageList = busMarketObjectiveService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+
+	/**
+	 *   添加
+	 *
+	 * @param busMarketObjective
+	 * @return
+	 */
+	@AutoLog(value = "销售目标-添加")
+	@ApiOperation(value="销售目标-添加", notes="销售目标-添加")
+	//@RequiresPermissions("business:bus_market_objective_info:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody BusMarketObjective busMarketObjective) {
+		busMarketObjectiveService.save(busMarketObjective);
+		return Result.OK("添加成功！");
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param busMarketObjective
+	 * @return
+	 */
+	@AutoLog(value = "销售目标-编辑")
+	@ApiOperation(value="销售目标-编辑", notes="销售目标-编辑")
+	//@RequiresPermissions("business:bus_market_objective_info:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody BusMarketObjective busMarketObjective) {
+		busMarketObjectiveService.updateById(busMarketObjective);
+		return Result.OK("编辑成功!");
+	}
+
+	 /**
+	  *   批量添加或修改
+	  *
+	  * @param busMarketObjectives
+	  * @return
+	  */
+	 @AutoLog(value = "销售目标-批量添加或修改")
+	 @ApiOperation(value="销售目标-批量添加或修改", notes="销售目标-批量添加或修改")
+	 //@RequiresPermissions("business:bus_market_objective_info:add")
+	 @PostMapping(value = "/batchAddOrUpdate")
+	 public Result<String> batchAddOrUpdate(@RequestBody List<BusMarketObjective> busMarketObjectives) {
+		 BusMarketObjective firstModel = busMarketObjectives.get(0);
+		 LoginUser user = TokenUtils.getAuthUser();
+		 if(user.getRelTenantIds() != null && !user.getRelTenantIds().equals("")){
+		 } else {
+			 throw new JeecgBootException("当前登录人租户信息错误");
+		 }
+		 List<BusMarketObjective> newData = new ArrayList<>();
+	 	if (firstModel.getId() != null && !firstModel.getId().equals("")){
+			//修改
+			busMarketObjectiveService.updateBatchById(busMarketObjectives);
+		}else{
+			//添加
+			busMarketObjectives.forEach(item->{
+				item.setTenantId(user.getRelTenantIds());
+				item.setDelFlag(CommonConstant.DEL_FLAG_0);
+				newData.add(item);
+			});
+			busMarketObjectiveService.saveBatch(newData);
+		}
+		 return Result.OK("添加成功！");
+	 }
+
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "销售目标-通过id删除")
+	@ApiOperation(value="销售目标-通过id删除", notes="销售目标-通过id删除")
+	//@RequiresPermissions("business:bus_market_objective_info:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		busMarketObjectiveService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "销售目标-批量删除")
+	@ApiOperation(value="销售目标-批量删除", notes="销售目标-批量删除")
+	//@RequiresPermissions("business:bus_market_objective_info:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.busMarketObjectiveService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "销售目标-通过id查询")
+	@ApiOperation(value="销售目标-通过id查询", notes="销售目标-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<BusMarketObjective> queryById(@RequestParam(name="id",required=true) String id) {
+		BusMarketObjective busMarketObjective = busMarketObjectiveService.getById(id);
+		if(busMarketObjective==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(busMarketObjective);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param busMarketObjective
+    */
+    //@RequiresPermissions("business:bus_market_objective_info:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, BusMarketObjective busMarketObjective) {
+        return super.exportXls(request, busMarketObjective, BusMarketObjective.class, "销售目标");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    //@RequiresPermissions("business:bus_market_objective_info:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, BusMarketObjective.class);
+    }
+
+	 /**
+	  * 列表查询
+	  *
+	  * @param busMarketObjective
+	  * @param req
+	  * @return
+	  */
+	 //@AutoLog(value = "销售目标-列表查询")
+	 @ApiOperation(value="销售目标-列表查询", notes="销售目标-列表查询")
+	 @GetMapping(value = "/queryList")
+	 public Result<List<BusMarketObjective>> queryList(BusMarketObjective busMarketObjective, HttpServletRequest req) {
+		 QueryWrapper<BusMarketObjective> queryWrapper = QueryGenerator.initQueryWrapper(busMarketObjective, req.getParameterMap());
+		 LoginUser user = TokenUtils.getAuthUser();
+		 if(user.getRelTenantIds() != null && !user.getRelTenantIds().equals("")){
+			 queryWrapper.eq("tenant_id",user.getRelTenantIds());
+		 }
+		 queryWrapper.eq("del_flag",0);
+		 String _yearStr = req.getParameter("year");
+		 int _year = 0;
+		 if (StringUtil.isNullOrEmpty(_yearStr)){
+			 _year = DateUtils.getYear();
+		 }else{
+			 _year = Integer.parseInt(_yearStr);
+		 }
+
+		 List<BusMarketObjective> list = busMarketObjectiveService.list(queryWrapper);
+		 if (list.size() <= 0){
+			 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
+			 Calendar cal = Calendar.getInstance();
+			 cal.set(Calendar.YEAR,_year);
+			 cal.set(Calendar.MONTH, 0);
+			 for(int i=1; i<=12; i++){
+				 BusMarketObjective model = new BusMarketObjective();
+				 model.setYear(_year);
+				 String _month = sdf.format(cal.getTime());
+				 cal.add(Calendar.MONTH, 1);
+				 model.setMonth(_month.split("-")[1]);
+				 list.add(model);
+			 }
+		 }
+		 return Result.OK(list);
+	 }
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/BusSalesPersonController.java

@@ -91,8 +91,8 @@ public class BusSalesPersonController extends JeecgController<BusSalesPerson, IB
 		}
 		String keyWord = req.getParameter("keyWord");
 		if(oConvertUtils.isNotEmpty(keyWord)){
-			queryWrapper.or().like("name",keyWord);
-			queryWrapper.or().like("work_no",keyWord);
+			queryWrapper.and(i -> i.like("name",keyWord)
+					.or().like("work_no",keyWord));
 		}
 		String hotelIds = req.getParameter("hotelId");
 //		String hotelId = req.getParameter("hotelId");

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/BusServiceRepairCategoryController.java

@@ -0,0 +1,225 @@
+package org.jeecg.modules.business.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.constant.CommonConstant;
+import org.jeecg.common.exception.JeecgBootException;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.util.TokenUtils;
+import org.jeecg.common.util.oConvertUtils;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecg.modules.business.entity.BusRoomPayType;
+import org.jeecg.modules.business.entity.BusServiceRepairCategory;
+import org.jeecg.modules.business.entity.BusWaiter;
+import org.jeecg.modules.business.service.IBusServiceRepairCategoryService;
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+
+ /**
+ * @Description: 服务维修-物品分类
+ * @Author: jeecg-boot
+ * @Date:   2023-03-22
+ * @Version: V1.0
+ */
+@Api(tags="服务维修-物品分类")
+@RestController
+@RequestMapping("/business/busServiceRepairCategory")
+@Slf4j
+public class BusServiceRepairCategoryController extends JeecgController<BusServiceRepairCategory, IBusServiceRepairCategoryService> {
+	@Autowired
+	private IBusServiceRepairCategoryService busServiceRepairCategoryService;
+
+	/**
+	 * 分页列表查询
+	 *
+	 * @param busServiceRepairCategory
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "服务维修-物品分类-分页列表查询")
+	@ApiOperation(value="服务维修-物品分类-分页列表查询", notes="服务维修-物品分类-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<BusServiceRepairCategory>> queryPageList(BusServiceRepairCategory busServiceRepairCategory,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<BusServiceRepairCategory> queryWrapper = QueryGenerator.initQueryWrapper(busServiceRepairCategory, req.getParameterMap());
+		Page<BusServiceRepairCategory> page = new Page<BusServiceRepairCategory>(pageNo, pageSize);
+		IPage<BusServiceRepairCategory> pageList = busServiceRepairCategoryService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+
+	/**
+	 *   添加
+	 *
+	 * @param busServiceRepairCategory
+	 * @return
+	 */
+	@AutoLog(value = "服务维修-物品分类-添加")
+	@ApiOperation(value="服务维修-物品分类-添加", notes="服务维修-物品分类-添加")
+	//@RequiresPermissions("business:bus_service_repair_category_info:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody BusServiceRepairCategory busServiceRepairCategory) {
+		busServiceRepairCategory.setStatus(1);
+		busServiceRepairCategory.setDelFlag(CommonConstant.DEL_FLAG_0);
+		if(busServiceRepairCategory.getTenantId() == null || busServiceRepairCategory.getTenantId().equals("")){
+			LoginUser user = TokenUtils.getAuthUser();
+			if(user.getRelTenantIds() != null && !user.getRelTenantIds().equals("")){
+				busServiceRepairCategory.setTenantId(user.getRelTenantIds());
+			} else {
+				throw new JeecgBootException("当前登录人租户信息错误");
+			}
+		}
+		busServiceRepairCategoryService.save(busServiceRepairCategory);
+		return Result.OK("添加成功！");
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param busServiceRepairCategory
+	 * @return
+	 */
+	@AutoLog(value = "服务维修-物品分类-编辑")
+	@ApiOperation(value="服务维修-物品分类-编辑", notes="服务维修-物品分类-编辑")
+	//@RequiresPermissions("business:bus_service_repair_category_info:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody BusServiceRepairCategory busServiceRepairCategory) {
+		if(busServiceRepairCategory.getTenantId() == null || busServiceRepairCategory.getTenantId().equals("")){
+			LoginUser user = TokenUtils.getAuthUser();
+			if(user.getRelTenantIds() != null && !user.getRelTenantIds().equals("")){
+				busServiceRepairCategory.setTenantId(user.getRelTenantIds());
+			} else {
+				throw new JeecgBootException("当前登录人租户信息错误");
+			}
+		}
+		BusServiceRepairCategory editModel = busServiceRepairCategoryService.getById(busServiceRepairCategory.getId());
+		editModel.setName(busServiceRepairCategory.getName());
+		busServiceRepairCategoryService.updateById(editModel);
+//		busServiceRepairCategoryService.updateById(busServiceRepairCategory);
+		return Result.OK("编辑成功!");
+	}
+
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "服务维修-物品分类-通过id删除")
+	@ApiOperation(value="服务维修-物品分类-通过id删除", notes="服务维修-物品分类-通过id删除")
+	//@RequiresPermissions("business:bus_service_repair_category_info:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		busServiceRepairCategoryService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "服务维修-物品分类-批量删除")
+	@ApiOperation(value="服务维修-物品分类-批量删除", notes="服务维修-物品分类-批量删除")
+	//@RequiresPermissions("business:bus_service_repair_category_info:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.busServiceRepairCategoryService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "服务维修-物品分类-通过id查询")
+	@ApiOperation(value="服务维修-物品分类-通过id查询", notes="服务维修-物品分类-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<BusServiceRepairCategory> queryById(@RequestParam(name="id",required=true) String id) {
+		BusServiceRepairCategory busServiceRepairCategory = busServiceRepairCategoryService.getById(id);
+		if(busServiceRepairCategory==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(busServiceRepairCategory);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param busServiceRepairCategory
+    */
+    //@RequiresPermissions("business:bus_service_repair_category_info:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, BusServiceRepairCategory busServiceRepairCategory) {
+        return super.exportXls(request, busServiceRepairCategory, BusServiceRepairCategory.class, "服务维修-物品分类");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    //@RequiresPermissions("business:bus_service_repair_category_info:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, BusServiceRepairCategory.class);
+    }
+
+	 /**
+	  * 列表查询
+	  *
+	  * @param busServiceRepairCategory
+	  * @param req
+	  * @return
+	  */
+	 //@AutoLog(value = "服务维修-物品分类-列表查询")
+	 @ApiOperation(value="服务维修-物品分类-列表查询", notes="服务维修-物品分类-列表查询")
+	 @GetMapping(value = "/queryList")
+	 public Result<List<BusServiceRepairCategory>> queryList(BusServiceRepairCategory busServiceRepairCategory, HttpServletRequest req) {
+		 QueryWrapper<BusServiceRepairCategory> queryWrapper = QueryGenerator.initQueryWrapper(busServiceRepairCategory, req.getParameterMap());
+		 LoginUser user = TokenUtils.getAuthUser();
+		 if(user.getRelTenantIds() != null && !user.getRelTenantIds().equals("")){
+			 queryWrapper.eq("tenant_id",user.getRelTenantIds());
+		 }
+		 queryWrapper.eq("del_flag",0);
+		 List<BusServiceRepairCategory> list = busServiceRepairCategoryService.list(queryWrapper);
+		 return Result.OK(list);
+	 }
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/BusServiceRepairController.java

@@ -0,0 +1,226 @@
+package org.jeecg.modules.business.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.constant.CommonConstant;
+import org.jeecg.common.exception.JeecgBootException;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.util.TokenUtils;
+import org.jeecg.common.util.oConvertUtils;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecg.modules.business.entity.BusHotel;
+import org.jeecg.modules.business.entity.BusServiceRepair;
+import org.jeecg.modules.business.entity.BusServiceRepairCategory;
+import org.jeecg.modules.business.entity.BusWaiter;
+import org.jeecg.modules.business.service.IBusHotelService;
+import org.jeecg.modules.business.service.IBusServiceRepairCategoryService;
+import org.jeecg.modules.business.service.IBusServiceRepairService;
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+
+ /**
+ * @Description: 服务维修
+ * @Author: jeecg-boot
+ * @Date:   2023-03-22
+ * @Version: V1.0
+ */
+@Api(tags="服务维修")
+@RestController
+@RequestMapping("/business/busServiceRepair")
+@Slf4j
+public class BusServiceRepairController extends JeecgController<BusServiceRepair, IBusServiceRepairService> {
+	@Autowired
+	private IBusServiceRepairService busServiceRepairService;
+
+	 @Autowired
+	 private IBusHotelService busHotelService;
+
+	 @Autowired
+	 private IBusServiceRepairCategoryService busServiceRepairCategoryService;
+	/**
+	 * 分页列表查询
+	 *
+	 * @param busServiceRepair
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "服务维修-分页列表查询")
+	@ApiOperation(value="服务维修-分页列表查询", notes="服务维修-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<BusServiceRepair>> queryPageList(BusServiceRepair busServiceRepair,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<BusServiceRepair> queryWrapper = QueryGenerator.initQueryWrapper(busServiceRepair, req.getParameterMap());
+		Page<BusServiceRepair> page = new Page<BusServiceRepair>(pageNo, pageSize);
+		IPage<BusServiceRepair> pageList = busServiceRepairService.page(page, queryWrapper);
+		pageList.getRecords().forEach(item->{
+			BusHotel busHotel = busHotelService.getById(item.getHotelId());
+			if (busHotel != null) {
+				item.setHotelName(busHotel.getName());
+			}
+
+			BusServiceRepairCategory category = busServiceRepairCategoryService.getById(item.getCategoryId());
+			if (category != null) {
+				item.setCategoryName(category.getName());
+			}
+		});
+		return Result.OK(pageList);
+	}
+
+	/**
+	 *   添加
+	 *
+	 * @param busServiceRepair
+	 * @return
+	 */
+	@AutoLog(value = "服务维修-添加")
+	@ApiOperation(value="服务维修-添加", notes="服务维修-添加")
+	//@RequiresPermissions("business:bus_service_repair_info:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody BusServiceRepair busServiceRepair) {
+		busServiceRepair.setDelFlag(CommonConstant.DEL_FLAG_0);
+		if(busServiceRepair.getTenantId() == null || busServiceRepair.getTenantId().equals("")){
+			LoginUser user = TokenUtils.getAuthUser();
+			if(user.getRelTenantIds() != null && !user.getRelTenantIds().equals("")){
+				busServiceRepair.setTenantId(user.getRelTenantIds());
+			} else {
+				throw new JeecgBootException("当前登录人租户信息错误");
+			}
+		}
+		busServiceRepairService.save(busServiceRepair);
+		return Result.OK("添加成功！");
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param busServiceRepair
+	 * @return
+	 */
+	@AutoLog(value = "服务维修-编辑")
+	@ApiOperation(value="服务维修-编辑", notes="服务维修-编辑")
+	//@RequiresPermissions("business:bus_service_repair_info:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody BusServiceRepair busServiceRepair) {
+		if(busServiceRepair.getTenantId() == null || busServiceRepair.getTenantId().equals("")){
+			LoginUser user = TokenUtils.getAuthUser();
+			if(user.getRelTenantIds() != null && !user.getRelTenantIds().equals("")){
+				busServiceRepair.setTenantId(user.getRelTenantIds());
+			} else {
+				throw new JeecgBootException("当前登录人租户信息错误");
+			}
+		}
+		BusServiceRepair editModel = busServiceRepairService.getById(busServiceRepair.getId());
+		editModel.setName(busServiceRepair.getName());
+		editModel.setType(busServiceRepair.getType());
+		editModel.setServiceType(busServiceRepair.getServiceType());
+		editModel.setCategoryId(busServiceRepair.getCategoryId());
+		busServiceRepairService.updateById(editModel);
+//		busServiceRepairService.updateById(busServiceRepair);
+		return Result.OK("编辑成功!");
+	}
+
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "服务维修-通过id删除")
+	@ApiOperation(value="服务维修-通过id删除", notes="服务维修-通过id删除")
+	//@RequiresPermissions("business:bus_service_repair_info:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		busServiceRepairService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "服务维修-批量删除")
+	@ApiOperation(value="服务维修-批量删除", notes="服务维修-批量删除")
+	//@RequiresPermissions("business:bus_service_repair_info:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.busServiceRepairService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "服务维修-通过id查询")
+	@ApiOperation(value="服务维修-通过id查询", notes="服务维修-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<BusServiceRepair> queryById(@RequestParam(name="id",required=true) String id) {
+		BusServiceRepair busServiceRepair = busServiceRepairService.getById(id);
+		if(busServiceRepair==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(busServiceRepair);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param busServiceRepair
+    */
+    //@RequiresPermissions("business:bus_service_repair_info:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, BusServiceRepair busServiceRepair) {
+        return super.exportXls(request, busServiceRepair, BusServiceRepair.class, "服务维修");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    //@RequiresPermissions("business:bus_service_repair_info:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, BusServiceRepair.class);
+    }
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/BusWaiterController.java

@@ -80,8 +80,15 @@ public class BusWaiterController extends JeecgController<BusWaiter, IBusWaiterSe
 		}
 		String keyWord = req.getParameter("keyWord");
 		if(oConvertUtils.isNotEmpty(keyWord)){
-			queryWrapper.or().like("name",keyWord);
-			queryWrapper.or().like("work_no",keyWord);
+//			queryWrapper.or().like("name",keyWord);
+//			queryWrapper.or().like("work_no",keyWord);
+//			queryWrapper.or().like("id_card",keyWord);
+//			queryWrapper.or().like("phone",keyWord);
+
+			queryWrapper.and(i -> i.like("name",keyWord)
+					.or().like("work_no",keyWord)
+					.or().like("id_card",keyWord)
+					.or().like("phone",keyWord));
 		}
 		String hotelIds = req.getParameter("hotelId");
 //		String hotelId = req.getParameter("hotelId");
@@ -147,6 +154,8 @@ public class BusWaiterController extends JeecgController<BusWaiter, IBusWaiterSe
 		BusWaiter editModel = busWaiterService.getById(busWaiter.getId());
 		editModel.setWorkNo(busWaiter.getWorkNo());
 		editModel.setName(busWaiter.getName());
+		editModel.setIdCard(busWaiter.getIdCard());
+		editModel.setPhone(busWaiter.getPhone());
 		editModel.setSex(busWaiter.getSex());
 		editModel.setStatus(busWaiter.getStatus());
 		editModel.setRemarks(busWaiter.getRemarks());

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/BusMarketObjective.java

@@ -0,0 +1,100 @@
+package org.jeecg.modules.business.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 销售目标
+ * @Author: jeecg-boot
+ * @Date:   2023-03-22
+ * @Version: V1.0
+ */
+@Data
+@TableName("bus_market_objective_info")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="bus_market_objective_info对象", description="销售目标")
+public class BusMarketObjective implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+	/**关联租户*/
+	@Excel(name = "关联租户", width = 15)
+    @ApiModelProperty(value = "关联租户")
+    private String tenantId;
+	/**关联酒店*/
+	@Excel(name = "关联酒店", width = 15)
+    @ApiModelProperty(value = "关联酒店")
+    private String hotelId;
+	/**年份*/
+	@Excel(name = "年份", width = 15)
+    @ApiModelProperty(value = "年份")
+    private Integer year;
+	/**月份*/
+	@Excel(name = "月份", width = 15)
+    @ApiModelProperty(value = "月份")
+    private String month;
+	/**营业额销售目标*/
+	@Excel(name = "营业额销售目标", width = 15)
+    @ApiModelProperty(value = "营业额销售目标")
+    private BigDecimal turnover;
+	/**出租率销售目标*/
+	@Excel(name = "出租率销售目标", width = 15)
+    @ApiModelProperty(value = "出租率销售目标")
+    private BigDecimal rentalRate;
+	/**平均房价销售目标*/
+	@Excel(name = "平均房价销售目标", width = 15)
+    @ApiModelProperty(value = "平均房价销售目标")
+    private BigDecimal roomPrice;
+	/**RevPer销售目标*/
+	@Excel(name = "RevPer销售目标", width = 15)
+    @ApiModelProperty(value = "RevPer销售目标")
+    private BigDecimal revper;
+	/**夜间数销售目标*/
+	@Excel(name = "夜间数销售目标", width = 15)
+    @ApiModelProperty(value = "夜间数销售目标")
+    private BigDecimal night;
+	/**json*/
+	@Excel(name = "json", width = 15)
+    @ApiModelProperty(value = "json")
+    private String json;
+	/**删除状态(0-正常,1-已删除)*/
+	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+    @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
+    @TableLogic
+    private Integer delFlag;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+	/**创建时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+	/**更新时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/BusPayInterfaceConfig.java

@@ -47,6 +47,7 @@ public class BusPayInterfaceConfig implements Serializable {
 	/**关联支付方式*/
 	@Excel(name = "关联支付方式", width = 15)
     @ApiModelProperty(value = "关联支付方式")
+    @Dict(dictTable = "bus_room_pay_type_info", dicCode = "id", dicText = "name")
     private String payTypeId;
 	/**商户号*/
 	@Excel(name = "商户号", width = 15)

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/BusServiceRepair.java

@@ -0,0 +1,94 @@
+package org.jeecg.modules.business.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 服务维修
+ * @Author: jeecg-boot
+ * @Date:   2023-03-22
+ * @Version: V1.0
+ */
+@Data
+@TableName("bus_service_repair_info")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="bus_service_repair_info对象", description="服务维修")
+public class BusServiceRepair implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+	/**关联租户*/
+	@Excel(name = "关联租户", width = 15)
+    @ApiModelProperty(value = "关联租户")
+    private String tenantId;
+	/**关联酒店*/
+	@Excel(name = "关联酒店", width = 15)
+    @ApiModelProperty(value = "关联酒店")
+    private String hotelId;
+
+    /**酒店名称*/
+    private transient String hotelName;
+
+	/**名称*/
+	@Excel(name = "名称", width = 15)
+    @ApiModelProperty(value = "名称")
+    private String name;
+	/**类型(1-服务；2-维修)*/
+	@Excel(name = "类型(1-服务；2-维修)", width = 15,dicCode="service_repair_type")
+    @Dict(dicCode = "service_repair_type")
+    @ApiModelProperty(value = "类型(1-服务；2-维修)")
+    private Integer type;
+	/**服务模块(1-物品；2-服务内容)*/
+	@Excel(name = "服务模块(1-物品；2-服务内容)", width = 15,dicCode="service_module")
+    @Dict(dicCode = "service_module")
+    @ApiModelProperty(value = "服务模块(1-物品；2-服务内容)")
+    private Integer serviceType;
+	/**关联物品分类*/
+	@Excel(name = "关联物品分类", width = 15)
+    @ApiModelProperty(value = "关联物品分类")
+    private String categoryId;
+
+    /**物品分类名称*/
+    private transient String categoryName;
+
+	/**删除状态(0-正常,1-已删除)*/
+	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+    @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
+    @TableLogic
+    private Integer delFlag;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+	/**创建时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+	/**更新时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/BusServiceRepairCategory.java

@@ -0,0 +1,76 @@
+package org.jeecg.modules.business.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 服务维修-物品分类
+ * @Author: jeecg-boot
+ * @Date:   2023-03-22
+ * @Version: V1.0
+ */
+@Data
+@TableName("bus_service_repair_category_info")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="bus_service_repair_category_info对象", description="服务维修-物品分类")
+public class BusServiceRepairCategory implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+	/**关联租户*/
+	@Excel(name = "关联租户", width = 15)
+    @ApiModelProperty(value = "关联租户")
+    private String tenantId;
+	/**关联酒店*/
+	@Excel(name = "关联酒店", width = 15)
+    @ApiModelProperty(value = "关联酒店")
+    private String hotelId;
+	/**分类名称*/
+	@Excel(name = "分类名称", width = 15)
+    @ApiModelProperty(value = "分类名称")
+    private String name;
+	/**状态(0-禁用；1-启用)*/
+	@Excel(name = "状态(0-禁用；1-启用)", width = 15)
+    @ApiModelProperty(value = "状态(0-禁用；1-启用)")
+    private Integer status;
+	/**删除状态(0-正常,1-已删除)*/
+	@Excel(name = "删除状态(0-正常,1-已删除)", width = 15)
+    @ApiModelProperty(value = "删除状态(0-正常,1-已删除)")
+    @TableLogic
+    private Integer delFlag;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+	/**创建时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+	/**更新时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/BusWaiter.java

@@ -57,6 +57,14 @@ public class BusWaiter implements Serializable {
     @ApiModelProperty(value = "性别(0-默认未知,1-男,2-女)")
     @Dict(dicCode = "sex")
     private Integer sex;
+    /**身份证号*/
+    @Excel(name = "身份证号", width = 15)
+    @ApiModelProperty(value = "身份证号")
+    private String idCard;
+    /**手机号*/
+    @Excel(name = "手机号", width = 15)
+    @ApiModelProperty(value = "手机号")
+    private String phone;
 	/**状态(0-禁用；1-启用)*/
 	@Excel(name = "状态(0-禁用；1-启用)", width = 15)
     @ApiModelProperty(value = "状态(0-禁用；1-启用)")

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

@@ -0,0 +1,17 @@
+package org.jeecg.modules.business.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.business.entity.BusMarketObjective;
+
+/**
+ * @Description: 销售目标
+ * @Author: jeecg-boot
+ * @Date:   2023-03-22
+ * @Version: V1.0
+ */
+public interface BusMarketObjectiveMapper extends BaseMapper<BusMarketObjective> {
+
+}

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

@@ -0,0 +1,17 @@
+package org.jeecg.modules.business.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.business.entity.BusServiceRepairCategory;
+
+/**
+ * @Description: 服务维修-物品分类
+ * @Author: jeecg-boot
+ * @Date:   2023-03-22
+ * @Version: V1.0
+ */
+public interface BusServiceRepairCategoryMapper extends BaseMapper<BusServiceRepairCategory> {
+
+}

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

@@ -0,0 +1,17 @@
+package org.jeecg.modules.business.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.business.entity.BusServiceRepair;
+
+/**
+ * @Description: 服务维修
+ * @Author: jeecg-boot
+ * @Date:   2023-03-22
+ * @Version: V1.0
+ */
+public interface BusServiceRepairMapper extends BaseMapper<BusServiceRepair> {
+
+}

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.demo.business.mapper.BusMarketObjectiveMapper">
+
+</mapper>

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.demo.business.mapper.BusServiceRepairCategoryMapper">
+
+</mapper>

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.demo.business.mapper.BusServiceRepairMapper">
+
+</mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/IBusDoorLockService.java

@@ -14,4 +14,6 @@ import java.util.List;
  */
 public interface IBusDoorLockService extends IService<BusDoorLock> {
     boolean deleteByHotelId(String hotelId);
+
+    List<BusDoorLock> getByHotelId(String hotelId);
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/IBusMarketObjectiveService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.business.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.business.entity.BusMarketObjective;
+
+/**
+ * @Description: 销售目标
+ * @Author: jeecg-boot
+ * @Date:   2023-03-22
+ * @Version: V1.0
+ */
+public interface IBusMarketObjectiveService extends IService<BusMarketObjective> {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/IBusServiceRepairCategoryService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.business.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.business.entity.BusServiceRepairCategory;
+
+/**
+ * @Description: 服务维修-物品分类
+ * @Author: jeecg-boot
+ * @Date:   2023-03-22
+ * @Version: V1.0
+ */
+public interface IBusServiceRepairCategoryService extends IService<BusServiceRepairCategory> {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/IBusServiceRepairService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.business.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.business.entity.BusServiceRepair;
+
+/**
+ * @Description: 服务维修
+ * @Author: jeecg-boot
+ * @Date:   2023-03-22
+ * @Version: V1.0
+ */
+public interface IBusServiceRepairService extends IService<BusServiceRepair> {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/BusDoorLockServiceImpl.java

@@ -39,4 +39,13 @@ public class BusDoorLockServiceImpl extends ServiceImpl<BusDoorLockMapper, BusDo
         boolean res = remove(query);
         return res;
     }
+
+    @Override
+    public List<BusDoorLock> getByHotelId(String hotelId) {
+        LambdaQueryWrapper<BusDoorLock> query = new LambdaQueryWrapper<BusDoorLock>();
+        query.eq(BusDoorLock::getHotelId, hotelId);
+        query.eq(BusDoorLock::getDelFlag, CommonConstant.DEL_FLAG_0.toString());
+        List<BusDoorLock> list= this.list(query);
+        return list;
+    }
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/BusMarketObjectiveServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.business.service.impl;
+
+import org.jeecg.modules.business.entity.BusMarketObjective;
+import org.jeecg.modules.business.mapper.BusMarketObjectiveMapper;
+import org.jeecg.modules.business.service.IBusMarketObjectiveService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 销售目标
+ * @Author: jeecg-boot
+ * @Date:   2023-03-22
+ * @Version: V1.0
+ */
+@Service
+public class BusMarketObjectiveServiceImpl extends ServiceImpl<BusMarketObjectiveMapper, BusMarketObjective> implements IBusMarketObjectiveService {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/BusServiceRepairCategoryServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.business.service.impl;
+
+import org.jeecg.modules.business.entity.BusServiceRepairCategory;
+import org.jeecg.modules.business.mapper.BusServiceRepairCategoryMapper;
+import org.jeecg.modules.business.service.IBusServiceRepairCategoryService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 服务维修-物品分类
+ * @Author: jeecg-boot
+ * @Date:   2023-03-22
+ * @Version: V1.0
+ */
+@Service
+public class BusServiceRepairCategoryServiceImpl extends ServiceImpl<BusServiceRepairCategoryMapper, BusServiceRepairCategory> implements IBusServiceRepairCategoryService {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/BusServiceRepairServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.business.service.impl;
+
+import org.jeecg.modules.business.entity.BusServiceRepair;
+import org.jeecg.modules.business.mapper.BusServiceRepairMapper;
+import org.jeecg.modules.business.service.IBusServiceRepairService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 服务维修
+ * @Author: jeecg-boot
+ * @Date:   2023-03-22
+ * @Version: V1.0
+ */
+@Service
+public class BusServiceRepairServiceImpl extends ServiceImpl<BusServiceRepairMapper, BusServiceRepair> implements IBusServiceRepairService {
+
+}