From 21e3ae893bf5a6d811fbf5c713c6ba37833e09ee Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Fri, 7 Apr 2023 11:32:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E7=A5=A8=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../finvehicleinvoice/FinVehicleInvoice.java | 66 +-- .../FinVehicleInvoiceDetailsVo.java | 29 +- .../FinVehicleInvoiceDto.java | 87 ++-- .../FinVehicleInvoiceExportVo.java | 21 +- .../FinVehicleInvoiceFeign.java | 12 +- .../FinVehicleInvoiceFeignFallback.java | 9 +- .../FinVehicleInvoiceQuery.java | 23 +- .../FinVehicleInvoiceVo.java | 34 +- .../FinVehicleInvoiceMapper.java | 7 +- .../FinVehicleInvoiceMapper.xml | 124 ++++-- .../FinVehicleInvoiceRest.java | 380 +++++++++--------- .../FinVehicleInvoiceService.java | 63 +-- 12 files changed, 468 insertions(+), 387 deletions(-) diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoice.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoice.java index 213a46e19d..107d49ba6d 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoice.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoice.java @@ -29,26 +29,26 @@ import java.util.Date; public class FinVehicleInvoice extends BaseEntity { private static final long serialVersionUID = 1L; - @ApiModelProperty("销售申请sid") - private String Sid; - @ApiModelProperty("版本锁") private Integer lockVersion; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiModelProperty("创建时间") private Date createTime; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiModelProperty("修改时间") private Date modifyTime; @ApiModelProperty("是否可用：1可用，0不可用") private Integer isEnable; - @ApiModelProperty("开票状态：0未开票，1已开票，2作废") private Integer state; + @ApiModelProperty("开票状态") + private String billingState; + @ApiModelProperty("开票状态Key") + private String billingStateKey; @ApiModelProperty("是否删除：0未删除，1已删除") private Integer isDelete; @@ -63,49 +63,53 @@ public class FinVehicleInvoice extends BaseEntity { @ApiModelProperty("车辆sid") private String vehicleSid; - - @ApiModelProperty("车架号") + + @ApiModelProperty("车架号") private String VIN; - - @ApiModelProperty("车辆类型Key") + + + @ApiModelProperty("车辆类型Key") private String vehicleTypeKey; - - @ApiModelProperty("车辆类型") + + @ApiModelProperty("车辆类型") private String vehicleType; - - @ApiModelProperty("车辆金额") + + @ApiModelProperty("车辆金额") private BigDecimal vehiclAmount; - - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") - @ApiModelProperty("最大发票开票日期") + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiModelProperty("最大发票开票日期") private Date invoiceDate; - - @ApiModelProperty("发票号") + + @ApiModelProperty("发票号") private String invoiceNo; - - @ApiModelProperty("发票代码") + + @ApiModelProperty("发票代码") private String invoiceCode; - - @ApiModelProperty("车辆发票金额") + + @ApiModelProperty("车辆发票金额") private BigDecimal invoiceAmount; - - @ApiModelProperty("发票类别Key（增值税专用发票/机动车销售统一发票/增值税普通发票）") + + @ApiModelProperty("发票类别Key（增值税专用发票/机动车销售统一发票/增值税普通发票）") private String invoiceTypeKey; - - @ApiModelProperty("发票类别") + + @ApiModelProperty("发票类别") private String invoiceType; - - @ApiModelProperty("开票单位") + + @ApiModelProperty("开票单位") private String invoiceTitle; @ApiModelProperty("移交状态：0未交接，1已交接") - private String invoiceState; + private String transferState; + + @ApiModelProperty("移交状态：0未交接，1已交接") + private String transferStateKey; @ApiModelProperty("客户名称") private String customerName; @ApiModelProperty("开票名称") - private String invoiceName; + private String invoicingName; @ApiModelProperty("合同编号") private String contractNo; diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceDetailsVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceDetailsVo.java index 14172787ff..6eca2094bf 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceDetailsVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceDetailsVo.java @@ -7,6 +7,7 @@ import lombok.Data; import java.math.BigDecimal; import java.util.Date; +import java.util.List; /** * @author Administrator @@ -18,44 +19,36 @@ public class FinVehicleInvoiceDetailsVo implements Vo { @ApiModelProperty("sid") private String sid; - @ApiModelProperty("开票单位") private String invoiceTitle; - @ApiModelProperty("合同编号") private String contractNo; - @ApiModelProperty("客户名称") private String customerName; - @ApiModelProperty("车架号") - private String VIN; - + private String vinNo; @ApiModelProperty("发票类别") private String invoiceType; - + @ApiModelProperty("开票类型Key") + private String invoiceTypeKey; @ApiModelProperty("车辆发票金额") private BigDecimal invoiceAmount; - - @ApiModelProperty("开票状态：0未开票，1已开票，2作废") - private String state; - + @ApiModelProperty("发票状态") + private String billingState; + @ApiModelProperty("发票状态Key") + private String billingStateKey; @ApiModelProperty("开票名称") - private String invoiceName; - + private String invoicingName; @ApiModelProperty("开票人") private String name; - @ApiModelProperty("开票时间") private String createTime; - @ApiModelProperty("发票号") private String invoiceNo; - @ApiModelProperty("发票代码") private String invoiceCode; - @ApiModelProperty("图片地址") private String filePath; - + @ApiModelProperty("图片地址集合") + private List filePaths; } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceDto.java index caddca0cc7..0955b16006 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceDto.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceDto.java @@ -9,6 +9,7 @@ import lombok.Data; import java.math.BigDecimal; import java.util.Date; +import java.util.List; /** * Project: anrui-fin(财务管理)
@@ -28,43 +29,67 @@ import java.util.Date; public class FinVehicleInvoiceDto implements Dto { - @ApiModelProperty("开票单位") - private String invoiceTitle; - - @ApiModelProperty("合同编号") - private String contractNo; - - @ApiModelProperty("客户名称") - private String customerName; - + private String sid; // sid + @ApiModelProperty("版本锁") + private Integer lockVersion; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("创建时间") + private String createTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("修改时间") + private String modifyTime; + @ApiModelProperty("是否可用：1可用，0不可用") + private Integer isEnable; + private Integer state; + @ApiModelProperty("是否删除：0未删除，1已删除") + private Integer isDelete; + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("创建人sid") + private String createBySid; + private String useOrgSid; + @ApiModelProperty("修改人sid") + private String updateBySid; + @ApiModelProperty("车辆sid") + private String vehicleSid; @ApiModelProperty("车架号") private String VIN; - - @ApiModelProperty("发票类别") - private String invoiceType; - - @ApiModelProperty("车辆发票金额") - private BigDecimal invoiceAmount; - - @ApiModelProperty("开票状态：0未开票，1已开票，2作废") - private String state; - - @ApiModelProperty("开票名称") - private String invoiceName; - - @ApiModelProperty("开票人") - private String name; - - @ApiModelProperty("开票时间") - private String createTime; - + @ApiModelProperty("车辆类型Key") + private String vehicleTypeKey; + @ApiModelProperty("车辆类型") + private String vehicleType; + @ApiModelProperty("车辆金额") + private BigDecimal vehiclAmount; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("最大发票开票日期") + private String invoiceDate; @ApiModelProperty("发票号") private String invoiceNo; - @ApiModelProperty("发票代码") private String invoiceCode; - + @ApiModelProperty("车辆发票金额") + private BigDecimal invoiceAmount; + @ApiModelProperty("发票类别Key（增值税专用发票/机动车销售统一发票/增值税普通发票）") + private String invoiceTypeKey; + @ApiModelProperty("发票类别") + private String invoiceType; + @ApiModelProperty("开票单位") + private String invoiceTitle; + @ApiModelProperty("移交状态：0未交接，1已交接") + private String transferState; + @ApiModelProperty("客户名称") + private String customerName; + @ApiModelProperty("合同编号") + private String contractNo; @ApiModelProperty("图片地址") private String filePath; - + @ApiModelProperty("开票状态") + private String billingState; + @ApiModelProperty("开票状态Key") + private String billingStateKey; + @ApiModelProperty("图片地址集合") + private List filePaths; + private String vinNo; + @ApiModelProperty("开票名称") + private String invoicingName; } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceExportVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceExportVo.java index 9b51dc8eb1..9abb694b83 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceExportVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceExportVo.java @@ -1,5 +1,4 @@ package com.yxt.anrui.fin.api.finvehicleinvoice; - import com.yxt.common.core.utils.ExportEntityMap; import com.yxt.common.core.vo.Vo; import lombok.Data; @@ -12,27 +11,29 @@ import lombok.Data; @Data public class FinVehicleInvoiceExportVo implements Vo { - @ExportEntityMap(CnName = "序号", EnName = "rankNo") private Integer rankNo; - @ExportEntityMap(CnName = "发票状态", EnName = "state") - private String state; - @ExportEntityMap(CnName = "交接状态", EnName = "invoiceState") - private String invoiceState; + @ExportEntityMap(CnName = "发票状态", EnName = "billingState") + private String billingState; + @ExportEntityMap(CnName = "交接状态", EnName = "transferState") + private String transferState; + @ExportEntityMap(CnName = "开票单位", EnName = "invoiceTitle") + private String invoiceTitle; @ExportEntityMap(CnName = "开票类型", EnName = "invoiceType") private String invoiceType; @ExportEntityMap(CnName = "合同编号", EnName = "contractNo") private String contractNo; @ExportEntityMap(CnName = "客户名称", EnName = "customerName") private String customerName; - @ExportEntityMap(CnName = "车架号", EnName = "VIN") - private String VIN; - @ExportEntityMap(CnName = "开票名称", EnName = "invoiceName") - private String invoiceName; + @ExportEntityMap(CnName = "车架号", EnName = "vinNo") + private String vinNo; + @ExportEntityMap(CnName = "开票名称", EnName = "invoicingName") + private String invoicingName; @ExportEntityMap(CnName = "开票金额", EnName = "invoiceAmount") private String invoiceAmount; @ExportEntityMap(CnName = "开票日期", EnName = "createTime") private String createTime; @ExportEntityMap(CnName = "发票代码", EnName = "invoiceCode") private String invoiceCode; + } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceFeign.java index 5ab6615af5..c3e4a927a3 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceFeign.java @@ -49,13 +49,8 @@ public interface FinVehicleInvoiceFeign { public ResultBean save(@RequestBody FinVehicleInvoiceDto dto); @ApiOperation("修改保存") - @PostMapping("/update/{sid}") - public ResultBean update(@RequestBody FinVehicleInvoiceDto dto, @PathVariable("sid") String sid); - - @ApiOperation("图片上传") - @ApiImplicitParam(name = "file", value = "文件", required = true, dataType = "MultipartFile", dataTypeClass = MultipartFile.class) - @PostMapping("/pictureUpload") - public ResultBean pictureUpload(@RequestParam(value = "sid")String sid,@RequestParam(value = "file") MultipartFile file); + @PostMapping("/saveOrUpdate") + public ResultBean saveOrUpdate(@RequestBody FinVehicleInvoiceDto dto); @ApiOperation("删除记录") @GetMapping("/del/{ids}") @@ -64,7 +59,7 @@ public interface FinVehicleInvoiceFeign { @ApiOperation("获取一条记录") @GetMapping("/fetch/{id}") public ResultBean fetch(@PathVariable("id") String id); - + @ApiOperation("获取详情记录") @GetMapping("/fetchSid/{sid}") public ResultBean fetchBySid(@PathVariable("sid") String sid); @@ -74,5 +69,4 @@ public interface FinVehicleInvoiceFeign { @ResponseBody public void exportExcel(@RequestBody FinVehicleInvoiceQuery query); - } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceFeignFallback.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceFeignFallback.java index 2fb434c2d6..2da912e83e 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceFeignFallback.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceFeignFallback.java @@ -46,15 +46,10 @@ public class FinVehicleInvoiceFeignFallback implements FinVehicleInvoiceFeign { public ResultBean save(FinVehicleInvoiceDto dto){ return ResultBean.fireFail().setMsg("接口anrui-fin/finvehicleinvoice/save无法访问"); } - - @Override - public ResultBean update(FinVehicleInvoiceDto dto, String sid){ - return ResultBean.fireFail().setMsg("接口anrui-fin/finvehicleinvoice/update无法访问"); - } @Override - public ResultBean pictureUpload(String sid, MultipartFile file) { - return ResultBean.fireFail().setMsg("接口anrui-fin/finvehicleinvoice/pictureUpload无法访问"); + public ResultBean saveOrUpdate(FinVehicleInvoiceDto dto) { + return ResultBean.fireFail().setMsg("接口anrui-fin/finvehicleinvoice/saveOrUpdate无法访问"); } @Override diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceQuery.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceQuery.java index 4b4dc75cfa..c134dc3659 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceQuery.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceQuery.java @@ -35,6 +35,16 @@ public class FinVehicleInvoiceQuery implements Query { @ApiModelProperty("开票单位") private String invoiceTitle; + @ApiModelProperty("开票状态") + private String billingState; + + @ApiModelProperty("开票状态Key") + private String billingStateKey; + + + @ApiModelProperty("开票类型Key") + private String invoiceTypeKey; + @ApiModelProperty("发票类别") private String invoiceType; @@ -45,16 +55,19 @@ public class FinVehicleInvoiceQuery implements Query { private String customerName; @ApiModelProperty("车架号") - private String VIN; - - @ApiModelProperty("发票状态") + private String vinNo; + private String state; + @ApiModelProperty("移交状态") - private String invoiceState; + private String transferState; + + @ApiModelProperty("移交状态key") + private String transferStateKey; @ApiModelProperty("开票名称") - private String invoiceName; + private String invoicingName; @ApiModelProperty("开票开始日期") private String createStartTime ; diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceVo.java index f745c4a978..10006bfd0e 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceVo.java @@ -9,6 +9,7 @@ import lombok.Data; import java.math.BigDecimal; import java.util.Date; +import java.util.List; /** * Project: anrui-fin(财务管理)
@@ -29,46 +30,41 @@ public class FinVehicleInvoiceVo implements Vo { @ApiModelProperty("车辆发票信息Sid") - private String Sid; - - @ApiModelProperty("发票状态") + private String sid; private String state; - + @ApiModelProperty("发票状态") + private String billingState; + @ApiModelProperty("发票状态Key") + private String billingStateKey; @ApiModelProperty("交接状态") - private String invoiceState; - + private String transferState; + @ApiModelProperty("交接状态Key") + private String transferStateKey; @ApiModelProperty("开票单位") private String invoiceTitle; - @ApiModelProperty("开票类型") private String invoiceType; - + @ApiModelProperty("开票类型Key") + private String invoiceTypeKey; @ApiModelProperty("合同编号") private String contractNo; - @ApiModelProperty("客户名称") private String customerName; - @ApiModelProperty("车架号") - private String VIN; - + private String vinNo; @ApiModelProperty("开票名称") - private String invoiceName; - + private String invoicingName; @ApiModelProperty("开票金额") private String invoiceAmount; - @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") @ApiModelProperty("开票日期") private Date createTime; - @ApiModelProperty("发票代码") private String invoiceCode; - @ApiModelProperty("发票号") private String invoiceNo; - @ApiModelProperty("发票图片") private String filePath; - + @ApiModelProperty("发票图片集合") + private List filePaths; } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.java index b0fbd7a8cb..0a8d784ab3 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.java @@ -37,14 +37,11 @@ public interface FinVehicleInvoiceMapper extends BaseMapper { IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); - - @Select("select * from fin_vehicle_invoice where isDelete = '0'") + List selectListVo(); List selByExcel(@Param(Constants.WRAPPER)QueryWrapper qw); - - Boolean updatePictureBySid(String state,String filePath,String sid); - FinVehicleInvoiceDetailsVo getInvoiceDetailsBySid(String sid); + } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.xml index 2f45cad704..e24b97d5f7 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.xml @@ -2,19 +2,44 @@ + + + + + + + + + + + + + + + + + + + + + - SELECT DISTINCT sid, `state`, - invoiceState, + billingStateKey, + billingState, + transferStateKey, + transferState, invoiceTitle, invoiceType, + invoiceTypeKey, contractNo, customerName, VIN, - invoiceName, + invoicingName, invoiceAmount, createTime, invoiceCode, @@ -26,60 +51,91 @@ - + SELECT * FROM fin_vehicle_invoice where isDelete = '0' + + + - SELECT DISTINCT - sid, - `state`, - invoiceState, + billingState, + transferState, invoiceTitle, invoiceType, contractNo, customerName, VIN, - invoiceName, + invoicingName, invoiceAmount, createTime, - invoiceCode, - invoiceNo, - filePath + invoiceCode FROM fin_vehicle_invoice ${ew.sqlSegment} + + + + + + + + + + + + + + + + + + - - Update fin_vehicle_invoice - Set - `state` = #{arg0}, - filePath = #{arg1} - Where sid = #{arg2} - \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceRest.java index 9b21baf070..a0f9043ce5 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceRest.java @@ -1,10 +1,11 @@ package com.yxt.anrui.fin.biz.finvehicleinvoice; + +import cn.hutool.core.bean.BeanUtil; import com.yxt.anrui.fin.api.finvehicleinvoice.*; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.utils.ExportExcelUtils; import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.query.PagerQuery; -import com.yxt.common.core.result.FileUploadResult; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import io.swagger.annotations.Api; @@ -12,7 +13,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; @@ -20,6 +20,7 @@ import java.io.UnsupportedEncodingException; import java.net.URLEncoder; import java.text.ParseException; import java.text.SimpleDateFormat; +import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -41,198 +42,187 @@ import java.util.List; @RequestMapping("v1/finvehicleinvoice") public class FinVehicleInvoiceRest implements FinVehicleInvoiceFeign { - @Autowired - private FinVehicleInvoiceService finVehicleInvoiceService; - - @Resource - private FileUploadComponent fileUploadComponent; - - @Autowired - private HttpServletResponse response; - - private List setVo(List list) { - for (FinVehicleInvoiceVo finVehicleInvoiceVo : list) { - if (StringUtils.isNotBlank(finVehicleInvoiceVo.getState())) { - String state = finVehicleInvoiceVo.getState(); - if (state.equals("0")) { - finVehicleInvoiceVo.setState("未开票"); - }else if (state.equals("1")) { - finVehicleInvoiceVo.setState("已开票"); - }else if (state.equals("2")) { - finVehicleInvoiceVo.setState("作废"); - } - } - if (StringUtils.isNotBlank(finVehicleInvoiceVo.getInvoiceState())) { - String invoiceState = finVehicleInvoiceVo.getInvoiceState(); - if (invoiceState.equals("0")) { - finVehicleInvoiceVo.setInvoiceState("未移交"); - } else if (invoiceState.equals("1")) { - finVehicleInvoiceVo.setInvoiceState("已移交"); - } - } - if (StringUtils.isNotBlank(finVehicleInvoiceVo.getFilePath())) { - String filePath = finVehicleInvoiceVo.getFilePath(); - String urlPrefix = fileUploadComponent.getUrlPrefix(); - filePath = urlPrefix + filePath; - finVehicleInvoiceVo.setFilePath(filePath); - } - } - return list; - } - - @Override - public ResultBean> listPage(@RequestBody PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - PagerVo pv = finVehicleInvoiceService.listPageVo(pq); - List records = pv.getRecords(); - List finVehicleInvoiceVos = setVo(records); - pv.setRecords(finVehicleInvoiceVos); - return rb.success().setData(pv); - } - - @Override - public ResultBean> listAll(@RequestBody FinVehicleInvoiceQuery query){ - ResultBean rb = ResultBean.fireFail(); - List list = finVehicleInvoiceService.listAllVo(query); - List finVehicleInvoiceVos = setVo(list); - return rb.success().setData(finVehicleInvoiceVos); - } - - @Override - public ResultBean> list(){ - ResultBean rb = ResultBean.fireFail(); - List list = finVehicleInvoiceService.listVo(); - List finVehicleInvoiceVos = setVo(list); - return rb.success().setData(finVehicleInvoiceVos); - } - - @Override - public ResultBean save(FinVehicleInvoiceDto dto){ - ResultBean rb = ResultBean.fireFail(); - finVehicleInvoiceService.saveOrUpdateDto(dto); - return rb.success(); - } - + @Autowired + private FinVehicleInvoiceService finVehicleInvoiceService; + + @Resource + private FileUploadComponent fileUploadComponent; + + @Autowired + private HttpServletResponse response; + + private List setVo(List list) { + for (FinVehicleInvoiceVo finVehicleInvoiceVo : list) { + if (StringUtils.isNotBlank(finVehicleInvoiceVo.getFilePath())) { + String filePath = finVehicleInvoiceVo.getFilePath(); + List filePaths = new ArrayList<>(); + String array[] = filePath.split(","); + for (int i = 0; i < array.length; i++) { + String urlPrefix = fileUploadComponent.getUrlPrefix(); + filePath = urlPrefix + array[i]; + filePaths.add(filePath); + finVehicleInvoiceVo.setFilePaths(filePaths); + } + } + } + return list; + } + + @Override + public ResultBean> listPage(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = finVehicleInvoiceService.listPageVo(pq); + List records = pv.getRecords(); + List finVehicleInvoiceVos = setVo(records); + pv.setRecords(finVehicleInvoiceVos); + return rb.success().setData(pv); + } + + @Override + public ResultBean> listAll(@RequestBody FinVehicleInvoiceQuery query) { + ResultBean rb = ResultBean.fireFail(); + List list = finVehicleInvoiceService.listAllVo(query); + List finVehicleInvoiceVos = setVo(list); + return rb.success().setData(finVehicleInvoiceVos); + } + + @Override + public ResultBean> list() { + ResultBean rb = ResultBean.fireFail(); + List list = finVehicleInvoiceService.listVo(); + List finVehicleInvoiceVos = setVo(list); + return rb.success().setData(finVehicleInvoiceVos); + } + @Override - public ResultBean update(FinVehicleInvoiceDto dto,String sid){ - ResultBean rb = ResultBean.fireFail(); - finVehicleInvoiceService.updateBySid(dto.toMap(),sid); - return rb.success(); - } - - @Override - public ResultBean del(String ids){ - ResultBean rb = ResultBean.fireFail(); - finVehicleInvoiceService.delByIds(ids); - return rb.success(); - } - - @Override - public ResultBean fetch(String id){ - ResultBean rb = ResultBean.fireFail(); - FinVehicleInvoiceVo vo = finVehicleInvoiceService.fetchByIdVo(id); - return rb.success().setData(vo); - } - - @Override - public ResultBean fetchBySid(String sid){ - ResultBean rb = ResultBean.fireFail(); - FinVehicleInvoiceDetailsVo vo = finVehicleInvoiceService.getInvoiceDetailsBySid(sid); - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); - if (StringUtils.isNotBlank(vo.getState())) { - String state = vo.getState(); - if (state.equals("0")) { - vo.setState("未开票"); - }else if (state.equals("1")) { - vo.setState("已开票"); - }else if (state.equals("2")) { - vo.setState("作废"); - } - } - if (StringUtils.isNotBlank(vo.getCreateTime())) { - String createTime = vo.getCreateTime(); - try { - Date date = sdf.parse(createTime); - String createTimeBySdf = sdf.format(date); - vo.setCreateTime(createTimeBySdf); - } catch (ParseException e) { - e.printStackTrace(); - } - } - if (StringUtils.isNotBlank(vo.getFilePath())) { - String filePath = vo.getFilePath(); - String urlPrefix = fileUploadComponent.getUrlPrefix(); - filePath = urlPrefix + filePath; - vo.setFilePath(filePath); - } - return rb.success().setData(vo); - } - - @Override - public void exportExcel(FinVehicleInvoiceQuery query) { - //得到所有要导出的数据 - List invoiceExportVoList = finVehicleInvoiceService.listExcel(query); - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); - for (FinVehicleInvoiceExportVo invoiceExportVo : invoiceExportVoList) { - if (StringUtils.isNotBlank(invoiceExportVo.getState())) { - String state = invoiceExportVo.getState(); - if (state.equals("0")) { - invoiceExportVo.setState("未开票"); - }else if (state.equals("1")) { - invoiceExportVo.setState("已开票"); - }else if (state.equals("2")) { - invoiceExportVo.setState("作废"); - } - } - if (StringUtils.isNotBlank(invoiceExportVo.getInvoiceState())) { - String invoiceState = invoiceExportVo.getInvoiceState(); - if (invoiceState.equals("0")) { - invoiceExportVo.setInvoiceState("未移交"); - } else if (invoiceState.equals("1")) { - invoiceExportVo.setInvoiceState("已移交"); - } - } - if (StringUtils.isNotBlank(invoiceExportVo.getCreateTime())) { - String createTime = invoiceExportVo.getCreateTime(); - try { - Date date = sdf.parse(createTime); - String createTimeBySdf = sdf.format(date); - invoiceExportVo.setCreateTime(createTimeBySdf); - } catch (ParseException e) { - e.printStackTrace(); - } - } - } - //定义导出的excel名字 - String excelName = "车辆发票信息列表"; - String fileNameURL = ""; - try { - fileNameURL = URLEncoder.encode(excelName, "UTF-8"); - } catch (UnsupportedEncodingException e) { - e.printStackTrace(); - } - //导出车辆管理列表 - ExportExcelUtils.export(fileNameURL, invoiceExportVoList, FinVehicleInvoiceExportVo.class, response); - } - - @Override - public ResultBean pictureUpload(String sid,MultipartFile file) { - ResultBean rb = ResultBean.fireFail(); - if (file == null || file.isEmpty()) { - return rb.setMsg("文件为空"); - } - rb = fileUploadComponent.uploadFile(file); - FileUploadResult data = (FileUploadResult) rb.getData(); - FinVehicleInvoiceDetailsVo invoice= finVehicleInvoiceService.getInvoiceDetailsBySid(sid); - invoice.setFilePath(data.getFilePath()); - String filePath = invoice.getFilePath(); - invoice.setState("1"); - String state = invoice.getState(); - Boolean isSuccess = finVehicleInvoiceService.updatePictureBySid(state,filePath,sid); - if (isSuccess) { - return rb.success().setMsg("上传成功"); - }else { - return rb.fail().setMsg("上传失败"); - } - } + public ResultBean save(FinVehicleInvoiceDto dto) { + ResultBean rb = ResultBean.fireFail(); + finVehicleInvoiceService.saveOrUpdateDto(dto); + return rb.success(); + } + + @Override + public ResultBean saveOrUpdate(FinVehicleInvoiceDto dto) { + ResultBean rb = ResultBean.fireFail(); + String sid = dto.getSid(); + if (StringUtils.isNotEmpty(sid)) { + StringBuilder sb = new StringBuilder(); + String urlPrefix = fileUploadComponent.getUrlPrefix(); + if (null != dto.getFilePaths()) { + for (String filePath : dto.getFilePaths()) { + String[] split = filePath.split(urlPrefix); + String s = split[1]; + sb.append(s).append(","); + } + sb.delete(sb.length() - 1, sb.length()); + dto.setFilePath(sb.toString()); + } + if (StringUtils.isNotBlank(dto.getFilePath())) { + dto.setBillingStateKey("002"); + dto.setBillingState("已开票"); + } + if (StringUtils.isNotEmpty(dto.getVinNo())) { + String VIN = dto.getVinNo(); + dto.setVIN(VIN); + } + finVehicleInvoiceService.updateBySid(dto, sid); + } else { + FinVehicleInvoice finVehicleInvoice = new FinVehicleInvoice(); + String sidAdd = finVehicleInvoice.getSid(); + BeanUtil.copyProperties(dto, finVehicleInvoice); + finVehicleInvoice.setSid(sidAdd); + StringBuilder sb = new StringBuilder(); + String urlPrefix = fileUploadComponent.getUrlPrefix(); + if (null != dto.getFilePaths()) { + for (String filePath : dto.getFilePaths()) { + String[] split = filePath.split(urlPrefix); + String s = split[1]; + sb.append(s).append(","); + } + sb.delete(sb.length() - 1, sb.length()); + finVehicleInvoice.setFilePath(sb.toString()); + finVehicleInvoice.setBillingStateKey("002"); + finVehicleInvoice.setBillingState("已开票"); + } + if (StringUtils.isNotEmpty(dto.getVinNo())) { + String VIN = dto.getVinNo(); + finVehicleInvoice.setVIN(VIN); + } + finVehicleInvoiceService.save(finVehicleInvoice); + } + return rb.success(); + } + + @Override + public ResultBean del(String ids) { + ResultBean rb = ResultBean.fireFail(); + finVehicleInvoiceService.delByIds(ids); + return rb.success(); + } + + @Override + public ResultBean fetch(String id) { + ResultBean rb = ResultBean.fireFail(); + FinVehicleInvoiceVo vo = finVehicleInvoiceService.fetchByIdVo(id); + return rb.success().setData(vo); + } + + @Override + public ResultBean fetchBySid(String sid) { + ResultBean rb = ResultBean.fireFail(); + FinVehicleInvoiceDetailsVo vo = finVehicleInvoiceService.getInvoiceDetailsBySid(sid); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + if (StringUtils.isNotBlank(vo.getCreateTime())) { + String createTime = vo.getCreateTime(); + try { + Date date = sdf.parse(createTime); + String createTimeBySdf = sdf.format(date); + vo.setCreateTime(createTimeBySdf); + } catch (ParseException e) { + e.printStackTrace(); + } + } + if (StringUtils.isNotBlank(vo.getFilePath())) { + String filePath = vo.getFilePath(); + List filePaths = new ArrayList<>(); + String array[] = filePath.split(","); + for (int i = 0; i < array.length; i++) { + String urlPrefix = fileUploadComponent.getUrlPrefix(); + filePath = urlPrefix + array[i]; + filePaths.add(filePath); + vo.setFilePaths(filePaths); + } + } + return rb.success().setData(vo); + } + + @Override + public void exportExcel(FinVehicleInvoiceQuery query) { + //得到所有要导出的数据 + List invoiceExportVoList = finVehicleInvoiceService.listExcel(query); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + for (FinVehicleInvoiceExportVo invoiceExportVo : invoiceExportVoList) { + if (StringUtils.isNotBlank(invoiceExportVo.getCreateTime())) { + String createTime = invoiceExportVo.getCreateTime(); + try { + Date date = sdf.parse(createTime); + String createTimeBySdf = sdf.format(date); + invoiceExportVo.setCreateTime(createTimeBySdf); + } catch (ParseException e) { + e.printStackTrace(); + } + } + } + //定义导出的excel名字 + String excelName = "车辆发票信息列表"; + String fileNameURL = ""; + try { + fileNameURL = URLEncoder.encode(excelName, "UTF-8"); + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } + //导出车辆管理列表 + ExportExcelUtils.export(fileNameURL, invoiceExportVoList, FinVehicleInvoiceExportVo.class, response); + } + } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java index 8acfd9f145..7196cf9984 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java @@ -51,6 +51,9 @@ public class FinVehicleInvoiceService extends MybatisBaseService= date_format('" + createStartTime + "','%Y-%m-%d')"). - apply(org.apache.commons.lang3.StringUtils.isNotEmpty(createEndTime), "date_format (vi.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" + qw.apply(org.apache.commons.lang3.StringUtils.isNotEmpty(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')"). + apply(org.apache.commons.lang3.StringUtils.isNotEmpty(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" ); + qw.orderByDesc("createTime"); return qw; } @@ -123,32 +133,42 @@ public class FinVehicleInvoiceService extends MybatisBaseService= date_format('" + createStartTime + "','%Y-%m-%d')"). - apply(org.apache.commons.lang3.StringUtils.isNotEmpty(createEndTime), "date_format (vi.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" + qw.apply(org.apache.commons.lang3.StringUtils.isNotEmpty(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')"). + apply(org.apache.commons.lang3.StringUtils.isNotEmpty(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" ); + qw.orderByDesc("createTime"); List invoiceExportVoList = baseMapper.selByExcel(qw); int id = 1; for (FinVehicleInvoiceExportVo invoiceExportVo : invoiceExportVoList) { @@ -163,7 +183,4 @@ public class FinVehicleInvoiceService extends MybatisBaseService