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