修改付款申请推送出纳代付款列表

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java

@@ -26,17 +26,14 @@
 package com.yxt.anrui.fin.biz.finpaymentapply;
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
-import com.yxt.anrui.base.api.basevehicle.BaseVehicleSelectVo;
 import com.yxt.anrui.base.common.enums.BillTypeEnum;
 import com.yxt.anrui.base.common.utils.Rule;
 import com.yxt.anrui.base.common.utils.domain.BillNo;
-import com.yxt.anrui.buscenter.api.busmaindeposit.BusMainDeposit;
 import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicing;
 import com.yxt.anrui.fin.api.finpaymentapply.*;
 import com.yxt.anrui.fin.api.finpaymentapply.flow.FinPayGetNodeQuery;
@@ -58,7 +55,6 @@ import com.yxt.anrui.fin.api.finpaymentapplyvehicle.AppFinPaymentapplyVehicleVo;
 import com.yxt.anrui.fin.api.finpaymentapplyvehicle.FinPaymentapplyVehicleDto;
 import com.yxt.anrui.fin.api.finpaymentapplyvehicle.FinPaymentapplyVehicleVo;
 import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordDto;
-import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo;
 import com.yxt.anrui.fin.biz.fincompanyinvoicing.FinCompanyInvoicingService;
 import com.yxt.anrui.fin.biz.finpaymentapplydetails.FinPaymentapplyDetailsService;
 import com.yxt.anrui.fin.biz.finpaymentapplydetailsbelow.FinPaymentapplyDetailsBelowService;
@@ -78,16 +74,11 @@ import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
 import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
-import com.yxt.anrui.portal.api.sysparameter.SysParameterFeign;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
-import com.yxt.anrui.portal.api.sysstaffpost.SysStaffPostFeign;
 import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
-import com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebateDto;
-import com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebateFeign;
-import com.yxt.anrui.scm.api.scmcollectionrebateveh.ScmCollectionRebateVehDto;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
@@ -644,7 +635,6 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
             //ToDo:到出纳记录
             if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
                 FinPaymentapplyDetailsVo vo = fetchDetailsVoBySid(bv.getBusinessSid());
-                ResultBean<String> stringResultBean = sysStaffOrgFeign.getPathSidByUserSid(finPaymentapply.getCreateBySid());
                 FinPaymentrecordDto finPaymentrecordDto = new FinPaymentrecordDto();
                 finPaymentrecordDto.setCreateBySid(finPaymentapply.getCreateBySid());
                 finPaymentrecordDto.setUpdateBySid(finPaymentapply.getCreateBySid());
@@ -655,9 +645,9 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
                 //付款类别
                 finPaymentrecordDto.setPayType(1);
                 //创建组织
-                finPaymentrecordDto.setCreateOrgSid(stringResultBean.getData());
+                finPaymentrecordDto.setCreateOrgSid(finPaymentapply.getUseOrgSid());
                 //使用组织
-                finPaymentrecordDto.setUseOrgSid(stringResultBean.getData());
+                finPaymentrecordDto.setUseOrgSid(finPaymentapply.getUseOrgSid());
                 //采购系统
                 FinCompanyInvoicing finCompanyInvoicing = finCompanyInvoicingService.fetchBySid(finPaymentapply.getPayCompanySid());
                 finPaymentrecordDto.setPurchaseSystemSid(finCompanyInvoicing.getPurchaseSystemSid());