|
@@ -227,7 +227,8 @@ public class ExportController extends BaseController {
|
|
|
row.setSubjectName(studentRegistration.getSubjectName());
|
|
|
row.setSchoolName(studentRegistration.getSchoolName());
|
|
|
//更新数据后删除
|
|
|
- if (row.getType().equals(OrderTypeEnum.APPLY) && studentRegistration.getKitType() != null && studentRegistration.getKitType().equals("LEASE")) {
|
|
|
+ if (leaseFee.compareTo(BigDecimal.ZERO) >0 ||
|
|
|
+ row.getType().equals(OrderTypeEnum.APPLY) && studentRegistration.getKitType() != null && studentRegistration.getKitType().equals("LEASE")) {
|
|
|
row.setLeaseFee(musicalFee);
|
|
|
row.setMusicalFee(BigDecimal.ZERO);
|
|
|
}
|