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 f47ac0f725..1308a99b6d 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 @@ -31,6 +31,7 @@ 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; import com.yxt.anrui.base.api.baseshuntinginvoicinapplyeveh.BaseShuntingInvoicinApplyeVehDetailsVo; @@ -38,12 +39,20 @@ import com.yxt.anrui.base.api.baseshuntinginvoicinapplyeveh.BaseShuntingInvoicin import com.yxt.anrui.base.api.baseshuntinginvoicingapply.*; import com.yxt.anrui.base.api.baseshuntinginvoicingapply.flow.BaseShuntingInvoicingApplyTaskQuery; import com.yxt.anrui.base.api.baseshuntinginvoicingapply.flow.SubmitBaseShuntingInvoicingApplyDto; +import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificate; import com.yxt.anrui.base.api.busvehicleapply.flow.GetNodeQuery; import com.yxt.anrui.base.api.busvehicleapply.flow.GetNodeVo; import com.yxt.anrui.base.biz.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleService; import com.yxt.anrui.base.biz.baseshuntinginvoicinapplyeveh.BaseShuntingInvoicinApplyeVehService; 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; +import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceFeign; import com.yxt.anrui.flowable.api.flow.FlowableFeign; import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; import com.yxt.anrui.flowable.api.flow2.FlowFeign; @@ -105,6 +114,10 @@ public class BaseShuntingInvoicingApplyService extends MybatisBaseService createQueryWrapper(BaseShuntingInvoicingApplyQuery query) { // todo: 这里根据具体业务调整查询条件 @@ -136,9 +149,9 @@ public class BaseShuntingInvoicingApplyService extends MybatisBaseService saveOrUpdateDto(BaseShuntingInvoicingApplyDto dto) { ResultBean rb = ResultBean.fireFail(); String orgSidPath = ""; - if (StringUtils.isNotBlank(dto.getOrgPath())){ + if (StringUtils.isNotBlank(dto.getOrgPath())) { orgSidPath = dto.getOrgPath(); - }else { + } else { //根据用户sid获取staffSid ResultBean userVoResultBean = sysUserFeign.fetchBySid(dto.getCreateBySid()); if (!userVoResultBean.getSuccess()) { @@ -172,14 +185,14 @@ public class BaseShuntingInvoicingApplyService extends MybatisBaseService 0){ + if (baseShuntingInvoicinApplyeVehs.size() > 0) { for (BaseShuntingInvoicinApplyeVehDto baseShuntingInvoicinApplyeVeh : baseShuntingInvoicinApplyeVehs) { - baseInternalPurchaseVehicleService.updateIsInvoicing(baseShuntingInvoicinApplyeVeh.getPurchaseSid(),"2"); + baseInternalPurchaseVehicleService.updateIsInvoicing(baseShuntingInvoicinApplyeVeh.getPurchaseSid(), "2"); } } return voResultBean; @@ -419,10 +432,48 @@ public class BaseShuntingInvoicingApplyService extends MybatisBaseService 0){ + if (baseShuntingInvoicinApplyeVehDetailsVos.size() > 0) { for (BaseShuntingInvoicinApplyeVehDetailsVo baseShuntingInvoicinApplyeVehDetailsVo : baseShuntingInvoicinApplyeVehDetailsVos) { - baseInternalPurchaseVehicleService.updateIsInvoicing(baseShuntingInvoicinApplyeVehDetailsVo.getPurchaseSid(),"1"); + baseInternalPurchaseVehicleService.updateIsInvoicing(baseShuntingInvoicinApplyeVehDetailsVo.getPurchaseSid(), "1"); } } } @@ -530,9 +581,9 @@ public class BaseShuntingInvoicingApplyService extends MybatisBaseService map = BeanUtil.beanToMap(resultBean.getData()); updateFlowFiled(map); - if (baseShuntingInvoicinApplyeVehDetailsVos.size() > 0){ + if (baseShuntingInvoicinApplyeVehDetailsVos.size() > 0) { for (BaseShuntingInvoicinApplyeVehDetailsVo baseShuntingInvoicinApplyeVehDetailsVo : baseShuntingInvoicinApplyeVehDetailsVos) { - baseInternalPurchaseVehicleService.updateIsInvoicing(baseShuntingInvoicinApplyeVehDetailsVo.getPurchaseSid(),"0"); + baseInternalPurchaseVehicleService.updateIsInvoicing(baseShuntingInvoicinApplyeVehDetailsVo.getPurchaseSid(), "0"); } } return rb.success().setData(resultBean.getData()); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateMapper.java index 894ed6a35f..c3419f4704 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateMapper.java @@ -110,4 +110,9 @@ public interface BaseVehicleCertificateMapper extends BaseMapper select * from base_vehicle_certificate where vehicleSid = #{vinSid} order by id limit 1 + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateService.java index b88eb4e2ec..7f18b2afc0 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateService.java @@ -369,4 +369,12 @@ public class BaseVehicleCertificateService extends MybatisBaseService