From 7cfa2654427821d28265a6a9843116849ea2ded5 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Tue, 29 Oct 2024 13:50:12 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E7=AE=A1=E7=90=862?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/yxt/crm/apiadmin/CrmDockingPeopleRest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yxt-crm-biz/src/main/java/com/yxt/crm/apiadmin/CrmDockingPeopleRest.java b/yxt-crm-biz/src/main/java/com/yxt/crm/apiadmin/CrmDockingPeopleRest.java index 696cc204b7..59bc1d5160 100644 --- a/yxt-crm-biz/src/main/java/com/yxt/crm/apiadmin/CrmDockingPeopleRest.java +++ b/yxt-crm-biz/src/main/java/com/yxt/crm/apiadmin/CrmDockingPeopleRest.java @@ -95,20 +95,20 @@ public class CrmDockingPeopleRest{ @ApiOperation("对接人批量禁用") @PostMapping("/disableState") - public ResultBean disableState(String[] sid) { + public ResultBean disableState(@RequestBody String[] sid) { return crmDockingPeopleService.disableState(sid); } @ApiOperation("对接人批量启用") @PostMapping("/enable") - public ResultBean enable(String[] sid) { + public ResultBean enable(@RequestBody String[] sid) { return crmDockingPeopleService.enable(sid); } @ApiOperation("根据客户SID获取一条记录") @GetMapping("/getListByCustomerSid") @ResponseBody - public ResultBean> getListByCustomerSid(String customerSid) { + public ResultBean> getListByCustomerSid(@RequestParam("sid") String customerSid) { ResultBean rb = ResultBean.fireFail(); List list = crmDockingPeopleService.getListByCustomerSid(customerSid); return rb.success().setData(list); From 53937e84650e0460e7576f6060fb24364674e1e5 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Tue, 29 Oct 2024 13:55:28 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E7=AE=A1=E7=90=863?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/yxt/crm/apiadmin/CrmCustomerRest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yxt-crm-biz/src/main/java/com/yxt/crm/apiadmin/CrmCustomerRest.java b/yxt-crm-biz/src/main/java/com/yxt/crm/apiadmin/CrmCustomerRest.java index 3d9db106ec..a34433acab 100644 --- a/yxt-crm-biz/src/main/java/com/yxt/crm/apiadmin/CrmCustomerRest.java +++ b/yxt-crm-biz/src/main/java/com/yxt/crm/apiadmin/CrmCustomerRest.java @@ -93,7 +93,7 @@ public class CrmCustomerRest { @ApiOperation("根据sid批量删除") - @PostMapping("/delBySids") + @DeleteMapping("/delBySids") public ResultBean delBySids(@RequestBody String[] sids) { ResultBean rb = ResultBean.fireFail(); crmCustomerService.delBySids(sids); From 8c1f33b5d37d03508cf8dd5583ce72ee2f34c354 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Tue, 29 Oct 2024 14:11:24 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E7=AE=A1=E7=90=864?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yxt/crm/apiadmin/CrmCustomerRest.java | 16 ++++++++++++++++ .../crm/biz/crmcustomer/CrmCustomerService.java | 14 ++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/yxt-crm-biz/src/main/java/com/yxt/crm/apiadmin/CrmCustomerRest.java b/yxt-crm-biz/src/main/java/com/yxt/crm/apiadmin/CrmCustomerRest.java index a34433acab..c26ca51743 100644 --- a/yxt-crm-biz/src/main/java/com/yxt/crm/apiadmin/CrmCustomerRest.java +++ b/yxt-crm-biz/src/main/java/com/yxt/crm/apiadmin/CrmCustomerRest.java @@ -185,4 +185,20 @@ public class CrmCustomerRest { PagerVo pv = crmCustomerService.asListPage(pq); return rb.success().setData(pv); } + + @ApiOperation("定点企业批量禁用") + @PostMapping("/disableState") + public ResultBean disableState(@RequestBody String[] sid) { + ResultBean rb = ResultBean.fireFail(); + crmCustomerService.disableState(sid); + return rb.success(); + } + + @ApiOperation("定点企业批量启用") + @PostMapping("/enable") + public ResultBean enable(@RequestBody String[] sid) { + ResultBean rb = ResultBean.fireFail(); + crmCustomerService.enable(sid); + return rb.success(); + } } diff --git a/yxt-crm-biz/src/main/java/com/yxt/crm/biz/crmcustomer/CrmCustomerService.java b/yxt-crm-biz/src/main/java/com/yxt/crm/biz/crmcustomer/CrmCustomerService.java index 42d00bc261..afd4a49ff5 100644 --- a/yxt-crm-biz/src/main/java/com/yxt/crm/biz/crmcustomer/CrmCustomerService.java +++ b/yxt-crm-biz/src/main/java/com/yxt/crm/biz/crmcustomer/CrmCustomerService.java @@ -305,7 +305,21 @@ public class CrmCustomerService extends MybatisBaseService asListPage(PagerQuery pq) { AsCustomerListQuery query = pq.getParams(); QueryWrapper qw = new QueryWrapper<>(); From 6f625feb7270042e940853cd208fec0ec5ee9a3a Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Tue, 29 Oct 2024 14:18:30 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E7=AE=A1=E7=90=865?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/yxt/crm/apiadmin/CrmCustomerRest.java | 10 +++++++++- .../CrmMaintenanceenterpriseRecordMapper.java | 2 ++ .../CrmMaintenanceenterpriseRecordMapper.xml | 7 ++++++- .../CrmMaintenanceenterpriseRecordService.java | 3 +++ 4 files changed, 20 insertions(+), 2 deletions(-) diff --git a/yxt-crm-biz/src/main/java/com/yxt/crm/apiadmin/CrmCustomerRest.java b/yxt-crm-biz/src/main/java/com/yxt/crm/apiadmin/CrmCustomerRest.java index c26ca51743..c2d8d4d01a 100644 --- a/yxt-crm-biz/src/main/java/com/yxt/crm/apiadmin/CrmCustomerRest.java +++ b/yxt-crm-biz/src/main/java/com/yxt/crm/apiadmin/CrmCustomerRest.java @@ -31,6 +31,7 @@ import com.yxt.common.core.vo.PagerVo; import com.yxt.crm.biz.crmcustomer.*; import com.yxt.crm.biz.crmcustomerorg.CrmCustomerOrgQuery; import com.yxt.crm.biz.crmcustomerorg.CrmCustomerOrgVo; +import com.yxt.crm.biz.crmmaintenanceenterpriserecord.CrmMaintenanceenterpriseRecordService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; @@ -60,7 +61,8 @@ public class CrmCustomerRest { @Autowired private CrmCustomerService crmCustomerService; - + @Autowired + private CrmMaintenanceenterpriseRecordService crmMaintenanceenterpriseRecordService; @ApiOperation("根据条件分页查询客户信息的列表") @PostMapping("/customerListPage") @@ -96,6 +98,12 @@ public class CrmCustomerRest { @DeleteMapping("/delBySids") public ResultBean delBySids(@RequestBody String[] sids) { ResultBean rb = ResultBean.fireFail(); + for (String sid : sids) { + int count = crmMaintenanceenterpriseRecordService.selCountByCustomerSid(sid); + if (count > 0) { + return rb.setMsg("删除数据中包含欠款客户月结备案数据，删除失败"); + } + } crmCustomerService.delBySids(sids); return rb.success(); } diff --git a/yxt-crm-biz/src/main/java/com/yxt/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordMapper.java b/yxt-crm-biz/src/main/java/com/yxt/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordMapper.java index 829114d30e..0ae039dc87 100644 --- a/yxt-crm-biz/src/main/java/com/yxt/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordMapper.java +++ b/yxt-crm-biz/src/main/java/com/yxt/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordMapper.java @@ -71,4 +71,6 @@ public interface CrmMaintenanceenterpriseRecordMapper extends BaseMapper map); + + int selCountByCustomerSid(@Param("customerSid") String customerSid); } diff --git a/yxt-crm-biz/src/main/java/com/yxt/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordMapper.xml b/yxt-crm-biz/src/main/java/com/yxt/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordMapper.xml index c4d78ec812..4c9517d5f4 100644 --- a/yxt-crm-biz/src/main/java/com/yxt/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordMapper.xml +++ b/yxt-crm-biz/src/main/java/com/yxt/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordMapper.xml @@ -71,8 +71,13 @@ WHERE nodeState != '待提交' and find_in_set(sid, #{list}) + - + UPDATE crm_maintenanceenterprise_record SET nodeState=#{nodeState} , nodeSid=#{taskDefKey} diff --git a/yxt-crm-biz/src/main/java/com/yxt/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordService.java b/yxt-crm-biz/src/main/java/com/yxt/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordService.java index 6f1b954dc1..07d9ea82b4 100644 --- a/yxt-crm-biz/src/main/java/com/yxt/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordService.java +++ b/yxt-crm-biz/src/main/java/com/yxt/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordService.java @@ -1008,4 +1008,7 @@ public class CrmMaintenanceenterpriseRecordService extends MybatisBaseService Date: Tue, 29 Oct 2024 14:20:09 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E7=AE=A1=E7=90=865?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CrmMaintenanceenterpriseRecordMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yxt-crm-biz/src/main/java/com/yxt/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordMapper.xml b/yxt-crm-biz/src/main/java/com/yxt/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordMapper.xml index 4c9517d5f4..39c0799c01 100644 --- a/yxt-crm-biz/src/main/java/com/yxt/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordMapper.xml +++ b/yxt-crm-biz/src/main/java/com/yxt/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordMapper.xml @@ -74,7 +74,7 @@