sumit

zhongzheng-system/src/main/java/com/zhongzheng/modules/middleground/record/service/impl/CdExamRoomServiceImpl.java

@@ -25,6 +25,7 @@ import com.zhongzheng.modules.middleground.tenant.service.IDataTenantService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -263,6 +264,10 @@ public class CdExamRoomServiceImpl extends ServiceImpl<CdExamRoomMapper, CdExamR
                         String format = String.format("%s(%s-%s)", content, examRoom.getExamStartTime(), examRoom.getExamEndTime());
                         examSubscribeVo.setExamTime(format);
                         examSubscribeVo.setExamStatus(cdExamSubscribe.getExamStatus());
+                        CdExamSite examSite = examSiteService.getById(examRoom.getExamSiteId());
+                        if (ObjectUtils.isNotNull(examSite)){
+                            examSubscribeVo.setExamSite(examSite.getSiteAddress());
+                        }
                         if (ObjectUtils.isNotNull(cdExamSubscribe.getPerformance())){
                             examSubscribeVo.setPerformance(cdExamSubscribe.getPerformance());
                             examSubscribeVo.setExamStatus(cdExamSubscribe.getResult());
@@ -301,7 +306,7 @@ public class CdExamRoomServiceImpl extends ServiceImpl<CdExamRoomMapper, CdExamR
     }
 
     @Override
-//    @Transactional(rollbackFor = Exception.class)
+    @Transactional(rollbackFor = Exception.class)
     public void batchSubscribe(BatchSubscribeBo bo) {
         //预约校验
         subscribeVerify(bo);
@@ -375,10 +380,11 @@ public class CdExamRoomServiceImpl extends ServiceImpl<CdExamRoomMapper, CdExamR
                         requstBo.setMajorName(item.getExamMajor());
                         requstBo.setOrderGoodsId(item.getOrderGoodsId());
                         String param = JSONObject.toJSONString(requstBo);
+                        JSONObject jsonObject = JSONObject.parseObject(param);
                         Map<String, String> headersMap = new HashMap<>();
                         headersMap.put("TenantId", getNewTenant(item.getTenantId(),1).getNewId().toString());
                         try {
-                            HttpUtils.sendPostHeader(EXAM_SUBSCRIBE_PATH, param,headersMap);
+                            HttpUtils.sendPostHeader(EXAM_SUBSCRIBE_PATH, jsonObject,headersMap);
                         }catch (Exception e){
                             //预约错误记录日志
                             CdExamErrorLog log = new CdExamErrorLog();
@@ -429,7 +435,7 @@ public class CdExamRoomServiceImpl extends ServiceImpl<CdExamRoomMapper, CdExamR
 
 
     @Override
-//    @Transactional(rollbackFor = Exception.class)
+    @Transactional(rollbackFor = Exception.class)
     public void batchCancelSubscribe(BatchCancelSubscribeBo bo) {
         List<CdExamSubscribe> subscribeList = new ArrayList<>();
         bo.getUserSubscribeIds().forEach(id -> {
@@ -487,10 +493,11 @@ public class CdExamRoomServiceImpl extends ServiceImpl<CdExamRoomMapper, CdExamR
                         requstBo.setMajorName(item.getExamMajor());
                         requstBo.setOrderGoodsId(item.getOrderGoodsId());
                         String param = JSONObject.toJSONString(requstBo);
+                        JSONObject jsonObject = JSONObject.parseObject(param);
                         Map<String, String> headersMap = new HashMap<>();
                         headersMap.put("TenantId", getNewTenant(item.getTenantId(),1).getNewId().toString());
                         try {
-                            HttpUtils.sendPostHeader(EXAM_SUBSCRIBE_CANCEL_PATH, param,headersMap);
+                            HttpUtils.sendPostHeader(EXAM_SUBSCRIBE_CANCEL_PATH, jsonObject,headersMap);
                         }catch (Exception e){
                             //预约错误记录日志
                             CdExamErrorLog log = new CdExamErrorLog();

zhongzheng-system/src/main/java/com/zhongzheng/modules/middleground/record/vo/CdUserExamSubscribeVo.java

@@ -35,6 +35,8 @@ public class CdUserExamSubscribeVo implements Serializable {
     private Integer subscribeStatus;
     @ApiModelProperty("考试时间")
     private String examTime;
+    @ApiModelProperty("考试地址")
+    private String examSite;
     @ApiModelProperty("考试状态:1通过 0不通过 2缺考 3作弊 4替考")
     private Integer examStatus;
     @ApiModelProperty("座位号")