fix 证书

zhongzheng-system/src/main/java/com/zhongzheng/modules/alioss/bo/OssRequest.java

@@ -29,4 +29,7 @@ public class OssRequest{
 
     @ApiModelProperty("用户ID")
     private Long userId;
+
+    @ApiModelProperty("班级ID")
+    private Long gradeId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/alioss/service/impl/OssServiceImpl.java

@@ -103,8 +103,12 @@ public class OssServiceImpl implements OssService {
 
 
     public String generateRandomFilename(OssRequest ossRequest) {
-        if(Validator.isEmpty(ossRequest.getUserId())){
-            ossRequest.setUserId(0L);
+        String prefixName = "";
+        if(Validator.isNotEmpty(ossRequest.getUserId())){
+            prefixName = prefixName + ossRequest.getUserId()+"/";
+        }
+        if(Validator.isNotEmpty(ossRequest.getGradeId())){
+            prefixName = prefixName + ossRequest.getGradeId()+"/";
         }
         String RandomFilename = "";
         //生成随机数
@@ -120,28 +124,28 @@ public class OssServiceImpl implements OssService {
         RandomFilename = now + String.valueOf(random > 0 ? random : (-1) * random);
         switch(ossRequest.getImageStatus()){
             case 0 :
-                RandomFilename = "avatar"+"/"+ossRequest.getUserId()+"/"+sdf.format(new Date())+"/"+now;
+                RandomFilename = "avatar"+"/"+prefixName+sdf.format(new Date())+"/"+now;
                 break;
             case 1 :
-                RandomFilename = "IDNumber"+"/"+ossRequest.getUserId()+"/"+sdf.format(new Date())+"/"+now;
+                RandomFilename = "IDNumber"+"/"+prefixName+sdf.format(new Date())+"/"+now;
                 break;
             case 2 :
-                RandomFilename = "QuestionBank"+ossRequest.getUserId()+"/"+"/"+sdf.format(new Date())+"/"+now;
+                RandomFilename = "QuestionBank"+prefixName+sdf.format(new Date())+"/"+now;
                 break;
             case 3 :
-                RandomFilename = "guide"+"/"+ossRequest.getUserId()+"/"+sdf.format(new Date())+"/"+now;
+                RandomFilename = "guide"+"/"+prefixName+sdf.format(new Date())+"/"+now;
                 break;
             case 4 :
-                RandomFilename = "advertising"+ossRequest.getUserId()+"/"+"/"+sdf.format(new Date())+"/"+now;
+                RandomFilename = "advertising"+prefixName+sdf.format(new Date())+"/"+now;
                 break;
             case 5 :
-                RandomFilename = "IDCard"+"/"+ossRequest.getUserId()+"/"+sdf.format(new Date())+"/"+now;
+                RandomFilename = "IDCard"+"/"+prefixName+sdf.format(new Date())+"/"+now;
                 break;
             case 6 :
-                RandomFilename = "file"+"/"+ossRequest.getUserId()+"/"+sdf.format(new Date())+"/"+now;
+                RandomFilename = "file"+"/"+prefixName+sdf.format(new Date())+"/"+now;
                 break;
             case 7 :
-                RandomFilename = "certificate"+"/"+ossRequest.getUserId()+"/"+sdf.format(new Date())+"/"+now;
+                RandomFilename = "certificate"+"/"+prefixName+sdf.format(new Date())+"/"+now;
                 break;
         }
 

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

@@ -32,7 +32,7 @@ public interface UserSubscribeMapper extends BaseMapper<UserSubscribe> {
 
     Long selectSubscribeId(@Param("applyId") Long applyId,@Param("goodsId") Long goodsId,@Param("userId")  Long userId);
 
-    Long selectSubscribeUpdateId(@Param("applyId") Long applyId,@Param("goodsId") Long goodsId,@Param("userId")  Long userId,@Param("applySiteExamTime")  Long applySiteExamTime,@Param("applySiteStartTime")  String applySiteStartTime,@Param("applySiteEndTime")  String applySiteEndTime,@Param("applySiteAddress")  String applySiteAddress);
+    UserSubscribeVo selectSubscribeUpdateId(@Param("applyId") Long applyId,@Param("goodsId") Long goodsId,@Param("userId")  Long userId,@Param("applySiteExamTime")  Long applySiteExamTime,@Param("applySiteStartTime")  String applySiteStartTime,@Param("applySiteEndTime")  String applySiteEndTime,@Param("applySiteAddress")  String applySiteAddress);
 
     Long selectAddSubscribeId(@Param("applyId") Long applyId,@Param("goodsId") Long goodsId,@Param("userId")  Long userId);
 

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

@@ -705,7 +705,16 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
                 userSubscribeImports.add(userSubscribeImport);
                 continue;
             }
-
+            //查看是否有无考试记录
+            ExamApplyQueryBo applyQueryBo = new ExamApplyQueryBo();
+            applyQueryBo.setUserId(userId);
+            applyQueryBo.setGoodsId(goodsId);
+            Integer countHaveSubscribeNext = examApplyMapper.countHaveSubscribeNext(applyQueryBo);
+            if(countHaveSubscribeNext<1){
+                userSubscribeImport.setStudentTypeName("非补考学员");
+            }else{
+                userSubscribeImport.setStudentTypeName("补考学员");
+            }
 
             String importNo = ServletUtils.getEncoded("IMPORT");
             userSubscribeAddBo.setImportNo(importNo);
@@ -1000,7 +1009,16 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
                 userSubscribeImports.add(userSubscribeImport);
                 continue;
             }
-
+            //查看是否有无考试记录
+            ExamApplyQueryBo applyQueryBo = new ExamApplyQueryBo();
+            applyQueryBo.setUserId(userId);
+            applyQueryBo.setGoodsId(goodsId);
+            Integer countHaveSubscribeNext = examApplyMapper.countHaveSubscribeNext(applyQueryBo);
+            if(countHaveSubscribeNext<1){
+                userSubscribeImport.setStudentTypeName("非补考学员");
+            }else{
+                userSubscribeImport.setStudentTypeName("补考学员");
+            }
 
             String importNo = ServletUtils.getEncoded("IMPORT");
             userSubscribeAddBo.setImportNo(importNo);
@@ -1039,7 +1057,7 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
         for (UserSubscribeImport userSubscribeImport : userSubscribeImportList) {
             UserSubscribe userSbusciEditBo = new UserSubscribe();
             if (StringUtils.isEmpty(userSubscribeImport.getApplyName()) ||StringUtils.isEmpty(userSubscribeImport.getApplySiteAddress())){
-                userSubscribeImport.setCause("考试信息错误");
+                userSubscribeImport.setCause("考试标题或者考试地点错误");
                 userSubscribeImports.add(userSubscribeImport);
                 continue;
             }
@@ -1223,13 +1241,23 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
                 continue;
             }
 
-            Long subscribeId = baseMapper.selectSubscribeUpdateId(applyId, goodsId, userId,userSbusciEditBo.getApplySiteExamTime(),userSbusciEditBo.getApplySiteStartTime(),userSbusciEditBo.getApplySiteEndTime(),userSbusciEditBo.getApplySiteAddress());
-            if (Validator.isEmpty(subscribeId)) {
+            UserSubscribeVo userSubscribeVo = baseMapper.selectSubscribeUpdateId(applyId, goodsId, userId,userSbusciEditBo.getApplySiteExamTime(),userSbusciEditBo.getApplySiteStartTime(),userSbusciEditBo.getApplySiteEndTime(),userSbusciEditBo.getApplySiteAddress());
+            if (Validator.isEmpty(userSubscribeVo)) {
                 userSubscribeImport.setCause("该学员在考试计划中无预约数据，请确认该学员已预约考试");
                 userSubscribeImports.add(userSubscribeImport);
                 continue;
             }
-            userSbusciEditBo.setSubscribeId(subscribeId);
+            if(Validator.isNotEmpty(userSubscribeVo.getStudentType())){
+                if(userSubscribeVo.getStudentType()==1){
+                    userSubscribeImport.setStudentTypeName("非补考学员");
+                }
+                if(userSubscribeVo.getStudentType()==2){
+                    userSubscribeImport.setStudentTypeName("补考学员");
+                }
+            }
+            userSbusciEditBo.setSubscribeId(userSubscribeVo.getSubscribeId());
+
+
 
           /*  ExamApplyQueryBo queryTimeBo = new ExamApplyQueryBo();
             queryTimeBo.setApplySiteId(applyId);

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

@@ -199,9 +199,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             LIMIT 1
     </select>
 
-    <select id="selectSubscribeUpdateId" parameterType="map"  resultType="Long">
+    <select id="selectSubscribeUpdateId" parameterType="map"  resultMap="UserSubscribeVo">
         SELECT
-            us.subscribe_id
+            us.*
         FROM
             user_subscribe us
         WHERE 1=1