merge

zhongzheng-api/src/main/java/com/zhongzheng/controller/exam/ExamApplyController.java

@@ -119,7 +119,7 @@ public class ExamApplyController extends BaseController {
     @ApiOperation("新增用户预约考试")
     @Log(title = "用户预约考试", businessType = BusinessType.INSERT)
     @PostMapping("save")
-    public AjaxResult<Long> saveApply(UserSubscribeAddBo bo) throws ParseException {
+    public AjaxResult<Long> saveApply(@RequestBody UserSubscribeAddBo bo) throws ParseException {
         ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
         bo.setUserId(loginUser.getUser().getUserId());
         return AjaxResult.success(iUserSubscribeService.saveByAddBo(bo));
@@ -144,7 +144,7 @@ public class ExamApplyController extends BaseController {
      */
     @ApiOperation("签署疫情防控承诺书")
     @PostMapping("/signReport")
-    public  AjaxResult<Void> signReport(UserSubscribeSignReportBo bo) {
+    public AjaxResult<Void> signReport(@RequestBody UserSubscribeSignReportBo bo) {
         ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
         bo.setUserId(loginUser.getUser().getUserId());
         bo.setPhone(loginUser.getUser().getTelphone());

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

@@ -26,7 +26,7 @@ public class UserSubscribeSignReportBo implements Serializable {
     @ApiModelProperty("身份证")
     private String idCard;
 
-    @ApiModelProperty("身份证")
+    @ApiModelProperty("考试开始时间")
     private String applySiteStartTime;
 
     @ApiModelProperty("专业")

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

@@ -194,9 +194,13 @@ public class UserMockSubscribeServiceImpl extends ServiceImpl<UserMockSubscribeM
         if (Validator.isNotEmpty(bo.getHandStatus()) && bo.getHandStatus() != 0) {
             update.setFirstHandTime(DateUtils.getNowTime());
         }
-        update.setUpdateTime(DateUtils.getNowTime());
-        SimpleDateFormat slf = new SimpleDateFormat("HH:mm:ss");
-        update.setApplySiteEndTime(slf.format(new Date()));
+        MockApply mockApply = iMockApplyService.getById(update.getApplyId());
+        if (ObjectUtils.isNotNull(mockApply.getMockActivity()) && mockApply.getMockActivity() == 1){
+            //活动模考
+            update.setUpdateTime(DateUtils.getNowTime());
+            SimpleDateFormat slf = new SimpleDateFormat("HH:mm:ss");
+            update.setApplySiteEndTime(slf.format(new Date()));
+        }
         return this.updateById(update);
     }
 

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

@@ -1904,14 +1904,17 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
         add.setExamineeCode(ServletUtils.getEncoded("ZS"+add.getUserId()));
         this.save(add);
         //签署疫情防控书
-        UserSubscribeSignReportBo reportBo = new UserSubscribeSignReportBo();
-        reportBo.setSubscribeId(add.getSubscribeId());
-        User user = iUserService.getById(bo.getUserId());
-        reportBo.setUserId(bo.getUserId());
-        reportBo.setPhone(user.getTelphone());
-        reportBo.setIdCard(user.getIdCard());
-        reportBo.setSignImageStr(bo.getSignImageStr());
-        this.signReport(reportBo);
+        if (org.apache.commons.lang3.StringUtils.isNotBlank(bo.getSignImageStr())){
+            UserSubscribeSignReportBo reportBo = new UserSubscribeSignReportBo();
+            reportBo.setSubscribeId(add.getSubscribeId());
+            User user = iUserService.getById(bo.getUserId());
+            reportBo.setUserId(bo.getUserId());
+            reportBo.setPhone(user.getTelphone());
+            reportBo.setIdCard(user.getIdCard());
+            reportBo.setSignImageStr(bo.getSignImageStr());
+            this.signReport(reportBo);
+        }
+
         //发送预约考试消息
         sendExamSucceed(bo);
         return add.getSubscribeId();