Commit 628b0103 authored by 李成龙's avatar 李成龙

资质时间修改为YYMMDD。

parent 061ba903
package com.yeejoin.amos.boot.biz.common.entity; package com.yeejoin.amos.boot.biz.common.entity;
import com.alibaba.fastjson.annotation.JSONField;
import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
...@@ -23,6 +24,7 @@ public class BaseRelationEntity implements Serializable{ ...@@ -23,6 +24,7 @@ public class BaseRelationEntity implements Serializable{
protected Long sequenceNbr; protected Long sequenceNbr;
@TableField(value = "rec_date", fill = FieldFill.INSERT_UPDATE) @TableField(value = "rec_date", fill = FieldFill.INSERT_UPDATE)
@JSONField(format = "yyyy-MM-dd")
protected Date recDate; protected Date recDate;
@TableField(value = "rec_user_id", fill = FieldFill.INSERT_UPDATE) @TableField(value = "rec_user_id", fill = FieldFill.INSERT_UPDATE)
......
package com.yeejoin.amos.boot.module.common.api.entity; package com.yeejoin.amos.boot.module.common.api.entity;
import com.alibaba.fastjson.annotation.JSONField;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.yeejoin.amos.boot.biz.common.entity.BaseRelationEntity; import com.yeejoin.amos.boot.biz.common.entity.BaseRelationEntity;
...@@ -57,6 +58,7 @@ public class TzsUserPermission extends BaseRelationEntity { ...@@ -57,6 +58,7 @@ public class TzsUserPermission extends BaseRelationEntity {
* 有效期至 * 有效期至
*/ */
@TableField("expiry_date") @TableField("expiry_date")
@JSONField(format = "yyyy-MM-dd")
private Date expiryDate; private Date expiryDate;
/** /**
...@@ -69,6 +71,7 @@ public class TzsUserPermission extends BaseRelationEntity { ...@@ -69,6 +71,7 @@ public class TzsUserPermission extends BaseRelationEntity {
* 发证日期 * 发证日期
*/ */
@TableField("issue_date") @TableField("issue_date")
@JSONField(format = "yyyy-MM-dd")
private Date issueDate; private Date issueDate;
/** /**
......
package com.yeejoin.amos.boot.module.statistics.api.vo; package com.yeejoin.amos.boot.module.statistics.api.vo;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.annotation.JSONField;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
...@@ -58,7 +59,7 @@ public class TzsUserInfoVo { ...@@ -58,7 +59,7 @@ public class TzsUserInfoVo {
* 出生日期 * 出生日期
*/ */
@TableField("birthday") @TableField("birthday")
private Date birthday; private String birthday;
/** /**
* 学历 * 学历
......
...@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; ...@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl; import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
import com.yeejoin.amos.boot.module.common.api.entity.TzsUserPermission; import com.yeejoin.amos.boot.module.common.api.entity.TzsUserPermission;
import com.yeejoin.amos.boot.module.common.api.utils.DateUtils;
import com.yeejoin.amos.boot.module.statistics.api.entity.TzsUserInfo; import com.yeejoin.amos.boot.module.statistics.api.entity.TzsUserInfo;
import com.yeejoin.amos.boot.module.statistics.api.mapper.UserInfoMapper; import com.yeejoin.amos.boot.module.statistics.api.mapper.UserInfoMapper;
import com.yeejoin.amos.boot.module.statistics.api.mapper.UserPermissionMapper; import com.yeejoin.amos.boot.module.statistics.api.mapper.UserPermissionMapper;
...@@ -80,6 +81,7 @@ public class UserBizByTCMServiceImpl { ...@@ -80,6 +81,7 @@ public class UserBizByTCMServiceImpl {
tzsUserInfoVo.setProfile(ObjectUtils.isEmpty(tzsUserInfo.getProfile()) ? null : JSON.parseArray(tzsUserInfo.getProfile())); tzsUserInfoVo.setProfile(ObjectUtils.isEmpty(tzsUserInfo.getProfile()) ? null : JSON.parseArray(tzsUserInfo.getProfile()));
tzsUserInfoVo.setAppointDoc(ObjectUtils.isEmpty(tzsUserInfo.getAppointDoc()) ? null : JSON.parseArray(tzsUserInfo.getAppointDoc())); tzsUserInfoVo.setAppointDoc(ObjectUtils.isEmpty(tzsUserInfo.getAppointDoc()) ? null : JSON.parseArray(tzsUserInfo.getAppointDoc()));
tzsUserInfoVo.setOtherAccessories(ObjectUtils.isEmpty(tzsUserInfo.getOtherAccessories()) ? null : JSON.parseArray(tzsUserInfo.getOtherAccessories())); tzsUserInfoVo.setOtherAccessories(ObjectUtils.isEmpty(tzsUserInfo.getOtherAccessories()) ? null : JSON.parseArray(tzsUserInfo.getOtherAccessories()));
tzsUserInfoVo.setBirthday(tzsUserInfo.getBirthday() != null ? DateUtils.longStrDate(tzsUserInfo.getBirthday()): null);
String companyType = getUnitType(); String companyType = getUnitType();
tzsUserInfoVo.setCompanyType(companyType.contains("个人主体") ? "individual" : "no-individual"); tzsUserInfoVo.setCompanyType(companyType.contains("个人主体") ? "individual" : "no-individual");
Map<String, Object> userInfoMap = BeanUtil.beanToMap(tzsUserInfoVo); Map<String, Object> userInfoMap = BeanUtil.beanToMap(tzsUserInfoVo);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment