Merge branch 'dev' of http://120.79.166.78:19005/zhongzheng-edu/saas_entrepot into dev

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

@@ -623,7 +623,7 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
                             paramMap.put("WorkTypeName", certInfoListItem.getWorkTypeName());
                             paramMap.put("productId", productsItem.getId().toString());
                             certInfoListItem.getTrainInfos().forEach(trainInfo->{
-                                if (bo.getTrainYear().equals(trainInfo.getTrainYear())){
+                                if (String.valueOf(cal.get(Calendar.YEAR)).equals(trainInfo.getTrainYear())){
                                     paramMap.put("trainPeriodDate", trainInfo.getTrainStartTime());
                                 }
                             });