| @@ -67,6 +67,7 @@ public class WxCUserBasicInfoController extends BaseController { | |||||
| } | } | ||||
| String tenantId = getTenantId(); | String tenantId = getTenantId(); | ||||
| wxCUserBasicInfo.setTenantId(tenantId); | wxCUserBasicInfo.setTenantId(tenantId); | ||||
| wxCUserBasicInfo.setSortColumns(WxCUserBasicInfo.Field.Id_DESC); | |||||
| PageInfo<WxCUserBasicInfo> page = wxCUserBasicInfoService.listAsPage(wxCUserBasicInfo, pageNum, pageSize); | PageInfo<WxCUserBasicInfo> page = wxCUserBasicInfoService.listAsPage(wxCUserBasicInfo, pageNum, pageSize); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| } | } | ||||
| @@ -9,12 +9,10 @@ import java.io.Serializable; | |||||
| public class CUserBaseInfoT implements Serializable { | public class CUserBaseInfoT implements Serializable { | ||||
| /**用户姓名**/ | /**用户姓名**/ | ||||
| @Excel(name="姓名",width = 20,orderNum = "1") | @Excel(name="姓名",width = 20,orderNum = "1") | ||||
| @NotNull | |||||
| @io.swagger.annotations.ApiModelProperty(value="用户姓名",name="name") | @io.swagger.annotations.ApiModelProperty(value="用户姓名",name="name") | ||||
| private String name; | private String name; | ||||
| /**性别:0:保密 1.男 2女**/ | /**性别:0:保密 1.男 2女**/ | ||||
| @Excel(name="性别",width = 20,replace = { "保密_0", "男_1","女_2"},orderNum = "2") | @Excel(name="性别",width = 20,replace = { "保密_0", "男_1","女_2"},orderNum = "2") | ||||
| @NotNull | |||||
| @io.swagger.annotations.ApiModelProperty(value="性别:0:保密 1.男 2女",name="sex") | @io.swagger.annotations.ApiModelProperty(value="性别:0:保密 1.男 2女",name="sex") | ||||
| private Integer sex; | private Integer sex; | ||||
| /**微信用户绑定的手机号**/ | /**微信用户绑定的手机号**/ | ||||
| @@ -28,12 +26,10 @@ public class CUserBaseInfoT implements Serializable { | |||||
| private String nickName; | private String nickName; | ||||
| /**学历**/ | /**学历**/ | ||||
| @Excel(name="学历",width = 20,orderNum = "5") | @Excel(name="学历",width = 20,orderNum = "5") | ||||
| @NotNull | |||||
| @io.swagger.annotations.ApiModelProperty(value="学历",name="education") | @io.swagger.annotations.ApiModelProperty(value="学历",name="education") | ||||
| private String education; | private String education; | ||||
| /**出生日期**/ | /**出生日期**/ | ||||
| @Excel(name="生日",width = 20,orderNum = "6") | @Excel(name="生日",width = 20,orderNum = "6") | ||||
| @NotNull | |||||
| @io.swagger.annotations.ApiModelProperty(value="出生日期",name="birthdate") | @io.swagger.annotations.ApiModelProperty(value="出生日期",name="birthdate") | ||||
| private String birthdate; | private String birthdate; | ||||
| /**地址**/ | /**地址**/ | ||||
| @@ -55,7 +51,6 @@ public class CUserBaseInfoT implements Serializable { | |||||
| @Excel(name="标签",width = 20,orderNum = "10") | @Excel(name="标签",width = 20,orderNum = "10") | ||||
| private String tagNames; | private String tagNames; | ||||
| @NotNull | |||||
| public String getName() { | public String getName() { | ||||
| return name; | return name; | ||||
| } | } | ||||
| @@ -64,7 +59,6 @@ public class CUserBaseInfoT implements Serializable { | |||||
| this.name = name; | this.name = name; | ||||
| } | } | ||||
| @NotNull | |||||
| public Integer getSex() { | public Integer getSex() { | ||||
| return sex; | return sex; | ||||
| } | } | ||||
| @@ -73,7 +67,6 @@ public class CUserBaseInfoT implements Serializable { | |||||
| this.sex = sex; | this.sex = sex; | ||||
| } | } | ||||
| @NotNull | |||||
| public String getPhone() { | public String getPhone() { | ||||
| return phone; | return phone; | ||||
| } | } | ||||
| @@ -90,7 +83,6 @@ public class CUserBaseInfoT implements Serializable { | |||||
| this.nickName = nickName; | this.nickName = nickName; | ||||
| } | } | ||||
| @NotNull | |||||
| public String getEducation() { | public String getEducation() { | ||||
| return education; | return education; | ||||
| } | } | ||||
| @@ -99,7 +91,6 @@ public class CUserBaseInfoT implements Serializable { | |||||
| this.education = education; | this.education = education; | ||||
| } | } | ||||
| @NotNull | |||||
| public String getBirthdate() { | public String getBirthdate() { | ||||
| return birthdate; | return birthdate; | ||||
| } | } | ||||
| @@ -422,9 +422,13 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { | |||||
| private WxCUserBasicInfo InitUserBaseInfo(CUserBaseInfoT uBase, String tenantId) { | private WxCUserBasicInfo InitUserBaseInfo(CUserBaseInfoT uBase, String tenantId) { | ||||
| if (StringUtils.isBlank(uBase.getPhone())) { | |||||
| return null; | |||||
| } | |||||
| SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); | SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); | ||||
| WxCUserBasicInfo userBase = new WxCUserBasicInfo(); | WxCUserBasicInfo userBase = new WxCUserBasicInfo(); | ||||
| userBase.setTenantId(tenantId); | userBase.setTenantId(tenantId); | ||||
| userBase.setName(uBase.getName()); | userBase.setName(uBase.getName()); | ||||
| if (uBase.getSex() == null) { | if (uBase.getSex() == null) { | ||||
| @@ -432,28 +436,34 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { | |||||
| } else { | } else { | ||||
| userBase.setSex(uBase.getSex()); | userBase.setSex(uBase.getSex()); | ||||
| } | } | ||||
| if (StringUtils.isBlank(uBase.getPhone())) { | |||||
| return null; | |||||
| } | |||||
| userBase.setPhone(uBase.getPhone()); | userBase.setPhone(uBase.getPhone()); | ||||
| userBase.setNickName(uBase.getNickName()); | userBase.setNickName(uBase.getNickName()); | ||||
| userBase.setEducation(uBase.getEducation()); | userBase.setEducation(uBase.getEducation()); | ||||
| try { | |||||
| userBase.setBirthdate(sdf.parse(uBase.getBirthdate())); | |||||
| } catch (ParseException e) { | |||||
| logger.error("生日: " + e.getMessage()); | |||||
| if (uBase.getBirthdate() != null) { | |||||
| try { | |||||
| userBase.setBirthdate(sdf.parse(uBase.getBirthdate())); | |||||
| } catch (ParseException e) { | |||||
| logger.error("生日: " + e.getMessage()); | |||||
| } | |||||
| } | } | ||||
| userBase.setAddress(uBase.getAddress()); | userBase.setAddress(uBase.getAddress()); | ||||
| try { | |||||
| userBase.setUpdateDate(sdf.parse(uBase.getUpdateDate())); | |||||
| } catch (ParseException e) { | |||||
| logger.error("上次活跃时间: " + e.getMessage()); | |||||
| if (uBase.getUpdateDate() != null) { | |||||
| try { | |||||
| userBase.setUpdateDate(sdf.parse(uBase.getUpdateDate())); | |||||
| } catch (ParseException e) { | |||||
| logger.error("上次活跃时间: " + e.getMessage()); | |||||
| } | |||||
| } | } | ||||
| try { | |||||
| userBase.setCreateDate(sdf.parse(uBase.getCreateDate())); | |||||
| } catch (ParseException e) { | |||||
| logger.error("注册时间: " + e.getMessage()); | |||||
| if (uBase.getCreateDate() != null) { | |||||
| try { | |||||
| userBase.setCreateDate(sdf.parse(uBase.getCreateDate())); | |||||
| } catch (ParseException e) { | |||||
| logger.error("注册时间: " + e.getMessage()); | |||||
| } | |||||
| } | } | ||||
| userBase.setTagNames(uBase.getTagNames()); | userBase.setTagNames(uBase.getTagNames()); | ||||
| return userBase; | return userBase; | ||||