Browse Source

Merge remote-tracking branch 'origin/master'

zhanglei
God 2 years ago
parent
commit
28d24f06d3
  1. 3
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BaseInfoDto.java
  2. 24
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java
  3. 16
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java
  4. BIN
      anrui-base/anrui-base-biz/src/main/resources/static/excel/车型调价模板.xls
  5. 11
      anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/relation/selectpackage.vue
  6. 8
      anrui-buscenter/anrui-buscenter-ui/src/views/discountpackagehandover/discountpackagehandover.vue
  7. 9
      anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/relation/selectpackage.vue
  8. 3
      anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanByJinRong.vue
  9. 3
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillfile/FinBillFileFeign.java
  10. 26
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinInvoiceInformationVo.java
  11. 6
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceDetailsVo.java
  12. 9
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceDto.java
  13. 12
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceFeign.java
  14. 9
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceFeignFallback.java
  15. 2
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileMapper.java
  16. 71
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileMapper.xml
  17. 192
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileService.java
  18. 9
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.java
  19. 88
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.xml
  20. 17
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceRest.java
  21. 88
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java
  22. 4
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DisBaseInfoDto.java

3
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BaseInfoDto.java

@ -32,7 +32,8 @@ public class BaseInfoDto implements Dto {
private String managementDetailAddress; private String managementDetailAddress;
@ApiModelProperty(value = "实际经营地址code") @ApiModelProperty(value = "实际经营地址code")
private String managementDetailAddressCode; // private String managementDetailAddressCode;
private String managementAddressCode;
@ApiModelProperty(value = "实际经营地址省") @ApiModelProperty(value = "实际经营地址省")
private String managementDetailAddressProvince; private String managementDetailAddressProvince;

24
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java

@ -616,10 +616,10 @@ public class BaseDistributorService extends MybatisBaseService<BaseDistributorMa
vo.setInvoiceInfo(baseInvoiceInfoVo); vo.setInvoiceInfo(baseInvoiceInfoVo);
BaseFileVo baseFileVo = new BaseFileVo(); BaseFileVo baseFileVo = new BaseFileVo();
//附件清单 //附件清单
List<String> businessLicense = baseDistributorAppendixService.selByLinkSidAndAttachTypeOne(sid, "0001"); List<String> businessLicense = baseDistributorAppendixService.selByLinkSidAndAttachTypeOne(sid, "营业执照");
List<String> transportPermit = baseDistributorAppendixService.selByLinkSidAndAttachTypeOne(sid, "0002"); List<String> transportPermit = baseDistributorAppendixService.selByLinkSidAndAttachTypeOne(sid, "道路运输许可证");
List<String> corporateIdCard = baseDistributorAppendixService.selByLinkSidAndAttachTypeOne(sid, "0003"); List<String> corporateIdCard = baseDistributorAppendixService.selByLinkSidAndAttachTypeOne(sid, "法人身份证");
List<String> otherInfo = baseDistributorAppendixService.selByLinkSidAndAttachTypeOne(sid, "0004"); List<String> otherInfo = baseDistributorAppendixService.selByLinkSidAndAttachTypeOne(sid, "其他资料");
baseFileVo.setBusinessLicense(businessLicense); baseFileVo.setBusinessLicense(businessLicense);
baseFileVo.setOtherInfo(otherInfo); baseFileVo.setOtherInfo(otherInfo);
baseFileVo.setCorporateIdCard(corporateIdCard); baseFileVo.setCorporateIdCard(corporateIdCard);
@ -804,10 +804,10 @@ public class BaseDistributorService extends MybatisBaseService<BaseDistributorMa
return rb.setMsg("该经销商不存在"); return rb.setMsg("该经销商不存在");
} }
BaseFileVo vo = new BaseFileVo(); BaseFileVo vo = new BaseFileVo();
List<String> businessLicense = baseDistributorAppendixService.selByLinkSidAndAttachTypeOne(sid, "0001"); List<String> businessLicense = baseDistributorAppendixService.selByLinkSidAndAttachTypeOne(sid, "营业执照");
List<String> transportPermit = baseDistributorAppendixService.selByLinkSidAndAttachTypeOne(sid, "0002"); List<String> transportPermit = baseDistributorAppendixService.selByLinkSidAndAttachTypeOne(sid, "道路运输许可证");
List<String> corporateIdCard = baseDistributorAppendixService.selByLinkSidAndAttachTypeOne(sid, "0003"); List<String> corporateIdCard = baseDistributorAppendixService.selByLinkSidAndAttachTypeOne(sid, "法人身份证");
List<String> otherInfo = baseDistributorAppendixService.selByLinkSidAndAttachTypeOne(sid, "0004"); List<String> otherInfo = baseDistributorAppendixService.selByLinkSidAndAttachTypeOne(sid, "其他资料");
vo.setBusinessLicense(businessLicense); vo.setBusinessLicense(businessLicense);
vo.setOtherInfo(otherInfo); vo.setOtherInfo(otherInfo);
vo.setCorporateIdCard(corporateIdCard); vo.setCorporateIdCard(corporateIdCard);
@ -828,17 +828,17 @@ public class BaseDistributorService extends MybatisBaseService<BaseDistributorMa
List<String> corporateIdCard = dto.getCorporateIdCard(); List<String> corporateIdCard = dto.getCorporateIdCard();
List<String> otherInfo = dto.getOtherInfo(); List<String> otherInfo = dto.getOtherInfo();
if (!businessLicense.isEmpty()) {//0001 if (!businessLicense.isEmpty()) {//0001
baseDistributorAppendixService.insertAppendix(dto.getDistributorSid(), businessLicense, "0001"); baseDistributorAppendixService.insertAppendix(dto.getDistributorSid(), businessLicense, "营业执照");
} }
if (!transportPermit.isEmpty()) {//0002 if (!transportPermit.isEmpty()) {//0002
baseDistributorAppendixService.insertAppendix(dto.getDistributorSid(), transportPermit, "0002"); baseDistributorAppendixService.insertAppendix(dto.getDistributorSid(), transportPermit, "道路运输许可证");
} }
if (!corporateIdCard.isEmpty()) {//0003 if (!corporateIdCard.isEmpty()) {//0003
baseDistributorAppendixService.insertAppendix(dto.getDistributorSid(), corporateIdCard, "0003"); baseDistributorAppendixService.insertAppendix(dto.getDistributorSid(), corporateIdCard, "法人身份证");
} }
if (!otherInfo.isEmpty()) {//0004 if (!otherInfo.isEmpty()) {//0004
baseDistributorAppendixService.insertAppendix(dto.getDistributorSid(), otherInfo, "0004"); baseDistributorAppendixService.insertAppendix(dto.getDistributorSid(), otherInfo, "其他资料");
} }
return rb.success(); return rb.success();

16
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java

@ -722,6 +722,22 @@ public class BaseModelModpriceService extends MybatisBaseService<BaseModelModpri
importVo.setOtherConfig(modpriceImportVo.getOtherConfig()); importVo.setOtherConfig(modpriceImportVo.getOtherConfig());
importVo.setModelSid(modpriceImportVo.getModelSid()); importVo.setModelSid(modpriceImportVo.getModelSid());
importVo.setConfigSid(modpriceImportVo.getConfigSid()); importVo.setConfigSid(modpriceImportVo.getConfigSid());
if (StringUtils.isNotBlank(importVo.getGuidedPrice()) && importVo.getGuidedPrice().contains(".")) {
String guidedPrice = importVo.getGuidedPrice();
String substring = guidedPrice.substring(0, guidedPrice.lastIndexOf("."));
String substringLast = guidedPrice.substring(guidedPrice.lastIndexOf(".") + 1);
if ("0".equals(substringLast) || "00".equals(substringLast)) {
importVo.setGuidedPrice(substring);
}
}
if (StringUtils.isNotBlank(importVo.getManufactorSettlementPrice()) && importVo.getManufactorSettlementPrice().contains(".")) {
String settlementPrice = importVo.getManufactorSettlementPrice();
String substring = settlementPrice.substring(0, settlementPrice.lastIndexOf("."));
String substringLast = settlementPrice.substring(settlementPrice.lastIndexOf(".") + 1);
if ("0".equals(substringLast) || "00".equals(substringLast)) {
importVo.setManufactorSettlementPrice(substring);
}
}
importVoList.add(importVo); importVoList.add(importVo);
vehTypeAndConfigMap.put(importVo.getRankNo(), importVo.getVehicleTypeCode() + importVo.getConfigCode() + importVo.getGuidedPrice() + importVo.getManufactorSettlementPrice()); vehTypeAndConfigMap.put(importVo.getRankNo(), importVo.getVehicleTypeCode() + importVo.getConfigCode() + importVo.getGuidedPrice() + importVo.getManufactorSettlementPrice());
ranks.add(importVo.getRankNo()); ranks.add(importVo.getRankNo());

BIN
anrui-base/anrui-base-biz/src/main/resources/static/excel/调价申请模板.xls → anrui-base/anrui-base-biz/src/main/resources/static/excel/车型调价模板.xls

Binary file not shown.

11
anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/relation/selectpackage.vue

@ -26,7 +26,7 @@
</el-table-column> </el-table-column>
<el-table-column label="本次赠送数量" align="center" width="200"> <el-table-column label="本次赠送数量" align="center" width="200">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input :disabled="scope.row.discountLeaveNum == '0'" v-model="scope.row.discountNum" placeholder=""/> <el-input :disabled="scope.row.discountLeaveNum == '0'" @change="changeByDiscountNum($event, scope.row)" v-model="scope.row.discountNum" placeholder=""/>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -105,6 +105,13 @@ export default {
this.list = aa this.list = aa
this.vinSid = vinSid this.vinSid = vinSid
}, },
changeByDiscountNum(val, row) {
if (parseInt(row.discountLeaveNum) - parseInt(val) < 0) {
row.discountNum = row.discountLeaveNum
} else {
row.discountNum = val
}
},
doCreate() { doCreate() {
for (var i = 0; i < this.list.length; i++) { for (var i = 0; i < this.list.length; i++) {
if (this.list[i].discountNum === '') { if (this.list[i].discountNum === '') {
@ -115,7 +122,7 @@ export default {
}, },
doClose() { doClose() {
this.$emit('doback') this.$emit('doback')
}, }
} }
} }
</script> </script>

8
anrui-buscenter/anrui-buscenter-ui/src/views/discountpackagehandover/discountpackagehandover.vue

@ -43,9 +43,11 @@
<el-table-column width="60" label="序号" type="index" :index="indexMethod" align="center"/> <el-table-column width="60" label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column label="操作" width="180" align="center"> <el-table-column label="操作" width="180" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="primary" size="mini" @click="handLook(scope.row)">查看</el-button> <div style="display: flex;flex-direction: row;justify-content: space-between;align-items: center">
<div class="upload_img"> <el-button type="primary" size="mini" @click="handLook(scope.row)">查看</el-button>
<uploadFile ref="uploadMoreImg" v-model="imgList" bucket="map" @eett="backData(scope.row)" :upload-data="{type:'0001'}"></uploadFile> <div style="padding-left: 10px">
<uploadFile ref="uploadMoreImg" v-model="imgList" bucket="map" @eett="backData(scope.row)" :upload-data="{type:'0001'}"></uploadFile>
</div>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>

9
anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/relation/selectpackage.vue

@ -26,7 +26,7 @@
</el-table-column> </el-table-column>
<el-table-column label="本次赠送数量" align="center" width="200"> <el-table-column label="本次赠送数量" align="center" width="200">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.discountNum" placeholder=""/> <el-input v-model="scope.row.discountNum" @change="changeByDiscountNum($event, scope.row)" placeholder=""/>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -105,6 +105,13 @@ export default {
this.list = aa this.list = aa
this.vinSid = vinSid this.vinSid = vinSid
}, },
changeByDiscountNum(val, row) {
if (parseInt(row.discountLeaveNum) - parseInt(val) < 0) {
row.discountNum = row.discountLeaveNum
} else {
row.discountNum = val
}
},
doCreate() { doCreate() {
for (var i = 0; i < this.list.length; i++) { for (var i = 0; i < this.list.length; i++) {
if (this.list[i].discountNum === '') { if (this.list[i].discountNum === '') {

3
anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanByJinRong.vue

@ -660,9 +660,6 @@ export default {
align-items: center; align-items: center;
margin-bottom: 1px; margin-bottom: 1px;
} }
.addinputInfo {
margin-left: 120px !important;
}
.tlineheightb { .tlineheightb {
display: flex; display: flex;
flex-direction: row; flex-direction: row;

3
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillfile/FinBillFileFeign.java

@ -80,4 +80,7 @@ public interface FinBillFileFeign {
@PostMapping("/fetchFileBySid") @PostMapping("/fetchFileBySid")
@ResponseBody @ResponseBody
public ResultBean<List<FinBillFileAppendxVo>> fetchFileBySid(@RequestParam("billAppSid") String billAppSid,@RequestParam("fileType") String fileType); public ResultBean<List<FinBillFileAppendxVo>> fetchFileBySid(@RequestParam("billAppSid") String billAppSid,@RequestParam("fileType") String fileType);
} }

26
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinInvoiceInformationVo.java

@ -0,0 +1,26 @@
package com.yxt.anrui.fin.api.finvehicleinvoice;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author Administrator
* @description
* @date 2023/5/9 14:54
*/
@Data
public class FinInvoiceInformationVo implements Vo {
@ApiModelProperty("开票名称")
private String invoicingName;
@ApiModelProperty("地址")
private String address;
@ApiModelProperty("联系电话")
private String telPhone;
@ApiModelProperty("开户行")
private String openingBank;
@ApiModelProperty("银行账号")
private String bankNum;
@ApiModelProperty("纳税人识别号")
private String taxpayerNo;
}

6
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceDetailsVo.java

@ -64,4 +64,10 @@ public class FinVehicleInvoiceDetailsVo implements Vo {
private Date transferTime; private Date transferTime;
@ApiModelProperty("图片地址集合") @ApiModelProperty("图片地址集合")
private List<String> filePaths; private List<String> filePaths;
@ApiModelProperty("开票申请附件")
private List<String> billingFilePaths;
@ApiModelProperty("合格证照片")
private List<String> certificatePaths;
@ApiModelProperty("纳税人识别号")
private String taxpayerNo;
} }

9
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceDto.java

@ -30,10 +30,10 @@ public class FinVehicleInvoiceDto implements Dto {
private String sid; // sid private String sid; // sid
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty("创建时间") @ApiModelProperty("创建时间")
private Date createTime; private Date createTime;
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty("修改时间") @ApiModelProperty("修改时间")
private Date modifyTime; private Date modifyTime;
@ApiModelProperty("是否可用:1可用,0不可用") @ApiModelProperty("是否可用:1可用,0不可用")
@ -58,7 +58,7 @@ public class FinVehicleInvoiceDto implements Dto {
private String vehicleType; private String vehicleType;
@ApiModelProperty("车辆金额") @ApiModelProperty("车辆金额")
private BigDecimal vehiclAmount; private BigDecimal vehiclAmount;
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@ApiModelProperty("最大发票开票日期") @ApiModelProperty("最大发票开票日期")
private Date invoiceDate; private Date invoiceDate;
@ApiModelProperty("发票号") @ApiModelProperty("发票号")
@ -113,4 +113,7 @@ public class FinVehicleInvoiceDto implements Dto {
private String taxpayerNo; private String taxpayerNo;
@ApiModelProperty("开票来源sid") @ApiModelProperty("开票来源sid")
private String billingSid; private String billingSid;
@ApiModelProperty("开票申请附件")
private List<String> billingFilePaths;
} }

12
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceFeign.java

@ -9,6 +9,7 @@ import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import java.util.List; import java.util.List;
/** /**
@ -69,4 +70,15 @@ public interface FinVehicleInvoiceFeign {
@ResponseBody @ResponseBody
public void exportExcel(@RequestBody FinVehicleInvoiceQuery query); public void exportExcel(@RequestBody FinVehicleInvoiceQuery query);
@ApiOperation("作废")
@PostMapping("/cancellation")
public ResultBean cancellation(@RequestBody String[] sids);
@ApiOperation("获取开票信息详情记录")
@GetMapping("/invoiceInformation/{sid}")
@ResponseBody
public ResultBean<FinInvoiceInformationVo> invoiceInformation(@PathVariable("sid") String sid);
} }

9
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceFeignFallback.java

@ -74,5 +74,14 @@ public class FinVehicleInvoiceFeignFallback implements FinVehicleInvoiceFeign {
} }
@Override
public ResultBean cancellation(String[] ids) {
return null;
}
@Override
public ResultBean<FinInvoiceInformationVo> invoiceInformation(String sid) {
return null;
}
} }

2
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileMapper.java

@ -88,4 +88,6 @@ public interface FinBillFileMapper extends BaseMapper<FinBillFile> {
@Select("select * from fin_bill_file where billAppSid = #{sid} and attachType = '005'") @Select("select * from fin_bill_file where billAppSid = #{sid} and attachType = '005'")
List<FinBillFileVo> fetchfjBySid(String sid); List<FinBillFileVo> fetchfjBySid(String sid);
List<FinBillFileVo> fetchFileByBillSid(@Param("sid") String sid);
} }

71
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileMapper.xml

@ -1,43 +1,44 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<!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.finbillfile.FinBillFileMapper"> <mapper namespace="com.yxt.anrui.fin.biz.finbillfile.FinBillFileMapper">
<!-- <where> ${ew.sqlSegment} </where>--> <!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} --> <!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.anrui.fin.api.finbillfile.FinBillFileVo"> <select id="selectPageVo" resultType="com.yxt.anrui.fin.api.finbillfile.FinBillFileVo">
SELECT * FROM fin_bill_file <where> ${ew.sqlSegment} </where> SELECT * FROM fin_bill_file
</select> <where>${ew.sqlSegment}</where>
</select>
<select id="selectListAllVo" resultType="com.yxt.anrui.fin.api.finbillfile.FinBillFileVo"> <select id="selectListAllVo" resultType="com.yxt.anrui.fin.api.finbillfile.FinBillFileVo">
SELECT * FROM fin_bill_file <where> ${ew.sqlSegment} </where> SELECT * FROM fin_bill_file
</select> <where>${ew.sqlSegment}</where>
</select>
<select id="fetchBillFileBySid" resultType="com.yxt.anrui.fin.api.finbillfile.FinBillFileVo"> <select id="fetchBillFileBySid" resultType="com.yxt.anrui.fin.api.finbillfile.FinBillFileVo">
SELECT SELECT *
* FROM fin_bill_file
FROM WHERE billAppSid = #{sid}
fin_bill_file GROUP BY fileType
WHERE billAppSid = #{sid} </select>
GROUP BY fileType
</select>
<select id="fetchFileBySid" resultType="com.yxt.anrui.fin.api.finbillfile.FinBillFileDetailsVo"> <select id="fetchFileBySid" resultType="com.yxt.anrui.fin.api.finbillfile.FinBillFileDetailsVo">
SELECT SELECT *
* FROM fin_bill_file
FROM WHERE billAppSid = #{billAppSid}
fin_bill_file AND fileType = #{fileType}
WHERE billAppSid = #{billAppSid} </select>
AND fileType = #{fileType}
</select>
<select id="groupByList" resultType="com.yxt.anrui.fin.api.finbillfile.FinBillFileVo"> <select id="groupByList" resultType="com.yxt.anrui.fin.api.finbillfile.FinBillFileVo">
SELECT SELECT fileType,
fileType, createTime,
createTime, createByName
createByName FROM fin_bill_file
FROM WHERE billAppSid = #{sid}
fin_bill_file GROUP BY fileType
WHERE billAppSid = #{sid} ORDER BY createTime DESC
GROUP BY fileType </select>
ORDER BY createTime DESC <select id="fetchFileByBillSid" resultType="com.yxt.anrui.fin.api.finbillfile.FinBillFileVo">
</select> SELECT *
FROM fin_bill_file
WHERE billAppSid = #{sid}
</select>
</mapper> </mapper>

192
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileService.java

@ -61,108 +61,112 @@ import java.util.List;
@Service @Service
public class FinBillFileService extends MybatisBaseService<FinBillFileMapper, FinBillFile> { public class FinBillFileService extends MybatisBaseService<FinBillFileMapper, FinBillFile> {
@Autowired @Autowired
private FileUploadComponent fileUploadComponent; private FileUploadComponent fileUploadComponent;
@Autowired @Autowired
private CommonAppendixFeign commonAppendixFeign; private CommonAppendixFeign commonAppendixFeign;
private QueryWrapper<FinBillFile> createQueryWrapper(FinBillFileQuery query) { private QueryWrapper<FinBillFile> createQueryWrapper(FinBillFileQuery query) {
// todo: 这里根据具体业务调整查询条件 // todo: 这里根据具体业务调整查询条件
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); // 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<FinBillFile> qw = new QueryWrapper<>(); QueryWrapper<FinBillFile> qw = new QueryWrapper<>();
return qw; return qw;
} }
public PagerVo<FinBillFileVo> listPageVo(PagerQuery<FinBillFileQuery> pq) { public PagerVo<FinBillFileVo> listPageVo(PagerQuery<FinBillFileQuery> pq) {
FinBillFileQuery query = pq.getParams(); FinBillFileQuery query = pq.getParams();
QueryWrapper<FinBillFile> qw = createQueryWrapper(query); QueryWrapper<FinBillFile> qw = createQueryWrapper(query);
IPage<FinBillFile> page = PagerUtil.queryToPage(pq); IPage<FinBillFile> page = PagerUtil.queryToPage(pq);
IPage<FinBillFileVo> pagging = baseMapper.selectPageVo(page, qw); IPage<FinBillFileVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<FinBillFileVo> p = PagerUtil.pageToVo(pagging, null); PagerVo<FinBillFileVo> p = PagerUtil.pageToVo(pagging, null);
return p; return p;
} }
public void saveOrUpdateDto(FinBillFileDto dto){ public void saveOrUpdateDto(FinBillFileDto dto) {
String dtoSid = dto.getSid(); String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) { if (StringUtils.isBlank(dtoSid)) {
this.insertByDto(dto); this.insertByDto(dto);
return; return;
} }
this.updateByDto(dto); this.updateByDto(dto);
} }
public void insertByDto(FinBillFileDto dto){ public void insertByDto(FinBillFileDto dto) {
FinBillFile entity = new FinBillFile(); FinBillFile entity = new FinBillFile();
BeanUtil.copyProperties(dto, entity, "id", "sid"); BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.insert(entity); baseMapper.insert(entity);
} }
public void updateByDto(FinBillFileDto dto){ public void updateByDto(FinBillFileDto dto) {
String dtoSid = dto.getSid(); String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) { if (StringUtils.isBlank(dtoSid)) {
return; return;
} }
FinBillFile entity = fetchBySid(dtoSid); FinBillFile entity = fetchBySid(dtoSid);
BeanUtil.copyProperties(dto, entity, "id", "sid"); BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity); baseMapper.updateById(entity);
} }
public FinBillFileDetailsVo fetchDetailsVoBySid(String sid){ public FinBillFileDetailsVo fetchDetailsVoBySid(String sid) {
FinBillFile entity = fetchBySid(sid); FinBillFile entity = fetchBySid(sid);
FinBillFileDetailsVo vo = new FinBillFileDetailsVo(); FinBillFileDetailsVo vo = new FinBillFileDetailsVo();
BeanUtil.copyProperties(entity, vo); BeanUtil.copyProperties(entity, vo);
return vo; return vo;
} }
public void deleteByFinAppSid(String dtoSid) { public void deleteByFinAppSid(String dtoSid) {
baseMapper.deleteByFinAppSid(dtoSid); baseMapper.deleteByFinAppSid(dtoSid);
} }
public List<FinBillFileVo> fetchBillFileBySid(String sid) { public List<FinBillFileVo> fetchBillFileBySid(String sid) {
return baseMapper.fetchBillFileBySid(sid); return baseMapper.fetchBillFileBySid(sid);
} }
public List<FinBillFileAppendxVo> fetchFileBySid(String billAppSid, String fileType) { public List<FinBillFileAppendxVo> fetchFileBySid(String billAppSid, String fileType) {
ArrayList<FinBillFileAppendxVo> finBillFileAppendxVos = new ArrayList<>(); ArrayList<FinBillFileAppendxVo> finBillFileAppendxVos = new ArrayList<>();
List<FinBillFileDetailsVo> finBillFileDetailsVos = baseMapper.fetchFileBySid(billAppSid, fileType); List<FinBillFileDetailsVo> finBillFileDetailsVos = baseMapper.fetchFileBySid(billAppSid, fileType);
String path = ""; String path = "";
for (FinBillFileDetailsVo finBillFileDetailsVo : finBillFileDetailsVos) { for (FinBillFileDetailsVo finBillFileDetailsVo : finBillFileDetailsVos) {
FinBillFileAppendxVo finBillFileAppendxVo = new FinBillFileAppendxVo(); FinBillFileAppendxVo finBillFileAppendxVo = new FinBillFileAppendxVo();
String fileUrl = finBillFileDetailsVo.getFileUrl(); String fileUrl = finBillFileDetailsVo.getFileUrl();
String urlPrefix = fileUploadComponent.getUrlPrefix(); String urlPrefix = fileUploadComponent.getUrlPrefix();
path = urlPrefix + fileUrl; path = urlPrefix + fileUrl;
String fileSid = finBillFileDetailsVo.getFileSid(); String fileSid = finBillFileDetailsVo.getFileSid();
ResultBean<CommonAppendixVo> commonAppendixVoResultBean = commonAppendixFeign.fetchSid(billAppSid); ResultBean<CommonAppendixVo> commonAppendixVoResultBean = commonAppendixFeign.fetchSid(billAppSid);
CommonAppendixVo data = commonAppendixVoResultBean.getData(); CommonAppendixVo data = commonAppendixVoResultBean.getData();
BeanUtil.copyProperties(data,finBillFileAppendxVo); BeanUtil.copyProperties(data, finBillFileAppendxVo);
finBillFileAppendxVo.setFilePath(path); finBillFileAppendxVo.setFilePath(path);
finBillFileAppendxVo.setAppendixName(finBillFileDetailsVo.getFileType()); finBillFileAppendxVo.setAppendixName(finBillFileDetailsVo.getFileType());
finBillFileAppendxVos.add(finBillFileAppendxVo); finBillFileAppendxVos.add(finBillFileAppendxVo);
} }
return finBillFileAppendxVos; return finBillFileAppendxVos;
} }
public List<FinBillFileVo> groupByList(String sid) { public List<FinBillFileVo> groupByList(String sid) {
return baseMapper.groupByList(sid); return baseMapper.groupByList(sid);
} }
public List<FinBillFileVo> fetchkhkpsqsBySid(String sid) { public List<FinBillFileVo> fetchkhkpsqsBySid(String sid) {
return baseMapper.fetchkhkpsqsBySid(sid); return baseMapper.fetchkhkpsqsBySid(sid);
} }
public List<FinBillFileVo> fetchkpxxqrsBySid(String sid) { public List<FinBillFileVo> fetchkpxxqrsBySid(String sid) {
return baseMapper.fetchkpxxqrsBySid(sid); return baseMapper.fetchkpxxqrsBySid(sid);
} }
public List<FinBillFileVo> fetchcldjhtBySid(String sid) { public List<FinBillFileVo> fetchcldjhtBySid(String sid) {
return baseMapper.fetchcldjhtBySid(sid); return baseMapper.fetchcldjhtBySid(sid);
} }
public List<FinBillFileVo> fetchzjBySid(String sid) { public List<FinBillFileVo> fetchzjBySid(String sid) {
return baseMapper.fetchzjBySid(sid); return baseMapper.fetchzjBySid(sid);
} }
public List<FinBillFileVo> fetchfjBySid(String sid) { public List<FinBillFileVo> fetchfjBySid(String sid) {
return baseMapper.fetchfjBySid(sid); return baseMapper.fetchfjBySid(sid);
} }
public List<FinBillFileVo> fetchFileByBillSid(String sid) {
return baseMapper.fetchFileByBillSid(sid);
}
} }

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

@ -5,10 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoice; import com.yxt.anrui.fin.api.finvehicleinvoice.*;
import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceDetailsVo;
import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceExportVo;
import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceVo;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Select;
@ -45,4 +42,8 @@ public interface FinVehicleInvoiceMapper extends BaseMapper<FinVehicleInvoice> {
FinVehicleInvoiceDetailsVo getInvoiceDetailsBySid(String sid); FinVehicleInvoiceDetailsVo getInvoiceDetailsBySid(String sid);
FinVehicleInvoice selectByVinSid(String vinSid); FinVehicleInvoice selectByVinSid(String vinSid);
int cancellation(@Param("sid")String sid);
FinInvoiceInformationVo invoiceInformation(@Param("sid") String sid);
} }

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

@ -30,6 +30,13 @@
<result column="transferTime" property="transferTime"></result> <result column="transferTime" property="transferTime"></result>
</resultMap> </resultMap>
<update id="cancellation">
UPDATE fin_vehicle_invoice
SET billingState = '作废',
billingStateKey = '003'
WHERE sid = #{sid}
</update>
<!-- <where> ${ew.sqlSegment} </where>--> <!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} --> <!-- ${ew.customSqlSegment} -->
@ -68,7 +75,9 @@
</select> </select>
<select id="selectListVo" resultMap="selectPageVoResultMap"> <select id="selectListVo" resultMap="selectPageVoResultMap">
SELECT * FROM fin_vehicle_invoice where isDelete = '0' SELECT *
FROM fin_vehicle_invoice
where isDelete = '0'
</select> </select>
<select id="selectListAllVo" resultMap="selectPageVoResultMap"> <select id="selectListAllVo" resultMap="selectPageVoResultMap">
@ -76,7 +85,8 @@
<where>${ew.sqlSegment}</where> <where>${ew.sqlSegment}</where>
</select> </select>
<resultMap id="selectPageExportVoResultMap" type="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="transferState" property="transferState"></result>
<result column="billingState" property="billingState"></result> <result column="billingState" property="billingState"></result>
<result column="invoiceTitle" property="invoiceTitle"></result> <result column="invoiceTitle" property="invoiceTitle"></result>
@ -112,7 +122,8 @@
</where> </where>
</select> </select>
<resultMap id="getInvoiceDetailsBySidResultMap" type="com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceDetailsVo"> <resultMap id="getInvoiceDetailsBySidResultMap"
type="com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceDetailsVo">
<result column="sid" property="sid"></result> <result column="sid" property="sid"></result>
<result column="billingState" property="billingState"></result> <result column="billingState" property="billingState"></result>
<result column="billingStateKey" property="billingStateKey"></result> <result column="billingStateKey" property="billingStateKey"></result>
@ -135,39 +146,58 @@
<result column="bankNum" property="bankNum"></result> <result column="bankNum" property="bankNum"></result>
<result column="recipient" property="recipient"></result> <result column="recipient" property="recipient"></result>
<result column="transferTime" property="transferTime"></result> <result column="transferTime" property="transferTime"></result>
<result column="taxpayerNo" property="taxpayerNo"></result>
</resultMap> </resultMap>
<select id="getInvoiceDetailsBySid" <select id="getInvoiceDetailsBySid"
resultMap="getInvoiceDetailsBySidResultMap"> resultMap="getInvoiceDetailsBySidResultMap">
SELECT DISTINCT SELECT DISTINCT si.`name` as name,
si.`name` as name, v.sid as sid,
v.sid as sid, v.invoiceTitle as invoiceTitle,
v.invoiceTitle as invoiceTitle, v.contractNo as contractNo,
v.contractNo as contractNo, v.customerName as customerName,
v.customerName as customerName, v.VIN as VIN,
v.VIN as VIN, v.invoiceType as invoiceType,
v.invoiceType as invoiceType, v.invoiceTypeKey as invoiceTypeKey,
v.invoiceTypeKey as invoiceTypeKey, v.invoiceAmount as invoiceAmount,
v.invoiceAmount as invoiceAmount, v.`state` as state,
v.`state` as state, v.billingState as billingState,
v.billingState as billingState, v.billingStateKey as billingStateKey,
v.billingStateKey as billingStateKey, v.invoicingName as invoicingName,
v.invoicingName as invoicingName, v.createTime as createTime,
v.createTime as createTime, v.invoiceNo as invoiceNo,
v.invoiceNo as invoiceNo, v.invoiceCode as invoiceCode,
v.invoiceCode as invoiceCode, v.filePath as filePath,
v.filePath as filePath, v.address as address,
v.address as address, v.telPhone as telPhone,
v.telPhone as telPhone, v.openingBank as openingBank,
v.openingBank as openingBank, v.recipient as recipient,
v.recipient as recipient, v.transferTime as transferTime,
v.transferTime as transferTime v.bankNum as bankNum,
v.taxpayerNo as taxpayerNo
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>
<select id="selectByVinSid" resultType="com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoice"> <select id="selectByVinSid" resultType="com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoice">
select *,DATE_FORMAT(transferTime,'%Y-%m-%d') as transferTime,DATE_FORMAT(invoiceDate,'%Y-%m-%d') as invoiceDate from fin_vehicle_invoice where vehicleSid = #{vinSid} limit 1 select *,
DATE_FORMAT(transferTime, '%Y-%m-%d') as transferTime,
DATE_FORMAT(invoiceDate, '%Y-%m-%d') as invoiceDate
from fin_vehicle_invoice
where vehicleSid = #{vinSid} limit 1
</select>
<select id="invoiceInformation"
resultType="com.yxt.anrui.fin.api.finvehicleinvoice.FinInvoiceInformationVo">
select invoicingName,
address,
telPhone,
openingBank,
bankNum,
taxpayerNo
from fin_vehicle_invoice
where sid = #{sid}
</select> </select>
</mapper> </mapper>

17
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceRest.java

@ -185,4 +185,21 @@ public class FinVehicleInvoiceRest implements FinVehicleInvoiceFeign {
ExportExcelUtils.export(fileNameURL, invoiceExportVoList, FinVehicleInvoiceExportVo.class, response); ExportExcelUtils.export(fileNameURL, invoiceExportVoList, FinVehicleInvoiceExportVo.class, response);
} }
@Override
public ResultBean cancellation(String[] sids) {
ResultBean rb = ResultBean.fireFail();
int success = finVehicleInvoiceService.cancellation(sids);
if (success > 0) {
return rb.success().setMsg("作废成功");
}
return rb.success().setMsg("作废失败");
}
@Override
public ResultBean<FinInvoiceInformationVo> invoiceInformation(String sid) {
ResultBean rb = ResultBean.fireFail();
FinInvoiceInformationVo vo = finVehicleInvoiceService.invoiceInformation(sid);
return rb.success().setData(vo);
}
} }

88
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java

@ -3,16 +3,26 @@ package com.yxt.anrui.fin.biz.finvehicleinvoice;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.base.api.basevehicleappendix.BaseVehicleAppendixFeign;
import com.yxt.anrui.base.api.commonappendix.CommonAppendixFeign;
import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo;
import com.yxt.anrui.fin.api.finbillfile.FinBillFile;
import com.yxt.anrui.fin.api.finbillfile.FinBillFileVo;
import com.yxt.anrui.fin.api.finvehicleinvoice.*; import com.yxt.anrui.fin.api.finvehicleinvoice.*;
import com.yxt.anrui.fin.biz.finbillfile.FinBillFileService;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.config.component.FileUploadComponent;
import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.vo.PagerVo; import com.yxt.common.core.vo.PagerVo;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List; import java.util.List;
/** /**
@ -33,6 +43,18 @@ public class FinVehicleInvoiceService extends MybatisBaseService<FinVehicleInvoi
@Resource @Resource
private FileUploadComponent fileUploadComponent; private FileUploadComponent fileUploadComponent;
@Autowired
private FinBillFileService finBillFileService;
@Autowired
private SysOrganizationFeign sysOrganizationFeign;
@Autowired
private BaseVehicleAppendixFeign baseVehicleAppendixFeign;
@Autowired
private CommonAppendixFeign commonAppendixFeign;
public PagerVo<FinVehicleInvoice> listPage(PagerQuery<FinVehicleInvoiceQuery> pq) { public PagerVo<FinVehicleInvoice> listPage(PagerQuery<FinVehicleInvoiceQuery> pq) {
FinVehicleInvoiceQuery query = pq.getParams(); FinVehicleInvoiceQuery query = pq.getParams();
QueryWrapper<FinVehicleInvoice> qw = createQueryWrapper(query); QueryWrapper<FinVehicleInvoice> qw = createQueryWrapper(query);
@ -51,7 +73,17 @@ public class FinVehicleInvoiceService extends MybatisBaseService<FinVehicleInvoi
// todo: 这里根据具体业务调整查询条件 // todo: 这里根据具体业务调整查询条件
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); // 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<FinVehicleInvoice> qw = new QueryWrapper<>(); QueryWrapper<FinVehicleInvoice> qw = new QueryWrapper<>();
// ===========================================================
// String orgSidPath = query.getOrgSidPath();
// SysOrganizationVo data = sysOrganizationFeign.selectByOrgSidPath(orgSidPath).getData();
// String orgLevelKey = data.getOrgLevelKey();
// if ("2".equals(orgLevelKey)) {
// orgSidPath = orgSidPath.substring(0, 73);
// qw.like("so.orgSidPath", orgSidPath);
// } else if ("3".equals(orgLevelKey)) {
// qw.eq("saiq.createOrgSid", query.getCreateOrgSid());
// }
// =================================================================
qw.eq("isDelete", "0"); qw.eq("isDelete", "0");
if (StringUtils.isNotBlank(query.getInvoiceTitle())) { if (StringUtils.isNotBlank(query.getInvoiceTitle())) {
qw.like("invoiceTitle", query.getInvoiceTitle()); qw.like("invoiceTitle", query.getInvoiceTitle());
@ -104,6 +136,7 @@ public class FinVehicleInvoiceService extends MybatisBaseService<FinVehicleInvoi
IPage<FinVehicleInvoice> page = PagerUtil.queryToPage(pq); IPage<FinVehicleInvoice> page = PagerUtil.queryToPage(pq);
IPage<FinVehicleInvoiceVo> pagging = baseMapper.selectPageVo(page, qw); IPage<FinVehicleInvoiceVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<FinVehicleInvoiceVo> p = PagerUtil.pageToVo(pagging, null); PagerVo<FinVehicleInvoiceVo> p = PagerUtil.pageToVo(pagging, null);
return p; return p;
} }
@ -185,6 +218,44 @@ public class FinVehicleInvoiceService extends MybatisBaseService<FinVehicleInvoi
public FinVehicleInvoiceDetailsVo getInvoiceDetailsBySid(String sid) { public FinVehicleInvoiceDetailsVo getInvoiceDetailsBySid(String sid) {
FinVehicleInvoiceDetailsVo vo = baseMapper.getInvoiceDetailsBySid(sid); FinVehicleInvoiceDetailsVo vo = baseMapper.getInvoiceDetailsBySid(sid);
FinVehicleInvoice finVehicleInvoice = this.fetchBySid(sid);
List<String> billingFilePaths = new ArrayList<>();
String urlPrefix = fileUploadComponent.getUrlPrefix();
//根据开票来源sid查询关联的附件列表
if (null != finVehicleInvoice) {
if (StringUtils.isNotBlank(finVehicleInvoice.getBillingSid())) {
List<FinBillFileVo> fileVos = finBillFileService.fetchFileByBillSid(finVehicleInvoice.getBillingSid());
if (null != fileVos) {
for (FinBillFileVo fileVo : fileVos) {
if (StringUtils.isNotBlank(fileVo.getFileUrl())) {
String fileUrl = urlPrefix + fileVo.getFileUrl();
billingFilePaths.add(fileUrl);
}
}
}
}
}
List<String> certificatePaths = new ArrayList<>();
//查询合格证 先判断是主车还是挂车
if (StringUtils.isNotBlank(finVehicleInvoice.getVehicleType()) && StringUtils.isNotBlank(finVehicleInvoice.getBillingSid())) {
if ("主车".equals(finVehicleInvoice.getVehicleType())) {
List<String> vehicleAppendixList = baseVehicleAppendixFeign.selectBySid(finVehicleInvoice.getBillingSid()).getData();
vo.setCertificatePaths(vehicleAppendixList);
} else {
List<CommonAppendixVo> commonAppendixVos = commonAppendixFeign.selByLinkSid(finVehicleInvoice.getBillingSid()).getData();
if (null != commonAppendixVos) {
for (CommonAppendixVo commonAppendixVo : commonAppendixVos) {
if (null != commonAppendixVo) {
if (StringUtils.isNotBlank(commonAppendixVo.getFileUrl())) {
certificatePaths.add(commonAppendixVo.getFileUrl());
}
}
}
vo.setCertificatePaths(certificatePaths);
}
}
}
vo.setBillingFilePaths(billingFilePaths);
return vo; return vo;
} }
@ -208,7 +279,7 @@ public class FinVehicleInvoiceService extends MybatisBaseService<FinVehicleInvoi
String VIN = dto.getVinNo(); String VIN = dto.getVinNo();
dto.setVIN(VIN); dto.setVIN(VIN);
} }
return updateBySid(dto,sid); return updateBySid(dto, sid);
} }
public boolean mySave(FinVehicleInvoiceDto dto) { public boolean mySave(FinVehicleInvoiceDto dto) {
@ -239,4 +310,17 @@ public class FinVehicleInvoiceService extends MybatisBaseService<FinVehicleInvoi
public FinVehicleInvoice selectByVinSid(String vinSid) { public FinVehicleInvoice selectByVinSid(String vinSid) {
return baseMapper.selectByVinSid(vinSid); return baseMapper.selectByVinSid(vinSid);
} }
public int cancellation(String[] sids) {
int isSuccess = 0;
for (String sid : sids) {
isSuccess = baseMapper.cancellation(sid);
}
return isSuccess;
}
public FinInvoiceInformationVo invoiceInformation(String sid) {
FinInvoiceInformationVo vo = baseMapper.invoiceInformation(sid);
return vo;
}
} }

4
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DisBaseInfoDto.java

@ -38,7 +38,9 @@ public class DisBaseInfoDto implements Dto {
private String managementDetailAddress; private String managementDetailAddress;
@ApiModelProperty(value = "实际经营地址code") @ApiModelProperty(value = "实际经营地址code")
private String managementDetailAddressCode; // private String managementDetailAddressCode;
@JsonProperty("managementDetailAddressCode")
private String managementAddressCode;
@ApiModelProperty(value = "实际经营地址省") @ApiModelProperty(value = "实际经营地址省")
private String managementDetailAddressProvince; private String managementDetailAddressProvince;

Loading…
Cancel
Save