From 41f30cdd5d9f06c4a0e179c0aa5c5a4c4758bdad Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Mon, 29 Jul 2024 17:51:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AE=A1=E7=90=86=E4=BC=81?= =?UTF-8?q?=E4=B8=9A=E5=AE=9A=E7=82=B9=E5=AE=A2=E6=88=B7=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../crmcustomertemp/CrmCustomerTempFeign.java | 8 ++++++++ .../CrmCustomerTempFeignFallback.java | 10 ++++++++++ .../CrmMaintenanceenterprisePersonFeign.java | 11 ++++++++--- ...aintenanceenterprisePersonFeignFallback.java | 7 ++++++- .../CrmPersonListVo.java | 17 +++++++++++++++++ ...CrmMaintenanceenterpriseRecordDetailsVo.java | 4 ++-- .../CrmMaintenanceenterpriseRecordDto.java | 4 ++-- .../crmcustomertemp/CrmCustomerTempRest.java | 14 ++++++++++++++ .../crmcustomertemp/CrmCustomerTempService.java | 16 ++++++++++++++++ .../CrmMaintenanceenterprisePersonMapper.java | 4 ++++ .../CrmMaintenanceenterprisePersonRest.java | 14 ++++++++------ .../CrmMaintenanceenterprisePersonService.java | 11 +++++------ .../CrmMaintenanceenterpriseRecordMapper.xml | 4 ++-- 13 files changed, 102 insertions(+), 22 deletions(-) create mode 100644 anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriseperson/CrmPersonListVo.java 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 f463957475..fe39cf2799 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 @@ -143,6 +143,14 @@ public interface CrmCustomerTempFeign { @DeleteMapping("/del") public ResultBean del(@RequestBody String[] sid); + + @ApiOperation("定点企业批量禁用") + @PostMapping("/disableState") + public ResultBean disableState(@RequestBody String[] sid); + + @ApiOperation("定点企业批量启用") + @PostMapping("/enable") + public ResultBean enable(@RequestBody String[] sid); /** * pc潜在客户的编辑回显 * 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 f35643b6ed..651ebbceb0 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 @@ -98,6 +98,16 @@ public class CrmCustomerTempFeignFallback implements CrmCustomerTempFeign { return ResultBean.fireFail().setMsg("接口anrui-crm/crmcustomertemp/del无法访问"); } + @Override + public ResultBean disableState(String[] sid) { + return null; + } + + @Override + public ResultBean enable(String[] sid) { + return null; + } + @Override public ResultBean fetchSid(String sid) { diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriseperson/CrmMaintenanceenterprisePersonFeign.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriseperson/CrmMaintenanceenterprisePersonFeign.java index bfb0c6effd..604a7470ce 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriseperson/CrmMaintenanceenterprisePersonFeign.java +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriseperson/CrmMaintenanceenterprisePersonFeign.java @@ -65,14 +65,19 @@ public interface CrmMaintenanceenterprisePersonFeign { @PostMapping("/save") @ResponseBody public ResultBean save(@RequestBody CrmMaintenanceenterprisePersonDto 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 + + @ApiOperation("根据SID获取一条记录") + @GetMapping("/personList") + @ResponseBody + public ResultBean> personList(@RequestParam("sid") String sid); +} diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriseperson/CrmMaintenanceenterprisePersonFeignFallback.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriseperson/CrmMaintenanceenterprisePersonFeignFallback.java index a80b439a0a..48e2f47323 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriseperson/CrmMaintenanceenterprisePersonFeignFallback.java +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriseperson/CrmMaintenanceenterprisePersonFeignFallback.java @@ -69,4 +69,9 @@ public class CrmMaintenanceenterprisePersonFeignFallback implements CrmMaintenan ResultBean rb = ResultBean.fireFail(); return rb.setMsg("接口crm/crmmaintenanceenterpriseperson/fetchDetailsBySid无法访问"); } -} \ No newline at end of file + + @Override + public ResultBean> personList(String sid) { + return null; + } +} diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriseperson/CrmPersonListVo.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriseperson/CrmPersonListVo.java new file mode 100644 index 0000000000..0bd2a4c61b --- /dev/null +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriseperson/CrmPersonListVo.java @@ -0,0 +1,17 @@ +package com.yxt.anrui.crm.api.crmmaintenanceenterpriseperson; + +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/7/29 16:48 + */ +@Data +public class CrmPersonListVo { + private String mobile; + private String name; + private String remarks; + private String sid; + +} diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordDetailsVo.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordDetailsVo.java index c42caa8a2b..24cd447a91 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordDetailsVo.java +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordDetailsVo.java @@ -66,7 +66,7 @@ public class CrmMaintenanceenterpriseRecordDetailsVo implements Vo { /** * 车辆列表 */ - private List carList; + private List carList = new ArrayList<>(); /** * 证件类型 */ @@ -82,7 +82,7 @@ public class CrmMaintenanceenterpriseRecordDetailsVo implements Vo { /** * 对接人列表 */ - private List contactPerson; + private List contactPerson = new ArrayList<>(); /** * 县 */ diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordDto.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordDto.java index 81e7aaf0f9..945b45c202 100644 --- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordDto.java +++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordDto.java @@ -67,7 +67,7 @@ public class CrmMaintenanceenterpriseRecordDto implements Dto { /** * 车辆列表 */ - private List carList; + private List carList = new ArrayList<>(); /** * 证件类型 */ @@ -83,7 +83,7 @@ public class CrmMaintenanceenterpriseRecordDto implements Dto { /** * 对接人列表 */ - private List contactPerson; + private List contactPerson = new ArrayList<>(); /** * 县 */ 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 45df5fb6f8..baa1ed30e5 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 @@ -195,6 +195,20 @@ public class CrmCustomerTempRest implements CrmCustomerTempFeign { return rb.success(); } + @Override + public ResultBean disableState(String[] sid) { + ResultBean rb = ResultBean.fireFail(); + crmCustomerTempService.disableState(sid); + return rb.success(); + } + + @Override + public ResultBean enable(String[] sid) { + ResultBean rb = ResultBean.fireFail(); + crmCustomerTempService.enable(sid); + return rb.success(); + } + @Override public ResultBean fetchSid(String sid) { 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 db3455c2b9..b8320e2040 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 @@ -1530,4 +1530,20 @@ public class CrmCustomerTempService extends MybatisBaseService selByBillSid(String sid); + + @Select("select * from crm_maintenanceenterprise_person where billSid = #{sid}") + List personList(String sid); } diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriseperson/CrmMaintenanceenterprisePersonRest.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriseperson/CrmMaintenanceenterprisePersonRest.java index f7446b3479..aa15dfdea4 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriseperson/CrmMaintenanceenterprisePersonRest.java +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriseperson/CrmMaintenanceenterprisePersonRest.java @@ -25,6 +25,7 @@ *********************************************************/ package com.yxt.anrui.crm.biz.crmmaintenanceenterpriseperson; +import com.yxt.anrui.crm.api.crmmaintenanceenterpriseperson.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -34,12 +35,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.List; -import com.yxt.anrui.crm.api.crmmaintenanceenterpriseperson.CrmMaintenanceenterprisePerson; -import com.yxt.anrui.crm.api.crmmaintenanceenterpriseperson.CrmMaintenanceenterprisePersonQuery; -import com.yxt.anrui.crm.api.crmmaintenanceenterpriseperson.CrmMaintenanceenterprisePersonVo; -import com.yxt.anrui.crm.api.crmmaintenanceenterpriseperson.CrmMaintenanceenterprisePersonDetailsVo; -import com.yxt.anrui.crm.api.crmmaintenanceenterpriseperson.CrmMaintenanceenterprisePersonDto; -import com.yxt.anrui.crm.api.crmmaintenanceenterpriseperson.CrmMaintenanceenterprisePersonFeign; /** * Project: crm(crm)
@@ -97,4 +92,11 @@ public class CrmMaintenanceenterprisePersonRest implements CrmMaintenanceenterpr CrmMaintenanceenterprisePersonDetailsVo vo = crmMaintenanceenterprisePersonService.fetchDetailsVoBySid(sid); return rb.success().setData(vo); } + + @Override + public ResultBean> personList(String sid) { + ResultBean rb = ResultBean.fireFail(); + List list = crmMaintenanceenterprisePersonService.personList(sid); + return rb.success().setData(list); + } } diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriseperson/CrmMaintenanceenterprisePersonService.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriseperson/CrmMaintenanceenterprisePersonService.java index 256ee5739b..447c846944 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriseperson/CrmMaintenanceenterprisePersonService.java +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriseperson/CrmMaintenanceenterprisePersonService.java @@ -29,6 +29,7 @@ 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.crm.api.crmcustomertemp.AsCustomerListVo; +import com.yxt.anrui.crm.api.crmmaintenanceenterpriseperson.*; import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; @@ -36,12 +37,6 @@ 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.crmmaintenanceenterpriseperson.CrmMaintenanceenterprisePerson; -import com.yxt.anrui.crm.api.crmmaintenanceenterpriseperson.CrmMaintenanceenterprisePersonQuery; -import com.yxt.anrui.crm.api.crmmaintenanceenterpriseperson.CrmMaintenanceenterprisePersonVo; -import com.yxt.anrui.crm.api.crmmaintenanceenterpriseperson.CrmMaintenanceenterprisePersonDetailsVo; -import com.yxt.anrui.crm.api.crmmaintenanceenterpriseperson.CrmMaintenanceenterprisePersonDto; -import com.yxt.anrui.crm.api.crmmaintenanceenterpriseperson.CrmMaintenanceenterprisePersonFeign; import org.springframework.stereotype.Service; @@ -118,4 +113,8 @@ public class CrmMaintenanceenterprisePersonService extends MybatisBaseService personList(String sid) { + return baseMapper.personList(sid); + } } diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordMapper.xml b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordMapper.xml index e8165fed87..06b2db5915 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordMapper.xml +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordMapper.xml @@ -29,9 +29,9 @@ CASE WHEN r.filingIndate >= NOW() THEN - '0' + '1' WHEN r.filingIndate < NOW() THEN - '1' ELSE '1' + '0' ELSE '0' END AS isFilingIndate, s.orgSidPath FROM