Browse Source

开票管理

zhanglei
fanzongzhe 2 years ago
parent
commit
21e3ae893b
  1. 66
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoice.java
  2. 29
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceDetailsVo.java
  3. 87
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceDto.java
  4. 21
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceExportVo.java
  5. 12
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceFeign.java
  6. 9
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceFeignFallback.java
  7. 23
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceQuery.java
  8. 34
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceVo.java
  9. 7
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.java
  10. 124
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.xml
  11. 380
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceRest.java
  12. 63
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java

66
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 { public class FinVehicleInvoice extends BaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ApiModelProperty("销售申请sid")
private String Sid;
@ApiModelProperty("版本锁") @ApiModelProperty("版本锁")
private Integer lockVersion; 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("创建时间") @ApiModelProperty("创建时间")
private Date createTime; 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("修改时间") @ApiModelProperty("修改时间")
private Date modifyTime; private Date modifyTime;
@ApiModelProperty("是否可用:1可用,0不可用") @ApiModelProperty("是否可用:1可用,0不可用")
private Integer isEnable; private Integer isEnable;
@ApiModelProperty("开票状态:0未开票,1已开票,2作废")
private Integer state; private Integer state;
@ApiModelProperty("开票状态")
private String billingState;
@ApiModelProperty("开票状态Key")
private String billingStateKey;
@ApiModelProperty("是否删除:0未删除,1已删除") @ApiModelProperty("是否删除:0未删除,1已删除")
private Integer isDelete; private Integer isDelete;
@ -63,49 +63,53 @@ public class FinVehicleInvoice extends BaseEntity {
@ApiModelProperty("车辆sid") @ApiModelProperty("车辆sid")
private String vehicleSid; private String vehicleSid;
@ApiModelProperty("车架号") @ApiModelProperty("车架号")
private String VIN; private String VIN;
@ApiModelProperty("车辆类型Key")
@ApiModelProperty("车辆类型Key")
private String vehicleTypeKey; private String vehicleTypeKey;
@ApiModelProperty("车辆类型") @ApiModelProperty("车辆类型")
private String vehicleType; private String vehicleType;
@ApiModelProperty("车辆金额") @ApiModelProperty("车辆金额")
private BigDecimal vehiclAmount; private BigDecimal vehiclAmount;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty("最大发票开票日期") @ApiModelProperty("最大发票开票日期")
private Date invoiceDate; private Date invoiceDate;
@ApiModelProperty("发票号") @ApiModelProperty("发票号")
private String invoiceNo; private String invoiceNo;
@ApiModelProperty("发票代码") @ApiModelProperty("发票代码")
private String invoiceCode; private String invoiceCode;
@ApiModelProperty("车辆发票金额") @ApiModelProperty("车辆发票金额")
private BigDecimal invoiceAmount; private BigDecimal invoiceAmount;
@ApiModelProperty("发票类别Key(增值税专用发票/机动车销售统一发票/增值税普通发票)") @ApiModelProperty("发票类别Key(增值税专用发票/机动车销售统一发票/增值税普通发票)")
private String invoiceTypeKey; private String invoiceTypeKey;
@ApiModelProperty("发票类别") @ApiModelProperty("发票类别")
private String invoiceType; private String invoiceType;
@ApiModelProperty("开票单位") @ApiModelProperty("开票单位")
private String invoiceTitle; private String invoiceTitle;
@ApiModelProperty("移交状态:0未交接,1已交接") @ApiModelProperty("移交状态:0未交接,1已交接")
private String invoiceState; private String transferState;
@ApiModelProperty("移交状态:0未交接,1已交接")
private String transferStateKey;
@ApiModelProperty("客户名称") @ApiModelProperty("客户名称")
private String customerName; private String customerName;
@ApiModelProperty("开票名称") @ApiModelProperty("开票名称")
private String invoiceName; private String invoicingName;
@ApiModelProperty("合同编号") @ApiModelProperty("合同编号")
private String contractNo; private String contractNo;

29
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.math.BigDecimal;
import java.util.Date; import java.util.Date;
import java.util.List;
/** /**
* @author Administrator * @author Administrator
@ -18,44 +19,36 @@ public class FinVehicleInvoiceDetailsVo implements Vo {
@ApiModelProperty("sid") @ApiModelProperty("sid")
private String sid; private String sid;
@ApiModelProperty("开票单位") @ApiModelProperty("开票单位")
private String invoiceTitle; private String invoiceTitle;
@ApiModelProperty("合同编号") @ApiModelProperty("合同编号")
private String contractNo; private String contractNo;
@ApiModelProperty("客户名称") @ApiModelProperty("客户名称")
private String customerName; private String customerName;
@ApiModelProperty("车架号") @ApiModelProperty("车架号")
private String VIN; private String vinNo;
@ApiModelProperty("发票类别") @ApiModelProperty("发票类别")
private String invoiceType; private String invoiceType;
@ApiModelProperty("开票类型Key")
private String invoiceTypeKey;
@ApiModelProperty("车辆发票金额") @ApiModelProperty("车辆发票金额")
private BigDecimal invoiceAmount; private BigDecimal invoiceAmount;
@ApiModelProperty("发票状态")
@ApiModelProperty("开票状态:0未开票,1已开票,2作废") private String billingState;
private String state; @ApiModelProperty("发票状态Key")
private String billingStateKey;
@ApiModelProperty("开票名称") @ApiModelProperty("开票名称")
private String invoiceName; private String invoicingName;
@ApiModelProperty("开票人") @ApiModelProperty("开票人")
private String name; private String name;
@ApiModelProperty("开票时间") @ApiModelProperty("开票时间")
private String createTime; private String createTime;
@ApiModelProperty("发票号") @ApiModelProperty("发票号")
private String invoiceNo; private String invoiceNo;
@ApiModelProperty("发票代码") @ApiModelProperty("发票代码")
private String invoiceCode; private String invoiceCode;
@ApiModelProperty("图片地址") @ApiModelProperty("图片地址")
private String filePath; private String filePath;
@ApiModelProperty("图片地址集合")
private List<String> filePaths;
} }

87
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.math.BigDecimal;
import java.util.Date; import java.util.Date;
import java.util.List;
/** /**
* Project: anrui-fin(财务管理) <br/> * Project: anrui-fin(财务管理) <br/>
@ -28,43 +29,67 @@ import java.util.Date;
public class FinVehicleInvoiceDto implements Dto { public class FinVehicleInvoiceDto implements Dto {
@ApiModelProperty("开票单位") private String sid; // sid
private String invoiceTitle; @ApiModelProperty("版本锁")
private Integer lockVersion;
@ApiModelProperty("合同编号") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private String contractNo; @ApiModelProperty("创建时间")
private String createTime;
@ApiModelProperty("客户名称") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private String customerName; @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("车架号") @ApiModelProperty("车架号")
private String VIN; private String VIN;
@ApiModelProperty("车辆类型Key")
@ApiModelProperty("发票类别") private String vehicleTypeKey;
private String invoiceType; @ApiModelProperty("车辆类型")
private String vehicleType;
@ApiModelProperty("车辆发票金额") @ApiModelProperty("车辆金额")
private BigDecimal invoiceAmount; private BigDecimal vehiclAmount;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@ApiModelProperty("开票状态:0未开票,1已开票,2作废") @ApiModelProperty("最大发票开票日期")
private String state; private String invoiceDate;
@ApiModelProperty("开票名称")
private String invoiceName;
@ApiModelProperty("开票人")
private String name;
@ApiModelProperty("开票时间")
private String createTime;
@ApiModelProperty("发票号") @ApiModelProperty("发票号")
private String invoiceNo; private String invoiceNo;
@ApiModelProperty("发票代码") @ApiModelProperty("发票代码")
private String invoiceCode; 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("图片地址") @ApiModelProperty("图片地址")
private String filePath; private String filePath;
@ApiModelProperty("开票状态")
private String billingState;
@ApiModelProperty("开票状态Key")
private String billingStateKey;
@ApiModelProperty("图片地址集合")
private List<String> filePaths;
private String vinNo;
@ApiModelProperty("开票名称")
private String invoicingName;
} }

21
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; package com.yxt.anrui.fin.api.finvehicleinvoice;
import com.yxt.common.core.utils.ExportEntityMap; import com.yxt.common.core.utils.ExportEntityMap;
import com.yxt.common.core.vo.Vo; import com.yxt.common.core.vo.Vo;
import lombok.Data; import lombok.Data;
@ -12,27 +11,29 @@ import lombok.Data;
@Data @Data
public class FinVehicleInvoiceExportVo implements Vo { public class FinVehicleInvoiceExportVo implements Vo {
@ExportEntityMap(CnName = "序号", EnName = "rankNo") @ExportEntityMap(CnName = "序号", EnName = "rankNo")
private Integer rankNo; private Integer rankNo;
@ExportEntityMap(CnName = "发票状态", EnName = "state") @ExportEntityMap(CnName = "发票状态", EnName = "billingState")
private String state; private String billingState;
@ExportEntityMap(CnName = "交接状态", EnName = "invoiceState") @ExportEntityMap(CnName = "交接状态", EnName = "transferState")
private String invoiceState; private String transferState;
@ExportEntityMap(CnName = "开票单位", EnName = "invoiceTitle")
private String invoiceTitle;
@ExportEntityMap(CnName = "开票类型", EnName = "invoiceType") @ExportEntityMap(CnName = "开票类型", EnName = "invoiceType")
private String invoiceType; private String invoiceType;
@ExportEntityMap(CnName = "合同编号", EnName = "contractNo") @ExportEntityMap(CnName = "合同编号", EnName = "contractNo")
private String contractNo; private String contractNo;
@ExportEntityMap(CnName = "客户名称", EnName = "customerName") @ExportEntityMap(CnName = "客户名称", EnName = "customerName")
private String customerName; private String customerName;
@ExportEntityMap(CnName = "车架号", EnName = "VIN") @ExportEntityMap(CnName = "车架号", EnName = "vinNo")
private String VIN; private String vinNo;
@ExportEntityMap(CnName = "开票名称", EnName = "invoiceName") @ExportEntityMap(CnName = "开票名称", EnName = "invoicingName")
private String invoiceName; private String invoicingName;
@ExportEntityMap(CnName = "开票金额", EnName = "invoiceAmount") @ExportEntityMap(CnName = "开票金额", EnName = "invoiceAmount")
private String invoiceAmount; private String invoiceAmount;
@ExportEntityMap(CnName = "开票日期", EnName = "createTime") @ExportEntityMap(CnName = "开票日期", EnName = "createTime")
private String createTime; private String createTime;
@ExportEntityMap(CnName = "发票代码", EnName = "invoiceCode") @ExportEntityMap(CnName = "发票代码", EnName = "invoiceCode")
private String invoiceCode; private String invoiceCode;
} }

12
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); public ResultBean save(@RequestBody FinVehicleInvoiceDto dto);
@ApiOperation("修改保存") @ApiOperation("修改保存")
@PostMapping("/update/{sid}") @PostMapping("/saveOrUpdate")
public ResultBean update(@RequestBody FinVehicleInvoiceDto dto, @PathVariable("sid") String sid); public ResultBean saveOrUpdate(@RequestBody FinVehicleInvoiceDto dto);
@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);
@ApiOperation("删除记录") @ApiOperation("删除记录")
@GetMapping("/del/{ids}") @GetMapping("/del/{ids}")
@ -64,7 +59,7 @@ public interface FinVehicleInvoiceFeign {
@ApiOperation("获取一条记录") @ApiOperation("获取一条记录")
@GetMapping("/fetch/{id}") @GetMapping("/fetch/{id}")
public ResultBean<FinVehicleInvoiceVo> fetch(@PathVariable("id") String id); public ResultBean<FinVehicleInvoiceVo> fetch(@PathVariable("id") String id);
@ApiOperation("获取详情记录") @ApiOperation("获取详情记录")
@GetMapping("/fetchSid/{sid}") @GetMapping("/fetchSid/{sid}")
public ResultBean<FinVehicleInvoiceDetailsVo> fetchBySid(@PathVariable("sid") String sid); public ResultBean<FinVehicleInvoiceDetailsVo> fetchBySid(@PathVariable("sid") String sid);
@ -74,5 +69,4 @@ public interface FinVehicleInvoiceFeign {
@ResponseBody @ResponseBody
public void exportExcel(@RequestBody FinVehicleInvoiceQuery query); public void exportExcel(@RequestBody FinVehicleInvoiceQuery query);
} }

9
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){ public ResultBean save(FinVehicleInvoiceDto dto){
return ResultBean.fireFail().setMsg("接口anrui-fin/finvehicleinvoice/save无法访问"); 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 @Override
public ResultBean pictureUpload(String sid, MultipartFile file) { public ResultBean saveOrUpdate(FinVehicleInvoiceDto dto) {
return ResultBean.fireFail().setMsg("接口anrui-fin/finvehicleinvoice/pictureUpload无法访问"); return ResultBean.fireFail().setMsg("接口anrui-fin/finvehicleinvoice/saveOrUpdate无法访问");
} }
@Override @Override

23
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("开票单位") @ApiModelProperty("开票单位")
private String invoiceTitle; private String invoiceTitle;
@ApiModelProperty("开票状态")
private String billingState;
@ApiModelProperty("开票状态Key")
private String billingStateKey;
@ApiModelProperty("开票类型Key")
private String invoiceTypeKey;
@ApiModelProperty("发票类别") @ApiModelProperty("发票类别")
private String invoiceType; private String invoiceType;
@ -45,16 +55,19 @@ public class FinVehicleInvoiceQuery implements Query {
private String customerName; private String customerName;
@ApiModelProperty("车架号") @ApiModelProperty("车架号")
private String VIN; private String vinNo;
@ApiModelProperty("发票状态")
private String state; private String state;
@ApiModelProperty("移交状态") @ApiModelProperty("移交状态")
private String invoiceState; private String transferState;
@ApiModelProperty("移交状态key")
private String transferStateKey;
@ApiModelProperty("开票名称") @ApiModelProperty("开票名称")
private String invoiceName; private String invoicingName;
@ApiModelProperty("开票开始日期") @ApiModelProperty("开票开始日期")
private String createStartTime ; private String createStartTime ;

34
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.math.BigDecimal;
import java.util.Date; import java.util.Date;
import java.util.List;
/** /**
* Project: anrui-fin(财务管理) <br/> * Project: anrui-fin(财务管理) <br/>
@ -29,46 +30,41 @@ public class FinVehicleInvoiceVo implements Vo {
@ApiModelProperty("车辆发票信息Sid") @ApiModelProperty("车辆发票信息Sid")
private String Sid; private String sid;
@ApiModelProperty("发票状态")
private String state; private String state;
@ApiModelProperty("发票状态")
private String billingState;
@ApiModelProperty("发票状态Key")
private String billingStateKey;
@ApiModelProperty("交接状态") @ApiModelProperty("交接状态")
private String invoiceState; private String transferState;
@ApiModelProperty("交接状态Key")
private String transferStateKey;
@ApiModelProperty("开票单位") @ApiModelProperty("开票单位")
private String invoiceTitle; private String invoiceTitle;
@ApiModelProperty("开票类型") @ApiModelProperty("开票类型")
private String invoiceType; private String invoiceType;
@ApiModelProperty("开票类型Key")
private String invoiceTypeKey;
@ApiModelProperty("合同编号") @ApiModelProperty("合同编号")
private String contractNo; private String contractNo;
@ApiModelProperty("客户名称") @ApiModelProperty("客户名称")
private String customerName; private String customerName;
@ApiModelProperty("车架号") @ApiModelProperty("车架号")
private String VIN; private String vinNo;
@ApiModelProperty("开票名称") @ApiModelProperty("开票名称")
private String invoiceName; private String invoicingName;
@ApiModelProperty("开票金额") @ApiModelProperty("开票金额")
private String invoiceAmount; private String invoiceAmount;
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
@ApiModelProperty("开票日期") @ApiModelProperty("开票日期")
private Date createTime; private Date createTime;
@ApiModelProperty("发票代码") @ApiModelProperty("发票代码")
private String invoiceCode; private String invoiceCode;
@ApiModelProperty("发票号") @ApiModelProperty("发票号")
private String invoiceNo; private String invoiceNo;
@ApiModelProperty("发票图片") @ApiModelProperty("发票图片")
private String filePath; private String filePath;
@ApiModelProperty("发票图片集合")
private List<String> filePaths;
} }

7
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<FinVehicleInvoice> {
IPage<FinVehicleInvoiceVo> selectPageVo(IPage<FinVehicleInvoice> page, @Param(Constants.WRAPPER) Wrapper<FinVehicleInvoice> qw); IPage<FinVehicleInvoiceVo> selectPageVo(IPage<FinVehicleInvoice> page, @Param(Constants.WRAPPER) Wrapper<FinVehicleInvoice> qw);
List<FinVehicleInvoiceVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<FinVehicleInvoice> qw); List<FinVehicleInvoiceVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<FinVehicleInvoice> qw);
@Select("select * from fin_vehicle_invoice where isDelete = '0'")
List<FinVehicleInvoiceVo> selectListVo(); List<FinVehicleInvoiceVo> selectListVo();
List<FinVehicleInvoiceExportVo> selByExcel(@Param(Constants.WRAPPER)QueryWrapper<FinVehicleInvoiceExportVo> qw); List<FinVehicleInvoiceExportVo> selByExcel(@Param(Constants.WRAPPER)QueryWrapper<FinVehicleInvoiceExportVo> qw);
Boolean updatePictureBySid(String state,String filePath,String sid);
FinVehicleInvoiceDetailsVo getInvoiceDetailsBySid(String sid); FinVehicleInvoiceDetailsVo getInvoiceDetailsBySid(String sid);
} }

124
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.xml

@ -2,19 +2,44 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yxt.anrui.fin.biz.finvehicleinvoice.FinVehicleInvoiceMapper"> <mapper namespace="com.yxt.anrui.fin.biz.finvehicleinvoice.FinVehicleInvoiceMapper">
<resultMap id="selectPageVoResultMap" type="com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceVo">
<result column="sid" property="sid"></result>
<result column="state" property="state"></result>
<result column="transferState" property="transferState"></result>
<result column="billingState" property="billingState"></result>
<result column="invoiceTitle" property="invoiceTitle"></result>
<result column="invoiceType" property="invoiceType"></result>
<result column="invoiceTypeKey" property="invoiceTypeKey"></result>
<result column="contractNo" property="contractNo"></result>
<result column="customerName" property="customerName"></result>
<result column="VIN" property="vinNo"></result>
<result column="invoicingName" property="invoicingName"></result>
<result column="invoiceAmount" property="invoiceAmount"></result>
<result column="createTime" property="createTime"></result>
<result column="invoiceCode" property="invoiceCode"></result>
<result column="filePath" property="filePath"></result>
<result column="billingStateKey" property="billingStateKey"></result>
<result column="transferStateKey" property="transferStateKey"></result>
</resultMap>
<!-- <where> ${ew.sqlSegment} </where>--> <!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} --> <!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceVo"> <select id="selectPageVo" resultMap="selectPageVoResultMap">
SELECT DISTINCT SELECT DISTINCT
sid, sid,
`state`, `state`,
invoiceState, billingStateKey,
billingState,
transferStateKey,
transferState,
invoiceTitle, invoiceTitle,
invoiceType, invoiceType,
invoiceTypeKey,
contractNo, contractNo,
customerName, customerName,
VIN, VIN,
invoiceName, invoicingName,
invoiceAmount, invoiceAmount,
createTime, createTime,
invoiceCode, invoiceCode,
@ -26,60 +51,91 @@
</where> </where>
</select> </select>
<select id="selectListAllVo" resultType="com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceVo"> <select id="selectListVo" resultMap="selectPageVoResultMap">
SELECT * FROM fin_vehicle_invoice where isDelete = '0'
</select>
<select id="selectListAllVo" resultMap="selectPageVoResultMap">
SELECT * FROM fin_vehicle_invoice SELECT * FROM fin_vehicle_invoice
<where>${ew.sqlSegment}</where> <where>${ew.sqlSegment}</where>
</select> </select>
<select id="selByExcel" resultType="com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceExportVo">
<resultMap id="selectPageExportVoResultMap" type="com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceExportVo">
<result column="transferState" property="transferState"></result>
<result column="billingState" property="billingState"></result>
<result column="invoiceTitle" property="invoiceTitle"></result>
<result column="invoiceType" property="invoiceType"></result>
<result column="contractNo" property="contractNo"></result>
<result column="customerName" property="customerName"></result>
<result column="VIN" property="vinNo"></result>
<result column="invoicingName" property="invoicingName"></result>
<result column="invoiceAmount" property="invoiceAmount"></result>
<result column="createTime" property="createTime"></result>
<result column="invoiceCode" property="invoiceCode"></result>
</resultMap>
<select id="selByExcel" resultMap="selectPageExportVoResultMap">
SELECT DISTINCT SELECT DISTINCT
sid, billingState,
`state`, transferState,
invoiceState,
invoiceTitle, invoiceTitle,
invoiceType, invoiceType,
contractNo, contractNo,
customerName, customerName,
VIN, VIN,
invoiceName, invoicingName,
invoiceAmount, invoiceAmount,
createTime, createTime,
invoiceCode, invoiceCode
invoiceNo,
filePath
FROM fin_vehicle_invoice FROM fin_vehicle_invoice
<where> <where>
${ew.sqlSegment} ${ew.sqlSegment}
</where> </where>
</select> </select>
<resultMap id="getInvoiceDetailsBySidResultMap" type="com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceDetailsVo">
<result column="sid" property="sid"></result>
<result column="billingState" property="billingState"></result>
<result column="billingStateKey" property="billingStateKey"></result>
<result column="invoiceTitle" property="invoiceTitle"></result>
<result column="invoiceType" property="invoiceType"></result>
<result column="invoiceTypeKey" property="invoiceTypeKey"></result>
<result column="contractNo" property="contractNo"></result>
<result column="customerName" property="customerName"></result>
<result column="VIN" property="vinNo"></result>
<result column="invoicingName" property="invoicingName"></result>
<result column="invoiceAmount" property="invoiceAmount"></result>
<result column="createTime" property="createTime"></result>
<result column="invoiceCode" property="invoiceCode"></result>
<result column="filePath" property="filePath"></result>
<result column="name" property="name"></result>
<result column="invoiceNo" property="invoiceNo"></result>
</resultMap>
<select id="getInvoiceDetailsBySid" <select id="getInvoiceDetailsBySid"
resultType="com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceDetailsVo"> resultMap="getInvoiceDetailsBySidResultMap">
SELECT DISTINCT SELECT DISTINCT
si.`name`, si.`name` as name,
v.sid, v.sid as sid,
v.invoiceTitle, v.invoiceTitle as invoiceTitle,
v.contractNo, v.contractNo as contractNo,
v.customerName, v.customerName as customerName,
v.VIN, v.VIN as VIN,
v.invoiceType, v.invoiceType as invoiceType,
v.invoiceAmount, v.invoiceTypeKey as invoiceTypeKey,
v.`state`, v.invoiceAmount as invoiceAmount,
v.invoiceName, v.`state` as state,
v.createTime, v.billingState as billingState,
v.invoiceNo, v.billingStateKey as billingStateKey,
v.invoiceCode, v.invoicingName as invoicingName,
v.filePath v.createTime as createTime,
v.invoiceNo as invoiceNo,
v.invoiceCode as invoiceCode,
v.filePath as filePath
FROM fin_vehicle_invoice AS v FROM fin_vehicle_invoice AS v
LEFT JOIN anrui_portal.sys_user AS u ON v.createBySid = u.sid LEFT JOIN anrui_portal.sys_user AS u ON v.createBySid = u.sid
LEFT JOIN anrui_portal.sys_staffinfo AS si ON u.staffSid = si.sid LEFT JOIN anrui_portal.sys_staffinfo AS si ON u.staffSid = si.sid
WHERE v.isDelete = '0' AND v.sid = #{sid} WHERE v.isDelete = '0' AND v.sid = #{sid}
</select> </select>
<update id="updatePictureBySid">
Update fin_vehicle_invoice
Set
`state` = #{arg0},
filePath = #{arg1}
Where sid = #{arg2}
</update>
</mapper> </mapper>

380
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; package com.yxt.anrui.fin.biz.finvehicleinvoice;
import cn.hutool.core.bean.BeanUtil;
import com.yxt.anrui.fin.api.finvehicleinvoice.*; import com.yxt.anrui.fin.api.finvehicleinvoice.*;
import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.config.component.FileUploadComponent;
import com.yxt.common.base.utils.ExportExcelUtils; import com.yxt.common.base.utils.ExportExcelUtils;
import com.yxt.common.base.utils.StringUtils; import com.yxt.common.base.utils.StringUtils;
import com.yxt.common.core.query.PagerQuery; 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.result.ResultBean;
import com.yxt.common.core.vo.PagerVo; import com.yxt.common.core.vo.PagerVo;
import io.swagger.annotations.Api; 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.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
@ -20,6 +20,7 @@ import java.io.UnsupportedEncodingException;
import java.net.URLEncoder; import java.net.URLEncoder;
import java.text.ParseException; import java.text.ParseException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
@ -41,198 +42,187 @@ import java.util.List;
@RequestMapping("v1/finvehicleinvoice") @RequestMapping("v1/finvehicleinvoice")
public class FinVehicleInvoiceRest implements FinVehicleInvoiceFeign { public class FinVehicleInvoiceRest implements FinVehicleInvoiceFeign {
@Autowired @Autowired
private FinVehicleInvoiceService finVehicleInvoiceService; private FinVehicleInvoiceService finVehicleInvoiceService;
@Resource @Resource
private FileUploadComponent fileUploadComponent; private FileUploadComponent fileUploadComponent;
@Autowired @Autowired
private HttpServletResponse response; private HttpServletResponse response;
private List<FinVehicleInvoiceVo> setVo(List<FinVehicleInvoiceVo> list) { private List<FinVehicleInvoiceVo> setVo(List<FinVehicleInvoiceVo> list) {
for (FinVehicleInvoiceVo finVehicleInvoiceVo : list) { for (FinVehicleInvoiceVo finVehicleInvoiceVo : list) {
if (StringUtils.isNotBlank(finVehicleInvoiceVo.getState())) { if (StringUtils.isNotBlank(finVehicleInvoiceVo.getFilePath())) {
String state = finVehicleInvoiceVo.getState(); String filePath = finVehicleInvoiceVo.getFilePath();
if (state.equals("0")) { List<String> filePaths = new ArrayList<>();
finVehicleInvoiceVo.setState("未开票"); String array[] = filePath.split(",");
}else if (state.equals("1")) { for (int i = 0; i < array.length; i++) {
finVehicleInvoiceVo.setState("已开票"); String urlPrefix = fileUploadComponent.getUrlPrefix();
}else if (state.equals("2")) { filePath = urlPrefix + array[i];
finVehicleInvoiceVo.setState("作废"); filePaths.add(filePath);
} finVehicleInvoiceVo.setFilePaths(filePaths);
} }
if (StringUtils.isNotBlank(finVehicleInvoiceVo.getInvoiceState())) { }
String invoiceState = finVehicleInvoiceVo.getInvoiceState(); }
if (invoiceState.equals("0")) { return list;
finVehicleInvoiceVo.setInvoiceState("未移交"); }
} else if (invoiceState.equals("1")) {
finVehicleInvoiceVo.setInvoiceState("已移交"); @Override
} public ResultBean<PagerVo<FinVehicleInvoiceVo>> listPage(@RequestBody PagerQuery<FinVehicleInvoiceQuery> pq) {
} ResultBean rb = ResultBean.fireFail();
if (StringUtils.isNotBlank(finVehicleInvoiceVo.getFilePath())) { PagerVo<FinVehicleInvoiceVo> pv = finVehicleInvoiceService.listPageVo(pq);
String filePath = finVehicleInvoiceVo.getFilePath(); List<FinVehicleInvoiceVo> records = pv.getRecords();
String urlPrefix = fileUploadComponent.getUrlPrefix(); List<FinVehicleInvoiceVo> finVehicleInvoiceVos = setVo(records);
filePath = urlPrefix + filePath; pv.setRecords(finVehicleInvoiceVos);
finVehicleInvoiceVo.setFilePath(filePath); return rb.success().setData(pv);
} }
}
return list; @Override
} public ResultBean<List<FinVehicleInvoiceVo>> listAll(@RequestBody FinVehicleInvoiceQuery query) {
ResultBean rb = ResultBean.fireFail();
@Override List<FinVehicleInvoiceVo> list = finVehicleInvoiceService.listAllVo(query);
public ResultBean<PagerVo<FinVehicleInvoiceVo>> listPage(@RequestBody PagerQuery<FinVehicleInvoiceQuery> pq){ List<FinVehicleInvoiceVo> finVehicleInvoiceVos = setVo(list);
ResultBean rb = ResultBean.fireFail(); return rb.success().setData(finVehicleInvoiceVos);
PagerVo<FinVehicleInvoiceVo> pv = finVehicleInvoiceService.listPageVo(pq); }
List<FinVehicleInvoiceVo> records = pv.getRecords();
List<FinVehicleInvoiceVo> finVehicleInvoiceVos = setVo(records); @Override
pv.setRecords(finVehicleInvoiceVos); public ResultBean<List<FinVehicleInvoiceVo>> list() {
return rb.success().setData(pv); ResultBean rb = ResultBean.fireFail();
} List<FinVehicleInvoiceVo> list = finVehicleInvoiceService.listVo();
List<FinVehicleInvoiceVo> finVehicleInvoiceVos = setVo(list);
@Override return rb.success().setData(finVehicleInvoiceVos);
public ResultBean<List<FinVehicleInvoiceVo>> listAll(@RequestBody FinVehicleInvoiceQuery query){ }
ResultBean rb = ResultBean.fireFail();
List<FinVehicleInvoiceVo> list = finVehicleInvoiceService.listAllVo(query);
List<FinVehicleInvoiceVo> finVehicleInvoiceVos = setVo(list);
return rb.success().setData(finVehicleInvoiceVos);
}
@Override
public ResultBean<List<FinVehicleInvoiceVo>> list(){
ResultBean rb = ResultBean.fireFail();
List<FinVehicleInvoiceVo> list = finVehicleInvoiceService.listVo();
List<FinVehicleInvoiceVo> finVehicleInvoiceVos = setVo(list);
return rb.success().setData(finVehicleInvoiceVos);
}
@Override
public ResultBean save(FinVehicleInvoiceDto dto){
ResultBean rb = ResultBean.fireFail();
finVehicleInvoiceService.saveOrUpdateDto(dto);
return rb.success();
}
@Override @Override
public ResultBean update(FinVehicleInvoiceDto dto,String sid){ public ResultBean save(FinVehicleInvoiceDto dto) {
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
finVehicleInvoiceService.updateBySid(dto.toMap(),sid); finVehicleInvoiceService.saveOrUpdateDto(dto);
return rb.success(); return rb.success();
} }
@Override @Override
public ResultBean del(String ids){ public ResultBean saveOrUpdate(FinVehicleInvoiceDto dto) {
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();
finVehicleInvoiceService.delByIds(ids); String sid = dto.getSid();
return rb.success(); if (StringUtils.isNotEmpty(sid)) {
} StringBuilder sb = new StringBuilder();
String urlPrefix = fileUploadComponent.getUrlPrefix();
@Override if (null != dto.getFilePaths()) {
public ResultBean<FinVehicleInvoiceVo> fetch(String id){ for (String filePath : dto.getFilePaths()) {
ResultBean rb = ResultBean.fireFail(); String[] split = filePath.split(urlPrefix);
FinVehicleInvoiceVo vo = finVehicleInvoiceService.fetchByIdVo(id); String s = split[1];
return rb.success().setData(vo); sb.append(s).append(",");
} }
sb.delete(sb.length() - 1, sb.length());
@Override dto.setFilePath(sb.toString());
public ResultBean<FinVehicleInvoiceDetailsVo> fetchBySid(String sid){ }
ResultBean rb = ResultBean.fireFail(); if (StringUtils.isNotBlank(dto.getFilePath())) {
FinVehicleInvoiceDetailsVo vo = finVehicleInvoiceService.getInvoiceDetailsBySid(sid); dto.setBillingStateKey("002");
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); dto.setBillingState("已开票");
if (StringUtils.isNotBlank(vo.getState())) { }
String state = vo.getState(); if (StringUtils.isNotEmpty(dto.getVinNo())) {
if (state.equals("0")) { String VIN = dto.getVinNo();
vo.setState("未开票"); dto.setVIN(VIN);
}else if (state.equals("1")) { }
vo.setState("已开票"); finVehicleInvoiceService.updateBySid(dto, sid);
}else if (state.equals("2")) { } else {
vo.setState("作废"); FinVehicleInvoice finVehicleInvoice = new FinVehicleInvoice();
} String sidAdd = finVehicleInvoice.getSid();
} BeanUtil.copyProperties(dto, finVehicleInvoice);
if (StringUtils.isNotBlank(vo.getCreateTime())) { finVehicleInvoice.setSid(sidAdd);
String createTime = vo.getCreateTime(); StringBuilder sb = new StringBuilder();
try { String urlPrefix = fileUploadComponent.getUrlPrefix();
Date date = sdf.parse(createTime); if (null != dto.getFilePaths()) {
String createTimeBySdf = sdf.format(date); for (String filePath : dto.getFilePaths()) {
vo.setCreateTime(createTimeBySdf); String[] split = filePath.split(urlPrefix);
} catch (ParseException e) { String s = split[1];
e.printStackTrace(); sb.append(s).append(",");
} }
} sb.delete(sb.length() - 1, sb.length());
if (StringUtils.isNotBlank(vo.getFilePath())) { finVehicleInvoice.setFilePath(sb.toString());
String filePath = vo.getFilePath(); finVehicleInvoice.setBillingStateKey("002");
String urlPrefix = fileUploadComponent.getUrlPrefix(); finVehicleInvoice.setBillingState("已开票");
filePath = urlPrefix + filePath; }
vo.setFilePath(filePath); if (StringUtils.isNotEmpty(dto.getVinNo())) {
} String VIN = dto.getVinNo();
return rb.success().setData(vo); finVehicleInvoice.setVIN(VIN);
} }
finVehicleInvoiceService.save(finVehicleInvoice);
@Override }
public void exportExcel(FinVehicleInvoiceQuery query) { return rb.success();
//得到所有要导出的数据 }
List<FinVehicleInvoiceExportVo> invoiceExportVoList = finVehicleInvoiceService.listExcel(query);
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); @Override
for (FinVehicleInvoiceExportVo invoiceExportVo : invoiceExportVoList) { public ResultBean del(String ids) {
if (StringUtils.isNotBlank(invoiceExportVo.getState())) { ResultBean rb = ResultBean.fireFail();
String state = invoiceExportVo.getState(); finVehicleInvoiceService.delByIds(ids);
if (state.equals("0")) { return rb.success();
invoiceExportVo.setState("未开票"); }
}else if (state.equals("1")) {
invoiceExportVo.setState("已开票"); @Override
}else if (state.equals("2")) { public ResultBean<FinVehicleInvoiceVo> fetch(String id) {
invoiceExportVo.setState("作废"); ResultBean rb = ResultBean.fireFail();
} FinVehicleInvoiceVo vo = finVehicleInvoiceService.fetchByIdVo(id);
} return rb.success().setData(vo);
if (StringUtils.isNotBlank(invoiceExportVo.getInvoiceState())) { }
String invoiceState = invoiceExportVo.getInvoiceState();
if (invoiceState.equals("0")) { @Override
invoiceExportVo.setInvoiceState("未移交"); public ResultBean<FinVehicleInvoiceDetailsVo> fetchBySid(String sid) {
} else if (invoiceState.equals("1")) { ResultBean rb = ResultBean.fireFail();
invoiceExportVo.setInvoiceState("已移交"); FinVehicleInvoiceDetailsVo vo = finVehicleInvoiceService.getInvoiceDetailsBySid(sid);
} SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
} if (StringUtils.isNotBlank(vo.getCreateTime())) {
if (StringUtils.isNotBlank(invoiceExportVo.getCreateTime())) { String createTime = vo.getCreateTime();
String createTime = invoiceExportVo.getCreateTime(); try {
try { Date date = sdf.parse(createTime);
Date date = sdf.parse(createTime); String createTimeBySdf = sdf.format(date);
String createTimeBySdf = sdf.format(date); vo.setCreateTime(createTimeBySdf);
invoiceExportVo.setCreateTime(createTimeBySdf); } catch (ParseException e) {
} catch (ParseException e) { e.printStackTrace();
e.printStackTrace(); }
} }
} if (StringUtils.isNotBlank(vo.getFilePath())) {
} String filePath = vo.getFilePath();
//定义导出的excel名字 List<String> filePaths = new ArrayList<>();
String excelName = "车辆发票信息列表"; String array[] = filePath.split(",");
String fileNameURL = ""; for (int i = 0; i < array.length; i++) {
try { String urlPrefix = fileUploadComponent.getUrlPrefix();
fileNameURL = URLEncoder.encode(excelName, "UTF-8"); filePath = urlPrefix + array[i];
} catch (UnsupportedEncodingException e) { filePaths.add(filePath);
e.printStackTrace(); vo.setFilePaths(filePaths);
} }
//导出车辆管理列表 }
ExportExcelUtils.export(fileNameURL, invoiceExportVoList, FinVehicleInvoiceExportVo.class, response); return rb.success().setData(vo);
} }
@Override @Override
public ResultBean pictureUpload(String sid,MultipartFile file) { public void exportExcel(FinVehicleInvoiceQuery query) {
ResultBean rb = ResultBean.fireFail(); //得到所有要导出的数据
if (file == null || file.isEmpty()) { List<FinVehicleInvoiceExportVo> invoiceExportVoList = finVehicleInvoiceService.listExcel(query);
return rb.setMsg("文件为空"); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
} for (FinVehicleInvoiceExportVo invoiceExportVo : invoiceExportVoList) {
rb = fileUploadComponent.uploadFile(file); if (StringUtils.isNotBlank(invoiceExportVo.getCreateTime())) {
FileUploadResult data = (FileUploadResult) rb.getData(); String createTime = invoiceExportVo.getCreateTime();
FinVehicleInvoiceDetailsVo invoice= finVehicleInvoiceService.getInvoiceDetailsBySid(sid); try {
invoice.setFilePath(data.getFilePath()); Date date = sdf.parse(createTime);
String filePath = invoice.getFilePath(); String createTimeBySdf = sdf.format(date);
invoice.setState("1"); invoiceExportVo.setCreateTime(createTimeBySdf);
String state = invoice.getState(); } catch (ParseException e) {
Boolean isSuccess = finVehicleInvoiceService.updatePictureBySid(state,filePath,sid); e.printStackTrace();
if (isSuccess) { }
return rb.success().setMsg("上传成功"); }
}else { }
return rb.fail().setMsg("上传失败"); //定义导出的excel名字
} String excelName = "车辆发票信息列表";
} String fileNameURL = "";
try {
fileNameURL = URLEncoder.encode(excelName, "UTF-8");
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
}
//导出车辆管理列表
ExportExcelUtils.export(fileNameURL, invoiceExportVoList, FinVehicleInvoiceExportVo.class, response);
}
} }

63
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<FinVehicleInvoi
if (StringUtils.isNotBlank(query.getInvoiceTitle())) { if (StringUtils.isNotBlank(query.getInvoiceTitle())) {
qw.like("invoiceTitle", query.getInvoiceTitle()); qw.like("invoiceTitle", query.getInvoiceTitle());
} }
if (StringUtils.isNotBlank(query.getInvoiceTypeKey())) {
qw.like("invoiceTypeKey", query.getInvoiceTypeKey());
}
if (StringUtils.isNotBlank(query.getInvoiceType())) { if (StringUtils.isNotBlank(query.getInvoiceType())) {
qw.like("invoiceType", query.getInvoiceType()); qw.like("invoiceType", query.getInvoiceType());
} }
@ -60,26 +63,33 @@ public class FinVehicleInvoiceService extends MybatisBaseService<FinVehicleInvoi
if (StringUtils.isNotBlank(query.getCustomerName())) { if (StringUtils.isNotBlank(query.getCustomerName())) {
qw.like("customerName", query.getCustomerName()); qw.like("customerName", query.getCustomerName());
} }
if (StringUtils.isNotBlank(query.getVIN())) { if (StringUtils.isNotBlank(query.getVinNo())) {
qw.like("VIN", query.getVIN()); qw.like("VIN", query.getVinNo());
}
if (StringUtils.isNotBlank(query.getTransferState())) {
qw.eq("transferState", query.getTransferState());
} }
if (StringUtils.isNotBlank(query.getState())) { if (StringUtils.isNotBlank(query.getBillingState())) {
qw.eq("state", query.getState()); qw.eq("billingState", query.getBillingState());
} }
if (StringUtils.isNotBlank(query.getInvoiceState())) { if (StringUtils.isNotBlank(query.getTransferStateKey())) {
qw.eq("invoiceState", query.getInvoiceState()); qw.eq("transferStateKey", query.getTransferStateKey());
} }
if (StringUtils.isNotBlank(query.getInvoiceName())) { if (StringUtils.isNotBlank(query.getBillingStateKey())) {
qw.like("invoiceName", query.getInvoiceName()); qw.eq("billingStateKey", query.getBillingStateKey());
}
if (StringUtils.isNotBlank(query.getInvoicingName())) {
qw.like("invoicingName", query.getInvoicingName());
} }
if (StringUtils.isNotBlank(query.getInvoiceCode())) { if (StringUtils.isNotBlank(query.getInvoiceCode())) {
qw.like("invoiceCode", query.getInvoiceCode()); qw.like("invoiceCode", query.getInvoiceCode());
} }
String createStartTime = query.getCreateStartTime(); String createStartTime = query.getCreateStartTime();
String createEndTime = query.getCreateEndTime(); String createEndTime = query.getCreateEndTime();
qw.apply(org.apache.commons.lang3.StringUtils.isNotEmpty(createStartTime), "date_format (vi.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%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 (vi.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%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; return qw;
} }
@ -123,32 +133,42 @@ public class FinVehicleInvoiceService extends MybatisBaseService<FinVehicleInvoi
if (StringUtils.isNotBlank(query.getInvoiceType())) { if (StringUtils.isNotBlank(query.getInvoiceType())) {
qw.like("invoiceType", query.getInvoiceType()); qw.like("invoiceType", query.getInvoiceType());
} }
if (StringUtils.isNotBlank(query.getInvoiceTypeKey())) {
qw.like("invoiceTypeKey", query.getInvoiceTypeKey());
}
if (StringUtils.isNotBlank(query.getContractNo())) { if (StringUtils.isNotBlank(query.getContractNo())) {
qw.like("contractNo", query.getContractNo()); qw.like("contractNo", query.getContractNo());
} }
if (StringUtils.isNotBlank(query.getCustomerName())) { if (StringUtils.isNotBlank(query.getCustomerName())) {
qw.like("customerName", query.getCustomerName()); qw.like("customerName", query.getCustomerName());
} }
if (StringUtils.isNotBlank(query.getVIN())) { if (StringUtils.isNotBlank(query.getVinNo())) {
qw.like("VIN", query.getVIN()); qw.like("VIN", query.getVinNo());
} }
if (StringUtils.isNotBlank(query.getState())) { if (StringUtils.isNotBlank(query.getTransferState())) {
qw.eq("state", query.getState()); qw.eq("transferState", query.getTransferState());
} }
if (StringUtils.isNotBlank(query.getInvoiceState())) { if (StringUtils.isNotBlank(query.getBillingState())) {
qw.eq("invoiceState", query.getInvoiceState()); qw.eq("billingState", query.getBillingState());
} }
if (StringUtils.isNotBlank(query.getInvoiceName())) { if (StringUtils.isNotBlank(query.getTransferStateKey())) {
qw.like("invoiceName", query.getInvoiceName()); qw.eq("transferStateKey", query.getTransferStateKey());
}
if (StringUtils.isNotBlank(query.getBillingStateKey())) {
qw.eq("billingStateKey", query.getBillingStateKey());
}
if (StringUtils.isNotBlank(query.getInvoicingName())) {
qw.like("invoicingName", query.getInvoicingName());
} }
if (StringUtils.isNotBlank(query.getInvoiceCode())) { if (StringUtils.isNotBlank(query.getInvoiceCode())) {
qw.like("invoiceCode", query.getInvoiceCode()); qw.like("invoiceCode", query.getInvoiceCode());
} }
String createStartTime = query.getCreateStartTime(); String createStartTime = query.getCreateStartTime();
String createEndTime = query.getCreateEndTime(); String createEndTime = query.getCreateEndTime();
qw.apply(org.apache.commons.lang3.StringUtils.isNotEmpty(createStartTime), "date_format (vi.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%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 (vi.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%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<FinVehicleInvoiceExportVo> invoiceExportVoList = baseMapper.selByExcel(qw); List<FinVehicleInvoiceExportVo> invoiceExportVoList = baseMapper.selByExcel(qw);
int id = 1; int id = 1;
for (FinVehicleInvoiceExportVo invoiceExportVo : invoiceExportVoList) { for (FinVehicleInvoiceExportVo invoiceExportVo : invoiceExportVoList) {
@ -163,7 +183,4 @@ public class FinVehicleInvoiceService extends MybatisBaseService<FinVehicleInvoi
return vo; return vo;
} }
public Boolean updatePictureBySid(String filePath,String state,String sid) {
return baseMapper.updatePictureBySid(filePath,state,sid);
}
} }
Loading…
Cancel
Save