zouxuan %!s(int64=2) %!d(string=hai) anos
pai
achega
f5701ae4d1

+ 0 - 3
mec-biz/src/main/java/com/ym/mec/biz/service/impl/FinancialExpenditureServiceImpl.java

@@ -466,9 +466,6 @@ public class FinancialExpenditureServiceImpl extends BaseServiceImpl<Long, Finan
                             financialExpenditure.setFeeProject(FeeProjectEnum.valueOfDesc(o.toString()));
                             continue;
                         }
-                    } else if (name.contains("子表单")) {
-                        List<OaColumnDto> columns = oaInputDto.getColumns();
-
                     }
                 }
                 financialExpenditureDao.insert(financialExpenditure);

+ 2 - 2
mec-biz/src/main/resources/config/mybatis/FinancialExpenditureMapper.xml

@@ -46,10 +46,10 @@
             keyColumn="id"
             keyProperty="id">
         INSERT INTO financial_expenditure (batch_no_, financial_process_no_, dingtalk_process_no_,
-                                           organ_id_, cooperation_organ_id_, apply_user_, amount_, item_detail_,
+                                           organ_id_, cooperation_organ_id_, apply_user_, apply_user_id_, amount_, item_detail_,
                                            payment_time_, cause_, create_time_, update_time_, fee_project_, type_, tenant_id_)
         VALUES (#{batchNo}, #{financialProcessNo}, #{dingtalkProcessNo}, #{organId}, #{cooperationOrganId},
-                #{applyUser}, #{amount},
+                #{applyUser}, #{applyUserId}, #{amount},
                 #{itemDetail}, #{paymentTime}, #{cause}, now(), now(),
                 #{feeProject,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
                 #{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{tenantId})