fix 同步考试数据

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

@@ -48,4 +48,6 @@ public interface UserSubscribeMapper extends BaseMapper<UserSubscribe> {
     UserSubscribeVo getRecentExam(UserSubscribeQueryBo bo);
 
     Integer getConsoleTestSubscribeNum(ConsoleQueryBo bo);
+
+    List<UserSubscribeVo> selectApplyUserList(@Param("applyId") Long applyId);
 }

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

@@ -8,6 +8,7 @@ import com.zhongzheng.modules.user.vo.UserSubscribeIdsImportCheck;
 import com.zhongzheng.modules.user.vo.UserSubscribeImport;
 import com.zhongzheng.modules.user.vo.UserSubscribeVo;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.text.ParseException;
@@ -37,6 +38,8 @@ public interface IUserSubscribeService extends IService<UserSubscribe> {
 
 	List<UserSubscribeIdsImport> checkIdsDataFilter(UserSubscribeIdsImportCheck bo);
 
+	List<UserSubscribeVo> selectApplyUserList(Long applyId);
+
 	/**
 	 * 根据新增业务对象插入用户预约考试
 	 * @param bo 用户预约考试新增业务对象

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

@@ -196,6 +196,11 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
         return bo.getList();
     }
 
+    @Override
+    public List<UserSubscribeVo> selectApplyUserList(Long applyId) {
+        return this.baseMapper.selectApplyUserList(applyId);
+    }
+
     /**
      * 实体类转化成视图对象
      *
@@ -1204,11 +1209,7 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
                 userSubscribeImports.add(userSubscribeImport);
                 continue;
             }
-
-
             userSubscribeAddBo.setApplySiteAddressTrain(userSubscribeImport.getApplySiteAddressTrain());
-
-
             if (userSubscribeImport.getApplySiteExamTrainTime() != null||userSubscribeImport.getApplySiteExamTrainTime().length()!=10) {
                 try{
                     userSubscribeAddBo.setApplySiteExamTrainTime(Convert.toLong(DateUtils.dateTimeThrow("yyyy/MM/dd",userSubscribeImport.getApplySiteExamTrainTime()).getTime()/1000));

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

@@ -244,4 +244,20 @@ public class UserSubscribeVo {
 	@Excel(name = "考场名称")
 	@ApiModelProperty("考场名称")
 	private String roomName;
+	/** 身份证人像照 */
+	@Excel(name = "身份证人像照")
+	@ApiModelProperty("身份证人像照")
+	private String idCardImg1;
+	/** 身份证国徽照 */
+	@Excel(name = "身份证国徽照")
+	@ApiModelProperty("身份证国徽照")
+	private String idCardImg2;
+	/** 手机号码 */
+	@Excel(name = "手机号码")
+	@ApiModelProperty("手机号码")
+	private String telphone;
+	/** 智慧考场ID */
+	private Long centerId;
+	private String siteCode;
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/wisdom/service/IWisdomService.java

@@ -11,4 +11,6 @@ public interface IWisdomService {
     String authorization();
 
     void SiteList(Integer pageNo);
+
+    void syncApplyUserInfo(Long applyId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/wisdom/service/impl/WisdomServiceImpl.java

@@ -96,6 +96,8 @@ import com.zhongzheng.modules.user.mapper.UserStudyRecordMapper;
 import com.zhongzheng.modules.user.service.*;
 import com.zhongzheng.modules.user.vo.*;
 import com.zhongzheng.modules.wisdom.service.IWisdomService;
+import com.zhongzheng.modules.wisdom.vo.CenterVo;
+import com.zhongzheng.modules.wisdom.vo.ExamineesVo;
 import com.zhongzheng.modules.wisdom.vo.WisdomRoomVo;
 import com.zhongzheng.modules.wx.service.IWxLoginService;
 import net.polyv.live.v1.entity.channel.playback.LiveChannelVideoListResponse;
@@ -137,6 +139,9 @@ public class WisdomServiceImpl  implements IWisdomService {
     @Autowired
     private IExamSiteService iExamSiteService;
 
+    @Autowired
+    private IUserSubscribeService iUserSubscribeService;
+
     @Override
     public String authorization() {
         String key = "WISDOM_AUTH_CODE";
@@ -189,7 +194,6 @@ public class WisdomServiceImpl  implements IWisdomService {
                 List<WisdomRoomVo> list=jsonArray.toJavaList(WisdomRoomVo.class);
                 for (WisdomRoomVo vo : list){
                     iExamSiteService.insertByWisdomAddBo(vo);
-                    System.out.println(vo);
                 }
                 if(page>pageNo){
                     SiteList(pageNo++);
@@ -199,4 +203,50 @@ public class WisdomServiceImpl  implements IWisdomService {
             throw new CustomException("获取智慧考场考场列表失败");
         }
     }
+
+    @Override
+    public void syncApplyUserInfo(Long applyId) {
+
+        List<UserSubscribeVo> list = iUserSubscribeService.selectApplyUserList(applyId);
+        Map<Long,CenterVo> cMap = new HashMap<>();
+        List<CenterVo> cList = new ArrayList<>();
+        for(UserSubscribeVo vo : list){
+            ExamineesVo userVo = new ExamineesVo();
+            userVo.setExamineeCode(vo.getExamineeCode());
+            userVo.setIdNumber(vo.getIdCard());
+            userVo.setPhone_num(vo.getTelphone());
+            userVo.setExamineeName(vo.getRealname());
+            userVo.setIdCardImg1(vo.getIdCardImg1());
+            userVo.setIdCardImg2(vo.getIdCardImg2());
+            if(vo.getReportStatus()==0){
+                userVo.setReportStatus("未签署");
+            }
+            if(vo.getReportStatus()==1){
+                userVo.setReportStatus("已签署");
+            }
+            if(cMap.containsKey(vo.getCenterId())){
+                CenterVo centerVo = cMap.get(vo.getCenterId());
+                List<ExamineesVo> examinees = centerVo.getExaminees();
+                examinees.add(userVo);
+            }else{
+                List<ExamineesVo> examinees = new ArrayList<>();
+                examinees.add(userVo);
+                CenterVo centerVo = new CenterVo();
+                centerVo.setExaminees(examinees);
+                centerVo.setCenterId(vo.getCenterId());
+                centerVo.setExamCode(vo.getSiteCode());
+                cMap.put(vo.getCenterId(),centerVo);
+            }
+        }
+        Iterator<Long> iterator = cMap.keySet().iterator();
+        while (iterator.hasNext()) {
+            Long key = iterator.next();
+            CenterVo vo = cMap.get(key);
+            for(ExamineesVo userVo : vo.getExaminees()){
+
+            }
+            cList.add(vo);
+        }
+
+    }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/wisdom/vo/CenterVo.java

@@ -0,0 +1,20 @@
+package com.zhongzheng.modules.wisdom.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class CenterVo {
+    private static final long serialVersionUID = 1L;
+
+    private Long centerId;
+
+    private String examCode;
+
+    private List<ExamineesVo> examinees;
+
+    private String zipFileName;
+
+    private byte[] examineeZipFiles;
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/wisdom/vo/ExamineesVo.java

@@ -0,0 +1,24 @@
+package com.zhongzheng.modules.wisdom.vo;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class ExamineesVo {
+    private static final long serialVersionUID = 1L;
+
+    private String examineeCode;
+
+    private String idNumber;
+
+    private String examineeName;
+
+    private String phone_num;
+
+    private String reportStatus;
+
+    private String idCardImg1;
+
+    private String idCardImg2;
+}

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

@@ -82,6 +82,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="roomAddress" column="room_address"/>
         <result property="syncResult" column="sync_result"/>
         <result property="roomName" column="room_name"/>
+        <result property="telphone" column="telphone"/>
+        <result property="idCardImg1" column="id_card_img1"/>
+        <result property="idCardImg2" column="id_card_img2"/>
+        <result property="centerId" column="center_id"/>
+        <result property="siteCode" column="site_code"/>
     </resultMap>
 
     <select id="listSubscribe" parameterType="com.zhongzheng.modules.user.bo.UserSubscribeQueryBo" resultMap="UserSubscribeVo">
@@ -365,4 +370,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND us.create_time &lt; #{subEndTime}
         </if>
     </select>
+
+    <select id="selectApplyUserList" parameterType="map"  resultMap="UserSubscribeVo">
+        SELECT
+            us.*,
+               u.realname,
+               u.id_card,
+               u.telphone,
+               u.id_card_img1,
+               u.id_card_img2,
+               es.center_id,
+               es.code as site_code
+        FROM
+            user_subscribe us
+                LEFT JOIN `user` u on u.user_id =us.user_id
+                LEFT JOIN exam_site es on us.site_id = es.site_id
+        WHERE 1=1
+          and us.subscribe_status =1
+          and us.apply_id = #{applyId}
+          and es.from_plat = 2
+    </select>
 </mapper>