From dde6a523e489fd12786b64277a25f7565eb6218c Mon Sep 17 00:00:00 2001 From: alllenliufor3 <1009545232@qq.com> Date: Fri, 8 Apr 2022 16:02:02 +0800 Subject: [PATCH 01/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundRest.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/ScmApplyInboundRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundRest.java index 50d309d412..c50a763c48 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundRest.java @@ -53,6 +53,6 @@ public class ScmApplyInboundRest implements ScmApplyInboundFeign { @Override public ResultBean fetchSid(String sid) { - return new ResultBean().setData(scmApplyInboundService.selectBySid(sid)); + return new ResultBean().success().setData(scmApplyInboundService.selectBySid(sid)); } } From 9130eb30a79405bf6b9965c2489553e37dbe7a7a Mon Sep 17 00:00:00 2001 From: alllenliufor3 <1009545232@qq.com> Date: Mon, 11 Apr 2022 10:45:50 +0800 Subject: [PATCH 02/13] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=90=88=E5=90=8C?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=A8=A1=E6=9D=BF=E6=9E=9A=E4=B8=BE=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commoncontract/ContractTemplateEnum.java | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/ContractTemplateEnum.java diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/ContractTemplateEnum.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/ContractTemplateEnum.java new file mode 100644 index 0000000000..f5fbef4a01 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/ContractTemplateEnum.java @@ -0,0 +1,42 @@ +package com.yxt.anrui.base.api.commoncontract; + +/** + * @author liuguohui + * @version 1.0 + * @Description: 合同类型模板枚举类 + * @date 2022/04/07 + */ +public enum ContractTemplateEnum { + + CARSALECONTRACTNEW("car_sale_contract_new", "新车买卖合同（现车）"), + CARSALECONTRACTNEWBLANK("car_sale_contract_new_blank", "新车买卖合同（现车）（空）"), // 空白 + CARSALECONTRACTBOOK("car_sale_contract_book", "新车买卖合同（订车）"), + CARSALECONTRACTBOOKBLANK("car_sale_contract_book_blank", "新车买卖合同（订车）（空）"), // 空白 + CUSTOMERINVOICINGAPPLICATION("customer_invoicing_application", "客户开票申请书"), + VEHICLEREGISTRATION("vehicle_registration", "车辆登记合同"), + ENTRUSTPICKUPAUTHORIZATION("entrust_pickup_authorization", "委托提车授权书"), + ; + + /** + * 模板类型 + */ + private final String type; + + /** + * 模板名称 + */ + private final String name; + + ContractTemplateEnum(String type, String name) { + this.type = type; + this.name = name; + } + + public String getType() { + return type; + } + + public String getName() { + return name; + } +} From 3ce25d1561018e0282a63cb10abad95237791a38 Mon Sep 17 00:00:00 2001 From: alllenliufor3 <1009545232@qq.com> Date: Mon, 11 Apr 2022 10:52:24 +0800 Subject: [PATCH 03/13] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20=E6=A0=B9=E6=8D=AE?= =?UTF-8?q?=E8=AE=A2=E5=8D=95sid=E6=9F=A5=E8=AF=A2=E8=BD=A6=E8=BE=86?= =?UTF-8?q?=E8=BD=A6=E6=9E=B6=E5=8F=B7=20=E7=9A=84=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yxt/anrui/buscenter/api/busorder/BusOrderVo.java | 2 ++ .../api/busordervehicle/BusOrderVehicleFeign.java | 4 ++++ .../busordervehicle/BusOrderVehicleFeignFallback.java | 6 ++++++ .../biz/busordervehicle/BusOrderVehicleMapper.java | 3 +++ .../biz/busordervehicle/BusOrderVehicleRest.java | 5 +++++ .../biz/busordervehicle/BusOrderVehicleService.java | 9 +++++++++ 6 files changed, 29 insertions(+) diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busorder/BusOrderVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busorder/BusOrderVo.java index dac350699e..9ecc7c670b 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busorder/BusOrderVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busorder/BusOrderVo.java @@ -36,6 +36,8 @@ public class BusOrderVo implements Vo { private String customerName; //联系电话 private String mobile; + //证件号码 + private String IDNumber; //品牌 //单台成交价 //数量 diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busordervehicle/BusOrderVehicleFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busordervehicle/BusOrderVehicleFeign.java index c76f3a77a1..7fc48aca41 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busordervehicle/BusOrderVehicleFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busordervehicle/BusOrderVehicleFeign.java @@ -63,6 +63,10 @@ public interface BusOrderVehicleFeign { @PostMapping("/checkFinGinvoiceapply") ResultBean checkFinGinvoiceapply(@RequestBody List list); + @ApiOperation("根据订单sid查询车辆车架号") + @GetMapping("/getVehicleVINNoByOrderSid/{orderSid}") + ResultBean getVehicleVINNoByOrderSid(@PathVariable ("orderSid") String orderSid); + /******************************************手机端接口********************************************/ @ApiOperation("手机端根据销售订单sid查询车辆信息列表") diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busordervehicle/BusOrderVehicleFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busordervehicle/BusOrderVehicleFeignFallback.java index 44a2289ca5..10ba40befb 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busordervehicle/BusOrderVehicleFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busordervehicle/BusOrderVehicleFeignFallback.java @@ -68,6 +68,12 @@ public class BusOrderVehicleFeignFallback implements BusOrderVehicleFeign { return rb.setMsg("接口anrui-buscenter/busordervehicle/checkFinGinvoiceapply无法访问"); } + @Override + public ResultBean getVehicleVINNoByOrderSid(String orderSid) { + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui-buscenter/busordervehicle/getVehicleVINNoByOrderSid无法访问"); + } + @Override public ResultBean getAppOrderVehicleListByOrderSid(String orderSid) { ResultBean rb = ResultBean.fireFail(); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busordervehicle/BusOrderVehicleMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busordervehicle/BusOrderVehicleMapper.java index 7e53306ba2..6de18d2051 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busordervehicle/BusOrderVehicleMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busordervehicle/BusOrderVehicleMapper.java @@ -41,6 +41,9 @@ public interface BusOrderVehicleMapper extends BaseMapper { */ List selectByOrderSid(String sid); + @Select("SELECT GROUP_CONCAT(VINNo) FROM bus_order_vehicle WHERE orderSid=#{orderSid}") + String getVehicleVINNoByOrderSid(@Param("orderSid") String orderSid); + List getBusOrderVehicle(String busOrderSid); IPage getExpectInvoiceList(IPage page, @Param(Constants.WRAPPER) Wrapper qw); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busordervehicle/BusOrderVehicleRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busordervehicle/BusOrderVehicleRest.java index fa675eefa4..eb2f547291 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busordervehicle/BusOrderVehicleRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busordervehicle/BusOrderVehicleRest.java @@ -88,6 +88,11 @@ public class BusOrderVehicleRest implements BusOrderVehicleFeign { return busOrderVehicleService.checkFinGinvoiceapply(list); } + @Override + public ResultBean getVehicleVINNoByOrderSid(String orderSid) { + return new ResultBean().success().setData(busOrderVehicleService.getVehicleVINNoByOrderSid(orderSid)); + } + @Override public ResultBean> getAppOrderVehicleListByOrderSid(String orderSid) { List list = busOrderVehicleService.getAppOrderVehicleListByOrderSid(orderSid); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busordervehicle/BusOrderVehicleService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busordervehicle/BusOrderVehicleService.java index 4474d2f0ad..32b92233b5 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busordervehicle/BusOrderVehicleService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busordervehicle/BusOrderVehicleService.java @@ -145,6 +145,15 @@ public class BusOrderVehicleService extends MybatisBaseService getBusOrderVehicle(String busOrderSid) { return baseMapper.getBusOrderVehicle(busOrderSid); } From 6c740fd1af9286abba191ca685562d53e42145a3 Mon Sep 17 00:00:00 2001 From: alllenliufor3 <1009545232@qq.com> Date: Mon, 11 Apr 2022 10:54:46 +0800 Subject: [PATCH 04/13] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20=E5=A4=87=E6=B3=A8?= =?UTF-8?q?=20=20=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/scmapplyinboundvehicle/ScmApplyInboundVehicleVo.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehicle/ScmApplyInboundVehicleVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehicle/ScmApplyInboundVehicleVo.java index abbf2a76f9..8d360546a4 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehicle/ScmApplyInboundVehicleVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinboundvehicle/ScmApplyInboundVehicleVo.java @@ -35,4 +35,7 @@ public class ScmApplyInboundVehicleVo implements Vo { @ApiModelProperty("车架号(VIN)") private String vinNo; + + @ApiModelProperty("备注") + private String remarks; } From 102d98b785d745299249605db0945cd7efe28cfb Mon Sep 17 00:00:00 2001 From: alllenliufor3 <1009545232@qq.com> Date: Mon, 11 Apr 2022 10:57:35 +0800 Subject: [PATCH 05/13] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20=E9=94=80=E5=94=AE?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=E4=B8=AD=E7=94=9F=E6=88=90?= =?UTF-8?q?=EF=BC=88=E4=B8=8B=E8=BD=BD=EF=BC=89pdf=E5=90=88=E5=90=8C?= =?UTF-8?q?=E7=9A=84=20=E7=9A=84=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commoncontract/AdvanceInvoiceListVo.java | 37 +++ .../commoncontract/CommonContractFeign.java | 9 + .../CommonContractFeignFallback.java | 12 + .../api/commoncontract/PrintConfirmDto.java | 44 +++ .../api/commoncontract/PrintConfirmVo.java | 23 ++ .../base/api/commoncontract/PrintItemVo.java | 32 ++ .../VehicleRegistrationListVo.java | 29 ++ .../BaseModelSzconfigMapper.xml | 1 - .../biz/basetrailer/BaseTrailerMapper.xml | 1 - .../commoncontract/CommonContractRest.java | 10 + .../commoncontract/CommonContractService.java | 298 ++++++++++++++++++ .../src/main/resources/application.yml | 4 +- 12 files changed, 497 insertions(+), 3 deletions(-) create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/AdvanceInvoiceListVo.java create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/PrintConfirmDto.java create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/PrintConfirmVo.java create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/PrintItemVo.java create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/VehicleRegistrationListVo.java diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/AdvanceInvoiceListVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/AdvanceInvoiceListVo.java new file mode 100644 index 0000000000..97406d8247 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/AdvanceInvoiceListVo.java @@ -0,0 +1,37 @@ +package com.yxt.anrui.base.api.commoncontract; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author liuguohui + * @version 1.0 + * @description + * @date 2022/04/08 + */ +@ApiModel("提前开票列表") +@Data +public class AdvanceInvoiceListVo implements Vo { + + @ApiModelProperty("车架号") + @JsonProperty("VINNo") + private String VINNo; + + @ApiModelProperty("发票类型") + private String invoiceType; + + @ApiModelProperty("开票金额") + private String invoiceMoney; + + @ApiModelProperty("开票名称") + private String invoiceName; + + @ApiModelProperty("品牌") + private String brandName; + + @ApiModelProperty("发动机号") + private String engineNo; +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeign.java index 3ff6f8e31e..5b9b806129 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeign.java @@ -12,6 +12,7 @@ import org.springframework.web.multipart.MultipartFile; import javax.validation.Valid; import java.io.IOException; import java.text.ParseException; +import java.util.List; import java.util.Map; /** @@ -128,6 +129,14 @@ public interface CommonContractFeign { @ApiOperation(value = "导入") public ResultBean getExcelInfo(@RequestParam(value = "fileName") String fileName, @RequestParam(value = "file") MultipartFile file) throws IOException, ParseException; + @ApiOperation(value = "打印项设置") + @GetMapping("/printItemSet") + public ResultBean printItemSet(@RequestParam("busSid") String busSid, @RequestParam("customerName") String customerName); + + @ApiOperation(value = "打印项确认(生成word后转为pdf)") + @PostMapping("/printConfirm") + public ResultBean> printConfirm(@RequestBody PrintConfirmDto dto); + /******************************************************新车买卖合同审核（流程）******************************************************/ diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeignFallback.java index 1a153ad72b..189fd364b8 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeignFallback.java @@ -134,6 +134,18 @@ public class CommonContractFeignFallback implements CommonContractFeign { return null; } + @Override + public ResultBean printItemSet(String busSid, String customerName) { + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui-base/commoncontract/printItemSet无法访问"); + } + + @Override + public ResultBean printConfirm(PrintConfirmDto dto) { + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui-base/commoncontract/printConfirm无法访问"); + } + @Override public ResultBean submitCarSaleContractApprove(CarSaleContractApproveDto dto) { ResultBean rb = ResultBean.fireFail(); diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/PrintConfirmDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/PrintConfirmDto.java new file mode 100644 index 0000000000..6eb46a4add --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/PrintConfirmDto.java @@ -0,0 +1,44 @@ +package com.yxt.anrui.base.api.commoncontract; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author liuguohui + * @version 1.0 + * @description + * @date 2022/04/07 + */ +@ApiModel("打印项确认") +@Data +public class PrintConfirmDto implements Dto { + + @ApiModelProperty("合同sid") + private String sid; + + @ApiModelProperty("业务表sid") + private String busSid; + + @ApiModelProperty("客户sid") + private String customerSid; + + @ApiModelProperty("合同编号") + private String contractNo; + + @ApiModelProperty("客户名称") + private String customerName; + + @ApiModelProperty("是否优惠：1是0否") + private int isDiscount; + + @ApiModelProperty("是否提前开票：1是0否") + private int isAdvanceInvoice; + + @ApiModelProperty("是否委托提车：1是0否") + private int isEntrustVehicle; + + @ApiModelProperty("是否在保险公司购买保险：1是0否") + private int isPurchasingInsurance; +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/PrintConfirmVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/PrintConfirmVo.java new file mode 100644 index 0000000000..e05a953a86 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/PrintConfirmVo.java @@ -0,0 +1,23 @@ +package com.yxt.anrui.base.api.commoncontract; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiOperation; +import lombok.Data; + +/** + * @author liuguohui + * @version 1.0 + * @description + * @date 2022/04/09 + */ +@ApiOperation("文件名称") +@Data +public class PrintConfirmVo implements Vo { + + @ApiModelProperty("文件名称") + private String name; + + @ApiModelProperty("下载路径") + private String downloadUrl; +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/PrintItemVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/PrintItemVo.java new file mode 100644 index 0000000000..c2181ccc13 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/PrintItemVo.java @@ -0,0 +1,32 @@ +package com.yxt.anrui.base.api.commoncontract; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author liuguohui + * @version 1.0 + * @description + * @date 2022/04/06 + */ +@ApiModel("打印项设置") +@Data +public class PrintItemVo implements Vo { + + @ApiModelProperty("合同sid") + private String sid; + + @ApiModelProperty("合同编号") + private String contractNo; + + @ApiModelProperty("业务表sid") + private String busSid; + + @ApiModelProperty("客户sid") + private String customerSid; + + @ApiModelProperty("客户名称") + private String customerName; +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/VehicleRegistrationListVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/VehicleRegistrationListVo.java new file mode 100644 index 0000000000..8d2d83fe97 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/VehicleRegistrationListVo.java @@ -0,0 +1,29 @@ +package com.yxt.anrui.base.api.commoncontract; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author liuguohui + * @version 1.0 + * @description + * @date 2022/04/08 + */ +@ApiModel("合同车辆信息列表") +@Data +public class VehicleRegistrationListVo implements Vo { + + @ApiModelProperty("车架号") + @JsonProperty("VINNo") + private String VINNo; + + @ApiModelProperty("品牌") + private String brandName; + + @ApiModelProperty("发动机号") + @JsonProperty("engineNo") + private String engineNo; +} diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelszconfig/BaseModelSzconfigMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelszconfig/BaseModelSzconfigMapper.xml index a80e22ca9b..c26b235c0f 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelszconfig/BaseModelSzconfigMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelszconfig/BaseModelSzconfigMapper.xml @@ -9,7 +9,6 @@ SELECT bms.refitMethod, bms.refitFactory, bms.topName, - bms.refitPrice, bms.announcementModel, bms.overallDimension, bms.plateMaterial, diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerMapper.xml index 33d7907121..32cb0728a6 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerMapper.xml @@ -44,7 +44,6 @@ bt.carBrand, bt.settlement, bt.vinNo, - bt.trailerPrince, bt.otherConfig FROM base_trailer bt WHERE bt.modelSid = #{modelSid} diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractRest.java index 7c0a5886dc..1a72ebe670 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractRest.java @@ -355,6 +355,16 @@ public class CommonContractRest implements CommonContractFeign { } } + @Override + public ResultBean printItemSet(String busSid, String customerName) { + return commonContractService.printItemSet(busSid, customerName); + } + + @Override + public ResultBean> printConfirm(PrintConfirmDto dto) { + return commonContractService.printConfirm(dto); + } + public List getSheetVal(Sheet sheet, int[] resultCell) throws ParseException { SimpleDateFormat ft = new SimpleDateFormat("yyyy-MM-dd"); List punishmentList = new ArrayList<>(); 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 00822b5242..fa33a875b3 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 @@ -3,8 +3,12 @@ package com.yxt.anrui.base.biz.commoncontract; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.base.api.basemodelszconfig.AppBaseModelSzconfigDetailsVo; +import com.yxt.anrui.base.api.basetrailer.AppBaseTrailerDetailsVo; import com.yxt.anrui.base.api.commonappendix.CommonAppendix; import com.yxt.anrui.base.api.commoncontract.*; +import com.yxt.anrui.base.biz.basemodelszconfig.BaseModelSzconfigService; +import com.yxt.anrui.base.biz.basetrailer.BaseTrailerService; import com.yxt.anrui.base.biz.basevehiclebrand.BaseVehicleBrandService; import com.yxt.anrui.base.biz.basevehiclemodel.BaseVehicleModelService; import com.yxt.anrui.base.biz.commonappendix.CommonAppendixService; @@ -13,6 +17,12 @@ import com.yxt.anrui.buscenter.api.busdeposit.BusDepositFeign; import com.yxt.anrui.buscenter.api.busdepositvehicle.BusDepositVehicleFeign; import com.yxt.anrui.buscenter.api.busorder.BusOrderFeign; import com.yxt.anrui.buscenter.api.busorder.BusOrderVo; +import com.yxt.anrui.buscenter.api.busorderdiscount.AppBusOrderDiscountListVo; +import com.yxt.anrui.buscenter.api.busorderdiscount.BusOrderDiscountFeign; +import com.yxt.anrui.buscenter.api.busordermodel.AppBusOrderModelVo; +import com.yxt.anrui.buscenter.api.busordermodel.BusOrderModelFeign; +import com.yxt.anrui.buscenter.api.busordervehicle.BusOrderVehicleFeign; +import com.yxt.anrui.crm.api.crmcustomer.CrmCustomerFeign; import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFeign; import com.yxt.anrui.flowable.api.sysformlink.SysFormStateVo; import com.yxt.anrui.flowable.api.utils.procDefEnum; @@ -25,6 +35,7 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.anrui.portal.config.DictCommonType; +import com.yxt.common.base.config.component.DocPdfComponent; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.DateUtils; @@ -34,12 +45,18 @@ import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.io.File; +import java.math.BigDecimal; +import java.text.MessageFormat; import java.text.SimpleDateFormat; import java.util.*; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; import java.util.stream.Collectors; /** @@ -58,6 +75,15 @@ import java.util.stream.Collectors; @Service public class CommonContractService extends MybatisBaseService { + @Value("${templateUrl.uploadUrl}") + private String uploadTemplateUrl; + + @Value("${templateUrl.prefixUrl}") + private String prefixTemplateUrl; + + @Autowired + private DocPdfComponent docPdfComponent; + @Autowired private SysUserFeign sysUserFeign; @Autowired @@ -71,6 +97,12 @@ public class CommonContractService extends MybatisBaseService createQueryWrapper(CommonContractQuery query) { // todo: 这里根据具体业务调整查询条件 @@ -522,6 +560,266 @@ public class CommonContractService extends MybatisBaseService printItemSet(String busSid, String customerName) { + CommonContractBuscenterVo contractBuscenterVo = baseMapper.selectByBusSid(busSid); + PrintItemVo vo = new PrintItemVo(); + BeanUtil.copyProperties(contractBuscenterVo, vo); + vo.setCustomerName(customerName); + return new ResultBean().success().setData(vo); + } + + /** + * 打印项-确认 + * @param dto + * @return + */ + public ResultBean> printConfirm(PrintConfirmDto dto) { + Map map = new HashMap(); + // 合同信息 + CommonContract contract = fetchBySid(dto.getSid()); + map.put("partyA", contract.getPartyA()); // 甲方 + map.put("partyB", contract.getPartyB()); // 乙方 + map.put("contractNo", contract.getContractNo()); // 合同编号 + map.put("createDate", contract.getCreateDate()); // 签订时间 + // 客户信息; + BusOrderVo order = busOrderFeign.fetchSid(dto.getBusSid()).getData(); + map.put("customerName", order.getCustomerName()); // 联系电话 + map.put("mobile", order.getMobile()); // 联系电话 + map.put("IDNumber", order.getIDNumber()); // 身份证号 + // 车型、主车信息 + ResultBean model = busOrderModelFeign.getAppBusOrderModelInfoBySid(dto.getBusSid()); + map.put("modelName", model.getData().getModelName()); // 车型 + map.put("modelConfig", model.getData().getModelotherConfig()); // 配置（只有订车有） ？待确认 + map.put("mainVehicleNum", model.getData().getQuantity()); // 主车数量 + map.put("mainVehicleSinglePrice", model.getData().getSingle_price()); // 单台成交价 + ResultBean vinNo = busOrderVehicleFeign.getVehicleVINNoByOrderSid(dto.getBusSid()); + map.put("VINNo", vinNo.getData()); // 车架号 + // 上装信息 + AppBaseModelSzconfigDetailsVo szconfig = baseModelSzconfigService.getAppBaseModelSzconfigDetailsVo(model.getData().getSid()); + map.put("topName", szconfig.getTopName()); // 上装 + // 挂车信息 + AppBaseTrailerDetailsVo trailer = baseTrailerService.getAppBaseTrailerDetailsVo(model.getData().getSid()); + map.put("trailerName", trailer.getOtherConfig()); // 挂车 + map.put("trailerNum", model.getData().getQuantity()); // 挂车数量 ？待确认 + map.put("trailerSinglePrice", StringUtils.isBlank(trailer.getTrailerPrince()) ? "" : trailer.getTrailerPrince()); // 挂车单台成交价 ？待确认 + // 优惠说明信息 + ResultBean> discountList = busOrderDiscountFeign.getAppDiscountListVoByOrderSid(order.getOrderSid()); + map.put("discountDetail", ""); // 优惠说明 ？待确认 + if (discountList.getSuccess()) { + map.put("discountDetail", discountList.getData().get(0).getDetail()); // 优惠说明 ？待确认 + } + // 保险说明信息 + map.put("insuranceDetail", "首次在本店投保，第二、三年继续在本店续保。（不在公司投保的，不显示）"); // 保险说明 ？待确认 + // 车辆交付地点 + map.put("deliveryPlace", model.getData().getExpected_takecar_location()); + + List list = new ArrayList<>(); + try { + ExecutorService executor = Executors.newFixedThreadPool(5); + Future future1 = executor.submit(() -> { + return genCarSaleContract(dto, map, order); + }); + Future future2 = executor.submit(() -> { + return genVehicleRegistration(dto, map); + }); + Future future3 = executor.submit(() -> { + // 客户开票申请书（暂时先不考虑） + if (dto.getIsAdvanceInvoice() == 1) { + return genAdvanceInvoice(dto, map); + } else { + return ""; + } + }); + Future future4 = executor.submit(() -> { + // 委托提车授权书 + if (dto.getIsEntrustVehicle() == 1) { + return genEntrustVehicle(dto, map); + } else { + return ""; + } + }); + Future future5 = executor.submit(() -> { + return genCarSaleContractBlank(dto, map, order); + }); + + future1.get(); + future2.get(); + future3.get(); + future4.get(); + future5.get(); + PrintConfirmVo printConfirmVo = null; + if (StringUtils.isNotBlank(future1.get())) { + printConfirmVo = new PrintConfirmVo(); + // 待确认：现车或订车 + // 现车 +// printConfirmVo.setName(MessageFormat.format("《{0}》", ContractTemplateEnum.CARSALECONTRACTNEW.getName())); + // 订车 + printConfirmVo.setName(MessageFormat.format("《{0}》", ContractTemplateEnum.CARSALECONTRACTBOOK.getName())); + printConfirmVo.setDownloadUrl(future1.get()); + list.add(printConfirmVo); + } + if (StringUtils.isNotBlank(future2.get())) { + printConfirmVo = new PrintConfirmVo(); + printConfirmVo.setName(MessageFormat.format("《{0}》", ContractTemplateEnum.VEHICLEREGISTRATION.getName())); + printConfirmVo.setDownloadUrl(future2.get()); + list.add(printConfirmVo); + } + if (StringUtils.isNotBlank(future3.get())) { + printConfirmVo = new PrintConfirmVo(); + printConfirmVo.setName(MessageFormat.format("《{0}》", ContractTemplateEnum.CUSTOMERINVOICINGAPPLICATION.getName())); + printConfirmVo.setDownloadUrl(future3.get()); + list.add(printConfirmVo); + } + if (StringUtils.isNotBlank(future4.get())) { + printConfirmVo = new PrintConfirmVo(); + printConfirmVo.setName(MessageFormat.format("《{0}》", ContractTemplateEnum.ENTRUSTPICKUPAUTHORIZATION.getName())); + printConfirmVo.setDownloadUrl(future4.get()); + list.add(printConfirmVo); + } + if (StringUtils.isNotBlank(future5.get())) { + printConfirmVo = new PrintConfirmVo(); + printConfirmVo.setName(MessageFormat.format("《{0}》", ContractTemplateEnum.CARSALECONTRACTNEWBLANK.getName())); + printConfirmVo.setDownloadUrl(future5.get()); + list.add(printConfirmVo); + } + } catch (Exception e) { + e.printStackTrace(); + return new ResultBean().fail().setMsg("生成文件失败"); + } + return new ResultBean().success().setData(list); + } + + /** + * 生成 新车买卖合同(现车或订车) pdf + * @param dto + */ + private String genCarSaleContract(PrintConfirmDto dto, Map map, BusOrderVo order) { + String url = ""; + // 车辆税信息 + map.put("taxSum", "1111"); // 车辆含税 ？待确认 + map.put("taxSumUpper", "壹仟壹佰壹拾壹"); // 车辆含税（大写） ？待确认 + // 乙方缴纳订金 + map.put("deposit", order.getDeposit()); // 订金 + map.put("useDeposit", "true"); // 判断是否展示括号中的内容 ？待确认：用本人交纳的虚拟订金的，需要显示订金后面括弧 中的说明 + map.put("date", order.getCreateDate()); // 订金缴纳日期 ？待确认 + map.put("deposit1", ""); // 总订金 ？待确认 + map.put("deposit2", ""); // 用于缴纳的订金 ？待确认 + + // 目标路径 ？ 待确认：如何区分现车和订车 + // 现车 +// String typeName = ContractTemplateEnum.CARSALECONTRACTNEW.getName(); + // 订车 + String typeName = ContractTemplateEnum.CARSALECONTRACTBOOK.getName(); + String docName = typeName + "（" + order.getCustomerName() + "）.doc"; + Map resultMap = docPdfComponent.createDocToPdf(map, typeName, docName); + url = resultMap.get("prefixTemplateUrl"); + return url; + } + + /** + * 生成 新车买卖合同(现车) （空）pdf + * @param dto + * @param map + * @param order + * @return + */ + private String genCarSaleContractBlank(PrintConfirmDto dto, Map map, BusOrderVo order) { + String url = ""; + String typeName = ""; + String docName = ""; + // 涉及高低开票的，需要打印两套合同，一套按照成交价打印（记账用），一套为价格空白的合同（开票用） + // 合同金额 ？ 待确定 + BigDecimal contractAmount = order.getContractAmount(); + if (contractAmount == null) { + // 待确定 ? 现车或订车 + // 现车 + typeName = ContractTemplateEnum.CARSALECONTRACTNEWBLANK.getName(); + // 订车 + typeName = ContractTemplateEnum.CARSALECONTRACTBOOKBLANK.getName(); + docName = typeName + "（" + order.getCustomerName() + "）.doc"; + Map map2 = docPdfComponent.createDocToPdf(map, typeName, docName); + url += ", " + map2.get("prefixTemplateUrl"); + } + return url; + } + + /** + * 生成 客户开票申请书 pdf + * @param dto + * @return + */ + private String genAdvanceInvoice(PrintConfirmDto dto, Map map) { + String url = ""; + // 列表？待确认 + List list = new ArrayList<>(); + AdvanceInvoiceListVo vo = new AdvanceInvoiceListVo(); + vo.setInvoiceName("开票名称"); + vo.setInvoiceMoney("开票金额"); + vo.setInvoiceType("发票类型"); + vo.setVINNo("002234329"); + list.add(vo); + AdvanceInvoiceListVo vo1 = new AdvanceInvoiceListVo(); + BeanUtil.copyProperties(vo, vo1); + vo1.setVINNo("002324345"); + list.add(vo1); + map.put("list", list); // 列表 + // 目标路径 + String typeName = ContractTemplateEnum.CUSTOMERINVOICINGAPPLICATION.getName(); + String docName = typeName + "（" + map.get("customerName") + "）.doc"; + Map resultMap = docPdfComponent.createDocToPdf(map, typeName, docName); + url = resultMap.get("prefixTemplateUrl"); + return url; + } + + /** + * 生成 车辆登记合同 pdf + * @param dto + * @return + */ + private String genVehicleRegistration(PrintConfirmDto dto, Map map) { + String url = ""; + // 列表？待确认 + List list = new ArrayList<>(); + VehicleRegistrationListVo vo = new VehicleRegistrationListVo(); + vo.setBrandName("陕汽"); + vo.setVINNo("002234329"); + vo.setEngineNo("672342642232323"); + list.add(vo); + VehicleRegistrationListVo vo1 = new VehicleRegistrationListVo(); + vo1.setBrandName("欧曼"); + vo1.setVINNo("002324345"); + vo1.setEngineNo("67234299923ad"); + list.add(vo1); + map.put("list", list); // 列表 + // 目标路径 + String typeName = ContractTemplateEnum.VEHICLEREGISTRATION.getName(); + String docName = typeName + "（" + map.get("customerName") + "）.doc"; + Map resultMap = docPdfComponent.createDocToPdf(map, typeName, docName); + url = resultMap.get("prefixTemplateUrl"); + return url; + } + + /** + * 生成 委托提车授权书 pdf + * @param dto + * @return + */ + private String genEntrustVehicle(PrintConfirmDto dto, Map map) { + String url = ""; + // 目标路径 + String typeName = ContractTemplateEnum.ENTRUSTPICKUPAUTHORIZATION.getName(); + String docName = typeName + "（" + map.get("customerName") + "）.doc"; + Map resultMap = docPdfComponent.createDocToPdf(map, typeName, docName); + url = resultMap.get("prefixTemplateUrl"); + return url; + } + + public List selByBusSid(String userSid, String busSid) { Map map = generateContractNo(userSid); String staffSid = map.get("staffSid"); diff --git a/anrui-base/anrui-base-biz/src/main/resources/application.yml b/anrui-base/anrui-base-biz/src/main/resources/application.yml index 5e4a442350..d0b0cb9c16 100644 --- a/anrui-base/anrui-base-biz/src/main/resources/application.yml +++ b/anrui-base/anrui-base-biz/src/main/resources/application.yml @@ -55,6 +55,8 @@ ribbon: ReadTimeout: 30000 ConnectTimeout: 30000 - +templateUrl: + uploadUrl: D:\anrui\template\ + prefixUrl: http://120.46.131.15:8111/template/ From 1798f61652cc503ea7ac01e38d30cba1ea00854d Mon Sep 17 00:00:00 2001 From: alllenliufor3 <1009545232@qq.com> Date: Mon, 11 Apr 2022 15:47:59 +0800 Subject: [PATCH 06/13] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20=E5=85=A5=E8=B4=A6?= =?UTF-8?q?=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/utils/{procDefEnum.java => ProcDefEnum.java} | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) rename anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/{procDefEnum.java => ProcDefEnum.java} (89%) 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 similarity index 89% rename from anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/procDefEnum.java rename to anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java index a57bda7d88..dd4ad580b3 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 @@ -3,7 +3,7 @@ package com.yxt.anrui.flowable.api.utils; /** * 流程定义：流程名称与代号枚举类 */ -public enum procDefEnum { +public enum ProcDefEnum { ORDERDEPOSITAPPROVE("虚拟订单（订金）审批", "order_deposit_approve_bsf3sgwd:1:230012"), ORDERDEPOSITVEHICLEAPPROVE("虚拟订单（预订车辆）审批", "order_deposit_vehicle_approve_bsf3sgwd:1:230016"), @@ -14,9 +14,10 @@ public enum procDefEnum { ADVANCEGINVOICEAPPLY("提前开票申请流程","advance_ginvoiceapply:1:242664"), ARREARSCARRYVEHICLE("欠款提车审批流程","arrears_carryvehicle:1:232589"), VEHICLEAPPLY("排产申请流程","process_9egcg169:1:242660"), + RECORDAPPLICATION("入账申请","record_application_7y80d4r8"), ; - procDefEnum(String proDefName, String proDefId) { + ProcDefEnum(String proDefName, String proDefId) { this.proDefName = proDefName; this.proDefId = proDefId; } From c7f4f32f218218eef1aba7a382bac693b39110d6 Mon Sep 17 00:00:00 2001 From: alllenliufor3 <1009545232@qq.com> Date: Mon, 11 Apr 2022 17:13:43 +0800 Subject: [PATCH 07/13] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E6=9E=9A=E4=B8=BE?= =?UTF-8?q?=E7=B1=BB=E5=90=8D=EF=BC=88=E9=A6=96=E5=AD=97=E6=AF=8D=E6=94=B9?= =?UTF-8?q?=E5=A4=A7=E5=86=99=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseDiscountpackageService.java | 4 ++-- .../biz/busvehicleapply/BusVehicleApplyService.java | 6 ++---- .../biz/commoncontract/CommonContractService.java | 4 ++-- .../BusAdvanceGinvoiceapplyService.java | 4 ++-- .../BusArrearsCarryVehicleApplyService.java | 4 ++-- .../biz/busmaindeposit/BusMainDepositService.java | 12 ++++++------ .../buscenter/biz/busorder/BusOrderService.java | 4 ++-- .../busorderdiscount/BusOrderDiscountService.java | 4 ++-- 8 files changed, 20 insertions(+), 22 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageService.java index 8675c6c3ab..7cac6404dd 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageService.java @@ -8,7 +8,7 @@ import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkDto; import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFeign; import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFlowStateEnum; import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkTypeEnum; -import com.yxt.anrui.flowable.api.utils.procDefEnum; +import com.yxt.anrui.flowable.api.utils.ProcDefEnum; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.common.core.result.ResultBean; @@ -201,7 +201,7 @@ public class BaseDiscountpackageService extends MybatisBaseService map = (Map) resultBean.getData(); saveSysFormLink(map); 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 9d37e263b0..6fb1e345d0 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 @@ -16,7 +16,7 @@ import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkDto; import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFeign; import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFlowStateEnum; import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkTypeEnum; -import com.yxt.anrui.flowable.api.utils.procDefEnum; +import com.yxt.anrui.flowable.api.utils.ProcDefEnum; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; @@ -29,11 +29,9 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.xml.crypto.Data; import java.math.BigDecimal; import java.text.SimpleDateFormat; import java.util.*; -import java.util.stream.Collectors; /** * Project: anrui-scm(进销存)
@@ -220,7 +218,7 @@ public class BusVehicleApplyService extends MybatisBaseService map = (Map) resultBean.getData(); saveSysFormLink(map); 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 fa33a875b3..27296b4091 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 @@ -25,7 +25,7 @@ import com.yxt.anrui.buscenter.api.busordervehicle.BusOrderVehicleFeign; import com.yxt.anrui.crm.api.crmcustomer.CrmCustomerFeign; import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFeign; import com.yxt.anrui.flowable.api.sysformlink.SysFormStateVo; -import com.yxt.anrui.flowable.api.utils.procDefEnum; +import com.yxt.anrui.flowable.api.utils.ProcDefEnum; import com.yxt.anrui.portal.api.dictcommon.DictCommonFeign; import com.yxt.anrui.portal.api.dictcommon.DictCommonVo; import com.yxt.anrui.portal.api.sysorganization.SysOrganization; @@ -902,7 +902,7 @@ public class CommonContractService extends MybatisBaseService fetchAllBySid(String sid) { diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyService.java index adc5bc0926..c279416bf3 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busadvanceginvoiceapply/BusAdvanceGinvoiceapplyService.java @@ -41,7 +41,7 @@ import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkDto; import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFeign; import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFlowStateEnum; import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkTypeEnum; -import com.yxt.anrui.flowable.api.utils.procDefEnum; +import com.yxt.anrui.flowable.api.utils.ProcDefEnum; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.common.base.config.component.FileUploadComponent; @@ -291,7 +291,7 @@ public class BusAdvanceGinvoiceapplyService extends MybatisBaseService map = (Map) resultBean.getData(); saveSysFormLink(map); 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 aaa837bfa3..69f4eebf13 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 @@ -14,7 +14,7 @@ import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkDto; import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFeign; import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFlowStateEnum; import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkTypeEnum; -import com.yxt.anrui.flowable.api.utils.procDefEnum; +import com.yxt.anrui.flowable.api.utils.ProcDefEnum; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.common.core.result.ResultBean; @@ -307,7 +307,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService map = (Map) resultBean.getData(); saveSysFormLink(map); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java index c91e79f3ff..eef9fa2362 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java @@ -46,7 +46,7 @@ import com.yxt.anrui.buscenter.biz.busdepositvehicle.BusDepositVehicleService; import com.yxt.anrui.buscenter.biz.busdepositvehiclecustomer.BusDepositVehicleCustomerService; import com.yxt.anrui.buscenter.biz.flow.FlowableService; import com.yxt.anrui.flowable.api.sysformlink.*; -import com.yxt.anrui.flowable.api.utils.procDefEnum; +import com.yxt.anrui.flowable.api.utils.ProcDefEnum; import com.yxt.anrui.portal.api.dictcommon.DictCommonFeign; import com.yxt.anrui.portal.api.dictcommon.DictCommonVo; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; @@ -713,13 +713,13 @@ public class BusMainDepositService extends MybatisBaseService map = (Map) resultBean.getData(); /*saveSysFormLink(map);*/ //更新虚拟订单审批（订金）业务表中的流程状态 modifiBusMainDepositFlowState(businessSid, - procDefEnum.ORDERDEPOSITAPPROVE.getProDefId(),//procDefId + ProcDefEnum.ORDERDEPOSITAPPROVE.getProDefId(),//procDefId map.get("nodeState"),//state map.get("procInsId"),//procInstSid map.get("taskDefKey")//nodeSid @@ -850,7 +850,7 @@ public class BusMainDepositService extends MybatisBaseService map = (Map) resultBean.getData(); saveSysFormLink(map); @@ -885,7 +885,7 @@ public class BusMainDepositService extends MybatisBaseService map = (Map) resultBean.getData(); saveSysFormLink(map); @@ -920,7 +920,7 @@ public class BusMainDepositService extends MybatisBaseService map = (Map) resultBean.getData(); saveSysFormLink(map); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busorder/BusOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busorder/BusOrderService.java index e3f2e28f5b..a07a9e1076 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busorder/BusOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busorder/BusOrderService.java @@ -36,7 +36,7 @@ import com.yxt.anrui.flowable.api.flowtask.FlowTask; import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign; import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFeign; import com.yxt.anrui.flowable.api.sysformlink.SysFormStateVo; -import com.yxt.anrui.flowable.api.utils.procDefEnum; +import com.yxt.anrui.flowable.api.utils.ProcDefEnum; import com.yxt.anrui.flowable.sqloperationsymbol.BusinessTaskParam; import com.yxt.anrui.flowable.sqloperationsymbol.BusinessTaskQuery; import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; @@ -813,7 +813,7 @@ public class BusOrderService extends MybatisBaseService Date: Tue, 12 Apr 2022 14:24:04 +0800 Subject: [PATCH 08/13] =?UTF-8?q?=E9=87=87=E8=B4=AD=E9=80=80=E5=BA=93?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E8=BD=A6=E8=BE=86=E5=88=86=E9=A1=B5=E5=88=97?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/basevehicle/BaseVehicleFeign.java | 4 + .../basevehicle/BaseVehicleFeignFallback.java | 5 + .../basevehicle/BaseVehicleReturnQuery.java | 40 ++++++ .../api/basevehicle/BaseVehicleReturnVo.java | 30 ++++ .../biz/basevehicle/BaseVehicleMapper.java | 9 ++ .../biz/basevehicle/BaseVehicleMapper.xml | 132 ++++++++++-------- .../base/biz/basevehicle/BaseVehicleRest.java | 13 ++ .../biz/basevehicle/BaseVehicleService.java | 77 +++++++++- 8 files changed, 249 insertions(+), 61 deletions(-) create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleReturnQuery.java create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleReturnVo.java diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java index 995a957715..62d1fe6cfb 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java @@ -177,6 +177,10 @@ public interface BaseVehicleFeign { @PostMapping("/selExistingCarPageList") public ResultBean> selExistingCarPageList(@RequestBody PagerQuery pagerQuery); + @ApiOperation("采购退库选择车辆分页列表") + @PostMapping("/vehicleReturnList") + ResultBean> vehicleReturnList(@RequestBody PagerQuery pagerQuery); + /***************************************************** App接口 **********************************************************/ @ApiOperation("手机端现车分页列表") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java index 9bc5748720..40f86ec7de 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java @@ -99,6 +99,11 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign { return null; } + @Override + public ResultBean> vehicleReturnList(PagerQuery pagerQuery) { + return null; + } + @Override public ResultBean> getAppCurrentCarByPageList(PagerQuery pagerQuery) { return null; diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleReturnQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleReturnQuery.java new file mode 100644 index 0000000000..d2c30c1030 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleReturnQuery.java @@ -0,0 +1,40 @@ +package com.yxt.anrui.base.api.basevehicle; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/4/12 11:30 + * @Description + */ +@Data +public class BaseVehicleReturnQuery implements Query { + private static final long serialVersionUID = 10773711417444473L; + + @ApiModelProperty(value = "品牌") + private String brandSid; + @ApiModelProperty(value = "功能") + private String vehicleType; + @ApiModelProperty(value = "系列") + private String productLine; + @ApiModelProperty(value = "变速箱") + private String gearboxType; + @ApiModelProperty(value = "驱动") + private String driveForm; + @ApiModelProperty(value = "排放标准") + private String emissionStandard; + @ApiModelProperty(value = "马力") + private String power; + @ApiModelProperty(value = "燃料") + private String fuelType; + @ApiModelProperty(value = "版本") + private String vehicleVersion; + @ApiModelProperty(value = "车型") + private String vehicleAlias; + @ApiModelProperty(value = "快捷检索车型") + private String modelName; + + +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleReturnVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleReturnVo.java new file mode 100644 index 0000000000..7e1ea885cf --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleReturnVo.java @@ -0,0 +1,30 @@ +package com.yxt.anrui.base.api.basevehicle; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/4/12 11:26 + * @Description 采购退库选择车辆数据对象 + */ +@Data +public class BaseVehicleReturnVo implements Vo { + private static final long serialVersionUID = -4203703835044248565L; + private String sid; + @ApiModelProperty(value = "品牌") + private String brandName; + @ApiModelProperty(value = "车型") + private String modelName; + @ApiModelProperty(value = "车架号") + private String vinNo; + @ApiModelProperty(value = "颜色") + private String color; + @ApiModelProperty(value = "存放地点") + private String location; + @ApiModelProperty(value = "销售指导价") + private String guidedPrice; + + +} diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java index 2f3a8d6c6a..241a20fcb8 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java @@ -249,4 +249,13 @@ public interface BaseVehicleMapper extends BaseMapper { * @return */ IPage getNowModelList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + /** + * 分页列表 + * + * @param page 分页 + * @param qw 查询条件 + * @return + */ + IPage vehicleReturnPageList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml index 5dd2bb4036..723bcd3edd 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml @@ -12,12 +12,12 @@ @@ -158,16 +158,16 @@ bvm.isValidity, bvm.isValidityValue FROM base_vehicle_model bvm - LEFT JOIN base_model_config bmc ON bmc.vehicleSid = bvm.sid - LEFT JOIN base_manufacturer bm ON bvm.manufacturer = bm.sid - LEFT JOIN base_vehicle_brand bvb ON bvb.sid = bvm.carBrand + LEFT JOIN base_model_config bmc ON bmc.vehicleSid = bvm.sid + LEFT JOIN base_manufacturer bm ON bvm.manufacturer = bm.sid + LEFT JOIN base_vehicle_brand bvb ON bvb.sid = bvm.carBrand WHERE bvm.sid = #{modelSid} - AND bmc.sid = #{modelConfigSid} + AND bmc.sid = #{modelConfigSid} INSERT INTO base_vehicle(sid, modelSid, modelConfigSid, vinNo, engineNo, manufactureDate, location, - vehicleState, firstStartDate, libraryAge) + vehicleState, firstStartDate, libraryAge) VALUES (UUID(), @@ -196,8 +196,8 @@ - SELECT - bvm.sid AS modelSid, - bvm.vehicleAlias, - bvm.brandName, - bvm.vehicleVersionValue, - bvm.fuelTypeValue, - bvm.gearboxTypeValue - FROM - base_vehicle bv - LEFT JOIN base_vehicle_model bvm ON bv.modelSid = bvm.sid + SELECT bvm.sid AS modelSid, + bvm.vehicleAlias, + bvm.brandName, + bvm.vehicleVersionValue, + bvm.fuelTypeValue, + bvm.gearboxTypeValue + FROM base_vehicle bv + LEFT JOIN base_vehicle_model bvm ON bv.modelSid = bvm.sid ${ew.sqlSegment} @@ -355,8 +353,7 @@ @@ -462,8 +458,7 @@ + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java index 9a9c0793cc..2140affb58 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java @@ -290,6 +290,19 @@ public class BaseVehicleRest implements BaseVehicleFeign { return rb.success().setData(pv1); } + /** + * 采购退库选择车辆分页列表 + * + * @param pagerQuery 查询条件 + * @return + */ + @Override + public ResultBean> vehicleReturnList(PagerQuery pagerQuery) { + ResultBean> rb = ResultBean.fireFail(); + PagerVo pv = baseVehicleService.vehicleReturnList(pagerQuery); + return rb.success().setData(pv); + } + /** * 手机端现车列表 * diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java index 320e0b59b6..8a5404bd61 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java @@ -2,11 +2,9 @@ package com.yxt.anrui.base.biz.basevehicle; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.yxt.anrui.base.api.basemodelconfig.AppCarConfigSummaryVo; import com.yxt.anrui.base.api.basemodelconfig.AppModelConfigDetailsVo; import com.yxt.anrui.base.api.basemodelconfig.AppModelConfigListVo; -import com.yxt.anrui.base.api.basemodelszconfig.BaseModelSzconfigVo; import com.yxt.anrui.base.api.basevehicle.*; import com.yxt.anrui.base.biz.basemodelconfig.BaseModelConfigService; import com.yxt.anrui.base.biz.basemodelszconfig.BaseModelSzconfigService; @@ -879,5 +877,80 @@ public class BaseVehicleService extends MybatisBaseService vehicleReturnList(PagerQuery pagerQuery) { + IPage page = vehicleReturnPageList(pagerQuery); + PagerVo pv = new PagerVo<>(); + PagerVo pv1 = PagerUtil.pageToVo(page, pv); + return pv1; + } + + private IPage vehicleReturnPageList(PagerQuery pagerQuery) { + IPage page = PagerUtil.queryToPage(pagerQuery); + QueryWrapper qw = vehicleReturnWrapper(pagerQuery.getParams()); + return baseMapper.vehicleReturnPageList(page, qw); + } + + private QueryWrapper vehicleReturnWrapper(BaseVehicleReturnQuery params) { + QueryWrapper qw = new QueryWrapper<>(); + if (params != null) { + //品牌 + if (StringUtils.isNotBlank(params.getBrandSid())) { + qw.eq("bvm.carBrand", params.getBrandSid()); + } + //功能 + if (StringUtils.isNotBlank(params.getVehicleType())) { + qw.like("bvm.vehicleType", params.getVehicleType()); + } + //系列 + if (StringUtils.isNotBlank(params.getProductLine())) { + qw.like("bvm.productLine", params.getProductLine()); + } + //变速箱 + if (StringUtils.isNotBlank(params.getGearboxType())) { + qw.eq("bvm.gearboxType", params.getGearboxType()); + } + //驱动 + if (StringUtils.isNotBlank(params.getDriveForm())) { + qw.eq("bvm.driveForm", params.getDriveForm()); + } + //排放标准 + if (StringUtils.isNotBlank(params.getEmissionStandard())) { + qw.eq("bvm.emissionStandard", params.getEmissionStandard()); + } + //马力 + if (StringUtils.isNotBlank(params.getPower())) { + qw.eq("bvm.power", params.getPower()); + } + //燃料 + if (StringUtils.isNotBlank(params.getFuelType())) { + qw.eq("bvm.fuelType", params.getFuelType()); + } + //版本 + if (StringUtils.isNotBlank(params.getVehicleVersion())) { + qw.eq("bvm.vehicleVersion", params.getVehicleVersion()); + } + //车型 + if (StringUtils.isNotBlank(params.getVehicleAlias())) { + qw.eq("bvm.vehicleAlias", params.getVehicleAlias()); + } + //快捷检索车型 + if (StringUtils.isNotBlank(params.getModelName())) { + qw.like("bvm.modelName", params.getModelName()); + } + //锁定状态 + qw.and(wrapper -> wrapper.isNull("bv.lockedStateValue").or().eq("bv.lockedStateValue", "")); + // 虚拟订单选择车辆查询现车库存列表参数 +// if (StringUtils.isNotBlank(params.getVehicleState())) { //车辆状态 +// qw.and(wrapper -> wrapper.eq("bv.vehicleStateValue", "现车").or().eq("bv.vehicleStateValue", "库存")); +// } + } + return qw; + } } \ No newline at end of file From db03a72128cdf49125761b80e854a3247a07aa33 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Tue, 12 Apr 2022 14:24:04 +0800 Subject: [PATCH 09/13] =?UTF-8?q?=E9=87=87=E8=B4=AD=E9=80=80=E5=BA=93?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E8=BD=A6=E8=BE=86=E5=88=86=E9=A1=B5=E5=88=97?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/basevehicle/BaseVehicleFeign.java | 4 + .../basevehicle/BaseVehicleFeignFallback.java | 5 + .../basevehicle/BaseVehicleReturnQuery.java | 40 ++++++ .../api/basevehicle/BaseVehicleReturnVo.java | 30 ++++ .../biz/basevehicle/BaseVehicleMapper.java | 9 ++ .../biz/basevehicle/BaseVehicleMapper.xml | 132 ++++++++++-------- .../base/biz/basevehicle/BaseVehicleRest.java | 13 ++ .../biz/basevehicle/BaseVehicleService.java | 77 +++++++++- 8 files changed, 249 insertions(+), 61 deletions(-) create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleReturnQuery.java create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleReturnVo.java diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java index 995a957715..62d1fe6cfb 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java @@ -177,6 +177,10 @@ public interface BaseVehicleFeign { @PostMapping("/selExistingCarPageList") public ResultBean> selExistingCarPageList(@RequestBody PagerQuery pagerQuery); + @ApiOperation("采购退库选择车辆分页列表") + @PostMapping("/vehicleReturnList") + ResultBean> vehicleReturnList(@RequestBody PagerQuery pagerQuery); + /***************************************************** App接口 **********************************************************/ @ApiOperation("手机端现车分页列表") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java index 9bc5748720..40f86ec7de 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java @@ -99,6 +99,11 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign { return null; } + @Override + public ResultBean> vehicleReturnList(PagerQuery pagerQuery) { + return null; + } + @Override public ResultBean> getAppCurrentCarByPageList(PagerQuery pagerQuery) { return null; diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleReturnQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleReturnQuery.java new file mode 100644 index 0000000000..d2c30c1030 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleReturnQuery.java @@ -0,0 +1,40 @@ +package com.yxt.anrui.base.api.basevehicle; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/4/12 11:30 + * @Description + */ +@Data +public class BaseVehicleReturnQuery implements Query { + private static final long serialVersionUID = 10773711417444473L; + + @ApiModelProperty(value = "品牌") + private String brandSid; + @ApiModelProperty(value = "功能") + private String vehicleType; + @ApiModelProperty(value = "系列") + private String productLine; + @ApiModelProperty(value = "变速箱") + private String gearboxType; + @ApiModelProperty(value = "驱动") + private String driveForm; + @ApiModelProperty(value = "排放标准") + private String emissionStandard; + @ApiModelProperty(value = "马力") + private String power; + @ApiModelProperty(value = "燃料") + private String fuelType; + @ApiModelProperty(value = "版本") + private String vehicleVersion; + @ApiModelProperty(value = "车型") + private String vehicleAlias; + @ApiModelProperty(value = "快捷检索车型") + private String modelName; + + +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleReturnVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleReturnVo.java new file mode 100644 index 0000000000..7e1ea885cf --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleReturnVo.java @@ -0,0 +1,30 @@ +package com.yxt.anrui.base.api.basevehicle; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/4/12 11:26 + * @Description 采购退库选择车辆数据对象 + */ +@Data +public class BaseVehicleReturnVo implements Vo { + private static final long serialVersionUID = -4203703835044248565L; + private String sid; + @ApiModelProperty(value = "品牌") + private String brandName; + @ApiModelProperty(value = "车型") + private String modelName; + @ApiModelProperty(value = "车架号") + private String vinNo; + @ApiModelProperty(value = "颜色") + private String color; + @ApiModelProperty(value = "存放地点") + private String location; + @ApiModelProperty(value = "销售指导价") + private String guidedPrice; + + +} diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java index 2f3a8d6c6a..241a20fcb8 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java @@ -249,4 +249,13 @@ public interface BaseVehicleMapper extends BaseMapper { * @return */ IPage getNowModelList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + /** + * 分页列表 + * + * @param page 分页 + * @param qw 查询条件 + * @return + */ + IPage vehicleReturnPageList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml index 5dd2bb4036..723bcd3edd 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml @@ -12,12 +12,12 @@ @@ -158,16 +158,16 @@ bvm.isValidity, bvm.isValidityValue FROM base_vehicle_model bvm - LEFT JOIN base_model_config bmc ON bmc.vehicleSid = bvm.sid - LEFT JOIN base_manufacturer bm ON bvm.manufacturer = bm.sid - LEFT JOIN base_vehicle_brand bvb ON bvb.sid = bvm.carBrand + LEFT JOIN base_model_config bmc ON bmc.vehicleSid = bvm.sid + LEFT JOIN base_manufacturer bm ON bvm.manufacturer = bm.sid + LEFT JOIN base_vehicle_brand bvb ON bvb.sid = bvm.carBrand WHERE bvm.sid = #{modelSid} - AND bmc.sid = #{modelConfigSid} + AND bmc.sid = #{modelConfigSid} INSERT INTO base_vehicle(sid, modelSid, modelConfigSid, vinNo, engineNo, manufactureDate, location, - vehicleState, firstStartDate, libraryAge) + vehicleState, firstStartDate, libraryAge) VALUES (UUID(), @@ -196,8 +196,8 @@ - SELECT - bvm.sid AS modelSid, - bvm.vehicleAlias, - bvm.brandName, - bvm.vehicleVersionValue, - bvm.fuelTypeValue, - bvm.gearboxTypeValue - FROM - base_vehicle bv - LEFT JOIN base_vehicle_model bvm ON bv.modelSid = bvm.sid + SELECT bvm.sid AS modelSid, + bvm.vehicleAlias, + bvm.brandName, + bvm.vehicleVersionValue, + bvm.fuelTypeValue, + bvm.gearboxTypeValue + FROM base_vehicle bv + LEFT JOIN base_vehicle_model bvm ON bv.modelSid = bvm.sid ${ew.sqlSegment} @@ -355,8 +353,7 @@ @@ -462,8 +458,7 @@ + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java index 9a9c0793cc..2140affb58 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java @@ -290,6 +290,19 @@ public class BaseVehicleRest implements BaseVehicleFeign { return rb.success().setData(pv1); } + /** + * 采购退库选择车辆分页列表 + * + * @param pagerQuery 查询条件 + * @return + */ + @Override + public ResultBean> vehicleReturnList(PagerQuery pagerQuery) { + ResultBean> rb = ResultBean.fireFail(); + PagerVo pv = baseVehicleService.vehicleReturnList(pagerQuery); + return rb.success().setData(pv); + } + /** * 手机端现车列表 * diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java index 60d51b38d3..0975029e75 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java @@ -2,11 +2,9 @@ package com.yxt.anrui.base.biz.basevehicle; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.yxt.anrui.base.api.basemodelconfig.AppCarConfigSummaryVo; import com.yxt.anrui.base.api.basemodelconfig.AppModelConfigDetailsVo; import com.yxt.anrui.base.api.basemodelconfig.AppModelConfigListVo; -import com.yxt.anrui.base.api.basemodelszconfig.BaseModelSzconfigVo; import com.yxt.anrui.base.api.basevehicle.*; import com.yxt.anrui.base.biz.basemodelconfig.BaseModelConfigService; import com.yxt.anrui.base.biz.basemodelszconfig.BaseModelSzconfigService; @@ -885,5 +883,80 @@ public class BaseVehicleService extends MybatisBaseService vehicleReturnList(PagerQuery pagerQuery) { + IPage page = vehicleReturnPageList(pagerQuery); + PagerVo pv = new PagerVo<>(); + PagerVo pv1 = PagerUtil.pageToVo(page, pv); + return pv1; + } + + private IPage vehicleReturnPageList(PagerQuery pagerQuery) { + IPage page = PagerUtil.queryToPage(pagerQuery); + QueryWrapper qw = vehicleReturnWrapper(pagerQuery.getParams()); + return baseMapper.vehicleReturnPageList(page, qw); + } + + private QueryWrapper vehicleReturnWrapper(BaseVehicleReturnQuery params) { + QueryWrapper qw = new QueryWrapper<>(); + if (params != null) { + //品牌 + if (StringUtils.isNotBlank(params.getBrandSid())) { + qw.eq("bvm.carBrand", params.getBrandSid()); + } + //功能 + if (StringUtils.isNotBlank(params.getVehicleType())) { + qw.like("bvm.vehicleType", params.getVehicleType()); + } + //系列 + if (StringUtils.isNotBlank(params.getProductLine())) { + qw.like("bvm.productLine", params.getProductLine()); + } + //变速箱 + if (StringUtils.isNotBlank(params.getGearboxType())) { + qw.eq("bvm.gearboxType", params.getGearboxType()); + } + //驱动 + if (StringUtils.isNotBlank(params.getDriveForm())) { + qw.eq("bvm.driveForm", params.getDriveForm()); + } + //排放标准 + if (StringUtils.isNotBlank(params.getEmissionStandard())) { + qw.eq("bvm.emissionStandard", params.getEmissionStandard()); + } + //马力 + if (StringUtils.isNotBlank(params.getPower())) { + qw.eq("bvm.power", params.getPower()); + } + //燃料 + if (StringUtils.isNotBlank(params.getFuelType())) { + qw.eq("bvm.fuelType", params.getFuelType()); + } + //版本 + if (StringUtils.isNotBlank(params.getVehicleVersion())) { + qw.eq("bvm.vehicleVersion", params.getVehicleVersion()); + } + //车型 + if (StringUtils.isNotBlank(params.getVehicleAlias())) { + qw.eq("bvm.vehicleAlias", params.getVehicleAlias()); + } + //快捷检索车型 + if (StringUtils.isNotBlank(params.getModelName())) { + qw.like("bvm.modelName", params.getModelName()); + } + //锁定状态 + qw.and(wrapper -> wrapper.isNull("bv.lockedStateValue").or().eq("bv.lockedStateValue", "")); + // 虚拟订单选择车辆查询现车库存列表参数 +// if (StringUtils.isNotBlank(params.getVehicleState())) { //车辆状态 +// qw.and(wrapper -> wrapper.eq("bv.vehicleStateValue", "现车").or().eq("bv.vehicleStateValue", "库存")); +// } + } + return qw; + } } \ No newline at end of file From e87ffbd90b7606cfb1f96abc4ba119cb9dbb810a Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Tue, 12 Apr 2022 15:02:32 +0800 Subject: [PATCH 10/13] =?UTF-8?q?=E9=87=87=E8=B4=AD=E9=80=80=E5=BA=93?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scm/biz/scmvehiclereturn/ScmVehicleReturnService.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java index ce12a262c7..936192f977 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.flowable.api.flow.FlowableFeign; import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFeign; import com.yxt.anrui.flowable.api.sysformlink.SysFormStateVo; -import com.yxt.anrui.flowable.api.utils.procDefEnum; +import com.yxt.anrui.flowable.api.utils.ProcDefEnum; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.scm.api.scmvehiclereturn.ScmVehicleReturn; @@ -153,12 +153,12 @@ public class ScmVehicleReturnService extends MybatisBaseService map = (Map) resultBean.getData(); //更新退库业务表中的流程状态 modifyFlowState(businessSid, - procDefEnum.ORDERDEPOSITAPPROVE.getProDefId(),//procDefId + ProcDefEnum.ORDERDEPOSITAPPROVE.getProDefId(),//procDefId map.get("nodeState"),//state map.get("procInsId"),//procInstSid map.get("taskDefKey")//nodeSid From 5f4c5a6d70dcaab8a842abc95f8dd7ee8f7a2687 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Tue, 12 Apr 2022 15:43:47 +0800 Subject: [PATCH 11/13] =?UTF-8?q?=E9=87=87=E8=B4=AD=E9=80=80=E5=BA=93?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=BD=A6=E6=9E=B6=E5=8F=B7=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=8F=8A=E5=AE=8C=E5=96=84=E9=80=89=E6=8B=A9=E8=BD=A6=E8=BE=86?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=97=B6=E6=8E=92=E9=99=A4=E5=B7=B2=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E7=9A=84=E9=87=87=E8=B4=AD=E9=80=80=E5=BA=93=E7=9A=84?= =?UTF-8?q?=E8=BD=A6=E6=9E=B6=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basevehicle/BaseVehicleReturnQuery.java | 3 ++ .../biz/basevehicle/BaseVehicleService.java | 25 ++++++++++++---- .../biz/busdeposit/BusDepositService.java | 15 ++++------ .../ScmVehicleReturnDetailsFeign.java | 28 ++++++++++++++++++ .../ScmVehicleReturnDetailsFeignFallback.java | 12 ++++++++ .../ScmVehicleReturnDetailsMapper.java | 2 ++ .../ScmVehicleReturnDetailsMapper.xml | 6 ++++ .../ScmVehicleReturnDetailsRest.java | 29 +++++++++++++++++++ .../ScmVehicleReturnDetailsService.java | 7 +++++ 9 files changed, 112 insertions(+), 15 deletions(-) create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturndetails/ScmVehicleReturnDetailsFeign.java create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturndetails/ScmVehicleReturnDetailsFeignFallback.java create mode 100644 anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturndetails/ScmVehicleReturnDetailsRest.java diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleReturnQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleReturnQuery.java index d2c30c1030..2aeb1cec85 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleReturnQuery.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleReturnQuery.java @@ -36,5 +36,8 @@ public class BaseVehicleReturnQuery implements Query { @ApiModelProperty(value = "快捷检索车型") private String modelName; + @ApiModelProperty(value = "采购退库主表sid") + private String vehicleOutSid; + } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java index 0975029e75..4fa41758f7 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java @@ -14,6 +14,7 @@ import com.yxt.anrui.portal.api.sysorganization.SysOrganization; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; +import com.yxt.anrui.scm.api.scmvehiclereturndetails.ScmVehicleReturnDetailsFeign; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; @@ -66,6 +67,9 @@ public class BaseVehicleService extends MybatisBaseService vehicleReturnWrapper(BaseVehicleReturnQuery params) { QueryWrapper qw = new QueryWrapper<>(); if (params != null) { @@ -949,13 +959,18 @@ public class BaseVehicleService extends MybatisBaseService> stringList = scmVehicleReturnDetailsFeign.selectVinNoList(params.getVehicleOutSid()); + if (stringList.getSuccess()) { + if (stringList.getData().size() > 0) { + qw.notIn("bv.vinNo", stringList.getData()); + } + } + } //锁定状态 qw.and(wrapper -> wrapper.isNull("bv.lockedStateValue").or().eq("bv.lockedStateValue", "")); - - // 虚拟订单选择车辆查询现车库存列表参数 -// if (StringUtils.isNotBlank(params.getVehicleState())) { //车辆状态 -// qw.and(wrapper -> wrapper.eq("bv.vehicleStateValue", "现车").or().eq("bv.vehicleStateValue", "库存")); -// } + qw.eq("bv.vehicleStateValue", "现车"); } return qw; } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositService.java index 2316390f82..28ded49c35 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositService.java @@ -1,21 +1,15 @@ package com.yxt.anrui.buscenter.biz.busdeposit; import com.alibaba.fastjson.JSONObject; -import com.yxt.anrui.buscenter.api.busdeposit.*; +import com.yxt.anrui.buscenter.api.busdeposit.AppBusDepositBusDetailsVo; +import com.yxt.anrui.buscenter.api.busdeposit.AppBusDepositBuscenterDetailVo; +import com.yxt.anrui.buscenter.api.busdeposit.BusDeposit; import com.yxt.anrui.buscenter.api.busdepositcustomer.AppBusDepositCustomerListVo; import com.yxt.anrui.buscenter.biz.busdepositcustomer.BusDepositCustomerService; import com.yxt.anrui.buscenter.biz.busdepositvehicle.BusDepositVehicleService; -import com.yxt.anrui.buscenter.biz.busmaindeposit.BusMainDepositService; -import com.yxt.anrui.buscenter.biz.flow.FlowableService; -import com.yxt.anrui.crm.api.crmcustomer.CrmCustomer; import com.yxt.anrui.crm.api.crmcustomer.CrmCustomerFeign; import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign; -import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo; -import com.yxt.anrui.flowable.api.utils.procDefEnum; import com.yxt.anrui.portal.api.dictcommon.DictCommonFeign; -import com.yxt.anrui.portal.api.dictcommon.DictCommonVo; -import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; -import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; @@ -27,7 +21,8 @@ import org.springframework.stereotype.Service; import org.springframework.util.concurrent.ListenableFuture; import org.springframework.util.concurrent.ListenableFutureCallback; -import java.util.*; +import java.util.ArrayList; +import java.util.List; /** * Project: anrui-buscenter(车辆订单)
diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturndetails/ScmVehicleReturnDetailsFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturndetails/ScmVehicleReturnDetailsFeign.java new file mode 100644 index 0000000000..03ccf0cbf5 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturndetails/ScmVehicleReturnDetailsFeign.java @@ -0,0 +1,28 @@ +package com.yxt.anrui.scm.api.scmvehiclereturndetails; + +import com.yxt.common.core.result.ResultBean; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2022/4/12 15:30 + * @Description + */ +@FeignClient( + contextId = "anrui-scm-ScmVehicleReturnDetails", + name = "anrui-scm", + path = "v1/scmvehiclereturndetails", + fallback = ScmVehicleReturnDetailsFeignFallback.class) +public interface ScmVehicleReturnDetailsFeign { + + @ApiOperation("查询车架号列表") + @GetMapping("/selectVinNoList") + @ResponseBody + ResultBean> selectVinNoList(@PathVariable(value = "sid") String sid); +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturndetails/ScmVehicleReturnDetailsFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturndetails/ScmVehicleReturnDetailsFeignFallback.java new file mode 100644 index 0000000000..a67f7d67be --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturndetails/ScmVehicleReturnDetailsFeignFallback.java @@ -0,0 +1,12 @@ +package com.yxt.anrui.scm.api.scmvehiclereturndetails; + +import org.springframework.stereotype.Component; + +/** + * @Author dimengzhe + * @Date 2022/4/12 15:30 + * @Description + */ +@Component +public class ScmVehicleReturnDetailsFeignFallback { +} diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturndetails/ScmVehicleReturnDetailsMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturndetails/ScmVehicleReturnDetailsMapper.java index b2cb92df42..dd10097645 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturndetails/ScmVehicleReturnDetailsMapper.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturndetails/ScmVehicleReturnDetailsMapper.java @@ -28,4 +28,6 @@ public interface ScmVehicleReturnDetailsMapper extends BaseMapper selectVinNoList(String sid); } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturndetails/ScmVehicleReturnDetailsMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturndetails/ScmVehicleReturnDetailsMapper.xml index 46c7b283de..bab35954ce 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturndetails/ScmVehicleReturnDetailsMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturndetails/ScmVehicleReturnDetailsMapper.xml @@ -12,4 +12,10 @@ from scm_vehicle_return_details where vehicleOutSid = #{sid} + + \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturndetails/ScmVehicleReturnDetailsRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturndetails/ScmVehicleReturnDetailsRest.java new file mode 100644 index 0000000000..e8f80e4e2e --- /dev/null +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturndetails/ScmVehicleReturnDetailsRest.java @@ -0,0 +1,29 @@ +package com.yxt.anrui.scm.biz.scmvehiclereturndetails; + +import com.yxt.anrui.scm.api.scmvehiclereturndetails.ScmVehicleReturnDetailsFeign; +import com.yxt.common.core.result.ResultBean; +import io.swagger.annotations.Api; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; + +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2022/4/12 15:29 + * @Description + */ +@Api(tags = "车辆采购退库详细管理") +@RequestMapping("v1/scmvehiclereturndetails") +@Controller +public class ScmVehicleReturnDetailsRest implements ScmVehicleReturnDetailsFeign { + + @Autowired + private ScmVehicleReturnDetailsService scmVehicleReturnDetailsService; + + @Override + public ResultBean> selectVinNoList(String sid) { + return scmVehicleReturnDetailsService.selectVinNoList(sid); + } +} diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturndetails/ScmVehicleReturnDetailsService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturndetails/ScmVehicleReturnDetailsService.java index 0e0ad9f583..d2b865828f 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturndetails/ScmVehicleReturnDetailsService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturndetails/ScmVehicleReturnDetailsService.java @@ -3,6 +3,7 @@ package com.yxt.anrui.scm.biz.scmvehiclereturndetails; import com.yxt.anrui.scm.api.scmvehiclereturndetails.ScmVehicleReturnDetails; import com.yxt.anrui.scm.api.scmvehiclereturndetails.ScmVehicleReturnDetailsDto; import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.core.result.ResultBean; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -54,4 +55,10 @@ public class ScmVehicleReturnDetailsService extends MybatisBaseService> selectVinNoList(String sid) { + ResultBean> rb = ResultBean.fireFail(); + List vinNoList = baseMapper.selectVinNoList(sid); + return rb.success().setData(vinNoList); + } } From f76628d081850d3dee0b3602c674bd546aba1ae4 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Tue, 12 Apr 2022 16:27:48 +0800 Subject: [PATCH 12/13] =?UTF-8?q?=E9=87=87=E8=B4=AD=E9=80=80=E5=BA=93?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E8=BD=A6=E8=BE=86=E4=BF=AE=E6=94=B9=E6=8E=92?= =?UTF-8?q?=E9=99=A4=E5=B7=B2=E9=80=89=E6=8B=A9=E7=9A=84=E8=BD=A6=E8=BE=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/api/basevehicle/BaseVehicleReturnQuery.java | 10 ++++++++-- .../anrui/base/biz/basevehicle/BaseVehicleService.java | 10 ++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleReturnQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleReturnQuery.java index 2aeb1cec85..7593e03d35 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleReturnQuery.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleReturnQuery.java @@ -4,6 +4,9 @@ import com.yxt.common.core.query.Query; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.ArrayList; +import java.util.List; + /** * @Author dimengzhe * @Date 2022/4/12 11:30 @@ -36,8 +39,11 @@ public class BaseVehicleReturnQuery implements Query { @ApiModelProperty(value = "快捷检索车型") private String modelName; - @ApiModelProperty(value = "采购退库主表sid") - private String vehicleOutSid; +// @ApiModelProperty(value = "采购退库主表sid") +// private String vehicleOutSid; + + @ApiModelProperty(value = "已选择的车辆的车架号") + private List vinNoList = new ArrayList<>(); } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java index 4fa41758f7..b78626c874 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java @@ -959,14 +959,8 @@ public class BaseVehicleService extends MybatisBaseService> stringList = scmVehicleReturnDetailsFeign.selectVinNoList(params.getVehicleOutSid()); - if (stringList.getSuccess()) { - if (stringList.getData().size() > 0) { - qw.notIn("bv.vinNo", stringList.getData()); - } - } + if (params.getVinNoList().size() > 0) { + qw.notIn("bv.vinNo", params.getVinNoList()); } //锁定状态 qw.and(wrapper -> wrapper.isNull("bv.lockedStateValue").or().eq("bv.lockedStateValue", "")); From a48d69b0aee3d8c39c843f1b313fb6a1615bc865 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Wed, 13 Apr 2022 10:30:10 +0800 Subject: [PATCH 13/13] =?UTF-8?q?=E7=BC=96=E5=86=99pc=E7=AB=AF=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E4=B8=AD=E6=A0=B9=E6=8D=AE=E6=B5=81=E7=A8=8B=E5=AE=9A?= =?UTF-8?q?=E4=B9=89iD=E5=92=8C=E8=8A=82=E7=82=B9id=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E5=AF=B9=E5=BA=94=E7=9A=84url?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/sysprourl/SysProUrlFeign.java | 30 +++++-- .../api/sysprourl/SysProUrlFeignFallBack.java | 5 ++ .../biz/sysprourl/SysProUrlController.java | 23 +++-- .../biz/sysprourl/SysProUrlMapper.java | 10 +++ .../biz/sysprourl/SysProUrlMapper.xml | 90 ++++++++++++++----- .../biz/sysprourl/SysProUrlService.java | 58 ++++++++---- 6 files changed, 165 insertions(+), 51 deletions(-) diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/sysprourl/SysProUrlFeign.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/sysprourl/SysProUrlFeign.java index de59be8b7d..00187b5a63 100644 --- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/sysprourl/SysProUrlFeign.java +++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/sysprourl/SysProUrlFeign.java @@ -4,6 +4,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.ApiOperation; +import io.swagger.annotations.ApiParam; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; @@ -20,28 +21,29 @@ public interface SysProUrlFeign { */ @PostMapping("/list") @ResponseBody - public ResultBean> list(@RequestBody PagerQuery pq) ; + public ResultBean> list(@RequestBody PagerQuery pq); + - /** * 获取流程业务表单url对象 */ @GetMapping(value = "/getSysProUrl/{formId}") @ResponseBody - public ResultBean getSysProUrl(@PathVariable("formId") int formId); + public ResultBean getSysProUrl(@PathVariable("formId") int formId); + /** * 根据流程实例id获取form信息 */ @GetMapping(value = "/getForm/{proId}") @ResponseBody - public ResultBean getForm(@PathVariable("proId") String proId); + public ResultBean getForm(@PathVariable("proId") String proId); /** * 新增流程业务表单url对象 */ - @PostMapping(value="/add") + @PostMapping(value = "/add") @ResponseBody - public ResultBean add(@RequestBody SysProUrl sysProUrl) ; + public ResultBean add(@RequestBody SysProUrl sysProUrl); /** * 修改流程业务表单url对象 @@ -62,4 +64,20 @@ public interface SysProUrlFeign { @ApiOperation("app根据流程定义id，节点id，终端及类型查询流程与业务表单url") @PostMapping("/selectAppUrlByTaskDefKey") ResultBean selectAppUrlByTaskDefKey(@Valid @RequestBody AppSysProUrlQuery query); + + + /** + * pc根据流程定义id，节点id，终端及类型查询流程与业务表单url + * + * @param procDefId 流程定义id + * @param taskDefKey 节点id + * @param type 类型：1办理，2详情 + * @return + */ + @ApiOperation("查询流程与业务表单的url") + @GetMapping("/selectUrlByKey") + ResultBean selectUrlByKey(@ApiParam(value = "流程定义id") @RequestParam(value = "procDefId") String procDefId, + @ApiParam(value = "节点id") @RequestParam(value = "taskDefKey") String taskDefKey, + @ApiParam(value = "类型:1办理，2详情") @RequestParam(value = "type") String type); + } diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/sysprourl/SysProUrlFeignFallBack.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/sysprourl/SysProUrlFeignFallBack.java index 76e46169b8..e3e49a5c1a 100644 --- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/sysprourl/SysProUrlFeignFallBack.java +++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/sysprourl/SysProUrlFeignFallBack.java @@ -54,4 +54,9 @@ public class SysProUrlFeignFallBack implements SysProUrlFeign { public ResultBean selectAppUrlByTaskDefKey(AppSysProUrlQuery query) { return null; } + + @Override + public ResultBean selectUrlByKey(String procDefId, String taskDefKey, String type) { + return null; + } } diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysprourl/SysProUrlController.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysprourl/SysProUrlController.java index 86b3c2f664..5754114293 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysprourl/SysProUrlController.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysprourl/SysProUrlController.java @@ -40,16 +40,16 @@ public class SysProUrlController implements SysProUrlFeign { @Override public ResultBean getSysProUrl(int formId) { - ResultBean< SysProUrl> rb = ResultBean.fireFail(); + ResultBean rb = ResultBean.fireFail(); SysProUrl sysProUrl = sysProUrlService.selectSysProUrlById(formId); - return rb.success().setData(sysProUrl); + return rb.success().setData(sysProUrl); } @Override public ResultBean getForm(String proId) { - ResultBean< SysForm> rb = ResultBean.fireFail(); + ResultBean rb = ResultBean.fireFail(); SysForm sysForm = sysDeployFormService.selectSysDeployFormByDeployId(proId); - return rb.success().setData(sysForm); + return rb.success().setData(sysForm); } /** @@ -73,7 +73,7 @@ public class SysProUrlController implements SysProUrlFeign { @DeleteMapping("/{formIds}") @Override public ResultBean remove(@PathVariable Long[] formIds) { - sysProUrlService.deleteSysProUrlByIds(formIds); + sysProUrlService.deleteSysProUrlByIds(formIds); ResultBean rb = ResultBean.fireFail(); return rb.success().setMsg("操作成功"); } @@ -106,4 +106,17 @@ public class SysProUrlController implements SysProUrlFeign { } return new ResultBean().success().setData(appUrlVo); } + + /** + * pc根据流程定义id，节点id，终端及类型查询流程与业务表单url + * + * @param procDefId 流程定义id + * @param taskDefKey 节点id + * @param type 类型：1办理，2详情 + * @return + */ + @Override + public ResultBean selectUrlByKey(String procDefId, String taskDefKey, String type) { + return sysProUrlService.selectUrlByKey(procDefId, taskDefKey, type); + } } diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysprourl/SysProUrlMapper.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysprourl/SysProUrlMapper.java index 6541eeb645..bea6ceed0a 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysprourl/SysProUrlMapper.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysprourl/SysProUrlMapper.java @@ -79,4 +79,14 @@ public interface SysProUrlMapper extends BaseMapper { List selectListByProcDefId(@Param("proc_def_id") String proc_def_id, @Param("taskDefKey") String taskDefKey); SysProUrlVo selectUniByTaskDefKey(SysProUrlQuery query); + + /** + * pc根据流程定义id，节点id，终端及类型查询流程与业务表单url + * + * @param procDefId 流程id + * @param taskDefKey 节点iD + * @param type 类型：1办理，2详情 + * @return + */ + String selectUrlByKey(@Param("procDefId") String procDefId, @Param("taskDefKey") String taskDefKey, @Param("type") String type); } diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysprourl/SysProUrlMapper.xml b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysprourl/SysProUrlMapper.xml index f9f2872f01..6afab06bd6 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysprourl/SysProUrlMapper.xml +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysprourl/SysProUrlMapper.xml @@ -2,50 +2,96 @@ - + insert into sys_pro_url - url, - type, - terminal, - formId, - title + + url, + + + type, + + + terminal, + + + formId, + + + title + - #{url}, - #{type}, - #{terminal}, - #{formId}, - #{title}, + + #{url}, + + + #{type}, + + + #{terminal}, + + + #{formId}, + + + #{title}, + - delete from sys_pro_url where sid in + delete + from sys_pro_url where sid in #{sid} - + select id as id, url as url, type as type, terminal as terminal, formId as formId, title as title + from sys_pro_url where formId = #{formId} - + SELECT url, modulePluginName FROM sys_pro_url - WHERE proc_def_id=#{proc_def_id} AND type=#{type} AND terminal=#{terminal} AND taskDefKey=#{taskDefKey} + WHERE proc_def_id = #{proc_def_id} + AND type = #{type} + AND terminal = #{terminal} + AND taskDefKey = #{taskDefKey} + + + \ No newline at end of file diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysprourl/SysProUrlService.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysprourl/SysProUrlService.java index 4a58e738b0..8b408c89ea 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysprourl/SysProUrlService.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/sysprourl/SysProUrlService.java @@ -20,7 +20,7 @@ import java.util.List; /** * 流程表单Service业务层处理 - * + * * @author XuanXuan Xuan * @date 2021-04-03 */ @@ -33,18 +33,17 @@ public class SysProUrlService extends MybatisBaseService selectSysProUrlList(PagerQuery pagerQuery) { List SysProUrls = baseMapper.selectListVo(); - IPage page =new Page<>();// PagerUtil.queryToPage(pagerQuery); + IPage page = new Page<>();// PagerUtil.queryToPage(pagerQuery); QueryWrapper qw = createQueryWrapper(pagerQuery.getParams()); List SysProUrlVoList = baseMapper.getSysProUrlVoList(page, qw); int total = baseMapper.getSysProUrlVoTotal(page, qw); @@ -55,46 +54,42 @@ public class SysProUrlService extends MybatisBaseService selectUrlByKey(String procDefId, String taskDefKey, String type) { + ResultBean rb = ResultBean.fireFail(); + //验证参数 + if (StringUtils.isBlank(procDefId)) { + return rb.setMsg("流程定义id不能为空"); + } + if (StringUtils.isBlank(taskDefKey)) { + return rb.setMsg("节点id不能为空"); + } + if (StringUtils.isBlank(type)) { + return rb.setMsg("请指定要操作的类型"); + } + String url = baseMapper.selectUrlByKey(procDefId, taskDefKey, type); + return null; + } }