Tenlion/system-operator
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

用户信息字段调整

Browse Source
This commit is contained in:
wanggeng 2024-07-29 15:28:33 +08:00
parent 4010e06ad6
commit ca45d0e4c1
4 changed files with 23 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
src/main/java/cn/com/tenlion/operator/pojo/dtos/user/info/UserInfoDTO.java
View File

@ -25,22 +25,12 @@ public class UserInfoDTO {
private String idCardType;
@ApiModelProperty(name = "idCardNumber", value = "证件号")
private String idCardNumber;
@ApiModelProperty(name = "idCardFront", value = "证件照正面")
private String idCardFront;
@ApiModelProperty(name = "idCardBack", value = "证件照反面")
private String idCardBack;
@ApiModelProperty(name = "idCardStartDate", value = "证件开始时间")
private String idCardStartDate;
@ApiModelProperty(name = "idCardEndDate", value = "证件结束时间")
private String idCardEndDate;
@ApiModelProperty(name = "legalPerson", value = "法人")
private String legalPerson;
@ApiModelProperty(name = "establishDate", value = "成立时间")
private String establishDate;
@ApiModelProperty(name = "contactAddress", value = "联系地址")
private String contactAddress;
@ApiModelProperty(name = "contactPhone", value = "联系电话")
private String contactPhone;
@ApiModelProperty(name = "contactName", value = "联系人姓名")
private String contactName;
@ApiModelProperty(name = "contactName", value = "英文名称")
private String userInfoNameEn;
@ApiModelProperty(name = "userUsername", value = "用户名")
private String userUsername;
@ -92,62 +82,6 @@ public class UserInfoDTO {
this.idCardNumber = idCardNumber;
}
public String getIdCardFront() {
return idCardFront == null ? "" : idCardFront.trim();
}
public void setIdCardFront(String idCardFront) {
this.idCardFront = idCardFront;
}
public String getIdCardBack() {
return idCardBack == null ? "" : idCardBack.trim();
}
public void setIdCardBack(String idCardBack) {
this.idCardBack = idCardBack;
}
public String getIdCardStartDate() {
return idCardStartDate == null ? "" : idCardStartDate.trim();
}
public void setIdCardStartDate(String idCardStartDate) {
this.idCardStartDate = idCardStartDate;
}
public String getIdCardEndDate() {
return idCardEndDate == null ? "" : idCardEndDate.trim();
}
public void setIdCardEndDate(String idCardEndDate) {
this.idCardEndDate = idCardEndDate;
}
public String getLegalPerson() {
return legalPerson == null ? "" : legalPerson.trim();
}
public void setLegalPerson(String legalPerson) {
this.legalPerson = legalPerson;
}
public String getEstablishDate() {
return establishDate == null ? "" : establishDate.trim();
}
public void setEstablishDate(String establishDate) {
this.establishDate = establishDate;
}
public String getContactAddress() {
return contactAddress == null ? "" : contactAddress.trim();
}
public void setContactAddress(String contactAddress) {
this.contactAddress = contactAddress;
}
public String getContactPhone() {
return contactPhone == null ? "" : contactPhone.trim();
}
@ -156,6 +90,22 @@ public class UserInfoDTO {
this.contactPhone = contactPhone;
}
public String getContactName() {
return contactName == null ? "" : contactName.trim();
}
public void setContactName(String contactName) {
this.contactName = contactName;
}
public String getUserInfoNameEn() {
return userInfoNameEn == null ? "" : userInfoNameEn.trim();
}
public void setUserInfoNameEn(String userInfoNameEn) {
this.userInfoNameEn = userInfoNameEn;
}
public String getUserUsername() {
return userUsername == null ? "" : userUsername.trim();
}

6
src/main/java/cn/com/tenlion/operator/service/user/custom/UserCustomService.java
View File

@ -65,11 +65,7 @@ public class UserCustomService extends DefaultBaseService {
List<RolePO> rolePOS = roleUserService.listRolePOByUserId(userDTO.getUserId());
List<UserCustomDTO.Role> roles = rolePOS.stream().map(rolePO -> new UserCustomDTO.Role(rolePO.getRoleId(), rolePO.getRoleName())).collect(Collectors.toList());
userCustomDTO.setRoles(roles);
userInfoDTOS.stream().filter(dto -> StringUtils.equals(userDTO.getUserId(), dto.getUserId())).findFirst().ifPresent(userInfo -> {
userInfo.setIdCardFront(String.format("%sroute/file/download/true/%s", systemApiPathProperties.getCopyrightExternal(), userInfo.getIdCardFront()));
userInfo.setIdCardBack(String.format("%sroute/file/download/true/%s", systemApiPathProperties.getCopyrightExternal(), userInfo.getIdCardBack()));
userCustomDTO.setUserInfo(userInfo);
});
userInfoDTOS.stream().filter(dto -> StringUtils.equals(userDTO.getUserId(), dto.getUserId())).findFirst().ifPresent(userCustomDTO::setUserInfo);
return userCustomDTO;
}).collect(Collectors.toList());
return new SuccessResultList<>(userCustomDTOS, successResultList.getPage(), successResultList.getTotal());

9
src/main/java/cn/com/tenlion/operator/service/user/info/UserInfoService.java
View File

@ -36,13 +36,10 @@ public class UserInfoService extends DefaultBaseService {
public UserInfoDTO get(String userInfoId) {
String token = OAuth2ClientTokenManager.getInstance().getToken().getAccessToken();
UserInfoDTO dto = userInfoRemoteService.get(
return userInfoRemoteService.get(
systemApiPathProperties.getCopyright(),
userInfoId,
token);
dto.setIdCardFront(String.format("%sroute/file/download/true/%s", systemApiPathProperties.getCopyrightExternal(), dto.getIdCardFront()));
dto.setIdCardBack(String.format("%sroute/file/download/true/%s", systemApiPathProperties.getCopyrightExternal(), dto.getIdCardBack()));
return dto;
}
public List<UserInfoDTO> listByUserIds(List<String> userIds) {
@ -77,10 +74,6 @@ public class UserInfoService extends DefaultBaseService {
userPOS.stream().filter(po -> StringUtils.equals(dto.getUserId(), po.getUserId())).findFirst().ifPresent(userPO -> dto.setUserUsername(userPO.getUserUsername()));
});
}
userInfoDTOS.forEach(dto -> {
dto.setIdCardFront(String.format("%sroute/file/download/true/%s", systemApiPathProperties.getCopyrightExternal(), dto.getIdCardFront()));
dto.setIdCardBack(String.format("%sroute/file/download/true/%s", systemApiPathProperties.getCopyrightExternal(), dto.getIdCardBack()));
});
return successResultList;
}

15
src/main/resources/templates/user/custom/list.html
View File

@ -102,7 +102,7 @@
return `￥${(item.account.accountMoney / 100).toFixed(2)}`;
}
},
{field:'userInfoName', width:200, title: '用户名称', align:'center',
{field:'userInfoName', width:200, title: '用户/公司名称', align:'center',
templet: function(item) {
if(!item.userInfo) {
return '-';
@ -118,19 +118,6 @@
return item.userInfo.idCardNumber;
}
},
{field: 'idCardFrontBack', width: 120, title: '证件照正/反面', align:'center',
templet: function(item) {
if(!item.userInfo) {
return '-';
}
return `
<div class="id-card">
<img class="img" src="${item.userInfo.idCardFront}" />
<img class="img" src="${item.userInfo.idCardBack}" />
</div>
`;
}
},
{field:'userType', width:90, title: '类型', sort: true, align:'center',
templet: function(item) {
if(item.userType == 1) {