From 2ced9f4241b93a427842735b4dea41ed443fb9fe Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Mon, 3 Jun 2024 15:43:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=94=AE=E5=90=8E=E5=AE=A2=E6=88=B7=E7=AE=A1?=
=?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../api/crmcustomerorg/CrmCustomerOrg.java | 76 +++++
.../CrmCustomerOrgDetailsVo.java | 78 +++++
.../api/crmcustomerorg/CrmCustomerOrgDto.java | 78 +++++
.../crmcustomerorg/CrmCustomerOrgFeign.java | 84 +++++
.../CrmCustomerOrgFeignFallback.java | 77 +++++
.../crmcustomerorg/CrmCustomerOrgQuery.java | 67 ++++
.../api/crmcustomerorg/CrmCustomerOrgVo.java | 76 +++++
.../CrmCustomerOrgLink.java | 58 ++++
.../CrmCustomerOrgLinkDetailsVo.java | 59 ++++
.../CrmCustomerOrgLinkDto.java | 59 ++++
.../CrmCustomerOrgLinkFeign.java | 78 +++++
.../CrmCustomerOrgLinkFeignFallback.java | 72 +++++
.../CrmCustomerOrgLinkQuery.java | 57 ++++
.../CrmCustomerOrgLinkVo.java | 59 ++++
.../crmcustomertemp/AsCustomerListQuery.java | 36 +++
.../api/crmcustomertemp/AsCustomerListVo.java | 39 +++
.../api/crmcustomertemp/CrmCustomerTemp.java | 3 +
.../crmcustomertemp/CrmCustomerTempDto.java | 6 +-
.../crmcustomertemp/CrmCustomerTempFeign.java | 9 +
.../CrmCustomerTempFeignFallback.java | 5 +
.../CrmCustomerTempUpdateDto.java | 4 +-
.../crmcustomertemp/CrmCustomerTempVo.java | 71 +++--
.../crmcustomerorg/CrmCustomerOrgMapper.java | 73 +++++
.../crmcustomerorg/CrmCustomerOrgMapper.xml | 43 +++
.../crmcustomerorg/CrmCustomerOrgRest.java | 104 +++++++
.../crmcustomerorg/CrmCustomerOrgService.java | 201 ++++++++++++
.../CrmCustomerOrgLinkMapper.java | 67 ++++
.../CrmCustomerOrgLinkMapper.xml | 16 +
.../CrmCustomerOrgLinkRest.java | 100 ++++++
.../CrmCustomerOrgLinkService.java | 128 ++++++++
.../CrmCustomerTempMapper.java | 4 +-
.../crmcustomertemp/CrmCustomerTempMapper.xml | 13 +-
.../crmcustomertemp/CrmCustomerTempRest.java | 8 +
.../CrmCustomerTempService.java | 103 +++++-
.../com/yxt/anrui/crm/utils/PinYinUtils.java | 292 ++++++++++++++++++
...sVo.java => AsCustomerVehicleDetails.java} | 84 +++--
.../AsCustomerVehicleDto.java | 24 +-
.../AsCustomerVehicleVo.java | 38 +--
.../AsCustomervehMaintenance.java | 106 +++++++
.../AsCustomervehMaintenanceDetailsVo.java | 99 ++++++
.../AsCustomervehMaintenanceDto.java | 98 ++++++
.../AsCustomervehMaintenanceQuery.java | 97 ++++++
.../AsCustomervehMaintenanceVo.java | 99 ++++++
.../AsCustomerVehicleMapper.java | 14 +-
.../AsCustomerVehicleMapper.xml | 18 +-
.../AsCustomerVehicleRest.java | 30 +-
.../AsCustomerVehicleService.java | 183 ++++++++---
.../AsCustomervehMaintenanceMapper.java | 72 +++++
.../AsCustomervehMaintenanceMapper.xml | 13 +
.../AsCustomervehMaintenanceRest.java | 97 ++++++
.../AsCustomervehMaintenanceService.java | 114 +++++++
51 files changed, 3303 insertions(+), 186 deletions(-)
create mode 100644 anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerorg/CrmCustomerOrg.java
create mode 100644 anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerorg/CrmCustomerOrgDetailsVo.java
create mode 100644 anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerorg/CrmCustomerOrgDto.java
create mode 100644 anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerorg/CrmCustomerOrgFeign.java
create mode 100644 anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerorg/CrmCustomerOrgFeignFallback.java
create mode 100644 anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerorg/CrmCustomerOrgQuery.java
create mode 100644 anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerorg/CrmCustomerOrgVo.java
create mode 100644 anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerorglink/CrmCustomerOrgLink.java
create mode 100644 anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerorglink/CrmCustomerOrgLinkDetailsVo.java
create mode 100644 anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerorglink/CrmCustomerOrgLinkDto.java
create mode 100644 anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerorglink/CrmCustomerOrgLinkFeign.java
create mode 100644 anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerorglink/CrmCustomerOrgLinkFeignFallback.java
create mode 100644 anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerorglink/CrmCustomerOrgLinkQuery.java
create mode 100644 anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerorglink/CrmCustomerOrgLinkVo.java
create mode 100644 anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/AsCustomerListQuery.java
create mode 100644 anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/AsCustomerListVo.java
create mode 100644 anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerorg/CrmCustomerOrgMapper.java
create mode 100644 anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerorg/CrmCustomerOrgMapper.xml
create mode 100644 anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerorg/CrmCustomerOrgRest.java
create mode 100644 anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerorg/CrmCustomerOrgService.java
create mode 100644 anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerorglink/CrmCustomerOrgLinkMapper.java
create mode 100644 anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerorglink/CrmCustomerOrgLinkMapper.xml
create mode 100644 anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerorglink/CrmCustomerOrgLinkRest.java
create mode 100644 anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerorglink/CrmCustomerOrgLinkService.java
create mode 100644 anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/utils/PinYinUtils.java
rename yxt-as/src/main/java/com/yxt/anrui/as/api/ascustomervehicle/{AsCustomerVehicleDetailsVo.java => AsCustomerVehicleDetails.java} (51%)
create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/api/ascustomervehmaintenance/AsCustomervehMaintenance.java
create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/api/ascustomervehmaintenance/AsCustomervehMaintenanceDetailsVo.java
create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/api/ascustomervehmaintenance/AsCustomervehMaintenanceDto.java
create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/api/ascustomervehmaintenance/AsCustomervehMaintenanceQuery.java
create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/api/ascustomervehmaintenance/AsCustomervehMaintenanceVo.java
create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehmaintenance/AsCustomervehMaintenanceMapper.java
create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehmaintenance/AsCustomervehMaintenanceMapper.xml
create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehmaintenance/AsCustomervehMaintenanceRest.java
create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehmaintenance/AsCustomervehMaintenanceService.java
diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerorg/CrmCustomerOrg.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerorg/CrmCustomerOrg.java
new file mode 100644
index 0000000000..d91772adb0
--- /dev/null
+++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerorg/CrmCustomerOrg.java
@@ -0,0 +1,76 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.crm.api.crmcustomerorg;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * Project: anrui-crm(客户单位)
+ * File: CrmCustomerOrg.java
+ * Class: com.yxt.anrui.crm.api.crmcustomerorg.CrmCustomerOrg
+ * Description: 客户单位.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-06-03 09:41:42
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "客户单位", description = "客户单位")
+@TableName("crm_customer_org")
+public class CrmCustomerOrg extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("单位名称")
+ private String orgName; // 单位名称
+ @ApiModelProperty("单位编码（拼音缩写）")
+ private String orgCode; // 单位编码（拼音缩写）
+ @ApiModelProperty("联系人")
+ private String contacts; // 联系人
+ @ApiModelProperty("联系电话")
+ private String mobile; // 联系电话
+ @ApiModelProperty("地址")
+ private String address; // 地址
+ @ApiModelProperty("信用额度")
+ private Integer creditLimit; // 信用额度
+ @ApiModelProperty("期初欠款")
+ private BigDecimal initialDebt; // 期初欠款
+ @ApiModelProperty("排序号")
+ private Integer sortNo; // 排序号
+ @ApiModelProperty("使用组织sid")
+ private String useOrgSid; // 使用组织sid
+ @ApiModelProperty("创建组织sid")
+ private String createOrgSid; // 创建组织sid
+
+}
diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerorg/CrmCustomerOrgDetailsVo.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerorg/CrmCustomerOrgDetailsVo.java
new file mode 100644
index 0000000000..442c48e090
--- /dev/null
+++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerorg/CrmCustomerOrgDetailsVo.java
@@ -0,0 +1,78 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.crm.api.crmcustomerorg;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-crm(客户单位)
+ * File: CrmCustomerOrgVo.java
+ * Class: com.yxt.anrui.crm.api.crmcustomerorg.CrmCustomerOrgVo
+ * Description: 客户单位 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-06-03 09:41:42
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "客户单位 视图数据详情", description = "客户单位 视图数据详情")
+public class CrmCustomerOrgDetailsVo implements Vo {
+
+ private String sid; // sid
+ @ApiModelProperty("创建人sid")
+ private String createBySid; // 创建人sid
+ @ApiModelProperty("备注")
+ private String remarks; // 备注
+ @ApiModelProperty("单位名称")
+ private String orgName; // 单位名称
+ @ApiModelProperty("单位编码（拼音缩写）")
+ private String orgCode; // 单位编码（拼音缩写）
+ @ApiModelProperty("联系人")
+ private String contacts; // 联系人
+ @ApiModelProperty("联系电话")
+ private String mobile; // 联系电话
+ @ApiModelProperty("地址")
+ private String address; // 地址
+ @ApiModelProperty("信用额度")
+ private String creditLimit; // 信用额度
+ @ApiModelProperty("排序号")
+ private String sortNo; // 排序号
+ @ApiModelProperty("期初欠款")
+ private String initialDebt; // 排序号
+ @ApiModelProperty("使用组织sid")
+ private String useOrgSid; // 使用组织sid
+ @ApiModelProperty("创建组织sid")
+ private String createOrgSid; // 创建组织sid
+
+}
diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerorg/CrmCustomerOrgDto.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerorg/CrmCustomerOrgDto.java
new file mode 100644
index 0000000000..ef3c10a963
--- /dev/null
+++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerorg/CrmCustomerOrgDto.java
@@ -0,0 +1,78 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.crm.api.crmcustomerorg;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-crm(客户单位)
+ * File: CrmCustomerOrgDto.java
+ * Class: com.yxt.anrui.crm.api.crmcustomerorg.CrmCustomerOrgDto
+ * Description: 客户单位 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-06-03 09:41:42
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "客户单位 数据传输对象", description = "客户单位 数据传输对象")
+public class CrmCustomerOrgDto implements Dto {
+
+ private String sid; // sid
+ @ApiModelProperty("创建人sid")
+ private String createBySid; // 创建人sid
+ @ApiModelProperty("备注")
+ private String remarks; // 备注
+ @ApiModelProperty("单位名称")
+ private String orgName; // 单位名称
+ @ApiModelProperty("单位编码（拼音缩写）")
+ private String orgCode; // 单位编码（拼音缩写）
+ @ApiModelProperty("联系人")
+ private String contacts; // 联系人
+ @ApiModelProperty("联系电话")
+ private String mobile; // 联系电话
+ @ApiModelProperty("地址")
+ private String address; // 地址
+ @ApiModelProperty("信用额度")
+ private String creditLimit; // 信用额度
+ @ApiModelProperty("排序号")
+ private String sortNo; // 排序号
+ @ApiModelProperty("期初欠款")
+ private String initialDebt; // 排序号
+ @ApiModelProperty("使用组织sid")
+ private String useOrgSid; // 使用组织sid
+ @ApiModelProperty("创建组织sid")
+ private String createOrgSid; // 创建组织sid
+
+}
diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerorg/CrmCustomerOrgFeign.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerorg/CrmCustomerOrgFeign.java
new file mode 100644
index 0000000000..22a3c08f97
--- /dev/null
+++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerorg/CrmCustomerOrgFeign.java
@@ -0,0 +1,84 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.crm.api.crmcustomerorg;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * Project: anrui-crm(客户单位)
+ * File: CrmCustomerOrgFeign.java
+ * Class: com.yxt.anrui.crm.api.crmcustomerorg.CrmCustomerOrgFeign
+ * Description: 客户单位.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-06-03 09:41:42
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "客户单位")
+@FeignClient(
+ contextId = "anrui-crm-CrmCustomerOrg",
+ name = "anrui-crm",
+ path = "v1/crmcustomerorg",
+ fallback = CrmCustomerOrgFeignFallback.class)
+public interface CrmCustomerOrgFeign {
+
+ @ApiOperation("根据条件分页查询数据的列表")
+ @PostMapping("/listPage")
+ @ResponseBody
+ public ResultBean> listPage(@RequestBody PagerQuery pq);
+
+ @ApiOperation("新增或修改")
+ @PostMapping("/save")
+ @ResponseBody
+ public ResultBean save(@RequestBody CrmCustomerOrgDto dto);
+
+ @ApiOperation("根据sid删除记录")
+ @DeleteMapping("/delBySids")
+ @ResponseBody
+ public ResultBean delBySids(@RequestBody String[] sids);
+
+ @ApiOperation("根据SID获取一条记录")
+ @GetMapping("/fetchDetailsBySid/{sid}")
+ @ResponseBody
+ public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid);
+
+ @ApiOperation("根据部门sid查询客户单位")
+ @GetMapping("/selCustomerOrgList")
+ @ResponseBody
+ public ResultBean> selCustomerOrgList(@RequestParam("useOrgSid") String useOrgSid);
+
+}
diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerorg/CrmCustomerOrgFeignFallback.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerorg/CrmCustomerOrgFeignFallback.java
new file mode 100644
index 0000000000..3ecb45b9c9
--- /dev/null
+++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerorg/CrmCustomerOrgFeignFallback.java
@@ -0,0 +1,77 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.crm.api.crmcustomerorg;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * Project: anrui-crm(客户单位)
+ * File: CrmCustomerOrgFeignFallback.java
+ * Class: com.yxt.anrui.crm.api.crmcustomerorg.CrmCustomerOrgFeignFallback
+ * Description: 客户单位.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-06-03 09:41:42
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class CrmCustomerOrgFeignFallback implements CrmCustomerOrgFeign {
+
+ @Override
+ public ResultBean> listPage(PagerQuery pq){
+ ResultBean rb = ResultBean.fireFail();
+ return rb.setMsg("接口anrui-crm/crmcustomerorg/listPage无法访问");
+ }
+
+ @Override
+ public ResultBean save(CrmCustomerOrgDto dto){
+ return ResultBean.fireFail().setMsg("接口anrui-crm/crmcustomerorg/save无法访问");
+ }
+
+ @Override
+ public ResultBean delBySids( String[] sids){
+ return ResultBean.fireFail().setMsg("接口anrui-crm/crmcustomerorg/delBySids无法访问");
+ }
+
+ @Override
+ public ResultBean fetchDetailsBySid(String sid){
+ ResultBean rb = ResultBean.fireFail();
+ return rb.setMsg("接口anrui-crm/crmcustomerorg/fetchDetailsBySid无法访问");
+ }
+
+ @Override
+ public ResultBean> selCustomerOrgList(String useOrgSid) {
+ return null;
+ }
+}
diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerorg/CrmCustomerOrgQuery.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerorg/CrmCustomerOrgQuery.java
new file mode 100644
index 0000000000..a6cef00424
--- /dev/null
+++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerorg/CrmCustomerOrgQuery.java
@@ -0,0 +1,67 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.crm.api.crmcustomerorg;
+
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-crm(客户单位)
+ * File: CrmCustomerOrgQuery.java
+ * Class: com.yxt.anrui.crm.api.crmcustomerorg.CrmCustomerOrgQuery
+ * Description: 客户单位 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-06-03 09:41:42
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "客户单位 查询条件", description = "客户单位 查询条件")
+public class CrmCustomerOrgQuery implements Query {
+
+ @ApiModelProperty("单位名称")
+ private String orgName; // 单位名称
+ @ApiModelProperty("单位编码（拼音缩写）")
+ private String orgCode; // 单位编码（拼音缩写）
+ @ApiModelProperty("联系人")
+ private String contacts; // 联系人
+ @ApiModelProperty("联系电话")
+ private String mobile; // 联系电话
+
+ @ApiModelProperty("全路径")
+ private String orgPath;
+ private String userSid;
+ @ApiModelProperty("菜单url")
+ private String menuUrl;
+
+}
diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerorg/CrmCustomerOrgVo.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerorg/CrmCustomerOrgVo.java
new file mode 100644
index 0000000000..3d87601647
--- /dev/null
+++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerorg/CrmCustomerOrgVo.java
@@ -0,0 +1,76 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.crm.api.crmcustomerorg;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * Project: anrui-crm(客户单位)
+ * File: CrmCustomerOrgVo.java
+ * Class: com.yxt.anrui.crm.api.crmcustomerorg.CrmCustomerOrgVo
+ * Description: 客户单位 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-06-03 09:41:42
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "客户单位 视图数据对象", description = "客户单位 视图数据对象")
+public class CrmCustomerOrgVo implements Vo {
+
+ private String sid; // sid
+
+ @ApiModelProperty("单位名称")
+ private String orgName; // 单位名称
+ @ApiModelProperty("单位编码（拼音缩写）")
+ private String orgCode; // 单位编码（拼音缩写）
+ @ApiModelProperty("联系人")
+ private String contacts; // 联系人
+ @ApiModelProperty("联系电话")
+ private String mobile; // 联系电话
+ @ApiModelProperty("地址")
+ private String address; // 地址
+ @ApiModelProperty("信用额度")
+ private String creditLimit; // 信用额度
+ @ApiModelProperty("排序号")
+ private String sortNo; // 排序号
+ @ApiModelProperty("期初欠款")
+ private String initialDebt; // 期初欠款
+ @ApiModelProperty("备注")
+ private String remarks; // 备注
+
+
+}
diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerorglink/CrmCustomerOrgLink.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerorglink/CrmCustomerOrgLink.java
new file mode 100644
index 0000000000..d324dfa9d2
--- /dev/null
+++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerorglink/CrmCustomerOrgLink.java
@@ -0,0 +1,58 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.crm.api.crmcustomerorglink;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-crm(客户单位)
+ * File: CrmCustomerOrgLink.java
+ * Class: com.yxt.anrui.crm.api.crmcustomerorglink.CrmCustomerOrgLink
+ * Description: 客户、单位关联表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-06-03 09:41:42
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "客户、单位关联表", description = "客户、单位关联表")
+@TableName("crm_customer_org_link")
+public class CrmCustomerOrgLink extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("customerSid")
+ private String customerSid; //
+ @ApiModelProperty("orgSid")
+ private String orgSid; //
+
+}
diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerorglink/CrmCustomerOrgLinkDetailsVo.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerorglink/CrmCustomerOrgLinkDetailsVo.java
new file mode 100644
index 0000000000..7a8882c6cc
--- /dev/null
+++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerorglink/CrmCustomerOrgLinkDetailsVo.java
@@ -0,0 +1,59 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.crm.api.crmcustomerorglink;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-crm(客户单位)
+ * File: CrmCustomerOrgLinkVo.java
+ * Class: com.yxt.anrui.crm.api.crmcustomerorglink.CrmCustomerOrgLinkVo
+ * Description: 客户、单位关联表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-06-03 09:41:42
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "客户、单位关联表 视图数据详情", description = "客户、单位关联表 视图数据详情")
+public class CrmCustomerOrgLinkDetailsVo implements Vo {
+
+ private String sid; // sid
+
+ @ApiModelProperty("customerSid")
+ private String customerSid; //
+ @ApiModelProperty("orgSid")
+ private String orgSid; //
+
+}
\ No newline at end of file
diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerorglink/CrmCustomerOrgLinkDto.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerorglink/CrmCustomerOrgLinkDto.java
new file mode 100644
index 0000000000..75bede85e6
--- /dev/null
+++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerorglink/CrmCustomerOrgLinkDto.java
@@ -0,0 +1,59 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.crm.api.crmcustomerorglink;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-crm(客户单位)
+ * File: CrmCustomerOrgLinkDto.java
+ * Class: com.yxt.anrui.crm.api.crmcustomerorglink.CrmCustomerOrgLinkDto
+ * Description: 客户、单位关联表 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-06-03 09:41:42
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "客户、单位关联表 数据传输对象", description = "客户、单位关联表 数据传输对象")
+public class CrmCustomerOrgLinkDto implements Dto {
+
+ private String sid; // sid
+
+ @ApiModelProperty("customerSid")
+ private String customerSid; //
+ @ApiModelProperty("orgSid")
+ private String orgSid; //
+
+}
\ No newline at end of file
diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerorglink/CrmCustomerOrgLinkFeign.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerorglink/CrmCustomerOrgLinkFeign.java
new file mode 100644
index 0000000000..c54cd38d62
--- /dev/null
+++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerorglink/CrmCustomerOrgLinkFeign.java
@@ -0,0 +1,78 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.crm.api.crmcustomerorglink;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * Project: anrui-crm(客户单位)
+ * File: CrmCustomerOrgLinkFeign.java
+ * Class: com.yxt.anrui.crm.api.crmcustomerorglink.CrmCustomerOrgLinkFeign
+ * Description: 客户、单位关联表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-06-03 09:41:42
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "客户、单位关联表")
+@FeignClient(
+ contextId = "anrui-crm-CrmCustomerOrgLink",
+ name = "anrui-crm",
+ path = "v1/crmcustomerorglink",
+ fallback = CrmCustomerOrgLinkFeignFallback.class)
+public interface CrmCustomerOrgLinkFeign {
+
+ @ApiOperation("根据条件分页查询数据的列表")
+ @PostMapping("/listPage")
+ @ResponseBody
+ public ResultBean> listPage(@RequestBody PagerQuery pq);
+
+ @ApiOperation("新增或修改")
+ @PostMapping("/save")
+ @ResponseBody
+ public ResultBean save(@RequestBody CrmCustomerOrgLinkDto dto);
+
+ @ApiOperation("根据sid删除记录")
+ @DeleteMapping("/delBySids")
+ @ResponseBody
+ public ResultBean delBySids(@RequestBody String[] sids);
+
+ @ApiOperation("根据SID获取一条记录")
+ @GetMapping("/fetchDetailsBySid/{sid}")
+ @ResponseBody
+ public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid);
+}
\ No newline at end of file
diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerorglink/CrmCustomerOrgLinkFeignFallback.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerorglink/CrmCustomerOrgLinkFeignFallback.java
new file mode 100644
index 0000000000..889fc9ebe8
--- /dev/null
+++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerorglink/CrmCustomerOrgLinkFeignFallback.java
@@ -0,0 +1,72 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.crm.api.crmcustomerorglink;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * Project: anrui-crm(客户单位)
+ * File: CrmCustomerOrgLinkFeignFallback.java
+ * Class: com.yxt.anrui.crm.api.crmcustomerorglink.CrmCustomerOrgLinkFeignFallback
+ * Description: 客户、单位关联表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-06-03 09:41:42
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class CrmCustomerOrgLinkFeignFallback implements CrmCustomerOrgLinkFeign {
+
+ @Override
+ public ResultBean> listPage(PagerQuery pq){
+ ResultBean rb = ResultBean.fireFail();
+ return rb.setMsg("接口anrui-crm/crmcustomerorglink/listPage无法访问");
+ }
+
+ @Override
+ public ResultBean save(CrmCustomerOrgLinkDto dto){
+ return ResultBean.fireFail().setMsg("接口anrui-crm/crmcustomerorglink/save无法访问");
+ }
+
+ @Override
+ public ResultBean delBySids( String[] sids){
+ return ResultBean.fireFail().setMsg("接口anrui-crm/crmcustomerorglink/delBySids无法访问");
+ }
+
+ @Override
+ public ResultBean fetchDetailsBySid(String sid){
+ ResultBean rb = ResultBean.fireFail();
+ return rb.setMsg("接口anrui-crm/crmcustomerorglink/fetchDetailsBySid无法访问");
+ }
+}
\ No newline at end of file
diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerorglink/CrmCustomerOrgLinkQuery.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerorglink/CrmCustomerOrgLinkQuery.java
new file mode 100644
index 0000000000..54b8420a8b
--- /dev/null
+++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerorglink/CrmCustomerOrgLinkQuery.java
@@ -0,0 +1,57 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.crm.api.crmcustomerorglink;
+
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-crm(客户单位)
+ * File: CrmCustomerOrgLinkQuery.java
+ * Class: com.yxt.anrui.crm.api.crmcustomerorglink.CrmCustomerOrgLinkQuery
+ * Description: 客户、单位关联表 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-06-03 09:41:42
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "客户、单位关联表 查询条件", description = "客户、单位关联表 查询条件")
+public class CrmCustomerOrgLinkQuery implements Query {
+
+ @ApiModelProperty("customerSid")
+ private String customerSid; //
+ @ApiModelProperty("orgSid")
+ private String orgSid; //
+
+}
diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerorglink/CrmCustomerOrgLinkVo.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerorglink/CrmCustomerOrgLinkVo.java
new file mode 100644
index 0000000000..5daf3eab71
--- /dev/null
+++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerorglink/CrmCustomerOrgLinkVo.java
@@ -0,0 +1,59 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.crm.api.crmcustomerorglink;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-crm(客户单位)
+ * File: CrmCustomerOrgLinkVo.java
+ * Class: com.yxt.anrui.crm.api.crmcustomerorglink.CrmCustomerOrgLinkVo
+ * Description: 客户、单位关联表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-06-03 09:41:42
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "客户、单位关联表 视图数据对象", description = "客户、单位关联表 视图数据对象")
+public class CrmCustomerOrgLinkVo implements Vo {
+
+ private String sid; // sid
+
+ @ApiModelProperty("customerSid")
+ private String customerSid; //
+ @ApiModelProperty("orgSid")
+ private String orgSid; //
+
+}
diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/AsCustomerListQuery.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/AsCustomerListQuery.java
new file mode 100644
index 0000000000..937a4fa74d
--- /dev/null
+++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/AsCustomerListQuery.java
@@ -0,0 +1,36 @@
+package com.yxt.anrui.crm.api.crmcustomertemp;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/6/3 13:42
+ */
+@Data
+public class AsCustomerListQuery implements Query {
+ @ApiModelProperty("客户名称")
+ private String name;
+ @ApiModelProperty("客户类型key（自然人/法人）")
+ private String customerTypeKey;
+ @ApiModelProperty("联系电话")
+ private String mobile;
+ @ApiModelProperty("客户级别（意向客户/准客户/成交客户/集团内销/黑名单客户）")
+ private String levelKey;
+ @ApiModelProperty("提醒开始日期")
+ private String remindStartDay;
+ @ApiModelProperty("提醒结束日期")
+ private String remindEndDay;
+
+ @ApiModelProperty("全路径")
+ private String orgPath;
+ private String userSid;
+ @ApiModelProperty("菜单url")
+ private String menuUrl;
+
+
+}
diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/AsCustomerListVo.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/AsCustomerListVo.java
new file mode 100644
index 0000000000..6483977336
--- /dev/null
+++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/AsCustomerListVo.java
@@ -0,0 +1,39 @@
+package com.yxt.anrui.crm.api.crmcustomertemp;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.anrui.crm.api.crmbusiness.CrmBusinessVo;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/6/3 13:42
+ */
+@Data
+public class AsCustomerListVo implements Vo {
+
+ @ApiModelProperty("潜在客户sid")
+ private String sid;
+ @ApiModelProperty("客户编号（部门编码+客户类型（1位，0个人，1企业）+部门内部流水号（6位））")
+ private String customerNo;
+ @ApiModelProperty("客户名称")
+ private String name;
+ @ApiModelProperty("客户类型（自然人/法人）")
+ private String customerType;
+ @ApiModelProperty("联系电话")
+ private String mobile;
+ @ApiModelProperty("微信号码")
+ private String weixin;
+ @ApiModelProperty("客户级别（意向客户/准客户/成交客户/集团内销/黑名单客户）")
+ private String level;
+ @ApiModelProperty("提醒日期")
+ private String remind_day;
+ private String vehCount; //车辆数量
+
+
+
+}
diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTemp.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTemp.java
index b3d34767f0..3119998687 100644
--- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTemp.java
+++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTemp.java
@@ -116,6 +116,9 @@ public class CrmCustomerTemp extends BaseEntity {
@ApiModelProperty("创建组织sid")
private String createOrgSid;
+ @ApiModelProperty("创建部门sid")
+ private String useOrgSid;
+
@ApiModelProperty("性别")
private String sex;
diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempDto.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempDto.java
index e0bce64fec..82a5e2650d 100644
--- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempDto.java
+++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempDto.java
@@ -140,6 +140,8 @@ public class CrmCustomerTempDto implements Dto {
private String orgPath;
+ private String useOrgSid;
+ private String customerOrgSid;
+ private String customerOrgName;
-
-}
\ No newline at end of file
+}
diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java
index c631354705..bdb0534255 100644
--- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java
+++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java
@@ -45,6 +45,15 @@ public interface CrmCustomerTempFeign {
@PostMapping("/listPage")
public ResultBean> listPage(@RequestBody PagerQuery pq);
+
+ /**
+ * 售后客户管理分页列表
+ * @param pq
+ * @return
+ */
+ @ApiOperation("售后客户管理分页列表")
+ @PostMapping("/asListPage")
+ public ResultBean> asListPage(@RequestBody PagerQuery pq);
/**
* 潜在客户管理区分组织层级查询
*
diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeignFallback.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeignFallback.java
index 162e797cb6..7743d33626 100644
--- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeignFallback.java
+++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeignFallback.java
@@ -31,6 +31,11 @@ public class CrmCustomerTempFeignFallback implements CrmCustomerTempFeign {
return rb.setMsg("接口anrui-crm/crmcustomertemp/listPage无法访问");
}
+ @Override
+ public ResultBean> asListPage(PagerQuery pq) {
+ return null;
+ }
+
@Override
public ResultBean> listPageByOrgPathSid(PagerQuery pq) {
return null;
diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempUpdateDto.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempUpdateDto.java
index 1f737f1c47..be02260d48 100644
--- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempUpdateDto.java
+++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempUpdateDto.java
@@ -109,7 +109,9 @@ public class CrmCustomerTempUpdateDto implements Dto {
private String remarks;
private String orgPath;
-
+ private String useOrgSid;
+ private String customerOrgSid;
+ private String customerOrgName;
//运营信息
@ApiModelProperty(value = "运营信息")
private CrmBusinessDto crmBusinessDto = new CrmBusinessDto();
diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempVo.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempVo.java
index 6628e1e07e..edf3b8d978 100644
--- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempVo.java
+++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempVo.java
@@ -50,79 +50,79 @@ public class CrmCustomerTempVo implements Vo {
@ApiModelProperty("登记日期")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date createTime;
-
+
@ApiModelProperty("客户编号（部门编码+客户类型（1位，0个人，1企业）+部门内部流水号（6位））")
private String customerNo;
-
+
@ApiModelProperty("客户类型（自然人/法人）")
private String customerType;
-
+
@ApiModelProperty("客户类型key")
private String customerTypeKey;
-
+
@ApiModelProperty("客户分类（个人：司机/个体老板/其他。企业：企业型客户/一级经销商/二级经销商/终端物流客户）")
private String customerClass;
-
+
@ApiModelProperty("客户分类key")
private String customerClassKey;
-
+
@ApiModelProperty("客户来源（公司资源/自主开发/交接客户/转介绍客户/集团内销）")
private String source;
-
+
@ApiModelProperty("客户来源key")
private String sourceKey;
-
+
@ApiModelProperty("客户级别（意向客户/准客户/成交客户/集团内销/黑名单客户）")
private String level;
-
+
@ApiModelProperty("客户级别key")
private String levelKey;
-
+
@ApiModelProperty("客户名称")
private String name;
@ApiModelProperty("证件类型key")
private String certificateTypeKey;
-
+
@ApiModelProperty("证件类型（个人为身份证/企业为营业执照）")
private String certificateType;
-
+
@ApiModelProperty("证件号码（个人为身份证号/企业为统一社会信用代码）")
private String IDNumber;
-
+
@ApiModelProperty("证件有效期")
private String endDate;
-
+
@ApiModelProperty("行政区划代码（省）")
private String address_province;
-
+
@ApiModelProperty("行政区划代码（市）")
private String address_city;
-
+
@ApiModelProperty("行政区划代码（县）")
private String address_county;
-
+
@ApiModelProperty("省")
private String province;
-
+
@ApiModelProperty("市")
private String city;
-
+
@ApiModelProperty("县")
private String county;
-
+
@ApiModelProperty("客户地址")
private String address;
-
+
@ApiModelProperty("邮编")
private String zipCode;
-
+
@ApiModelProperty("电子邮箱")
private String e_mail;
-
+
@ApiModelProperty("联系人")
private String contacts;
-
+
@ApiModelProperty("联系电话")
private String mobile;
@@ -131,31 +131,31 @@ public class CrmCustomerTempVo implements Vo {
@ApiModelProperty("紧急联系电话")
private String emergencyMobile;
-
+
@ApiModelProperty("微信号码")
private String weixin;
-
+
@ApiModelProperty("业务人员sid")
private String staffSid;
-
+
@ApiModelProperty("创建组织sid")
private String createOrgSid;
-
+
@ApiModelProperty("性别")
private String sex;
@ApiModelProperty("性别key")
private String sexKey;
-
+
@ApiModelProperty("客户生日")
private String birthday;
-
+
@ApiModelProperty("所在公司名称")
private String companyName;
@ApiModelProperty("跟进状态key")
private String follow_state_key;
-
+
@ApiModelProperty("跟进状态")
private String follow_state;
@@ -164,13 +164,13 @@ public class CrmCustomerTempVo implements Vo {
@ApiModelProperty("是否开启提醒（1开启，0不开启）")
private String isOnRemind;
-
+
@ApiModelProperty("提醒日期")
private String remind_day;
-
+
@ApiModelProperty("提醒备注")
private String remind_remark;
-
+
@ApiModelProperty("客户头像")
private String customerPhoto;
@@ -192,6 +192,9 @@ public class CrmCustomerTempVo implements Vo {
@ApiModelProperty("客户运营信息")
private CrmBusinessVo crmBusinessVo;
+ private String useOrgSid;
+ private String customerOrgSid;
+ private String customerOrgName;
/* @ApiModelProperty("客户车辆需求信息")
private List crmVehicledemandVos;*/
}
diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerorg/CrmCustomerOrgMapper.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerorg/CrmCustomerOrgMapper.java
new file mode 100644
index 0000000000..cab9cd7a3c
--- /dev/null
+++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerorg/CrmCustomerOrgMapper.java
@@ -0,0 +1,73 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.crm.biz.crmcustomerorg;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import com.yxt.anrui.crm.api.crmcustomerorg.CrmCustomerOrg;
+import com.yxt.anrui.crm.api.crmcustomerorg.CrmCustomerOrgVo;
+
+import java.util.List;
+
+/**
+ * Project: anrui-crm(客户单位)
+ * File: CrmCustomerOrgMapper.java
+ * Class: com.yxt.anrui.crm.biz.crmcustomerorg.CrmCustomerOrgMapper
+ * Description: 客户单位.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-06-03 09:41:42
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface CrmCustomerOrgMapper extends BaseMapper {
+
+ //@Update("update crm_customer_org set name=#{msg} where id=#{id}")
+ //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw);
+
+ IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw);
+
+ List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw);
+
+ @Select("select * from crm_customer_org")
+ List selectListVo();
+
+ CrmCustomerOrg checkForInsert(@Param("orgName") String orgName,@Param("useOrgSid") String useOrgSid);
+
+ CrmCustomerOrg checkForUpdate(@Param("orgName")String orgName, @Param("useOrgSid")String useOrgSid, @Param("sid")String sid);
+
+ int updateBySidIsDelete(List list);
+
+ List selCustomerOrgList(@Param("useOrgSid") String useOrgSid);
+}
diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerorg/CrmCustomerOrgMapper.xml b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerorg/CrmCustomerOrgMapper.xml
new file mode 100644
index 0000000000..fa6e3079c3
--- /dev/null
+++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerorg/CrmCustomerOrgMapper.xml
@@ -0,0 +1,43 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ UPDATE crm_customer_org
+ SET isDelete=1
+ where sid in
+
+ #{item}
+
+
+
diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerorg/CrmCustomerOrgRest.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerorg/CrmCustomerOrgRest.java
new file mode 100644
index 0000000000..890ce382b9
--- /dev/null
+++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerorg/CrmCustomerOrgRest.java
@@ -0,0 +1,104 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.crm.biz.crmcustomerorg;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import com.yxt.anrui.crm.api.crmcustomerorg.CrmCustomerOrg;
+import com.yxt.anrui.crm.api.crmcustomerorg.CrmCustomerOrgQuery;
+import com.yxt.anrui.crm.api.crmcustomerorg.CrmCustomerOrgVo;
+import com.yxt.anrui.crm.api.crmcustomerorg.CrmCustomerOrgDetailsVo;
+import com.yxt.anrui.crm.api.crmcustomerorg.CrmCustomerOrgDto;
+import com.yxt.anrui.crm.api.crmcustomerorg.CrmCustomerOrgFeign;
+
+/**
+ * Project: anrui-crm(客户单位)
+ * File: CrmCustomerOrgFeignFallback.java
+ * Class: com.yxt.anrui.crm.biz.crmcustomerorg.CrmCustomerOrgRest
+ * Description: 客户单位.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-06-03 09:41:42
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "客户单位")
+@RestController("com.yxt.anrui.crm.biz.crmcustomerorg.CrmCustomerOrgRest")
+@RequestMapping("v1/crmcustomerorg")
+public class CrmCustomerOrgRest implements CrmCustomerOrgFeign {
+
+ @Autowired
+ private CrmCustomerOrgService crmCustomerOrgService;
+
+ @Override
+ @ApiOperation("根据条件分页查询数据的列表")
+ @PostMapping("/listPage")
+ public ResultBean> listPage(@RequestBody PagerQuery pq){
+ ResultBean rb = ResultBean.fireFail();
+ PagerVo pv = crmCustomerOrgService.listPageVo(pq);
+ return rb.success().setData(pv);
+ }
+
+ @Override
+ @ApiOperation("新增或修改")
+ @PostMapping("/save")
+ public ResultBean save(@RequestBody CrmCustomerOrgDto dto){
+ return crmCustomerOrgService.saveOrUpdateDto(dto);
+ }
+
+ @ApiOperation("根据sid批量删除")
+ @DeleteMapping("/delBySids")
+ public ResultBean delBySids(@RequestBody String[] sids){
+ ResultBean rb = ResultBean.fireFail();
+ crmCustomerOrgService.delAll(sids);
+ return rb.success();
+ }
+
+ @Override
+ @ApiOperation("根据SID获取一条记录")
+ @GetMapping("/fetchDetailsBySid/{sid}")
+ public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){
+ ResultBean rb = ResultBean.fireFail();
+ CrmCustomerOrgDetailsVo vo = crmCustomerOrgService.fetchDetailsVoBySid(sid);
+ return rb.success().setData(vo);
+ }
+
+ @Override
+ public ResultBean> selCustomerOrgList(String useOrgSid) {
+ ResultBean rb = ResultBean.fireFail();
+ List list = crmCustomerOrgService.selCustomerOrgList(useOrgSid);
+ return rb.success().setData(list);
+ }
+}
diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerorg/CrmCustomerOrgService.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerorg/CrmCustomerOrgService.java
new file mode 100644
index 0000000000..35b2739e50
--- /dev/null
+++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerorg/CrmCustomerOrgService.java
@@ -0,0 +1,201 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.crm.biz.crmcustomerorg;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateTime;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.crm.utils.PinYinUtils;
+import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
+import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
+import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
+import org.apache.commons.lang3.StringUtils;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.anrui.crm.api.crmcustomerorg.CrmCustomerOrg;
+import com.yxt.anrui.crm.api.crmcustomerorg.CrmCustomerOrgQuery;
+import com.yxt.anrui.crm.api.crmcustomerorg.CrmCustomerOrgVo;
+import com.yxt.anrui.crm.api.crmcustomerorg.CrmCustomerOrgDetailsVo;
+import com.yxt.anrui.crm.api.crmcustomerorg.CrmCustomerOrgDto;
+import com.yxt.anrui.crm.api.crmcustomerorg.CrmCustomerOrgFeign;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * Project: anrui-crm(客户单位)
+ * File: CrmCustomerOrgService.java
+ * Class: com.yxt.anrui.crm.biz.crmcustomerorg.CrmCustomerOrgService
+ * Description: 客户单位 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-06-03 09:41:42
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class CrmCustomerOrgService extends MybatisBaseService {
+
+ @Autowired
+ private SysUserFeign sysUserFeign;
+
+ private QueryWrapper createQueryWrapper(CrmCustomerOrgQuery query) {
+ // todo: 这里根据具体业务调整查询条件
+ // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+ QueryWrapper qw = new QueryWrapper<>();
+ return qw;
+ }
+
+ public PagerVo listPageVo(PagerQuery pq) {
+ CrmCustomerOrgQuery query = pq.getParams();
+ QueryWrapper qw = new QueryWrapper<>();
+ PrivilegeQuery privilegeQuery = new PrivilegeQuery();
+ privilegeQuery.setOrgPath(query.getOrgPath());
+ privilegeQuery.setMenuUrl(query.getMenuUrl());
+ privilegeQuery.setUserSid(query.getUserSid());
+ ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
+ if (StringUtils.isNotBlank(query.getMenuUrl())) {
+ if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
+ //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
+ String orgSidPath = query.getOrgPath();
+ orgSidPath = orgSidPath + "/";
+ int i1 = orgSidPath.indexOf("/");
+ int i2 = orgSidPath.indexOf("/", i1 + 1);
+ int i3 = orgSidPath.indexOf("/", i2 + 1);
+ int i4 = orgSidPath.indexOf("/", i3 + 1);
+ String orgLevelKey = defaultIdReltBean.getData();
+ if ("1".equals(orgLevelKey)) {
+ orgSidPath = orgSidPath.substring(0, i1);
+ qw.like("s.orgSidPath", orgSidPath);
+ } else if ("2".equals(orgLevelKey)) {
+ orgSidPath = orgSidPath.substring(0, i2);
+ qw.like("s.orgSidPath", orgSidPath);
+ } else if ("3".equals(orgLevelKey)) {
+ orgSidPath = orgSidPath.substring(0, i3);
+ qw.like("s.orgSidPath", orgSidPath);
+ } else if ("4".equals(orgLevelKey)) {
+ orgSidPath = orgSidPath.substring(0, i4);
+ qw.like("s.orgSidPath", orgSidPath);
+ } else if ("5".equals(orgLevelKey)) {
+ qw.eq("a.createBySid", query.getUserSid());
+ } else {
+ PagerVo p = new PagerVo<>();
+ return p;
+ }
+ } else {
+ PagerVo p = new PagerVo<>();
+ return p;
+ }
+ }
+ if (StringUtils.isNotBlank(query.getOrgName())) {
+ qw.like("a.orgName", query.getOrgName());
+ }
+ if (StringUtils.isNotBlank(query.getOrgCode())) {
+ qw.like("a.orgCode", query.getOrgCode());
+ }
+ if (StringUtils.isNotBlank(query.getContacts())) {
+ qw.like("a.contacts", query.getContacts());
+ }
+ if (StringUtils.isNotBlank(query.getMobile())) {
+ qw.like("a.mobile", query.getMobile());
+ }
+ qw.eq("a.isDelete", 0);
+ qw.orderByAsc("a.sortNo");
+ IPage page = PagerUtil.queryToPage(pq);
+ IPage pagging = baseMapper.selectPageVo(page, qw);
+ PagerVo p = PagerUtil.pageToVo(pagging, null);
+ return p;
+ }
+
+ public ResultBean saveOrUpdateDto(CrmCustomerOrgDto dto) {
+ ResultBean rb = ResultBean.fireFail();
+ String sid = "";
+ if (StringUtils.isNotBlank(dto.getSid())) {
+ sid = dto.getSid();
+ CrmCustomerOrg crmCustomerOrg = fetchBySid(dto.getSid());
+ BeanUtil.copyProperties(dto, crmCustomerOrg, "id", "sid");
+ crmCustomerOrg.setModifyTime(new Date());
+ crmCustomerOrg.setOrgCode(PinYinUtils.sx(dto.getOrgName()));
+ CrmCustomerOrg check = baseMapper.checkForUpdate(dto.getOrgName(), crmCustomerOrg.getUseOrgSid(), sid);
+ if (null != check) {
+ return rb.setMsg("单位名称不能重复");
+ }
+ baseMapper.updateById(crmCustomerOrg);
+ } else {
+ CrmCustomerOrg crmCustomerOrg = new CrmCustomerOrg();
+ BeanUtil.copyProperties(dto, crmCustomerOrg, "id", "sid");
+ crmCustomerOrg.setOrgCode(PinYinUtils.sx(dto.getOrgName()));
+ CrmCustomerOrg check = baseMapper.checkForInsert(dto.getOrgName(), dto.getUseOrgSid());
+ if (null != check) {
+ return rb.setMsg("单位名称不能重复");
+ }
+ baseMapper.insert(crmCustomerOrg);
+ }
+ return rb.success();
+ }
+
+ public void insertByDto(CrmCustomerOrgDto dto) {
+ CrmCustomerOrg entity = new CrmCustomerOrg();
+ BeanUtil.copyProperties(dto, entity, "id", "sid");
+ baseMapper.insert(entity);
+ }
+
+ public void updateByDto(CrmCustomerOrgDto dto) {
+ String dtoSid = dto.getSid();
+ if (StringUtils.isBlank(dtoSid)) {
+ return;
+ }
+ CrmCustomerOrg entity = fetchBySid(dtoSid);
+ BeanUtil.copyProperties(dto, entity, "id", "sid");
+ baseMapper.updateById(entity);
+ }
+
+ public CrmCustomerOrgDetailsVo fetchDetailsVoBySid(String sid) {
+ CrmCustomerOrg entity = fetchBySid(sid);
+ CrmCustomerOrgDetailsVo vo = new CrmCustomerOrgDetailsVo();
+ BeanUtil.copyProperties(entity, vo);
+ return vo;
+ }
+
+ public void delAll(String[] sids) {
+ int count = baseMapper.updateBySidIsDelete(Arrays.stream(sids).collect(Collectors.toList()));
+ }
+
+ public List selCustomerOrgList(String useOrgSid) {
+ return baseMapper.selCustomerOrgList(useOrgSid);
+ }
+}
diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerorglink/CrmCustomerOrgLinkMapper.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerorglink/CrmCustomerOrgLinkMapper.java
new file mode 100644
index 0000000000..6092010f09
--- /dev/null
+++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerorglink/CrmCustomerOrgLinkMapper.java
@@ -0,0 +1,67 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.crm.biz.crmcustomerorglink;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import com.yxt.anrui.crm.api.crmcustomerorglink.CrmCustomerOrgLink;
+import com.yxt.anrui.crm.api.crmcustomerorglink.CrmCustomerOrgLinkVo;
+
+import java.util.List;
+
+/**
+ * Project: anrui-crm(客户单位)
+ * File: CrmCustomerOrgLinkMapper.java
+ * Class: com.yxt.anrui.crm.biz.crmcustomerorglink.CrmCustomerOrgLinkMapper
+ * Description: 客户、单位关联表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-06-03 09:41:42
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface CrmCustomerOrgLinkMapper extends BaseMapper {
+
+ //@Update("update crm_customer_org_link set name=#{msg} where id=#{id}")
+ //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw);
+
+ IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw);
+
+ List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw);
+
+ @Select("select * from crm_customer_org_link")
+ List selectListVo();
+
+ CrmCustomerOrgLink fetchByCustomerSid(@Param("customerSid") String customerSid);
+}
diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerorglink/CrmCustomerOrgLinkMapper.xml b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerorglink/CrmCustomerOrgLinkMapper.xml
new file mode 100644
index 0000000000..0241fec3b3
--- /dev/null
+++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerorglink/CrmCustomerOrgLinkMapper.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerorglink/CrmCustomerOrgLinkRest.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerorglink/CrmCustomerOrgLinkRest.java
new file mode 100644
index 0000000000..990a35d640
--- /dev/null
+++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerorglink/CrmCustomerOrgLinkRest.java
@@ -0,0 +1,100 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.crm.biz.crmcustomerorglink;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import com.yxt.anrui.crm.api.crmcustomerorglink.CrmCustomerOrgLink;
+import com.yxt.anrui.crm.api.crmcustomerorglink.CrmCustomerOrgLinkQuery;
+import com.yxt.anrui.crm.api.crmcustomerorglink.CrmCustomerOrgLinkVo;
+import com.yxt.anrui.crm.api.crmcustomerorglink.CrmCustomerOrgLinkDetailsVo;
+import com.yxt.anrui.crm.api.crmcustomerorglink.CrmCustomerOrgLinkDto;
+import com.yxt.anrui.crm.api.crmcustomerorglink.CrmCustomerOrgLinkFeign;
+
+/**
+ * Project: anrui-crm(客户单位)
+ * File: CrmCustomerOrgLinkFeignFallback.java
+ * Class: com.yxt.anrui.crm.biz.crmcustomerorglink.CrmCustomerOrgLinkRest
+ * Description: 客户、单位关联表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-06-03 09:41:42
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "客户、单位关联表")
+@RestController("com.yxt.anrui.crm.biz.crmcustomerorglink.CrmCustomerOrgLinkRest")
+@RequestMapping("v1/crmcustomerorglink")
+public class CrmCustomerOrgLinkRest implements CrmCustomerOrgLinkFeign {
+
+ @Autowired
+ private CrmCustomerOrgLinkService crmCustomerOrgLinkService;
+
+ @Override
+ @ApiOperation("根据条件分页查询数据的列表")
+ @PostMapping("/listPage")
+ public ResultBean> listPage(@RequestBody PagerQuery pq){
+ ResultBean rb = ResultBean.fireFail();
+ PagerVo pv = crmCustomerOrgLinkService.listPageVo(pq);
+ return rb.success().setData(pv);
+ }
+
+ @Override
+ @ApiOperation("新增或修改")
+ @PostMapping("/save")
+ public ResultBean save(@RequestBody CrmCustomerOrgLinkDto dto){
+ ResultBean rb = ResultBean.fireFail();
+ crmCustomerOrgLinkService.saveOrUpdateDto(dto);
+ return rb.success();
+ }
+
+ @Override
+ @ApiOperation("根据sid批量删除")
+ @PostMapping("/delBySids")
+ public ResultBean delBySids(@RequestBody String[] sids){
+ ResultBean rb = ResultBean.fireFail();
+ crmCustomerOrgLinkService.delBySids(sids);
+ return rb.success();
+ }
+
+ @Override
+ @ApiOperation("根据SID获取一条记录")
+ @GetMapping("/fetchDetailsBySid/{sid}")
+ public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){
+ ResultBean rb = ResultBean.fireFail();
+ CrmCustomerOrgLinkDetailsVo vo = crmCustomerOrgLinkService.fetchDetailsVoBySid(sid);
+ return rb.success().setData(vo);
+ }
+}
diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerorglink/CrmCustomerOrgLinkService.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerorglink/CrmCustomerOrgLinkService.java
new file mode 100644
index 0000000000..88605516ff
--- /dev/null
+++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerorglink/CrmCustomerOrgLinkService.java
@@ -0,0 +1,128 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.crm.biz.crmcustomerorglink;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import io.swagger.annotations.ApiModelProperty;
+import org.apache.commons.lang3.StringUtils;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.anrui.crm.api.crmcustomerorglink.CrmCustomerOrgLink;
+import com.yxt.anrui.crm.api.crmcustomerorglink.CrmCustomerOrgLinkQuery;
+import com.yxt.anrui.crm.api.crmcustomerorglink.CrmCustomerOrgLinkVo;
+import com.yxt.anrui.crm.api.crmcustomerorglink.CrmCustomerOrgLinkDetailsVo;
+import com.yxt.anrui.crm.api.crmcustomerorglink.CrmCustomerOrgLinkDto;
+import com.yxt.anrui.crm.api.crmcustomerorglink.CrmCustomerOrgLinkFeign;
+
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Project: anrui-crm(客户单位)
+ * File: CrmCustomerOrgLinkService.java
+ * Class: com.yxt.anrui.crm.biz.crmcustomerorglink.CrmCustomerOrgLinkService
+ * Description: 客户、单位关联表 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-06-03 09:41:42
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class CrmCustomerOrgLinkService extends MybatisBaseService {
+ private QueryWrapper createQueryWrapper(CrmCustomerOrgLinkQuery query) {
+ // todo: 这里根据具体业务调整查询条件
+ // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+ QueryWrapper qw = new QueryWrapper<>();
+ return qw;
+ }
+
+ public PagerVo listPageVo(PagerQuery pq) {
+ CrmCustomerOrgLinkQuery query = pq.getParams();
+ QueryWrapper qw = createQueryWrapper(query);
+ IPage page = PagerUtil.queryToPage(pq);
+ IPage pagging = baseMapper.selectPageVo(page, qw);
+ PagerVo p = PagerUtil.pageToVo(pagging, null);
+ return p;
+ }
+
+ public void saveOrUpdateDto(CrmCustomerOrgLinkDto dto) {
+ String dtoSid = dto.getSid();
+ if (StringUtils.isBlank(dtoSid)) {
+ this.insertByDto(dto);
+ return;
+ }
+ this.updateByDto(dto);
+ }
+
+ public void insertByDto(CrmCustomerOrgLinkDto dto) {
+ CrmCustomerOrgLink entity = new CrmCustomerOrgLink();
+ BeanUtil.copyProperties(dto, entity, "id", "sid");
+ baseMapper.insert(entity);
+ }
+
+ public void updateByDto(CrmCustomerOrgLinkDto dto) {
+ String dtoSid = dto.getSid();
+ if (StringUtils.isBlank(dtoSid)) {
+ return;
+ }
+ CrmCustomerOrgLink entity = fetchBySid(dtoSid);
+ BeanUtil.copyProperties(dto, entity, "id", "sid");
+ baseMapper.updateById(entity);
+ }
+
+ public CrmCustomerOrgLinkDetailsVo fetchDetailsVoBySid(String sid) {
+ CrmCustomerOrgLink entity = fetchBySid(sid);
+ CrmCustomerOrgLinkDetailsVo vo = new CrmCustomerOrgLinkDetailsVo();
+ BeanUtil.copyProperties(entity, vo);
+ return vo;
+ }
+
+ public CrmCustomerOrgLink fetchByCustomerSid(String customerSid) {
+ return baseMapper.fetchByCustomerSid(customerSid);
+ }
+
+ public void saveOrgLink(String customerSid, String orgSid) {
+ CrmCustomerOrgLink crmCustomerOrgLink = baseMapper.fetchByCustomerSid(customerSid);
+ if (null != crmCustomerOrgLink) {
+ crmCustomerOrgLink.setOrgSid(orgSid);
+ baseMapper.updateById(crmCustomerOrgLink);
+ } else {
+ CrmCustomerOrgLink entity = new CrmCustomerOrgLink();
+ entity.setCustomerSid(customerSid);
+ entity.setOrgSid(orgSid);
+ baseMapper.insert(entity);
+ }
+ }
+}
diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.java
index 5f4dbe3de4..32ae88700a 100644
--- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.java
+++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.java
@@ -137,4 +137,6 @@ public interface CrmCustomerTempMapper extends BaseMapper {
void updateIdBySid(@Param("idCard") String idCard,@Param("custSid") String custSid);
List exportExcel(@Param(Constants.WRAPPER) QueryWrapper qw);
-}
\ No newline at end of file
+
+ IPage asListPage(IPage page, @Param(Constants.WRAPPER)QueryWrapper qw);
+}
diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml
index b60c7bedaa..51d5602bcf 100644
--- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml
+++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml
@@ -298,10 +298,21 @@
${ew.sqlSegment}
+
update crm_customer_temp
set IDNumber = #{idCard}
where sid = #{custSid}
-
\ No newline at end of file
+
diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempRest.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempRest.java
index 74c11ed53a..42fb3857c5 100644
--- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempRest.java
+++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempRest.java
@@ -8,6 +8,7 @@ import com.yxt.anrui.base.api.basevehicle.BaseVehicleExportVo;
import com.yxt.anrui.buscenter.api.busdeposit.BusDepositFeign;
import com.yxt.anrui.crm.api.crmcustomerfile.AppCrmCustomerTempArchivesDto;
import com.yxt.anrui.crm.api.crmcustomerfile.AppCrmCustomerTempArchivesVo;
+import com.yxt.anrui.crm.api.crmcustomerorg.CrmCustomerOrgVo;
import com.yxt.anrui.crm.api.crmcustomertemp.*;
import com.yxt.anrui.crm.biz.crmcustomerfile.CrmCustomerFileService;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
@@ -72,6 +73,13 @@ public class CrmCustomerTempRest implements CrmCustomerTempFeign {
return rb.success().setData(pv);
}
+ @Override
+ public ResultBean> asListPage(PagerQuery pq) {
+ ResultBean rb = ResultBean.fireFail();
+ PagerVo pv = crmCustomerTempService.asListPage(pq);
+ return rb.success().setData(pv);
+ }
+
@Override
public ResultBean> listPageByOrgPathSid(@RequestBody PagerQuery pq) {
ResultBean rb = ResultBean.fireFail();
diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java
index e37abaf761..9d28cadb87 100644
--- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java
+++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java
@@ -13,6 +13,10 @@ import com.yxt.anrui.crm.api.crmbusiness.CrmBusinessDto;
import com.yxt.anrui.crm.api.crmbusiness.CrmBusinessVo;
import com.yxt.anrui.crm.api.crmcustomerfile.CrmCustomerFile;
import com.yxt.anrui.crm.api.crmcustomerfile.CrmCustomerFileVo;
+import com.yxt.anrui.crm.api.crmcustomerorg.CrmCustomerOrg;
+import com.yxt.anrui.crm.api.crmcustomerorg.CrmCustomerOrgQuery;
+import com.yxt.anrui.crm.api.crmcustomerorg.CrmCustomerOrgVo;
+import com.yxt.anrui.crm.api.crmcustomerorglink.CrmCustomerOrgLink;
import com.yxt.anrui.crm.api.crmcustomertemp.*;
import com.yxt.anrui.crm.api.crmfile.CrmFile;
import com.yxt.anrui.crm.api.crmfile.CrmFileAttachTypeEnum;
@@ -24,6 +28,8 @@ import com.yxt.anrui.crm.api.crmvisit.CrmVisitVo;
import com.yxt.anrui.crm.api.crmvisit.PcCrmVisitAppendixDto;
import com.yxt.anrui.crm.biz.crmbusiness.CrmBusinessService;
import com.yxt.anrui.crm.biz.crmcustomerfile.CrmCustomerFileService;
+import com.yxt.anrui.crm.biz.crmcustomerorg.CrmCustomerOrgService;
+import com.yxt.anrui.crm.biz.crmcustomerorglink.CrmCustomerOrgLinkService;
import com.yxt.anrui.crm.biz.crmfile.CrmFileService;
import com.yxt.anrui.crm.biz.crmvehicledemand.CrmVehicledemandService;
import com.yxt.anrui.crm.biz.crmvisit.CrmVisitService;
@@ -37,6 +43,7 @@ import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoFeign;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo;
+import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserInfoVo;
import com.yxt.anrui.portal.api.sysuser.SysUserVo;
@@ -119,8 +126,10 @@ public class CrmCustomerTempService extends MybatisBaseService listPage(PagerQuery pq) {
CrmCustomerTempQuery query = pq.getParams();
QueryWrapper qw = createQueryWrapper(query);
@@ -781,6 +790,16 @@ public class CrmCustomerTempService extends MybatisBaseService asListPage(PagerQuery pq) {
+ AsCustomerListQuery query = pq.getParams();
+ QueryWrapper qw = new QueryWrapper<>();
+ PrivilegeQuery privilegeQuery = new PrivilegeQuery();
+ privilegeQuery.setOrgPath(query.getOrgPath());
+ privilegeQuery.setMenuUrl(query.getMenuUrl());
+ privilegeQuery.setUserSid(query.getUserSid());
+ ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
+ if (StringUtils.isNotBlank(query.getMenuUrl())) {
+ if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
+ //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
+ String orgSidPath = query.getOrgPath();
+ orgSidPath = orgSidPath + "/";
+ int i1 = orgSidPath.indexOf("/");
+ int i2 = orgSidPath.indexOf("/", i1 + 1);
+ int i3 = orgSidPath.indexOf("/", i2 + 1);
+ int i4 = orgSidPath.indexOf("/", i3 + 1);
+ String orgLevelKey = defaultIdReltBean.getData();
+ if ("1".equals(orgLevelKey)) {
+ orgSidPath = orgSidPath.substring(0, i1);
+ qw.like("s.orgSidPath", orgSidPath);
+ } else if ("2".equals(orgLevelKey)) {
+ orgSidPath = orgSidPath.substring(0, i2);
+ qw.like("s.orgSidPath", orgSidPath);
+ } else if ("3".equals(orgLevelKey)) {
+ orgSidPath = orgSidPath.substring(0, i3);
+ qw.like("s.orgSidPath", orgSidPath);
+ } else if ("4".equals(orgLevelKey)) {
+ orgSidPath = orgSidPath.substring(0, i4);
+ qw.like("s.orgSidPath", orgSidPath);
+ } else if ("5".equals(orgLevelKey)) {
+ qw.eq("a.createBySid", query.getUserSid());
+ } else {
+ PagerVo p = new PagerVo<>();
+ return p;
+ }
+ } else {
+ PagerVo p = new PagerVo<>();
+ return p;
+ }
+ }
+ if (StringUtils.isNotBlank(query.getName())) {
+ qw.like("a.name", query.getName());
+ }
+ if (StringUtils.isNotBlank(query.getCustomerTypeKey())) {
+ qw.eq("a.customerTypeKey", query.getCustomerTypeKey());
+ }
+ if (StringUtils.isNotBlank(query.getMobile())) {
+ qw.like("a.mobile", query.getMobile());
+ }
+ if (StringUtils.isNotBlank(query.getLevelKey())) {
+ qw.like("a.levelKey", query.getLevelKey());
+ }
+ String remindStartDay = query.getRemindStartDay();
+ String remindEndDay = query.getRemindEndDay();
+ qw.apply(StringUtils.isNotBlank(remindStartDay), "date_format (a.remind_day,'%Y-%m-%d') >= date_format('" + remindStartDay + "','%Y-%m-%d')").
+ apply(StringUtils.isNotBlank(remindEndDay), "date_format (a.remind_day,'%Y-%m-%d') <= date_format('" + remindEndDay + "','%Y-%m-%d')"
+ );
+ qw.apply("a.useOrgSid IS NOT NULL and a.useOrgSid != ''");
+ qw.eq("a.isDelete", 0);
+ qw.orderByDesc("a.createTime");
+ IPage page = PagerUtil.queryToPage(pq);
+ IPage pagging = baseMapper.asListPage(page, qw);
+ PagerVo p = PagerUtil.pageToVo(pagging, null);
+ return p;
+ }
}
diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/utils/PinYinUtils.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/utils/PinYinUtils.java
new file mode 100644
index 0000000000..5c5eef627f
--- /dev/null
+++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/utils/PinYinUtils.java
@@ -0,0 +1,292 @@
+package com.yxt.anrui.crm.utils;
+
+import net.sourceforge.pinyin4j.PinyinHelper;
+import net.sourceforge.pinyin4j.format.HanyuPinyinCaseType;
+import net.sourceforge.pinyin4j.format.HanyuPinyinOutputFormat;
+import net.sourceforge.pinyin4j.format.HanyuPinyinToneType;
+import net.sourceforge.pinyin4j.format.HanyuPinyinVCharType;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.*;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+/**
+ * @Description
+ * @Author liuguohui
+ * @Date 2021/9/16
+ */
+public class PinYinUtils {
+
+ private static HanyuPinyinOutputFormat format = null;
+
+ static {
+ format = new HanyuPinyinOutputFormat();
+ //拼音小写
+ format.setCaseType(HanyuPinyinCaseType.LOWERCASE);
+ //无音标方式；WITH_TONE_NUMBER：1-4数字表示英标；WITH_TONE_MARK：直接用音标符（必须WITH_U_UNICODE否则异常
+ format.setToneType(HanyuPinyinToneType.WITHOUT_TONE);
+ //用v表示ü
+ format.setVCharType(HanyuPinyinVCharType.WITH_V);
+ }
+
+ // 多音字
+ private static final Map DYZMAP = setDYZMap();
+
+ private static Map setDYZMap(){
+ Map map = new HashMap<>();
+ map.put("仇","QIU");
+ map.put("柏", "BO");
+ map.put("牟", "MU");
+ map.put("颉", "XIE");
+ map.put("解", "XIE");
+ map.put("尉", "YU");
+ map.put("奇", "JI");
+ map.put("单", "SHAN");
+ map.put("谌", "SHEN");
+ map.put("乐", "YUE");
+ map.put("召", "SHAO");
+ map.put("朴", "PIAO");
+ map.put("区", "OU");
+ map.put("查", "ZHA");
+ map.put("曾", "ZENG");
+ map.put("缪", "MIAO");
+ map.put("晟", "CHENG");
+ map.put("员", "YUN");
+ map.put("贠", "YUN");
+ map.put("黑", "HE");
+ map.put("重", "CHONG");
+ map.put("秘", "BI");
+ map.put("冼", "XIAN");
+ map.put("折", "SHE");
+ map.put("翟", "ZHAI");
+ map.put("盖", "GE");
+ map.put("万俟", "MOQI");
+ map.put("尉迟", "YUCHI");
+ return map;
+ }
+
+
+
+ /**
+ * 返回字符串的拼音
+ * @param str
+ * @return
+ */
+ public static String[] getCharPinYinString(String str) {
+ if (str == null || str.length() < 1) {
+ return null;
+ }
+ List result = new ArrayList();
+ //对字符串中的记录逐个分析
+ for (int i = 0; i < str.length(); i++) {
+ result = getCharPinYinString(str.charAt(i), result);
+ }
+ return result.toArray(new String[result.size()]);
+ }
+
+ /**
+ * 将字符c的拼音拼接到list中的记录中
+ * @param c
+ * @param list
+ * @return
+ */
+ private static List getCharPinYinString(char c, List list) {
+ String[] strs = getCharPinYinString(c);
+ List result = new ArrayList();
+ // strs去重(多音字)
+ strs = disdinctStr(strs);
+
+ //如果解析出的拼音为空，判断字符C是否为英文字母，如果是英文字母则添加值拼音结果中
+ if (strs == null) {
+ if ((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z')) {
+ c = c <= 91 ? (char)(c + 32) : c;
+ if (list == null || list.size() == 0) {
+ result.add(c + "");
+ } else {
+ for (String s : list) {
+ result.add(s + c);
+ }
+ }
+ return result;
+ }
+ return list;
+ }
+ //将字符C的拼音首和已存在的拼音首组合成新的记录
+ for (String str : strs) {
+ if (list == null || list.size() == 0) {
+ result.add(str);
+ } else {
+ for (String s : list) {
+ result.add(s + str);
+ }
+ }
+ }
+ return result;
+ }
+
+ /**
+ * 返回汉字的拼音
+ * @param c
+ * @return
+ */
+ public static String[] getCharPinYinString(char c) {
+ try {
+ //返回字符C的拼音
+ return PinyinHelper.toHanyuPinyinStringArray(c, format);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return null;
+ }
+ /**
+ * 缩写
+ * @param args
+ */
+ public static String sx(String hz) {
+ char [] nameArray = hz.toCharArray();
+ String b="";
+ for (int i = 0; i < nameArray.length; i++) {
+ if (Character.toString(nameArray[i]).matches("^[\u4e00-\u9fa5]+$")) {
+ b=b+PinYinUtils.getCharDuoPinYinChar(String.valueOf(nameArray[i]));
+ }else{
+ b=b+String.valueOf(nameArray[i]);
+ }
+ }
+ return b;
+ }
+ /**
+ * 返回字符串的拼音的首字母
+ * @param str
+ * @return
+ */
+ public static String[] getCharPinYinChar(String str) {
+ if (str == null || str.length() < 1) {
+ return null;
+ }
+ List result = new ArrayList();
+ //对字符串中的记录逐个分析
+ for (int i = 0; i < str.length(); i++) {
+ result = getCharPinYinChar(str.charAt(i), result);
+ }
+ return result.toArray(new String[result.size()]);
+ }
+
+ /**
+ * 将字符c的拼音首字母拼接到list中的记录中
+ * @param c
+ * @param list
+ * @return
+ */
+ private static List getCharPinYinChar(char c, List list) {
+ char[] chars = getCharPinYinChar(c);
+ List result = new ArrayList();
+ //如果解析出的拼音为空，判断字符C是否为英文字母，如果是英文字母则添加值拼音结果中
+ if (chars == null) {
+ if ((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z')) {
+ c = c < 91 ? (char)(c + 32) : c;
+ if (list == null || list.size() == 0) {
+ result.add(c + "");
+ } else {
+ for (String s : list) {
+ result.add(s + c);
+ }
+ }
+ return result;
+ }
+ return list;
+ }
+ //将字符C的拼音首字母和已存在的拼音首字母组合成新的记录
+ for (char ch : chars) {
+ if (list == null || list.size() == 0) {
+ result.add(ch + "");
+ } else {
+ for (String s : list) {
+ result.add(s + ch);
+ }
+ }
+ }
+ return result;
+ }
+
+ /**
+ * 返回汉字拼音首字母
+ * @param c
+ * @return
+ */
+ public static char[] getCharPinYinChar(char c) {
+ //字符C的拼音
+ String[] strs = getCharPinYinString(c);
+ if (strs != null) {
+ //截取拼音的首字母
+ char[] chars = new char[strs.length];
+ for(int i = 0; i arrStream = Arrays.stream(str);
+ List arrList = arrStream.distinct().collect(Collectors.toList());
+ str = new String[arrList.size()];
+ arrList.toArray(str);
+ return str;
+ }
+
+ /**
+ * 判断传入的字符串是否为中文，将中文的转换为拼音
+ * @param name
+ * @return
+ */
+ public static String getPinYinName(String name){
+ char[] nameArray = name.toCharArray();
+ String newName = "";
+ for (int i = 0; i < nameArray.length; i++) {
+ if (Character.toString(nameArray[i]).matches("^[\u4e00-\u9fa5]+$")) { // 如果字符是中文,则将中文转为汉语拼音
+ String[] pinYinString = PinYinUtils.getCharPinYinString(nameArray[i]);
+ // strs去重(多音字)
+ pinYinString = disdinctStr(pinYinString);
+ String pinYinStr = StringUtils.join(pinYinString);
+ newName = newName + pinYinStr;
+ }else {
+ newName = newName + Character.toString(nameArray[i]);
+ }
+ }
+ return newName;
+ }
+
+ /**
+ * 返回字符串的拼音的首字母(包括多音字)
+ * @param str
+ * @return
+ */
+ public static String getCharDuoPinYinChar(String str) {
+ if (str == null || str.length() < 1) {
+ return null;
+ }
+ char firstChar = str.toCharArray()[0];
+ if(Character.toString(firstChar).matches("^[\u4e00-\u9fa5]+$")){ // 为中文
+ char[] charPinYinChar = getCharPinYinChar(firstChar);
+ String result = "";
+ if (DYZMAP.containsKey(Character.toString(firstChar))) {
+ result = DYZMAP.get(Character.toString(firstChar)).toString().substring(0, 1);
+ }else {
+ result = StringUtils.join(charPinYinChar[0]);
+ }
+ return result.toUpperCase();
+ }else if(Character.toString(firstChar).matches("^[a-zA-Z]")){ // 为英文字母
+ return Character.toString(firstChar).toUpperCase();
+ }else { // 特殊符号
+ return "#";
+ }
+ }
+
+}
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/ascustomervehicle/AsCustomerVehicleDetailsVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/ascustomervehicle/AsCustomerVehicleDetails.java
similarity index 51%
rename from yxt-as/src/main/java/com/yxt/anrui/as/api/ascustomervehicle/AsCustomerVehicleDetailsVo.java
rename to yxt-as/src/main/java/com/yxt/anrui/as/api/ascustomervehicle/AsCustomerVehicleDetails.java
index dd65b5c33c..bed3e88883 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/ascustomervehicle/AsCustomerVehicleDetailsVo.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/ascustomervehicle/AsCustomerVehicleDetails.java
@@ -26,10 +26,13 @@
package com.yxt.anrui.as.api.ascustomervehicle;
+import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.common.core.vo.Vo;
import com.fasterxml.jackson.annotation.JsonFormat;
+
import java.util.Date;
+
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -49,43 +52,60 @@ import lombok.Data;
*/
@Data
@ApiModel(value = "客户车辆信息 视图数据详情", description = "客户车辆信息 视图数据详情")
-public class AsCustomerVehicleDetailsVo implements Vo {
-
- private String sid; // sid
+public class AsCustomerVehicleDetails{
- @ApiModelProperty("客户sid")
+ private String customerVehSid; // 客户车辆信息sid
+ @ApiModelProperty("客户sid")
private String customerSid; // 客户sid
- @ApiModelProperty("车牌号")
+ @ApiModelProperty("车牌号")
private String vehMark; // 车牌号
- @ApiModelProperty("车架号")
+ @ApiModelProperty("车架号")
private String vinNo; // 车架号
- @ApiModelProperty("发动机号")
+ @ApiModelProperty("发动机号")
private String engineNo; // 发动机号
- @ApiModelProperty("车型sid")
+ @ApiModelProperty("车型sid")
private String vehModelSid; // 车型sid
- @ApiModelProperty("车型")
+ @ApiModelProperty("车型")
private String vehModel; // 车型
- @ApiModelProperty("行驶里程")
- private Integer mileage; // 行驶里程
- @ApiModelProperty("上次保养里程")
- private Integer lastMileage; // 上次保养里程
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
- @ApiModelProperty("下次保养日期")
- private Date nextMaintainDateStart; // 下次保养日期
- private Date nextMaintainDateEnd; // 下次保养日期
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
- @ApiModelProperty("购车日期")
- private Date buyDateStart; // 购车日期
- private Date buyDateEnd; // 购车日期
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
- @ApiModelProperty("商业险到期日期")
- private Date commercialInsuranceEndDateStart; // 商业险到期日期
- private Date commercialInsuranceEndDateEnd; // 商业险到期日期
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
- @ApiModelProperty("交强险到期日期")
- private Date compulsoryInsuranceEndDateStart; // 交强险到期日期
- private Date compulsoryInsuranceEndDateEnd; // 交强险到期日期
- @ApiModelProperty("0为内部车，1为外部车")
- private Integer vehState; // 0为内部车，1为外部车
+ @ApiModelProperty("行驶里程")
+ private String mileage; // 行驶里程
+ @ApiModelProperty("上次保养里程")
+ private String lastMileage; // 上次保养里程
+ @ApiModelProperty("下次保养日期")
+ private String nextMaintainDate; // 下次保养日期
+ @ApiModelProperty("购车日期")
+ private String buyDate; // 购车日期
+ @ApiModelProperty("商业险到期日期")
+ private String commercialInsuranceEndDate; // 商业险到期日期
+ @ApiModelProperty("交强险到期日期")
+ private String compulsoryInsuranceEndDate; // 交强险到期日期
-}
\ No newline at end of file
+ @ApiModelProperty("行驶里程")
+ private String currentMileage; // 行驶里程
+ @ApiModelProperty("每月公里")
+ private String MonthKm; // 每月公里
+ @ApiModelProperty("滤芯到期公里")
+ private String filter_km; // 滤芯到期公里
+ @ApiModelProperty("滤芯到期日期")
+ private String filter_date; // 滤芯到期日期
+ @ApiModelProperty("机油到期公里")
+ private String engineoil_km; // 机油到期公里
+ @ApiModelProperty("机油到期日期")
+ private String engineoil_date; // 机油到期日期
+ @ApiModelProperty("齿轮油到期公里")
+ private String gearoil_km; // 齿轮油到期公里
+ @ApiModelProperty("齿轮油到期日期")
+ private String gearoil_date; // 齿轮油到期日期
+ @ApiModelProperty("宝轮到期公里")
+ private String treasurewheel_km; // 宝轮到期公里
+ @ApiModelProperty("宝轮到期日期")
+ private String treasurewheel_date; // 宝轮到期日期
+ @ApiModelProperty("风扇皮带到期公里")
+ private String fanbelt_km; // 风扇皮带到期公里
+ @ApiModelProperty("风扇皮带到期日期")
+ private String fanbelt_date; // 风扇皮带到期日期
+ @ApiModelProperty("刹车片到期公里")
+ private String brakepads_km; // 刹车片到期公里
+ @ApiModelProperty("刹车片到期日期")
+ private String brakepads_date; // 刹车片到期日期
+}
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/ascustomervehicle/AsCustomerVehicleDto.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/ascustomervehicle/AsCustomerVehicleDto.java
index 837b055df6..b6a8efd0d8 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/ascustomervehicle/AsCustomerVehicleDto.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/ascustomervehicle/AsCustomerVehicleDto.java
@@ -65,27 +65,9 @@ public class AsCustomerVehicleDto implements Dto {
private String vehModelSid; // 车型sid
@ApiModelProperty("车型")
private String vehModel; // 车型
- @ApiModelProperty("行驶里程")
- private Integer mileage; // 行驶里程
- @ApiModelProperty("上次保养里程")
- private Integer lastMileage; // 上次保养里程
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
- @ApiModelProperty("下次保养日期")
- private Date nextMaintainDateStart; // 下次保养日期
- private Date nextMaintainDateEnd; // 下次保养日期
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
- @ApiModelProperty("购车日期")
- private Date buyDateStart; // 购车日期
- private Date buyDateEnd; // 购车日期
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
- @ApiModelProperty("商业险到期日期")
- private Date commercialInsuranceEndDateStart; // 商业险到期日期
- private Date commercialInsuranceEndDateEnd; // 商业险到期日期
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
- @ApiModelProperty("交强险到期日期")
- private Date compulsoryInsuranceEndDateStart; // 交强险到期日期
- private Date compulsoryInsuranceEndDateEnd; // 交强险到期日期
+ @ApiModelProperty("购车日期")
+ private String buyDate; // 购车日期
@ApiModelProperty("0为内部车，1为外部车")
private Integer vehState; // 0为内部车，1为外部车
-}
\ No newline at end of file
+}
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/ascustomervehicle/AsCustomerVehicleVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/ascustomervehicle/AsCustomerVehicleVo.java
index baf501a242..bf497c92d6 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/ascustomervehicle/AsCustomerVehicleVo.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/ascustomervehicle/AsCustomerVehicleVo.java
@@ -51,41 +51,17 @@ import lombok.Data;
@ApiModel(value = "客户车辆信息 视图数据对象", description = "客户车辆信息 视图数据对象")
public class AsCustomerVehicleVo implements Vo {
- private String sid; // sid
-
- @ApiModelProperty("客户sid")
- private String customerSid; // 客户sid
+ private String customerVehSid; // 客户车辆信息sid
@ApiModelProperty("车牌号")
private String vehMark; // 车牌号
@ApiModelProperty("车架号")
private String vinNo; // 车架号
- @ApiModelProperty("发动机号")
- private String engineNo; // 发动机号
- @ApiModelProperty("车型sid")
- private String vehModelSid; // 车型sid
- @ApiModelProperty("车型")
- private String vehModel; // 车型
- @ApiModelProperty("行驶里程")
- private Integer mileage; // 行驶里程
@ApiModelProperty("上次保养里程")
- private Integer lastMileage; // 上次保养里程
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
- @ApiModelProperty("下次保养日期")
- private Date nextMaintainDateStart; // 下次保养日期
- private Date nextMaintainDateEnd; // 下次保养日期
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
- @ApiModelProperty("购车日期")
- private Date buyDateStart; // 购车日期
- private Date buyDateEnd; // 购车日期
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
- @ApiModelProperty("商业险到期日期")
- private Date commercialInsuranceEndDateStart; // 商业险到期日期
- private Date commercialInsuranceEndDateEnd; // 商业险到期日期
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
- @ApiModelProperty("交强险到期日期")
- private Date compulsoryInsuranceEndDateStart; // 交强险到期日期
- private Date compulsoryInsuranceEndDateEnd; // 交强险到期日期
- @ApiModelProperty("0为内部车，1为外部车")
- private Integer vehState; // 0为内部车，1为外部车
+ private String lastMileage; // 上次保养里程
+ @ApiModelProperty("购车日期")
+ private String buyDate; // 购车日期
+ @ApiModelProperty("下次保养日期")
+ private String nextMaintainDate; // 购车日期
+
}
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/ascustomervehmaintenance/AsCustomervehMaintenance.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/ascustomervehmaintenance/AsCustomervehMaintenance.java
new file mode 100644
index 0000000000..46db01ce26
--- /dev/null
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/ascustomervehmaintenance/AsCustomervehMaintenance.java
@@ -0,0 +1,106 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.ascustomervehmaintenance;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.yxt.common.core.domain.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: as(车辆保养明细)
+ * File: AsCustomervehMaintenance.java
+ * Class: com.yxt.anrui.as.api.ascustomervehmaintenance.AsCustomervehMaintenance
+ * Description: 客户保养记录（到期明细）.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-06-03 10:04:53
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "客户保养记录（到期明细）", description = "客户保养记录（到期明细）")
+@TableName("as_customerveh_maintenance")
+public class AsCustomervehMaintenance extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("车辆sid")
+ private String vehSid; // 车辆sid
+ @ApiModelProperty("行驶里程")
+ private Integer currentMileage; // 行驶里程
+ @ApiModelProperty("每月公里")
+ private Integer MonthKm; // 每月公里
+
+ @ApiModelProperty("滤芯到期公里")
+ private Integer filter_km; // 滤芯到期公里
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @ApiModelProperty("滤芯到期日期")
+ private Date filter_date; // 滤芯到期日期
+
+ @ApiModelProperty("机油到期公里")
+ private Integer engineoil_km; // 机油到期公里
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @ApiModelProperty("机油到期日期")
+ private Date engineoil_date; // 机油到期日期
+
+ @ApiModelProperty("齿轮油到期公里")
+ private Integer gearoil_km; // 齿轮油到期公里
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @ApiModelProperty("齿轮油到期日期")
+ private Date gearoil_date; // 齿轮油到期日期
+
+ @ApiModelProperty("宝轮到期公里")
+ private Integer treasurewheel_km; // 宝轮到期公里
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @ApiModelProperty("宝轮到期日期")
+ private Date treasurewheel_date; // 宝轮到期日期
+
+ @ApiModelProperty("风扇皮带到期公里")
+ private Integer fanbelt_km; // 风扇皮带到期公里
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @ApiModelProperty("风扇皮带到期日期")
+ private Date fanbelt_date; // 风扇皮带到期日期
+
+ @ApiModelProperty("刹车片到期公里")
+ private Integer brakepads_km; // 刹车片到期公里
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @ApiModelProperty("刹车片到期日期")
+ private Date brakepads_date; // 刹车片到期日期
+
+}
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/ascustomervehmaintenance/AsCustomervehMaintenanceDetailsVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/ascustomervehmaintenance/AsCustomervehMaintenanceDetailsVo.java
new file mode 100644
index 0000000000..0c668fdbc9
--- /dev/null
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/ascustomervehmaintenance/AsCustomervehMaintenanceDetailsVo.java
@@ -0,0 +1,99 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.ascustomervehmaintenance;
+
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.yxt.common.core.vo.Vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: as(车辆保养明细)
+ * File: AsCustomervehMaintenanceVo.java
+ * Class: com.yxt.anrui.as.api.ascustomervehmaintenance.AsCustomervehMaintenanceVo
+ * Description: 客户保养记录（到期明细） 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-06-03 10:04:53
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "客户保养记录（到期明细） 视图数据详情", description = "客户保养记录（到期明细） 视图数据详情")
+public class AsCustomervehMaintenanceDetailsVo implements Vo {
+
+ private String sid; // sid
+
+ @ApiModelProperty("车辆sid")
+ private String vehSid; // 车辆sid
+ @ApiModelProperty("行驶里程")
+ private String currentMileage; // 行驶里程
+ @ApiModelProperty("每月公里")
+ private String MonthKm; // 每月公里
+ @ApiModelProperty("滤芯到期公里")
+ private String filterKm; // 滤芯到期公里
+
+ @ApiModelProperty("滤芯到期日期")
+ private String filterDate; // 滤芯到期日期
+
+ @ApiModelProperty("机油到期公里")
+ private String engineoilKm; // 机油到期公里
+
+ @ApiModelProperty("机油到期日期")
+ private String engineoilDate; // 机油到期日期
+
+ @ApiModelProperty("齿轮油到期公里")
+ private String gearoilKm; // 齿轮油到期公里
+
+ @ApiModelProperty("齿轮油到期日期")
+ private String gearoilDate; // 齿轮油到期日期
+
+ @ApiModelProperty("宝轮到期公里")
+ private String treasurewheelKm; // 宝轮到期公里
+
+ @ApiModelProperty("宝轮到期日期")
+ private String treasurewheelDate; // 宝轮到期日期
+
+ @ApiModelProperty("风扇皮带到期公里")
+ private String fanbeltKm; // 风扇皮带到期公里
+
+ @ApiModelProperty("风扇皮带到期日期")
+ private String fanbeltDate; // 风扇皮带到期日期
+
+ @ApiModelProperty("刹车片到期公里")
+ private String brakepadsKm; // 刹车片到期公里
+
+ @ApiModelProperty("刹车片到期日期")
+ private String brakepadsDate; // 刹车片到期日期
+
+}
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/ascustomervehmaintenance/AsCustomervehMaintenanceDto.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/ascustomervehmaintenance/AsCustomervehMaintenanceDto.java
new file mode 100644
index 0000000000..9bcfeba626
--- /dev/null
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/ascustomervehmaintenance/AsCustomervehMaintenanceDto.java
@@ -0,0 +1,98 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.ascustomervehmaintenance;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: as(车辆保养明细)
+ * File: AsCustomervehMaintenanceDto.java
+ * Class: com.yxt.anrui.as.api.ascustomervehmaintenance.AsCustomervehMaintenanceDto
+ * Description: 客户保养记录（到期明细） 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-06-03 10:04:53
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "客户保养记录（到期明细） 数据传输对象", description = "客户保养记录（到期明细） 数据传输对象")
+public class AsCustomervehMaintenanceDto implements Dto {
+
+ private String sid; // sid
+
+ @ApiModelProperty("车辆sid")
+ private String vehSid; // 车辆sid
+ @ApiModelProperty("行驶里程")
+ private String currentMileage; // 行驶里程
+ @ApiModelProperty("每月公里")
+ private String MonthKm; // 每月公里
+ @ApiModelProperty("滤芯到期公里")
+ private String filterKm; // 滤芯到期公里
+
+ @ApiModelProperty("滤芯到期日期")
+ private String filterDate; // 滤芯到期日期
+
+ @ApiModelProperty("机油到期公里")
+ private String engineoilKm; // 机油到期公里
+
+ @ApiModelProperty("机油到期日期")
+ private String engineoilDate; // 机油到期日期
+
+ @ApiModelProperty("齿轮油到期公里")
+ private String gearoilKm; // 齿轮油到期公里
+
+ @ApiModelProperty("齿轮油到期日期")
+ private String gearoilDate; // 齿轮油到期日期
+
+ @ApiModelProperty("宝轮到期公里")
+ private String treasurewheelKm; // 宝轮到期公里
+
+ @ApiModelProperty("宝轮到期日期")
+ private String treasurewheelDate; // 宝轮到期日期
+
+ @ApiModelProperty("风扇皮带到期公里")
+ private String fanbeltKm; // 风扇皮带到期公里
+
+ @ApiModelProperty("风扇皮带到期日期")
+ private String fanbeltDate; // 风扇皮带到期日期
+
+ @ApiModelProperty("刹车片到期公里")
+ private String brakepadsKm; // 刹车片到期公里
+
+ @ApiModelProperty("刹车片到期日期")
+ private String brakepadsDate; // 刹车片到期日期
+
+}
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/ascustomervehmaintenance/AsCustomervehMaintenanceQuery.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/ascustomervehmaintenance/AsCustomervehMaintenanceQuery.java
new file mode 100644
index 0000000000..ab9fd2d04f
--- /dev/null
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/ascustomervehmaintenance/AsCustomervehMaintenanceQuery.java
@@ -0,0 +1,97 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.ascustomervehmaintenance;
+
+
+import com.yxt.common.core.query.Query;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: as(车辆保养明细)
+ * File: AsCustomervehMaintenanceQuery.java
+ * Class: com.yxt.anrui.as.api.ascustomervehmaintenance.AsCustomervehMaintenanceQuery
+ * Description: 客户保养记录（到期明细） 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-06-03 10:04:53
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "客户保养记录（到期明细） 查询条件", description = "客户保养记录（到期明细） 查询条件")
+public class AsCustomervehMaintenanceQuery implements Query {
+
+ @ApiModelProperty("车辆sid")
+ private String vehSid; // 车辆sid
+ @ApiModelProperty("行驶里程")
+ private Integer currentMileage; // 行驶里程
+ @ApiModelProperty("每月公里")
+ private Integer MonthKm; // 每月公里
+ @ApiModelProperty("滤芯到期公里")
+ private Integer filter_km; // 滤芯到期公里
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @ApiModelProperty("滤芯到期日期")
+ private Date filter_dateStart; // 滤芯到期日期
+ private Date filter_dateEnd; // 滤芯到期日期
+ @ApiModelProperty("机油到期公里")
+ private Integer engineoil_km; // 机油到期公里
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @ApiModelProperty("机油到期日期")
+ private Date engineoil_dateStart; // 机油到期日期
+ private Date engineoil_dateEnd; // 机油到期日期
+ @ApiModelProperty("齿轮油到期公里")
+ private Integer gearoil_km; // 齿轮油到期公里
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @ApiModelProperty("齿轮油到期日期")
+ private Date gearoil_dateStart; // 齿轮油到期日期
+ private Date gearoil_dateEnd; // 齿轮油到期日期
+ @ApiModelProperty("宝轮到期公里")
+ private Integer treasurewheel_km; // 宝轮到期公里
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @ApiModelProperty("宝轮到期日期")
+ private Date treasurewheel_dateStart; // 宝轮到期日期
+ private Date treasurewheel_dateEnd; // 宝轮到期日期
+ @ApiModelProperty("风扇皮带到期公里")
+ private Integer fanbelt_km; // 风扇皮带到期公里
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @ApiModelProperty("风扇皮带到期日期")
+ private Date fanbelt_dateStart; // 风扇皮带到期日期
+ private Date fanbelt_dateEnd; // 风扇皮带到期日期
+ @ApiModelProperty("刹车片到期公里")
+ private Integer brakepads_km; // 刹车片到期公里
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @ApiModelProperty("刹车片到期日期")
+ private Date brakepads_dateStart; // 刹车片到期日期
+ private Date brakepads_dateEnd; // 刹车片到期日期
+
+}
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/ascustomervehmaintenance/AsCustomervehMaintenanceVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/ascustomervehmaintenance/AsCustomervehMaintenanceVo.java
new file mode 100644
index 0000000000..3b91c041d9
--- /dev/null
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/ascustomervehmaintenance/AsCustomervehMaintenanceVo.java
@@ -0,0 +1,99 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.api.ascustomervehmaintenance;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.Date;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: as(车辆保养明细)
+ * File: AsCustomervehMaintenanceVo.java
+ * Class: com.yxt.anrui.as.api.ascustomervehmaintenance.AsCustomervehMaintenanceVo
+ * Description: 客户保养记录（到期明细） 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-06-03 10:04:53
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "客户保养记录（到期明细） 视图数据对象", description = "客户保养记录（到期明细） 视图数据对象")
+public class AsCustomervehMaintenanceVo implements Vo {
+
+ private String sid; // sid
+
+ @ApiModelProperty("车辆sid")
+ private String vehSid; // 车辆sid
+ @ApiModelProperty("行驶里程")
+ private Integer currentMileage; // 行驶里程
+ @ApiModelProperty("每月公里")
+ private Integer MonthKm; // 每月公里
+ @ApiModelProperty("滤芯到期公里")
+ private Integer filter_km; // 滤芯到期公里
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @ApiModelProperty("滤芯到期日期")
+ private Date filter_dateStart; // 滤芯到期日期
+ private Date filter_dateEnd; // 滤芯到期日期
+ @ApiModelProperty("机油到期公里")
+ private Integer engineoil_km; // 机油到期公里
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @ApiModelProperty("机油到期日期")
+ private Date engineoil_dateStart; // 机油到期日期
+ private Date engineoil_dateEnd; // 机油到期日期
+ @ApiModelProperty("齿轮油到期公里")
+ private Integer gearoil_km; // 齿轮油到期公里
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @ApiModelProperty("齿轮油到期日期")
+ private Date gearoil_dateStart; // 齿轮油到期日期
+ private Date gearoil_dateEnd; // 齿轮油到期日期
+ @ApiModelProperty("宝轮到期公里")
+ private Integer treasurewheel_km; // 宝轮到期公里
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @ApiModelProperty("宝轮到期日期")
+ private Date treasurewheel_dateStart; // 宝轮到期日期
+ private Date treasurewheel_dateEnd; // 宝轮到期日期
+ @ApiModelProperty("风扇皮带到期公里")
+ private Integer fanbelt_km; // 风扇皮带到期公里
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @ApiModelProperty("风扇皮带到期日期")
+ private Date fanbelt_dateStart; // 风扇皮带到期日期
+ private Date fanbelt_dateEnd; // 风扇皮带到期日期
+ @ApiModelProperty("刹车片到期公里")
+ private Integer brakepads_km; // 刹车片到期公里
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @ApiModelProperty("刹车片到期日期")
+ private Date brakepads_dateStart; // 刹车片到期日期
+ private Date brakepads_dateEnd; // 刹车片到期日期
+
+}
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleMapper.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleMapper.java
index 2d9b2e4dcb..42888cb1e5 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleMapper.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleMapper.java
@@ -32,6 +32,7 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.anrui.as.api.ascustomervehicle.AsCustomerCrmVehVo;
import com.yxt.anrui.as.api.ascustomervehicle.AsCustomerVehicle;
import com.yxt.anrui.as.api.ascustomervehicle.AsCustomerVehicleVo;
+import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@@ -56,14 +57,19 @@ public interface AsCustomerVehicleMapper extends BaseMapper {
//@Update("update as_customer_vehicle set name=#{msg} where id=#{id}")
//IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw);
-
+
IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw);
-
+
List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw);
-
+
@Select("select * from as_customer_vehicle")
List selectListVo();
@Select("select * from as_customer_vehicle")
List listCustomerVeh();
-}
\ No newline at end of file
+
+ List selVehListByCustomerSid(@Param("sid") String sid);
+
+ @Delete("delete from as_customer_vehicle where sid =#{sid}")
+ void delBySid(@Param("sid") String sid);
+}
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleMapper.xml
index c6b92f3c2c..79bbf272c0 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleMapper.xml
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleMapper.xml
@@ -6,8 +6,22 @@
-
+
-
\ No newline at end of file
+
+
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleRest.java
index c199853bc7..cc1ce9fc3c 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleRest.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleRest.java
@@ -51,7 +51,7 @@ import java.util.List;
*/
@Api(tags = "客户车辆信息")
@RestController
-@RequestMapping("as/v1/ascustomervehicle")
+@RequestMapping("v1/ascustomervehicle")
public class AsCustomerVehicleRest{
@Autowired
@@ -84,19 +84,33 @@ public class AsCustomerVehicleRest{
@ApiOperation("根据sid批量删除")
- @PostMapping("/delBySids")
+ @DeleteMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids){
- ResultBean rb = ResultBean.fireFail();
- asCustomerVehicleService.delBySids(sids);
- return rb.success();
+ return asCustomerVehicleService.deleteBySids(sids);
}
@ApiOperation("根据SID获取一条记录")
- @GetMapping("/fetchDetailsBySid/{sid}")
- public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){
+ @GetMapping("/fetchDetailsBySid/{customerVehSid}")
+ public ResultBean fetchDetailsBySid(@PathVariable("customerVehSid") String customerVehSid){
ResultBean rb = ResultBean.fireFail();
- AsCustomerVehicleDetailsVo vo = asCustomerVehicleService.fetchDetailsVoBySid(sid);
+ AsCustomerVehicleDetails vo = asCustomerVehicleService.fetchDetailsVoBySid(customerVehSid);
return rb.success().setData(vo);
}
+
+
+ @ApiOperation("根据SID获取一条记录")
+ @GetMapping("/vehList")
+ public ResultBean> vehList(@RequestParam("sid") String sid){
+ ResultBean rb = ResultBean.fireFail();
+ List list = asCustomerVehicleService.vehList(sid);
+ return rb.success().setData(list);
+
+ }
+
+ @ApiOperation("保存修改车辆信息")
+ @PostMapping("/saveCustomerVeh")
+ public ResultBean saveCustomerVeh(@RequestBody AsCustomerVehicleDetails dto){
+ return asCustomerVehicleService.saveCustomerVeh(dto);
+ }
}
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleService.java
index 921e1477db..a662f5d5f7 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleService.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleService.java
@@ -29,15 +29,19 @@ import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.as.api.ascustomervehicle.*;
+import com.yxt.anrui.as.api.ascustomervehmaintenance.AsCustomervehMaintenance;
+import com.yxt.anrui.as.biz.ascustomervehmaintenance.AsCustomervehMaintenanceService;
+import com.yxt.common.core.result.ResultBean;
import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
-import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.text.SimpleDateFormat;
import java.util.List;
/**
@@ -55,55 +59,140 @@ import java.util.List;
*/
@Service
public class AsCustomerVehicleService extends MybatisBaseService {
- private QueryWrapper createQueryWrapper(AsCustomerVehicleQuery query) {
- // todo: 这里根据具体业务调整查询条件
- // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
- QueryWrapper qw = new QueryWrapper<>();
- return qw;
- }
-
- public PagerVo listPageVo(PagerQuery pq) {
- AsCustomerVehicleQuery query = pq.getParams();
- QueryWrapper qw = createQueryWrapper(query);
- IPage page = PagerUtil.queryToPage(pq);
- IPage pagging = baseMapper.selectPageVo(page, qw);
- PagerVo p = PagerUtil.pageToVo(pagging, null);
- return p;
- }
-
- public void saveOrUpdateDto(AsCustomerVehicleDto dto){
+ @Autowired
+ private AsCustomervehMaintenanceService asCustomervehMaintenanceService;
+
+ private QueryWrapper createQueryWrapper(AsCustomerVehicleQuery query) {
+ // todo: 这里根据具体业务调整查询条件
+ // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+ QueryWrapper qw = new QueryWrapper<>();
+ return qw;
+ }
+
+ public PagerVo listPageVo(PagerQuery pq) {
+ AsCustomerVehicleQuery query = pq.getParams();
+ QueryWrapper qw = createQueryWrapper(query);
+ IPage page = PagerUtil.queryToPage(pq);
+ IPage pagging = baseMapper.selectPageVo(page, qw);
+ PagerVo p = PagerUtil.pageToVo(pagging, null);
+ return p;
+ }
+
+ public void saveOrUpdateDto(AsCustomerVehicleDto dto) {
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
this.insertByDto(dto);
- return;
- }
- this.updateByDto(dto);
- }
-
- public void insertByDto(AsCustomerVehicleDto dto){
- AsCustomerVehicle entity = new AsCustomerVehicle();
- BeanUtil.copyProperties(dto, entity, "id", "sid");
- baseMapper.insert(entity);
- }
-
- public void updateByDto(AsCustomerVehicleDto dto){
- String dtoSid = dto.getSid();
+ return;
+ }
+ this.updateByDto(dto);
+ }
+
+ public void insertByDto(AsCustomerVehicleDto dto) {
+ AsCustomerVehicle entity = new AsCustomerVehicle();
+ BeanUtil.copyProperties(dto, entity, "id", "sid");
+ baseMapper.insert(entity);
+ }
+
+ public void updateByDto(AsCustomerVehicleDto dto) {
+ String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
return;
- }
- AsCustomerVehicle entity = fetchBySid(dtoSid);
- BeanUtil.copyProperties(dto, entity, "id", "sid");
- baseMapper.updateById(entity);
- }
-
- public AsCustomerVehicleDetailsVo fetchDetailsVoBySid(String sid){
- AsCustomerVehicle entity = fetchBySid(sid);
- AsCustomerVehicleDetailsVo vo = new AsCustomerVehicleDetailsVo();
- BeanUtil.copyProperties(entity, vo);
- return vo;
- }
+ }
+ AsCustomerVehicle entity = fetchBySid(dtoSid);
+ BeanUtil.copyProperties(dto, entity, "id", "sid");
+ baseMapper.updateById(entity);
+ }
+
+ public AsCustomerVehicleDetails fetchDetailsVoBySid(String customerVehSid) {
+ AsCustomerVehicleDetails vo = new AsCustomerVehicleDetails();
+ AsCustomerVehicle entity = fetchBySid(customerVehSid);
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ if (null != entity) {
+ BeanUtil.copyProperties(entity, vo);
+ if (null != entity.getNextMaintainDate()) {
+ vo.setNextMaintainDate(sdf.format(entity.getNextMaintainDate()));
+ }
+ if (null != entity.getBuyDate()) {
+ vo.setBuyDate(sdf.format(entity.getBuyDate()));
+ }
+ if (null != entity.getCommercialInsuranceEndDate()) {
+ vo.setCommercialInsuranceEndDate(sdf.format(entity.getCommercialInsuranceEndDate()));
+ }
+ if (null != entity.getCompulsoryInsuranceEndDate()) {
+ vo.setCompulsoryInsuranceEndDate(sdf.format(entity.getCompulsoryInsuranceEndDate()));
+ }
+ AsCustomervehMaintenance maintenance = asCustomervehMaintenanceService.fetchByVehSid(customerVehSid);
+ if (null != maintenance) {
+ BeanUtil.copyProperties(maintenance, vo, "id", "sid");
+ if (null != maintenance.getFanbelt_date()) {
+ vo.setFanbelt_date(sdf.format(maintenance.getFanbelt_date()));
+ }
+ if (null != maintenance.getEngineoil_date()) {
+ vo.setEngineoil_date(sdf.format(maintenance.getEngineoil_date()));
+ }
+ if (null != maintenance.getGearoil_date()) {
+ vo.setGearoil_date(sdf.format(maintenance.getGearoil_date()));
+ }
+ if (null != maintenance.getFilter_date()) {
+ vo.setFilter_date(sdf.format(maintenance.getFilter_date()));
+ }
+ if (null != maintenance.getTreasurewheel_date()) {
+ vo.setTreasurewheel_date(sdf.format(maintenance.getTreasurewheel_date()));
+ }
+ if (null != maintenance.getBrakepads_date()) {
+ vo.setBrakepads_date(sdf.format(maintenance.getBrakepads_date()));
+ }
+ }
+ vo.setCustomerVehSid(customerVehSid);
+ }
+ return vo;
+ }
+
+ public List listCustomerVeh() {
+ return baseMapper.listCustomerVeh();
+ }
+
+
+ public List vehList(String sid) {
+ return baseMapper.selVehListByCustomerSid(sid);
+ }
+
+ public ResultBean saveCustomerVeh(AsCustomerVehicleDetails dto) {
+ ResultBean rb = ResultBean.fireFail();
+ String sid = dto.getCustomerVehSid();
+ if (StringUtils.isNotBlank(sid)) {
+ AsCustomerVehicle asCustomerVehicle = fetchBySid(sid);
+ BeanUtil.copyProperties(dto, asCustomerVehicle, "id", "sid");
+ baseMapper.updateById(asCustomerVehicle);
+ AsCustomervehMaintenance asCustomervehMaintenance = asCustomervehMaintenanceService.fetchByVehSid(sid);
+ if (null != asCustomervehMaintenance) {
+ BeanUtil.copyProperties(dto, asCustomervehMaintenance, "id", "sid");
+ asCustomervehMaintenanceService.updateById(asCustomervehMaintenance);
+ } else {
+ AsCustomervehMaintenance maintenance = new AsCustomervehMaintenance();
+ BeanUtil.copyProperties(dto, maintenance, "id", "sid");
+ maintenance.setVehSid(sid);
+ asCustomervehMaintenanceService.insert(maintenance);
+ }
+ } else {
+ AsCustomerVehicle asCustomerVehicle = new AsCustomerVehicle();
+ BeanUtil.copyProperties(dto, asCustomerVehicle, "id", "sid");
+ asCustomerVehicle.setVehState(1);
+ baseMapper.insert(asCustomerVehicle);
+ AsCustomervehMaintenance maintenance = new AsCustomervehMaintenance();
+ BeanUtil.copyProperties(dto, maintenance, "id", "sid");
+ maintenance.setVehSid(asCustomerVehicle.getSid());
+ asCustomervehMaintenanceService.insert(maintenance);
+ }
+ return rb.success();
+ }
- public List listCustomerVeh() {
- return baseMapper.listCustomerVeh();
- }
-}
\ No newline at end of file
+ public ResultBean deleteBySids(String[] sids) {
+ ResultBean rb = ResultBean.fireFail();
+ for (String sid : sids) {
+ baseMapper.delBySid(sid);
+ asCustomervehMaintenanceService.delByVehSid(sid);
+ }
+ return rb.success();
+ }
+}
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehmaintenance/AsCustomervehMaintenanceMapper.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehmaintenance/AsCustomervehMaintenanceMapper.java
new file mode 100644
index 0000000000..5f33e15d16
--- /dev/null
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehmaintenance/AsCustomervehMaintenanceMapper.java
@@ -0,0 +1,72 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.biz.ascustomervehmaintenance;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import com.yxt.anrui.as.api.ascustomervehmaintenance.AsCustomervehMaintenance;
+import com.yxt.anrui.as.api.ascustomervehmaintenance.AsCustomervehMaintenanceVo;
+
+import java.util.List;
+
+/**
+ * Project: as(车辆保养明细)
+ * File: AsCustomervehMaintenanceMapper.java
+ * Class: com.yxt.anrui.as.biz.ascustomervehmaintenance.AsCustomervehMaintenanceMapper
+ * Description: 客户保养记录（到期明细）.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-06-03 10:04:53
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface AsCustomervehMaintenanceMapper extends BaseMapper {
+
+ //@Update("update as_customerveh_maintenance set name=#{msg} where id=#{id}")
+ //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw);
+
+ IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw);
+
+ List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw);
+
+ @Select("select * from as_customerveh_maintenance")
+ List selectListVo();
+
+ @Select("select * from as_customerveh_maintenance where vehSid =#{vehSid}")
+ AsCustomervehMaintenance fetchByVehSid(@Param("vehSid") String vehSid);
+
+ @Delete("delete from as_customerveh_maintenance where vehSid =#{vehSid}")
+ void delByVehSid(@Param("vehSid") String vehSid);
+}
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehmaintenance/AsCustomervehMaintenanceMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehmaintenance/AsCustomervehMaintenanceMapper.xml
new file mode 100644
index 0000000000..61fb5db8e2
--- /dev/null
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehmaintenance/AsCustomervehMaintenanceMapper.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehmaintenance/AsCustomervehMaintenanceRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehmaintenance/AsCustomervehMaintenanceRest.java
new file mode 100644
index 0000000000..fe2880d724
--- /dev/null
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehmaintenance/AsCustomervehMaintenanceRest.java
@@ -0,0 +1,97 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.biz.ascustomervehmaintenance;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import com.yxt.anrui.as.api.ascustomervehmaintenance.AsCustomervehMaintenanceQuery;
+import com.yxt.anrui.as.api.ascustomervehmaintenance.AsCustomervehMaintenanceVo;
+import com.yxt.anrui.as.api.ascustomervehmaintenance.AsCustomervehMaintenanceDetailsVo;
+import com.yxt.anrui.as.api.ascustomervehmaintenance.AsCustomervehMaintenanceDto;
+
+/**
+ * Project: as(车辆保养明细)
+ * File: AsCustomervehMaintenanceFeignFallback.java
+ * Class: com.yxt.anrui.as.biz.ascustomervehmaintenance.AsCustomervehMaintenanceRest
+ * Description: 客户保养记录（到期明细）.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-06-03 10:04:53
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "客户保养记录（到期明细）")
+@RestController("com.yxt.anrui.as.biz.ascustomervehmaintenance.AsCustomervehMaintenanceRest")
+@RequestMapping("v1/ascustomervehmaintenance")
+public class AsCustomervehMaintenanceRest{
+
+ @Autowired
+ private AsCustomervehMaintenanceService asCustomervehMaintenanceService;
+
+
+ @ApiOperation("根据条件分页查询数据的列表")
+ @PostMapping("/listPage")
+ public ResultBean> listPage(@RequestBody PagerQuery pq){
+ ResultBean rb = ResultBean.fireFail();
+ PagerVo pv = asCustomervehMaintenanceService.listPageVo(pq);
+ return rb.success().setData(pv);
+ }
+
+
+ @ApiOperation("新增或修改")
+ @PostMapping("/save")
+ public ResultBean save(@RequestBody AsCustomervehMaintenanceDto dto){
+ ResultBean rb = ResultBean.fireFail();
+ asCustomervehMaintenanceService.saveOrUpdateDto(dto);
+ return rb.success();
+ }
+
+
+ @ApiOperation("根据sid批量删除")
+ @PostMapping("/delBySids")
+ public ResultBean delBySids(@RequestBody String[] sids){
+ ResultBean rb = ResultBean.fireFail();
+ asCustomervehMaintenanceService.delBySids(sids);
+ return rb.success();
+ }
+
+
+ @ApiOperation("根据SID获取一条记录")
+ @GetMapping("/fetchDetailsBySid/{sid}")
+ public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){
+ ResultBean rb = ResultBean.fireFail();
+ AsCustomervehMaintenanceDetailsVo vo = asCustomervehMaintenanceService.fetchDetailsVoBySid(sid);
+ return rb.success().setData(vo);
+ }
+}
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehmaintenance/AsCustomervehMaintenanceService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehmaintenance/AsCustomervehMaintenanceService.java
new file mode 100644
index 0000000000..ab0ef9a8fc
--- /dev/null
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehmaintenance/AsCustomervehMaintenanceService.java
@@ -0,0 +1,114 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.as.biz.ascustomervehmaintenance;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.commons.lang3.StringUtils;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.anrui.as.api.ascustomervehmaintenance.AsCustomervehMaintenance;
+import com.yxt.anrui.as.api.ascustomervehmaintenance.AsCustomervehMaintenanceQuery;
+import com.yxt.anrui.as.api.ascustomervehmaintenance.AsCustomervehMaintenanceVo;
+import com.yxt.anrui.as.api.ascustomervehmaintenance.AsCustomervehMaintenanceDetailsVo;
+import com.yxt.anrui.as.api.ascustomervehmaintenance.AsCustomervehMaintenanceDto;
+
+import org.springframework.stereotype.Service;
+
+/**
+ * Project: as(车辆保养明细)
+ * File: AsCustomervehMaintenanceService.java
+ * Class: com.yxt.anrui.as.biz.ascustomervehmaintenance.AsCustomervehMaintenanceService
+ * Description: 客户保养记录（到期明细） 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-06-03 10:04:53
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class AsCustomervehMaintenanceService extends MybatisBaseService {
+ private QueryWrapper createQueryWrapper(AsCustomervehMaintenanceQuery query) {
+ // todo: 这里根据具体业务调整查询条件
+ // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+ QueryWrapper qw = new QueryWrapper<>();
+ return qw;
+ }
+
+ public AsCustomervehMaintenance fetchByVehSid(String vehSid) {
+ return baseMapper.fetchByVehSid(vehSid);
+ }
+
+ public PagerVo listPageVo(PagerQuery pq) {
+ AsCustomervehMaintenanceQuery query = pq.getParams();
+ QueryWrapper qw = createQueryWrapper(query);
+ IPage page = PagerUtil.queryToPage(pq);
+ IPage pagging = baseMapper.selectPageVo(page, qw);
+ PagerVo p = PagerUtil.pageToVo(pagging, null);
+ return p;
+ }
+
+ public void saveOrUpdateDto(AsCustomervehMaintenanceDto dto){
+ String dtoSid = dto.getSid();
+ if (StringUtils.isBlank(dtoSid)) {
+ this.insertByDto(dto);
+ return;
+ }
+ this.updateByDto(dto);
+ }
+
+ public void insertByDto(AsCustomervehMaintenanceDto dto){
+ AsCustomervehMaintenance entity = new AsCustomervehMaintenance();
+ BeanUtil.copyProperties(dto, entity, "id", "sid");
+ baseMapper.insert(entity);
+ }
+
+ public void updateByDto(AsCustomervehMaintenanceDto dto){
+ String dtoSid = dto.getSid();
+ if (StringUtils.isBlank(dtoSid)) {
+ return;
+ }
+ AsCustomervehMaintenance entity = fetchBySid(dtoSid);
+ BeanUtil.copyProperties(dto, entity, "id", "sid");
+ baseMapper.updateById(entity);
+ }
+
+ public AsCustomervehMaintenanceDetailsVo fetchDetailsVoBySid(String sid){
+ AsCustomervehMaintenance entity = fetchBySid(sid);
+ AsCustomervehMaintenanceDetailsVo vo = new AsCustomervehMaintenanceDetailsVo();
+ BeanUtil.copyProperties(entity, vo);
+ return vo;
+ }
+
+ public void delByVehSid(String sid) {
+ baseMapper.delByVehSid(sid);
+ }
+}