feat: 优化认证状态显示

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/SysUserController.java

@@ -37,6 +37,7 @@ import com.qunzhixinxi.hnqz.admin.api.dto.UserDTO;
 import com.qunzhixinxi.hnqz.admin.api.dto.UserInfo;
 import com.qunzhixinxi.hnqz.admin.api.dto.UserPwd;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysDept;
+import com.qunzhixinxi.hnqz.admin.api.entity.SysDictItem;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysRole;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysUser;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysUserRole;
@@ -57,6 +58,7 @@ import com.qunzhixinxi.hnqz.admin.enums.ZhengQiZhiXingCertStatus;
 import com.qunzhixinxi.hnqz.admin.mapper.*;
 import com.qunzhixinxi.hnqz.admin.service.SysDeptService;
 import com.qunzhixinxi.hnqz.admin.service.SysDeptSubService;
+import com.qunzhixinxi.hnqz.admin.service.SysDictItemService;
 import com.qunzhixinxi.hnqz.admin.service.SysUserService;
 import com.qunzhixinxi.hnqz.admin.service.SysUserSubService;
 import com.qunzhixinxi.hnqz.common.core.constant.CommonConstants;
@@ -105,6 +107,7 @@ public class SysUserController {
 	private final SysUserRoleMapper sysUserRoleMapper;
 	private final QccService qccService;
 	private final SysUserSubService sysUserSubService;
+	private final SysDictItemService sysDictItemService;
 
 
 	private boolean isZbOrDbUsers(Integer[] roles) {
@@ -1475,6 +1478,27 @@ public class SysUserController {
 			});
 		}
 
+		// 登录人所属企业的结算配置信息
+		List<SubjectLocation> locations;
+		Integer deptId = SecurityUtils.getUser().getDeptId();
+		// 非平台用户，获取各自的配置项
+		if (1 != deptId) {
+			List<SysDeptSub> l = sysDeptSubService.list(Wrappers.<SysDeptSub>lambdaQuery().eq(SysDeptSub::getDeptId, deptId).eq(SysDeptSub::getEnableFlag, "1"));
+			if (CollUtil.isNotEmpty(l)) {
+				locations = l.stream().filter(sub -> sub.getSubjectLocation() != null)
+						.map(sub -> Enum.valueOf(SubjectLocation.class, sub.getSubjectLocation().getType()))
+						.collect(Collectors.toList());
+			} else {
+				locations = Collections.emptyList();
+			}
+
+		}
+		// 平台管理员和admin获取全部
+		else {
+			List<SysDictItem> list = sysDictItemService.list(Wrappers.<SysDictItem>query().lambda().eq(SysDictItem::getType, "subject_location"));
+			locations = list.stream().map( item -> Enum.valueOf(SubjectLocation.class, item.getValue())).collect(Collectors.toList());
+		}
+
 		userVosPage.getRecords().forEach(userVO -> {
 			// 查询所属企业渠道
 			SysDeptSub sysDeptSub = new SysDeptSub();
@@ -1488,12 +1512,19 @@ public class SysUserController {
 						.eq(SysUserSub::getDeptId, userVO.getDeptId())
 						.eq(SysUserSub::getUserId, userVO.getUserId()));
 
-				if (CollUtil.isNotEmpty(userSubList)) {
+				if (CollUtil.isNotEmpty(userSubList) && CollUtil.isNotEmpty(locations)) {
 					// 不同渠道认证信息列表
 					List<SysUserSubVO> certList = new ArrayList<>();
 					userSubList.forEach(sysUserSub -> {
 						SysUserSubVO userSubVO = BeanUtil.copyProperties(sysUserSub, SysUserSubVO.class, "certStatus");
+
+						// 不包含设置成未签约
+						if (!locations.contains(sysUserSub.getSubjectLocation())){
+							sysUserSub.setCertStatus(0);
+						}
+
 						userSubVO.setCertStatus(GigTypeEnum.getCertStatusByCode(sysUserSub.getGigType(), sysUserSub.getCertStatus()));
+						userSubVO.setCertStatusDisplay(String.format("%s:%s", sysUserSub.getSubjectLocation().getDescription(),GigTypeEnum.getCertStatusNameByCode(sysUserSub.getGigType(), sysUserSub.getCertStatus())));
 						certList.add(userSubVO);
 					});
 					userVO.setCertList(certList);

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/entity/vo/SysUserSubVO.java

@@ -57,6 +57,11 @@ public class SysUserSubVO {
 	 */
 	private String certStatus;
 
+	/**
+	 * 认证状态: 展示
+	 */
+	private String certStatusDisplay;
+
 	/**
 	 * 认证结果描述
 	 */