Merge branch 'develop' into 'master'

Develop

See merge request 8timerv2/8timerapiv200!563

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

@@ -161,6 +161,9 @@ public class CrmClientData extends Model<CrmClientData> {
 	
 	
 	@ApiModelProperty(value = "产品")
 	@ApiModelProperty(value = "产品")
 	private String product;
 	private String product;
+	
+	@ApiModelProperty(value = "跟进记录")
+	private String followuprecord;
 
 
 	@Transient
 	@Transient
 	@TableField(exist = false)
 	@TableField(exist = false)

src/main/java/cn/timer/api/controller/yggl/YgglController.java

@@ -123,6 +123,7 @@ import cn.timer.api.dto.yggl.LoginerChargeDto;
 import cn.timer.api.dto.yggl.LzbQueryDto;
 import cn.timer.api.dto.yggl.LzbQueryDto;
 import cn.timer.api.dto.yggl.LzygQueryDto;
 import cn.timer.api.dto.yggl.LzygQueryDto;
 import cn.timer.api.dto.yggl.ModifyAvatarDto;
 import cn.timer.api.dto.yggl.ModifyAvatarDto;
+import cn.timer.api.dto.yggl.UserInfo;
 import cn.timer.api.dto.yggl.YgCartogramDto;
 import cn.timer.api.dto.yggl.YgCartogramDto;
 import cn.timer.api.dto.yggl.YgKVDto;
 import cn.timer.api.dto.yggl.YgKVDto;
 import cn.timer.api.dto.yggl.YgQueryDto;
 import cn.timer.api.dto.yggl.YgQueryDto;
@@ -1997,7 +1998,23 @@ public class YgglController {
 		return ResultUtil.success("上传成功");
 		return ResultUtil.success("上传成功");
 	}
 	}
 	
 	
-	
+	@PostMapping(value = "/new_account")
+	@ApiOperation(value = "修改账号", httpMethod = "POST", notes = "接口发布说明")
+	public Result<Object> New_account(@CurrentUser UserBean userBean, @RequestBody UserInfo userinfo) {
+		
+		YgglMainEmp sjhpd = YgglMainEmp.builder().build().selectOne(new QueryWrapper<YgglMainEmp>().lambda().eq(YgglMainEmp::getPhone, userinfo.getPhone())
+				.eq(YgglMainEmp::getOrgCode, userBean.getOrgCode()));
+		if(sjhpd == null) {
+			YgglMainEmp.builder().phone(userinfo.getPhone()).build().update(new QueryWrapper<YgglMainEmp>().lambda().eq(YgglMainEmp::getEmpNum, userinfo.getName()).eq(YgglMainEmp::getOrgCode, userBean.getOrgCode()));
+			
+			QyzxEmpLogin.builder().phone(userinfo.getPhone()).build().update(new QueryWrapper<QyzxEmpLogin>().lambda().eq(QyzxEmpLogin::getId,userinfo.getName()).eq(QyzxEmpLogin::getOrgId, userBean.getOrgCode()));
+			
+			return ResultUtil.success("修改成功");
+		}else {
+			return ResultUtil.error("该号码已存在");
+		}
+		
+	}
 	
 	
 	
 	
 }
 }

src/main/java/cn/timer/api/dto/crm/CrmClientDataImportVo.java

@@ -64,5 +64,7 @@ public class CrmClientDataImportVo implements Serializable {
 	private String telephone;
 	private String telephone;
 	private String email;
 	private String email;
 	private String linkAddress;
 	private String linkAddress;
+	
+	private String followuprecord;
 
 
 }
 }