fix 报考数据

zhongzheng-admin/src/main/java/com/zhongzheng/controller/user/UserSubscribeController.java

@@ -39,7 +39,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 /**
  * 用户预约考试Controller
- * 
+ *
  * @author ruoyi
  * @date 2021-12-07
  */
@@ -144,4 +144,17 @@ public class UserSubscribeController extends BaseController {
         return AjaxResult.successNoMsg(userSubscribeImport1);
     }
 
+    /**
+     * 查询报考数据用户列表
+     */
+    @ApiOperation("查询报考数据用户列表")
+    @PreAuthorize("@ss.hasPermi('system:subscribe:list')")
+    @GetMapping("/listUser")
+    public TableDataInfo<UserSubscribeVo> listSubscribeByUser(UserSubscribeQueryBo bo) {
+        startPage();
+        List<UserSubscribeVo> list = iUserSubscribeService.listSubscribeByUser(bo);
+        return getDataTable(list);
+    }
+
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserSubscribeQueryBo.java

@@ -6,6 +6,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.util.Date;
+import java.util.List;
 import java.util.Map;
 import java.util.HashMap;
 
@@ -84,7 +85,7 @@ public class UserSubscribeQueryBo extends BaseEntity {
 	private Integer examExpend;
 	/** 1 前培次数消耗 */
 	@ApiModelProperty("1 前培次数消耗")
-	private Integer beforeExpend;	
+	private Integer beforeExpend;
 
 	/** 1 前培次数消耗 */
 	@ApiModelProperty("前培id")
@@ -95,4 +96,8 @@ public class UserSubscribeQueryBo extends BaseEntity {
 
 	@ApiModelProperty("查询超过过期时间，考试次数 1过期 2不过期")
 	private Long exceedExamExpend;
+
+	/** 身份证号 */
+	@ApiModelProperty("身份证号列表")
+	private List<String> idCards;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/mapper/UserSubscribeMapper.java

@@ -33,4 +33,6 @@ public interface UserSubscribeMapper extends BaseMapper<UserSubscribe> {
     List<UserSubscribeVo> timeSend();
 
     Long sendExamSucceed(Long goodsId);
+
+    List<UserSubscribeVo> listSubscribeByUser(UserSubscribeQueryBo bo);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/IUserSubscribeService.java

@@ -61,4 +61,6 @@ public interface IUserSubscribeService extends IService<UserSubscribe> {
 	List<UserSubscribeImport> importUpdateData(List<UserSubscribeImport> userSubscribeImportList);
 
 	List<UserSubscribeVo> timeSend();
+
+	List<UserSubscribeVo> listSubscribeByUser(UserSubscribeQueryBo bo);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserSubscribeServiceImpl.java

@@ -880,4 +880,9 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
     public List<UserSubscribeVo> timeSend() {
         return baseMapper.timeSend();
     }
+
+    @Override
+    public List<UserSubscribeVo> listSubscribeByUser(UserSubscribeQueryBo bo) {
+        return baseMapper.listSubscribeByUser(bo);
+    }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/UserSubscribeVo.java

@@ -177,4 +177,6 @@ public class UserSubscribeVo {
 	@Excel(name = "剩余前培次数")
 	@ApiModelProperty("剩余前培次数")
 	private Long beforeCount;
+
+
 }

zhongzheng-system/src/main/resources/mapper/modules/grade/ClassGradeUserMapper.xml

@@ -243,8 +243,8 @@
         <if test="userPhoto != null and userPhoto == 1">
         up.key_value,
         </if>
-        cgu.period_time as end_time
-        ,(SELECT COUNT(DISTINCT ubr.module_id,ubr.chapter_id,ubr.exam_id) FROM user_bank_record ubr  where ubr.`status`=1 and ubr.report_status=1 and ubr.grade_id = cgu.grade_id and ubr.user_id = cgu.user_id and ubr.current_status = 1) as record_num
+        cgu.period_time as end_time,
+        (SELECT COUNT(DISTINCT ubr.module_id,ubr.chapter_id,ubr.exam_id) FROM user_bank_record ubr  where ubr.`status`=1 and ubr.report_status=1 and ubr.grade_id = cgu.grade_id and ubr.user_id = cgu.user_id and ubr.current_status = 1) as record_num
         <if test="userPhoto == null">
       ,(select COUNT(up.id) from user_period up LEFT JOIN user_period_status ups on up.id=ups.period_id where up.goods_id = (SELECT cgg.goods_id FROM class_grade_goods cgg where cg.grade_id=cgg.grade_id) and up.grade_id = cgu.grade_id and up.user_id = u.user_id
         and ups.period_status=0 and ups.`status`=0 and (SELECT COUNT(upss.id) from user_period_status upss where upss.id = ups.id and upss.period_status = 1 and upss.`status` = 2) > 0 ) as rebuild_num

zhongzheng-system/src/main/resources/mapper/modules/user/UserSubscribeMapper.xml

@@ -59,17 +59,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="applyEndTime" column="apply_end_time"/>
         <result property="businessId" column="business_id"/>
         <result property="beforeCount" column="before_count"/>
+        <result property="beforeName" column="before_name"/>
     </resultMap>
 
     <select id="listSubscribe" parameterType="com.zhongzheng.modules.user.bo.UserSubscribeQueryBo" resultMap="UserSubscribeVo">
         SELECT
-        us.*,
+        us.*, eb.before_name,
             (SELECT g.goods_name FROM goods g where us.goods_id = g.goods_id) as goods_name,
             (SELECT g.code FROM goods g where us.goods_id = g.goods_id) as goods_code,
             (SELECT g.stand_price FROM goods g where us.goods_id = g.goods_id) as stand_price,
             (SELECT m.category_name FROM goods g LEFT JOIN major m on g.major_id= m.id where us.goods_id = g.goods_id) as category_name,
-            (SELECT u.realname FROM `user` u where us.user_id = u.user_id) as realname,
-            (SELECT u.id_card FROM `user` u where us.user_id = u.user_id) as id_card,
+            u.realname,
+            u.id_card,
             (SELECT ea.apply_name FROM exam_apply ea where ea.apply_id = us.apply_id) as apply_name,
             (SELECT ea.apply_start_time FROM exam_apply ea where ea.apply_id = us.apply_id) as apply_start_time,
             (SELECT ea.apply_end_time FROM exam_apply ea where ea.apply_id = us.apply_id) as apply_end_time,
@@ -77,8 +78,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         (SELECT ueg.do_number-ueg.expend_before FROM user_exam_goods ueg where ueg.goods_id = us.goods_id and ueg.user_id = us.user_id) as before_count
         FROM
             user_subscribe us
+        LEFT JOIN  exam_before eb ON us.before_id = eb.before_id
+        LEFT JOIN  `user` u ON us.user_id = u.user_id
+
         WHERE
             1 =1
+        <if test="idCards != null and idCards.size()!=0 ">
+            AND u.id_card in
+            <foreach collection="idCards" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
         <if test="userId != null and userId != '' ">
             and us.user_id = #{userId}
         </if>
@@ -193,4 +203,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where 1=1
           and g.goods_id = #{goodsId}
     </select>
-</mapper>
+
+    <select id="listSubscribeByUser" parameterType="com.zhongzheng.modules.user.bo.UserSubscribeQueryBo" resultMap="UserSubscribeVo">
+        SELECT
+            us.user_id,
+            u.realname,
+            u.id_card
+        FROM
+                ( SELECT user_id FROM user_subscribe GROUP BY user_id ) us
+                    LEFT JOIN `user` u ON us.user_id = u.user_id
+    </select>
+</mapper>