欠款月结客户

anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmdockingpeople/CrmDockingPeopleFeign.java

@@ -65,14 +65,23 @@ public interface CrmDockingPeopleFeign {
     @PostMapping("/save")
     @ResponseBody
     public ResultBean save(@RequestBody CrmDockingPeopleDto dto);
-        
+
     @ApiOperation("根据sid删除记录")
     @DeleteMapping("/delBySids")
     @ResponseBody
     public ResultBean delBySids(@RequestBody String[] sids);
-      
+
     @ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchDetailsBySid/{sid}")
     @ResponseBody
     public ResultBean<CrmDockingPeopleDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
-}
+
+
+    @ApiOperation("对接人批量禁用")
+    @PostMapping("/disableState")
+    public ResultBean disableState(@RequestBody String[] sid);
+
+    @ApiOperation("对接人批量启用")
+    @PostMapping("/enable")
+    public ResultBean enable(@RequestBody String[] sid);
+}

anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmdockingpeople/CrmDockingPeopleFeignFallback.java

@@ -69,4 +69,14 @@ public class CrmDockingPeopleFeignFallback implements CrmDockingPeopleFeign {
 		ResultBean rb = ResultBean.fireFail();
 		return rb.setMsg("接口anrui-crm/crmdockingpeople/fetchDetailsBySid无法访问");
 	}
-}
+
+	@Override
+	public ResultBean disableState(String[] sid) {
+		return null;
+	}
+
+	@Override
+	public ResultBean enable(String[] sid) {
+		return null;
+	}
+}

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmdockingpeople/CrmDockingPeopleRest.java

@@ -97,4 +97,14 @@ public class CrmDockingPeopleRest implements CrmDockingPeopleFeign {
 		CrmDockingPeopleDetailsVo vo = crmDockingPeopleService.fetchDetailsVoBySid(sid);
 		return rb.success().setData(vo);
 	}
+
+	@Override
+	public ResultBean disableState(String[] sid) {
+		return crmDockingPeopleService.disableState(sid);
+	}
+
+	@Override
+	public ResultBean enable(String[] sid) {
+		return crmDockingPeopleService.enable(sid);
+	}
 }

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmdockingpeople/CrmDockingPeopleService.java

@@ -66,7 +66,7 @@ public class CrmDockingPeopleService extends MybatisBaseService<CrmDockingPeople
 		QueryWrapper<CrmDockingPeople> qw = new QueryWrapper<>();
 		return qw;
 	}
-	
+
 	public PagerVo<CrmDockingPeopleVo> listPageVo(PagerQuery<CrmDockingPeopleQuery> pq) {
 		CrmDockingPeopleQuery query = pq.getParams();
 		QueryWrapper<CrmDockingPeople> qw = createQueryWrapper(query);
@@ -75,36 +75,56 @@ public class CrmDockingPeopleService extends MybatisBaseService<CrmDockingPeople
 		PagerVo<CrmDockingPeopleVo> p = PagerUtil.pageToVo(pagging, null);
 		return p;
 	}
-	
+
 	public void saveOrUpdateDto(CrmDockingPeopleDto dto){
         String dtoSid = dto.getSid();
         if (StringUtils.isBlank(dtoSid)) {
             this.insertByDto(dto);
-            return; 
-        } 
+            return;
+        }
 		this.updateByDto(dto);
 	}
-	
+
 	public void insertByDto(CrmDockingPeopleDto dto){
 		CrmDockingPeople entity = new CrmDockingPeople();
 		BeanUtil.copyProperties(dto, entity, "id", "sid");
 		baseMapper.insert(entity);
 	}
-	
+
 	public void updateByDto(CrmDockingPeopleDto dto){
           String dtoSid = dto.getSid();
         if (StringUtils.isBlank(dtoSid)) {
             return;
-        } 
+        }
 		CrmDockingPeople entity = fetchBySid(dtoSid);
 		BeanUtil.copyProperties(dto, entity, "id", "sid");
 		baseMapper.updateById(entity);
 	}
-	
+
 	public CrmDockingPeopleDetailsVo fetchDetailsVoBySid(String sid){
 		CrmDockingPeople entity = fetchBySid(sid);
 		CrmDockingPeopleDetailsVo vo = new CrmDockingPeopleDetailsVo();
 		BeanUtil.copyProperties(entity, vo);
 		return vo;
 	}
-}
+
+	public ResultBean disableState(String[] sid) {
+		ResultBean rb = ResultBean.fireFail();
+		for (String s : sid) {
+			CrmDockingPeople crmDockingPeople = fetchBySid(s);
+			crmDockingPeople.setIsEnable(0);
+			baseMapper.updateById(crmDockingPeople);
+		}
+		return rb.success();
+	}
+
+	public ResultBean enable(String[] sid) {
+		ResultBean rb = ResultBean.fireFail();
+		for (String s : sid) {
+			CrmDockingPeople crmDockingPeople = fetchBySid(s);
+			crmDockingPeople.setIsEnable(1);
+			baseMapper.updateById(crmDockingPeople);
+		}
+		return rb.success();
+	}
+}

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

@@ -53,7 +53,7 @@
 		mobile,
 		`name`,
 		remarks
-		from crm_docking_people where customerSid =#{sid}
+		from crm_docking_people where customerSid =#{sid} and isEnable = 1
 	</select>
 	<select id="selectNum" resultType="java.lang.Integer">
 		select IFNULL(CAST(REPLACE(MAX(billNo), #{bill}, '') AS SIGNED), 0) as code

yxt-as/src/main/java/com/yxt/anrui/as/api/ascustomervehicle/AsCustomerVehicleQuery.java

@@ -63,7 +63,7 @@ public class AsCustomerVehicleQuery implements Query {
     private String customerTypeKey; // 客户类型key
 	@ApiModelProperty("工单类型")
     private String billType; // 0代表保险维修，显示所有客户（不传值也查询所有）；
-                            // 1定点维修显示已备案且在有效期内的定点维修客户；
+                            // 1欠款月结显示已备案且在有效期内的定点维修客户；
                             // 2常规维修显示非定点维修客户
     @ApiModelProperty("useOrgSid")
     private String useOrgSid; // 部门sid

yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleMapper.xml

@@ -50,7 +50,7 @@
 		FROM
 			as_customer_vehicle
 		WHERE
-			customerSid = #{customerSid}
+			customerSid = #{customerSid} and isEnable = 1
 	</select>
 	<select id="getVehListCountsByCustomerSid" resultType="java.lang.Integer">
 		SELECT COUNT(*) FROM as_customer_vehicle WHERE customerSid = #{customerSid}

yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleRest.java

@@ -58,6 +58,31 @@ public class AsCustomerVehicleRest{
 	private AsCustomerVehicleService asCustomerVehicleService;
 
 
+
+	@ApiOperation("批量禁用")
+	@PostMapping("/disableState")
+	public ResultBean disableState(@RequestBody String[] sid){
+		ResultBean rb = ResultBean.fireFail();
+		for (String s : sid) {
+			AsCustomerVehicle asCustomerVehicle = asCustomerVehicleService.fetchBySid(s);
+			asCustomerVehicle.setIsEnable(0);
+			asCustomerVehicleService.updateById(asCustomerVehicle);
+		}
+		return rb.success();
+	}
+
+	@ApiOperation("批量启用")
+	@PostMapping("/enable")
+	public ResultBean enable(@RequestBody String[] sid){
+		ResultBean rb = ResultBean.fireFail();
+		for (String s : sid) {
+			AsCustomerVehicle asCustomerVehicle = asCustomerVehicleService.fetchBySid(s);
+			asCustomerVehicle.setIsEnable(1);
+			asCustomerVehicleService.updateById(asCustomerVehicle);
+		}
+		return rb.success();
+	}
+
 	@ApiOperation("根据条件分页查询数据的列表")
 	@PostMapping("/listPage")
 	public ResultBean<PagerVo<AsCustomerVehicleVo>> listPage(@RequestBody PagerQuery<AsCustomerVehicleQuery> pq){

yxt-as/src/main/java/com/yxt/anrui/as/biz/ascustomervehicle/AsCustomerVehicleService.java

@@ -223,7 +223,15 @@ public class AsCustomerVehicleService extends MybatisBaseService<AsCustomerVehic
             qw.eq("c.customerTypeKey", query.getCustomerTypeKey());
         }
         if (StringUtils.isNotBlank(query.getBillType())) {
-
+            // 0代表保险维修，显示所有客户（不传值也查询所有）；
+            // 1欠款月结显示已备案且在有效期内的定点维修客户；
+            // 2常规维修显示非定点维修客户
+            if (query.getBillType().equals("1")) {
+                qw.apply("\tc.isDesignatedEnterprise = 1 \n" +
+                        "\tAND c.filingIndate >= CURDATE()");
+            } else if (query.getBillType().equals("2")) {
+                qw.ne("isDesignatedEnterprise","1");
+            }
         }
         if (StringUtils.isNotBlank(query.getVehMark())) {
             qw.like("v.vehMark", query.getVehMark());