欠款开票新增、修改、详情、回显、销售内勤审批移动端PC端添加欠款领票附件的上传

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDetailsVo.java

@@ -170,4 +170,6 @@ public class FinBillApplicationDetailsVo extends AppBillApplicationIInfoVo imple
     private List<FinBillFileVo> kpxxqrsApplicationAppendxs; // 开票信息确认书
     @ApiModelProperty("车辆登记合同")
     private List<FinBillFileVo> cldjhtApplicationAppendxs; // 车辆登记合同
+    @ApiModelProperty("欠款领票附件")
+    private List<FinBillFileVo> arrearsCollectionAppendxs;
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDto.java

@@ -163,4 +163,6 @@ public class FinBillApplicationDto implements Dto {
     private List<FinBillFileDto> zjApplicationAppendxs = new ArrayList<>();
     @ApiModelProperty("附件")
     private List<FinBillFileDto> fjApplicationAppendxs = new ArrayList<>();
+    @ApiModelProperty("欠款领票附件")
+    private List<FinBillFileDto> arrearsCollectionAppendxs = new ArrayList<>();
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/flowable/FinBillCompleteDto.java

@@ -49,4 +49,6 @@ public class FinBillCompleteDto implements Dto {
     private List<FinBillFileDto> zjApplicationAppendxs = new ArrayList<>();
     @ApiModelProperty("附件")
     private List<FinBillFileDto> fjApplicationAppendxs = new ArrayList<>();
+    @ApiModelProperty("欠款领票附件")
+    private List<FinBillFileDto> arrearsCollectionAppendxs = new ArrayList<>();
 }

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

@@ -11,7 +11,8 @@ public enum FinAttachTypeEnum {
     KPXXQRS("002", "款项确认书"),
     CLDJHT("003", "车辆登记合同"),
     ZJ("004", "证件"),
-    FJ("005", "附件");
+    FJ("005", "附件"),
+    QKLPFJ("006", "欠款领票附件");
 
     /**
      * 附件类型

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java

@@ -496,35 +496,6 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             }
             vo.setFinBillTrailers(finBillTrailerVos);
         }
-        /*else {
-            for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) {
-                BaseVehicle baseVehicle = baseVehicleFeign.selectByVinNoAndOrgSid(finBillVehicleVo.getVinNo(), entity.getUseOrgSid()).getData();
-                TraliveredVo data = baseTrailerFeign.trailerList(baseVehicle.getSid(), entity.getContractNo()).getData();
-                List<TrailerVo> trailerVoList = data.getList();
-                for (TrailerVo trailerVo : trailerVoList) {
-                    FinBillTrailerVo finBillTrailerVo = new FinBillTrailerVo();
-                    finBillTrailerVo.setBillAppSid(sid);
-                    finBillTrailerVo.setVinNo(finBillVehicleVo.getVinNo());
-                    finBillTrailerVo.setGcVinNo(trailerVo.getTrailerVinNo());
-                    finBillTrailerVo.setBillTypeKey(finBillVehicleVo.getBillTypeKey());
-                    finBillTrailerVo.setBillTypeValue(finBillVehicleVo.getBillTypeValue());
-                    finBillTrailerVo.setOpenTickSid(finBillVehicleVo.getOpenTickSid());
-                    finBillTrailerVo.setOpenTickName(finBillVehicleVo.getOpenTickName());
-                    //根据挂车车架号查询挂车信息以及合格证照片路径
-                    BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerFeign.fetchByGcVinNo(trailerVo.getTrailerVinNo()).getData();
-                    List<CommonAppendixVo> commonAppendixVos = commonAppendixFeign.selByLinkSid(baseTrailerDetailsVo.getSid()).getData();
-                    List<String> hgzImageUrls = new ArrayList<>();
-                    for (CommonAppendixVo commonAppendixVo : commonAppendixVos) {
-                        if (commonAppendixVo.getAttachType().equals("挂车合格证照片")) {
-                            hgzImageUrls.add(commonAppendixVo.getFileUrl());
-                        }
-                    }
-                    finBillTrailerVo.setHgzImageUrl(hgzImageUrls);
-                    finBillTrailerVos.add(finBillTrailerVo);
-                }
-            }
-            vo.setFinBillTrailers(finBillTrailerVos);
-        }*/
         List<FinBillFileVo> khkpsqsApplicationAppendxs = finBillFileService.fetchkhkpsqsBySid(sid);
         for (FinBillFileVo khkpsqsApplicationAppendx : khkpsqsApplicationAppendxs) {
             String fileUrl = khkpsqsApplicationAppendx.getFileUrl();
@@ -560,11 +531,19 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             fileUrl = urlPrefix + fileUrl;
             fjApplicationAppendx.setFileUrl(fileUrl);
         }
+        List<FinBillFileVo> arrearsCollectionAppendxs = finBillFileService.fetchqklpfjBySid(sid);
+        for (FinBillFileVo arrearsCollectionAppendx : arrearsCollectionAppendxs) {
+            String fileUrl = arrearsCollectionAppendx.getFileUrl();
+            String urlPrefix = fileUploadComponent.getUrlPrefix();
+            fileUrl = urlPrefix + fileUrl;
+            arrearsCollectionAppendx.setFileUrl(fileUrl);
+        }
         vo.setKhkpsqsApplicationAppendxs(khkpsqsApplicationAppendxs);
         vo.setKpxxqrsApplicationAppendxs(kpxxqrsApplicationAppendxs);
         vo.setCldjhtApplicationAppendxs(cldjhtApplicationAppendxs);
         vo.setZjApplicationAppendxs(zjApplicationAppendxs);
         vo.setFjApplicationAppendxs(fjApplicationAppendxs);
+        vo.setArrearsCollectionAppendxs(arrearsCollectionAppendxs);
         return vo;
     }
 
@@ -1463,6 +1442,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         List<FinBillFileDto> kpxxqrsApplicationAppendxs = dto.getKpxxqrsApplicationAppendxs();
         List<FinBillFileDto> cldjhtApplicationAppendxs = dto.getCldjhtApplicationAppendxs();
         List<FinBillFileDto> zjApplicationAppendxs = dto.getZjApplicationAppendxs();
+        List<FinBillFileDto> arrearsCollectionAppendxs = dto.getArrearsCollectionAppendxs();
         if (StringUtils.isBlank(dtoSid)) {//新增
             FinBillApplication finBillApplication = new FinBillApplication();
             BeanUtil.copyProperties(dto, finBillApplication, "sid");
@@ -1575,6 +1555,18 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                     finBillFileService.saveOrUpdateDto(finBillFileDto);
                 }
             }
+            if (arrearsCollectionAppendxs.size() > 0) {
+                for (FinBillFileDto finBillFileDto : arrearsCollectionAppendxs) {
+                    String filePath = finBillFileDto.getFileUrl();
+                    if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                        filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), "");
+                    }
+                    finBillFileDto.setFileUrl(filePath);
+                    finBillFileDto.setBillAppSid(finBillApplication.getSid());
+                    finBillFileDto.setAttachType(FinAttachTypeEnum.QKLPFJ.getAttachType());
+                    finBillFileService.saveOrUpdateDto(finBillFileDto);
+                }
+            }
             return rb.success().setMsg("保存成功").setData(finBillApplication.getSid());
         }
         FinBillApplication finBillApplication = fetchBySid(dtoSid);
@@ -1634,6 +1626,18 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                 finBillFileService.saveOrUpdateDto(finBillFileDto);
             }
         }
+        if (arrearsCollectionAppendxs.size() > 0) {
+            for (FinBillFileDto finBillFileDto : arrearsCollectionAppendxs) {
+                String filePath = finBillFileDto.getFileUrl();
+                if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                    filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), "");
+                }
+                finBillFileDto.setFileUrl(filePath);
+                finBillFileDto.setBillAppSid(finBillApplication.getSid());
+                finBillFileDto.setAttachType(FinAttachTypeEnum.QKLPFJ.getAttachType());
+                finBillFileService.saveOrUpdateDto(finBillFileDto);
+            }
+        }
         finBillVehicleService.delByBillAppSid(dtoSid);
         for (FinBillVehicleDto finBillVehicleDto : finBillVehicles) {
             FinBillVehicle finBillVehicle = new FinBillVehicle();
@@ -2044,6 +2048,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         List<FinBillFileDto> kpxxqrsApplicationAppendxs = query.getKpxxqrsApplicationAppendxs();
         List<FinBillFileDto> cldjhtApplicationAppendxs = query.getCldjhtApplicationAppendxs();
         List<FinBillFileDto> zjApplicationAppendxs = query.getZjApplicationAppendxs();
+        List<FinBillFileDto> arrearsCollectionAppendxs = query.getArrearsCollectionAppendxs();
         if (zjApplicationAppendxs.size() == 0) {
             return rb.setMsg("证件不能为空");
         }
@@ -2132,6 +2137,18 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                     finBillFileService.saveOrUpdateDto(finBillFileDto);
                 }
             }
+            if (arrearsCollectionAppendxs.size() > 0) {
+                for (FinBillFileDto finBillFileDto : arrearsCollectionAppendxs) {
+                    String filePath = finBillFileDto.getFileUrl();
+                    if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
+                        filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), "");
+                    }
+                    finBillFileDto.setFileUrl(filePath);
+                    finBillFileDto.setBillAppSid(businessSid);
+                    finBillFileDto.setAttachType(FinAttachTypeEnum.QKLPFJ.getAttachType());
+                    finBillFileService.saveOrUpdateDto(finBillFileDto);
+                }
+            }
             //极光推送
             finBillApplication = fetchBySid(businessSid);
             MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();

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

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

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

@@ -169,4 +169,8 @@ public class FinBillFileService extends MybatisBaseService<FinBillFileMapper, Fi
     public List<FinBillFileVo> fetchFileByBillSid(String sid) {
         return baseMapper.fetchFileByBillSid(sid);
     }
+
+    public List<FinBillFileVo> fetchqklpfjBySid(String sid) {
+        return baseMapper.fetchqklpfjBySid(sid);
+    }
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceDto.java

@@ -63,6 +63,8 @@ public class AdvanceInvoiceDto implements Dto {
     private List<String> registerContractImages;
     @ApiModelProperty("确认书")
     private List<String> invoiceApplyConfirmImages;
+    @ApiModelProperty("欠款领票附件")
+    private List<String> arrearsCollectionAppendxs;
     @ApiModelProperty("用户sid")
     private String userSid;
     @ApiModelProperty("组织全路径")

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/AdvanceInvoiceInfoVo.java

@@ -68,6 +68,8 @@ public class AdvanceInvoiceInfoVo implements Vo {
     private List<String> registerContractImages;
     @ApiModelProperty("确认书")
     private List<String> invoiceApplyConfirmImages;
+    @ApiModelProperty("欠款领票附件")
+    private List<String> arrearsCollectionAppendxs;
     @ApiModelProperty("用户sid")
     private String userSid;
     @ApiModelProperty("组织全路径")

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/advanceInvoice/flowable/qkkpDto.java

@@ -47,6 +47,8 @@ public class qkkpDto implements Dto {
     private List<String> registerContractImages = new ArrayList<>();
     @ApiModelProperty("确认书")
     private List<String> invoiceApplyConfirmImages = new ArrayList<>();
+    @ApiModelProperty("欠款领票附件")
+    private List<String> arrearsCollectionAppendxs = new ArrayList<>();
 
     private String orgPath;
 

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java

@@ -480,10 +480,12 @@ public class AppBusAdvanceGinvoiceapplyService {
         List<String> invoiceApplyConfirmImages = dto.getInvoiceApplyConfirmImages();//开票信息确认书
         List<String> registerContractImages = dto.getRegisterContractImages();//车辆登记合同
         List<String> idCardImages = dto.getIdCardImages();//证件
+        List<String> arrearsCollectionAppendxs = dto.getArrearsCollectionAppendxs();//欠款领票附件
         List<FinBillFileDto> khkpsqsApplicationAppendxs = new ArrayList<>(); // 客户开票申请书附件信息
         List<FinBillFileDto> kpxxqrsApplicationAppendxs = new ArrayList<>(); // 开票信息确认书附件信息
         List<FinBillFileDto> cldjhtApplicationAppendxs = new ArrayList<>(); // 车辆登记合同附件信息
         List<FinBillFileDto> idCardImagesPC = new ArrayList<>();//证件
+        List<FinBillFileDto> qklpfjImages = new ArrayList<>(); // 欠款领票附件
         if (customerInvoiceApplyImages != null) {
             for (String customerInvoiceApplyImage : customerInvoiceApplyImages) {
                 FinBillFileDto finBillFileDto = new FinBillFileDto();
@@ -512,10 +514,18 @@ public class AppBusAdvanceGinvoiceapplyService {
                 idCardImagesPC.add(finBillFileDto);
             }
         }
+        if (arrearsCollectionAppendxs != null) {
+            for (String arrearsCollectionAppendx : arrearsCollectionAppendxs) {
+                FinBillFileDto finBillFileDto = new FinBillFileDto();
+                finBillFileDto.setFileUrl(arrearsCollectionAppendx);
+                qklpfjImages.add(finBillFileDto);
+            }
+        }
         finBillApplicationDto.setKhkpsqsApplicationAppendxs(khkpsqsApplicationAppendxs);
         finBillApplicationDto.setKpxxqrsApplicationAppendxs(kpxxqrsApplicationAppendxs);
         finBillApplicationDto.setCldjhtApplicationAppendxs(cldjhtApplicationAppendxs);
         finBillApplicationDto.setZjApplicationAppendxs(idCardImagesPC);
+        finBillApplicationDto.setArrearsCollectionAppendxs(qklpfjImages);
         ResultBean resultBean = finBillApplicationFeign.saveQK(finBillApplicationDto);
         return resultBean;
     }
@@ -889,10 +899,12 @@ public class AppBusAdvanceGinvoiceapplyService {
         List<FinBillFileVo> kpxxqrsApplicationAppendxs = finBillApplicationDetailsVo.getKpxxqrsApplicationAppendxs();
         List<FinBillFileVo> cldjhtApplicationAppendxs = finBillApplicationDetailsVo.getCldjhtApplicationAppendxs();
         List<FinBillFileVo> zjApplicationAppendxs = finBillApplicationDetailsVo.getZjApplicationAppendxs();
+        List<FinBillFileVo> arrearsCollectionAppendxs = finBillApplicationDetailsVo.getArrearsCollectionAppendxs();
         List<String> customerInvoiceApplyImages = new ArrayList<>();//客户开票申请书
         List<String> invoiceApplyConfirmImages = new ArrayList<>();//开票信息确认书
         List<String> registerContractImages = new ArrayList<>();//车辆登记合同
         List<String> idCardImages = new ArrayList<>();
+        List<String> qklpfjImages = new ArrayList<>();//欠款领票附件
         if (zjApplicationAppendxs != null) {
             for (FinBillFileVo zjApplicationAppendx : zjApplicationAppendxs) {
                 idCardImages.add(zjApplicationAppendx.getFileUrl());
@@ -913,10 +925,16 @@ public class AppBusAdvanceGinvoiceapplyService {
                 registerContractImages.add(cldjhtApplicationAppendx.getFileUrl());
             }
         }
+        if (arrearsCollectionAppendxs != null) {
+            for (FinBillFileVo cldjhtApplicationAppendx : arrearsCollectionAppendxs) {
+                qklpfjImages.add(cldjhtApplicationAppendx.getFileUrl());
+            }
+        }
         vo.setCustomerInvoiceApplyImages(customerInvoiceApplyImages);
         vo.setInvoiceApplyConfirmImages(invoiceApplyConfirmImages);
         vo.setRegisterContractImages(registerContractImages);
         vo.setIdCardImages(idCardImages);
+        vo.setArrearsCollectionAppendxs(qklpfjImages);
         BusSalesOrderIsDTKPJVo busSalesOrderIsDTKPJVo = busSalesOrderFeign.fetchByContractNo(finBillApplicationDetailsVo.getContractNo()).getData();
         if (StringUtils.isNotBlank(busSalesOrderIsDTKPJVo.getOneBillMoney())) {
             vo.setIsCanEdit(false);
@@ -953,10 +971,12 @@ public class AppBusAdvanceGinvoiceapplyService {
         List<String> invoiceApplyConfirmImages = dto.getInvoiceApplyConfirmImages();//开票信息确认书
         List<String> registerContractImages = dto.getRegisterContractImages();//车辆登记合同
         List<String> idCardImages = dto.getIdCardImages();//证件
+        List<String> arrearsCollectionAppendxs = dto.getArrearsCollectionAppendxs();//欠款领票附件
         List<FinBillFileDto> khkpsqsApplicationAppendxs = new ArrayList<>(); // 客户开票申请书附件信息
         List<FinBillFileDto> kpxxqrsApplicationAppendxs = new ArrayList<>(); // 开票信息确认书附件信息
         List<FinBillFileDto> cldjhtApplicationAppendxs = new ArrayList<>(); // 车辆登记合同附件信息
         List<FinBillFileDto> idCardImagesPC = new ArrayList<>();//证件
+        List<FinBillFileDto> qklpfjImages = new ArrayList<>();//欠款领票附件
         if (customerInvoiceApplyImages != null) {
             for (String customerInvoiceApplyImage : customerInvoiceApplyImages) {
                 FinBillFileDto finBillFileDto = new FinBillFileDto();
@@ -985,10 +1005,18 @@ public class AppBusAdvanceGinvoiceapplyService {
                 idCardImagesPC.add(finBillFileDto);
             }
         }
+        if (arrearsCollectionAppendxs != null) {
+            for (String arrearsCollectionAppendx : arrearsCollectionAppendxs) {
+                FinBillFileDto finBillFileDto = new FinBillFileDto();
+                finBillFileDto.setFileUrl(arrearsCollectionAppendx);
+                qklpfjImages.add(finBillFileDto);
+            }
+        }
         finBillCompleteDto.setKhkpsqsApplicationAppendxs(khkpsqsApplicationAppendxs);
         finBillCompleteDto.setKpxxqrsApplicationAppendxs(kpxxqrsApplicationAppendxs);
         finBillCompleteDto.setCldjhtApplicationAppendxs(cldjhtApplicationAppendxs);
         finBillCompleteDto.setZjApplicationAppendxs(idCardImagesPC);
+        finBillCompleteDto.setArrearsCollectionAppendxs(qklpfjImages);
         finBillCompleteDto.setOrgSidPath(orgSidPath);
         ResultBean resultBean = finBillApplicationFeign.completeBy(finBillCompleteDto);
         if (!resultBean.getSuccess()) {