Kaynağa Gözat

feat: 积分包结算管理新增身份证号,众包任务审核新增手机号、积分包编号

李学松 2 yıl önce
ebeveyn
işleme
b303675d58

+ 5 - 0
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/entity/WmScorePackageStatus.java

@@ -176,4 +176,9 @@ public class WmScorePackageStatus extends Model<WmScorePackageStatus> {
 	 */
 	@TableField(exist = false)
 	private List<String> teamIdList;
+
+	/**
+	 * 积分包编号
+	 */
+	private String packageSn;
 }

+ 5 - 0
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/entity/input/WmScorePackageSettleOutput.java

@@ -58,6 +58,11 @@ public class WmScorePackageSettleOutput {
 
 	private String userPhones;
 
+	/**
+	 * 身份证号
+	 */
+	private String idCardNums;
+
 	private String subType;
 
 	private SubjectLocation subjectLocation;

+ 4 - 0
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmScorePackageServiceImpl.java

@@ -19,6 +19,7 @@ package com.qunzhixinxi.hnqz.admin.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.DesensitizedUtil;
 import cn.hutool.core.util.RandomUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.csp.sentinel.util.StringUtil;
@@ -1745,6 +1746,9 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 				List<SysUser> users = sysUserMapper.selectList(Wrappers.<SysUser>lambdaQuery().in(SysUser::getUserId, userIds));
 				String userPhones = users.stream().map(SysUser::getUsername).collect(Collectors.joining(","));
 				ouPut.setUserPhones(userPhones);
+				// 脱敏的身份证号
+				String idCardNums = users.stream().map(user -> DesensitizedUtil.idCardNum(user.getIdCardNumber(), 5, 4)).collect(Collectors.joining(","));
+				ouPut.setIdCardNums(idCardNums);
 			}
 			// 查询结算成功时间
 			List<WmScorePackageSettleNote> packageSettleNoteList = settleNoteMapper.selectList(Wrappers.<WmScorePackageSettleNote>lambdaQuery()

+ 2 - 1
hnqz-upms/hnqz-upms-biz/src/main/resources/mapper/WmScorePackageStatusMapper.xml

@@ -39,6 +39,7 @@
 	  					<result property="phone" column="phone"/>
 	  					<result property="userScore" column="user_score"/>
 	 				 	<result property="enableType" column="enable_type"/>
+	 				 	<result property="packageSn" column="package_sn"/>
 	  <result property="taskAddFlag" column="task_add_flag"/>
 	  <result property="taskNum" column="task_num"/>
 
@@ -149,7 +150,7 @@
 
 
 	<select id="getWmScorePackageStatusPage" resultMap="wmScorePackageStatusMap">
-		select distinct s.*,p.score_package_name from wm_score_package_status s
+		select distinct s.*,p.score_package_name, p.pkg_sn as package_sn, u1.username as phone from wm_score_package_status s
 		left join  wm_score_package p on p.id=s.package_id
 		left join sys_user u on u.dept_id=p.send_package_dept_id
 		left join sys_user u1 on u1.user_id = s.user_id