Merge branch 'dsc' into 'develop'

修复客户跟进 字段类型

See merge request 8timerv2/8timerapiv200!172

src/main/java/cn/timer/api/bean/crm/CrmClientFollow.java

@@ -60,7 +60,7 @@ public class CrmClientFollow extends Model<CrmClientFollow> {
 	private Integer content;
 	private Integer content;
 	
 	
 	@ApiModelProperty(value = "客户数据状态 0-无 1-潜在 2-意向 3-签约 4-合作中 5-已封档")
 	@ApiModelProperty(value = "客户数据状态 0-无 1-潜在 2-意向 3-签约 4-合作中 5-已封档")
-	private String clientStatus;
+	private Integer clientStatus;
 	
 	
 	@ApiModelProperty(value = "联系人姓名")
 	@ApiModelProperty(value = "联系人姓名")
 	private String name;
 	private String name;

src/main/java/cn/timer/api/controller/crm/CrmController.java

@@ -591,7 +591,10 @@ public class CrmController {
 		if (cid == null)
 		if (cid == null)
 			return ResultUtil.error("删除失败,请传入客户id");
 			return ResultUtil.error("删除失败,请传入客户id");
 		Integer num = CrmClientData.builder().id(cid).build().selectById().getContactsNum();
 		Integer num = CrmClientData.builder().id(cid).build().selectById().getContactsNum();
-		CrmClientData.builder().id(cid).contactsNum(--num).build().updateById();
+		if (--num < 0) {
+			return ResultUtil.error("删除失败,已经没有可以删的联系人了");
+		}
+		CrmClientData.builder().id(cid).contactsNum(num).build().updateById();
 		if (crmClientContactsMapper.deleteById(id) > 0)
 		if (crmClientContactsMapper.deleteById(id) > 0)
 			return ResultUtil.success("删除成功");
 			return ResultUtil.success("删除成功");
 		return ResultUtil.error("删除失败");
 		return ResultUtil.error("删除失败");
@@ -645,7 +648,8 @@ public class CrmController {
 		Integer orgCode = getOrgCode(userBean);
 		Integer orgCode = getOrgCode(userBean);
 		Integer empNum = getEmpNum(userBean);
 		Integer empNum = getEmpNum(userBean);
 
 
-		CrmClientData.builder().id(crmClientFollow.getCid()).lastFollowTime(new Date()).build().updateById(); // 更新客户最近跟进时间
+		CrmClientData.builder().id(crmClientFollow.getCid()).clientStatus(crmClientFollow.getClientStatus())
+				.lastFollowTime(new Date()).build().updateById(); // 更新客户最近跟进时间
 
 
 		crmClientFollow.setOrgCode(orgCode);
 		crmClientFollow.setOrgCode(orgCode);
 		crmClientFollow.setCreateUserName(getEmpName(orgCode, empNum));
 		crmClientFollow.setCreateUserName(getEmpName(orgCode, empNum));