From 032f32082486e484bd9d1d1ebf0dfdd963eae6dc Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Wed, 10 May 2023 16:27:03 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98--?= =?UTF-8?q?=E5=87=BA=E5=BA=93=E7=94=B3=E8=AF=B7=E9=80=89=E6=8B=A9=E4=BC=98?= =?UTF-8?q?=E6=83=A0=E5=A5=97=E9=A4=90=E6=97=B6=E6=9C=AC=E6=AC=A1=E8=B5=A0?= =?UTF-8?q?=E9=80=81=E6=95=B0=E9=87=8F=E4=B8=8D=E8=83=BD=E5=A4=A7=E4=BA=8E?= =?UTF-8?q?=E5=89=A9=E4=BD=99=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chukuguanli/chukubanli/relation/selectpackage.vue | 11 +++++++++-- .../chukuguanli/relation/selectpackage.vue | 9 ++++++++- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/relation/selectpackage.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/relation/selectpackage.vue index 4cadf8804f..9586834710 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/relation/selectpackage.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/relation/selectpackage.vue @@ -26,7 +26,7 @@ @@ -105,6 +105,13 @@ export default { this.list = aa this.vinSid = vinSid }, + changeByDiscountNum(val, row) { + if (parseInt(row.discountLeaveNum) - parseInt(val) < 0) { + row.discountNum = row.discountLeaveNum + } else { + row.discountNum = val + } + }, doCreate() { for (var i = 0; i < this.list.length; i++) { if (this.list[i].discountNum === '') { @@ -115,7 +122,7 @@ export default { }, doClose() { this.$emit('doback') - }, + } } } diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/relation/selectpackage.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/relation/selectpackage.vue index 06901c3dbb..78b77c8a92 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/relation/selectpackage.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/relation/selectpackage.vue @@ -26,7 +26,7 @@ @@ -105,6 +105,13 @@ export default { this.list = aa this.vinSid = vinSid }, + changeByDiscountNum(val, row) { + if (parseInt(row.discountLeaveNum) - parseInt(val) < 0) { + row.discountNum = row.discountLeaveNum + } else { + row.discountNum = val + } + }, doCreate() { for (var i = 0; i < this.list.length; i++) { if (this.list[i].discountNum === '') { From aec3d6091e36c4015c2dd475ca695101e0f483cd Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Wed, 10 May 2023 16:33:13 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xiaoshoudingdanFlow/xiaoshoudingdanByJinRong.vue | 3 --- 1 file changed, 3 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanByJinRong.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanByJinRong.vue index ba8df57d0d..bc6c98e374 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanByJinRong.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanByJinRong.vue @@ -660,9 +660,6 @@ export default { align-items: center; margin-bottom: 1px; } -.addinputInfo { - margin-left: 120px !important; -} .tlineheightb { display: flex; flex-direction: row; From 8b9c81dd134bf9f6d2a95a4f3627ea4e059d3392 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Wed, 10 May 2023 16:34:14 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98--?= =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=8C=85=E4=BA=A4=E6=8E=A5=E6=9F=A5=E7=9C=8B?= =?UTF-8?q?=E5=B7=B2=E4=BA=A4=E6=8E=A5=E5=88=97=E8=A1=A8=E6=97=B6=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E5=88=97=E6=8C=89=E9=92=AE=E6=98=BE=E7=A4=BA=E9=94=99?= =?UTF-8?q?=E4=B9=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../discountpackagehandover/discountpackagehandover.vue | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/discountpackagehandover/discountpackagehandover.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/discountpackagehandover/discountpackagehandover.vue index 500b9b1195..2bb71ac498 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/discountpackagehandover/discountpackagehandover.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/discountpackagehandover/discountpackagehandover.vue @@ -43,9 +43,11 @@ From c62f6471505a3bedfcb0d135ae9e288b95c70409 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Wed, 10 May 2023 16:51:38 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/basedistributor/app/BaseInfoDto.java | 3 ++- .../BaseDistributorService.java | 24 +++++++++---------- .../distributor/DisBaseInfoDto.java | 4 +++- 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BaseInfoDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BaseInfoDto.java index 8e3a06055a..a6226b9b21 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basedistributor/app/BaseInfoDto.java +++ b/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; @ApiModelProperty(value = "实际经营地址code") - private String managementDetailAddressCode; +// private String managementDetailAddressCode; + private String managementAddressCode; @ApiModelProperty(value = "实际经营地址省") private String managementDetailAddressProvince; diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java index ff163baa5b..6efefb235e 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basedistributor/BaseDistributorService.java +++ b/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 businessLicense = baseDistributorAppendixService.selByLinkSidAndAttachTypeOne(sid, "0001"); - List transportPermit = baseDistributorAppendixService.selByLinkSidAndAttachTypeOne(sid, "0002"); - List corporateIdCard = baseDistributorAppendixService.selByLinkSidAndAttachTypeOne(sid, "0003"); - List otherInfo = baseDistributorAppendixService.selByLinkSidAndAttachTypeOne(sid, "0004"); + List businessLicense = baseDistributorAppendixService.selByLinkSidAndAttachTypeOne(sid, "营业执照"); + List transportPermit = baseDistributorAppendixService.selByLinkSidAndAttachTypeOne(sid, "道路运输许可证"); + List corporateIdCard = baseDistributorAppendixService.selByLinkSidAndAttachTypeOne(sid, "法人身份证"); + List otherInfo = baseDistributorAppendixService.selByLinkSidAndAttachTypeOne(sid, "其他资料"); baseFileVo.setBusinessLicense(businessLicense); baseFileVo.setOtherInfo(otherInfo); baseFileVo.setCorporateIdCard(corporateIdCard); @@ -804,10 +804,10 @@ public class BaseDistributorService extends MybatisBaseService businessLicense = baseDistributorAppendixService.selByLinkSidAndAttachTypeOne(sid, "0001"); - List transportPermit = baseDistributorAppendixService.selByLinkSidAndAttachTypeOne(sid, "0002"); - List corporateIdCard = baseDistributorAppendixService.selByLinkSidAndAttachTypeOne(sid, "0003"); - List otherInfo = baseDistributorAppendixService.selByLinkSidAndAttachTypeOne(sid, "0004"); + List businessLicense = baseDistributorAppendixService.selByLinkSidAndAttachTypeOne(sid, "营业执照"); + List transportPermit = baseDistributorAppendixService.selByLinkSidAndAttachTypeOne(sid, "道路运输许可证"); + List corporateIdCard = baseDistributorAppendixService.selByLinkSidAndAttachTypeOne(sid, "法人身份证"); + List otherInfo = baseDistributorAppendixService.selByLinkSidAndAttachTypeOne(sid, "其他资料"); vo.setBusinessLicense(businessLicense); vo.setOtherInfo(otherInfo); vo.setCorporateIdCard(corporateIdCard); @@ -828,17 +828,17 @@ public class BaseDistributorService extends MybatisBaseService corporateIdCard = dto.getCorporateIdCard(); List otherInfo = dto.getOtherInfo(); if (!businessLicense.isEmpty()) {//0001 - baseDistributorAppendixService.insertAppendix(dto.getDistributorSid(), businessLicense, "0001"); + baseDistributorAppendixService.insertAppendix(dto.getDistributorSid(), businessLicense, "营业执照"); } if (!transportPermit.isEmpty()) {//0002 - baseDistributorAppendixService.insertAppendix(dto.getDistributorSid(), transportPermit, "0002"); + baseDistributorAppendixService.insertAppendix(dto.getDistributorSid(), transportPermit, "道路运输许可证"); } if (!corporateIdCard.isEmpty()) {//0003 - baseDistributorAppendixService.insertAppendix(dto.getDistributorSid(), corporateIdCard, "0003"); + baseDistributorAppendixService.insertAppendix(dto.getDistributorSid(), corporateIdCard, "法人身份证"); } if (!otherInfo.isEmpty()) {//0004 - baseDistributorAppendixService.insertAppendix(dto.getDistributorSid(), otherInfo, "0004"); + baseDistributorAppendixService.insertAppendix(dto.getDistributorSid(), otherInfo, "其他资料"); } return rb.success(); diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DisBaseInfoDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DisBaseInfoDto.java index eea6769b29..9ad8b33f94 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/distributor/DisBaseInfoDto.java +++ b/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; @ApiModelProperty(value = "实际经营地址code") - private String managementDetailAddressCode; +// private String managementDetailAddressCode; + @JsonProperty("managementDetailAddressCode") + private String managementAddressCode; @ApiModelProperty(value = "实际经营地址省") private String managementDetailAddressProvince; From 4515e30c25ce0abc825883f2c0cd81e5d8e5f7ce Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Wed, 10 May 2023 17:26:22 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E5=BC=80=E7=A5=A8=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=A2=9E=E5=8A=A0=E5=BC=80=E7=A5=A8=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E9=99=84=E4=BB=B6=E3=80=81=E8=BD=A6=E8=BE=86=E5=90=88?= =?UTF-8?q?=E6=A0=BC=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fin/api/finbillfile/FinBillFileFeign.java | 3 + .../FinVehicleInvoiceDetailsVo.java | 4 + .../FinVehicleInvoiceDto.java | 9 +- .../FinVehicleInvoiceFeign.java | 14 +- .../FinVehicleInvoiceFeignFallback.java | 9 + .../biz/finbillfile/FinBillFileMapper.java | 2 + .../fin/biz/finbillfile/FinBillFileMapper.xml | 73 +++---- .../biz/finbillfile/FinBillFileService.java | 202 +++++++++--------- .../FinVehicleInvoiceMapper.java | 9 +- .../FinVehicleInvoiceMapper.xml | 85 +++++--- .../FinVehicleInvoiceRest.java | 17 ++ .../FinVehicleInvoiceService.java | 88 +++++++- 12 files changed, 341 insertions(+), 174 deletions(-) diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillfile/FinBillFileFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillfile/FinBillFileFeign.java index 286f4cf8d6..f937630b47 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillfile/FinBillFileFeign.java +++ b/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") @ResponseBody public ResultBean> fetchFileBySid(@RequestParam("billAppSid") String billAppSid,@RequestParam("fileType") String fileType); + + + } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceDetailsVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceDetailsVo.java index 71487e94af..3a0a32cbfc 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceDetailsVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceDetailsVo.java @@ -64,4 +64,8 @@ public class FinVehicleInvoiceDetailsVo implements Vo { private Date transferTime; @ApiModelProperty("图片地址集合") private List filePaths; + @ApiModelProperty("开票申请附件") + private List billingFilePaths; + @ApiModelProperty("合格证照片") + private List certificatePaths; } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceDto.java index ca62c373c8..b52da02a1f 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceDto.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceDto.java @@ -30,10 +30,10 @@ public class FinVehicleInvoiceDto implements Dto { private String sid; // sid - @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty("创建时间") private Date createTime; - @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty("修改时间") private Date modifyTime; @ApiModelProperty("是否可用：1可用，0不可用") @@ -58,7 +58,7 @@ public class FinVehicleInvoiceDto implements Dto { private String vehicleType; @ApiModelProperty("车辆金额") private BigDecimal vehiclAmount; - @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty("最大发票开票日期") private Date invoiceDate; @ApiModelProperty("发票号") @@ -113,4 +113,7 @@ public class FinVehicleInvoiceDto implements Dto { private String taxpayerNo; @ApiModelProperty("开票来源sid") private String billingSid; + @ApiModelProperty("开票申请附件") + private List billingFilePaths; + } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceFeign.java index c3e4a927a3..452fba1ff3 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceFeign.java @@ -9,6 +9,7 @@ import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; + import java.util.List; /** @@ -47,7 +48,7 @@ public interface FinVehicleInvoiceFeign { @ApiOperation("新增保存") @PostMapping("/save") public ResultBean save(@RequestBody FinVehicleInvoiceDto dto); - + @ApiOperation("修改保存") @PostMapping("/saveOrUpdate") public ResultBean saveOrUpdate(@RequestBody FinVehicleInvoiceDto dto); @@ -69,4 +70,15 @@ public interface FinVehicleInvoiceFeign { @ResponseBody public void exportExcel(@RequestBody FinVehicleInvoiceQuery query); + @ApiOperation("作废") + @PostMapping("/cancellation") + public ResultBean cancellation(@RequestBody String[] sids); + + @ApiOperation("获取开票信息详情记录") + @GetMapping("/invoiceInformation/{sid}") + @ResponseBody + public ResultBean invoiceInformation(@PathVariable("sid") String sid); + + + } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceFeignFallback.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceFeignFallback.java index 2da912e83e..e0ca6c7843 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceFeignFallback.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceFeignFallback.java @@ -74,5 +74,14 @@ public class FinVehicleInvoiceFeignFallback implements FinVehicleInvoiceFeign { } + @Override + public ResultBean cancellation(String[] ids) { + return null; + } + + @Override + public ResultBean invoiceInformation(String sid) { + return null; + } } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileMapper.java index fa4043c3fb..a8672c199c 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileMapper.java +++ b/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 { @Select("select * from fin_bill_file where billAppSid = #{sid} and attachType = '005'") List fetchfjBySid(String sid); + + List fetchFileByBillSid(@Param("sid") String sid); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileMapper.xml index ade3d0e421..e8afea1c9c 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileMapper.xml @@ -1,43 +1,44 @@ - - - - - + + + - + - + - + + + + \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileService.java index 1a6031e9ff..bd4143f675 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillfile/FinBillFileService.java +++ b/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 public class FinBillFileService extends MybatisBaseService { - @Autowired - private FileUploadComponent fileUploadComponent; - @Autowired - private CommonAppendixFeign commonAppendixFeign; - - private QueryWrapper createQueryWrapper(FinBillFileQuery query) { - // todo: 这里根据具体业务调整查询条件 - // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); - QueryWrapper qw = new QueryWrapper<>(); - return qw; - } - - public PagerVo listPageVo(PagerQuery pq) { - FinBillFileQuery query = pq.getParams(); - QueryWrapper qw = createQueryWrapper(query); - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectPageVo(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - return p; - } - - public void saveOrUpdateDto(FinBillFileDto dto){ + @Autowired + private FileUploadComponent fileUploadComponent; + @Autowired + private CommonAppendixFeign commonAppendixFeign; + + private QueryWrapper createQueryWrapper(FinBillFileQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + return qw; + } + + public PagerVo listPageVo(PagerQuery pq) { + FinBillFileQuery query = pq.getParams(); + QueryWrapper qw = createQueryWrapper(query); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public void saveOrUpdateDto(FinBillFileDto dto) { String dtoSid = dto.getSid(); if (StringUtils.isBlank(dtoSid)) { this.insertByDto(dto); - return; - } - this.updateByDto(dto); - } - - public void insertByDto(FinBillFileDto dto){ - FinBillFile entity = new FinBillFile(); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.insert(entity); - } - - public void updateByDto(FinBillFileDto dto){ - String dtoSid = dto.getSid(); + return; + } + this.updateByDto(dto); + } + + public void insertByDto(FinBillFileDto dto) { + FinBillFile entity = new FinBillFile(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } + + public void updateByDto(FinBillFileDto dto) { + String dtoSid = dto.getSid(); if (StringUtils.isBlank(dtoSid)) { return; - } - FinBillFile entity = fetchBySid(dtoSid); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.updateById(entity); - } - - public FinBillFileDetailsVo fetchDetailsVoBySid(String sid){ - FinBillFile entity = fetchBySid(sid); - FinBillFileDetailsVo vo = new FinBillFileDetailsVo(); - BeanUtil.copyProperties(entity, vo); - return vo; - } - - public void deleteByFinAppSid(String dtoSid) { - baseMapper.deleteByFinAppSid(dtoSid); - } - - public List fetchBillFileBySid(String sid) { - return baseMapper.fetchBillFileBySid(sid); - } - - public List fetchFileBySid(String billAppSid, String fileType) { - ArrayList finBillFileAppendxVos = new ArrayList<>(); - List finBillFileDetailsVos = baseMapper.fetchFileBySid(billAppSid, fileType); - String path = ""; - for (FinBillFileDetailsVo finBillFileDetailsVo : finBillFileDetailsVos) { - FinBillFileAppendxVo finBillFileAppendxVo = new FinBillFileAppendxVo(); - String fileUrl = finBillFileDetailsVo.getFileUrl(); - String urlPrefix = fileUploadComponent.getUrlPrefix(); - path = urlPrefix + fileUrl; - String fileSid = finBillFileDetailsVo.getFileSid(); - ResultBean commonAppendixVoResultBean = commonAppendixFeign.fetchSid(billAppSid); - CommonAppendixVo data = commonAppendixVoResultBean.getData(); - BeanUtil.copyProperties(data,finBillFileAppendxVo); - finBillFileAppendxVo.setFilePath(path); - finBillFileAppendxVo.setAppendixName(finBillFileDetailsVo.getFileType()); - finBillFileAppendxVos.add(finBillFileAppendxVo); - } - return finBillFileAppendxVos; - } - - public List groupByList(String sid) { - return baseMapper.groupByList(sid); - } - - public List fetchkhkpsqsBySid(String sid) { - return baseMapper.fetchkhkpsqsBySid(sid); - } - - public List fetchkpxxqrsBySid(String sid) { - return baseMapper.fetchkpxxqrsBySid(sid); - } - - public List fetchcldjhtBySid(String sid) { - return baseMapper.fetchcldjhtBySid(sid); - } - - public List fetchzjBySid(String sid) { - return baseMapper.fetchzjBySid(sid); - } - - public List fetchfjBySid(String sid) { - return baseMapper.fetchfjBySid(sid); - } + } + FinBillFile entity = fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + } + + public FinBillFileDetailsVo fetchDetailsVoBySid(String sid) { + FinBillFile entity = fetchBySid(sid); + FinBillFileDetailsVo vo = new FinBillFileDetailsVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } + + public void deleteByFinAppSid(String dtoSid) { + baseMapper.deleteByFinAppSid(dtoSid); + } + + public List fetchBillFileBySid(String sid) { + return baseMapper.fetchBillFileBySid(sid); + } + + public List fetchFileBySid(String billAppSid, String fileType) { + ArrayList finBillFileAppendxVos = new ArrayList<>(); + List finBillFileDetailsVos = baseMapper.fetchFileBySid(billAppSid, fileType); + String path = ""; + for (FinBillFileDetailsVo finBillFileDetailsVo : finBillFileDetailsVos) { + FinBillFileAppendxVo finBillFileAppendxVo = new FinBillFileAppendxVo(); + String fileUrl = finBillFileDetailsVo.getFileUrl(); + String urlPrefix = fileUploadComponent.getUrlPrefix(); + path = urlPrefix + fileUrl; + String fileSid = finBillFileDetailsVo.getFileSid(); + ResultBean commonAppendixVoResultBean = commonAppendixFeign.fetchSid(billAppSid); + CommonAppendixVo data = commonAppendixVoResultBean.getData(); + BeanUtil.copyProperties(data, finBillFileAppendxVo); + finBillFileAppendxVo.setFilePath(path); + finBillFileAppendxVo.setAppendixName(finBillFileDetailsVo.getFileType()); + finBillFileAppendxVos.add(finBillFileAppendxVo); + } + return finBillFileAppendxVos; + } + + public List groupByList(String sid) { + return baseMapper.groupByList(sid); + } + + public List fetchkhkpsqsBySid(String sid) { + return baseMapper.fetchkhkpsqsBySid(sid); + } + + public List fetchkpxxqrsBySid(String sid) { + return baseMapper.fetchkpxxqrsBySid(sid); + } + + public List fetchcldjhtBySid(String sid) { + return baseMapper.fetchcldjhtBySid(sid); + } + + public List fetchzjBySid(String sid) { + return baseMapper.fetchzjBySid(sid); + } + + public List fetchfjBySid(String sid) { + return baseMapper.fetchfjBySid(sid); + } + + public List fetchFileByBillSid(String sid) { + return baseMapper.fetchFileByBillSid(sid); + } } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.java index 8f96b09bf4..7ea6bb7a5a 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.java @@ -5,10 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; -import com.yxt.anrui.fin.api.finvehicleinvoice.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 com.yxt.anrui.fin.api.finvehicleinvoice.*; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -45,4 +42,8 @@ public interface FinVehicleInvoiceMapper extends BaseMapper { FinVehicleInvoiceDetailsVo getInvoiceDetailsBySid(String sid); FinVehicleInvoice selectByVinSid(String vinSid); + + int cancellation(@Param("sid")String sid); + + FinInvoiceInformationVo invoiceInformation(@Param("sid") String sid); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.xml index c57d7d08ed..fc2eda68c5 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.xml @@ -30,6 +30,13 @@ + + UPDATE fin_vehicle_invoice + SET billingState = '作废', + billingStateKey = '003' + WHERE sid = #{sid} + + @@ -68,7 +75,9 @@ - + @@ -112,7 +122,8 @@ - + @@ -137,37 +148,53 @@ + \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceRest.java index f724b0942b..1a9c92efa8 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceRest.java @@ -185,4 +185,21 @@ public class FinVehicleInvoiceRest implements FinVehicleInvoiceFeign { 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 invoiceInformation(String sid) { + ResultBean rb = ResultBean.fireFail(); + FinInvoiceInformationVo vo = finVehicleInvoiceService.invoiceInformation(sid); + return rb.success().setData(vo); + } + } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java index fc6e3a5e25..24ec826c49 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java @@ -3,16 +3,26 @@ package com.yxt.anrui.fin.biz.finvehicleinvoice; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.base.api.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.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.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.vo.PagerVo; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.ArrayList; import java.util.List; /** @@ -33,6 +43,18 @@ public class FinVehicleInvoiceService extends MybatisBaseService listPage(PagerQuery pq) { FinVehicleInvoiceQuery query = pq.getParams(); QueryWrapper qw = createQueryWrapper(query); @@ -51,7 +73,17 @@ public class FinVehicleInvoiceService extends MybatisBaseService wrapper.like("name", query.getName()).or().like("remark", query.getName())); QueryWrapper 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"); if (StringUtils.isNotBlank(query.getInvoiceTitle())) { qw.like("invoiceTitle", query.getInvoiceTitle()); @@ -104,6 +136,7 @@ public class FinVehicleInvoiceService extends MybatisBaseService page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; } @@ -185,6 +218,44 @@ public class FinVehicleInvoiceService extends MybatisBaseService billingFilePaths = new ArrayList<>(); + String urlPrefix = fileUploadComponent.getUrlPrefix(); + //根据开票来源sid查询关联的附件列表 + if (null != finVehicleInvoice) { + if (StringUtils.isNotBlank(finVehicleInvoice.getBillingSid())) { + List 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 certificatePaths = new ArrayList<>(); + //查询合格证 先判断是主车还是挂车 + if (StringUtils.isNotBlank(finVehicleInvoice.getVehicleType()) && StringUtils.isNotBlank(finVehicleInvoice.getBillingSid())) { + if ("主车".equals(finVehicleInvoice.getVehicleType())) { + List vehicleAppendixList = baseVehicleAppendixFeign.selectBySid(finVehicleInvoice.getBillingSid()).getData(); + vo.setCertificatePaths(vehicleAppendixList); + } else { + List 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; } @@ -208,7 +279,7 @@ public class FinVehicleInvoiceService extends MybatisBaseService Date: Wed, 10 May 2023 17:27:18 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E5=BC=80=E7=A5=A8=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=A2=9E=E5=8A=A0=E5=BC=80=E7=A5=A8=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E9=99=84=E4=BB=B6=E3=80=81=E8=BD=A6=E8=BE=86=E5=90=88?= =?UTF-8?q?=E6=A0=BC=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinInvoiceInformationVo.java | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinInvoiceInformationVo.java diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinInvoiceInformationVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinInvoiceInformationVo.java new file mode 100644 index 0000000000..d24c7672bb --- /dev/null +++ b/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; +} From 66cbd4e9f6fea35cafed2e778684b966d6121e7c Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Wed, 10 May 2023 17:36:53 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E5=BC=80=E7=A5=A8=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E8=AF=A6=E6=83=85=20=E8=B0=83=E4=BB=B7=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseModelModpriceService.java | 16 ++++++++++++++++ ...请模板.xls => 车型调价模板.xls} | Bin 18944 -> 18944 bytes .../FinVehicleInvoiceDetailsVo.java | 2 ++ .../FinVehicleInvoiceMapper.xml | 5 ++++- 4 files changed, 22 insertions(+), 1 deletion(-) rename anrui-base/anrui-base-biz/src/main/resources/static/excel/{调价申请模板.xls => 车型调价模板.xls} (87%) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java index 2fb70d0c1c..b8a2f75e7e 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java @@ -722,6 +722,22 @@ public class BaseModelModpriceService extends MybatisBaseServiceOSX8{0LxZ7~1IUE~7a$8Pw>e(nmV{BA2}p*G zF_y*=8Rr8Ad@T z1||j;hFYK$3lKI)I!&&$cD4jLhk@ZQ0~e5FWN-#z7>^0aV}kRT8C)1ZeuJoFVQ`uJ z)!L4a1LQ@Z9u6R6W83U#lgzxyL5zuAk7-4dIiKrhStmgzfj5j`QyKpJ{|_|%!2ij5 XE>4phT+XmD%rTY`Xx<#;x{d_^0fk3{ delta 284 zcmZpe!q_l{aYGIZo5ANU-EEbVi&)wi>n8tXsb|dET*-Q$cXENS$mBV~LTt_q4-PRm zY~CV#kcZWYfq{W>@_k{^&ASzDNk}T00Qn4TjKK^U45>g^!eGeI${@m!HhG<;IMXNd z$;T~Mv+XoyVBlexyvIgn@)Ro}reCI;S6Im~3OX_{F|aVy0;O1hutCys@>OeROOOQ& z41XE8fFvV>6A;6AOh6tJoW~60F~fN*3{H~+ZS432fF^>Ar%jUT@$;^`m billingFilePaths; @ApiModelProperty("合格证照片") private List certificatePaths; + @ApiModelProperty("纳税人识别号") + private String taxpayerNo; } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.xml index fc2eda68c5..f188f9f53c 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.xml @@ -146,6 +146,8 @@ + +