Merge branch 'zx_saas_director_0927' of http://git.dayaedu.com/yonge/mec into dev

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ExportServiceImpl.java

@@ -3404,10 +3404,10 @@ public class ExportServiceImpl implements ExportService {
             }
         });
         groupTypeConsumerMap1.put(GroupType.SPORADIC, (basicOrder) -> {
-            if (basicOrder.getType() != OrderTypeEnum.DEGREE_REGISTRATION && basicOrder.getChargeType() != null) {
-                if(basicOrder.getType() == DIRECTOR_TRAINING_CAMP){
-                    basicOrder.setSporadicType(SporadicChargeTypeEnum.DIRECTOR_TRAINING_CAMP.getMsg());
-                }else{
+            if(basicOrder.getType() == DIRECTOR_TRAINING_CAMP){
+                basicOrder.setSporadicType(SporadicChargeTypeEnum.DIRECTOR_TRAINING_CAMP.getMsg());
+            }else {
+                if (basicOrder.getType() != OrderTypeEnum.DEGREE_REGISTRATION && basicOrder.getChargeType() != null) {
                     for (SporadicChargeTypeEnum chargeType : SporadicChargeTypeEnum.values()) {
                         if (!chargeType.getCode().equals(basicOrder.getChargeType())) {
                             continue;