yangdamao 1 год назад
Родитель
Сommit
5817681b85

+ 2 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseServiceImpl.java

@@ -1000,6 +1000,8 @@ public class CourseServiceImpl extends ServiceImpl<CourseMapper, Course> impleme
             goodsUserVo.setExamNum(classGradeVo.getExamNum());
             goodsUserVo.setRecordNum(classGradeVo.getRecordNum());
             goodsUserVo.setPeriodStatus(classGradeVo.getPeriodStatus());
+            goodsUserVo.setSignId(classGradeVo.getId());
+            goodsUserVo.setOfficialStatus(classGradeVo.getOfficialStatus());
         }
         return goodsUserVos;
     }

+ 3 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/vo/GoodsUserVo.java

@@ -451,4 +451,7 @@ public class GoodsUserVo {
 
 	@ApiModelProperty("失败原因")
 	private String pushFailReason;
+
+	@ApiModelProperty("标签Id")
+	private Long signId;
 }

+ 7 - 2
zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/ClassGradeServiceImpl.java

@@ -354,8 +354,13 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
                             }
                         });
                     }
-                    String sevenCode = getSevenCode(goodsId,add.getStudentUpper());
-                    add.setSevenCode(sevenCode);
+                    if (StringUtils.isNotBlank(bo.getOfficialName()) && ObjectUtils.isNotNull(bo.getClassStatus()) && bo.getClassStatus() == 1){
+                        add.setSevenCode(ServletUtils.getEncoded("SEV"));
+                    }else {
+                        String sevenCode = getSevenCode(goodsId,add.getStudentUpper());
+                        add.setSevenCode(sevenCode);
+                    }
+
             }
             else if (("继续教育二级建造师".equals(businessName)|| ("继续教育二级造价师".equals(businessName))) && sysTenant.getShareClass() == 1){
                 erJfalg = true;