添加客户保率

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataHistoricalContractEntity.java

@@ -17,12 +17,15 @@
 package com.logpm.basicdata.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.EqualsAndHashCode;
 import org.springblade.core.tenant.mp.TenantEntity;
 
+import java.util.Date;
+
 /**
  * 客户历史合同记录 实体类
  *
@@ -35,5 +38,52 @@ import org.springblade.core.tenant.mp.TenantEntity;
 @EqualsAndHashCode(callSuper = true)
 public class BasicdataHistoricalContractEntity extends TenantEntity {
 
+	/**
+	 * 预留1
+	 */
+	@ApiModelProperty(value = "预留1")
+	private String reserve1;
+	/**
+	 * 预留2
+	 */
+	@ApiModelProperty(value = "预留2")
+	private String reserve2;
+	/**
+	 * 预留3
+	 */
+	@ApiModelProperty(value = "预留3")
+	private String reserve3;
+	/**
+	 * 预留4
+	 */
+	@ApiModelProperty(value = "预留4")
+	private String reserve4;
+	/**
+	 * 预留5
+	 */
+	@ApiModelProperty(value = "预留5")
+	private String reserve5;
+	/**
+	 * 客户ID
+	 */
+	@ApiModelProperty(value = "客户ID")
+	private String clientId;
 
+	/**
+	 * 合同附件
+	 */
+	@ApiModelProperty(value = "合同附件")
+	private String leaseAccessories;
+	/**
+	 * 合同开始时间
+	 */
+	@ApiModelProperty(value = "合同开始时间")
+	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	private Date contractStartTime;
+	/**
+	 * 合同结束时间
+	 */
+	@ApiModelProperty(value = "合同结束时间")
+	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	private Date contractEntTime;
 }

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataStoreContactEntity.java

@@ -17,12 +17,15 @@
 package com.logpm.basicdata.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.EqualsAndHashCode;
 import org.springblade.core.tenant.mp.TenantEntity;
 
+import java.util.Date;
+
 /**
  * 基础门店联系人表 实体类
  *
@@ -35,5 +38,45 @@ import org.springblade.core.tenant.mp.TenantEntity;
 @EqualsAndHashCode(callSuper = true)
 public class BasicdataStoreContactEntity extends TenantEntity {
 
+	/**
+	 * 预留1
+	 */
+	@ApiModelProperty(value = "预留1")
+	private String reserve1;
+	/**
+	 * 预留2
+	 */
+	@ApiModelProperty(value = "预留2")
+	private String reserve2;
+	/**
+	 * 预留3
+	 */
+	@ApiModelProperty(value = "预留3")
+	private String reserve3;
+	/**
+	 * 预留4
+	 */
+	@ApiModelProperty(value = "预留4")
+	private String reserve4;
+	/**
+	 * 预留5
+	 */
+	@ApiModelProperty(value = "预留5")
+	private String reserve5;
+	/**
+	 * 门店名称
+	 */
+	@ApiModelProperty(value = "门店名称")
+	private String shopId;
+	/**
+	 * 联系人
+	 */
+	@ApiModelProperty(value = "联系人")
+	private Integer linkman;
+	/**
+	 * 联系电话
+	 */
+	@ApiModelProperty(value = "联系电话")
+	private Integer phone;
 
 }

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataSupportValueEntity.java

@@ -0,0 +1,90 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.tenant.mp.TenantEntity;
+
+/**
+ * 客户基础保价表 实体类
+ *
+ * @author cyz
+ * @since 2023-05-26
+ */
+@Data
+@TableName("logpm_basicdata_support_value")
+@ApiModel(value = "BasicdataSupportValue对象", description = "客户基础保价表")
+@EqualsAndHashCode(callSuper = true)
+public class BasicdataSupportValueEntity extends TenantEntity {
+
+	/**
+	 * 收货用户名称
+	 */
+	@ApiModelProperty(value = "收货用户名称")
+	private String userName;
+	/**
+	 * 保费率
+	 */
+	@ApiModelProperty(value = "保费率")
+	private Integer premiumRate;
+	/**
+	 * 收货用户地址
+	 */
+	@ApiModelProperty(value = "收货用户地址")
+	private String userAdderss;
+	/**
+	 * 收货用户电话
+	 */
+	@ApiModelProperty(value = "收货用户电话")
+	private String userPhone;
+	/**
+	 * 预留1
+	 */
+	@ApiModelProperty(value = "预留1")
+	private String reserve1;
+	/**
+	 * 预留2
+	 */
+	@ApiModelProperty(value = "预留2")
+	private String reserve2;
+	/**
+	 * 预留3
+	 */
+	@ApiModelProperty(value = "预留3")
+	private String reserve3;
+	/**
+	 * 预留4
+	 */
+	@ApiModelProperty(value = "预留4")
+	private String reserve4;
+	/**
+	 * 预留5
+	 */
+	@ApiModelProperty(value = "预留5")
+	private String reserve5;
+	/**
+	 * 客户ID（结算对象）
+	 */
+	@ApiModelProperty(value = "客户ID（结算对象）")
+	private String clientId;
+
+}

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataSupportValueClient.java

@@ -0,0 +1,49 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.feign;
+
+import org.springblade.core.mp.support.BladePage;
+import com.logpm.basicdata.entity.BasicdataSupportValueEntity;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * 客户基础保价表 Feign接口类
+ *
+ * @author cyz
+ * @since 2023-05-26
+ */
+@FeignClient(
+    value = "blade-basicdataSupportValue"
+)
+public interface IBasicdataSupportValueClient {
+
+    String API_PREFIX = "/client";
+    String TOP = API_PREFIX + "/top2314";
+
+    /**
+     * 获取客户基础保价表列表
+     *
+     * @param current   页号
+     * @param size      页数
+     * @return BladePage
+     */
+    @GetMapping(TOP)
+    BladePage<BasicdataSupportValueEntity> top(@RequestParam("current") Integer current, @RequestParam("size") Integer size);
+
+}

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataHistoricalContractVO.java

@@ -32,4 +32,5 @@ import lombok.EqualsAndHashCode;
 public class BasicdataHistoricalContractVO extends BasicdataHistoricalContractEntity {
 	private static final long serialVersionUID = 1L;
 
+	private String clientName;
 }

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataSupportValueVO.java

@@ -0,0 +1,35 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.vo;
+
+import com.logpm.basicdata.entity.BasicdataSupportValueEntity;
+import org.springblade.core.tool.node.INode;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 客户基础保价表 视图实体类
+ *
+ * @author cyz
+ * @since 2023-05-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class BasicdataSupportValueVO extends BasicdataSupportValueEntity {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataClientController.java

@@ -100,6 +100,17 @@ public class BasicdataClientController extends BladeController {
 		return R.data(pages);
 	}
 
+	/**
+	 * 基础客户表查询
+	 */
+	@GetMapping("/listName")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入basicdataClient")
+	public R<List<BasicdataClientEntity>> listName(String name) {
+		List<BasicdataClientEntity> pages = basicdataClientService.listName(name);
+		return R.data(pages);
+	}
+
 	/**
 	 * 基础客户表 新增
 	 */
@@ -127,7 +138,7 @@ public class BasicdataClientController extends BladeController {
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "新增或修改", notes = "传入basicdataClient")
 	public R submit(@Valid @RequestBody BasicdataClientEntity basicdataClient) {
-		return R.status(basicdataClientService.saveOrUpdate(basicdataClient));
+		return R.status(basicdataClientService.ownSaveOrUpdate(basicdataClient));
 	}
 
 	/**

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataHistoricalContractController.java

@@ -16,6 +16,8 @@
  */
 package com.logpm.basicdata.controller;
 
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.logpm.basicdata.service.IBasicdataClientService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -57,6 +59,7 @@ import javax.servlet.http.HttpServletResponse;
 public class BasicdataHistoricalContractController extends BladeController {
 
 	private final IBasicdataHistoricalContractService basicdataHistoricalContractService;
+	private final IBasicdataClientService basicdataClientService;
 
 	/**
 	 * 客户历史合同记录 详情
@@ -76,6 +79,25 @@ public class BasicdataHistoricalContractController extends BladeController {
 	@ApiOperation(value = "分页", notes = "传入basicdataHistoricalContract")
 	public R<IPage<BasicdataHistoricalContractEntity>> list(@ApiIgnore @RequestParam Map<String, Object> basicdataHistoricalContract, Query query) {
 		IPage<BasicdataHistoricalContractEntity> pages = basicdataHistoricalContractService.page(Condition.getPage(query), Condition.getQueryWrapper(basicdataHistoricalContract, BasicdataHistoricalContractEntity.class));
+		pages.getRecords().forEach( i ->{
+			i.setClientId(basicdataClientService.getById(i.getClientId()).getClientName());
+		});
+
+		return R.data(pages);
+	}
+
+	/**
+	 * 客户历史合同记录 分页
+	 */
+	@GetMapping("/pageList")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入basicdataHistoricalContract")
+	public R<IPage<BasicdataHistoricalContractEntity>> pageList(@ApiIgnore @RequestParam Map<String, Object> basicdataHistoricalContract, Query query) {
+		IPage<BasicdataHistoricalContractEntity> pages = basicdataHistoricalContractService.pageList(Condition.getPage(query), basicdataHistoricalContract);
+//		pages.getRecords().forEach( i ->{
+//			i.setClientId(basicdataClientService.getById(i.getClientId()).getClientName());
+//		});
+
 		return R.data(pages);
 	}
 

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataSupportValueController.java

@@ -0,0 +1,150 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.basicdata.entity.BasicdataSupportValueEntity;
+import com.logpm.basicdata.vo.BasicdataSupportValueVO;
+import com.logpm.basicdata.excel.BasicdataSupportValueExcel;
+import com.logpm.basicdata.service.IBasicdataSupportValueService;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.tool.utils.DateUtil;
+import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.tool.constant.BladeConstant;
+import springfox.documentation.annotations.ApiIgnore;
+import java.util.Map;
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * 客户基础保价表 控制器
+ *
+ * @author cyz
+ * @since 2023-05-26
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/basicdataSupportValue")
+@Api(value = "客户基础保价表", tags = "客户基础保价表接口")
+public class BasicdataSupportValueController extends BladeController {
+
+	private final IBasicdataSupportValueService basicdataSupportValueService;
+
+	/**
+	 * 客户基础保价表 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入basicdataSupportValue")
+	public R<BasicdataSupportValueEntity> detail(BasicdataSupportValueEntity basicdataSupportValue) {
+		BasicdataSupportValueEntity detail = basicdataSupportValueService.getOne(Condition.getQueryWrapper(basicdataSupportValue));
+		return R.data(detail);
+	}
+	/**
+	 * 客户基础保价表 分页
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入basicdataSupportValue")
+	public R<IPage<BasicdataSupportValueEntity>> list(@ApiIgnore @RequestParam Map<String, Object> basicdataSupportValue, Query query) {
+		IPage<BasicdataSupportValueEntity> pages = basicdataSupportValueService.page(Condition.getPage(query), Condition.getQueryWrapper(basicdataSupportValue, BasicdataSupportValueEntity.class));
+		return R.data(pages);
+	}
+
+	/**
+	 * 客户基础保价表 自定义分页
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入basicdataSupportValue")
+	public R<IPage<BasicdataSupportValueVO>> page(BasicdataSupportValueVO basicdataSupportValue, Query query) {
+		IPage<BasicdataSupportValueVO> pages = basicdataSupportValueService.selectBasicdataSupportValuePage(Condition.getPage(query), basicdataSupportValue);
+		return R.data(pages);
+	}
+
+	/**
+	 * 客户基础保价表 新增
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入basicdataSupportValue")
+	public R save(@Valid @RequestBody BasicdataSupportValueEntity basicdataSupportValue) {
+		return R.status(basicdataSupportValueService.save(basicdataSupportValue));
+	}
+
+	/**
+	 * 客户基础保价表 修改
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入basicdataSupportValue")
+	public R update(@Valid @RequestBody BasicdataSupportValueEntity basicdataSupportValue) {
+		return R.status(basicdataSupportValueService.updateById(basicdataSupportValue));
+	}
+
+	/**
+	 * 客户基础保价表 新增或修改
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入basicdataSupportValue")
+	public R submit(@Valid @RequestBody BasicdataSupportValueEntity basicdataSupportValue) {
+		return R.status(basicdataSupportValueService.saveOrUpdate(basicdataSupportValue));
+	}
+
+	/**
+	 * 客户基础保价表 删除
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(basicdataSupportValueService.deleteLogic(Func.toLongList(ids)));
+	}
+
+
+	/**
+	 * 导出数据
+	 */
+	@GetMapping("/export-basicdataSupportValue")
+	@ApiOperationSupport(order = 9)
+	@ApiOperation(value = "导出数据", notes = "传入basicdataSupportValue")
+	public void exportBasicdataSupportValue(@ApiIgnore @RequestParam Map<String, Object> basicdataSupportValue, BladeUser bladeUser, HttpServletResponse response) {
+		QueryWrapper<BasicdataSupportValueEntity> queryWrapper = Condition.getQueryWrapper(basicdataSupportValue, BasicdataSupportValueEntity.class);
+		//if (!AuthUtil.isAdministrator()) {
+		//	queryWrapper.lambda().eq(BasicdataSupportValue::getTenantId, bladeUser.getTenantId());
+		//}
+		queryWrapper.lambda().eq(BasicdataSupportValueEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
+		List<BasicdataSupportValueExcel> list = basicdataSupportValueService.exportBasicdataSupportValue(queryWrapper);
+		ExcelUtil.export(response, "客户基础保价表数据" + DateUtil.time(), "客户基础保价表数据表", list, BasicdataSupportValueExcel.class);
+	}
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataSupportValueDTO.java

@@ -0,0 +1,34 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.dto;
+
+import com.logpm.basicdata.entity.BasicdataSupportValueEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 客户基础保价表 数据传输对象实体类
+ *
+ * @author cyz
+ * @since 2023-05-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class BasicdataSupportValueDTO extends BasicdataSupportValueEntity {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataSupportValueExcel.java

@@ -0,0 +1,117 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.excel;
+
+
+import lombok.Data;
+
+import java.util.Date;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import java.io.Serializable;
+
+
+/**
+ * 客户基础保价表 Excel实体类
+ *
+ * @author cyz
+ * @since 2023-05-26
+ */
+@Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(18)
+public class BasicdataSupportValueExcel implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 租户号
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("租户号")
+	private String tenantId;
+	/**
+	 * 是否已删除
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("是否已删除")
+	private Integer isDeleted;
+	/**
+	 * 收货用户名称
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("收货用户名称")
+	private String userName;
+	/**
+	 * 保费率
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("保费率")
+	private Integer premiumRate;
+	/**
+	 * 收货用户地址
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("收货用户地址")
+	private String userAdderss;
+	/**
+	 * 收货用户电话
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("收货用户电话")
+	private String userPhone;
+	/**
+	 * 预留1
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留1")
+	private String reserve1;
+	/**
+	 * 预留2
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留2")
+	private String reserve2;
+	/**
+	 * 预留3
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留3")
+	private String reserve3;
+	/**
+	 * 预留4
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留4")
+	private String reserve4;
+	/**
+	 * 预留5
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预留5")
+	private String reserve5;
+	/**
+	 * 客户ID（结算对象）
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("客户ID（结算对象）")
+	private String clientId;
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataSupportValueClient.java

@@ -0,0 +1,53 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.feign;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import lombok.AllArgsConstructor;
+import org.springblade.core.mp.support.BladePage;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import com.logpm.basicdata.entity.BasicdataSupportValueEntity;
+import com.logpm.basicdata.service.IBasicdataSupportValueService;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
+
+/**
+ * 客户基础保价表 Feign实现类
+ *
+ * @author cyz
+ * @since 2023-05-26
+ */
+@ApiIgnore()
+@RestController
+@AllArgsConstructor
+public class BasicdataSupportValueClient implements IBasicdataSupportValueClient {
+
+    private final IBasicdataSupportValueService basicdataSupportValueService;
+
+    @Override
+    @GetMapping(TOP)
+    public BladePage<BasicdataSupportValueEntity> top(Integer current, Integer size) {
+        Query query = new Query();
+        query.setCurrent(current);
+        query.setSize(size);
+        IPage<BasicdataSupportValueEntity> page = basicdataSupportValueService.page(Condition.getPage(query));
+        return BladePage.of(page);
+    }
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataHistoricalContractMapper.java

@@ -51,4 +51,5 @@ public interface BasicdataHistoricalContractMapper extends BaseMapper<BasicdataH
 	 */
 	List<BasicdataHistoricalContractExcel> exportBasicdataHistoricalContract(@Param("ew") Wrapper<BasicdataHistoricalContractEntity> queryWrapper);
 
+	IPage<BasicdataHistoricalContractEntity> pageList(IPage<Object> page, @Param("param") BasicdataHistoricalContractEntity basicdataHistorical);
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataHistoricalContractMapper.xml

@@ -5,7 +5,19 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="basicdataHistoricalContractResultMap" type="com.logpm.basicdata.entity.BasicdataHistoricalContractEntity">
     </resultMap>
-
+    <select id="pageList" resultType="com.logpm.basicdata.vo.BasicdataHistoricalContractVO">
+        select lbhc.tenant_id, lbhc.create_user, lbhc.create_time, lbhc.update_user, lbhc.update_time, lbhc.status, lbhc.is_deleted, lbhc.create_dept, lbhc.id,
+               lbhc.reserve1, lbhc.reserve2, lbhc.reserve3, lbhc.reserve4, lbhc.reserve5, lbhc.client_id, lbhc.contract_start_time, lbhc.contract_ent_time,
+               lbhc.lease_accessories,lbc.client_name clientName
+        from logpm_basicdata_historical_contract lbhc
+                 left join logpm_basicdata_client lbc on  lbc.id  = lbhc.client_id
+        <where>
+            lbhc.is_deleted = 0
+            <if test="param.clientId != null and param.clientId"> and lbc.client_name like concat('%',#{param.clientId},'%') </if>
+            <if test="param.contractStartTime != null ">and date_format (lbhc.contract_start_time,'%Y-%m-%d') <![CDATA[ >= ]]> date_format (#{param.contractStartTime},'%Y-%m-%d')  </if>
+            <if test="param.contractEntTime != null ">and date_format (lbhc.contract_ent_time,'%Y-%m-%d') <![CDATA[ <= ]]> date_format (#{param.contractEntTime},'%Y-%m-%d')  </if>
+        </where>
+    </select>
 
     <select id="selectBasicdataHistoricalContractPage" resultMap="basicdataHistoricalContractResultMap">
         select * from logpm_basicdata_historical_contract where is_deleted = 0

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataSupportValueMapper.java

@@ -0,0 +1,54 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.mapper;
+
+import com.logpm.basicdata.entity.BasicdataSupportValueEntity;
+import com.logpm.basicdata.vo.BasicdataSupportValueVO;
+import com.logpm.basicdata.excel.BasicdataSupportValueExcel;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
+import java.util.List;
+
+/**
+ * 客户基础保价表 Mapper 接口
+ *
+ * @author cyz
+ * @since 2023-05-26
+ */
+public interface BasicdataSupportValueMapper extends BaseMapper<BasicdataSupportValueEntity> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param basicdataSupportValue
+	 * @return
+	 */
+	List<BasicdataSupportValueVO> selectBasicdataSupportValuePage(IPage page, BasicdataSupportValueVO basicdataSupportValue);
+
+
+	/**
+	 * 获取导出数据
+	 *
+	 * @param queryWrapper
+	 * @return
+	 */
+	List<BasicdataSupportValueExcel> exportBasicdataSupportValue(@Param("ew") Wrapper<BasicdataSupportValueEntity> queryWrapper);
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataSupportValueMapper.xml

@@ -0,0 +1,38 @@
+<?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="com.logpm.basicdata.mapper.BasicdataSupportValueMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="basicdataSupportValueResultMap" type="com.logpm.basicdata.entity.BasicdataSupportValueEntity">
+        <result column="id" property="id"/>
+        <result column="tenant_id" property="tenantId"/>
+        <result column="create_user" property="createUser"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="status" property="status"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="create_dept" property="createDept"/>
+        <result column="user_name" property="userName"/>
+        <result column="premium_rate" property="premiumRate"/>
+        <result column="user_adderss" property="userAdderss"/>
+        <result column="user_phone" property="userPhone"/>
+        <result column="reserve1" property="reserve1"/>
+        <result column="reserve2" property="reserve2"/>
+        <result column="reserve3" property="reserve3"/>
+        <result column="reserve4" property="reserve4"/>
+        <result column="reserve5" property="reserve5"/>
+        <result column="client_id" property="clientId"/>
+    </resultMap>
+
+
+    <select id="selectBasicdataSupportValuePage" resultMap="basicdataSupportValueResultMap">
+        select * from logpm_basicdata_support_value where is_deleted = 0
+    </select>
+
+
+    <select id="exportBasicdataSupportValue" resultType="com.logpm.basicdata.excel.BasicdataSupportValueExcel">
+        SELECT * FROM logpm_basicdata_support_value ${ew.customSqlSegment}
+    </select>
+
+</mapper>

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataClientService.java

@@ -49,4 +49,12 @@ public interface IBasicdataClientService extends BaseService<BasicdataClientEnti
 	 */
 	List<BasicdataClientExcel> exportBasicdataClient(Wrapper<BasicdataClientEntity> queryWrapper);
 
+	/**
+	 * 添加或修改
+	 * @param basicdataClient
+	 * @return
+	 */
+    boolean ownSaveOrUpdate(BasicdataClientEntity basicdataClient);
+
+	List<BasicdataClientEntity> listName(String name);
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataHistoricalContractService.java

@@ -23,6 +23,7 @@ import com.logpm.basicdata.excel.BasicdataHistoricalContractExcel;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 客户历史合同记录 服务类
@@ -49,4 +50,5 @@ public interface IBasicdataHistoricalContractService extends BaseService<Basicda
 	 */
 	List<BasicdataHistoricalContractExcel> exportBasicdataHistoricalContract(Wrapper<BasicdataHistoricalContractEntity> queryWrapper);
 
+	IPage<BasicdataHistoricalContractEntity> pageList(IPage<Object> page, Map<String, Object> basicdataHistoricalContract);
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataSupportValueService.java

@@ -0,0 +1,52 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.service;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.logpm.basicdata.entity.BasicdataSupportValueEntity;
+import com.logpm.basicdata.vo.BasicdataSupportValueVO;
+import com.logpm.basicdata.excel.BasicdataSupportValueExcel;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseService;
+import java.util.List;
+
+/**
+ * 客户基础保价表 服务类
+ *
+ * @author cyz
+ * @since 2023-05-26
+ */
+public interface IBasicdataSupportValueService extends BaseService<BasicdataSupportValueEntity> {
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param basicdataSupportValue
+	 * @return
+	 */
+	IPage<BasicdataSupportValueVO> selectBasicdataSupportValuePage(IPage<BasicdataSupportValueVO> page, BasicdataSupportValueVO basicdataSupportValue);
+
+
+	/**
+	 * 导出数据
+	 *
+	 * @param queryWrapper
+	 * @return
+	 */
+	List<BasicdataSupportValueExcel> exportBasicdataSupportValue(Wrapper<BasicdataSupportValueEntity> queryWrapper);
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataClientServiceImpl.java

@@ -16,15 +16,25 @@
  */
 package com.logpm.basicdata.service.impl;
 
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.logpm.basicdata.entity.BasicdataClientEntity;
+import com.logpm.basicdata.entity.BasicdataHistoricalContractEntity;
+import com.logpm.basicdata.mapper.BasicdataHistoricalContractMapper;
+import com.logpm.basicdata.service.IBasicdataHistoricalContractService;
 import com.logpm.basicdata.vo.BasicdataClientVO;
 import com.logpm.basicdata.excel.BasicdataClientExcel;
 import com.logpm.basicdata.mapper.BasicdataClientMapper;
 import com.logpm.basicdata.service.IBasicdataClientService;
+import com.logpm.basicdata.vo.BasicdataHistoricalContractVO;
+import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.transaction.annotation.Transactional;
+
 import java.util.List;
 
 /**
@@ -34,8 +44,12 @@ import java.util.List;
  * @since 2023-05-16
  */
 @Service
+@AllArgsConstructor
 public class BasicdataClientServiceImpl extends BaseServiceImpl<BasicdataClientMapper, BasicdataClientEntity> implements IBasicdataClientService {
 
+
+	private IBasicdataHistoricalContractService basicdataHistoricalContractService;
+
 	@Override
 	public IPage<BasicdataClientVO> selectBasicdataClientPage(IPage<BasicdataClientVO> page, BasicdataClientVO basicdataClient) {
 		return page.setRecords(baseMapper.selectBasicdataClientPage(page, basicdataClient));
@@ -51,4 +65,35 @@ public class BasicdataClientServiceImpl extends BaseServiceImpl<BasicdataClientM
 		return basicdataClientList;
 	}
 
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public boolean ownSaveOrUpdate(BasicdataClientEntity basicdataClient) {
+		//添加客户端的历史合同的数据
+		if(ObjectUtils.isNotNull(basicdataClient.getId())){
+			//修改
+			this.updateById(basicdataClient);
+		}else{
+			//添加
+			this.save(basicdataClient);
+		}
+		if(ObjectUtils.isNull(basicdataClient.getId())){
+			throw new RuntimeException("没有必要的ID了！！！");
+		}
+		BasicdataHistoricalContractEntity basicdataHistoricalContract = new BasicdataHistoricalContractEntity();
+		basicdataHistoricalContract.setClientId(basicdataClient.getId().toString());
+		basicdataHistoricalContract.setContractEntTime(basicdataClient.getContractEntTime());
+		basicdataHistoricalContract.setContractStartTime(basicdataClient.getContractStartTime());
+		basicdataHistoricalContract.setLeaseAccessories(basicdataClient.getLeaseAccessories());
+		basicdataHistoricalContractService.save(basicdataHistoricalContract);
+		return true;
+	}
+
+
+	@Override
+	public List<BasicdataClientEntity> listName(String name) {
+		return baseMapper.selectList(Wrappers.<BasicdataClientEntity>query().lambda()
+			.like(StringUtils.isNotBlank(name),BasicdataClientEntity::getClientName,name)
+		);
+	}
+
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataHistoricalContractServiceImpl.java

@@ -16,6 +16,7 @@
  */
 package com.logpm.basicdata.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.logpm.basicdata.entity.BasicdataHistoricalContractEntity;
 import com.logpm.basicdata.vo.BasicdataHistoricalContractVO;
 import com.logpm.basicdata.excel.BasicdataHistoricalContractExcel;
@@ -26,6 +27,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 客户历史合同记录 服务实现类
@@ -51,4 +53,10 @@ public class BasicdataHistoricalContractServiceImpl extends BaseServiceImpl<Basi
 		return basicdataHistoricalContractList;
 	}
 
+	@Override
+	public IPage<BasicdataHistoricalContractEntity> pageList(IPage<Object> page, Map<String, Object> basicdataHistoricalContract) {
+		BasicdataHistoricalContractEntity basicdataHistorical = JSONObject.parseObject(JSONObject.toJSONString(basicdataHistoricalContract), BasicdataHistoricalContractEntity.class);
+		return baseMapper.pageList(page,basicdataHistorical);
+	}
+
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataSupportValueServiceImpl.java

@@ -0,0 +1,54 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.service.impl;
+
+import com.logpm.basicdata.entity.BasicdataSupportValueEntity;
+import com.logpm.basicdata.vo.BasicdataSupportValueVO;
+import com.logpm.basicdata.excel.BasicdataSupportValueExcel;
+import com.logpm.basicdata.mapper.BasicdataSupportValueMapper;
+import com.logpm.basicdata.service.IBasicdataSupportValueService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import java.util.List;
+
+/**
+ * 客户基础保价表 服务实现类
+ *
+ * @author cyz
+ * @since 2023-05-26
+ */
+@Service
+public class BasicdataSupportValueServiceImpl extends BaseServiceImpl<BasicdataSupportValueMapper, BasicdataSupportValueEntity> implements IBasicdataSupportValueService {
+
+	@Override
+	public IPage<BasicdataSupportValueVO> selectBasicdataSupportValuePage(IPage<BasicdataSupportValueVO> page, BasicdataSupportValueVO basicdataSupportValue) {
+		return page.setRecords(baseMapper.selectBasicdataSupportValuePage(page, basicdataSupportValue));
+	}
+
+
+	@Override
+	public List<BasicdataSupportValueExcel> exportBasicdataSupportValue(Wrapper<BasicdataSupportValueEntity> queryWrapper) {
+		List<BasicdataSupportValueExcel> basicdataSupportValueList = baseMapper.exportBasicdataSupportValue(queryWrapper);
+		//basicdataSupportValueList.forEach(basicdataSupportValue -> {
+		//	basicdataSupportValue.setTypeName(DictCache.getValue(DictEnum.YES_NO, BasicdataSupportValue.getType()));
+		//});
+		return basicdataSupportValueList;
+	}
+
+}

doc/dpm/物流租户系统.pdma.json

@@ -32685,4 +32685,4 @@
     }
   ],
   "dbConn": []
-}
+}