营销-协议单位(客户协议+联系人)

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

@@ -9,6 +9,9 @@ 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;
@@ -120,6 +123,18 @@ public class BusMarketAgreementContactsController extends JeecgController<BusMar
 				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("添加成功！");
 	}
@@ -144,6 +159,18 @@ public class BusMarketAgreementContactsController extends JeecgController<BusMar
 				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());

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

@@ -1,5 +1,6 @@
 package org.jeecg.modules.business.controller;
 
+import java.math.BigDecimal;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -9,6 +10,9 @@ 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;
@@ -24,7 +28,10 @@ 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;
@@ -120,6 +127,22 @@ public class BusMarketAgreementCustomerController extends JeecgController<BusMar
 				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("添加成功！");
 	}
@@ -144,6 +167,18 @@ public class BusMarketAgreementCustomerController extends JeecgController<BusMar
 				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());

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());
@@ -168,6 +191,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.setBookkeeping(busMarketAgreementUnit.getBookkeeping());
 		editModel.setRemarks(busMarketAgreementUnit.getRemarks());

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

@@ -53,8 +53,9 @@ public class BusMarketAgreementContacts implements Serializable {
     @ApiModelProperty(value = "姓名")
     private String name;
 	/**性别(0-默认未知,1-男,2-女)*/
-	@Excel(name = "性别(0-默认未知,1-男,2-女)", width = 15)
+    @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")
@@ -62,9 +63,9 @@ public class BusMarketAgreementContacts implements Serializable {
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "生日")
     private Date birthday;
-	/**称呼*/
-	@Excel(name = "称呼", width = 15)
-    @ApiModelProperty(value = "称呼")
+    /**称呼(1-先生,2-女士)*/
+    @Excel(name = "称呼(1-先生,2-女士)", width = 15,dicCode="calls")
+    @ApiModelProperty(value = "称呼(1-先生,2-女士)")
     private Integer calls;
 	/**部门*/
 	@Excel(name = "部门", width = 15)

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

@@ -54,6 +54,7 @@ public class BusMarketAgreementCustomer implements Serializable {
     private String name;
 	/**协议类型*/
 	@Excel(name = "协议类型", width = 15)
+    @Dict(dictTable = "bus_dict_item_info", dicCode = "id", dicText = "item_text")
     @ApiModelProperty(value = "协议类型")
     private String type;
 	/**协议单号*/

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;
+    }
+}