From e9350a635dc9ca73e920dd70ea44e845f57b5fa3 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Thu, 27 Apr 2023 10:07:31 +0800 Subject: [PATCH 01/17] =?UTF-8?q?=E6=AC=A0=E6=AC=BE=E5=BC=80=E7=A5=A8?= =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java index 1c4b46db34..b61c46f538 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java @@ -503,7 +503,7 @@ public class ScmApplyInboundService extends MybatisBaseService Date: Thu, 27 Apr 2023 10:15:35 +0800 Subject: [PATCH 02/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/busdeliveredapply/BusDeliveredApplyService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 c55c030b4c..2dd094b8e5 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 @@ -699,7 +699,7 @@ public class BusDeliveredApplyService extends MybatisBaseService vinList = detailsList.stream().map(v -> v.getVinNo()).collect(Collectors.toList()); String vins = String.join(",", vinList); - busDiscountpackageHandoverDto.setVins(vins); + busDiscountpackageHandoverDto.setVinNo(vins); busDiscountpackageHandoverDto.setRecUserSid(busDeliveredApply.getApplySid()); busDiscountpackageHandoverDto.setCustomerName(busDeliveredApply.getName()); busDiscountpackageHandoverDto.setRecName(busDeliveredApply.getApplyName()); From 2d0368df337efde0bddf6fc49b89a523ac044f11 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Thu, 27 Apr 2023 10:29:01 +0800 Subject: [PATCH 03/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/commoncontract/ContractPageQuery.java | 9 +- .../commoncontract/CommonContractService.java | 6 ++ .../AppArrearsCarryInfoVo.java | 8 ++ .../busarrearscarryvehicleapply/PdfVo.java | 22 +++++ .../BusSalesOrderVehicleFeign.java | 6 ++ .../BusSalesOrderVehicleFeignFallback.java | 5 ++ .../api/bussalesordervehicle/QCarQuery.java | 5 +- .../api/bussalesordervehicle/QCarVo.java | 8 +- .../BusArrearsCarryVehicleApplyService.java | 28 ++++-- .../BusSalesOrderVehicleMapper.java | 3 + .../BusSalesOrderVehicleMapper.xml | 20 ++++- .../BusSalesOrderVehicleRest.java | 9 ++ .../BusSalesOrderVehicleService.java | 86 ++++++++++++++++--- .../arrearsTakeCar/AdvanceArrearsInfoVo.java | 9 +- 14 files changed, 199 insertions(+), 25 deletions(-) create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/PdfVo.java diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/ContractPageQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/ContractPageQuery.java index 5eec77cf01..eabdd8f0cd 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/ContractPageQuery.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/ContractPageQuery.java @@ -11,10 +11,15 @@ public class ContractPageQuery implements Query { @ApiModelProperty("用户sid") private String userSid; - @ApiModelProperty("车架号 客户名称 合同编号") + @ApiModelProperty("app车架号 客户名称 合同编号") private String name; - @ApiModelProperty("状态") + @ApiModelProperty("状态:1欠款提车，2欠款开票") private int stateType; @ApiModelProperty("组织全路径") private String orgPath; + + @ApiModelProperty("pc客户名称") + private String customerName; + @ApiModelProperty("pc合同编号") + private String contractNo; } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java index 56912546a9..f4d4757017 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java @@ -2663,6 +2663,12 @@ public class CommonContractService extends MybatisBaseService wrapper.like("partyB", params.getName()).or().like("contractNo", params.getName())); } + if(StringUtils.isNotBlank(params.getContractNo())){ + qw.like("contractNo", params.getContractNo()); + } + if(StringUtils.isNotBlank(params.getCustomerName())){ + qw.like("partyB",params.getCustomerName()); + } qw.orderByDesc("createDate"); } IPage page = PagerUtil.queryToPage(query); diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppArrearsCarryInfoVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppArrearsCarryInfoVo.java index 11ad695061..86155e7a26 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppArrearsCarryInfoVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/AppArrearsCarryInfoVo.java @@ -116,6 +116,14 @@ public class AppArrearsCarryInfoVo implements Vo { private List gdLetter = new ArrayList<>(); @ApiModelProperty("总经理担保书") private List zjlLetter = new ArrayList<>(); + @ApiModelProperty("总经理担保书下载地址") + private String zjlLetterDownloadUrl; + @ApiModelProperty("车辆买卖合同下载地址") + private String carContractDownloadUrl; + @ApiModelProperty("欠款提车担保承诺书下载地址") + private String guaranteeLetterDownloadUrl; + @ApiModelProperty("股东会对外担保决议下载地址") + private String gdLetterDownloadUrl; @ApiModelProperty("组织全路径") private String orgPath; diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/PdfVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/PdfVo.java new file mode 100644 index 0000000000..76d0c88a79 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/PdfVo.java @@ -0,0 +1,22 @@ +package com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2023/4/27 9:35 + * @Description + */ +@Data +public class PdfVo implements Vo { + private static final long serialVersionUID = 8072514740863334811L; + + @ApiModelProperty("名称") + private String name; + @ApiModelProperty("下载地址") + private String downUrl; + @ApiModelProperty("类型") + private String type; +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java index 759bd5b474..810c3815b3 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java @@ -25,7 +25,9 @@ *********************************************************/ package com.yxt.anrui.buscenter.api.bussalesordervehicle; +import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; @@ -87,4 +89,8 @@ public interface BusSalesOrderVehicleFeign { @ApiOperation("欠款提车选择车辆") @PostMapping("/getCanUseCars") ResultBean> getCanUseCars(@RequestBody QCarQuery query); + + @ApiOperation("PC欠款提车选择车辆") + @PostMapping("/getCanUseCarsPage") + ResultBean>> getCanUseCarsPage(@RequestBody PagerQuery pagerQuery); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java index f685329d5f..240c75bc09 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java @@ -83,4 +83,9 @@ public class BusSalesOrderVehicleFeignFallback implements BusSalesOrderVehicleFe return null; } + @Override + public ResultBean>> getCanUseCarsPage(PagerQuery pagerQuery) { + return null; + } + } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/QCarQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/QCarQuery.java index 5b22323a7a..1647106775 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/QCarQuery.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/QCarQuery.java @@ -1,5 +1,6 @@ package com.yxt.anrui.buscenter.api.bussalesordervehicle; +import com.yxt.common.core.query.Query; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -11,10 +12,12 @@ import java.util.List; * @Description */ @Data -public class QCarQuery { +public class QCarQuery implements Query { @ApiModelProperty(value = "合同编号") private String contractNo; @ApiModelProperty(value = "车辆sid") private List vinSids; + @ApiModelProperty("车架号检索") + private String vinNo; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/QCarVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/QCarVo.java index 6d810ece69..61939cdd12 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/QCarVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/QCarVo.java @@ -7,6 +7,7 @@ import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.ArrayList; import java.util.List; /** @@ -29,8 +30,13 @@ public class QCarVo implements Vo { @ApiModelProperty("销售订单车辆sid") @JsonIgnore private String busVinSid; + @ApiModelProperty("合同编号") + private String contractNo; + @ApiModelProperty("客户名称") + private String customerName; + @ApiModelProperty("移动端使用") private AdCarListVo vinDto; - private List gcList; + private List gcList = new ArrayList<>(); } 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 1a4e365878..dec827ebe5 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 @@ -556,7 +556,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService subscribtAllResultBean = finCollectionConfirmationFeign.selectCollectionMoney(contractNo); - if(subscribtAllResultBean.getData() != null){ + if (subscribtAllResultBean.getData() != null) { appArrearsCarryInfoVo.setContractCollectionMoney(subscribtAllResultBean.getData()); } } else { @@ -620,6 +620,24 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService createPdf(String sid, List vinList, String commitmentMoneyDate) { + List list = new ArrayList<>(); + //新增生成附件（新车买卖合同（欠款）、欠款提车担保承诺书、总经理担保承诺书、股东会对外担保决议） + //车架号发生变化，重新生成新车买卖合同（欠款）、欠款提车担保承诺书、总经理担保承诺书、 + //回购日期发生变化，重新生成欠款提车担保承诺书 + + return list; + + } + /** * 移动端-新增欠款提车申请 * @@ -629,21 +647,21 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService adCarListVoList = dto.getVinList(); - if(adCarListVoList.isEmpty()){ + if (adCarListVoList.isEmpty()) { return rb.setMsg("请选择车辆"); } - }else{ + } else { //修改保存 } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java index 23e305dcf5..b7210791fe 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java @@ -27,6 +27,7 @@ package com.yxt.anrui.buscenter.biz.bussalesordervehicle; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.yxt.anrui.base.api.basevehicle.BaseVehicle; import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppNowCarListVo; @@ -117,4 +118,6 @@ public interface BusSalesOrderVehicleMapper extends BaseMapper appVehicleQKKPList(@Param(Constants.WRAPPER) QueryWrapper qw); List getCanUseCars(@Param(Constants.WRAPPER)QueryWrapper qw); + + IPage selectPageVo(IPage page,@Param(Constants.WRAPPER) QueryWrapper qw); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml index 65031b1d82..b3fee41fec 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml @@ -114,7 +114,25 @@ select bv.linkNo as vin, bv.linkSid carSid, bm.finalPrice as price, - bv.sid busVinSid + bv.sid busVinSid, + bo.contractNo, + bo.customerName + from bus_sales_order_vehicle bv + left join bus_sales_order bo on bo.sid = bv.salesOrderSid + left join bus_sales_order_model bm on bo.sid = bm.salesOrderSid + + ${ew.sqlSegment} + and length(bv.linkSid)>0 + + + + - SELECT * FROM bus_arrears_carry_vehicle_details - ${ew.sqlSegment} + SELECT * + FROM bus_arrears_carry_vehicle_details + + ${ew.sqlSegment} + + + + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsService.java index 5e1aad4537..df801a8eba 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicledetails/BusArrearsCarryVehicleDetailsService.java @@ -123,4 +123,12 @@ public class BusArrearsCarryVehicleDetailsService extends MybatisBaseService selectByApplySid(String sid) { + return baseMapper.selectByApplySid(sid); + } + + public List selectDetailsByApplySid(String sid) { + return baseMapper.selectDetailsByApplySid(sid); + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscenterfile/BuscenterFileService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscenterfile/BuscenterFileService.java index 79d0c1954c..4af8c43513 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscenterfile/BuscenterFileService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscenterfile/BuscenterFileService.java @@ -1,8 +1,6 @@ package com.yxt.anrui.buscenter.biz.buscenterfile; import com.yxt.anrui.buscenter.api.buscenterfile.BuscenterFile; -import com.yxt.anrui.crm.api.crmfile.CrmFile; -import com.yxt.anrui.crm.api.crmfile.CrmFileAttachTypeEnum; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; import org.springframework.beans.factory.annotation.Autowired; @@ -21,16 +19,16 @@ public class BuscenterFileService extends MybatisBaseService selectByLinkSid(String sid,String attachType) { - return baseMapper.selectByLinkSid(sid,attachType); + public List selectByLinkSid(String sid, String attachType) { + return baseMapper.selectByLinkSid(sid, attachType); } public int deleteByLinkSid(String sid) { return baseMapper.deleteByLinkSid(sid); } - public void saveAll(String sid, List entrustConfirmImages, String attachType) { - entrustConfirmImages.stream().forEach(str -> { + public void saveAll(String sid, List imageFiles, String attachType) { + imageFiles.stream().forEach(str -> { BuscenterFile buscenterFile = new BuscenterFile(); File file = new File(fileUploadComponent.getUploadPath() + str.replace("/", File.separator)); if (file != null) { @@ -50,6 +48,21 @@ public class BuscenterFileService extends MybatisBaseService gcList = new ArrayList<>(); ResultBean voResultBean = baseTrailerFeign.trailerList(qCarVo.getCarSid(), query.getContractNo()); if(voResultBean.getData() != null){ diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/gd.ftl b/anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/gd.ftl new file mode 100644 index 0000000000..e6c70078d1 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/gd.ftl @@ -0,0 +1,834 @@ + + + + + dimengzhe + 孟哲 + 2 + 1 + 2023-04-27T07:39:00Z + 2023-04-27T07:39:00Z + 1 + 42 + 245 + 2 + 1 + 286 + 16 + + + 2052-11.1.0.14036 + 8D9EF930347E48428DF2F06AAB2A4FF2_12 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 股东会对外担保决议 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 议题：关于是否同意本公司提供担保事宜。 + + + + + + + + + + + + + + + + + + + + + + 根据《公司法》和公司章程规定，股东会会议应到股东 + + + + + + + + + +         + + + + + + + + + 名，实到 + + + + + + + + + +        + + + + + + + + + 名，所持股份占公司全部股份 + + + + + + + + + +   + + + + + + + + + %。本次股东会召集与所作决议符合公司章程和《公司法》的规定，所作决议合法有效。与会股东经审议、表决，一致通过以下决议： + + + + + + + + + + + + + + + + + + + + + + 同意本公司在《欠款提车担保承诺书》中为 + + + + + + + + + + + + + + + + + + + 向 + + + + + + + + + + + + + + + + + + + 提供连带责任担保。 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 与会股东签字： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +           公司（公章） + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 年 月 日 + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AdvanceArrearsDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AdvanceArrearsDto.java index ab18a0e8f8..65390d6ea2 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AdvanceArrearsDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AdvanceArrearsDto.java @@ -12,7 +12,7 @@ import java.util.List; public class AdvanceArrearsDto implements Dto { private static final long serialVersionUID = 6445736018244517900L; - @ApiModelProperty("用户sid") + /* @ApiModelProperty("用户sid") private String userSid; @ApiModelProperty("合同sid") @JsonProperty("contractSid") @@ -49,5 +49,94 @@ public class AdvanceArrearsDto implements Dto { @ApiModelProperty("流程实列id") private String procInsId; @ApiModelProperty("用户sid") + private String taskId;*/ + + @ApiModelProperty("欠款提车申请sid") + private String sid; + @ApiModelProperty("合同编号") + private String contractId; + @ApiModelProperty("发起部门-发起人") + private String publishInfo; + @ApiModelProperty("发起日期") + @JsonProperty("date") + private String createDate; + private String applyDept; + private String applyDeptSid; + private String applyUserSid; + private String applyName; + private String staffUserSid; + @JsonProperty("sellerName") + private String staffName; + private String staffDeptSid; + @ApiModelProperty("销售部门") + @JsonProperty("sellerDept") + private String staffDept; + @JsonProperty("saleType") + @ApiModelProperty("销售类型") + private String paymentMethod; + private String paymentMethodKey; + @ApiModelProperty("开票单位") + private String openTickName; + @ApiModelProperty("客户名称") + @JsonProperty("name") + private String customerName; + @ApiModelProperty("客户sid") + private String customerSid; + @ApiModelProperty("车型") + @JsonProperty("model") + private String modelName; + @ApiModelProperty("车型sid") + private String modelSid; + @ApiModelProperty("配置sid") + private String configSid; + //是否金融部复核 + @ApiModelProperty("是否金融部复核，1是，0否") + private String isFinance; + @ApiModelProperty("金融人员用户sid") + private String financeUserSid; + @ApiModelProperty("金融人员名称") + private String financeName; + + @ApiModelProperty("实例id") + @JsonProperty("procInsId") + private String procInstId; + @ApiModelProperty("任务id") private String taskId; + + @ApiModelProperty("选择车辆列表") + private List vinList = new ArrayList<>(); + + @ApiModelProperty("欠款提车挂车列表") + private List trailersList = new ArrayList<>(); + + @ApiModelProperty("车辆买卖合同") + private List carContract = new ArrayList<>(); + @ApiModelProperty("欠款提车担保承诺书") + private List guaranteeLetter = new ArrayList<>(); + @ApiModelProperty("股东会对外担保决议") + private List gdLetter = new ArrayList<>(); + @ApiModelProperty("总经理担保书") + private List zjlLetter = new ArrayList<>(); + + @ApiModelProperty("组织全路径") + private String orgPath; + + @ApiModelProperty("用户sid") + private String userSid; + + @ApiModelProperty("欠款原因key") + private String reasonKey; + @ApiModelProperty("欠款原因value") + private String reasonValue; + @ApiModelProperty("原因备注") + @JsonProperty("remarks") + private String reason; + @ApiModelProperty("回款日期") + private String commitmentMoneyDate; + @ApiModelProperty("合同总金额") + private String contractMoney; + @ApiModelProperty("平台收款总金额") + private String contractCollectionMoney; + @ApiModelProperty("其他附件") + private List fileList = new ArrayList<>(); } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AppBusArrearsCarryVehicleApplyFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AppBusArrearsCarryVehicleApplyFeign.java index 7fd8e0f129..d4249a7523 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AppBusArrearsCarryVehicleApplyFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AppBusArrearsCarryVehicleApplyFeign.java @@ -61,13 +61,18 @@ public interface AppBusArrearsCarryVehicleApplyFeign { @ApiOperation("选择车辆列表") @GetMapping("/getCanUseCars") @ResponseBody - ResultBean> getCanUseCars(@RequestParam("contractNo") String contractNo, @RequestParam("vinSids") List vinSids); + ResultBean> getCanUseCars(CarsQuery query); @ApiOperation("移动端-保存欠款提车申请") @PostMapping("/saveArrearsApply") @ResponseBody public ResultBean saveArrearsApply(@Valid @RequestBody AdvanceArrearsDto dto); + @ApiOperation("点击生成附件") + @PostMapping("/saveArrearsApplyPdf") + @ResponseBody + public ResultBean saveArrearsApplyPdf(@Valid @RequestBody AdvanceArrearsDto dto); + @ApiOperation("手机端-删除欠款提车") @DeleteMapping("/deleteArrearsTakeCar") @ResponseBody diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AppBusArrearsCarryVehicleApplyFeignFallback.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AppBusArrearsCarryVehicleApplyFeignFallback.java index a97a6d348e..4f35da0f2f 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AppBusArrearsCarryVehicleApplyFeignFallback.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AppBusArrearsCarryVehicleApplyFeignFallback.java @@ -43,7 +43,7 @@ public class AppBusArrearsCarryVehicleApplyFeignFallback implements AppBusArrear } @Override - public ResultBean> getCanUseCars(String contractNo, List vinSids) { + public ResultBean> getCanUseCars(CarsQuery query) { return null; } @@ -52,6 +52,11 @@ public class AppBusArrearsCarryVehicleApplyFeignFallback implements AppBusArrear return null; } + @Override + public ResultBean saveArrearsApplyPdf(AdvanceArrearsDto dto) { + return null; + } + @Override public ResultBean deleteArrearsTakeCar( AdvanceArrearsInfoQuery query) { return null; diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/CarsQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/CarsQuery.java new file mode 100644 index 0000000000..46f2f2d448 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/CarsQuery.java @@ -0,0 +1,19 @@ +package com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar; + +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2023/4/27 16:10 + * @Description + */ +@Data +public class CarsQuery { + + private String contractNo; + + private List vinSids = new ArrayList<>(); +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/arrearsTakeCar/AppBusArrearsCarryVehicleApplyRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/arrearsTakeCar/AppBusArrearsCarryVehicleApplyRest.java index aa9cf48bac..fc1d0fb8b4 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/arrearsTakeCar/AppBusArrearsCarryVehicleApplyRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/arrearsTakeCar/AppBusArrearsCarryVehicleApplyRest.java @@ -58,8 +58,8 @@ public class AppBusArrearsCarryVehicleApplyRest implements AppBusArrearsCarryVeh } @Override - public ResultBean> getCanUseCars(String contractNo, List vinSids) { - return appBusArrearsCarryVehicleApplyService.getCanUseCars(contractNo, vinSids); + public ResultBean> getCanUseCars(CarsQuery query) { + return appBusArrearsCarryVehicleApplyService.getCanUseCars(query); } @Override @@ -67,6 +67,11 @@ public class AppBusArrearsCarryVehicleApplyRest implements AppBusArrearsCarryVeh return appBusArrearsCarryVehicleApplyService.saveArrearsApply(dto); } + @Override + public ResultBean saveArrearsApplyPdf(AdvanceArrearsDto dto) { + return appBusArrearsCarryVehicleApplyService.saveArrearsApplyPdf(dto); + } + @Override public ResultBean deleteArrearsTakeCar(AdvanceArrearsInfoQuery query) { return appBusArrearsCarryVehicleApplyService.deleteArrearsTakeCar(query); diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/arrearsTakeCar/AppBusArrearsCarryVehicleApplyService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/arrearsTakeCar/AppBusArrearsCarryVehicleApplyService.java index c37135de35..085a5074ff 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/arrearsTakeCar/AppBusArrearsCarryVehicleApplyService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/arrearsTakeCar/AppBusArrearsCarryVehicleApplyService.java @@ -91,10 +91,14 @@ public class AppBusArrearsCarryVehicleApplyService { } public ResultBean saveArrearsApply(AdvanceArrearsDto dto) { + ResultBean rb = ResultBean.fireFail(); AppArrearsCarryDto appArrearsCarryDto = new AppArrearsCarryDto(); BeanUtil.copyProperties(dto, appArrearsCarryDto); ResultBean resultBean = busArrearsCarryVehicleApplyFeign.saveArrearsApply(appArrearsCarryDto); - return resultBean; + if(!resultBean.getSuccess()){ + return rb.setMsg(resultBean.getMsg()); + } + return rb.success(); } public ResultBean deleteArrearsTakeCar(AdvanceArrearsInfoQuery query) { @@ -226,11 +230,10 @@ public class AppBusArrearsCarryVehicleApplyService { } - public ResultBean> getCanUseCars(String contractNo, List vinSids) { + public ResultBean> getCanUseCars(CarsQuery query) { ResultBean> rb = ResultBean.fireFail(); QCarQuery qCarQuery = new QCarQuery(); - qCarQuery.setContractNo(contractNo); - qCarQuery.setVinSids(vinSids); + BeanUtil.copyProperties(query,qCarQuery); ResultBean> resultBean = busSalesOrderVehicleFeign.getCanUseCars(qCarQuery); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); @@ -238,4 +241,11 @@ public class AppBusArrearsCarryVehicleApplyService { List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), ArrearsCarVo.class)).collect(Collectors.toList()); return rb.success().setData(voList); } + + public ResultBean saveArrearsApplyPdf(AdvanceArrearsDto dto) { + AppArrearsCarryDto appArrearsCarryDto = new AppArrearsCarryDto(); + BeanUtil.copyProperties(dto, appArrearsCarryDto); + ResultBean resultBean = busArrearsCarryVehicleApplyFeign.saveArrearsApplyPdf(appArrearsCarryDto); + return resultBean; + } } \ No newline at end of file diff --git a/doc/databases/bus-center_tables.sql b/doc/databases/bus-center_tables.sql index ffbca9585b..d2f7ad7d3a 100644 --- a/doc/databases/bus-center_tables.sql +++ b/doc/databases/bus-center_tables.sql @@ -773,3 +773,90 @@ CREATE TABLE `buscenter_file` ) ENGINE = INNODB DEFAULT CHARSET = utf8 COMMENT ='销售附件表'; +-- 欠款提车申请 +DROP TABLE IF EXISTS `bus_arrears_carry_vehicle_apply`; +CREATE TABLE `bus_arrears_carry_vehicle_apply` +( + `id` int(32) NOT NULL AUTO_INCREMENT COMMENT 'id', + `sid` varchar(64) NOT NULL COMMENT 'sid', + `lockVersion` int(32) DEFAULT '0' COMMENT '版本锁', + `createTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `modifyTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `isEnable` int(32) DEFAULT '1' COMMENT '是否可用：1可用，0不可用', + `state` int(32) DEFAULT '1' COMMENT '状态', + `isDelete` int(32) DEFAULT '0' COMMENT '是否删除：0未删除，1已删除', + `remarks` varchar(255) DEFAULT NULL COMMENT '备注', + `createBySid` varchar(64) DEFAULT NULL COMMENT '创建人sid', + `updateBySid` varchar(64) DEFAULT NULL COMMENT '修改人sid', + `billNo` VARCHAR(64) DEFAULT NULL COMMENT '申请单编号', + `contractNo` VARCHAR(200) DEFAULT NULL COMMENT '合同编号', + `customerName` VARCHAR(200) DEFAULT NULL COMMENT '客户名称', + `customerSid` VARCHAR(64) DEFAULT NULL COMMENT '客户sid', + `modelSid` VARCHAR(64) DEFAULT NULL COMMENT '车型sid', + `configSid` VARCHAR(64) DEFAULT NULL COMMENT '配置sid', + `modelName` VARCHAR(255) DEFAULT NULL COMMENT '车型名称', + `contractMoney` decimal(10, 2) DEFAULT NULL COMMENT '合同总金额', + `contractCollectionMoney` decimal(10, 2) DEFAULT NULL COMMENT '合同收款金额', + `arrearsMoney` decimal(10, 2) DEFAULT NULL COMMENT '欠款金额', + `commitmentMoneyDate` VARCHAR(200) DEFAULT NULL COMMENT '承诺回款日期', + `applyName` VARCHAR(200) DEFAULT NULL COMMENT '申请人名称', + `applyUserSid` VARCHAR(64) DEFAULT NULL COMMENT '申请人sid', + `applyDeptSid` VARCHAR(64) DEFAULT NULL COMMENT '发起部门sid', + `applyDept` VARCHAR(64) DEFAULT NULL COMMENT '发起部门名称', + `staffUserSid` VARCHAR(64) DEFAULT NULL COMMENT '销售专员用户sid', + `staffName` VARCHAR(200) DEFAULT NULL COMMENT '销售专员名称', + `staffDeptSid` VARCHAR(64) DEFAULT NULL COMMENT '销售专员部门sid', + `staffDept` VARCHAR(200) DEFAULT NULL COMMENT '销售部门', + `paymentMethod` VARCHAR(200) DEFAULT NULL COMMENT '销售类型', + `paymentMethodKey` VARCHAR(64) DEFAULT NULL COMMENT '销售类型', + `openTickName` VARCHAR(200) DEFAULT NULL COMMENT '开票单位', + `isFinance` VARCHAR(64) DEFAULT NULL COMMENT '是否金融部复核，1是，0否', + `financeUserSid` VARCHAR(64) DEFAULT NULL COMMENT '金融部人员用户sid', + `financeName` VARCHAR(200) DEFAULT NULL COMMENT '金融部人员名称', + `reason` VARCHAR(500) DEFAULT NULL COMMENT '欠款提车原因', + `reasonKey` VARCHAR(64) DEFAULT NULL COMMENT '欠款原因key', + `reasonValue` VARCHAR(64) DEFAULT NULL COMMENT '欠款原因value', + `useOrgSid` VARCHAR(64) DEFAULT NULL COMMENT '分公司sid', + `useOrgName` VARCHAR(200) DEFAULT NULL COMMENT '分公司名称', + `type` VARCHAR(64) DEFAULT NULL COMMENT 'type:1待办理，2已办理', + `nodeState` VARCHAR(64) DEFAULT NULL COMMENT '节点状态', + `taskDefKey` VARCHAR(64) DEFAULT NULL COMMENT '节点id', + `procDefId` VARCHAR(64) DEFAULT NULL COMMENT '流程id', + `procInstId` VARCHAR(64) DEFAULT NULL COMMENT '实例id', + `taskId` VARCHAR(64) DEFAULT NULL COMMENT '任务id', + `orgSidPath` VARCHAR(200) DEFAULT NULL COMMENT '当前用户部门全路径', + `carContractFile` text DEFAULT NULL COMMENT '新车买卖合同欠款', + `guaranteeLetterFile` text DEFAULT NULL COMMENT '担保承诺书', + `gdLetterFile` text DEFAULT NULL COMMENT '股东', + `zjlLetterFile` text DEFAULT NULL COMMENT '总经理', + `otherFile` text DEFAULT NULL COMMENT '其他附件', + PRIMARY KEY (`id`), + KEY `id` (`id`) +) ENGINE = INNODB + DEFAULT CHARSET = utf8 COMMENT ='欠款提车申请'; + +-- 欠款提车车辆信息 +DROP TABLE IF EXISTS `bus_arrears_carry_vehicle_details`; +CREATE TABLE `bus_arrears_carry_vehicle_details` +( + `id` int(32) NOT NULL AUTO_INCREMENT COMMENT 'id', + `sid` varchar(64) NOT NULL COMMENT 'sid', + `lockVersion` int(32) DEFAULT '0' COMMENT '版本锁', + `createTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `modifyTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `isEnable` int(32) DEFAULT '1' COMMENT '是否可用：1可用，0不可用', + `state` int(32) DEFAULT '1' COMMENT '状态', + `isDelete` int(32) DEFAULT '0' COMMENT '是否删除：0未删除，1已删除', + `remarks` varchar(255) DEFAULT NULL COMMENT '备注', + `createBySid` varchar(64) DEFAULT NULL COMMENT '创建人sid', + `updateBySid` varchar(64) DEFAULT NULL COMMENT '修改人sid', + `applySid` VARCHAR(200) DEFAULT NULL COMMENT '合同编号', + `vinNo` varchar(200) DEFAULT NULL COMMENT '车架号', + `vinSid` varchar(64) DEFAULT NULL COMMENT '车辆sid', + `price` decimal(10, 2) DEFAULT NULL COMMENT '成交价', + `subscribedAll` decimal(10, 2) DEFAULT NULL COMMENT '平台总认款', + PRIMARY KEY (`id`), + KEY `id` (`id`) +) ENGINE = INNODB + DEFAULT CHARSET = utf8 COMMENT ='欠款提车车辆信息'; + From 555a06d75e9bfeaf1e2a9648aa7b3fa4e4c4753b Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Thu, 27 Apr 2023 17:58:39 +0800 Subject: [PATCH 06/17] =?UTF-8?q?=E6=AC=A0=E6=AC=BE=E5=BC=80=E7=A5=A8?= =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/biz/basemodelmodprice/BaseModelModpriceService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java index bc04001a24..1fffc8baea 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java @@ -394,7 +394,7 @@ public class BaseModelModpriceService extends MybatisBaseService Date: Thu, 27 Apr 2023 22:37:40 +0800 Subject: [PATCH 07/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../arrearsTakeCar/ArrearsCarryVehiclePageVo.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/ArrearsCarryVehiclePageVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/ArrearsCarryVehiclePageVo.java index 72d3b6a55e..37df7c3a66 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/ArrearsCarryVehiclePageVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/ArrearsCarryVehiclePageVo.java @@ -1,19 +1,15 @@ package com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.math.BigDecimal; - @Data public class ArrearsCarryVehiclePageVo implements Vo { private static final long serialVersionUID = 1607000479637135351L; - @ApiModelProperty("合同sid") - @JsonProperty("contractSid") + @ApiModelProperty("申请单sid") private String sid; @ApiModelProperty("合同状态") @JsonProperty("contractType") From 248e9446226bd2d8eb158afefde020839ee88332 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Fri, 28 Apr 2023 10:17:24 +0800 Subject: [PATCH 08/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusArrearsCarryVehicleApplyMapper.xml | 3 ++- .../BusArrearsCarryVehicleApplyService.java | 22 +++++++++++++++---- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyMapper.xml index c3e510a8dc..0d7e6642f8 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyMapper.xml @@ -66,7 +66,8 @@ customerName, arrearsMoney, commitmentMoneyDate, - applyName + applyName, + DATE_FORMAT(createTime,'%Y-%m-%d') as applyDate FROM bus_arrears_carry_vehicle_apply ${ew.sqlSegment} 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 44523a98df..e1dfdc7cec 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 @@ -76,6 +76,7 @@ import org.springframework.transaction.annotation.Transactional; import java.io.File; import java.io.InputStream; +import java.math.BigDecimal; import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; @@ -591,6 +592,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService carContract = Arrays.asList(busArrearsCarryVehicleApply.getCarContractFile().split(",")); @@ -1043,6 +1045,18 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService carContract = dto.getCarContract(); if (!carContract.isEmpty()) { String carContractImages = String.join(",", carContract).replaceAll(fileUploadComponent.getUrlPrefix(), ""); From 2a85d4e0ddbe3151607ceb397f84ba6f8493baf2 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Fri, 28 Apr 2023 10:28:34 +0800 Subject: [PATCH 09/17] =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E6=9C=80=E6=96=B0=E6=9B=B4=E6=96=B0=E6=97=A5=E6=9C=9F=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E4=B8=BA=E5=BD=93=E6=9C=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui/scm/api/scmapplyinbound/ScmApplyInboundVo.java | 2 ++ .../scm/biz/scmapplyinbound/ScmApplyInboundService.java | 9 +++++++++ 2 files changed, 11 insertions(+) diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundVo.java index 74e1ada794..048f40ae94 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundVo.java @@ -166,4 +166,6 @@ public class ScmApplyInboundVo implements Vo { private String guidedPrice; // 全款/贷款销售指导价 @ApiModelProperty("最新更新时间") private String newUpdateDate; // 最新更新时间 + @ApiModelProperty("判断最新更新时间是否为当月") + private Boolean isNow; // 判断最新更新时间是否为当月 } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java index a5a4fcce1c..f9d0f875bc 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java @@ -336,7 +336,16 @@ public class ScmApplyInboundService extends MybatisBaseService list = scmApplyInboundVehicleService.selectListByAppSid(sid); List scmFileVos = scmFileService.fetchByMainSid(sid); for (ScmFileVo scmFileVo : scmFileVos) { From e228428b677c86e85d32a35338c7a5e803fbc447 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Fri, 28 Apr 2023 11:50:11 +0800 Subject: [PATCH 10/17] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scm/biz/scmapplyinbound/ScmApplyInboundService.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java index f9d0f875bc..e4f96014cf 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java @@ -588,7 +588,12 @@ public class ScmApplyInboundService extends MybatisBaseService flowList = flowRecordVo.getFlowList(); for (FlowTask flowTask : flowList) { - if (flowTask.getTaskName().equals("销售支持部经理审批")) { + if (flowTask.getTaskName().equals("账务部审批")) { + confirmSid = flowTask.getTaskUserInfos().get(0).getAssigneeSid(); + confirmName = flowTask.getTaskUserInfos().get(0).getAssigneeName(); + confirmDate = DateUtil.formatDate(flowTask.getFinishTime()); + break; + }else if (flowTask.getTaskName().equals("销售支持部经理审批")) { confirmSid = flowTask.getTaskUserInfos().get(0).getAssigneeSid(); confirmName = flowTask.getTaskUserInfos().get(0).getAssigneeName(); confirmDate = DateUtil.formatDate(flowTask.getFinishTime()); From aa0077546df69fa6782d8aba72569249c1adc1c5 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Fri, 28 Apr 2023 13:19:13 +0800 Subject: [PATCH 11/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui/base/common/enums/BillTypeEnum.java | 1 + .../BusVehicleApplyService.java | 3 ++ .../BusArrearsCarryVehicleApplyMapper.java | 2 + .../BusArrearsCarryVehicleApplyMapper.xml | 10 ++++- .../BusArrearsCarryVehicleApplyService.java | 22 ++++++++++ .../api/sysorganization/SysFinanceVo.java | 16 ++++++++ .../sysorganization/SysOrganizationFeign.java | 6 +++ .../SysOrganizationFeignFallback.java | 6 ++- .../SysOrganizationMapper.java | 8 +++- .../sysorganization/SysOrganizationMapper.xml | 4 ++ .../sysorganization/SysOrganizationRest.java | 9 ++++ .../SysOrganizationService.java | 41 +++++++++++-------- .../terminal/api/base/common/CommonFeign.java | 5 +++ .../terminal/api/base/common/FinanceVo.java | 19 +++++++++ .../terminal/biz/base/common/CommonRest.java | 9 +++- .../biz/base/common/CommonService.java | 20 ++++++--- 16 files changed, 151 insertions(+), 30 deletions(-) create mode 100644 anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysFinanceVo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/common/FinanceVo.java diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/BillTypeEnum.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/BillTypeEnum.java index 133b37d497..7224d3f2a1 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/BillTypeEnum.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/BillTypeEnum.java @@ -28,6 +28,7 @@ public enum BillTypeEnum { GCRK("GCRK","挂车入库"), SZRK("SZRK","上装入库"), XSDDTCSQ("XSDDTCSQ","销售订单退车申请"), + QKTCSQ("QKTCSQ","欠款提车申请"), ; private String billType; diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java index 8c916d1706..fb27aaeb23 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java @@ -256,6 +256,9 @@ public class BusVehicleApplyService extends MybatisBaseService saveOrUpdateDto(BusVehicleApplyDto dto) { ResultBean rb = ResultBean.fireFail(); String sid = dto.getSid(); + if(StringUtils.isBlank(dto.getApplyTypeKey())){ + return rb.setMsg("采购类型不能为空"); + } List commonAppendixs = dto.getCommonAppendixs(); if (StringUtils.isBlank(sid)) {//新增 //======================================= diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyMapper.java index 3acb12a021..e7289aed37 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyMapper.java @@ -76,4 +76,6 @@ public interface BusArrearsCarryVehicleApplyMapper extends BaseMapper map); void updateType(@Param("businessSid") String businessSid); + + String selectNum(String bill); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyMapper.xml index 0d7e6642f8..d3c6445504 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyMapper.xml @@ -86,7 +86,7 @@ UPDATE bus_arrears_carry_vehicle_apply SET nodeState=#{nodeState} - , nodeId=#{taskDefKey} + , taskDefKey=#{taskDefKey} , procDefId=#{procDefId} @@ -104,4 +104,12 @@ set `type` = '2' where sid = #{businessSid} + + \ No newline at end of file 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 e1dfdc7cec..06f4801dc3 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 @@ -16,7 +16,10 @@ import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateFeign; import com.yxt.anrui.base.api.commonappendix.CommonAppendixDto; import com.yxt.anrui.base.api.commonappendix.CommonAppendixFeign; import com.yxt.anrui.base.api.commoncontract.CommonContractFeign; +import com.yxt.anrui.base.common.enums.BillTypeEnum; import com.yxt.anrui.base.common.enums.VehicleStateTempOrLast; +import com.yxt.anrui.base.common.utils.Rule; +import com.yxt.anrui.base.common.utils.domain.BillNo; import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.*; import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.flowable.AppAdvanceArrearsTaskQuery; import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.flowable.AppSubmitAdvanceArrearsDto; @@ -1205,6 +1208,25 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService resultBean = sysStaffOrgFeign.getOrgSidByPath(orgSidPath); + ResultBean resultBean1 = sysOrganizationFeign.fetchBySid(resultBean.getData()); + String orgCode = resultBean1.getData().getOrgCode(); + BillNo b = new BillNo(); + b.setOrgCode(orgCode); + b.setBillType(BillTypeEnum.QKTCSQ.getBillType()); + String bill = Rule.getBill(b); + String i = baseMapper.selectNum(bill); + String billNo = ""; + if (StringUtils.isNotBlank(i)) { + billNo = Rule.getBillNo(bill, Integer.valueOf(i).intValue()); + } else { + billNo = Rule.getBillNo(bill, 0); + } + return billNo; + } + public ResultBean submitAdvanceArrearsInfo(AppSubmitAdvanceArrearsDto dto) { ResultBean rb = ResultBean.fireFail(); /* //根据用户sid获取staffSid diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysFinanceVo.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysFinanceVo.java new file mode 100644 index 0000000000..09e5c5fa7e --- /dev/null +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysFinanceVo.java @@ -0,0 +1,16 @@ +package com.yxt.anrui.portal.api.sysorganization; + +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2023/4/28 10:29 + * @Description + */ +@Data +public class SysFinanceVo { + + private String userSid; + + private String name; +} diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java index a47c0c1f21..bc0a3c0d80 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeign.java @@ -184,4 +184,10 @@ public interface SysOrganizationFeign { @ResponseBody @ApiOperation("根据code查询组织信息") ResultBean selectByOrgCode(@RequestParam("orgCode") String orgCode); + + @GetMapping("/selectFinance") + @ResponseBody + @ApiOperation("查询金融部主管人员") + ResultBean> selectFinance(@RequestParam("orgPath")String orgPath,@RequestParam("userSid")String userSid); + } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java index d5a60f1e68..86bd598d49 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationFeignFallback.java @@ -1,6 +1,5 @@ package com.yxt.anrui.portal.api.sysorganization; -import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -187,4 +186,9 @@ public class SysOrganizationFeignFallback implements SysOrganizationFeign { public ResultBean selectByOrgCode(String orgCode) { return null; } + + @Override + public ResultBean> selectFinance(String orgPath, String userSid) { + return null; + } } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java index 2cbee9b190..0b4e98f519 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.java @@ -1,11 +1,12 @@ package com.yxt.anrui.portal.biz.sysorganization; import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.yxt.anrui.portal.api.sysorganization.*; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo; +import com.yxt.anrui.terminal.api.base.common.FinanceVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -92,7 +93,7 @@ public interface SysOrganizationMapper extends BaseMapper { * @param sid * @return */ - SysOrganizationVo getUseOrgBySid(@Param("sid")String sid); + SysOrganizationVo getUseOrgBySid(@Param("sid") String sid); int updateQrCodePath(@Param("sid") String sid, @Param("path") String path); @@ -106,6 +107,7 @@ public interface SysOrganizationMapper extends BaseMapper { SysOrgVo getListOrgByBrand(String sid); List selectOrgList(String orgSid); + List selectOrgLists(String orgSid); List selectByOrgDeptSid(String orgDeptSid); @@ -122,4 +124,6 @@ public interface SysOrganizationMapper extends BaseMapper { List selectOrgByPSid(String psid); int updateOrgBySid(@Param("orgSid") String sid, @Param("orgName") String orgName, @Param("orgSidPath") String orgSidPath, @Param("orgNamePath") String orgNamePath); + + List selectBy(@Param("name") String name, @Param("useOrgSid") String useOrgSid); } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml index c5153252a6..8314781df9 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml @@ -231,4 +231,8 @@ where orgSid = #{orgSid} and manageType = '3' + + \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java index 1ebd5386f7..026625a29e 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java @@ -11,6 +11,7 @@ import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.anrui.portal.biz.sysstaffinfo.SysStaffinfoService; import com.yxt.anrui.portal.biz.sysstafforg.SysStaffOrgService; import com.yxt.anrui.portal.biz.sysuser.SysUserService; +import com.yxt.anrui.terminal.api.base.common.FinanceVo; import com.yxt.common.base.config.RedisUtil; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.utils.QRCodeUtil; @@ -443,4 +444,12 @@ public class SysOrganizationRest implements SysOrganizationFeign { SysOrganization sysOrganization = sysOrganizationService.selectByOrgCode(orgCode); return rb.success().setData(sysOrganization); } + + @Override + public ResultBean> selectFinance(String orgPath, String userSid) { + ResultBean> rb = ResultBean.fireFail(); + String useOrgSid = sysStaffOrgService.getOrgSidByPath(orgPath).getData(); + List list = sysOrganizationService.selectBy("金融服务部",useOrgSid); + return rb.success().setData(list); + } } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java index 578c5934a3..571359f0f8 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java @@ -17,6 +17,7 @@ import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.anrui.portal.biz.sysstaffinfo.SysStaffinfoService; import com.yxt.anrui.portal.biz.sysstafforg.SysStaffOrgService; import com.yxt.anrui.portal.biz.sysuser.SysUserService; +import com.yxt.anrui.terminal.api.base.common.FinanceVo; import com.yxt.common.base.config.RedisUtil; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; @@ -212,16 +213,16 @@ public class SysOrganizationService extends MybatisBaseService split = Arrays.asList(sysStaffOrg.getOrgSidPath().split("/")); - if(split.size()>1){ - for(int i = 0;i 1) { + for (int i = 0; i < split.size(); i++) { SysOrganization sysOrganization = fetchBySid(split.get(i)); - if(i == 0){ + if (i == 0) { orgName = orgName.append(sysOrganization.getName()); - }else{ + } else { orgName = orgName.append("/").append(sysOrganization.getName()); } } - }else{ + } else { SysOrganization sysOrganization = fetchBySid(split.get(0)); orgName = orgName.append(sysOrganization.getName()); } @@ -276,7 +277,7 @@ public class SysOrganizationService extends MybatisBaseService m = new HashMap<>(); // app选择组织时 map 存值key要求这个是空字符串 - if("fd6435f2-0005-11ec-a033-48452053aa33".equals(orgSidPathArr[i])){//河北安瑞集团的sid + if ("fd6435f2-0005-11ec-a033-48452053aa33".equals(orgSidPathArr[i])) {//河北安瑞集团的sid m.put("sid", ""); - }else{ + } else { m.put("sid", orgSidPathArr[i]); } // m.put("sid", orgSidPathArr[i]); @@ -572,9 +573,9 @@ public class SysOrganizationService extends MybatisBaseService split = Arrays.asList(orgSidPath.split("/")); - if(split.size()>1){ - for(int i = 0;i 1) { + for (int i = 0; i < split.size(); i++) { SysOrganization sysOrganization = fetchBySid(split.get(i)); - if(i == 0){ + if (i == 0) { orgNamePath1 = orgNamePath1.append(sysOrganization.getName()); - }else{ + } else { orgNamePath1 = orgNamePath1.append("/").append(sysOrganization.getName()); } } - }else{ + } else { SysOrganization sysOrganization = fetchBySid(split.get(0)); orgNamePath1 = orgNamePath1.append(sysOrganization.getName()); } orgNamePath = orgNamePath1.toString(); } //更新关联该部门的所有员工的关联表中的部门名称、部门全路径以及名称全路径 - baseMapper.updateOrgBySid(entity.getSid(),orgName,orgSidPath,orgNamePath); + baseMapper.updateOrgBySid(entity.getSid(), orgName, orgSidPath, orgNamePath); return rb.success(); } + + public List selectBy(String name, String useOrgSid) { + return baseMapper.selectBy(name,useOrgSid); + } } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/common/CommonFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/common/CommonFeign.java index 598742b5b2..a18d3712ff 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/common/CommonFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/common/CommonFeign.java @@ -37,4 +37,9 @@ public interface CommonFeign { @ResponseBody @GetMapping("/getSystem") ResultBean> getSystem(@RequestParam("orgPath")String orgPath); + + @ApiOperation(value = "获取金融部门主管") + @ResponseBody + @GetMapping("/selectFinance") + ResultBean> selectFinance(@RequestParam("orgPath")String orgPath,@RequestParam("userSid")String userSid); } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/common/FinanceVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/common/FinanceVo.java new file mode 100644 index 0000000000..f21ea4b120 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/common/FinanceVo.java @@ -0,0 +1,19 @@ +package com.yxt.anrui.terminal.api.base.common; + +import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2023/4/28 10:25 + * @Description + */ +@Data +public class FinanceVo { + + @JsonProperty("dictKey") + private String userSid; + @JsonProperty("dictValue") + private String name; +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonRest.java index 6964468b49..40bba346b7 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonRest.java @@ -25,8 +25,8 @@ public class CommonRest implements CommonFeign { private CommonService commonService; @Override - public ResultBean> getPublicModelList(String modelSid,String orgPath) { - return commonService.getPublicModelList(modelSid,orgPath); + public ResultBean> getPublicModelList(String modelSid, String orgPath) { + return commonService.getPublicModelList(modelSid, orgPath); } @Override @@ -38,4 +38,9 @@ public class CommonRest implements CommonFeign { public ResultBean> getSystem(String orgPath) { return commonService.getSystem(orgPath); } + + @Override + public ResultBean> selectFinance(String orgPath, String userSid) { + return commonService.selectFinance(orgPath, userSid); + } } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonService.java index e94b9af401..a340f9c506 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/common/CommonService.java @@ -9,10 +9,9 @@ import com.yxt.anrui.base.api.basevehinstallmodel.VehinstallModelQuery; import com.yxt.anrui.base.api.basevehinstallmodel.VehinstallModelVo; import com.yxt.anrui.base.api.basevehmodelannouncementmodel.AnnouncementVo; import com.yxt.anrui.base.api.basevehmodelannouncementmodel.BaseVehmodelAnnouncementmodelFeign; -import com.yxt.anrui.terminal.api.base.common.PublicModelVo; -import com.yxt.anrui.terminal.api.base.common.SystemVo; -import com.yxt.anrui.terminal.api.base.common.TopConfigQuery; -import com.yxt.anrui.terminal.api.base.common.TopConfigVo; +import com.yxt.anrui.portal.api.sysorganization.SysFinanceVo; +import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; +import com.yxt.anrui.terminal.api.base.common.*; import com.yxt.anrui.terminal.config.CoverUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; @@ -39,10 +38,12 @@ public class CommonService { private BaseVehinstallmodelFeign baseVehinstallmodelFeign; @Autowired private BasePurchaseSystemFeign basePurchaseSystemFeign; + @Autowired + private SysOrganizationFeign sysOrganizationFeign; - public ResultBean> getPublicModelList(String modelSid,String orgPath) { + public ResultBean> getPublicModelList(String modelSid, String orgPath) { ResultBean> rb = ResultBean.fireFail(); - ResultBean> resultBean = baseVehmodelAnnouncementmodelFeign.getAnnounceList(modelSid,orgPath); + ResultBean> resultBean = baseVehmodelAnnouncementmodelFeign.getAnnounceList(modelSid, orgPath); List list = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), PublicModelVo.class)).collect(Collectors.toList()); return rb.success().setData(list); } @@ -64,4 +65,11 @@ public class CommonService { List list = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), SystemVo.class)).collect(Collectors.toList()); return rb.success().setData(list); } + + public ResultBean> selectFinance(String orgPath, String userSid) { + ResultBean> rb = ResultBean.fireFail(); + ResultBean> resultBean = sysOrganizationFeign.selectFinance(orgPath, userSid); + List list = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), FinanceVo.class)).collect(Collectors.toList()); + return rb.success().setData(list); + } } From 5ee52fa98b370e48672919de578e0cbe693e5084 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Fri, 28 Apr 2023 15:06:39 +0800 Subject: [PATCH 12/17] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinBillTrailerDetailsVo.java | 2 + .../api/finbilltrailer/FinBillTrailerVo.java | 2 + .../FinBillApplicationService.java | 78 ++++++------- .../finbillvehicle/FinBillVehicleMapper.java | 3 + .../finbillvehicle/FinBillVehicleService.java | 4 + .../ScmApplyInboundService.java | 6 +- .../advanceInvoice/AdvanceInvoicePageVo.java | 5 +- .../AppBusAdvanceGinvoiceapplyFeign.java | 7 +- .../advanceInvoice/FinBillTrailerVo.java | 2 + .../invoiced/FinBillTrailerVo.java | 2 + .../AppBusAdvanceGinvoiceapplyRest.java | 5 + .../AppBusAdvanceGinvoiceapplyService.java | 107 ++++++++++++++++++ 12 files changed, 180 insertions(+), 43 deletions(-) diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbilltrailer/FinBillTrailerDetailsVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbilltrailer/FinBillTrailerDetailsVo.java index 67af0386c4..e1255ccc96 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbilltrailer/FinBillTrailerDetailsVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbilltrailer/FinBillTrailerDetailsVo.java @@ -65,6 +65,8 @@ public class FinBillTrailerDetailsVo implements Vo { private String openTickSid; // 开票名称sid @ApiModelProperty("开票名称") private String openTickName; // 开票名称 + @ApiModelProperty("开票信息") + private String invoiceInfo; @ApiModelProperty("开票申请单sid") private String billAppSid; // 开票申请单sid @ApiModelProperty("单台开票金额") diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbilltrailer/FinBillTrailerVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbilltrailer/FinBillTrailerVo.java index 10fc6c6064..91d9a2d1cf 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbilltrailer/FinBillTrailerVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbilltrailer/FinBillTrailerVo.java @@ -67,6 +67,8 @@ public class FinBillTrailerVo implements Vo { private String openTickName; // 开票名称 @ApiModelProperty("开票申请单sid") private String billAppSid; // 开票申请单sid + @ApiModelProperty("开票信息") + private String invoiceInfo; @ApiModelProperty("单台开票金额") private String oneBillMoney; // 单台开票金额 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 66dcc96c68..e7ab6165e9 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 @@ -158,7 +158,7 @@ public class FinBillApplicationService extends MybatisBaseService wrapper.like("name", query.getName()).or().like("remark", query.getName())); QueryWrapper qw = new QueryWrapper<>(); - if (StringUtils.isNotBlank(query.getOrgPath())){ + if (StringUtils.isNotBlank(query.getOrgPath())) { String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData(); query.setUseOrgSid(useOrgSid); } @@ -237,7 +237,7 @@ public class FinBillApplicationService extends MybatisBaseService finBillApplicationVos = baseMapper.selectByContractNo(contractNo); if (finBillApplicationVos != null && finBillApplicationVos.size() > 0) { FinBillApplicationDetailsVo finBillApplicationVo = finBillApplicationVos.get(0); - if (StringUtils.isNotBlank(finBillApplicationVo.getOneBillMoney())){ + if (StringUtils.isNotBlank(finBillApplicationVo.getOneBillMoney())) { entity.setOneBillMoney(new BigDecimal(finBillApplicationVo.getOneBillMoney())); } } @@ -403,10 +403,12 @@ public class FinBillApplicationService extends MybatisBaseService finBillTrailerVos = finBillTrailerService.fetchByMainSid(sid); if (finBillTrailerVos.size() > 0) { for (FinBillTrailerVo finBillTrailerVo : finBillTrailerVos) { + FinBillVehicleVo finBillVehicleVo = finBillVehicleService.selByVinNo(finBillTrailerVo.getVinNo()); + finBillTrailerVo.setInvoiceInfo(finBillVehicleVo.getOpenTickRemarks()); BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerFeign.fetchByGcVinNo(finBillTrailerVo.getGcVinNo()).getData(); List commonAppendixVos = commonAppendixFeign.selByLinkSid(baseTrailerDetailsVo.getSid()).getData(); for (CommonAppendixVo commonAppendixVo : commonAppendixVos) { - if (commonAppendixVo.getAttachType().equals("挂车合格证照片")){ + if (commonAppendixVo.getAttachType().equals("挂车合格证照片")) { finBillTrailerVo.setHgzImageUrl(commonAppendixVo.getFileUrl()); } } @@ -415,7 +417,7 @@ public class FinBillApplicationService extends MybatisBaseService trailerVoList = data.getList(); for (TrailerVo trailerVo : trailerVoList) { FinBillTrailerVo finBillTrailerVo = new FinBillTrailerVo(); @@ -430,7 +432,7 @@ public class FinBillApplicationService extends MybatisBaseService commonAppendixVos = commonAppendixFeign.selByLinkSid(baseTrailerDetailsVo.getSid()).getData(); for (CommonAppendixVo commonAppendixVo : commonAppendixVos) { - if (commonAppendixVo.getAttachType().equals("挂车合格证照片")){ + if (commonAppendixVo.getAttachType().equals("挂车合格证照片")) { finBillTrailerVo.setHgzImageUrl(commonAppendixVo.getFileUrl()); } } @@ -765,7 +767,7 @@ public class FinBillApplicationService extends MybatisBaseService finBillApplicationDetailsVos = baseMapper.selectByContractNo(contractNo); - if (finBillApplicationDetailsVos != null){ + if (finBillApplicationDetailsVos != null) { for (FinBillApplicationDetailsVo finBillApplicationDetailsVo : finBillApplicationDetailsVos) { String nodeState = finBillApplicationDetailsVo.getNodeState(); - if (!"待提交".equals(nodeState) && !"已办结".equals(nodeState) &&!"终止".equals(nodeState)&&!"发起申请".equals(nodeState)){ + if (!"待提交".equals(nodeState) && !"已办结".equals(nodeState) && !"终止".equals(nodeState) && !"发起申请".equals(nodeState)) { return rb.setMsg("该合同已有开票/欠款开票申请正在审批中，不可提交"); } } @@ -1523,7 +1525,7 @@ public class FinBillApplicationService extends MybatisBaseService 0){ + if (khkpsqsApplicationAppendxs.size() > 0) { for (FinBillFileDto finBillFileDto : khkpsqsApplicationAppendxs) { String filePath = finBillFileDto.getFileUrl(); if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { @@ -1545,7 +1547,7 @@ public class FinBillApplicationService extends MybatisBaseService 0){ + if (kpxxqrsApplicationAppendxs.size() > 0) { for (FinBillFileDto finBillFileDto : kpxxqrsApplicationAppendxs) { String filePath = finBillFileDto.getFileUrl(); if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { @@ -1557,7 +1559,7 @@ public class FinBillApplicationService extends MybatisBaseService 0){ + if (cldjhtApplicationAppendxs.size() > 0) { for (FinBillFileDto finBillFileDto : cldjhtApplicationAppendxs) { String filePath = finBillFileDto.getFileUrl(); if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { @@ -1569,7 +1571,7 @@ public class FinBillApplicationService extends MybatisBaseService 0){ + if (zjApplicationAppendxs.size() > 0) { for (FinBillFileDto finBillFileDto : zjApplicationAppendxs) { String filePath = finBillFileDto.getFileUrl(); if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { @@ -1653,7 +1655,7 @@ public class FinBillApplicationService extends MybatisBaseService finBillApplicationDetailsVos = baseMapper.selectByContractNo(contractNo); - if (finBillApplicationDetailsVos != null){ + if (finBillApplicationDetailsVos != null) { for (FinBillApplicationDetailsVo finBillApplicationDetailsVo : finBillApplicationDetailsVos) { String nodeState = finBillApplicationDetailsVo.getNodeState(); - if (!"待提交".equals(nodeState) && !"已办结".equals(nodeState) &&!"终止".equals(nodeState)&&!"发起申请".equals(nodeState)){ + if (!"待提交".equals(nodeState) && !"已办结".equals(nodeState) && !"终止".equals(nodeState) && !"发起申请".equals(nodeState)) { return rb.setMsg("该合同已有开票/欠款开票申请正在审批中，不可提交"); } } @@ -1782,8 +1784,8 @@ public class FinBillApplicationService extends MybatisBaseService listPageQK(PagerQuery pq) { FinBillApplicationQuery query = pq.getParams(); QueryWrapper qw = new QueryWrapper<>(); - if (StringUtils.isNotBlank(query.getOrgPath())){ + if (StringUtils.isNotBlank(query.getOrgPath())) { String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData(); query.setUseOrgSid(useOrgSid); } qw.eq("fba.billStateKey", "003"); qw.eq("fba.useOrgSid", query.getUseOrgSid()); qw.eq("fba.createBySid", query.getCreateBySid()); - if ("1".equals(query.getType())){ - qw.eq("fba.nodeState","待提交"); - }else if ("2".equals(query.getType())){ - qw.ne("fba.nodeState","待提交"); + if ("1".equals(query.getType())) { + qw.eq("fba.nodeState", "待提交"); + } else if ("2".equals(query.getType())) { + qw.ne("fba.nodeState", "待提交"); } if (StringUtils.isNotBlank(query.getSaleTypeKey())) { qw.eq("fba.saleTypeKey", query.getSaleTypeKey()); @@ -2064,15 +2066,13 @@ public class FinBillApplicationService extends MybatisBaseService appQKFetchDetailsBySid(AppBillApplicationDetailsQKQuery query) { ResultBean rb = ResultBean.fireFail(); String sid = query.getSid(); - String userSid = query.getUserSid(); - String contractNo = query.getContractNo(); - String orgPath = query.getOrgPath(); - String deptSid = orgPath.substring(orgPath.lastIndexOf("/") + 1); - String deptName = sysOrganizationFeign.fetchBySid(deptSid).getData().getName(); FinBillApplicationDetailsVo finBillApplicationDetailsVo = new FinBillApplicationDetailsVo(); - if (StringUtils.isBlank(sid)){ - finBillApplicationDetailsVo.setCreateBySid(userSid); - SysUserVo sysUserVo = sysUserFeign.fetchBySid(userSid).getData(); + if (StringUtils.isBlank(sid)) { + String orgPath = query.getOrgPath(); + String deptSid = orgPath.substring(orgPath.lastIndexOf("/") + 1); + String deptName = sysOrganizationFeign.fetchBySid(deptSid).getData().getName(); + finBillApplicationDetailsVo.setCreateBySid(query.getUserSid()); + SysUserVo sysUserVo = sysUserFeign.fetchBySid(query.getUserSid()).getData(); finBillApplicationDetailsVo.setCreateByName(sysUserVo.getName()); finBillApplicationDetailsVo.setDeptSid(deptSid); finBillApplicationDetailsVo.setDeptName(deptName); @@ -2081,15 +2081,15 @@ public class FinBillApplicationService extends MybatisBaseService { @Update("UPDATE fin_bill_vehicle SET state = 0 WHERE billAppSid = #{sid}") void updateByMainSid(String sid); + + @Select("select * from fin_bill_vehicle where vinNo = #{vinNo}") + FinBillVehicleVo selByVinNo(String vinNo); } \ No newline at end of file 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 00dede17cb..5b2d3909ae 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 @@ -141,4 +141,8 @@ public class FinBillVehicleService extends MybatisBaseService initAdvanceInvoice(@SpringQueryMap AdvanceInvoiceInfoQuery query); + @ApiOperation("手机端-欠款开票详情") + @GetMapping("/detailAdvancelnvoice") + @ResponseBody + public ResultBean detailAdvancelnvoice(@RequestParam("sid") String sid); + @ApiOperation("移动端-保存欠款开票申请") @PostMapping("/saveAdvanceInvoice") @ResponseBody @@ -87,7 +91,6 @@ public interface AppBusAdvanceGinvoiceapplyFeign { @ResponseBody public ResultBean deleteAdvanceInvoice(@SpringQueryMap AdvanceInvoiceInfoQuery query); - @ApiOperation("提交流程") @PostMapping("/submitAdvanceInvoiceInfo") @ResponseBody diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/FinBillTrailerVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/FinBillTrailerVo.java index d1c3bee32c..5351c64cde 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/FinBillTrailerVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/FinBillTrailerVo.java @@ -62,6 +62,8 @@ public class FinBillTrailerVo implements Vo { private String openTickName; // 开票名称 @ApiModelProperty("开票申请单sid") private String billAppSid; // 开票申请单sid + @ApiModelProperty("开票信息") + private String invoiceInfo; @ApiModelProperty("单台开票金额") private String oneBillMoney; // 单台开票金额 @ApiModelProperty("合格证图片") diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/FinBillTrailerVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/FinBillTrailerVo.java index 6c487aa5cf..a0ed92ce70 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/FinBillTrailerVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/invoiced/FinBillTrailerVo.java @@ -64,6 +64,8 @@ public class FinBillTrailerVo implements Vo { private String openTickName; // 开票名称 @ApiModelProperty("开票申请单sid") private String billAppSid; // 开票申请单sid + @ApiModelProperty("开票信息") + private String invoiceInfo; @ApiModelProperty("单台开票金额") private String oneBillMoney; // 单台开票金额 @ApiModelProperty("合格证图片") diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyRest.java index 6fbae7124c..d22525e178 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyRest.java @@ -73,6 +73,11 @@ public class AppBusAdvanceGinvoiceapplyRest implements AppBusAdvanceGinvoiceappl return appBusAdvanceGinvoiceapplyService.initAdvanceInvoice(query); } + @Override + public ResultBean detailAdvancelnvoice(String sid) { + return appBusAdvanceGinvoiceapplyService.detailAdvancelnvoice(sid); + } + @Override public ResultBean saveAdvanceInvoice(AdvanceInvoiceDto dto) { return appBusAdvanceGinvoiceapplyService.saveAdvanceInvoice(dto); 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 fa895be001..cbcb7eb0b5 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 @@ -122,6 +122,8 @@ public class AppBusAdvanceGinvoiceapplyService { advanceInvoicePageVo.setReason(record.getArrearsOpenYYValue()); advanceInvoicePageVo.setDate(record.getApplyDate()); advanceInvoicePageVo.setCustomerName(record.getCustomerName()); + advanceInvoicePageVo.setModel(record.getModelName()); + advanceInvoicePageVo.setType(record.getSaleTypeValue()); if (record.getNodeState().equals("待提交")){ advanceInvoicePageVo.setShowUpdateBtn(true); advanceInvoicePageVo.setShowDeleteBtn(true); @@ -568,4 +570,109 @@ public class AppBusAdvanceGinvoiceapplyService { } return rb.success().setData(data); } + + public ResultBean detailAdvancelnvoice(String sid) { + ResultBean rb = ResultBean.fireFail(); + AdvanceInvoiceInfoVo vo = new AdvanceInvoiceInfoVo(); + AppBillApplicationDetailsQKQuery appBillApplicationDetailsQKQuery = new AppBillApplicationDetailsQKQuery(); + appBillApplicationDetailsQKQuery.setSid(sid); + ResultBean resultBean = finBillApplicationFeign.appQKFetchDetailsBySid(appBillApplicationDetailsQKQuery); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + FinBillApplicationDetailsVo finBillApplicationDetailsVo = resultBean.getData(); + BeanUtil.copyProperties(finBillApplicationDetailsVo, vo); + vo.setReasonKey(finBillApplicationDetailsVo.getArrearsOpenYYKey()); + vo.setReasonValue(finBillApplicationDetailsVo.getArrearsOpenYYValue()); + vo.setCollectionDate(finBillApplicationDetailsVo.getReturnedMoneyDate()); + vo.setGetOriginalValue(finBillApplicationDetailsVo.getIsLQOrigInvoice()); + vo.setProcInsId(finBillApplicationDetailsVo.getProcInstSid()); + vo.setInvoiceTotal(finBillApplicationDetailsVo.getTotalBillMoney()); + vo.setOrgPath(finBillApplicationDetailsVo.getOrgSidPath()); + vo.setSaleType(finBillApplicationDetailsVo.getSaleTypeValue()); + vo.setSellerDept(finBillApplicationDetailsVo.getSaleDeptName()); + vo.setSellerName(finBillApplicationDetailsVo.getStaffName()); + vo.setInvoicingUnit(finBillApplicationDetailsVo.getOpenTickUnitName()); + vo.setName(finBillApplicationDetailsVo.getCustomerName()); + vo.setInvoiceMoney(finBillApplicationDetailsVo.getOneBillMoney()); + vo.setOpenTickSid(finBillApplicationDetailsVo.getOpenTickSid()); + vo.setOpenTickName(finBillApplicationDetailsVo.getOpenTickName()); + vo.setContractId(finBillApplicationDetailsVo.getContractNo()); + vo.setDate(finBillApplicationDetailsVo.getApplyDate()); + vo.setUserSid(finBillApplicationDetailsVo.getCreateBySid()); + vo.setPublishInfo(finBillApplicationDetailsVo.getDeptName() + "-" + finBillApplicationDetailsVo.getCreateByName()); + //车辆信息 + List vinListVos = new ArrayList<>(); + List finBillVehicles = finBillApplicationDetailsVo.getFinBillVehicles(); + if (finBillVehicles != null){ + for (FinBillVehicleVo finBillVehicle : finBillVehicles) { + AppCarListVo vinListVo = new AppCarListVo(); + vinListVo.setVin(finBillVehicle.getVinNo()); + vinListVo.setCertificateStateKey(finBillVehicle.getCertificateStateKey()); + vinListVo.setCertificateState(finBillVehicle.getCertificateStateValue()); + vinListVo.setInvoiceTypeKey(finBillVehicle.getBillTypeKey()); + vinListVo.setInvoiceType(finBillVehicle.getBillTypeValue()); + vinListVo.setInvoiceName(finBillVehicle.getOpenTickName()); + vinListVo.setInvoiceInfo(finBillVehicle.getOpenTickRemarks()); + vinListVos.add(vinListVo); + } + } + vo.setVinList(vinListVos); + //挂车信息 + List finBillTrailers = finBillApplicationDetailsVo.getFinBillTrailers(); + List finBillTrailerVos = new ArrayList<>(); + if (finBillTrailers != null && finBillTrailers.size() > 0){ + for (com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerVo finBillTrailer : finBillTrailers) { + com.yxt.anrui.terminal.api.autoservice.invoiced.FinBillTrailerVo finBillTrailerVo = new FinBillTrailerVo(); + BeanUtil.copyProperties(finBillTrailer,finBillTrailerVo); + String hgzImageUrl = finBillTrailer.getHgzImageUrl(); + List files = new ArrayList<>(); + files.add(hgzImageUrl); + finBillTrailerVo.setFiles(files); + finBillTrailerVos.add(finBillTrailerVo); + } + } + vo.setFinBillTrailers(finBillTrailerVos); + //附件信息 + List khkpsqsApplicationAppendxs = finBillApplicationDetailsVo.getKhkpsqsApplicationAppendxs(); + List kpxxqrsApplicationAppendxs = finBillApplicationDetailsVo.getKpxxqrsApplicationAppendxs(); + List cldjhtApplicationAppendxs = finBillApplicationDetailsVo.getCldjhtApplicationAppendxs(); + List zjApplicationAppendxs = finBillApplicationDetailsVo.getZjApplicationAppendxs(); + List customerInvoiceApplyImages = new ArrayList<>();//客户开票申请书 + List invoiceApplyConfirmImages = new ArrayList<>();//开票信息确认书 + List registerContractImages = new ArrayList<>();//车辆登记合同 + List idCardImages = new ArrayList<>(); + if (zjApplicationAppendxs != null){ + for (FinBillFileVo zjApplicationAppendx : zjApplicationAppendxs) { + idCardImages.add(zjApplicationAppendx.getFileUrl()); + } + } + if (khkpsqsApplicationAppendxs != null){ + for (FinBillFileVo khkpsqsApplicationAppendx : khkpsqsApplicationAppendxs) { + customerInvoiceApplyImages.add(khkpsqsApplicationAppendx.getFileUrl()); + } + } + if (kpxxqrsApplicationAppendxs != null){ + for (FinBillFileVo kpxxqrsApplicationAppendx : kpxxqrsApplicationAppendxs) { + invoiceApplyConfirmImages.add(kpxxqrsApplicationAppendx.getFileUrl()); + } + } + if (cldjhtApplicationAppendxs != null){ + for (FinBillFileVo cldjhtApplicationAppendx : cldjhtApplicationAppendxs) { + registerContractImages.add(cldjhtApplicationAppendx.getFileUrl()); + } + } + vo.setCustomerInvoiceApplyImages(customerInvoiceApplyImages); + vo.setInvoiceApplyConfirmImages(invoiceApplyConfirmImages); + vo.setRegisterContractImages(registerContractImages); + vo.setIdCardImages(idCardImages); + BusSalesOrderIsDTKPJVo busSalesOrderIsDTKPJVo = busSalesOrderFeign.fetchByContractNo(finBillApplicationDetailsVo.getContractNo()).getData(); + if (StringUtils.isNotBlank(busSalesOrderIsDTKPJVo.getOneBillMoney())){ + vo.setIsCanEdit(false); + vo.setInvoiceMoney(busSalesOrderIsDTKPJVo.getOneBillMoney()); + }else { + vo.setIsCanEdit(true); + } + return rb.success().setData(vo); + } } \ No newline at end of file From c651be009c0482223971c9a019122ea8da90b8c9 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Fri, 28 Apr 2023 15:26:17 +0800 Subject: [PATCH 13/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseVehicleTempstateFeign.java | 6 + .../BaseVehicleTempstateFeignFallback.java | 5 + .../BaseVehicleTempstateMapper.java | 3 + .../BaseVehicleTempstateRest.java | 7 + .../BaseVehicleTempstateService.java | 4 + .../BusArrearsCarryVehicleApplyFeign.java | 12 +- ...ArrearsCarryVehicleApplyFeignFallback.java | 5 +- .../BusArrearsCarryVehicleApplyPageVo.java | 8 +- .../AppCompleteAdvanceArrearsDto.java | 5 +- .../flowable/AppSubmitAdvanceArrearsDto.java | 4 +- .../flowable/GetNodeQuery.java | 2 + .../BusArrearsCarryVehicleApplyMapper.xml | 7 +- .../BusArrearsCarryVehicleApplyRest.java | 4 +- .../BusArrearsCarryVehicleApplyService.java | 205 +++++++++++------- .../bussalesorder/BusSalesOrderService.java | 17 +- .../BusSalesOrderVehicleService.java | 34 ++- .../anrui/flowable/api/utils/ProcDefEnum.java | 6 +- .../AppBusArrearsCarryVehicleApplyFeign.java | 7 +- ...ArrearsCarryVehicleApplyFeignFallback.java | 4 +- .../AppBusArrearsCarryVehicleApplyRest.java | 4 +- ...AppBusArrearsCarryVehicleApplyService.java | 4 +- 21 files changed, 211 insertions(+), 142 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateFeign.java index 16c4ba0382..f8e4763470 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateFeign.java @@ -28,6 +28,7 @@ package com.yxt.anrui.base.api.basevehicletempstate; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; +import feign.Param; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; @@ -99,4 +100,9 @@ public interface BaseVehicleTempstateFeign { @GetMapping("/getList") @ResponseBody ResultBean> getList(@RequestParam("tempStateKey")String tempStateKey); + + @ApiOperation("查询状态") + @GetMapping("/selectByVinSidAndType") + @ResponseBody + ResultBean selectByVinSidAndType(@RequestParam("carSid") String carSid, @Param("tempstateKey") String tempstateKey); } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateFeignFallback.java index d5f5e1a47f..e5d794c51d 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicletempstate/BaseVehicleTempstateFeignFallback.java @@ -90,6 +90,11 @@ public class BaseVehicleTempstateFeignFallback implements BaseVehicleTempstateFe return null; } + @Override + public ResultBean selectByVinSidAndType(String carSid, String tempstateKey) { + return null; + } + @Override public ResultBean selectByVin(String vin) { return null; diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicletempstate/BaseVehicleTempstateMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicletempstate/BaseVehicleTempstateMapper.java index f84c5dd509..d936661add 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicletempstate/BaseVehicleTempstateMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicletempstate/BaseVehicleTempstateMapper.java @@ -75,4 +75,7 @@ public interface BaseVehicleTempstateMapper extends BaseMapper getList(String tempStateKey); + + @Select("select * from base_vehicle_tempstate where vehSid = #{carSid} and tempStateKey = #{key} limit 1") + BaseVehicleTempstate selectByVinSidAndType(@Param("carSid") String carSid, @Param("key") String tempstateKey); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicletempstate/BaseVehicleTempstateRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicletempstate/BaseVehicleTempstateRest.java index bdaffcb8ab..3906e33fcc 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicletempstate/BaseVehicleTempstateRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicletempstate/BaseVehicleTempstateRest.java @@ -122,6 +122,13 @@ public class BaseVehicleTempstateRest implements BaseVehicleTempstateFeign { return rb.success().setData(baseVehicleTempstates); } + @Override + public ResultBean selectByVinSidAndType(String carSid, String tempstateKey) { + ResultBean rb = ResultBean.fireFail(); + BaseVehicleTempstate count = baseVehicleTempstateService.selectByVinSidAndType(carSid,tempstateKey); + return rb.setData(count); + } + @Override public ResultBean selectByVin(String vin) { ResultBean rb = ResultBean.fireFail(); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicletempstate/BaseVehicleTempstateService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicletempstate/BaseVehicleTempstateService.java index e798dff6b7..ae389ab0c3 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicletempstate/BaseVehicleTempstateService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicletempstate/BaseVehicleTempstateService.java @@ -129,4 +129,8 @@ public class BaseVehicleTempstateService extends MybatisBaseService initArrearsApply(@SpringQueryMap AppAdvanceArrearsInfoQuery query); - @ApiOperation("移动端-新增欠款提车申请") + /* @ApiOperation("移动端-新增欠款提车申请") @PostMapping("/addArrearsApply") @ResponseBody - public ResultBean addArrearsApply(@Valid @RequestBody AppArrearsCarryVinDto dto); + public ResultBean addArrearsApply(@Valid @RequestBody AppArrearsCarryVinDto dto);*/ @ApiOperation("移动端-保存欠款提车申请") @PostMapping("/saveArrearsApply") diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeignFallback.java index 263b49b6fd..1799c7babd 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeignFallback.java @@ -1,6 +1,5 @@ package com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply; -import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.flowable.AppCompleteAdvanceInvoiceDto; import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.flowable.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; @@ -82,10 +81,10 @@ public class BusArrearsCarryVehicleApplyFeignFallback implements BusArrearsCarry return null; } - @Override + /*@Override public ResultBean addArrearsApply(AppArrearsCarryVinDto dto) { return null; - } + }*/ @Override public ResultBean saveArrearsApply(AppArrearsCarryDto dto) { diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyPageVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyPageVo.java index 3223176780..c1b0299cc3 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyPageVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyPageVo.java @@ -25,11 +25,11 @@ public class BusArrearsCarryVehicleApplyPageVo implements Vo { @ApiModelProperty("车型名称") private String modelName; -// @ApiModelProperty("欠款金额") -// private BigDecimal arrearsMoney; + @ApiModelProperty("欠款金额") + private String arrearsMoney; - @ApiModelProperty("累计欠款金额") - private BigDecimal cumulativeArrearsMoney; +/* @ApiModelProperty("累计欠款金额") + private BigDecimal cumulativeArrearsMoney;*/ @ApiModelProperty("承诺回款日期") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/flowable/AppCompleteAdvanceArrearsDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/flowable/AppCompleteAdvanceArrearsDto.java index 751c994d26..546d5b69e1 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/flowable/AppCompleteAdvanceArrearsDto.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/flowable/AppCompleteAdvanceArrearsDto.java @@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.NotBlank; +import java.util.List; @Data public class AppCompleteAdvanceArrearsDto implements Dto { @@ -14,7 +15,7 @@ public class AppCompleteAdvanceArrearsDto implements Dto { @NotBlank(message = "参数错误：userSid") private String userSid; @ApiModelProperty(value = "用户全路径sid") - @NotBlank(message = "参数错误：orgSidPath") +// @NotBlank(message = "参数错误：orgSidPath") private String orgSidPath; @ApiModelProperty(value = "节点id") @NotBlank(message = "参数错误：taskDefKey") @@ -30,6 +31,4 @@ public class AppCompleteAdvanceArrearsDto implements Dto { @ApiModelProperty(value = "业务sid") @NotBlank(message = "参数错误：businessSid") private String businessSid; -// @ApiModelProperty(value = "暂不确定是不是需要前端传的：还是有分支的时候传？？") -// private Map formVariables; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/flowable/AppSubmitAdvanceArrearsDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/flowable/AppSubmitAdvanceArrearsDto.java index b1661d2bcb..2966d70299 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/flowable/AppSubmitAdvanceArrearsDto.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/flowable/AppSubmitAdvanceArrearsDto.java @@ -7,9 +7,7 @@ import lombok.Data; @Data public class AppSubmitAdvanceArrearsDto extends AppArrearsCarryDto { private static final long serialVersionUID = 9148028768206972924L; - - @ApiModelProperty("意见") - private String comment; + @ApiModelProperty("流程实例id") private String instanceId; @ApiModelProperty("任务id") diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/flowable/GetNodeQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/flowable/GetNodeQuery.java index ce2e78e573..0a5236d73a 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/flowable/GetNodeQuery.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/flowable/GetNodeQuery.java @@ -14,6 +14,8 @@ public class GetNodeQuery implements Query { @NotBlank(message = "参数错误：taskDefKey") private String taskDefKey; + private String businessSid; + // @ApiModelProperty(value = "分支字段及业务字段") // private Map formVariables; } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyMapper.xml index d3c6445504..03472503f9 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyMapper.xml @@ -9,18 +9,19 @@ resultType="com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.BusArrearsCarryVehicleApplyPageVo"> SELECT bacva.sid, + if(length(bacva.nodeState)>0,bacva.nodeState,'待提交') as nodeState, bacva.contractNo, bacva.customerName, bacva.modelName, - - bacva.cumulativeArrearsMoney, + + bacva.arrearsMoney, bacva.commitmentMoneyDate, - bacva.applyDate, + DATE_FORMAT(bacva.createTime,'%Y-%m-%d') AS applyDate, bacva.applyName FROM bus_arrears_carry_vehicle_apply bacva diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyRest.java index 0a3c51e2e1..047ff4d71c 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyRest.java @@ -165,10 +165,10 @@ public class BusArrearsCarryVehicleApplyRest implements BusArrearsCarryVehicleAp return busArrearsCarryVehicleApplyService.initArrearsApply(query); } - @Override +/* @Override public ResultBean addArrearsApply(AppArrearsCarryVinDto dto) { return busArrearsCarryVehicleApplyService.addArrearsApply(dto); - } + }*/ @Override public ResultBean saveArrearsApply(AppArrearsCarryDto dto) { 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 06f4801dc3..c9fd701d9f 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 @@ -12,6 +12,8 @@ import com.yxt.anrui.base.api.basetrailer.TrailerVo; import com.yxt.anrui.base.api.basetrailer.TraliveredVo; import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; import com.yxt.anrui.base.api.basevehicle.BaseVehicleSelectVo; +import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstate; +import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateDto; import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateFeign; import com.yxt.anrui.base.api.commonappendix.CommonAppendixDto; import com.yxt.anrui.base.api.commonappendix.CommonAppendixFeign; @@ -59,7 +61,6 @@ import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; 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 com.yxt.common.base.config.component.DocPdfComponent; import com.yxt.common.base.config.component.FileUploadComponent; @@ -69,7 +70,9 @@ import com.yxt.common.base.utils.WordConvertUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.messagecenter.api.message.*; +import com.yxt.messagecenter.api.message.MessageFeign; +import com.yxt.messagecenter.api.message.MessageFlowVo; +import com.yxt.messagecenter.api.message.MessageFlowableQuery; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -1049,14 +1052,14 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid()); - if (!userVoResultBean.getSuccess()) { - return rb.setMsg(userVoResultBean.getMsg()); - } - //根据staffSid获取用户的组织全路径 - ResultBean staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid()); - if (!staffOrgResultBean.getSuccess()) { - return rb.setMsg(staffOrgResultBean.getMsg()); - } //用户的组织全路径 - String orgSidPath = staffOrgResultBean.getData().getOrgSidPath(); - dto.setOrgSidPath(orgSidPath); - BusArrearsCarryVehicleApply busArrearsCarryVehicleApply = fetchBySid(dto.getContractSid()); + String orgSidPath = dto.getOrgPath(); + BusArrearsCarryVehicleApply busArrearsCarryVehicleApply = fetchBySid(dto.getSid()); int r = submitBusinessData(dto, busArrearsCarryVehicleApply); if (r == 3) { return rb.setMsg("该申请不存在"); @@ -1251,25 +1243,30 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService carList = dto.getCarList(); - for (AdCarListDto adCarListDto : carList) { - Integer count = baseVehicleTempstateFeign.selectByVin(adCarListDto.getVin()).getData(); - if (count > 0) { - return rb.setMsg("该申请车架号中存在审核中，请重新选择！"); + List carList = dto.getVinList(); + List vinSidi = new ArrayList<>(); + boolean isT = false; + for (AdCarListVo adCarListDto : carList) { + BaseVehicleTempstate count = baseVehicleTempstateFeign.selectByVinSidAndType(adCarListDto.getCarSid(), VehicleStateTempOrLast.PaymentEnum.ARREARS_CARRY_VEHICLE.getCode()).getData(); + if (count != null) { + vinSidi.add(count.getVinNo()); + isT = true; } } + if (isT) { + return rb.setMsg(String.join(",", vinSidi) + "已存在提交的申请"); + } //新增修改保存 ResultBean resultBean = saveArrearsApply(dto); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); } String businessSid = resultBean.getData(); - BaseVehicleTempstateDto baseVehicleTempstateDto = new BaseVehicleTempstateDto(); baseVehicleTempstateDto.setBusSid(businessSid); baseVehicleTempstateDto.setTempStateKey(VehicleStateTempOrLast.PaymentEnum.ARREARS_CARRY_VEHICLE.getCode()); baseVehicleTempstateDto.setTempStateValue(VehicleStateTempOrLast.PaymentEnum.ARREARS_CARRY_VEHICLE.getRemarks()); - baseVehicleTempstateDto.setTempKey("1"); + baseVehicleTempstateDto.setTempKey("0"); baseVehicleTempstateDto.setTempValue("待审核"); List busArrearsCarryVehicleDetailsVos = busArrearsCarryVehicleDetailsService.selByArrearsSid(busArrearsCarryVehicleApply.getSid()); for (BusArrearsCarryVehicleDetailsVo busArrearsCarryVehicleDetailsVo : busArrearsCarryVehicleDetailsVos) { @@ -1292,12 +1289,20 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService appMap = new HashMap<>(); //需和移动端沟通业务sid保存的属性具体值：appMap中sid不是固定的。移动端提供具体字段。 - appMap.put("contractSid", businessSid); + appMap.put("sid", businessSid); variables.put("app", appMap); + if (StringUtils.isNotBlank(dto.getIsFinance())) { + variables.put("jinrong", "1".equals(dto.getIsFinance())); + } else { + variables.put("jinrong", false); + } //流程定义id bv.setModelId(ProcDefEnum.ARREARSCARRYVEHICLE.getProDefId()); if (r == 1) { ResultBean voResultBean = flowableFeign.startProcess(bv); + if (!voResultBean.getSuccess()) { + return rb.setMsg(voResultBean.getMsg()); + } UpdateFlowFieldVo ufVo = voResultBean.getData(); updateFlowFiled(BeanUtil.beanToMap(ufVo)); //极光推送 @@ -1321,10 +1326,10 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService variables = new HashMap<>(); Map appMap = new HashMap<>(); - appMap.put("contractSid", bv.getBusinessSid()); + appMap.put("sid", bv.getBusinessSid()); variables.put("app", appMap); - bv.setFormVariables(variables); - if (StringUtils.isNotBlank(busArrearsCarryVehicleApply.getOrgSidPath())) { - bv.setOrgSidPath(busArrearsCarryVehicleApply.getOrgSidPath()); + if (StringUtils.isNotBlank(busArrearsCarryVehicleApply.getIsFinance())) { + variables.put("jinrong", "1".equals(busArrearsCarryVehicleApply.getIsFinance())); } else { - return rb.setMsg("orgSidPath 为空！"); + variables.put("jinrong", false); + } + bv.setFormVariables(variables); + bv.setOrgSidPath(busArrearsCarryVehicleApply.getOrgSidPath()); + bv.setModelId(busArrearsCarryVehicleApply.getProcDefId()); + if ("Activity_0tieuz3".equals(bv.getTaskDefKey())) { + //销售内勤审批 + + } + if ("Activity_0ynxtyz".equals(bv.getTaskDefKey())) { + //销售部经理审批上传信审 + + } + if ("Activity_03na1gk".equals(bv.getTaskDefKey())) { + //金融部经理审批 + bv.setNextNodeUserSids(busArrearsCarryVehicleApply.getFinanceUserSid()); } if (bv.getTaskId().equals(busArrearsCarryVehicleApply.getTaskId())) { ResultBean resultBean = flowableFeign.handleProsess(bv); @@ -1403,14 +1421,24 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService stringResultBean = messageFeign.pushMessage(messageFlowableQuery); } else { - AppScmMessageFlowableQuery query = new AppScmMessageFlowableQuery(); - Map appMaps = new HashMap<>(); - appMaps.put("contractSid", busArrearsCarryVehicleApply.getSid()); - List recipientSidList = new ArrayList<>(); - + List carList = busArrearsCarryVehicleDetailsService.selectDetailsByApplySid(bv.getBusinessSid()); + for (BusArrearsCarryVehicleDetails adCarListDto : carList) { + BaseVehicleTempstate count = baseVehicleTempstateFeign.selectByVinSidAndType(adCarListDto.getVinSid(), VehicleStateTempOrLast.PaymentEnum.ARREARS_CARRY_VEHICLE.getCode()).getData(); + if (count != null) { + BaseVehicleTempstateDto baseVehicleTempstateDto = new BaseVehicleTempstateDto(); + baseVehicleTempstateDto.setSid(count.getSid()); + baseVehicleTempstateDto.setBusSid(bv.getBusinessSid()); + baseVehicleTempstateDto.setTempStateKey(VehicleStateTempOrLast.PaymentEnum.ARREARS_CARRY_VEHICLE.getCode()); + baseVehicleTempstateDto.setTempStateValue(VehicleStateTempOrLast.PaymentEnum.ARREARS_CARRY_VEHICLE.getRemarks()); + baseVehicleTempstateDto.setTempKey("1"); + baseVehicleTempstateDto.setTempValue("审核通过"); + baseVehicleTempstateDto.setVehSid(adCarListDto.getVinSid()); + baseVehicleTempstateDto.setVinNo(adCarListDto.getVinNo()); + baseVehicleTempstateFeign.save(baseVehicleTempstateDto); + } + } //修改状态 baseMapper.updateType(bv.getBusinessSid()); - //推送出库申请 List vehicleDetailsVos = busArrearsCarryVehicleDetailsService.selByArrearsSid(busArrearsCarryVehicleApply.getSid()); if (vehicleDetailsVos.size() > 0) { @@ -1437,7 +1465,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService list4 = sysUserFeign.getOtherOrgRoleUser(userRoleQuery1).getData(); @@ -1483,7 +1511,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService variables = new HashMap<>(); Map appMap = new HashMap<>(); - appMap.put("contractSid", bv.getBusinessSid()); + appMap.put("sid", bv.getBusinessSid()); variables.put("app", appMap); bv.setFormVariables(variables); - if (StringUtils.isNotBlank(busArrearsCarryVehicleApply.getOrgSidPath())) { - bv.setOrgSidPath(busArrearsCarryVehicleApply.getOrgSidPath()); - } else { - return rb.setMsg("orgSidPath 为空！"); - } + bv.setOrgSidPath(busArrearsCarryVehicleApply.getOrgSidPath()); ResultBean>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv); //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList()); @@ -1531,7 +1554,6 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService stringResultBean = messageFeign.pushMessage(messageFlowableQuery); } else { - AppScmMessageFlowableQuery query = new AppScmMessageFlowableQuery(); - Map appMaps = new HashMap<>(); - appMaps.put("contractSid", busArrearsCarryVehicleApply.getSid()); - List recipientSidList = new ArrayList<>(); - + List carList = busArrearsCarryVehicleDetailsService.selectDetailsByApplySid(bv.getBusinessSid()); + for (BusArrearsCarryVehicleDetails adCarListDto : carList) { + BaseVehicleTempstate count = baseVehicleTempstateFeign.selectByVinSidAndType(adCarListDto.getVinSid(), VehicleStateTempOrLast.PaymentEnum.ARREARS_CARRY_VEHICLE.getCode()).getData(); + if (count != null) { + BaseVehicleTempstateDto baseVehicleTempstateDto = new BaseVehicleTempstateDto(); + baseVehicleTempstateDto.setSid(count.getSid()); + baseVehicleTempstateDto.setBusSid(bv.getBusinessSid()); + baseVehicleTempstateDto.setTempStateKey(VehicleStateTempOrLast.PaymentEnum.ARREARS_CARRY_VEHICLE.getCode()); + baseVehicleTempstateDto.setTempStateValue(VehicleStateTempOrLast.PaymentEnum.ARREARS_CARRY_VEHICLE.getRemarks()); + baseVehicleTempstateDto.setTempKey("1"); + baseVehicleTempstateDto.setTempValue("审核通过"); + baseVehicleTempstateDto.setVehSid(adCarListDto.getVinSid()); + baseVehicleTempstateDto.setVinNo(adCarListDto.getVinNo()); + baseVehicleTempstateFeign.save(baseVehicleTempstateDto); + } + } //修改状态 baseMapper.updateType(bv.getBusinessSid()); - //推送出库申请 List vehicleDetailsVos = busArrearsCarryVehicleDetailsService.selByArrearsSid(busArrearsCarryVehicleApply.getSid()); if (vehicleDetailsVos.size() > 0) { @@ -1579,7 +1611,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService> rb = new ResultBean<>(); BusinessVariables bv = new BusinessVariables(); BeanUtil.copyProperties(query, bv); -// Map formVariables = query.getFormVariables(); - //判断流程分支 -// Map map = IsTrue(formVariables.get("businessSid")); -// bv.setFormVariables(map); - bv.setModelId(ProcDefEnum.ARREARSCARRYVEHICLE.getProDefId()); + Map map = new HashMap<>(); + Map appMap = new HashMap<>(); + BusArrearsCarryVehicleApply busArrearsCarryVehicleApply = fetchBySid(query.getBusinessSid()); + if (StringUtils.isNotBlank(busArrearsCarryVehicleApply.getIsFinance())) { + map.put("jinrong", "1".equals(busArrearsCarryVehicleApply.getIsFinance())); + } else { + map.put("jinrong", false); + } + appMap.put("sid", bv.getBusinessSid()); + map.put("app", appMap); + bv.setFormVariables(map); + bv.setModelId(busArrearsCarryVehicleApply.getProcDefId()); ResultBean>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv); - //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList()); return rb.success().setData(voList); } @@ -1654,13 +1692,19 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService> rb = ResultBean.fireFail(); BusinessVariables bv = new BusinessVariables(); BeanUtil.copyProperties(query, bv); -// Map formVariables = query.getFormVariables(); - //判断流程分支 -// Map map = IsTrue(formVariables.get("businessSid")); -// bv.setFormVariables(map); - bv.setModelId(ProcDefEnum.ARREARSCARRYVEHICLE.getProDefId()); + Map map = new HashMap<>(); + Map appMap = new HashMap<>(); + BusArrearsCarryVehicleApply busArrearsCarryVehicleApply = fetchBySid(query.getBusinessSid()); + if (StringUtils.isNotBlank(busArrearsCarryVehicleApply.getIsFinance())) { + map.put("jinrong", "1".equals(busArrearsCarryVehicleApply.getIsFinance())); + } else { + map.put("jinrong", false); + } + appMap.put("sid", bv.getBusinessSid()); + map.put("app", appMap); + bv.setFormVariables(map); + bv.setModelId(busArrearsCarryVehicleApply.getProcDefId()); ResultBean>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv); - //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList()); return rb.success().setData(voList); } @@ -1681,7 +1725,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService variables = new HashMap<>(); Map appMap = new HashMap<>(); - appMap.put("contractSid", query.getBusinessSid()); + appMap.put("sid", query.getBusinessSid()); variables.put("app", appMap); flowTaskVo.setValues(variables); ResultBean resultBean = flowableFeign.taskReject(flowTaskVo); @@ -1701,17 +1745,18 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService> listResultBean = flowTaskFeign.getLatestTasks(procId); String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_(); + String nextName = listResultBean.getData().get(0).getName_(); List receiveSidList = Arrays.asList(nextNodeUserSids.split(",")); - if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busArrearsCarryVehicleApply.getCreateBySid())) { + if ("发起申请".equals(nextName)) { messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交"); baseVehicleTempstateFeign.delByBusSid(busArrearsCarryVehicleApply.getSid()); } else { messageFlowableQuery.setMsgContent(busArrearsCarryVehicleApply.getApplyName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); } - messageFlowableQuery.setMsgTitle("提前开票申请"); + messageFlowableQuery.setMsgTitle("欠款提车申请"); ResultBean stringResultBean = messageFeign.pushMessage(messageFlowableQuery); return rb.success(); } @@ -1724,7 +1769,6 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService receiveSidList = Arrays.asList(nextNodeUserSids.split(",")); - if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busArrearsCarryVehicleApply.getCreateBySid())) { + busArrearsCarryVehicleApply = fetchBySid(query.getBusinessSid()); + ResultBean> listResultBean = flowTaskFeign.getLatestTasks(busArrearsCarryVehicleApply.getProcInstId()); + String nextName = listResultBean.getData().get(0).getName_(); + if ("发起申请".equals(nextName)) { baseVehicleTempstateFeign.delByBusSid(busArrearsCarryVehicleApply.getSid()); } updateFlowFiled(BeanUtil.beanToMap(resultBean.getData())); @@ -1798,7 +1845,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService @@ -83,6 +87,8 @@ public class BusSalesOrderVehicleService extends MybatisBaseService list, String sid) { if (list.size() > 0) { @@ -267,7 +273,7 @@ public class BusSalesOrderVehicleService extends MybatisBaseService busVehicleQKKPTrailerVos = new ArrayList<>(); List busVehicleQKKPVosNew = new ArrayList<>(); for (BusVehicleQKKPVo busVehicleQKKPVo : busVehicleQKKPVos) { - if (StringUtils.isNotBlank(busVehicleQKKPVo.getVehSid())){ + if (StringUtils.isNotBlank(busVehicleQKKPVo.getVehSid())) { BaseVehicleCertificateVo baseVehicleCertificateVo = baseVehicleCertificateFeign.selStateByVehicleSid(busVehicleQKKPVo.getVehSid()).getData(); busVehicleQKKPVo.setCertificateState(baseVehicleCertificateVo.getCertificateState()); busVehicleQKKPVo.setCertificateStateValue(baseVehicleCertificateVo.getCertificateStateValue()); @@ -300,8 +306,18 @@ public class BusSalesOrderVehicleService extends MybatisBaseService> resultBean = baseVehicleTempstateFeign.getList(VehicleStateTempOrLast.PaymentEnum.ARREARS_CARRY_VEHICLE.getCode()); + if (!resultBean.getData().isEmpty()) { + resultBean.getData().removeAll(Collections.singleton(null)); + List vinSidList = resultBean.getData().stream().map(v -> v.getVehSid()).collect(Collectors.toList()); + vinSidList.removeAll(Collections.singleton(null)); + if (!vinSidList.isEmpty()) { + qw.notIn("bv.linkSid", vinSidList); + } } List list = baseMapper.getCanUseCars(qw); list.removeAll(Collections.singleton(null)); @@ -318,7 +334,7 @@ public class BusSalesOrderVehicleService extends MybatisBaseService gcList = new ArrayList<>(); ResultBean voResultBean = baseTrailerFeign.trailerList(qCarVo.getCarSid(), query.getContractNo()); - if(voResultBean.getData() != null){ + if (voResultBean.getData() != null) { TraliveredVo traliveredVo = baseTrailerFeign.trailerList(qCarVo.getCarSid(), query.getContractNo()).getData(); List trailerVos = traliveredVo.getList(); if (!trailerVos.isEmpty()) { @@ -349,12 +365,12 @@ public class BusSalesOrderVehicleService extends MybatisBaseService pagging = baseMapper.selectPageVo(page,qw); + IPage pagging = baseMapper.selectPageVo(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); - List list =pagging.getRecords(); + List list = pagging.getRecords(); list.removeAll(Collections.singleton(null)); if (!list.isEmpty()) { for (int i = 0; i < list.size(); i++) { @@ -368,7 +384,7 @@ public class BusSalesOrderVehicleService extends MybatisBaseService gcList = new ArrayList<>(); ResultBean voResultBean = baseTrailerFeign.trailerList(qCarVo.getCarSid(), qCarVo.getContractNo()); - if(voResultBean.getData() != null){ + if (voResultBean.getData() != null) { TraliveredVo traliveredVo = baseTrailerFeign.trailerList(qCarVo.getCarSid(), qCarVo.getContractNo()).getData(); List trailerVos = traliveredVo.getList(); if (!trailerVos.isEmpty()) { diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java index 4e0a301e10..789a7cd12f 100644 --- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java +++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java @@ -15,7 +15,8 @@ public enum ProcDefEnum { FINBILLAPPLICATION("开票申请流程", "process_hxys3ap3:1:1180004"), QKFINBILLAPPLICATION("欠款开票申请流程", "process_x9r8epty:1:1202504"), BUSCENTERADVANCEGINVOICEAPPLY("提前开票申请流程", "advance_ginvoiceapply:1:242664"), - ARREARSCARRYVEHICLE("欠款提车审批流程", "process_8ax1xxn3:1:795004"), + // ARREARSCARRYVEHICLE("欠款提车审批流程", "process_8ax1xxn3:1:795004"), + ARREARSCARRYVEHICLE("欠款提车审批流程", "process_f2dkbvny:1:1285006"), VEHICLEAPPLY("排产申请流程", "process_9egcg169:13:1250004"), SCMCARTRANSFER("库存地点变更申请", "process_3bc4p2em:8:725008"), BASEVEHICLEACTUALSALES("未售买断", "process_6qx07b75:8:725012"), @@ -77,8 +78,7 @@ public enum ProcDefEnum { SCMCOLLECTIONREBATEWITHAPPLY("回款返利预提申请", "process_k4lodiyg:1:630004"), SCMCOLLECTIONREBATECHECKAPPLY("回款返利核对申请", "process_fgrv1mbv:1:630008"), CONTRACTAPPLY("合同审核", "process_gd8c9xd5:2:932504"), - BASEDISPACKAGEAPPLY("优惠包申请流程", "process_l8i6tqho:1:967504"),*/ - ; + BASEDISPACKAGEAPPLY("优惠包申请流程", "process_l8i6tqho:1:967504"),*/; ProcDefEnum(String proDefName, String proDefId) { diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AppBusArrearsCarryVehicleApplyFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AppBusArrearsCarryVehicleApplyFeign.java index d4249a7523..b11787c582 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AppBusArrearsCarryVehicleApplyFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AppBusArrearsCarryVehicleApplyFeign.java @@ -42,10 +42,10 @@ public interface AppBusArrearsCarryVehicleApplyFeign { @ResponseBody ResultBean> getArrearsTakeCarList(@RequestBody PagerQuery pagerQuery); - @ApiOperation("移动端-新增欠款提车申请") +/* @ApiOperation("移动端-新增欠款提车申请") @PostMapping("/addArrearsApply") @ResponseBody - public ResultBean addArrearsApply(@Valid @RequestBody AdvanceArrearsVinDto dto); + public ResultBean addArrearsApply(@Valid @RequestBody AdvanceArrearsVinDto dto);*/ @ApiOperation("手机端-初始化欠款提车申请") @GetMapping("/initArrearsApply") @@ -54,8 +54,7 @@ public interface AppBusArrearsCarryVehicleApplyFeign { /** * 选择车辆列表 - * @param contractNo 合同编号 - * @param vinSids 已选择的车辆sid集合 + * * @return */ @ApiOperation("选择车辆列表") diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AppBusArrearsCarryVehicleApplyFeignFallback.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AppBusArrearsCarryVehicleApplyFeignFallback.java index 4f35da0f2f..8a5bd84431 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AppBusArrearsCarryVehicleApplyFeignFallback.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/arrearsTakeCar/AppBusArrearsCarryVehicleApplyFeignFallback.java @@ -32,10 +32,10 @@ public class AppBusArrearsCarryVehicleApplyFeignFallback implements AppBusArrear return null; } - @Override + /* @Override public ResultBean addArrearsApply(AdvanceArrearsVinDto dto) { return null; - } + }*/ @Override public ResultBean initArrearsApply(AdvanceArrearsInfoQuery query) { diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/arrearsTakeCar/AppBusArrearsCarryVehicleApplyRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/arrearsTakeCar/AppBusArrearsCarryVehicleApplyRest.java index fc1d0fb8b4..313b36ca3c 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/arrearsTakeCar/AppBusArrearsCarryVehicleApplyRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/arrearsTakeCar/AppBusArrearsCarryVehicleApplyRest.java @@ -47,10 +47,10 @@ public class AppBusArrearsCarryVehicleApplyRest implements AppBusArrearsCarryVeh return appBusArrearsCarryVehicleApplyService.getArrearsTakeCarList(pagerQuery); } - @Override +/* @Override public ResultBean addArrearsApply(AdvanceArrearsVinDto dto) { return appBusArrearsCarryVehicleApplyService.addArrearsApply(dto); - } + }*/ @Override public ResultBean initArrearsApply(AdvanceArrearsInfoQuery query) { diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/arrearsTakeCar/AppBusArrearsCarryVehicleApplyService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/arrearsTakeCar/AppBusArrearsCarryVehicleApplyService.java index 085a5074ff..961e9d5bd7 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/arrearsTakeCar/AppBusArrearsCarryVehicleApplyService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/arrearsTakeCar/AppBusArrearsCarryVehicleApplyService.java @@ -69,12 +69,12 @@ public class AppBusArrearsCarryVehicleApplyService { return rb.success().setData(v); } - public ResultBean addArrearsApply(AdvanceArrearsVinDto dto) { +/* public ResultBean addArrearsApply(AdvanceArrearsVinDto dto) { AppArrearsCarryVinDto advanceArrearsVinDto = new AppArrearsCarryVinDto(); BeanUtil.copyProperties(dto, advanceArrearsVinDto); ResultBean resultBean = busArrearsCarryVehicleApplyFeign.addArrearsApply(advanceArrearsVinDto); return resultBean; - } + }*/ public ResultBean initArrearsApply(AdvanceArrearsInfoQuery query) { ResultBean rb = ResultBean.fireFail(); From 739f264fdc09b66c168409a452c3b130c0b045d0 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Fri, 28 Apr 2023 15:37:17 +0800 Subject: [PATCH 14/17] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../finbillapplication/FinBillApplicationService.java | 2 ++ .../ScmVehicleEnterlibraryService.java | 10 +++++----- .../AppBusAdvanceGinvoiceapplyFeignFallback.java | 5 +++++ .../AppBusAdvanceGinvoiceapplyService.java | 6 ++++++ 4 files changed, 18 insertions(+), 5 deletions(-) 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 e7ab6165e9..57d844d8b9 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 @@ -2089,6 +2089,8 @@ public class FinBillApplicationService extends MybatisBaseService sysOrg = sysOrganizationFeign.fetchBySid(useOrgSid); - SysOrganizationVo sysOrganizationVo = sysOrg.getData(); - List FPAYBILLENTRYs = new ArrayList<>(); + //String useOrgSid = scmVehicleEnterlibrary.getUseOrgSid(); + //ResultBean sysOrg = sysOrganizationFeign.fetchBySid(useOrgSid); + //SysOrganizationVo sysOrganizationVo = sysOrg.getData(); +/* List FPAYBILLENTRYs = new ArrayList<>(); StkTransferDirect stkTransferDirect = new StkTransferDirect(); // stkTransferDirect.setFStockOutOrgId("101"); //调出库存组织 // stkTransferDirect.setFStockOrgId("101"); //调入库存组织 @@ -420,7 +420,7 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService resultBean = finKingDeeFeign.draftStkTransferDirect(stkTransferDirect); + ResultBean resultBean = finKingDeeFeign.draftStkTransferDirect(stkTransferDirect);*/ } //外采 if (ManPurOrderType.ManOrderType.WC_ORDER.getCode().equals(scmVehicleEnterlibrary.getPurchaseTypeKey())) { diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyFeignFallback.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyFeignFallback.java index 9defb82c38..2de1a9e53a 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyFeignFallback.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyFeignFallback.java @@ -66,6 +66,11 @@ public class AppBusAdvanceGinvoiceapplyFeignFallback implements AppBusAdvanceGin return null; } + @Override + public ResultBean detailAdvancelnvoice(String sid) { + return null; + } + @Override public ResultBean saveAdvanceInvoice(AdvanceInvoiceDto dto) { return null; 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 cbcb7eb0b5..113ddf68dc 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 @@ -173,6 +173,8 @@ public class AppBusAdvanceGinvoiceapplyService { vo.setContractId(finBillApplicationDetailsVo.getContractNo()); vo.setDate(finBillApplicationDetailsVo.getApplyDate()); vo.setUserSid(finBillApplicationDetailsVo.getCreateBySid()); + vo.setModelSid(finBillApplicationDetailsVo.getModelSid()); + vo.setModelName(finBillApplicationDetailsVo.getModelName()); vo.setPublishInfo(finBillApplicationDetailsVo.getDeptName() + "-" + finBillApplicationDetailsVo.getCreateByName()); //车辆信息 List vinListVos = new ArrayList<>(); @@ -273,6 +275,8 @@ public class AppBusAdvanceGinvoiceapplyService { finBillApplicationDto.setCreateBySid(dto.getUserSid()); finBillApplicationDto.setNodeState(dto.getNodeState()); finBillApplicationDto.setBillNo(dto.getBillNo()); + finBillApplicationDto.setModelSid(dto.getModelSid()); + finBillApplicationDto.setModelName(dto.getModelName()); String publishInfo = dto.getPublishInfo(); String[] split = publishInfo.split("-"); finBillApplicationDto.setDeptName(split[0]); @@ -383,6 +387,8 @@ public class AppBusAdvanceGinvoiceapplyService { submitAdvanceInvoiceDto.setCreateBySid(dto.getUserSid()); submitAdvanceInvoiceDto.setNodeState(dto.getNodeState()); submitAdvanceInvoiceDto.setBillNo(dto.getBillNo()); + submitAdvanceInvoiceDto.setModelSid(dto.getModelSid()); + submitAdvanceInvoiceDto.setModelName(dto.getModelName()); String publishInfo = dto.getPublishInfo(); String[] split = publishInfo.split("-"); submitAdvanceInvoiceDto.setDeptName(split[0]); From 6ad0c45878e08783135539cfe60b90794116f9ea Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Fri, 28 Apr 2023 16:05:34 +0800 Subject: [PATCH 15/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusArrearsCarryVehicleApplyFeign.java | 8 +++--- ...ArrearsCarryVehicleApplyFeignFallback.java | 8 +++--- .../BusArrearsCarryVehicleApplyQuery.java | 22 ++++++---------- .../BusArrearsCarryVehicleApplyMapper.java | 2 ++ .../BusArrearsCarryVehicleApplyMapper.xml | 7 +++++ .../BusArrearsCarryVehicleApplyRest.java | 19 ++++++++------ .../BusArrearsCarryVehicleApplyService.java | 26 ++++++++++++------- 7 files changed, 53 insertions(+), 39 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeign.java index c2a8c821a1..dbff98a5bb 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeign.java @@ -38,22 +38,22 @@ public interface BusArrearsCarryVehicleApplyFeign { @PostMapping("/listPage") public ResultBean> listPage(@RequestBody PagerQuery pagerQuery); - @ApiOperation("新增欠款提车") + /* @ApiOperation("新增欠款提车") @PostMapping("/save") public ResultBean save(@RequestBody BusArrearsCarryVehicleApplyDto dto); @ApiOperation("修改欠款提车") @PostMapping("/update/{sid}") - public ResultBean update(@RequestBody BusArrearsCarryVehicleApplyDto dto, @PathVariable("sid") String sid); + public ResultBean update(@RequestBody BusArrearsCarryVehicleApplyDto dto, @PathVariable("sid") String sid);*/ @ApiOperation("根据sid批量删除欠款提车单") @PostMapping("/deleteBySids") public ResultBean deleteBySids(@RequestBody String[] sids); - @ApiOperation("欠款提车复核回显/修改回显/详情回显") + /* @ApiOperation("欠款提车复核回显/修改回显/详情回显") @GetMapping("/fetchSid/{sid}") public ResultBean fetchSid(@PathVariable("sid") String sid); - +*/ @ApiOperation("欠款提车-车辆列表") @PostMapping("/getArrearsVehicleList") public ResultBean> getArrearsVehicleList(@RequestBody PagerQuery pq); diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeignFallback.java index 1799c7babd..16363a349f 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeignFallback.java @@ -30,7 +30,7 @@ public class BusArrearsCarryVehicleApplyFeignFallback implements BusArrearsCarry return rb.setMsg("接口bus/busarrearscarryvehicleapply/listPage无法访问"); } - @Override +/* @Override public ResultBean save(BusArrearsCarryVehicleApplyDto dto){ return ResultBean.fireFail().setMsg("接口bus/busarrearscarryvehicleapply/save无法访问"); } @@ -38,18 +38,18 @@ public class BusArrearsCarryVehicleApplyFeignFallback implements BusArrearsCarry @Override public ResultBean update(BusArrearsCarryVehicleApplyDto dto,String sid){ return ResultBean.fireFail().setMsg("接口bus/busarrearscarryvehicleapply/update无法访问"); - } + }*/ @Override public ResultBean deleteBySids(String[] sids){ return ResultBean.fireFail().setMsg("接口bus/busarrearscarryvehicleapply/del无法访问"); } - @Override +/* @Override public ResultBean fetchSid(String sid) { ResultBean rb = ResultBean.fireFail(); return rb.setMsg("接口bus/busarrearscarryvehicleapply/fetchSid无法访问"); - } + }*/ @Override public ResultBean> getArrearsVehicleList(PagerQuery pq) { diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyQuery.java index 63cd17b7f7..e43fccd1cd 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyQuery.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyQuery.java @@ -2,13 +2,10 @@ package com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply; import com.yxt.common.core.query.Query; - import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.math.BigDecimal; - /** * Project: bus(bus)
* File: BusArrearsCarryVehicleApplyQuery.java
@@ -26,22 +23,19 @@ import java.math.BigDecimal; @Data public class BusArrearsCarryVehicleApplyQuery implements Query { - - @ApiModelProperty("客户名称") + + @ApiModelProperty("客户名称") private String customerName; - - @ApiModelProperty("合同编号") + + @ApiModelProperty("合同编号") private String contractNo; - -// @ApiModelProperty("申请日期") -// private String applyDate; @ApiModelProperty("申请开始日期") - private String applyStartDate; // 申请开始日期 + private String applyStartDate; @ApiModelProperty("申请结束日期") - private String applyEndDate; // 申请结束日期 - - @ApiModelProperty("申请人") + private String applyEndDate; + + @ApiModelProperty("申请人") private String applyName; } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyMapper.java index e7289aed37..f1ffc57967 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyMapper.java @@ -78,4 +78,6 @@ public interface BusArrearsCarryVehicleApplyMapper extends BaseMapper + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyRest.java index 047ff4d71c..e25c6db091 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyRest.java @@ -11,6 +11,7 @@ import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import io.swagger.annotations.Api; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -59,12 +60,12 @@ public class BusArrearsCarryVehicleApplyRest implements BusArrearsCarryVehicleAp * @param dto * @return */ - @Override + /* @Override public ResultBean save(BusArrearsCarryVehicleApplyDto dto) { ResultBean rb = ResultBean.fireFail(); busArrearsCarryVehicleApplyService.saveOrUpdateDto(dto); return rb.success(); - } + }*/ /** * 修改欠款提车 @@ -73,12 +74,12 @@ public class BusArrearsCarryVehicleApplyRest implements BusArrearsCarryVehicleAp * @param sid * @return */ - @Override + /* @Override public ResultBean update(BusArrearsCarryVehicleApplyDto dto, String sid) { ResultBean rb = ResultBean.fireFail(); busArrearsCarryVehicleApplyService.updateByArrearsSid(dto, sid); return rb.success(); - } + }*/ /** * 根据sid批量删除欠款提车单 @@ -89,8 +90,10 @@ public class BusArrearsCarryVehicleApplyRest implements BusArrearsCarryVehicleAp @Override public ResultBean deleteBySids(String[] sids) { ResultBean rb = ResultBean.fireFail(); - if (sids == null || sids.length == 0) { - return rb.setMsg("删除成功，欠款提车单sid不能为空"); + //查询该sid中是否有流程不是待提交的 + int count = busArrearsCarryVehicleApplyService.selectBySids(StringUtils.join(sids, ",")); + if (count > 0) { + return rb.setMsg("删除的数据中包含已经提交审批的数据，删除失败"); } return busArrearsCarryVehicleApplyService.deleteBySids(sids); @@ -102,12 +105,12 @@ public class BusArrearsCarryVehicleApplyRest implements BusArrearsCarryVehicleAp * @param sid * @return */ - @Override + /* @Override public ResultBean fetchSid(String sid) { ResultBean rb = ResultBean.fireFail(); BusArrearsCarryVehicleApplyVo vo = busArrearsCarryVehicleApplyService.selectBySid(sid); return rb.success().setData(vo); - } + }*/ /** * 欠款提车-车辆列表 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 c9fd701d9f..60d3f60b8d 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 @@ -196,8 +196,8 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService= date_format('" + applyStartDate + "','%Y-%m-%d')"). - apply(StringUtils.isNotEmpty(applyEndDate), "date_format (bacva.applyDate,'%Y-%m-%d') <= date_format('" + applyEndDate + "','%Y-%m-%d')" + qw.apply(StringUtils.isNotEmpty(applyStartDate), "date_format (bacva.createTime,'%Y-%m-%d') >= date_format('" + applyStartDate + "','%Y-%m-%d')"). + apply(StringUtils.isNotEmpty(applyEndDate), "date_format (bacva.createTime,'%Y-%m-%d') <= date_format('" + applyEndDate + "','%Y-%m-%d')" ); } @@ -214,12 +214,6 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService page = PagerUtil.queryToPage(pagerQuery); QueryWrapper qw = buildQueryWrapper(pagerQuery.getParams()); IPage busArrearsCarryVehicleApplyPageVoIPage = baseMapper.listPage(page, qw); - List records = busArrearsCarryVehicleApplyPageVoIPage.getRecords(); - for (BusArrearsCarryVehicleApplyPageVo record : records) { - String sid = record.getSid(); - String nodeState = sysFormLinkFeign.selectStateByBusinessSid(sid).getData().getNodeState(); - record.setNodeState(nodeState); - } return busArrearsCarryVehicleApplyPageVoIPage; } @@ -604,7 +598,17 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService detailsList = busArrearsCarryVehicleDetailsService.selectDetailsByApplySid(sid); - List voList = Optional.ofNullable(detailsList).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), AdCarListVo.class)).collect(Collectors.toList()); + List voList = new ArrayList<>(); + detailsList.removeAll(Collections.singleton(null)); + if (!detailsList.isEmpty()) { + for (int i = 0; i < detailsList.size(); i++) { + AdCarListVo adCarListVo = new AdCarListVo(); + BeanUtil.copyProperties(detailsList.get(i), adCarListVo); + adCarListVo.setCarSid(detailsList.get(i).getVinSid()); + adCarListVo.setVin(detailsList.get(i).getVinNo()); + voList.add(adCarListVo); + } + } appArrearsCarryInfoVo.setVinList(voList); voList.removeAll(Collections.singleton(null)); if (!voList.isEmpty()) { @@ -1856,4 +1860,8 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService Date: Fri, 28 Apr 2023 16:19:32 +0800 Subject: [PATCH 16/17] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java | 3 ++- .../advanceInvoice/AppBusAdvanceGinvoiceapplyService.java | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java index 95b1fa630d..a566a4f17d 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java @@ -433,7 +433,8 @@ public class ScmApplyInboundService extends MybatisBaseService stringList = Arrays.asList(split); + if (stringList.size() < 3){ return new ResultBean().fail().setMsg("车型与配置贷款或全款销售指导价未维护，不可提交"); } List vehicleList = dto.getVehicleList(); 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 113ddf68dc..4675cb7f70 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 @@ -124,6 +124,7 @@ public class AppBusAdvanceGinvoiceapplyService { advanceInvoicePageVo.setCustomerName(record.getCustomerName()); advanceInvoicePageVo.setModel(record.getModelName()); advanceInvoicePageVo.setType(record.getSaleTypeValue()); + advanceInvoicePageVo.setContractType(record.getNodeState()); if (record.getNodeState().equals("待提交")){ advanceInvoicePageVo.setShowUpdateBtn(true); advanceInvoicePageVo.setShowDeleteBtn(true); From 890c5e1bb12b0013ccbd46043d52fa2205c6aab5 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Fri, 28 Apr 2023 16:19:43 +0800 Subject: [PATCH 17/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusArrearsCarryVehicleApplyService.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) 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 60d3f60b8d..049d23c890 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 @@ -1087,6 +1087,11 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService otherFile = dto.getFileList(); + if (!otherFile.isEmpty()) { + String fileLists = String.join(",", otherFile).replaceAll(fileUploadComponent.getUrlPrefix(), ""); + busArrearsCarryVehicleApply.setOtherFile(fileLists); + } //车辆 List adCarListVoList = dto.getVinList(); if (adCarListVoList.isEmpty()) { @@ -1120,6 +1125,10 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService carContract = dto.getCarContract(); if (!carContract.isEmpty()) { String carContractImages = String.join(",", carContract).replaceAll(fileUploadComponent.getUrlPrefix(), ""); @@ -1140,6 +1149,11 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService otherFile = dto.getFileList(); + if (!otherFile.isEmpty()) { + String fileLists = String.join(",", otherFile).replaceAll(fileUploadComponent.getUrlPrefix(), ""); + busArrearsCarryVehicleApply.setOtherFile(fileLists); + } //车辆 List adCarListVoList = dto.getVinList(); if (adCarListVoList.isEmpty()) {