IMERGE

zhongzheng-common/src/main/java/com/zhongzheng/common/utils/ToolsUtils.java

@@ -271,7 +271,7 @@ public class ToolsUtils {
         // 0 代表前面补充0
         // num 代表长度为4
         // d 代表参数为正数型
-        result = String.format("%0" + num + "d", Integer.parseInt(code) + 1);
+        result = String.format("%0" + num + "d", Integer.parseInt(code));
 
         return result;
     }

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

@@ -154,4 +154,6 @@ public class UserSubscribeAddBo {
     /** 签署承诺书时间 */
     @ApiModelProperty("签署承诺书时间")
     private Long reportFileTime;
+
+
 }

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

@@ -236,7 +236,7 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
         }
         ExamApplyQueryBo applyQueryBo = new ExamApplyQueryBo();
         applyQueryBo.setUserId(bo.getUserId());
-        applyQueryBo.setGoodsId(bo.getGoodsId());
+        applyQueryBo.setOrderGoodsId(add.getOrderGoodsId());
         //查询剩余考试次数
         Integer residueSubscribeNext = examApplyMapper.residueSubscribeNext(applyQueryBo);
         if (residueSubscribeNext == null || residueSubscribeNext < 1){
@@ -260,7 +260,7 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
         add.setExamStatus(0);
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
-        add.setExamineeCode(ServletUtils.getEncoded("ZZ"+ ToolsUtils.autoGenericCode(String.valueOf(add.getApplyId()),3) +ToolsUtils.autoGenericCode(String.valueOf(add.getUserId()),3)));
+        add.setExamineeCode(ServletUtils.getEncoded("ZZ"+ ToolsUtils.autoGenericCode(String.valueOf(add.getApplyId()),4) +ToolsUtils.autoGenericCode(String.valueOf(add.getUserId()),4)));
         this.save(add);
         //发送预约考试消息
         sendExamSucceed(bo);
@@ -849,7 +849,7 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
             //查询剩余考试次数
             ExamApplyQueryBo examApplyQueryBo = new ExamApplyQueryBo();
             examApplyQueryBo.setUserId(userId);
-            examApplyQueryBo.setGoodsId(goodsId);
+            examApplyQueryBo.setOrderGoodsId(classGradeVo.getOrderGoodsId());
             Integer residueSubscribeNext = examApplyMapper.residueSubscribeNext(examApplyQueryBo);
             if (residueSubscribeNext == null || residueSubscribeNext < 1){
                 userSubscribeImport.setCause("剩余考试次数不足");
@@ -1079,7 +1079,7 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
             //查询剩余考试次数
             ExamApplyQueryBo examApplyQueryBo = new ExamApplyQueryBo();
             examApplyQueryBo.setUserId(userId);
-            examApplyQueryBo.setGoodsId(goodsId);
+            examApplyQueryBo.setOrderGoodsId(classGradeVo.getOrderGoodsId());
             Integer residueSubscribeNext = examApplyMapper.residueSubscribeNext(examApplyQueryBo);
             if (residueSubscribeNext == null || residueSubscribeNext < 1){
                 userSubscribeImport.setCause("剩余考试次数不足");

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

@@ -290,12 +290,15 @@ public class WisdomServiceImpl  implements IWisdomService {
                 ZipOutputStream outStream = new ZipOutputStream(new FileOutputStream(zipFile));
                 List<FileBean> fileBeanList = new ArrayList<>();
                 for(Map<String, Object> userVo : vo.getExaminees()){
+                    if(Validator.isEmpty(userVo.get("idCardImg1"))||Validator.isEmpty(userVo.get("idCardImg2"))){
+                        continue;
+                    }
                     FileBean f1 = new FileBean();
-                    String idCardImg1 = Validator.isEmpty(userVo.get("idCardImg1"))?null:String.valueOf(userVo.get("idCardImg1"));
+                    String idCardImg1 = String.valueOf(userVo.get("idCardImg1"));
                     f1.setPath(idCardImg1);
                     f1.setFileName(userVo.get("examineeCode")+"_0.jpg");
                     FileBean f2 = new FileBean();
-                    String idCardImg2 = Validator.isEmpty(userVo.get("idCardImg2"))?null:String.valueOf(userVo.get("idCardImg2"));
+                    String idCardImg2 = String.valueOf(userVo.get("idCardImg2"));
                     f2.setPath(idCardImg2);
                     f2.setFileName(userVo.get("examineeCode")+"_1.jpg");
                     fileBeanList.add(f1);