diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/AppDeliveredDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/AppDeliveredDetailsVo.java index 29e1900ec9..fb21be4280 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/AppDeliveredDetailsVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/AppDeliveredDetailsVo.java @@ -96,5 +96,10 @@ public class AppDeliveredDetailsVo implements Vo { @ApiModelProperty("PC服务费合计2") private String pcDistributorPriceTwoAll; + @ApiModelProperty("销售订单sid") + private String busSalesOrderSid; + + private String taskDefKey; + } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java index cb2a43fc83..91840a42c5 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java @@ -210,4 +210,10 @@ public interface BusDeliveredApplyFeign { @ResponseBody public ResultBean submitAppDeliveredApply(@Valid @RequestBody AppSubmitDeliveredApplyDto dto); + + @ApiOperation("查看车辆的款票情况") + @GetMapping("/deliveredFinSelect") + @ResponseBody + ResultBean deliveredFinSelect(@RequestParam("contractNo") String contractNo, @RequestParam("vinSid") String vinSid); + } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeignFallback.java index 4a2bffce77..261dde0ba4 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeignFallback.java @@ -111,6 +111,11 @@ public class BusDeliveredApplyFeignFallback implements BusDeliveredApplyFeign { return null; } + @Override + public ResultBean deliveredFinSelect(String contractNo, String vinSid) { + return null; + } + @Override public ResultBean complete(BusDeliveredApplyCompleteDto query) { return null; diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyQuery.java index c8f40b58bd..70def67cf3 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyQuery.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyQuery.java @@ -60,5 +60,7 @@ public class BusDeliveredApplyQuery implements Query { private String applyName; @ApiModelProperty(value = "申请人sid") private String applySid; + @ApiModelProperty("销售类型") + private String paymentMethodKey; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredExamineQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredExamineQuery.java index 50e5ed442d..00a86c8b62 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredExamineQuery.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredExamineQuery.java @@ -24,4 +24,8 @@ public class BusDeliveredExamineQuery implements Query { private String applyName; @ApiModelProperty(value = "员工sid") private String staffSid; + @ApiModelProperty("orgPath") + private String orgPath; + + private String paymentMethodKey; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/DeliveredFinVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/DeliveredFinVo.java new file mode 100644 index 0000000000..a7adfe94e3 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/DeliveredFinVo.java @@ -0,0 +1,33 @@ +package com.yxt.anrui.buscenter.api.busdeliveredapply; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2023/4/19 9:22 + * @Description + */ +@Data +public class DeliveredFinVo { + + @ApiModelProperty("车架号") + private String vinNo; + @ApiModelProperty("销售类型") + private String paymentMethod; + @ApiModelProperty("合同编号") + private String contractNo; + @ApiModelProperty("客户名称") + private String customerName; + @ApiModelProperty("车型") + private String modelName; + @ApiModelProperty("款项情况") + private List finSelectVoList = new ArrayList<>(); + @ApiModelProperty("发票情况") + private VinInvoiceVo vinInvoiceVo = new VinInvoiceVo(); + + +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/FinSelectVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/FinSelectVo.java new file mode 100644 index 0000000000..254ae749ce --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/FinSelectVo.java @@ -0,0 +1,26 @@ +package com.yxt.anrui.buscenter.api.busdeliveredapply; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2023/4/19 10:30 + * @Description + */ +@Data +public class FinSelectVo { + + @ApiModelProperty("款项名称") + private String receivablesName; + + @ApiModelProperty("应收金额") + private String reveivableMoney; + @ApiModelProperty("已收金额") + private String subscriptionMoneyAll; + + @ApiModelProperty("未收金额") + private String notSubscriptionMoney; + + private String remarks; +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/VinInvoiceVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/VinInvoiceVo.java new file mode 100644 index 0000000000..eec697914a --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/VinInvoiceVo.java @@ -0,0 +1,45 @@ +package com.yxt.anrui.buscenter.api.busdeliveredapply; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * @Author dimengzhe + * @Date 2023/4/19 10:35 + * @Description + */ +@Data +public class VinInvoiceVo { + + //开票名称 + private String invoicingName; + //税号 + private String invoiceNo; + //开票单位 + private String invoiceTitle; + //开票类型 + private String invoiceType; + //开票状态 + private String billingState; + //开票金额 + private String invoiceAmount; + //开票日期 + private String invoiceDate; + //移交状态 + private String transferState; + @ApiModelProperty("地址") + private String address; + @ApiModelProperty("联系电话") + private String telPhone; + @ApiModelProperty("开户行") + private String openingBank; + @ApiModelProperty("银行账号") + private String bankNum; + @ApiModelProperty("接收人") + private String recipient; + @ApiModelProperty("移交日期") + private String transferTime; +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverFeign.java index 6e20ab9c02..d1aa312a60 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverFeign.java @@ -12,12 +12,14 @@ import org.springframework.web.bind.annotation.*; import java.text.ParseException; import java.util.List; + /** * @author Administrator * @description * @date 2023/4/13 14:58 */ + @Api(tags = "优惠包交接表") @FeignClient( contextId = "anrui-buscenter-BusDiscountpackageHandover", @@ -52,6 +54,6 @@ public interface BusDiscountpackageHandoverFeign { @ApiOperation(("上传图片")) @PostMapping("/uploadPicture") - public ResultBean uploadPicture(@RequestBody List fileDtos , String sid); + public ResultBean uploadPicture(@RequestBody BusDiscountpackageHandoverDto dto); } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverFeignFallback.java index 50a9559f1e..7449eb3b64 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdiscountpackagehandover/BusDiscountpackageHandoverFeignFallback.java @@ -53,7 +53,9 @@ public class BusDiscountpackageHandoverFeignFallback implements BusDiscountpacka } @Override - public ResultBean uploadPicture(List fileDto, String sid) { + public ResultBean uploadPicture(BusDiscountpackageHandoverDto dto) { return null; } + + } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busfile/BusFileDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busfile/BusFileDto.java index 77e5d5841d..002a086dc5 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busfile/BusFileDto.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busfile/BusFileDto.java @@ -12,6 +12,7 @@ import lombok.Data; @Data public class BusFileDto implements Dto { + @ApiModelProperty("关联sid") private String linkSid; @ApiModelProperty("文件类型") diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java index fd654dba03..ea2a27eb06 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java @@ -137,5 +137,7 @@ public class AppOrderDetailsVo implements Vo { private List financeForms = new ArrayList<>(); + private String busSalesOrderSid; + } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java index ae6f7f2c37..3748a4b0ff 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java @@ -400,6 +400,13 @@ public class BusDeliveredService extends MybatisBaseService resultBean = busSalesOrderService.getSaleOrderDetailsByContractNo(busDeliveredApply.getContractNo()); + if (!resultBean.getSuccess()) { + log.error("获取销售订单详情出错啦！！！"); + return rb; + } + appDeliveredDetailsVo.setTaskDefKey(busDeliveredApply.getTaskDefKey()); + appDeliveredDetailsVo.setBusSalesOrderSid(resultBean.getData().getBusSalesOrderSid()); List busDeliveredApplyDetailsList = busDeliveredApplyDetailsService.selectByApplySid(query.getOutboundSid()); busDeliveredApplyDetailsList.removeAll(Collections.singleton(null)); //pc发起人 diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml index 161b83a0f0..3dbcdba573 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml @@ -95,7 +95,7 @@ + \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedRest.java index e717c1a974..546ea34428 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedRest.java @@ -129,7 +129,12 @@ public class FinUncollectedReceivablesDetailedRest implements FinUncollectedRece @Override public ResultBean createPdf(String detailedSid, String createBySid) throws Exception { - return finUncollectedReceivablesDetailedService.createPdf(detailedSid,createBySid); + return finUncollectedReceivablesDetailedService.createPdf(detailedSid, createBySid); + } + + @Override + public ResultBean receivedSelect(String busVinSid, String vinSid) { + return finUncollectedReceivablesDetailedService.receivedSelect(busVinSid, vinSid); } 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 c302d6f729..2f0f7e2703 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 @@ -36,13 +36,15 @@ import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign; import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingDetailsVo; -import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingFeign; import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed; import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo; import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.*; +import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoice; +import com.yxt.anrui.fin.api.finvehicleinvoice.InvoiceVo; import com.yxt.anrui.fin.biz.fincollectionconfirmation.FinCollectionConfirmationService; import com.yxt.anrui.fin.biz.fincompanyinvoicing.FinCompanyInvoicingService; import com.yxt.anrui.fin.biz.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedService; +import com.yxt.anrui.fin.biz.finvehicleinvoice.FinVehicleInvoiceService; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoFeign; @@ -63,10 +65,8 @@ import com.yxt.common.core.vo.PagerVo; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; -import javax.annotation.Resource; import java.io.File; import java.io.InputStream; import java.math.BigDecimal; @@ -118,6 +118,8 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService private LoanSolutionsFeign loanSolutionsFeign; @Autowired private FinCompanyInvoicingService finCompanyInvoicingService; + @Autowired + private FinVehicleInvoiceService finVehicleInvoiceService; private QueryWrapper createQueryWrapper(FinUncollectedReceivablesDetailedQuery query) { /** @@ -343,6 +345,7 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService qw.orderByDesc("createTime"); return qw; } + public PagerVo detailedListPageVo(PagerQuery pq) { FinUncollectedReceivablesDetailedQuery params = pq.getParams(); String orgPath = params.getOrgPath(); @@ -742,4 +745,27 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService } } + public ResultBean receivedSelect(String busVinSid, String vinSid) { + ResultBean rb = ResultBean.fireFail(); + ReceiveInvoiceVo receiveInvoiceVo = new ReceiveInvoiceVo(); + //根据销售订单车辆sid查询应收未收表中该车的情况 + List receiveSeleteVoList = baseMapper.receivedSelect(busVinSid); + receiveSeleteVoList.removeAll(Collections.singleton(null)); + if (!receiveSeleteVoList.isEmpty()) { + for (int i = 0; i < receiveSeleteVoList.size(); i++) { + ReceiveSeleteVo receiveSeleteVo = receiveSeleteVoList.get(i); + BigDecimal notSubscriptionMoney = new BigDecimal(receiveSeleteVo.getReveivableMoney()).subtract(new BigDecimal(receiveSeleteVo.getSubscriptionMoneyAll())); + receiveSeleteVo.setNotSubscriptionMoney(notSubscriptionMoney.toString()); + } + } + receiveInvoiceVo.setReceiveSeleteVoList(receiveSeleteVoList); + //根据车辆sid查询该车辆的发票信息 + FinVehicleInvoice finVehicleInvoice = finVehicleInvoiceService.selectByVinSid(vinSid); + if(finVehicleInvoice != null){ + InvoiceVo invoiceVo = new InvoiceVo(); + BeanUtils.copyProperties(finVehicleInvoice,invoiceVo); + receiveInvoiceVo.setInvoiceVo(invoiceVo); + } + return rb.success().setData(receiveInvoiceVo); + } } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.java index 0a8d784ab3..8f96b09bf4 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.java @@ -44,4 +44,5 @@ public interface FinVehicleInvoiceMapper extends BaseMapper { FinVehicleInvoiceDetailsVo getInvoiceDetailsBySid(String sid); + FinVehicleInvoice selectByVinSid(String vinSid); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.xml index 7d224ecb79..c57d7d08ed 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.xml @@ -22,6 +22,12 @@ + + + + + + @@ -48,7 +54,13 @@ createTime, invoiceCode, invoiceNo, - filePath + filePath, + address, + telPhone, + openingBank, + bankNum, + recipient, + transferTime FROM fin_vehicle_invoice ${ew.sqlSegment} @@ -117,6 +129,12 @@ + + + + + + + \ No newline at end of file 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 54991d7cc1..fc6e3a5e25 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 @@ -235,4 +235,8 @@ public class FinVehicleInvoiceService extends MybatisBaseService AND ahpi.START_TIME_ #{endDate} - - and (A0.NAME_ = 'orderNames' and A0.TEXT_ LIKE concat('%',#{names},'%') or arpd.NAME_ LIKE concat('%',#{proDefName},'%')) + + and (A0.NAME_ = 'orderNames' and A0.TEXT_ LIKE concat('%',#{proDefName},'%') or arpd.NAME_ LIKE concat('%',#{proDefName},'%')) + + + and A0.NAME_ = 'INITIATOR' and A0.TEXT_ LIKE concat('%',#{startUserSid},'%') ) flow GROUP BY flow.PROC_INST_ID_ ORDER BY flow.START_TIME_ DESC - + LIMIT #{page},#{size} diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java index 3ce16a9139..d8af62359e 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java @@ -465,7 +465,7 @@ public class FlowTaskService extends MybatisBaseService page = new Page<>(); TaskQuery taskQuery = taskService.createTaskQuery(); - String startUserNameParams = ""; + String startUserSidParams = ""; String names = ""; // 流程参数 @@ -486,8 +486,8 @@ public class FlowTaskService extends MybatisBaseService v.getStartUserName().contains(finalStartUserNameParams)).collect(Collectors.toList()); - } - if(StringUtils.isNotBlank(names)){ - String finalNames = names; - flowList = flowList.stream().filter(v -> v.getProcDefName().contains(finalNames)).collect(Collectors.toList()); - } - page.setTotal(flowList.size()); - flowList = flowList.stream().skip((pageNum - 1) * pageSize).limit(pageSize). - collect(Collectors.toList());*/ page.setRecords(flowList); ResultBean> rb = new ResultBean>(); return rb.success().setData(page); @@ -704,8 +695,6 @@ public class FlowTaskService extends MybatisBaseService page = new Page<>(); Map paraMap = new HashMap<>(); List> ll = new ArrayList<>(); - String startUserNameParams = ""; - String names = ""; for (BusinessTaskParam btq : params) { paraMap.put(btq.getField(), btq.getValue()); Map mapss = new HashMap<>(); @@ -720,15 +709,6 @@ public class FlowTaskService extends MybatisBaseService v.getStartUserName().contains(finalStartUserNameParams)).collect(Collectors.toList()); - } - if(StringUtils.isNotBlank(names)){ - String finalNames = names; - hisTaskList = hisTaskList.stream().filter(v -> v.getProcDefName().contains(finalNames)).collect(Collectors.toList()); - } - page.setTotal(hisTaskList.size()); - hisTaskList = hisTaskList.stream().skip((pageNum - 1) * pageSize).limit(pageSize). - collect(Collectors.toList());*/ page.setTotal(count); page.setRecords(hisTaskList); ResultBean> rb = new ResultBean>(); @@ -864,11 +832,11 @@ public class FlowTaskService extends MybatisBaseService{{ formobj.modelName }} + + +
全款/贷款销售指导价
+ {{ formobj.guidedPrice }} + + +
最新更新时间
+ + {{ formobj.newUpdateDate }} + {{ formobj.newUpdateDate }} + + +
常用配置
@@ -292,7 +305,9 @@ export default { vehicleList: [], vehicleOrderSid: '', orgPath: '', - orgPriceDate: '' + orgPriceDate: '', + guidedPrice: '', + newUpdateDate: '' }, rules: {}, submitdisabled: false @@ -961,7 +976,7 @@ export default { align-items: center; } .spanOneWidth { - width: 120px !important; + width: 140px !important; } .spanTwoWidth { line-height: 42px; @@ -985,6 +1000,6 @@ export default { width: 40% !important; } .addinputwOne { - margin-left: 115px !important; + margin-left: 130px !important; } diff --git a/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangInfo.vue b/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangInfo.vue index 6d62f00089..5847d86831 100644 --- a/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangInfo.vue +++ b/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangInfo.vue @@ -45,6 +45,19 @@ {{ formobj.modelName }} + + +
全款/贷款销售指导价
+ {{ formobj.guidedPrice }} + + +
最新更新时间
+ + {{ formobj.newUpdateDate }} + {{ formobj.newUpdateDate }} + + +
常用配置
@@ -286,7 +299,9 @@ export default { scmFiles: [], vehicleList: [], vehicleOrderSid: '', - orgPriceDate: '' + orgPriceDate: '', + guidedPrice: '', + newUpdateDate: '' }, rules: {}, submitdisabled: false @@ -377,7 +392,7 @@ export default { align-items: center; } .spanOneWidth { - width: 120px !important; + width: 140px !important; } .spanTwoWidth { line-height: 42px; @@ -398,6 +413,6 @@ export default { width: 100%; } .addinputwOne { - margin-left: 115px !important; + margin-left: 130px !important; } diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangDaiBanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangDaiBanInfo.vue index 945bb0fb5c..f616ac873f 100644 --- a/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangDaiBanInfo.vue +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangDaiBanInfo.vue @@ -47,6 +47,19 @@ {{ formobj.modelName }} + + +
全款/贷款销售指导价
+ {{ formobj.guidedPrice }} + + +
最新更新时间
+ + {{ formobj.newUpdateDate }} + {{ formobj.newUpdateDate }} + + +
常用配置
@@ -321,7 +334,9 @@ export default { scmFiles: [], vehicleList: [], vehicleOrderSid: '', - orgPriceDate: '' + orgPriceDate: '', + guidedPrice: '', + newUpdateDate: '' }, // 环节所需参数 linkByParameter: { diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangEdit.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangEdit.vue index a151bb4ce7..4d7bab3eb1 100644 --- a/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangEdit.vue +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangEdit.vue @@ -46,6 +46,19 @@ {{ formobj.modelName }} + + +
全款/贷款销售指导价
+ {{ formobj.guidedPrice }} + + +
最新更新时间
+ + {{ formobj.newUpdateDate }} + {{ formobj.newUpdateDate }} + + +
常用配置
@@ -289,7 +302,9 @@ export default { vehicleList: [], vehicleOrderSid: '', orgPath: '', - orgPriceDate: '' + orgPriceDate: '', + guidedPrice: '', + newUpdateDate: '' }, rules: {}, submitdisabled: false diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangYiBanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangYiBanInfo.vue index 54a22104d5..e932ae1bfa 100644 --- a/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangYiBanInfo.vue +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangYiBanInfo.vue @@ -45,6 +45,19 @@ {{ formobj.modelName }} + + +
全款/贷款销售指导价
+ {{ formobj.guidedPrice }} + + +
最新更新时间
+ + {{ formobj.newUpdateDate }} + {{ formobj.newUpdateDate }} + + +
常用配置
@@ -286,7 +299,9 @@ export default { scmFiles: [], vehicleList: [], vehicleOrderSid: '', - orgPriceDate: '' + orgPriceDate: '', + guidedPrice: '', + newUpdateDate: '' }, // 环节所需参数 linkByParameter: {