|
|
@@ -262,7 +262,6 @@ public class FinancialExpenditureServiceImpl extends BaseServiceImpl<Long, Finan
|
|
|
for (OaColumnDto column : columns) {
|
|
|
List<OaInputDto> columnList = column.getList();
|
|
|
if(columnList != null && columnList.size() > 0){
|
|
|
-
|
|
|
Employee employee = employeeDao.get(pWorkOrderInfo.getCreator());
|
|
|
List<SimpleUserDto> byIds = new ArrayList<>();
|
|
|
if(employee != null){
|
|
|
@@ -280,37 +279,37 @@ public class FinancialExpenditureServiceImpl extends BaseServiceImpl<Long, Finan
|
|
|
String name = inputDto.getName();
|
|
|
if(name.contains("课程组编号")){
|
|
|
Object o = hashMap.get(inputDto.getModel());
|
|
|
- if(o != null){
|
|
|
+ if(Objects.nonNull(o) && StringUtils.isNotEmpty(o.toString())){
|
|
|
financialExpenditure.setVipGroupId(Long.parseLong(o.toString()));
|
|
|
continue;
|
|
|
}
|
|
|
}else if(name.contains("课程类型")){
|
|
|
Object o = hashMap.get(inputDto.getModel());
|
|
|
- if(o != null){
|
|
|
+ if(Objects.nonNull(o) && StringUtils.isNotEmpty(o.toString())){
|
|
|
financialExpenditure.setGroupType(o.toString());
|
|
|
continue;
|
|
|
}
|
|
|
}else if(name.contains("乐团编号")){
|
|
|
Object o = hashMap.get(inputDto.getModel());
|
|
|
- if(o != null){
|
|
|
+ if(Objects.nonNull(o) && StringUtils.isNotEmpty(o.toString())){
|
|
|
financialExpenditure.setMusicGroupId(o.toString());
|
|
|
continue;
|
|
|
}
|
|
|
}else if(name.contains("退费项目")){
|
|
|
Object o = hashMap.get(inputDto.getModel());
|
|
|
- if(o != null){
|
|
|
+ if(Objects.nonNull(o) && StringUtils.isNotEmpty(o.toString())){
|
|
|
financialExpenditure.setReturnFeeType(o.toString());
|
|
|
continue;
|
|
|
}
|
|
|
}else if(name.contains("学员编号")){
|
|
|
Object o = hashMap.get(inputDto.getModel());
|
|
|
- if(o != null){
|
|
|
+ if(Objects.nonNull(o) && StringUtils.isNotEmpty(o.toString())){
|
|
|
financialExpenditure.setStudentId(Integer.parseInt(o.toString()));
|
|
|
continue;
|
|
|
}
|
|
|
}else if(name.contains("分部")){
|
|
|
Object o = hashMap.get(inputDto.getModel());
|
|
|
- if(o != null){
|
|
|
+ if(Objects.nonNull(o) && StringUtils.isNotEmpty(o.toString())){
|
|
|
int organId = Integer.parseInt(o.toString());
|
|
|
Organization organization = organizationDao.get(organId);
|
|
|
if(organization != null){
|
|
|
@@ -321,25 +320,25 @@ public class FinancialExpenditureServiceImpl extends BaseServiceImpl<Long, Finan
|
|
|
}
|
|
|
}else if(name.contains("金额")){
|
|
|
Object o = hashMap.get(inputDto.getModel());
|
|
|
- if(o != null){
|
|
|
+ if(Objects.nonNull(o) && StringUtils.isNotEmpty(o.toString())){
|
|
|
financialExpenditure.setAmount(new BigDecimal(Double.parseDouble(o.toString())));
|
|
|
continue;
|
|
|
}
|
|
|
}else if(name.contains("情况说明")){
|
|
|
Object o = hashMap.get(inputDto.getModel());
|
|
|
- if(o != null){
|
|
|
+ if(Objects.nonNull(o) && StringUtils.isNotEmpty(o.toString())){
|
|
|
financialExpenditure.setCause(o.toString());
|
|
|
continue;
|
|
|
}
|
|
|
}else if(name.contains("支出类型")){
|
|
|
Object o = hashMap.get(inputDto.getModel());
|
|
|
- if(o != null){
|
|
|
+ if(Objects.nonNull(o) && StringUtils.isNotEmpty(o.toString())){
|
|
|
financialExpenditure.setType(ExpenditureTypeEnum.valueOfDesc(o.toString()));
|
|
|
continue;
|
|
|
}
|
|
|
}else if(name.contains("费用类型")){
|
|
|
Object o = hashMap.get(inputDto.getModel());
|
|
|
- if(o != null){
|
|
|
+ if(Objects.nonNull(o) && StringUtils.isNotEmpty(o.toString())){
|
|
|
financialExpenditure.setFeeProject(FeeProjectEnum.valueOfDesc(o.toString()));
|
|
|
continue;
|
|
|
}
|
|
|
@@ -450,25 +449,25 @@ public class FinancialExpenditureServiceImpl extends BaseServiceImpl<Long, Finan
|
|
|
String name = oaInputDto.getName();
|
|
|
if(name.contains("金额")){
|
|
|
Object o = formData.get(oaInputDto.getModel());
|
|
|
- if(o != null){
|
|
|
+ if(Objects.nonNull(o) && StringUtils.isNotEmpty(o.toString())){
|
|
|
financialExpenditure.setAmount(new BigDecimal(Double.parseDouble(o.toString())));
|
|
|
continue;
|
|
|
}
|
|
|
}else if(name.contains("情况说明")){
|
|
|
Object o = formData.get(oaInputDto.getModel());
|
|
|
- if(o != null){
|
|
|
+ if(Objects.nonNull(o) && StringUtils.isNotEmpty(o.toString())){
|
|
|
financialExpenditure.setCause(o.toString());
|
|
|
continue;
|
|
|
}
|
|
|
}else if(name.contains("支出类型")){
|
|
|
Object o = formData.get(oaInputDto.getModel());
|
|
|
- if(o != null){
|
|
|
+ if(Objects.nonNull(o) && StringUtils.isNotEmpty(o.toString())){
|
|
|
financialExpenditure.setType(ExpenditureTypeEnum.valueOfDesc(o.toString()));
|
|
|
continue;
|
|
|
}
|
|
|
}else if(name.contains("费用类型")){
|
|
|
Object o = formData.get(oaInputDto.getModel());
|
|
|
- if(o != null){
|
|
|
+ if(Objects.nonNull(o) && StringUtils.isNotEmpty(o.toString())){
|
|
|
financialExpenditure.setFeeProject(FeeProjectEnum.valueOfDesc(o.toString()));
|
|
|
continue;
|
|
|
}
|
|
|
@@ -515,25 +514,25 @@ public class FinancialExpenditureServiceImpl extends BaseServiceImpl<Long, Finan
|
|
|
String name = inputDto.getName();
|
|
|
if(name.contains("课程组编号")){
|
|
|
Object o = hashMap.get(inputDto.getModel());
|
|
|
- if(o != null){
|
|
|
+ if(Objects.nonNull(o) && StringUtils.isNotEmpty(o.toString())){
|
|
|
financialExpenditure.setVipGroupId(Long.parseLong(o.toString()));
|
|
|
continue;
|
|
|
}
|
|
|
}else if(name.contains("课程类型")){
|
|
|
Object o = hashMap.get(inputDto.getModel());
|
|
|
- if(o != null){
|
|
|
+ if(Objects.nonNull(o) && StringUtils.isNotEmpty(o.toString())){
|
|
|
financialExpenditure.setGroupType(o.toString());
|
|
|
continue;
|
|
|
}
|
|
|
}else if(name.contains("乐团编号")){
|
|
|
Object o = hashMap.get(inputDto.getModel());
|
|
|
- if(o != null){
|
|
|
+ if(Objects.nonNull(o) && StringUtils.isNotEmpty(o.toString())){
|
|
|
financialExpenditure.setMusicGroupId(o.toString());
|
|
|
continue;
|
|
|
}
|
|
|
}else if(name.contains("学员编号")){
|
|
|
Object o = hashMap.get(inputDto.getModel());
|
|
|
- if(o != null){
|
|
|
+ if(Objects.nonNull(o) && StringUtils.isNotEmpty(o.toString())){
|
|
|
financialExpenditure.setStudentId(Integer.parseInt(o.toString()));
|
|
|
continue;
|
|
|
}else {
|
|
|
@@ -541,7 +540,7 @@ public class FinancialExpenditureServiceImpl extends BaseServiceImpl<Long, Finan
|
|
|
}
|
|
|
}else if(name.contains("金额")){
|
|
|
Object o = hashMap.get(inputDto.getModel());
|
|
|
- if(o != null){
|
|
|
+ if(Objects.nonNull(o) && StringUtils.isNotEmpty(o.toString())){
|
|
|
financialExpenditure.setAmount(new BigDecimal(Double.parseDouble(o.toString())));
|
|
|
continue;
|
|
|
}
|
zouxuan