|
@@ -303,12 +303,12 @@ public class FinancialExpenditureServiceImpl extends BaseServiceImpl<Long, Finan
|
|
List<HashMap> hashMaps = JSONObject.parseArray(formData.get(submitForm).toString(), HashMap.class);
|
|
List<HashMap> hashMaps = JSONObject.parseArray(formData.get(submitForm).toString(), HashMap.class);
|
|
if(StringUtils.equals("分摊明细",oaInputDto.getName())){
|
|
if(StringUtils.equals("分摊明细",oaInputDto.getName())){
|
|
//处理房租的分摊明细
|
|
//处理房租的分摊明细
|
|
- nullUser:
|
|
|
|
|
|
+ nullAmount:
|
|
for (HashMap hashMap : hashMaps) {
|
|
for (HashMap hashMap : hashMaps) {
|
|
List<OaColumnDto> columns = oaInputDto.getColumns();
|
|
List<OaColumnDto> columns = oaInputDto.getColumns();
|
|
if (columns != null && columns.size() > 0) {
|
|
if (columns != null && columns.size() > 0) {
|
|
FinancialExpenditure financialExpenditure = new FinancialExpenditure();
|
|
FinancialExpenditure financialExpenditure = new FinancialExpenditure();
|
|
- nullAmount:for (OaColumnDto column : columns) {
|
|
|
|
|
|
+ for (OaColumnDto column : columns) {
|
|
List<OaInputDto> columnList = column.getList();
|
|
List<OaInputDto> columnList = column.getList();
|
|
if (columnList != null && columnList.size() > 0) {
|
|
if (columnList != null && columnList.size() > 0) {
|
|
for (OaInputDto inputDto : columnList) {
|
|
for (OaInputDto inputDto : columnList) {
|