Merge remote-tracking branch 'origin/master'

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")
@@ -93,9 +95,15 @@ public class CrmCustomerRest {
 
 
     @ApiOperation("根据sid批量删除")
-    @PostMapping("/delBySids")
+    @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();
     }
@@ -185,4 +193,20 @@ public class CrmCustomerRest {
         PagerVo<AsCustomerListVo> 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();
+    }
 }

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<List<PeopleList>> getListByCustomerSid(String customerSid) {
+	public ResultBean<List<PeopleList>> getListByCustomerSid(@RequestParam("sid") String customerSid) {
 		ResultBean rb = ResultBean.fireFail();
 		List<PeopleList> list = crmDockingPeopleService.getListByCustomerSid(customerSid);
 		return rb.success().setData(list);

yxt-crm-biz/src/main/java/com/yxt/crm/biz/crmcustomer/CrmCustomerService.java

@@ -305,7 +305,21 @@ public class CrmCustomerService extends MybatisBaseService<CrmCustomerMapper, Cr
         }
         return subList;
     }
+    public void disableState(String[] sid) {
+        for (String s : sid) {
+            CrmCustomer customerTemp = fetchBySid(s);
+            customerTemp.setIsEnable(0);
+            baseMapper.updateById(customerTemp);
+        }
+    }
 
+    public void enable(String[] sid) {
+        for (String s : sid) {
+            CrmCustomer customerTemp = fetchBySid(s);
+            customerTemp.setIsEnable(1);
+            baseMapper.updateById(customerTemp);
+        }
+    }
     public PagerVo<AsCustomerListVo> asListPage(PagerQuery<AsCustomerListQuery> pq) {
         AsCustomerListQuery query = pq.getParams();
         QueryWrapper<CrmCustomer> qw = new QueryWrapper<>();

yxt-crm-biz/src/main/java/com/yxt/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordMapper.java

@@ -71,4 +71,6 @@ public interface CrmMaintenanceenterpriseRecordMapper extends BaseMapper<CrmMain
 	int selectBySid(String join);
 
 	int updateFlowFiled(Map<String, Object> map);
+
+    int selCountByCustomerSid(@Param("customerSid") String customerSid);
 }

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})
 	</select>
+    <select id="selCountByCustomerSid" resultType="java.lang.Integer">
+		SELECT COUNT(*)
+		FROM crm_maintenanceenterprise_record
+		WHERE isDelete = '0' and customerSid = #{customerSid}
+	</select>
 
-	<update id="updateFlowFiled">
+    <update id="updateFlowFiled">
 		UPDATE crm_maintenanceenterprise_record
 		SET nodeState=#{nodeState}
 		, nodeSid=#{taskDefKey}

yxt-crm-biz/src/main/java/com/yxt/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordService.java

@@ -1008,4 +1008,7 @@ public class CrmMaintenanceenterpriseRecordService extends MybatisBaseService<Cr
         return rb.success();
     }
 
+    public int selCountByCustomerSid(String sid) {
+        return baseMapper.selCountByCustomerSid(sid);
+    }
 }