Browse Source

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

zouxuan 10 months ago
parent
commit
d0fe08742e

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

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