diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyService.java index f650532df6..c027455768 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyService.java @@ -30,7 +30,6 @@ 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.yxt.anrui.base.api.baseaccadjapply.BaseAccadjApply; import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicle; import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleDetailsVo; import com.yxt.anrui.base.api.baseshuntinginvoicinapplyeveh.BaseShuntingInvoicinApplyeVeh; @@ -48,9 +47,6 @@ import com.yxt.anrui.base.biz.baseshuntinginvoicinapplyeveh.BaseShuntingInvoicin import com.yxt.anrui.base.biz.basevehicle.BaseVehicleService; import com.yxt.anrui.base.biz.basevehiclecertificate.BaseVehicleCertificateService; import com.yxt.anrui.base.common.enums.VehicleState; -import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo; -import com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationDetailsVo; -import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleDetailsVo; import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingDetailsVo; import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingFeign; import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceDto; @@ -66,7 +62,6 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; -import com.yxt.anrui.portal.api.sysuser.UserQuery; import com.yxt.anrui.portal.api.sysuser.UserRoleQuery; import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; @@ -74,29 +69,14 @@ import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; - import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Optional; import java.util.stream.Collectors; -/** - * Project: anrui-base(调车开票)
- * File: BaseShuntingInvoicingApplyService.java
- * Class: com.yxt.anrui.base.biz.baseshuntinginvoicingapply.BaseShuntingInvoicingApplyService
- * Description: 调车开票申请表 业务逻辑.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2022-07-11 15:30:28
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Service public class BaseShuntingInvoicingApplyService extends MybatisBaseService { @@ -123,13 +103,6 @@ public class BaseShuntingInvoicingApplyService extends MybatisBaseService createQueryWrapper(BaseShuntingInvoicingApplyQuery query) { - // todo: 这里根据具体业务调整查询条件 - // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); - QueryWrapper qw = new QueryWrapper<>(); - return qw; - } - public PagerVo listPageVo(PagerQuery pq) { BaseShuntingInvoicingApplyQuery query = pq.getParams(); QueryWrapper qw = new QueryWrapper<>(); @@ -271,15 +244,7 @@ public class BaseShuntingInvoicingApplyService extends MybatisBaseService baseShuntingInvoicinApplyeVehs = dto.getBaseShuntingInvoicinApplyeVehs(); BaseShuntingInvoicingApply baseShuntingInvoicingApply = fetchBySid(dto.getSid()); - for (BaseShuntingInvoicinApplyeVehDto baseShuntingInvoicinApplyeVeh : baseShuntingInvoicinApplyeVehs) { - BaseInternalPurchaseVehicle baseInternalPurchaseVehicle = baseInternalPurchaseVehicleService.fetchBySid(baseShuntingInvoicinApplyeVeh.getPurchaseSid()); - FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(baseShuntingInvoicingApply.getCallInOrgSid(), baseInternalPurchaseVehicle.getCallInBuyerOrgSid()).getData(); - if (finCompanyInvoicingDetailsVo == null){ - return rb.setMsg("调入分公司企业开票信息不存在"); - } - } int r = submitBusinessData(dto, baseShuntingInvoicingApply); if (r == 3) { return rb.setMsg("该申请不存在"); @@ -293,6 +258,15 @@ public class BaseShuntingInvoicingApplyService extends MybatisBaseService baseShuntingInvoicinApplyeVehs = dto.getBaseShuntingInvoicinApplyeVehs(); + for (BaseShuntingInvoicinApplyeVehDto baseShuntingInvoicinApplyeVeh : baseShuntingInvoicinApplyeVehs) { + BaseInternalPurchaseVehicle baseInternalPurchaseVehicle = baseInternalPurchaseVehicleService.fetchBySid(baseShuntingInvoicinApplyeVeh.getPurchaseSid()); + FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(baseShuntingInvoicingApply.getCallInOrgSid(), baseInternalPurchaseVehicle.getCallInBuyerOrgSid()).getData(); + if (finCompanyInvoicingDetailsVo == null){ + return rb.setMsg("调入分公司企业开票信息不存在"); + } + } //创建BusinessVariables实体对象 BusinessVariables bv = new BusinessVariables(); //流程中的参数赋值 @@ -300,8 +274,7 @@ public class BaseShuntingInvoicingApplyService extends MybatisBaseService eveList = dto.getEveList(); + for (FinPaymentapplyEveDto finPaymentapplyEveDto : eveList) { + finPaymentapplyDetailsBelowEveService.updateState(finPaymentapplyEveDto.getEveSid(), 2); + } + } if (r == 1) { ResultBean voResultBean = flowFeign.startProcess(bv); if (!voResultBean.getSuccess()) { @@ -699,9 +705,9 @@ public class FinPaymentapplyService extends MybatisBaseService vehicleList = vo.getVehicleList(); @@ -1060,6 +1067,12 @@ public class FinPaymentapplyService extends MybatisBaseService map = BeanUtil.beanToMap(resultBean.getData()); updateFlowFiled(map); + if ("004".equals(finPaymentapply.getCostTypeKey())){ + List finPaymentapplyEveDetailsVos = finPaymentapplyEveService.fetchByMainSid(query.getBusinessSid()); + for (FinPaymentapplyEveDetailsVo finPaymentapplyEveDetailsVo : finPaymentapplyEveDetailsVos) { + finPaymentapplyDetailsBelowEveService.updateState(finPaymentapplyEveDetailsVo.getEveSid(),1); + } + } return rb.success().setData(resultBean.getData()); } else { if (businessTaskId.equals(query.getTaskId())) { @@ -1071,6 +1084,12 @@ public class FinPaymentapplyService extends MybatisBaseService map = BeanUtil.beanToMap(resultBean.getData()); updateFlowFiled(map); + if ("004".equals(finPaymentapply.getCostTypeKey())){ + List finPaymentapplyEveDetailsVos = finPaymentapplyEveService.fetchByMainSid(query.getBusinessSid()); + for (FinPaymentapplyEveDetailsVo finPaymentapplyEveDetailsVo : finPaymentapplyEveDetailsVos) { + finPaymentapplyDetailsBelowEveService.updateState(finPaymentapplyEveDetailsVo.getEveSid(),1); + } + } return rb.success().setData(resultBean.getData()); } } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbelow/FinPaymentapplyDetailsBelowMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbelow/FinPaymentapplyDetailsBelowMapper.java index 6c142a0aff..df2bcec6e4 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbelow/FinPaymentapplyDetailsBelowMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbelow/FinPaymentapplyDetailsBelowMapper.java @@ -47,6 +47,4 @@ public interface FinPaymentapplyDetailsBelowMapper extends BaseMapper - - \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbelow/FinPaymentapplyDetailsBelowService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbelow/FinPaymentapplyDetailsBelowService.java index c6ede141b1..85dfd30be8 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbelow/FinPaymentapplyDetailsBelowService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbelow/FinPaymentapplyDetailsBelowService.java @@ -57,8 +57,4 @@ public class FinPaymentapplyDetailsBelowService extends MybatisBaseService fetchEveSidList(String bzjSid); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveMapper.xml index fb78a1646c..01084f98f1 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveMapper.xml @@ -15,4 +15,26 @@ ON fe.useOrgSid = s.sid ${ew.sqlSegment} + + + + + + \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveService.java index 23ab9027a9..90bbd86ea0 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveService.java @@ -131,9 +131,8 @@ public class FinPaymentapplyDetailsBelowEveService extends MybatisBaseService qw = new QueryWrapper<>(); qw.eq("fe.useOrgSid", query.getUseOrgSid()); - /*if (StringUtils.isNotBlank(query.getPayCompany())) { - qw.like("fe.payCompany", query.getPayCompany()); - }*/ + qw.eq("fe.payCompanySid", query.getPayCompanySid()); + qw.eq("fe.state", 1); qw.orderByDesc("fe.createTime"); IPage page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); @@ -180,4 +179,20 @@ public class FinPaymentapplyDetailsBelowEveService extends MybatisBaseService fetchEveSidList(String bzjSid) { + return baseMapper.fetchEveSidList(bzjSid); + } } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyeve/FinPaymentapplyEveMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyeve/FinPaymentapplyEveMapper.java index ad667f192d..676cd5146a 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyeve/FinPaymentapplyEveMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyeve/FinPaymentapplyEveMapper.java @@ -30,6 +30,7 @@ import com.yxt.anrui.fin.api.finpaymentapplyeve.FinPaymentapplyEveDetailsVo; import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Mapper; import com.yxt.anrui.fin.api.finpaymentapplyeve.FinPaymentapplyEve; +import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import java.math.BigDecimal; @@ -46,4 +47,6 @@ public interface FinPaymentapplyEveMapper extends BaseMapper @Select("SELECT SUM(exePayPrice) FROM fin_paymentapply_eve WHERE applySid = #{applySid}") BigDecimal fetchExePriceByMainSid(String applySid); + + List selPayEveSidList(@Param("eveSidList") List eveSidList); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyeve/FinPaymentapplyEveMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyeve/FinPaymentapplyEveMapper.xml index 2c00bd7d4a..80d4cd0e67 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyeve/FinPaymentapplyEveMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyeve/FinPaymentapplyEveMapper.xml @@ -1,5 +1,10 @@ - + \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyeve/FinPaymentapplyEveService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyeve/FinPaymentapplyEveService.java index d70df20a30..a9104b4edd 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyeve/FinPaymentapplyEveService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplyeve/FinPaymentapplyEveService.java @@ -56,4 +56,8 @@ public class FinPaymentapplyEveService extends MybatisBaseService selPayEveSidList(List eveSidList) { + return baseMapper.selPayEveSidList(eveSidList); + } } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordMapper.java index 200a6a4a22..96586d5c98 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordMapper.java @@ -34,7 +34,6 @@ import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; - import java.math.BigDecimal; import java.util.List; @@ -56,5 +55,5 @@ public interface FinPaymentrecordMapper extends BaseMapper { String selectBatchNum(@Param("s") String s); - BigDecimal selPayPrice(String applySid); + BigDecimal selPayPriceTotal(@Param("payEveSidList") List payEveSidList); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordMapper.xml index ae1814d6ed..f1060525b9 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordMapper.xml @@ -67,6 +67,7 @@ #{item} + - SELECT SUM(cost) FROM fin_paymentrecord - WHERE applySid = #{applySid} - AND state = 2 - AND (costTitleKey = '' OR costTitleKey IS NULL) + WHERE state = 2 + AND busSid IN + + #{item} + \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java index 576ddea209..0bad6db5ab 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java @@ -1695,14 +1695,27 @@ public class FinPaymentrecordService extends MybatisBaseService eveSidList = finPaymentapplyDetailsBelowEveService.fetchEveSidList(bzjSid); + //查询融资付款平仓sid + List payEveSidList = finPaymentapplyEveService.selPayEveSidList(eveSidList); //查询已付款平仓款金额 - BigDecimal payPriceTotal = baseMapper.selPayPrice(finPaymentrecord.getApplySid()); + BigDecimal payPriceTotal = baseMapper.selPayPriceTotal(payEveSidList); + if (payPriceTotal == null){ + payPriceTotal = BigDecimal.ZERO; + } if (payPriceTotal.compareTo(exePayPriceTotal) == -1) { //借方 voucherResultDetailDtoJF.setSummary("还" + finPaymentrecord.getCostTitleValue() + finPaymentapplyEve.getOpenDate()); @@ -1733,7 +1746,7 @@ public class FinPaymentrecordService extends MybatisBaseService