diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleQKKPTrailerVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleQKKPTrailerVo.java index 34ff48ee0f..aa93d9fd9c 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleQKKPTrailerVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleQKKPTrailerVo.java @@ -13,8 +13,10 @@ import lombok.Data; public class BaseVehicleQKKPTrailerVo implements Vo { @ApiModelProperty("挂车车架号") - private String gcVinNo; // 挂车车架号 + private String gcVinNo; @ApiModelProperty("车架号") - private String vinNo; // 车架号 + private String vinNo; + @ApiModelProperty("开票金额") + private String oneBillMoney; } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java index 26d4411728..7b46db3ff8 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java @@ -13,6 +13,7 @@ import com.yxt.anrui.base.api.basemodelconfig.AppModelConfigListVo; import com.yxt.anrui.base.api.basemodelconfig.BaseModelConfig; import com.yxt.anrui.base.api.basemodelmodprice.BaseModelVehicleVersionVo; import com.yxt.anrui.base.api.basepurchasesystem.BasePurchSystemVo; +import com.yxt.anrui.base.api.basetrailer.BaseTrailerDetailsVo; import com.yxt.anrui.base.api.basetrailer.TrailerVo; import com.yxt.anrui.base.api.basetrailer.TraliveredVo; import com.yxt.anrui.base.api.basevehicle.*; @@ -1994,7 +1995,7 @@ public class BaseVehicleService extends MybatisBaseService wrapper.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.DC_STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.NX_STOCK.getCode())); + qw.and(wrapper -> wrapper.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.DC_STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.NX_STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.ING_STOCK.getCode())); //非外采或非内购 qw.ne("bv.manPurOrderTypeKey", ManPurOrderType.ManOrderType.WC_ORDER.getCode()); qw.ne("bv.manPurOrderTypeKey", ManPurOrderType.ManOrderType.NG_ORDER.getCode()); @@ -3871,6 +3872,8 @@ public class BaseVehicleService extends MybatisBaseService createQueryWrapper(CommonContractQuery query) { // todo: 这里根据具体业务调整查询条件 @@ -2631,6 +2636,7 @@ public class CommonContractService extends MybatisBaseService> busList = busSalesOrderFeign.selectBusinessSidByQKKP(params.getUserSid(), params.getOrgPath()); @@ -2646,7 +2652,9 @@ public class CommonContractService extends MybatisBaseService page = PagerUtil.queryToPage(query); IPage pagging = baseMapper.selectByStaffSid(page, qw); - for (CommonContractVo record : pagging.getRecords()) { + List records = pagging.getRecords(); + List recordsNew = new ArrayList<>(); + for (CommonContractVo record : records) { String createDate = record.getCreateDate(); DateTime dateTime = DateUtil.parse(createDate, "yyyy-MM-dd"); createDate = DateUtil.formatDate(dateTime); @@ -2654,7 +2662,17 @@ public class CommonContractService extends MybatisBaseService busVehicleQKKPVos = busSalesOrderVehicleFeign.appVehicleQKKPList(busVehicleQKKPQuery).getData(); + if (busVehicleQKKPVos != null){ + if (busVehicleQKKPVos.size() != 0){ + recordsNew.add(record); + } + } } + pagging.setRecords(recordsNew); + pagging.setTotal(recordsNew.size()); PagerVo p = PagerUtil.pageToVo(pagging, null); return rb.success().setData(p); } @@ -2662,6 +2680,7 @@ public class CommonContractService extends MybatisBaseService getApprovalContractList(PagerQuery query) { ContractPageQuery params = query.getParams(); QueryWrapper qw = new QueryWrapper<>(); + String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(params.getOrgPath()).getData(); if (params.getStateType() == 2) { SysUserVo sysUserVo = sysUserFeign.fetchBySid(params.getUserSid()).getData(); String staffSid = sysUserVo.getStaffSid(); @@ -2699,6 +2718,23 @@ public class CommonContractService extends MybatisBaseService page = PagerUtil.queryToPage(query); IPage iPage = baseMapper.getApprovalContractList(page, qw); + if (params.getStateType() == 2) { + List records = iPage.getRecords(); + List recordsNew = new ArrayList<>(); + if (records != null){ + for (ContractPageVo record : records) { + BusVehicleQKKPQuery busVehicleQKKPQuery = new BusVehicleQKKPQuery(); + busVehicleQKKPQuery.setContractNo(record.getContractId()); + List busVehicleQKKPVos = busSalesOrderVehicleFeign.appVehicleQKKPList(busVehicleQKKPQuery).getData(); + if (busVehicleQKKPVos != null){ + if (busVehicleQKKPVos.size() != 0){ + recordsNew.add(record); + } + } + } + } + iPage.setRecords(recordsNew); + } return iPage; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusVehicleQKKPVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusVehicleQKKPVo.java index 79f763355f..05061e6c41 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusVehicleQKKPVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusVehicleQKKPVo.java @@ -4,6 +4,7 @@ import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.ArrayList; import java.util.List; /** @@ -26,6 +27,8 @@ public class BusVehicleQKKPVo implements Vo { private String certificateState; // 合格证状态key @ApiModelProperty("合格证状态value") private String certificateStateValue; // 合格证状态value + @ApiModelProperty("主车合格证照片") + private List zcHgzImages = new ArrayList<>(); @ApiModelProperty(value = "挂车信息") private List trailers; } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java index edc1f98beb..eb99391500 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java @@ -1731,6 +1731,13 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService金融部经理审批 bv.setNextNodeUserSids(busArrearsCarryVehicleApply.getFinanceUserSid()); } + if("Activity_0tieuz3".equals(bv.getTaskDefKey())){//分公司销售内勤的节点id + //分公司销售内勤审批->销售部经理审批 + List orgPathList = Arrays.asList(busArrearsCarryVehicleApply.getOrgSidPath().split("/")); + SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(orgPathList.get(orgPathList.size() - 1)).getData(); + String nextNodeUserSids_ = sysOrganization.getManagerSid(); + bv.setNextNodeUserSids(nextNodeUserSids_); + } if (bv.getTaskId().equals(busArrearsCarryVehicleApply.getTaskId())) { ResultBean resultBean = flowableFeign.handleProsess(bv); if (!resultBean.getSuccess()) { @@ -1943,6 +1950,11 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService variables = new HashMap<>(); + if (StringUtils.isNotBlank(busArrearsCarryVehicleApply.getIsFinance())) { + variables.put("jinrong", "1".equals(busArrearsCarryVehicleApply.getIsFinance())); + } else { + variables.put("jinrong", false); + } Map appMap = new HashMap<>(); appMap.put("sid", query.getBusinessSid()); variables.put("app", appMap); @@ -1994,6 +2006,16 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService variables = new HashMap<>(); + if (StringUtils.isNotBlank(busArrearsCarryVehicleApply.getIsFinance())) { + variables.put("jinrong", "1".equals(busArrearsCarryVehicleApply.getIsFinance())); + } else { + variables.put("jinrong", false); + } + Map appMap = new HashMap<>(); + appMap.put("sid", query.getBusinessSid()); + variables.put("app", appMap); + flowTaskVo.setValues(variables); ResultBean resultBean = flowableFeign.revokeProcess(flowTaskVo); if (!resultBean.getSuccess()) { return rb.setMsg("操作失败!"); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java index 7673a3b879..bea6d6fc1c 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java @@ -731,7 +731,7 @@ public class BusDeliveredApplyService extends MybatisBaseService variables = new HashMap<>(); + //若app移动端有此功能，则传递appMap参数 + Map appMap = new HashMap<>(); + //需和移动端沟通业务sid保存的属性具体值：appMap中sid不是固定的。移动端提供具体字段。 + appMap.put("outboundSid", query.getBusinessSid()); + appMap.put("contractId", busDeliveredApply.getContractNo()); + appMap.put("contract_id", busDeliveredApply.getContractNo()); + variables.put("app", appMap); + flowTaskVo.setValues(variables); ResultBean resultBean = flowableFeign.taskReject(flowTaskVo); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); @@ -976,6 +985,7 @@ public class BusDeliveredApplyService extends MybatisBaseService map = BeanUtil.beanToMap(resultBean.getData()); //更新业务中的流程相关的参数 + updateFlowFiled(map); busDeliveredApply = fetchBySid(query.getBusinessSid()); ResultBean> listResultBean = flowTaskFeign.getLatestTasks(busDeliveredApply.getProcInstId()); @@ -987,6 +997,28 @@ public class BusDeliveredApplyService extends MybatisBaseService) variables.get("app")); + messageFlowableQuery.setBusinessSid(query.getBusinessSid()); + messageFlowableQuery.setModuleName("出库申请"); + ResultBean> listResultBean2 = flowTaskFeign.getLatestTasks(busDeliveredApply.getProcInstId()); + String nextNodeUserSids2 = listResultBean2.getData().get(0).getASSIGNEE_(); + String nextName2 = listResultBean2.getData().get(0).getName_(); + if ("发起申请".equals(nextName2)) { + messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交"); + } else { + messageFlowableQuery.setMsgContent(busDeliveredApply.getStaffName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); + } + messageFlowableQuery.setMsgTitle("出库申请"); + ResultBean stringResultBean = messageFeign.pushMessage(messageFlowableQuery); return rb.success(); } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index 11bbaea4b8..10ce0f428e 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -4509,7 +4509,6 @@ public class BusSalesOrderService extends MybatisBaseService busVehicleQKKPVosNew = new ArrayList<>(); if (busVehicleQKKPVos != null){ for (BusVehicleQKKPVo record : busVehicleQKKPVos) { + //判断相同车辆是否存在已提交的申请 FinBillVehicleDetailsVo finBillVehicleDetailsVo = finBillVehicleFeign.fetchByVehSid(record.getVehSid()).getData(); if (finBillVehicleDetailsVo == null){ busVehicleQKKPVosNew.add(record); diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/AppVinListDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/AppVinListDto.java index 562691bffc..4c759e801e 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/AppVinListDto.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/AppVinListDto.java @@ -4,6 +4,9 @@ import com.yxt.common.core.dto.Dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.ArrayList; +import java.util.List; + @Data public class AppVinListDto implements Dto { private static final long serialVersionUID = 1941205415631089700L; @@ -37,4 +40,7 @@ public class AppVinListDto implements Dto { private String certificateState; // 合格证 @ApiModelProperty("开票信息") private String invoiceInfo; // 开票信息 + + @ApiModelProperty("主车合格证照片") + private List zcHgzImages = new ArrayList<>(); } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/AppVinListVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/AppVinListVo.java index 1d4f6a9bc9..1be3bb15cd 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/AppVinListVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/AppVinListVo.java @@ -5,6 +5,9 @@ import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.ArrayList; +import java.util.List; + @Data public class AppVinListVo implements Vo { @@ -30,4 +33,7 @@ public class AppVinListVo implements Vo { @ApiModelProperty("合格证") private Boolean certificateState; + + @ApiModelProperty("主车合格证照片") + private List zcHgzImages = new ArrayList<>(); } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillvehicle/FinBillVehicleDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillvehicle/FinBillVehicleDto.java index 0413915496..9e80626ba9 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillvehicle/FinBillVehicleDto.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillvehicle/FinBillVehicleDto.java @@ -33,6 +33,9 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.ArrayList; +import java.util.List; + /** * Project: anrui-fin(开票申请管理)
* File: FinBillVehicleDto.java
@@ -83,4 +86,7 @@ public class FinBillVehicleDto implements Dto { private String certificateStateValue; // 合格证状态value @ApiModelProperty("开票信息") private String openTickRemarks; // 开票信息 + + @ApiModelProperty("主车合格证照片") + private List zcHgzImages = new ArrayList<>(); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillvehicle/FinBillVehicleFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillvehicle/FinBillVehicleFeign.java index 05e6c09594..f479cf8b2a 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillvehicle/FinBillVehicleFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillvehicle/FinBillVehicleFeign.java @@ -25,6 +25,7 @@ *********************************************************/ package com.yxt.anrui.fin.api.finbillvehicle; +import com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationDetailsVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import com.yxt.common.core.query.PagerQuery; @@ -85,4 +86,12 @@ public interface FinBillVehicleFeign { @GetMapping("/fetchByVehSid/{vehSid}") @ResponseBody ResultBean fetchByVehSid(@PathVariable("vehSid") String vehSid); + + /************************业务接口调用********************************/ + + @ApiOperation("查询本公司以及合同下欠款开票的车辆sid") + @PostMapping("/fetchByUseOrgSid") + @ResponseBody + ResultBean> fetchByUseOrgSid(@RequestParam("useOrgSid") String useOrgSid, @RequestParam("contractNo") String contractNo); + } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillvehicle/FinBillVehicleFeignFallback.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillvehicle/FinBillVehicleFeignFallback.java index b9745f5104..f39b7f8240 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillvehicle/FinBillVehicleFeignFallback.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillvehicle/FinBillVehicleFeignFallback.java @@ -79,4 +79,9 @@ public class FinBillVehicleFeignFallback implements FinBillVehicleFeign { public ResultBean fetchByVehSid(String vehSid) { return null; } + + @Override + public ResultBean> fetchByUseOrgSid(String useOrgSid, String contractNo) { + return null; + } } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoice.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoice.java index fb03657f3f..abcf06b714 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoice.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoice.java @@ -136,6 +136,8 @@ public class FinVehicleInvoice extends BaseEntity { private String bankNum; @ApiModelProperty("接收人") private String recipient; + @ApiModelProperty("接收人sid") + private String recipientSid; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiModelProperty("移交日期") private Date transferTime; diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceDetailsVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceDetailsVo.java index 86b560a074..d613626b4a 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceDetailsVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceDetailsVo.java @@ -61,6 +61,8 @@ public class FinVehicleInvoiceDetailsVo implements Vo { private String bankNum; @ApiModelProperty("接收人") private String recipient; + @ApiModelProperty("接收人sid") + private String recipientSid; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiModelProperty("移交日期") private Date transferTime; @@ -74,4 +76,6 @@ public class FinVehicleInvoiceDetailsVo implements Vo { private List certificatePaths; @ApiModelProperty("临时保存") private Boolean tempSave; + @ApiModelProperty("移交判断") + private Boolean showTransfer; } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceDto.java index 774accee63..ea17b6cac1 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceDto.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceDto.java @@ -106,6 +106,8 @@ public class FinVehicleInvoiceDto implements Dto { private String bankNum; @ApiModelProperty("接收人") private String recipient; + @ApiModelProperty("接收人sid") + private String recipientSid; @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty("移交日期") private Date transferTime; @@ -117,5 +119,6 @@ public class FinVehicleInvoiceDto implements Dto { private List billingFilePaths; @ApiModelProperty("临时保存") private Boolean tempSave; - + @ApiModelProperty("移交判断") + private Boolean showTransfer; } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceVo.java index 1d1fb5f375..a2656acb39 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceVo.java @@ -81,6 +81,8 @@ public class FinVehicleInvoiceVo implements Vo { private String bankNum; @ApiModelProperty("接收人") private String recipient; + @ApiModelProperty("接收人sid") + private String recipientSid; @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty("移交日期") private Date transferTime; diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java index 6268cd2902..d086987453 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java @@ -426,17 +426,21 @@ public class FinBillApplicationService extends MybatisBaseService finBillVehicleVos = finBillVehicleService.fetchVehBySid(sid); String contractNo = entity.getContractNo(); - List finBillApplicationVos = baseMapper.selectByContractNo(contractNo); - entity.setTotalBillMoney(entity.getOneBillMoney().multiply(new BigDecimal(finBillVehicleVos.size()))); + BigDecimal oneBillMoney = entity.getOneBillMoney(); + if (oneBillMoney != null){ + entity.setTotalBillMoney(entity.getOneBillMoney().multiply(new BigDecimal(finBillVehicleVos.size()))); + } FinBillApplicationDetailsVo vo = new FinBillApplicationDetailsVo(); BeanUtil.copyProperties(entity, vo); BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(contractNo).getData(); vo.setBusSalesOrderSid(busSalesOrder.getSid()); - for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) { - BaseVehicleCertificateVo baseVehicleCertificateVo = baseVehicleCertificateFeign.selStateByVehicleSid(finBillVehicleVo.getVehSid()).getData(); - if (baseVehicleCertificateVo != null){ - List clhgeImages = baseVehicleAppendixFeign.selectBySid(baseVehicleCertificateVo.getSid()).getData(); - finBillVehicleVo.setCertificatePhoto(clhgeImages); + if (finBillVehicleVos != null){ + for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) { + BaseVehicleCertificateVo baseVehicleCertificateVo = baseVehicleCertificateFeign.selStateByVehicleSid(finBillVehicleVo.getVehSid()).getData(); + if (baseVehicleCertificateVo != null){ + List clhgeImages = baseVehicleAppendixFeign.selectBySid(baseVehicleCertificateVo.getSid()).getData(); + finBillVehicleVo.setCertificatePhoto(clhgeImages); + } } } vo.setFinBillVehicles(finBillVehicleVos); @@ -1380,8 +1384,12 @@ public class FinBillApplicationService extends MybatisBaseService 0){ + BigDecimal qkMoneyTotal = qkMoneyOne.multiply(new BigDecimal(finBillVehicles.size())); + finBillApplication.setArrearsMoney(qkMoneyTotal.toString()); + }else { + finBillApplication.setArrearsMoney(""); + } //单台开票金额 BigDecimal oneBillMoney = finBillApplication.getOneBillMoney(); //计算开票金额合计 @@ -1786,6 +1794,13 @@ public class FinBillApplicationService extends MybatisBaseService销售部经理审批 + List orgPathList = Arrays.asList(finBillApplication.getOrgSidPath().split("/")); + SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(orgPathList.get(orgPathList.size() - 1)).getData(); + String nextNodeUserSids_ = sysOrganization.getManagerSid(); + bv.setNextNodeUserSids(nextNodeUserSids_); + } if (bv.getTaskId().equals(finBillApplication.getTaskId())) { ResultBean resultBean = flowableFeign.handleProsess(bv); if (!resultBean.getSuccess()) { @@ -2446,6 +2461,13 @@ public class FinBillApplicationService extends MybatisBaseService销售部经理审批 + List orgPathList = Arrays.asList(finBillApplication.getOrgSidPath().split("/")); + SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(orgPathList.get(orgPathList.size() - 1)).getData(); + String nextNodeUserSids_ = sysOrganization.getManagerSid(); + bv.setNextNodeUserSids(nextNodeUserSids_); + } if (bv.getTaskId().equals(finBillApplication.getTaskId())) { ResultBean resultBean = flowableFeign.handleProsess(bv); if (!resultBean.getSuccess()) { diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillvehicle/FinBillVehicleMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillvehicle/FinBillVehicleMapper.java index 197a670d31..e90bbda683 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillvehicle/FinBillVehicleMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillvehicle/FinBillVehicleMapper.java @@ -71,7 +71,6 @@ public interface FinBillVehicleMapper extends BaseMapper { AppInvoicingInfoVinNoVo selDetailsByVinNo(@Param("vinNo") String vinNo); - @Select("select * from fin_bill_vehicle where vehSid = #{vehSid}") FinBillVehicleDetailsVo fetchByVehSid(String vehSid); @Update("UPDATE fin_bill_vehicle SET state = 0 WHERE billAppSid = #{sid}") @@ -82,4 +81,6 @@ public interface FinBillVehicleMapper extends BaseMapper { @Select("select * from fin_bill_vehicle where billAppSid = #{sid}") List fetchByMainSid(String sid); + + List fetchByUseOrgSid(@Param(Constants.WRAPPER) Wrapper qw); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillvehicle/FinBillVehicleMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillvehicle/FinBillVehicleMapper.xml index 8b4be891ae..1507d51e1d 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillvehicle/FinBillVehicleMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillvehicle/FinBillVehicleMapper.xml @@ -5,12 +5,16 @@ + + + + \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillvehicle/FinBillVehicleRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillvehicle/FinBillVehicleRest.java index 2d5ca1e0c7..941ee0aae8 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillvehicle/FinBillVehicleRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillvehicle/FinBillVehicleRest.java @@ -106,4 +106,11 @@ public class FinBillVehicleRest implements FinBillVehicleFeign { FinBillVehicleDetailsVo finBillVehicleDetailsVo = finBillVehicleService.fetchByVehSid(vehSid); return rb.success().setData(finBillVehicleDetailsVo); } + + @Override + public ResultBean> fetchByUseOrgSid(String useOrgSid,String contractNo) { + ResultBean rb = ResultBean.fireFail(); + List vehSids = finBillVehicleService.fetchByUseOrgSid(useOrgSid,contractNo); + return rb.success().setData(vehSids); + } } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillvehicle/FinBillVehicleService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillvehicle/FinBillVehicleService.java index c49030a7c9..ee3855009f 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillvehicle/FinBillVehicleService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillvehicle/FinBillVehicleService.java @@ -29,9 +29,12 @@ import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum; +import com.yxt.anrui.fin.api.finbillapplication.FinBillApplication; +import com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationFeign; import com.yxt.anrui.fin.api.finbillfile.FinBillFileAppendxVo; import com.yxt.anrui.fin.api.finbillfile.FinBillFileVo; import com.yxt.anrui.fin.api.finbillvehicle.*; +import com.yxt.anrui.fin.biz.finbillapplication.FinBillApplicationService; import com.yxt.anrui.fin.biz.finbillfile.FinBillFileService; import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; @@ -149,4 +152,13 @@ public class FinBillVehicleService extends MybatisBaseService fetchByMainSid(String sid) { return baseMapper.fetchByMainSid(sid); } + + public List fetchByUseOrgSid(String useOrgSid,String contractNo) { + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("fba.useOrgSid",useOrgSid); + qw.eq("fba.contractNo",contractNo); + qw.ne("fba.nodeState","待提交"); + qw.ne("fba.nodeState","终止"); + return baseMapper.fetchByUseOrgSid(qw); + } } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java index 33ec7ee451..5021d15179 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java @@ -800,6 +800,12 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService if (finVehicleInvoice != null) { InvoiceVo invoiceVo = new InvoiceVo(); BeanUtils.copyProperties(finVehicleInvoice, invoiceVo); + if(finVehicleInvoice.getInvoiceAmount() != null){ + invoiceVo.setInvoiceAmount(finVehicleInvoice.getInvoiceAmount().toString()); + } + if(finVehicleInvoice.getInvoiceDate() != null){ + invoiceVo.setInvoiceDate(DateUtil.format(finVehicleInvoice.getInvoiceDate(),"yyyy-MM-dd")); + } receiveInvoiceVo.setInvoiceVo(invoiceVo); } return rb.success().setData(receiveInvoiceVo); diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java index 48c0bb2121..80f1035a87 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java @@ -296,6 +296,12 @@ public class FinVehicleInvoiceService extends MybatisBaseService0){ + return rb.setMsg("抵顶首年保险费不能超过保险费用"); + } + } + } + } + //是否勾选购置税 + if (dto.isPurchaseTaxCb()) { + //购置税 + String purchaseTax = dto.getPurchaseTax(); + if (StringUtils.isBlank(purchaseTax)) { + return rb.setMsg("请输入购置税"); + } else{ + if (StringUtils.isNotBlank(dto.getOffsetPurchasetax())) { + if(new BigDecimal(dto.getOffsetPurchasetax()).compareTo(new BigDecimal(purchaseTax))>0){ + return rb.setMsg("抵顶购置税不能超过购置税"); + } + } + } + + } + } //查询金融方案 LoanSolutions loanSolutions = baseMapper.selectBySaleOrderSid(dto.getSaleOrderSid()); @@ -191,6 +243,11 @@ public class LoanSolutionsService extends MybatisBaseService0){ + return rb.setMsg("抵顶首年保险费不能超过保险费用"); + } + } } else { loanTotal = loanTotal.add(new BigDecimal(BigInteger.ZERO)); loanSolutions.setPremiumCb(0); @@ -206,12 +263,17 @@ public class LoanSolutionsService extends MybatisBaseService0){ + return rb.setMsg("抵顶购置税不能超过购置税"); + } + } } else { loanTotal = loanTotal.add(new BigDecimal(BigInteger.ZERO)); loanSolutions.setPurchaseTaxCb(0); } //是否勾选车损上浮 - if (dto.isVehDamageFloatCb()) { + /* if (dto.isVehDamageFloatCb()) { //车损上浮 String vehDamageFloat = dto.getVehDamageFloat(); if (StringUtils.isNotBlank(vehDamageFloat)) { @@ -224,7 +286,7 @@ public class LoanSolutionsService extends MybatisBaseService zcHgzImages = new ArrayList<>(); } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/VinListVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/VinListVo.java index 72b4a83371..2b63a70d1f 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/VinListVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/VinListVo.java @@ -5,6 +5,9 @@ import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.ArrayList; +import java.util.List; + @Data public class VinListVo implements Vo { @@ -28,4 +31,6 @@ public class VinListVo implements Vo { private String certificateStateKey; // 合格证状态key @ApiModelProperty("合格证状态value") private String certificateState; // 合格证状态value + @ApiModelProperty("主车合格证照片") + private List zcHgzImages = new ArrayList<>(); } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionsDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionsDetailsVo.java index 3d7405c684..69994a774b 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionsDetailsVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionsDetailsVo.java @@ -172,4 +172,11 @@ public class AppSolutionsDetailsVo implements Vo { @ApiModelProperty("名义留购价") @JsonSerialize(using = ToStringSerializer.class) private String nominalPrice; + + @ApiModelProperty("单台成交价") + private String finalPrice; + @ApiModelProperty("挂车价格") + private String gcPrice; + @ApiModelProperty("上装成交价") + private String szPrice; } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java index 9e5810e04c..a3747d6006 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java @@ -248,6 +248,7 @@ public class AppBusAdvanceGinvoiceapplyService { vinListVo.setOpenTickSid(finBillVehicle.getOpenTickSid()); vinListVo.setInvoiceName(finBillVehicle.getOpenTickName()); vinListVo.setInvoiceInfo(finBillVehicle.getOpenTickRemarks()); + vinListVo.setZcHgzImages(finBillVehicle.getCertificatePhoto()); vinListVos.add(vinListVo); } } @@ -858,6 +859,7 @@ public class AppBusAdvanceGinvoiceapplyService { vinListVo.setOpenTickSid(finBillVehicle.getOpenTickSid()); vinListVo.setInvoiceName(finBillVehicle.getOpenTickName()); vinListVo.setInvoiceInfo(finBillVehicle.getOpenTickRemarks()); + vinListVo.setZcHgzImages(finBillVehicle.getCertificatePhoto()); vinListVos.add(vinListVo); } } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/approval/AppRovalService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/approval/AppRovalService.java index fe4709fac7..eb569a8962 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/approval/AppRovalService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/approval/AppRovalService.java @@ -114,6 +114,7 @@ public class AppRovalService { FinBillTrailerVo finBillTrailerVo = new FinBillTrailerVo(); finBillTrailerVo.setVinNo(trailer.getVinNo()); finBillTrailerVo.setGcVinNo(trailer.getGcVinNo()); + finBillTrailerVo.setOneBillMoney(trailer.getOneBillMoney()); finBillTrailerVos.add(finBillTrailerVo); } }