Merge remote-tracking branch 'origin/master'

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/becollection/AppInvoiceDetails.java

@@ -0,0 +1,80 @@
+package com.yxt.anrui.terminal.api.risk.becollection;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/4/5 20:30
+ */
+@Data
+public class AppInvoiceDetails implements Vo {
+
+    @ApiModelProperty("开票单位")
+    private String invoiceTitle;
+    @ApiModelProperty("申请人")
+    private String name;
+    @ApiModelProperty("合同编号")
+    private String contractNo;
+    @ApiModelProperty("客户名称")
+    private String customerName;
+    @ApiModelProperty("车架号")
+    private String vinNo;
+    @ApiModelProperty("业务状态")
+    private String businessState;
+    @ApiModelProperty("是否领票")
+    private String isTakeTicket;
+    @ApiModelProperty("发票状态")
+    private String billingState;
+    @ApiModelProperty("开票类型")
+    private String invoiceType;
+    @ApiModelProperty("开票金额")
+    private BigDecimal invoiceAmount;
+    @ApiModelProperty("开票人")
+    private String drawer;
+    @ApiModelProperty("发票号")
+    private String invoiceNo;
+    @ApiModelProperty("发票代码")
+    private String invoiceCode;
+    @ApiModelProperty("开票日期")
+    private String createTime;
+    @ApiModelProperty("接收人")
+    private String recipient;
+    @ApiModelProperty("接收日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date transferTime;
+    @ApiModelProperty("移交状态")
+    private String transferState;
+    @ApiModelProperty("移交备注")
+    private String transferRemarks;
+
+    @ApiModelProperty("发票照片")
+    private List<String> fpFiles = new ArrayList<>();
+    @ApiModelProperty("开票申请附件")
+    private List<String> kpsqFiles = new ArrayList<>();
+    @ApiModelProperty("合格证照片")
+    private List<String> hgzFiles = new ArrayList<>();
+
+    @ApiModelProperty("开票名称")
+    private String invoicingName;
+    @ApiModelProperty("纳税人识别号")
+    private String taxpayerNo;
+    @ApiModelProperty("地址")
+    private String address;
+    @ApiModelProperty("电话")
+    private String telPhone;
+    @ApiModelProperty("开户行")
+    private String openingBank;
+    @ApiModelProperty("银行账号")
+    private String bankNum;
+
+
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/becollection/BeCollectionFeign.java

@@ -64,6 +64,10 @@ public interface BeCollectionFeign {
     @GetMapping("/yhmxDetails")
     public ResultBean<AppMonRepayDetails> yhmxDetails(@RequestParam("saleVehSid") String saleVehSid);
 
+    @ApiOperation("开票管理")
+    @GetMapping("/kpglDetails")
+    public ResultBean<AppInvoiceDetails> kpglDetails(@RequestParam("sid") String sid);
+
     /****************************************催收流程审批******************************************/
 
     @ApiOperation("办理")

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/becollection/BeCollectionRest.java

@@ -86,6 +86,11 @@ public class BeCollectionRest implements BeCollectionFeign {
         return beCollectionService.yhmxDetails(saleVehSid);
     }
 
+    @Override
+    public ResultBean<AppInvoiceDetails> kpglDetails(String sid) {
+        return beCollectionService.kpglDetails(sid);
+    }
+
     @Override
     public ResultBean agreeCreditInfo(CompleteBeCollectionDto dto) {
         return beCollectionService.agreeCreditInfo(dto);

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/becollection/BeCollectionService.java

@@ -30,6 +30,8 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.ReaRepaymentDto;
+import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceDetailsVo;
+import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
@@ -103,6 +105,8 @@ public class BeCollectionService {
     private SysOrganizationFeign sysOrganizationFeign;
     @Autowired
     private CommonService commonService;
+    @Autowired
+    private FinVehicleInvoiceFeign finVehicleInvoiceFeign;
 
     public ResultBean agreeCreditInfo(CompleteBeCollectionDto dto) {
         ResultBean rb = ResultBean.fireFail();
@@ -606,4 +610,24 @@ public class BeCollectionService {
         appMonRepayDetails.setAppMonRepayPeriodDetailsList(appMonRepayPeriodDetailsList);
         return rb.success().setData(appMonRepayDetails);
     }
+
+    public ResultBean<AppInvoiceDetails> kpglDetails(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        FinVehicleInvoiceDetailsVo finVehicleInvoiceDetailsVo = finVehicleInvoiceFeign.fetchBySid(sid).getData();
+        AppInvoiceDetails appInvoiceDetails = new AppInvoiceDetails();
+        BeanUtil.copyProperties(finVehicleInvoiceDetailsVo,appInvoiceDetails);
+        List<String> filePaths = finVehicleInvoiceDetailsVo.getFilePaths();
+        if (filePaths != null && filePaths.size() > 0){
+            appInvoiceDetails.setFpFiles(filePaths);
+        }
+        List<String> billingFilePaths = finVehicleInvoiceDetailsVo.getBillingFilePaths();
+        if (billingFilePaths != null && billingFilePaths.size() > 0){
+            appInvoiceDetails.setKpsqFiles(billingFilePaths);
+        }
+        List<String> certificatePaths = finVehicleInvoiceDetailsVo.getCertificatePaths();
+        if (certificatePaths != null && certificatePaths.size() > 0){
+            appInvoiceDetails.setHgzFiles(certificatePaths);
+        }
+        return rb.success().setData(appInvoiceDetails);
+    }
 }

doc/databases/报表中心.sql

@@ -235,7 +235,7 @@ UPDATE daily_report r
                                left join anrui_base.base_vehicle_out bvo on bv.sid = bvo.vinSid
                                left join anrui_base.base_vehicle_out_apply bvoa on bvoa.sid = bvo.mainSid
                       where bv.salesDate like concat('%', CURDATE(), '%')
-                        and bvoa.saleTypeKey = '001'
+                        and bvoa.saleTypeKey = '001' and (bvo.materialTypeKey = '001' or bvo.materialTypeValue is null or length(bvo.materialTypeValue) = 0)
                       group by bv.useOrgSid, bv.modelSid, bv.modelConfigSid) ss
                 group by ss.useOrgSid, ss.modelSid, ss.modelConfigSid
     ) AS s ON r.useOrgSid = s.useOrgSid
@@ -251,7 +251,7 @@ UPDATE daily_report r
                                left join anrui_base.base_vehicle_out bvo on bv.sid = bvo.vinSid
                                left join anrui_base.base_vehicle_out_apply bvoa on bvoa.sid = bvo.mainSid
                       where bv.salesDate like concat('%', CURDATE(), '%')
-                        and bvoa.saleTypeKey = '002'
+                        and bvoa.saleTypeKey = '002' and (bvo.materialTypeKey = '001' or bvo.materialTypeValue is null or length(bvo.materialTypeValue) = 0)
                       group by bv.useOrgSid, bv.modelSid, bv.modelConfigSid) ss
                 group by ss.useOrgSid, ss.modelSid, ss.modelConfigSid
     ) AS s ON r.useOrgSid = s.useOrgSid
@@ -284,7 +284,7 @@ UPDATE daily_report r
                                left join anrui_base.base_vehicle_out bvo on bv.sid = bvo.vinSid
                                left join anrui_base.base_vehicle_out_apply bvoa on bvoa.sid = bvo.mainSid
                       where bv.salesDate like concat('%', DATE_FORMAT(CURDATE(), '%Y-%m'), '%')
-                        and bvoa.saleTypeKey = '001'
+                        and bvoa.saleTypeKey = '001' and (bvo.materialTypeKey = '001' or bvo.materialTypeValue is null or length(bvo.materialTypeValue) = 0)
                       group by bv.useOrgSid, bv.modelSid, bv.modelConfigSid) ss
                 group by ss.useOrgSid, ss.modelSid, ss.modelConfigSid
     ) AS s ON r.useOrgSid = s.useOrgSid
@@ -300,7 +300,7 @@ UPDATE daily_report r
                                left join anrui_base.base_vehicle_out bvo on bv.sid = bvo.vinSid
                                left join anrui_base.base_vehicle_out_apply bvoa on bvoa.sid = bvo.mainSid
                       where bv.salesDate like concat('%', DATE_FORMAT(CURDATE(), '%Y-%m'), '%')
-                        and bvoa.saleTypeKey = '002'
+                        and bvoa.saleTypeKey = '002' and (bvo.materialTypeKey = '001' or bvo.materialTypeValue is null or length(bvo.materialTypeValue) = 0)
                       group by bv.useOrgSid, bv.modelSid, bv.modelConfigSid) ss
                 group by ss.useOrgSid, ss.modelSid, ss.modelConfigSid
     ) AS s ON r.useOrgSid = s.useOrgSid
@@ -333,7 +333,7 @@ UPDATE daily_report r
                                left join anrui_base.base_vehicle_out bvo on bv.sid = bvo.vinSid
                                left join anrui_base.base_vehicle_out_apply bvoa on bvoa.sid = bvo.mainSid
                       where bv.salesDate like concat('%', DATE_FORMAT(CURDATE(), '%Y'), '%')
-                        and bvoa.saleTypeKey = '001'
+                        and bvoa.saleTypeKey = '001' and (bvo.materialTypeKey = '001' or bvo.materialTypeValue is null or length(bvo.materialTypeValue) = 0)
                       group by bv.useOrgSid, bv.modelSid, bv.modelConfigSid) ss
                 group by ss.useOrgSid, ss.modelSid, ss.modelConfigSid
     ) AS s ON r.useOrgSid = s.useOrgSid
@@ -349,7 +349,7 @@ UPDATE daily_report r
                                left join anrui_base.base_vehicle_out bvo on bv.sid = bvo.vinSid
                                left join anrui_base.base_vehicle_out_apply bvoa on bvoa.sid = bvo.mainSid
                       where bv.salesDate like concat('%', DATE_FORMAT(CURDATE(), '%Y'), '%')
-                        and bvoa.saleTypeKey = '002'
+                        and bvoa.saleTypeKey = '002' and (bvo.materialTypeKey = '001' or bvo.materialTypeValue is null or length(bvo.materialTypeValue) = 0)
                       group by bv.useOrgSid, bv.modelSid, bv.modelConfigSid) ss
                 group by ss.useOrgSid, ss.modelSid, ss.modelConfigSid
     ) AS s ON r.useOrgSid = s.useOrgSid