|
@@ -231,6 +231,9 @@ public class FinancialExpenditureServiceImpl extends BaseServiceImpl<Long, Finan
|
|
|
if(pWorkOrderInfo.getProcess().equals(22) || pWorkOrderInfo.getProcess().equals(19)){
|
|
|
List<FinancialExpenditure> financialExpenditureList = new ArrayList<>();
|
|
|
for (OaInputDto oaInputDto : oaInputDtos) {
|
|
|
+ if(!"子表单".equals(oaInputDto.getName())){
|
|
|
+ continue;
|
|
|
+ }
|
|
|
String submitForm = oaInputDto.getModel();
|
|
|
List<HashMap> hashMaps = JSONObject.parseArray(formData.get(submitForm).toString(), HashMap.class);
|
|
|
for (HashMap hashMap : hashMaps) {
|
|
@@ -430,6 +433,9 @@ public class FinancialExpenditureServiceImpl extends BaseServiceImpl<Long, Finan
|
|
|
List<OaInputDto> oaInputDtos = oaFormStructureDto.getList();
|
|
|
List<FinancialExpenditure> financialExpenditureList = new ArrayList<>();
|
|
|
for (OaInputDto oaInputDto : oaInputDtos) {
|
|
|
+ if(!"子表单".equals(oaInputDto.getName())){
|
|
|
+ continue;
|
|
|
+ }
|
|
|
String submitForm = oaInputDto.getModel();
|
|
|
List<HashMap> hashMaps = JSONObject.parseArray(formData.get(submitForm).toString(), HashMap.class);
|
|
|
for (HashMap hashMap : hashMaps) {
|