Merge remote-tracking branch 'origin/master'

mec-web/src/main/java/com/ym/mec/web/controller/ExportController.java

@@ -20,6 +20,7 @@ import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.lang3.StringUtils;
@@ -1119,8 +1120,11 @@ public class ExportController extends BaseController {
                     }
                     row.setDegreeFee(row.getActualAmount().subtract(row.getVipCourseFee()).subtract(row.getPracticeCourseFee()).subtract(row.getTheoryCourseFee()));
                 } else {
-                    row.setOtherFee(row.getActualAmount());
-                }
+                    if(row.getChargeType() != null && SporadicChargeTypeEnum.LEVEL.getCode().equals(row.getChargeType())){
+                        row.setDegreeFee(row.getActualAmount());
+                    }else {
+                        row.setOtherFee(row.getActualAmount());
+                    }                }
                 if (row.getChargeType() != null) {
                     for (SporadicChargeTypeEnum chargeType : SporadicChargeTypeEnum.values()) {
                         if (!chargeType.getCode().equals(row.getChargeType())) continue;
@@ -2257,7 +2261,11 @@ public class ExportController extends BaseController {
                     }
                     row.setDegreeFee(row.getActualAmount().subtract(row.getVipCourseFee()).subtract(row.getPracticeCourseFee()).subtract(row.getTheoryCourseFee()));
                 } else {
-                    row.setOtherFee(row.getActualAmount());
+                    if(row.getChargeType() != null && SporadicChargeTypeEnum.LEVEL.getCode().equals(row.getChargeType())){
+                        row.setDegreeFee(row.getActualAmount());
+                    }else {
+                        row.setOtherFee(row.getActualAmount());
+                    }
                 }
                 if (row.getChargeType() != null) {
                     for (SporadicChargeTypeEnum chargeType : SporadicChargeTypeEnum.values()) {