|
@@ -3330,11 +3330,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());
|
|
|
}
|
|
|
}
|
|
|
});
|