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/BusMarketAgreementContactsController.java

@@ -0,0 +1,265 @@
+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 com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import org.apache.commons.lang.StringUtils;
+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.BusMarketAgreementContacts;
+import org.jeecg.modules.business.entity.BusMarketAgreementCustomer;
+import org.jeecg.modules.business.entity.BusOrderSound;
+import org.jeecg.modules.business.service.IBusMarketAgreementContactsService;
+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-04-11
+ * @Version: V1.0
+ */
+@Api(tags="协议单位-联系人")
+@RestController
+@RequestMapping("/business/busMarketAgreementContacts")
+@Slf4j
+public class BusMarketAgreementContactsController extends JeecgController<BusMarketAgreementContacts, IBusMarketAgreementContactsService> {
+	@Autowired
+	private IBusMarketAgreementContactsService busMarketAgreementContactsService;
+
+	/**
+	 * 分页列表查询
+	 *
+	 * @param busMarketAgreementContacts
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "协议单位-联系人-分页列表查询")
+	@ApiOperation(value="协议单位-联系人-分页列表查询", notes="协议单位-联系人-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<BusMarketAgreementContacts>> queryPageList(BusMarketAgreementContacts busMarketAgreementContacts,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<BusMarketAgreementContacts> queryWrapper = QueryGenerator.initQueryWrapper(busMarketAgreementContacts, req.getParameterMap());
+		Page<BusMarketAgreementContacts> page = new Page<BusMarketAgreementContacts>(pageNo, pageSize);
+		IPage<BusMarketAgreementContacts> pageList = busMarketAgreementContactsService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+
+	 /**
+	  * 列表查询
+	  *
+	  * @param busMarketAgreementContacts
+	  * @param req
+	  * @return
+	  */
+	 //@AutoLog(value = "协议单位-联系人-列表查询")
+	 @ApiOperation(value="协议单位-联系人-列表查询", notes="协议单位-联系人-列表查询")
+	 @GetMapping(value = "/queryList")
+	 public Result<List<BusMarketAgreementContacts>> queryList(BusMarketAgreementContacts busMarketAgreementContacts, HttpServletRequest req) {
+		 QueryWrapper<BusMarketAgreementContacts> queryWrapper = QueryGenerator.initQueryWrapper(busMarketAgreementContacts, 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<BusMarketAgreementContacts> list = busMarketAgreementContactsService.list(queryWrapper);
+		 return Result.OK(list);
+	 }
+
+	/**
+	 *   添加
+	 *
+	 * @param busMarketAgreementContacts
+	 * @return
+	 */
+	@AutoLog(value = "协议单位-联系人-添加")
+	@ApiOperation(value="协议单位-联系人-添加", notes="协议单位-联系人-添加")
+	//@RequiresPermissions("business:bus_market_agreement_contacts_info:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody BusMarketAgreementContacts busMarketAgreementContacts) {
+		busMarketAgreementContacts.setDelFlag(CommonConstant.DEL_FLAG_0);
+		if(busMarketAgreementContacts.getTenantId() == null || busMarketAgreementContacts.getTenantId().equals("")){
+			LoginUser user = TokenUtils.getAuthUser();
+			if(user.getRelTenantIds() != null && !user.getRelTenantIds().equals("")){
+				busMarketAgreementContacts.setTenantId(user.getRelTenantIds());
+			} else {
+				throw new JeecgBootException("当前登录人租户信息错误");
+			}
+		}
+		//客户名称校验
+		LambdaQueryWrapper<BusMarketAgreementContacts> queryWrapper = new LambdaQueryWrapper<BusMarketAgreementContacts>();
+		queryWrapper.eq(BusMarketAgreementContacts::getName,busMarketAgreementContacts.getName());
+		if (StringUtils.isNotBlank(busMarketAgreementContacts.getId())) {
+			// 编辑页面校验
+			queryWrapper.ne(BusMarketAgreementContacts::getId,busMarketAgreementContacts.getId());
+		}
+		long num = busMarketAgreementContactsService.count(queryWrapper);
+		if (num != 0) {
+			// 该值不可用
+			return Result.error("客户名称已存在！");
+		}
+		busMarketAgreementContactsService.save(busMarketAgreementContacts);
+		return Result.OK("添加成功！");
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param busMarketAgreementContacts
+	 * @return
+	 */
+	@AutoLog(value = "协议单位-联系人-编辑")
+	@ApiOperation(value="协议单位-联系人-编辑", notes="协议单位-联系人-编辑")
+	//@RequiresPermissions("business:bus_market_agreement_contacts_info:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody BusMarketAgreementContacts busMarketAgreementContacts) {
+//		busMarketAgreementContactsService.updateById(busMarketAgreementContacts);
+		if(busMarketAgreementContacts.getTenantId() == null || busMarketAgreementContacts.getTenantId().equals("")){
+			LoginUser user = TokenUtils.getAuthUser();
+			if(user.getRelTenantIds() != null && !user.getRelTenantIds().equals("")){
+				busMarketAgreementContacts.setTenantId(user.getRelTenantIds());
+			} else {
+				throw new JeecgBootException("当前登录人租户信息错误");
+			}
+		}
+		//客户名称校验
+		LambdaQueryWrapper<BusMarketAgreementContacts> queryWrapper = new LambdaQueryWrapper<BusMarketAgreementContacts>();
+		queryWrapper.eq(BusMarketAgreementContacts::getName,busMarketAgreementContacts.getName());
+		if (StringUtils.isNotBlank(busMarketAgreementContacts.getId())) {
+			// 编辑页面校验
+			queryWrapper.ne(BusMarketAgreementContacts::getId,busMarketAgreementContacts.getId());
+		}
+		long num = busMarketAgreementContactsService.count(queryWrapper);
+		if (num != 0) {
+			// 该值不可用
+			return Result.error("客户名称已存在！");
+		}
+		BusMarketAgreementContacts editModel = busMarketAgreementContactsService.getById(busMarketAgreementContacts.getId());
+		editModel.setName(busMarketAgreementContacts.getName());
+		editModel.setSex(busMarketAgreementContacts.getSex());
+		editModel.setBirthday(busMarketAgreementContacts.getBirthday());
+		editModel.setCalls(busMarketAgreementContacts.getCalls());
+		editModel.setDepartment(busMarketAgreementContacts.getDepartment());
+		editModel.setCompanyPhone(busMarketAgreementContacts.getCompanyPhone());
+		editModel.setPhone(busMarketAgreementContacts.getPhone());
+		editModel.setHomePhone(busMarketAgreementContacts.getHomePhone());
+		editModel.setPost(busMarketAgreementContacts.getPost());
+		editModel.setPostalCode(busMarketAgreementContacts.getPostalCode());
+		editModel.setEmail(busMarketAgreementContacts.getEmail());
+		editModel.setAddress(busMarketAgreementContacts.getAddress());
+		editModel.setHobby(busMarketAgreementContacts.getHobby());
+		editModel.setRemarks(busMarketAgreementContacts.getRemarks());
+		busMarketAgreementContactsService.updateById(editModel);
+		return Result.OK("编辑成功!");
+	}
+
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "协议单位-联系人-通过id删除")
+	@ApiOperation(value="协议单位-联系人-通过id删除", notes="协议单位-联系人-通过id删除")
+	//@RequiresPermissions("business:bus_market_agreement_contacts_info:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		busMarketAgreementContactsService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "协议单位-联系人-批量删除")
+	@ApiOperation(value="协议单位-联系人-批量删除", notes="协议单位-联系人-批量删除")
+	//@RequiresPermissions("business:bus_market_agreement_contacts_info:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.busMarketAgreementContactsService.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<BusMarketAgreementContacts> queryById(@RequestParam(name="id",required=true) String id) {
+		BusMarketAgreementContacts busMarketAgreementContacts = busMarketAgreementContactsService.getById(id);
+		if(busMarketAgreementContacts==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(busMarketAgreementContacts);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param busMarketAgreementContacts
+    */
+    //@RequiresPermissions("business:bus_market_agreement_contacts_info:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, BusMarketAgreementContacts busMarketAgreementContacts) {
+        return super.exportXls(request, busMarketAgreementContacts, BusMarketAgreementContacts.class, "协议单位-联系人");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    //@RequiresPermissions("business:bus_market_agreement_contacts_info:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, BusMarketAgreementContacts.class);
+    }
+
+}

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

@@ -0,0 +1,269 @@
+package org.jeecg.modules.business.controller;
+
+import java.math.BigDecimal;
+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 com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import org.apache.commons.lang.StringUtils;
+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.BusMarketAgreementContacts;
+import org.jeecg.modules.business.entity.BusMarketAgreementCustomer;
+import org.jeecg.modules.business.entity.BusMarketAgreementUnit;
+import org.jeecg.modules.business.entity.BusOrderSound;
+import org.jeecg.modules.business.enums.AgreementCommonEnum;
+import org.jeecg.modules.business.enums.CommissionTypeEnum;
+import org.jeecg.modules.business.service.IBusMarketAgreementCustomerService;
+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-04-11
+ * @Version: V1.0
+ */
+@Api(tags="协议单位-客户协议")
+@RestController
+@RequestMapping("/business/busMarketAgreementCustomer")
+@Slf4j
+public class BusMarketAgreementCustomerController extends JeecgController<BusMarketAgreementCustomer, IBusMarketAgreementCustomerService> {
+	@Autowired
+	private IBusMarketAgreementCustomerService busMarketAgreementCustomerService;
+
+	/**
+	 * 分页列表查询
+	 *
+	 * @param busMarketAgreementCustomer
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "协议单位-客户协议-分页列表查询")
+	@ApiOperation(value="协议单位-客户协议-分页列表查询", notes="协议单位-客户协议-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<BusMarketAgreementCustomer>> queryPageList(BusMarketAgreementCustomer busMarketAgreementCustomer,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<BusMarketAgreementCustomer> queryWrapper = QueryGenerator.initQueryWrapper(busMarketAgreementCustomer, req.getParameterMap());
+		Page<BusMarketAgreementCustomer> page = new Page<BusMarketAgreementCustomer>(pageNo, pageSize);
+		IPage<BusMarketAgreementCustomer> pageList = busMarketAgreementCustomerService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+
+	 /**
+	  * 列表查询
+	  *
+	  * @param busMarketAgreementCustomer
+	  * @param req
+	  * @return
+	  */
+	 //@AutoLog(value = "协议单位-客户协议-列表查询")
+	 @ApiOperation(value="协议单位-客户协议-列表查询", notes="协议单位-客户协议-列表查询")
+	 @GetMapping(value = "/queryList")
+	 public Result<List<BusMarketAgreementCustomer>> queryList(BusMarketAgreementCustomer busMarketAgreementCustomer, HttpServletRequest req) {
+		 QueryWrapper<BusMarketAgreementCustomer> queryWrapper = QueryGenerator.initQueryWrapper(busMarketAgreementCustomer, 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<BusMarketAgreementCustomer> list = busMarketAgreementCustomerService.list(queryWrapper);
+		 return Result.OK(list);
+	 }
+
+	/**
+	 *   添加
+	 *
+	 * @param busMarketAgreementCustomer
+	 * @return
+	 */
+	@AutoLog(value = "协议单位-客户协议-添加")
+	@ApiOperation(value="协议单位-客户协议-添加", notes="协议单位-客户协议-添加")
+	//@RequiresPermissions("business:bus_market_agreement_customer_info:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody BusMarketAgreementCustomer busMarketAgreementCustomer) {
+		busMarketAgreementCustomer.setDelFlag(CommonConstant.DEL_FLAG_0);
+		if(busMarketAgreementCustomer.getTenantId() == null || busMarketAgreementCustomer.getTenantId().equals("")){
+			LoginUser user = TokenUtils.getAuthUser();
+			if(user.getRelTenantIds() != null && !user.getRelTenantIds().equals("")){
+				busMarketAgreementCustomer.setTenantId(user.getRelTenantIds());
+			} else {
+				throw new JeecgBootException("当前登录人租户信息错误");
+			}
+		}
+		//协议单号校验
+		LambdaQueryWrapper<BusMarketAgreementCustomer> queryWrapper = new LambdaQueryWrapper<BusMarketAgreementCustomer>();
+		queryWrapper.eq(BusMarketAgreementCustomer::getNumber,busMarketAgreementCustomer.getNumber());
+		if (StringUtils.isNotBlank(busMarketAgreementCustomer.getId())) {
+			// 编辑页面校验
+			queryWrapper.ne(BusMarketAgreementCustomer::getId,busMarketAgreementCustomer.getId());
+		}
+		long num = busMarketAgreementCustomerService.count(queryWrapper);
+		if (num != 0) {
+			// 该值不可用
+			return Result.error("协议单号已存在！");
+		}
+		busMarketAgreementCustomer.setRoomType(CommissionTypeEnum.house.getKey());
+		busMarketAgreementCustomer.setCommission(AgreementCommonEnum.yes.getKey());
+		busMarketAgreementCustomer.setFixedDiscount(AgreementCommonEnum.yes.getKey());
+		busMarketAgreementCustomer.setDiscount(BigDecimal.valueOf(100));
+		busMarketAgreementCustomerService.save(busMarketAgreementCustomer);
+		return Result.OK("添加成功！");
+	}
+
+	/**
+	 *  编辑
+	 *
+	 * @param busMarketAgreementCustomer
+	 * @return
+	 */
+	@AutoLog(value = "协议单位-客户协议-编辑")
+	@ApiOperation(value="协议单位-客户协议-编辑", notes="协议单位-客户协议-编辑")
+	//@RequiresPermissions("business:bus_market_agreement_customer_info:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody BusMarketAgreementCustomer busMarketAgreementCustomer) {
+//		busMarketAgreementCustomerService.updateById(busMarketAgreementCustomer);
+		if(busMarketAgreementCustomer.getTenantId() == null || busMarketAgreementCustomer.getTenantId().equals("")){
+			LoginUser user = TokenUtils.getAuthUser();
+			if(user.getRelTenantIds() != null && !user.getRelTenantIds().equals("")){
+				busMarketAgreementCustomer.setTenantId(user.getRelTenantIds());
+			} else {
+				throw new JeecgBootException("当前登录人租户信息错误");
+			}
+		}
+		//协议单号校验
+		LambdaQueryWrapper<BusMarketAgreementCustomer> queryWrapper = new LambdaQueryWrapper<BusMarketAgreementCustomer>();
+		queryWrapper.eq(BusMarketAgreementCustomer::getNumber,busMarketAgreementCustomer.getNumber());
+		if (StringUtils.isNotBlank(busMarketAgreementCustomer.getId())) {
+			// 编辑页面校验
+			queryWrapper.ne(BusMarketAgreementCustomer::getId,busMarketAgreementCustomer.getId());
+		}
+		long num = busMarketAgreementCustomerService.count(queryWrapper);
+		if (num != 0) {
+			// 该值不可用
+			return Result.error("协议单号已存在！");
+		}
+		BusMarketAgreementCustomer editModel = busMarketAgreementCustomerService.getById(busMarketAgreementCustomer.getId());
+		editModel.setName(busMarketAgreementCustomer.getName());
+		editModel.setType(busMarketAgreementCustomer.getType());
+		editModel.setNumber(busMarketAgreementCustomer.getNumber());
+		editModel.setSignTime(busMarketAgreementCustomer.getSignTime());
+		editModel.setEffective(busMarketAgreementCustomer.getEffective());
+		editModel.setSecrecy(busMarketAgreementCustomer.getSecrecy());
+		editModel.setCustomerSignatory(busMarketAgreementCustomer.getCustomerSignatory());
+		editModel.setCompanySignatory(busMarketAgreementCustomer.getCompanySignatory());
+		editModel.setRemarks(busMarketAgreementCustomer.getRemarks());
+		editModel.setContent(busMarketAgreementCustomer.getContent());
+		busMarketAgreementCustomerService.updateById(editModel);
+		return Result.OK("编辑成功!");
+	}
+
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "协议单位-客户协议-通过id删除")
+	@ApiOperation(value="协议单位-客户协议-通过id删除", notes="协议单位-客户协议-通过id删除")
+	//@RequiresPermissions("business:bus_market_agreement_customer_info:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		busMarketAgreementCustomerService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "协议单位-客户协议-批量删除")
+	@ApiOperation(value="协议单位-客户协议-批量删除", notes="协议单位-客户协议-批量删除")
+	//@RequiresPermissions("business:bus_market_agreement_customer_info:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.busMarketAgreementCustomerService.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<BusMarketAgreementCustomer> queryById(@RequestParam(name="id",required=true) String id) {
+		BusMarketAgreementCustomer busMarketAgreementCustomer = busMarketAgreementCustomerService.getById(id);
+		if(busMarketAgreementCustomer==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(busMarketAgreementCustomer);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param busMarketAgreementCustomer
+    */
+    //@RequiresPermissions("business:bus_market_agreement_customer_info:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, BusMarketAgreementCustomer busMarketAgreementCustomer) {
+        return super.exportXls(request, busMarketAgreementCustomer, BusMarketAgreementCustomer.class, "协议单位-客户协议");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    //@RequiresPermissions("business:bus_market_agreement_customer_info:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, BusMarketAgreementCustomer.class);
+    }
+
+}

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

@@ -5,6 +5,8 @@ import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import org.apache.commons.lang.StringUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.exception.JeecgBootException;
@@ -17,12 +19,14 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
+import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.business.entity.*;
 import org.jeecg.modules.business.enums.AgreenmentAccountStatus;
 import org.jeecg.modules.business.enums.AgreenmentCheckStatus;
 import org.jeecg.modules.business.service.IBusMarketAgreementUnitService;
 import org.jeecg.modules.business.service.IBusHotelService;
 import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.modules.system.entity.SysDictItem;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
@@ -64,6 +68,13 @@ public class BusMarketAgreementUnitController extends JeecgController<BusMarketA
 															   HttpServletRequest req) {
 		QueryWrapper<BusMarketAgreementUnit> queryWrapper = QueryGenerator.initQueryWrapper(busMarketAgreementUnit, req.getParameterMap());
 		Page<BusMarketAgreementUnit> page = new Page<BusMarketAgreementUnit>(pageNo, pageSize);
+		String keyWord = req.getParameter("keyWord");
+		if(oConvertUtils.isNotEmpty(keyWord)){
+			queryWrapper.and(i -> i.like("customer_name",keyWord)
+					.or().like("customer_no",keyWord)
+					.or().like("contacts_name",keyWord)
+					.or().like("phone",keyWord));
+		}
 		IPage<BusMarketAgreementUnit> pageList = busAgreementUnitService.page(page, queryWrapper);
 		pageList.getRecords().forEach(item->{
 			BusHotel hotle = busHotelService.getById(item.getHotelId());
@@ -125,6 +136,18 @@ public class BusMarketAgreementUnitController extends JeecgController<BusMarketA
 				throw new JeecgBootException("当前登录人租户信息错误");
 			}
 		}
+		//客户编号校验
+		LambdaQueryWrapper<BusMarketAgreementUnit> queryWrapper = new LambdaQueryWrapper<BusMarketAgreementUnit>();
+		queryWrapper.eq(BusMarketAgreementUnit::getCustomerNo,busMarketAgreementUnit.getCustomerNo());
+		if (StringUtils.isNotBlank(busMarketAgreementUnit.getId())) {
+			// 编辑页面校验
+			queryWrapper.ne(BusMarketAgreementUnit::getId,busMarketAgreementUnit.getId());
+		}
+		long num = busAgreementUnitService.count(queryWrapper);
+		if (num != 0) {
+			// 该值不可用
+			return Result.error("客户编号已存在！");
+		}
 		BusMarketAgreementUnit editModel = busAgreementUnitService.getById(busMarketAgreementUnit.getId());
 		editModel.setCustomerName(busMarketAgreementUnit.getCustomerName());
 		editModel.setCustomerShortName(busMarketAgreementUnit.getCustomerShortName());
@@ -149,6 +172,48 @@ public class BusMarketAgreementUnitController extends JeecgController<BusMarketA
 	}
 
 	/**
+	 *  编辑
+	 *
+	 * @param busMarketAgreementUnit
+	 * @return
+	 */
+	@AutoLog(value = "协议单位-编辑")
+	@ApiOperation(value="协议单位-编辑", notes="协议单位-编辑")
+	//@RequiresPermissions("business:bus_agreement_unit_info:edit")
+	@RequestMapping(value = "/editOther", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> editOther(@RequestBody BusMarketAgreementUnit busMarketAgreementUnit) {
+//		busAgreementUnitService.updateById(busAgreementUnit);
+		if(busMarketAgreementUnit.getTenantId() == null || busMarketAgreementUnit.getTenantId().equals("")){
+			LoginUser user = TokenUtils.getAuthUser();
+			if(user.getRelTenantIds() != null && !user.getRelTenantIds().equals("")){
+				busMarketAgreementUnit.setTenantId(user.getRelTenantIds());
+			} else {
+				throw new JeecgBootException("当前登录人租户信息错误");
+			}
+		}
+		//客户编号校验
+		LambdaQueryWrapper<BusMarketAgreementUnit> queryWrapper = new LambdaQueryWrapper<BusMarketAgreementUnit>();
+		queryWrapper.eq(BusMarketAgreementUnit::getCustomerNo,busMarketAgreementUnit.getCustomerNo());
+		if (StringUtils.isNotBlank(busMarketAgreementUnit.getId())) {
+			// 编辑页面校验
+			queryWrapper.ne(BusMarketAgreementUnit::getId,busMarketAgreementUnit.getId());
+		}
+		long num = busAgreementUnitService.count(queryWrapper);
+		if (num != 0) {
+			// 该值不可用
+			return Result.error("客户编号已存在！");
+		}
+		BusMarketAgreementUnit editModel = busAgreementUnitService.getById(busMarketAgreementUnit.getId());
+		editModel.setBookkeeping(busMarketAgreementUnit.getBookkeeping());
+		editModel.setRemarks(busMarketAgreementUnit.getRemarks());
+		editModel.setReception(busMarketAgreementUnit.getReception());
+		editModel.setCommission(busMarketAgreementUnit.getCommission());
+		editModel.setBookkStatus(busMarketAgreementUnit.getBookkStatus());
+		busAgreementUnitService.updateById(editModel);
+		return Result.OK("编辑成功!");
+	}
+
+	/**
 	 *   通过id删除
 	 *
 	 * @param id

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

@@ -24,6 +24,7 @@ import lombok.extern.slf4j.Slf4j;
 
 import org.jeecg.modules.business.entity.BusAdvert;
 import org.jeecg.modules.business.entity.BusOrderSound;
+import org.jeecg.modules.business.entity.BusSalesPerson;
 import org.jeecg.modules.business.service.IBusOrderSoundService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
@@ -78,6 +79,27 @@ public class BusOrderSoundController extends JeecgController<BusOrderSound, IBus
 		return Result.OK(pageList);
 	}
 
+	 /**
+	  * 列表查询
+	  *
+	  * @param busOrderSound
+	  * @param req
+	  * @return
+	  */
+	 //@AutoLog(value = "订单铃声-列表查询")
+	 @ApiOperation(value="订单铃声-列表查询", notes="订单铃声-列表查询")
+	 @GetMapping(value = "/queryList")
+	 public Result<List<BusOrderSound>> queryList(BusOrderSound busOrderSound, HttpServletRequest req) {
+		 QueryWrapper<BusOrderSound> queryWrapper = QueryGenerator.initQueryWrapper(busOrderSound, 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<BusOrderSound> list = busOrderSoundService.list(queryWrapper);
+		 return Result.OK(list);
+	 }
+
 	/**
 	 *   添加
 	 *

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

@@ -0,0 +1,131 @@
+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-04-11
+ * @Version: V1.0
+ */
+@Data
+@TableName("bus_market_agreement_contacts_info")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="bus_market_agreement_contacts_info对象", description="协议单位-联系人")
+public class BusMarketAgreementContacts 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 agreementId;
+	/**姓名*/
+	@Excel(name = "姓名", width = 15)
+    @ApiModelProperty(value = "姓名")
+    private String name;
+	/**性别(0-默认未知,1-男,2-女)*/
+    @Excel(name = "性别(0-默认未知,1-男,2-女)", width = 15,dicCode="sex")
+    @ApiModelProperty(value = "性别(0-默认未知,1-男,2-女)")
+    @Dict(dicCode = "sex")
+    private Integer sex;
+	/**生日*/
+	@Excel(name = "生日", width = 15, format = "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "生日")
+    private Date birthday;
+    /**称呼(1-先生,2-女士)*/
+    @Excel(name = "称呼(1-先生,2-女士)", width = 15,dicCode="calls")
+    @ApiModelProperty(value = "称呼(1-先生,2-女士)")
+    private Integer calls;
+	/**部门*/
+	@Excel(name = "部门", width = 15)
+    @ApiModelProperty(value = "部门")
+    private String department;
+	/**公司电话*/
+	@Excel(name = "公司电话", width = 15)
+    @ApiModelProperty(value = "公司电话")
+    private String companyPhone;
+	/**手机号*/
+	@Excel(name = "手机号", width = 15)
+    @ApiModelProperty(value = "手机号")
+    private String phone;
+	/**家庭电话*/
+	@Excel(name = "家庭电话", width = 15)
+    @ApiModelProperty(value = "家庭电话")
+    private String homePhone;
+	/**职务*/
+	@Excel(name = "职务", width = 15)
+    @ApiModelProperty(value = "职务")
+    private String post;
+	/**邮编*/
+	@Excel(name = "邮编", width = 15)
+    @ApiModelProperty(value = "邮编")
+    private String postalCode;
+	/**电子邮件*/
+	@Excel(name = "电子邮件", width = 15)
+    @ApiModelProperty(value = "电子邮件")
+    private String email;
+	/**地址*/
+	@Excel(name = "地址", width = 15)
+    @ApiModelProperty(value = "地址")
+    private String address;
+	/**爱好*/
+	@Excel(name = "爱好", width = 15)
+    @ApiModelProperty(value = "爱好")
+    private String hobby;
+	/**备注*/
+	@Excel(name = "备注", width = 15)
+    @ApiModelProperty(value = "备注")
+    private String remarks;
+	/**删除状态(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/BusMarketAgreementCustomer.java

@@ -0,0 +1,143 @@
+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-04-11
+ * @Version: V1.0
+ */
+@Data
+@TableName("bus_market_agreement_customer_info")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="bus_market_agreement_customer_info对象", description="协议单位-客户协议")
+public class BusMarketAgreementCustomer 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 agreementId;
+	/**关联酒店*/
+	@Excel(name = "关联酒店", width = 15)
+    @ApiModelProperty(value = "关联酒店")
+    private String hotelId;
+	/**协议主题*/
+	@Excel(name = "协议主题", width = 15)
+    @ApiModelProperty(value = "协议主题")
+    private String name;
+	/**协议类型*/
+	@Excel(name = "协议类型", width = 15)
+    @Dict(dictTable = "bus_dict_item_info", dicCode = "id", dicText = "item_text")
+    @ApiModelProperty(value = "协议类型")
+    private String type;
+	/**协议单号*/
+	@Excel(name = "协议单号", width = 15)
+    @ApiModelProperty(value = "协议单号")
+    private String number;
+	/**签约时间*/
+	@Excel(name = "签约时间", width = 15, format = "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "签约时间")
+    private Date signTime;
+	/**有效期*/
+	@Excel(name = "有效期", width = 15, format = "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "有效期")
+    private Date effective;
+	/**佣金信息保密*/
+	@Excel(name = "佣金信息保密", width = 15)
+    @ApiModelProperty(value = "佣金信息保密")
+    private Integer secrecy;
+	/**客户签约人*/
+	@Excel(name = "客户签约人", width = 15)
+    @ApiModelProperty(value = "客户签约人")
+    private String customerSignatory;
+	/**本司签约人*/
+	@Excel(name = "本司签约人", width = 15)
+    @ApiModelProperty(value = "本司签约人")
+    private String companySignatory;
+	/**内容*/
+	@Excel(name = "内容", width = 15)
+    @ApiModelProperty(value = "内容")
+    private String content;
+	/**备注*/
+	@Excel(name = "备注", width = 15)
+    @ApiModelProperty(value = "备注")
+    private String remarks;
+
+    /**计佣类型(0-固定计佣；1-房类计佣)*/
+    @Excel(name = "计佣类型(0-固定计佣；1-房类计佣)", width = 15)
+    @ApiModelProperty(value = "计佣类型(0-固定计佣；1-房类计佣)")
+    private java.lang.Integer roomType;
+    /**佣金单位(0-元；1-%)*/
+    @Excel(name = "佣金单位(0-元；1-%)", width = 15)
+    @ApiModelProperty(value = "佣金单位(0-元；1-%)")
+    private java.lang.Integer commissionUnit;
+    /**每日佣金*/
+    @Excel(name = "每日佣金", width = 15)
+    @ApiModelProperty(value = "每日佣金")
+    private java.math.BigDecimal dailyCommission;
+    /**每日计佣(0-否；1-是)*/
+    @Excel(name = "每日计佣(0-否；1-是)", width = 15)
+    @ApiModelProperty(value = "每日计佣(0-否；1-是)")
+    private java.lang.Integer commission;
+    /**使用固定房价折扣(0-否；1-是)*/
+    @Excel(name = "使用固定房价折扣(0-否；1-是)", width = 15)
+    @ApiModelProperty(value = "使用固定房价折扣(0-否；1-是)")
+    private java.lang.Integer fixedDiscount;
+    /**房价固定折扣*/
+    @Excel(name = "房价固定折扣", width = 15)
+    @ApiModelProperty(value = "房价固定折扣")
+    private java.math.BigDecimal discount;
+
+	/**删除状态(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/BusMarketAgreementUnit.java

@@ -124,6 +124,7 @@ public class BusMarketAgreementUnit implements Serializable {
 	/**客户行业*/
 	@Excel(name = "客户行业", width = 15)
     @ApiModelProperty(value = "客户行业")
+    @Dict(dictTable = "bus_dict_item_info", dicCode = "id", dicText = "item_text")
     private String customerIndustry;
 	/**审核状态*/
 	@Excel(name = "审核状态", width = 15)
@@ -169,18 +170,20 @@ public class BusMarketAgreementUnit implements Serializable {
 	@Excel(name = "不允许该单位记账", width = 15)
     @ApiModelProperty(value = "不允许该单位记账")
     private Integer bookkStatus;
-	/**前台是否查询*/
-	@Excel(name = "前台是否查询", width = 15)
-    @ApiModelProperty(value = "前台是否查询")
-    private Integer commission;
-	/**是否返佣*/
-	@Excel(name = "是否返佣", width = 15)
+
+    /**是否返佣*/
+    @Excel(name = "是否返佣", width = 15)
     @ApiModelProperty(value = "是否返佣")
+    private Integer commission;
+
+    /**前台是否查询*/
+    @Excel(name = "前台是否查询", width = 15)
+    @ApiModelProperty(value = "前台是否查询")
     private Integer reception;
 	/**备注*/
 	@Excel(name = "备注", width = 15)
     @ApiModelProperty(value = "备注")
-    private String remark;
+    private String remarks;
 	/**删除状态*/
 	@Excel(name = "删除状态", width = 15)
     @ApiModelProperty(value = "删除状态")

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/enums/AgreementCommonEnum.java

@@ -0,0 +1,53 @@
+package org.jeecg.modules.business.enums;
+
+import org.jeecg.common.system.vo.DictModel;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public enum AgreementCommonEnum {
+    no(0, "否"),
+    yes(1, "是"),
+    ;
+
+    Integer key;
+
+    String title;
+
+    AgreementCommonEnum(Integer key, String title){
+        this.key = key;
+        this.title = title;
+    }
+    public Integer getKey() {
+        return key;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    /**
+     * 获取字典数据
+     * @return
+     */
+    public static List<DictModel> getDictList(){
+        List<DictModel> list = new ArrayList<>();
+        DictModel dictModel = null;
+        for(AgreementCommonEnum e: AgreementCommonEnum.values()){
+            dictModel = new DictModel();
+            dictModel.setValue(e.key.toString());
+            dictModel.setText(e.title);
+            list.add(dictModel);
+        }
+        return list;
+    }
+
+    public static AgreementCommonEnum val(Integer key){
+        for(AgreementCommonEnum bld: values()){
+            if(bld.key == key){
+                return bld;
+            }
+        }
+        return null;
+    }
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/enums/CommissionTypeEnum.java

@@ -0,0 +1,52 @@
+package org.jeecg.modules.business.enums;
+
+import org.jeecg.common.system.vo.DictModel;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public enum CommissionTypeEnum {
+    house(1, "是"),
+    fix(0, "否"),;
+
+    Integer key;
+
+    String title;
+
+    CommissionTypeEnum(Integer key, String title){
+        this.key = key;
+        this.title = title;
+    }
+    public Integer getKey() {
+        return key;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    /**
+     * 获取字典数据
+     * @return
+     */
+    public static List<DictModel> getDictList(){
+        List<DictModel> list = new ArrayList<>();
+        DictModel dictModel = null;
+        for(CommissionTypeEnum e: CommissionTypeEnum.values()){
+            dictModel = new DictModel();
+            dictModel.setValue(e.key.toString());
+            dictModel.setText(e.title);
+            list.add(dictModel);
+        }
+        return list;
+    }
+
+    public static CommissionTypeEnum val(Integer key){
+        for(CommissionTypeEnum bld: values()){
+            if(bld.key == key){
+                return bld;
+            }
+        }
+        return null;
+    }
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/BusMarketAgreementContactsMapper.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.BusMarketAgreementContacts;
+
+/**
+ * @Description: 协议单位-联系人
+ * @Author: jeecg-boot
+ * @Date:   2023-04-11
+ * @Version: V1.0
+ */
+public interface BusMarketAgreementContactsMapper extends BaseMapper<BusMarketAgreementContacts> {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/BusMarketAgreementCustomerMapper.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.BusMarketAgreementCustomer;
+
+/**
+ * @Description: 协议单位-客户协议
+ * @Author: jeecg-boot
+ * @Date:   2023-04-11
+ * @Version: V1.0
+ */
+public interface BusMarketAgreementCustomerMapper extends BaseMapper<BusMarketAgreementCustomer> {
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/BusMarketAgreementContactsMapper.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.BusMarketAgreementContactsMapper">
+
+</mapper>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/BusMarketAgreementCustomerMapper.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.BusMarketAgreementCustomerMapper">
+
+</mapper>

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

@@ -0,0 +1,14 @@
+package org.jeecg.modules.business.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.business.entity.BusMarketAgreementContacts;
+
+/**
+ * @Description: 协议单位-联系人
+ * @Author: jeecg-boot
+ * @Date:   2023-04-11
+ * @Version: V1.0
+ */
+public interface IBusMarketAgreementContactsService extends IService<BusMarketAgreementContacts> {
+
+}

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

@@ -0,0 +1,14 @@
+package org.jeecg.modules.business.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.business.entity.BusMarketAgreementCustomer;
+
+/**
+ * @Description: 协议单位-客户协议
+ * @Author: jeecg-boot
+ * @Date:   2023-04-11
+ * @Version: V1.0
+ */
+public interface IBusMarketAgreementCustomerService extends IService<BusMarketAgreementCustomer> {
+
+}

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

@@ -0,0 +1,19 @@
+package org.jeecg.modules.business.service.impl;
+
+import org.jeecg.modules.business.entity.BusMarketAgreementContacts;
+import org.jeecg.modules.business.mapper.BusMarketAgreementContactsMapper;
+import org.jeecg.modules.business.service.IBusMarketAgreementContactsService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 协议单位-联系人
+ * @Author: jeecg-boot
+ * @Date:   2023-04-11
+ * @Version: V1.0
+ */
+@Service
+public class BusMarketAgreementContactsServiceImpl extends ServiceImpl<BusMarketAgreementContactsMapper, BusMarketAgreementContacts> implements IBusMarketAgreementContactsService {
+
+}

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

@@ -0,0 +1,19 @@
+package org.jeecg.modules.business.service.impl;
+
+import org.jeecg.modules.business.entity.BusMarketAgreementCustomer;
+import org.jeecg.modules.business.mapper.BusMarketAgreementCustomerMapper;
+import org.jeecg.modules.business.service.IBusMarketAgreementCustomerService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 协议单位-客户协议
+ * @Author: jeecg-boot
+ * @Date:   2023-04-11
+ * @Version: V1.0
+ */
+@Service
+public class BusMarketAgreementCustomerServiceImpl extends ServiceImpl<BusMarketAgreementCustomerMapper, BusMarketAgreementCustomer> implements IBusMarketAgreementCustomerService {
+
+}