Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleState.java

@@ -35,7 +35,7 @@ public class BaseVehicleState extends BaseEntity {
     @ApiModelProperty("开票申请状态：未发起过0，审批通过的为1，审批不通过为改为0，审批中的为2，驳回或撤回到发起人修改为0，默认为0，提交时需要判断是否已发起开票申请流程")
     private String invoiceApplyState;
     @ApiModelProperty("资方终审：0未通过，1通过，贷款资方终审通过时设置为1")
-    private String  manageState;
+    private String manageState;
     @ApiModelProperty("包牌业务")
     private String packageBusiness;
     @ApiModelProperty("合同状态")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateEnum.java

@@ -91,6 +91,11 @@ public class BaseVehicleStateEnum {
         JFZB("21","家访准备"),
         JFKC("22","家访考察"),
         JFZLSH("23","家访资料审核"),
+        KPSQTJ("24","开票申请提交"),
+        KPSQZZ("25","开票申请终止"),
+        KPSQTG("26","开票申请通过"),
+        KPSQBH("27","开票申请驳回"),
+        KPSQCH("28","开票申请撤回"),
         ;
 
         private String typeKey;

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java

@@ -2169,13 +2169,13 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
                         String assigneeName = (String) taskUserInfos.get(0).get("assigneeName");
                         String finishTime = (String) flowableRecordVo.get("finishTime");
                         finishTime = finishTime.substring(0, 10);
-                        if ("Activity_1x1eivz".equals(taskDefKey)) {
+                        if ("Activity_0kodcz1".equals(taskDefKey) || "Activity_1x1eivz".equals(taskDefKey)) {
                             dataMap.put("makeName", assigneeName + finishTime);
-                        } else if ("Activity_13w5v5m".equals(taskDefKey)) {
+                        } else if ("Activity_1bojg9v".equals(taskDefKey) || "Activity_13w5v5m".equals(taskDefKey)) {
                             dataMap.put("jrsp", assigneeName + finishTime);
-                        } else if ("Activity_1xzxtct".equals(taskDefKey) || "Activity_1ohp3br".equals(taskDefKey)) {
+                        } else if ("Activity_1f3fqeh".equals(taskDefKey) || "Activity_1v7kn5s".equals(taskDefKey) || "Activity_1xzxtct".equals(taskDefKey) || "Activity_1ohp3br".equals(taskDefKey)) {
                             dataMap.put("confirmName", assigneeName + finishTime);
-                        } else if ("Activity_1461e4e".equals(taskDefKey)) {
+                        } else if ("Activity_1kdrmgx".equals(taskDefKey) || "Activity_1tnvpt7".equals(taskDefKey) || "Activity_1461e4e".equals(taskDefKey)) {
                             dataMap.put("cwsp", assigneeName + finishTime);
                         }
                     }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java

@@ -107,7 +107,17 @@ public class BaseVehicleStateService extends MybatisBaseService<BaseVehicleState
                     baseVehicleState.setBusState(BaseVehicleStateEnum.BusStateEnum.JFKC.getStateKey());
                 }else if (BaseVehicleStateEnum.OperateTypeEnum.JFZLSH.getTypeKey().equals(operateType)){
                     baseVehicleState.setBusState(BaseVehicleStateEnum.BusStateEnum.JFZLSH.getStateKey());
-                }*/
+                }*/else if (BaseVehicleStateEnum.OperateTypeEnum.KPSQTJ.getTypeKey().equals(operateType)){
+                    baseVehicleState.setInvoiceApplyState("2");
+                }else if (BaseVehicleStateEnum.OperateTypeEnum.KPSQZZ.getTypeKey().equals(operateType)){
+                    baseVehicleState.setInvoiceApplyState("0");
+                }else if (BaseVehicleStateEnum.OperateTypeEnum.KPSQTG.getTypeKey().equals(operateType)){
+                    baseVehicleState.setInvoiceApplyState("1");
+                }else if (BaseVehicleStateEnum.OperateTypeEnum.KPSQBH.getTypeKey().equals(operateType)){
+                    baseVehicleState.setInvoiceApplyState("0");
+                }else if (BaseVehicleStateEnum.OperateTypeEnum.KPSQCH.getTypeKey().equals(operateType)){
+                    baseVehicleState.setInvoiceApplyState("0");
+                }
                 baseMapper.updateById(baseVehicleState);
             } else {
                 if (BaseVehicleStateEnum.OperateTypeEnum.DDBA_PASS.getTypeKey().equals(operateType)) {

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

@@ -165,8 +165,14 @@ public class FinBillApplicationDetailsVo extends AppBillApplicationIInfoVo imple
     private List<FinBillVehicleVo> finBillVehicles; // 开票车辆信息
     @ApiModelProperty("开票挂车信息")
     private List<FinBillTrailerVo> finBillTrailers; // 开票挂车信息
-    @ApiModelProperty("附件")
+    @ApiModelProperty("欠款承诺书(欠款人、担保人同签)")
     private List<FinBillFileVo> fjApplicationAppendxs;
+    @ApiModelProperty("公司股东会对外担保决议(公司担保)")
+    private List<FinBillFileVo> pcgsgdhdwdbjy;
+    @ApiModelProperty("责任人担保承诺书")
+    private List<FinBillFileVo> pczrrdbcns;
+    @ApiModelProperty("资方信审截图")
+    private List<FinBillFileVo> pczfxsjt;
     @ApiModelProperty("证件")
     private List<FinBillFileVo> zjApplicationAppendxs; // 证件
     @ApiModelProperty("车辆买卖合同附件信息")

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

@@ -165,8 +165,14 @@ public class FinBillApplicationDto implements Dto {
     private List<FinBillFileDto> cldjhtApplicationAppendxs = new ArrayList<>();
     @ApiModelProperty("证件")
     private List<FinBillFileDto> zjApplicationAppendxs = new ArrayList<>();
-    @ApiModelProperty("附件")
+    @ApiModelProperty("欠款承诺书(欠款人、担保人同签)")
     private List<FinBillFileDto> fjApplicationAppendxs = new ArrayList<>();
+    @ApiModelProperty("公司股东会对外担保决议(公司担保)")
+    private List<FinBillFileDto> pcgsgdhdwdbjy = new ArrayList<>();
+    @ApiModelProperty("责任人担保承诺书")
+    private List<FinBillFileDto> pczrrdbcns = new ArrayList<>();
+    @ApiModelProperty("资方信审截图")
+    private List<FinBillFileDto> pczfxsjt = 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

@@ -13,7 +13,11 @@ public enum FinAttachTypeEnum {
     ZJ("004", "证件"),
     FJ("005", "附件"),
     QKLPFJ("006", "欠款领票附件"),
-    CLMMHT("007", "车辆买卖合同");
+    CLMMHT("007", "车辆买卖合同"),
+    GSGDHDWDBJY("008", "公司股东会对外担保决议"),
+    ZRRDBCNS("009", "责任人担保承诺书"),
+    ZFXSJT("010", "资方信审截图"),
+    ;
 
     /**
      * 附件类型

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

@@ -758,6 +758,27 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             fileUrl = urlPrefix + fileUrl;
             fjApplicationAppendx.setFileUrl(fileUrl);
         }
+        List<FinBillFileVo> pcgsgdhdwdbjy = finBillFileService.fetchgsgdhdwdbjyBySid(sid);
+        for (FinBillFileVo pcgsgdhdwdb : pcgsgdhdwdbjy) {
+            String fileUrl = pcgsgdhdwdb.getFileUrl();
+            String urlPrefix = fileUploadComponent.getUrlPrefix();
+            fileUrl = urlPrefix + fileUrl;
+            pcgsgdhdwdb.setFileUrl(fileUrl);
+        }
+        List<FinBillFileVo> pczrrdbcns = finBillFileService.fetchzrrdbcnsBySid(sid);
+        for (FinBillFileVo pczrrdbcn : pczrrdbcns) {
+            String fileUrl = pczrrdbcn.getFileUrl();
+            String urlPrefix = fileUploadComponent.getUrlPrefix();
+            fileUrl = urlPrefix + fileUrl;
+            pczrrdbcn.setFileUrl(fileUrl);
+        }
+        List<FinBillFileVo> pczfxsjt = finBillFileService.fetchzfxsjtBySid(sid);
+        for (FinBillFileVo pczfxs : pczfxsjt) {
+            String fileUrl = pczfxs.getFileUrl();
+            String urlPrefix = fileUploadComponent.getUrlPrefix();
+            fileUrl = urlPrefix + fileUrl;
+            pczfxs.setFileUrl(fileUrl);
+        }
         List<FinBillFileVo> arrearsCollectionAppendxs = finBillFileService.fetchqklpfjBySid(sid);
         for (FinBillFileVo arrearsCollectionAppendx : arrearsCollectionAppendxs) {
             String fileUrl = arrearsCollectionAppendx.getFileUrl();
@@ -771,6 +792,9 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         vo.setCldjhtApplicationAppendxs(cldjhtApplicationAppendxs);
         vo.setZjApplicationAppendxs(zjApplicationAppendxs);
         vo.setFjApplicationAppendxs(fjApplicationAppendxs);
+        vo.setPcgsgdhdwdbjy(pcgsgdhdwdbjy);
+        vo.setPczrrdbcns(pczrrdbcns);
+        vo.setPczfxsjt(pczfxsjt);
         vo.setArrearsCollectionAppendxs(arrearsCollectionAppendxs);
         //判断是否是高低开，若是，则isAdj网关参数为true=============添加
         BusSalesOrderPrice data = busSalesOrderFeign.selectByContractNo(contractNo).getData();
@@ -846,10 +870,18 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             UpdateFlowFieldVo ufVo = resultBean.getData();
             updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
             if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
-                List<BaseVehicleStateDto> baseVehicleStateDtos = new ArrayList<>();
-                baseVehicleStateFeign.saveOrUpdate(baseVehicleStateDtos);
                 List<FinBillVehicleVo> finBillVehicleVos = finBillVehicleService.fetchVehBySid(businessSid);
                 List<FinBillTrailerVo> finBillTrailerVos = finBillTrailerService.fetchByMainSid(businessSid);
+                //修改车辆表状态
+                List<BaseVehicleStateDto> baseVehicleStateDtos = new ArrayList<>();
+                for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) {
+                    BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
+                    BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(finBillApplication.getContractNo(), finBillVehicleVo.getVehSid()).getData();
+                    baseVehicleStateDto.setBusSid(busSalesOrderVehicle.getSid());
+                    baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.KPSQTG.getTypeKey());
+                    baseVehicleStateDtos.add(baseVehicleStateDto);
+                }
+                baseVehicleStateFeign.saveOrUpdate(baseVehicleStateDtos);
                 if (!data.getSingleFinalPrice().equals(finBillApplication.getOneBillMoney())) {//是高低开
                     BusValcustFilingDto busValcustFilingDto = new BusValcustFilingDto();
                     busValcustFilingDto.setCreateBySid(finBillApplication.getCreateBySid());
@@ -1157,6 +1189,17 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                 Map<String, Object> map = BeanUtil.beanToMap(ufVo);
                 //更新业务中的流程相关的参数
                 updateFlowFiled(map);
+                //修改车辆表状态
+                List<BaseVehicleStateDto> baseVehicleStateDtos = new ArrayList<>();
+                List<FinBillVehicleVo> finBillVehicleVos = finBillVehicleService.fetchByMainSid(businessSid);
+                for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) {
+                    BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
+                    BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(finBillApplication.getContractNo(), finBillVehicleVo.getVehSid()).getData();
+                    baseVehicleStateDto.setBusSid(busSalesOrderVehicle.getSid());
+                    baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.KPSQBH.getTypeKey());
+                    baseVehicleStateDtos.add(baseVehicleStateDto);
+                }
+                baseVehicleStateFeign.saveOrUpdate(baseVehicleStateDtos);
                 finBillApplication = fetchBySid(businessSid);
                 try {
                     ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
@@ -1213,6 +1256,17 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                     return rb.setMsg(resultBean.getMsg());
                 }
                 updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
+                //修改车辆表状态
+                List<BaseVehicleStateDto> baseVehicleStateDtos = new ArrayList<>();
+                List<FinBillVehicleVo> finBillVehicleVos = finBillVehicleService.fetchByMainSid(query.getBusinessSid());
+                for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) {
+                    BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
+                    BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(finBillApplication.getContractNo(), finBillVehicleVo.getVehSid()).getData();
+                    baseVehicleStateDto.setBusSid(busSalesOrderVehicle.getSid());
+                    baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.KPSQCH.getTypeKey());
+                    baseVehicleStateDtos.add(baseVehicleStateDto);
+                }
+                baseVehicleStateFeign.saveOrUpdate(baseVehicleStateDtos);
                 return rb.success().setData(resultBean.getData());
             }
         }
@@ -1246,6 +1300,17 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                 }
                 Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
                 updateFlowFiled(map);
+                //修改车辆表状态
+                List<BaseVehicleStateDto> baseVehicleStateDtos = new ArrayList<>();
+                List<FinBillVehicleVo> finBillVehicleVos = finBillVehicleService.fetchByMainSid(query.getBusinessSid());
+                for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) {
+                    BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
+                    BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(finBillApplication.getContractNo(), finBillVehicleVo.getVehSid()).getData();
+                    baseVehicleStateDto.setBusSid(busSalesOrderVehicle.getSid());
+                    baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.KPSQZZ.getTypeKey());
+                    baseVehicleStateDtos.add(baseVehicleStateDto);
+                }
+                baseVehicleStateFeign.saveOrUpdate(baseVehicleStateDtos);
                 finBillVehicleService.updateByMainSid(finBillApplication.getSid());
                 return rb.success().setData(resultBean.getData());
             } else {
@@ -1258,6 +1323,17 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                     }
                     Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
                     updateFlowFiled(map);
+                    //修改车辆表状态
+                    List<BaseVehicleStateDto> baseVehicleStateDtos = new ArrayList<>();
+                    List<FinBillVehicleVo> finBillVehicleVos = finBillVehicleService.fetchByMainSid(query.getBusinessSid());
+                    for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) {
+                        BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
+                        BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(finBillApplication.getContractNo(), finBillVehicleVo.getVehSid()).getData();
+                        baseVehicleStateDto.setBusSid(busSalesOrderVehicle.getSid());
+                        baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.KPSQZZ.getTypeKey());
+                        baseVehicleStateDtos.add(baseVehicleStateDto);
+                    }
+                    baseVehicleStateFeign.saveOrUpdate(baseVehicleStateDtos);
                     finBillVehicleService.updateByMainSid(finBillApplication.getSid());
                     return rb.success().setData(resultBean.getData());
                 }
@@ -1356,6 +1432,15 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             UpdateFlowFieldVo ufVo = voResultBean.getData();
             updateFlowFiled(BeanUtil.beanToMap(ufVo));
             //修改车辆表状态
+            List<BaseVehicleStateDto> baseVehicleStateDtos = new ArrayList<>();
+            for (FinBillVehicleDto finBillVehicleDto : finBillVehicles) {
+                BaseVehicleStateDto baseVehicleStateDto = new BaseVehicleStateDto();
+                BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(finBillApplication.getContractNo(), finBillVehicleDto.getVehSid()).getData();
+                baseVehicleStateDto.setBusSid(busSalesOrderVehicle.getSid());
+                baseVehicleStateDto.setOperateType(BaseVehicleStateEnum.OperateTypeEnum.KPSQTJ.getTypeKey());
+                baseVehicleStateDtos.add(baseVehicleStateDto);
+            }
+            baseVehicleStateFeign.saveOrUpdate(baseVehicleStateDtos);
             //极光推送
             finBillApplication = fetchBySid(businessSid);
             try {
@@ -2059,6 +2144,9 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         List<FinBillTrailerDto> finBillTrailers = dto.getFinBillTrailers();
         List<FinBillVehicleDto> finBillVehicles = dto.getFinBillVehicles();
         List<FinBillFileDto> fjApplicationAppendxs = dto.getFjApplicationAppendxs();
+        List<FinBillFileDto> pcgsgdhdwdbjy = dto.getPcgsgdhdwdbjy();
+        List<FinBillFileDto> pczrrdbcns = dto.getPczrrdbcns();
+        List<FinBillFileDto> pczfxsjt = dto.getPczfxsjt();
         if (StringUtils.isBlank(dtoSid)) {//新增
             if ("是".equals(dto.getIsLQOrigInvoice())) {
                 return rb.setMsg("请选择未领取发票原件的申请");
@@ -2119,6 +2207,42 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                     finBillFileService.saveOrUpdateDto(finBillFileDto);
                 }
             }
+            if (pcgsgdhdwdbjy.size() > 0) {
+                for (FinBillFileDto finBillFileDto : pcgsgdhdwdbjy) {
+                    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.GSGDHDWDBJY.getAttachType());
+                    finBillFileService.saveOrUpdateDto(finBillFileDto);
+                }
+            }
+            if (pczrrdbcns.size() > 0) {
+                for (FinBillFileDto finBillFileDto : pczrrdbcns) {
+                    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.ZRRDBCNS.getAttachType());
+                    finBillFileService.saveOrUpdateDto(finBillFileDto);
+                }
+            }
+            if (pczfxsjt.size() > 0) {
+                for (FinBillFileDto finBillFileDto : pczfxsjt) {
+                    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.ZFXSJT.getAttachType());
+                    finBillFileService.saveOrUpdateDto(finBillFileDto);
+                }
+            }
             return rb.success().setMsg("保存成功").setData(finBillApplication.getSid());
         }
         FinBillApplication finBillApplication = fetchBySid(dtoSid);
@@ -3694,6 +3818,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         //=======================================
         bv.setFormVariables(variables);
         bv.setOrgSidPath(finBillApplication.getOrgSidPath());
+        bv.setModelId(finBillApplication.getProcDefId());
         if (bv.getTaskId().equals(finBillApplication.getTaskId())) {
             ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv);
             if (!resultBean.getSuccess()) {

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

@@ -96,4 +96,13 @@ public interface FinBillFileMapper extends BaseMapper<FinBillFile> {
 	List<FinBillFileVo> fetchclmmhtBySid(String sid);
 
 	List<FinBillFileVo> fetchFileByBillSid(@Param("sid") String sid);
+
+	@Select("select * from fin_bill_file where billAppSid = #{sid} and attachType = '008'")
+	List<FinBillFileVo> fetchgsgdhdwdbjyBySid(String sid);
+
+	@Select("select * from fin_bill_file where billAppSid = #{sid} and attachType = '009'")
+	List<FinBillFileVo> fetchzrrdbcnsBySid(String sid);
+
+	@Select("select * from fin_bill_file where billAppSid = #{sid} and attachType = '010'")
+	List<FinBillFileVo> fetchzfxsjtBySid(String sid);
 }

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

@@ -177,4 +177,16 @@ public class FinBillFileService extends MybatisBaseService<FinBillFileMapper, Fi
     public List<FinBillFileVo> fetchclmmhtBySid(String sid) {
         return baseMapper.fetchclmmhtBySid(sid);
     }
+
+    public List<FinBillFileVo> fetchgsgdhdwdbjyBySid(String sid) {
+        return baseMapper.fetchgsgdhdwdbjyBySid(sid);
+    }
+
+    public List<FinBillFileVo> fetchzrrdbcnsBySid(String sid) {
+        return baseMapper.fetchzrrdbcnsBySid(sid);
+    }
+
+    public List<FinBillFileVo> fetchzfxsjtBySid(String sid) {
+        return baseMapper.fetchzfxsjtBySid(sid);
+    }
 }

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java

@@ -14,7 +14,7 @@ public enum ProcDefEnum {
     ORDERDEPOSITVEHICLEAPPROVE("简易订单-车辆预定", "process_pkyns85b:5:575008"),
     ORDERAPPROVE("订单审批", "order_approve_96asleqi:1:227504"),
     SALESPOLICY("销售政策审批流程", "process_biw9gfh7:3:917504"),
-    FINBILLAPPLICATION("开票申请流程", "process_hxys3ap3:4:4505004"),
+    FINBILLAPPLICATION("开票申请流程", "process_hxys3ap3:5:5665004"),
     QKFINBILLAPPLICATION("欠款开票申请流程", "process_q4evu61h:2:5100004"),
     QKLPFINBILLAPPLICATION("欠款领票申请流程", "process_x9r8epty:5:4975008"),
     ARREARSCARRYVEHICLE("欠款提车审批流程", "process_f2dkbvny:5:4975004"),

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

@@ -53,8 +53,14 @@ public class AdvanceInvoiceDto implements Dto {
     private String remarks;
     @ApiModelProperty("欠款开票挂车信息")
     private List<FinBillTrailerDto> finBillTrailers;
-    @ApiModelProperty("附件")
+    @ApiModelProperty("欠款承诺书(欠款人、担保人同签)")
     private List<String> fjApplicationAppendxs;
+    @ApiModelProperty("公司股东会对外担保决议(公司担保)")
+    private List<String> gsgdhdwdbjy;
+    @ApiModelProperty("责任人担保承诺书")
+    private List<String> zrrdbcns;
+    @ApiModelProperty("资方信审截图")
+    private List<String> zfxsjt;
     @ApiModelProperty("证件")
     private List<String> idCardImages;
     @ApiModelProperty("车辆买卖合同")

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

@@ -58,8 +58,14 @@ public class AdvanceInvoiceInfoVo implements Vo {
     private String reasonRemarks;
     @ApiModelProperty("欠款开票挂车信息")
     private List<FinBillTrailerVo> finBillTrailers;
-    @ApiModelProperty("附件")
+    @ApiModelProperty("欠款承诺书(欠款人、担保人同签)")
     private List<String> fjApplicationAppendxs;
+    @ApiModelProperty("公司股东会对外担保决议(公司担保)")
+    private List<String> gsgdhdwdbjy;
+    @ApiModelProperty("责任人担保承诺书")
+    private List<String> zrrdbcns;
+    @ApiModelProperty("资方信审截图")
+    private List<String> zfxsjt;
     @ApiModelProperty("证件")
     private List<String> idCardImages;
     @ApiModelProperty("车辆买卖合同")

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

@@ -166,7 +166,7 @@ public interface DistributorFeign {
     ResultBean<String> getFlowOperateTitle(@Valid @SpringQueryMap DistributorFlowableQuery query);
 
     @ApiOperation(value = "加签")
-    @PostMapping(value = "/delegate")
+    @PutMapping(value = "/delegate")
     @ResponseBody
     public ResultBean delegate(@RequestBody AppDistributorDelegateQuery appDistributorDelegateQuery);
 

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

@@ -406,7 +406,7 @@ public class AppBusAdvanceGinvoiceapplyService {
             }
         }
         vo.setFinBillTrailers(finBillTrailerVos);
-        //附件信息
+        //《欠款承诺书》(欠款人、担保人同签)
         List<FinBillFileVo> fjApplicationAppendxs = finBillApplicationDetailsVo.getFjApplicationAppendxs();
         List<String> fj = new ArrayList<>();
         if (fjApplicationAppendxs != null) {
@@ -415,6 +415,33 @@ public class AppBusAdvanceGinvoiceapplyService {
             }
         }
         vo.setFjApplicationAppendxs(fj);
+        //《公司股东会对外担保决议》(公司担保)
+        List<FinBillFileVo> pcgsgdhdwdbjy = finBillApplicationDetailsVo.getPcgsgdhdwdbjy();
+        List<String> gsgdhdwdbjy = new ArrayList<>();
+        if (pcgsgdhdwdbjy != null) {
+            for (FinBillFileVo pcgsgdhdwdb : pcgsgdhdwdbjy) {
+                gsgdhdwdbjy.add(pcgsgdhdwdb.getFileUrl());
+            }
+        }
+        vo.setGsgdhdwdbjy(gsgdhdwdbjy);
+        //《责任人担保承诺书》
+        List<FinBillFileVo> pczrrdbcns = finBillApplicationDetailsVo.getPczrrdbcns();
+        List<String> zrrdbcns = new ArrayList<>();
+        if (pczrrdbcns != null) {
+            for (FinBillFileVo pczrrdbcn : pczrrdbcns) {
+                zrrdbcns.add(pczrrdbcn.getFileUrl());
+            }
+        }
+        vo.setZrrdbcns(zrrdbcns);
+        //资方信审截图
+        List<FinBillFileVo> pczfxsjt = finBillApplicationDetailsVo.getPczfxsjt();
+        List<String> zfxsjt = new ArrayList<>();
+        if (pczfxsjt != null) {
+            for (FinBillFileVo pczfxs : pczfxsjt) {
+                zfxsjt.add(pczfxs.getFileUrl());
+            }
+        }
+        vo.setZfxsjt(zfxsjt);
         BusSalesOrderIsDTKPJVo busSalesOrderIsDTKPJVo = busSalesOrderFeign.fetchByContractNo(finBillApplicationDetailsVo.getContractNo()).getData();
         if (StringUtils.isNotBlank(busSalesOrderIsDTKPJVo.getOneBillMoney())) {
             vo.setIsCanEdit(false);
@@ -610,8 +637,14 @@ public class AppBusAdvanceGinvoiceapplyService {
         }
         finBillApplicationDto.setFinBillTrailers(finBillTrailerDtos);
         //附件信息
-        List<String> fjApplicationAppendxs = dto.getFjApplicationAppendxs();//证件
-        List<FinBillFileDto> fj = new ArrayList<>();//证件
+        List<String> fjApplicationAppendxs = dto.getFjApplicationAppendxs();
+        List<String> gsgdhdwdbjy = dto.getGsgdhdwdbjy();
+        List<String> zrrdbcns = dto.getZrrdbcns();
+        List<String> zfxsjt = dto.getZfxsjt();
+        List<FinBillFileDto> fj = new ArrayList<>();
+        List<FinBillFileDto> pcgsgdhdwdbjy = new ArrayList<>();
+        List<FinBillFileDto> pczrrdbcns = new ArrayList<>();
+        List<FinBillFileDto> pczfxsjt = new ArrayList<>();
         if (fjApplicationAppendxs != null) {
             for (String fjApplicationAppendx : fjApplicationAppendxs) {
                 FinBillFileDto finBillFileDto = new FinBillFileDto();
@@ -619,7 +652,31 @@ public class AppBusAdvanceGinvoiceapplyService {
                 fj.add(finBillFileDto);
             }
         }
+        if (gsgdhdwdbjy != null) {
+            for (String gsgdhdwdb : gsgdhdwdbjy) {
+                FinBillFileDto finBillFileDto = new FinBillFileDto();
+                finBillFileDto.setFileUrl(gsgdhdwdb);
+                pcgsgdhdwdbjy.add(finBillFileDto);
+            }
+        }
+        if (zrrdbcns != null) {
+            for (String zrrdbcn : zrrdbcns) {
+                FinBillFileDto finBillFileDto = new FinBillFileDto();
+                finBillFileDto.setFileUrl(zrrdbcn);
+                pczrrdbcns.add(finBillFileDto);
+            }
+        }
+        if (zfxsjt != null) {
+            for (String zfxs : zfxsjt) {
+                FinBillFileDto finBillFileDto = new FinBillFileDto();
+                finBillFileDto.setFileUrl(zfxs);
+                pczfxsjt.add(finBillFileDto);
+            }
+        }
         finBillApplicationDto.setFjApplicationAppendxs(fj);
+        finBillApplicationDto.setPcgsgdhdwdbjy(pcgsgdhdwdbjy);
+        finBillApplicationDto.setPczrrdbcns(pczrrdbcns);
+        finBillApplicationDto.setPczfxsjt(pczfxsjt);
         ResultBean resultBean = finBillApplicationFeign.saveQKLP(finBillApplicationDto);
         return resultBean;
     }
@@ -1404,22 +1461,67 @@ public class AppBusAdvanceGinvoiceapplyService {
         }
         FinBillApplicationDetailsVo finBillApplicationDetailsVo = resultBean.getData();
         if (finBillApplicationDetailsVo != null) {
-            //附件信息
+            //《欠款承诺书》(欠款人、担保人同签)
             List<FinBillFileVo> fjApplicationAppendxs = finBillApplicationDetailsVo.getFjApplicationAppendxs();
+            //《公司股东会对外担保决议》(公司担保)
+            List<FinBillFileVo> pcgsgdhdwdbjy = finBillApplicationDetailsVo.getPcgsgdhdwdbjy();
+            //《责任人担保承诺书》
+            List<FinBillFileVo> pczrrdbcns = finBillApplicationDetailsVo.getPczrrdbcns();
+            //资方信审截图
+            List<FinBillFileVo> pczfxsjt = finBillApplicationDetailsVo.getPczfxsjt();
             List<String> fj = new ArrayList<>();
+            List<String> gsgdhdwdbjy = new ArrayList<>();
+            List<String> zrrdbcns = new ArrayList<>();
+            List<String> zfxsjt = new ArrayList<>();
             List<ItemEditTextInfo> itemEditTextInfos = new ArrayList<>();
             if (fjApplicationAppendxs != null) {
                 for (FinBillFileVo fjApplicationAppendx : fjApplicationAppendxs) {
                     fj.add(fjApplicationAppendx.getFileUrl());
                 }
                 ItemEditTextInfo itemEditTextInfo = new ItemEditTextInfo();
-                itemEditTextInfo.setTitle("附件");
+                itemEditTextInfo.setTitle("《欠款承诺书》(欠款人、担保人同签)");
                 itemEditTextInfo.setType(1);
                 itemEditTextInfo.setNullAble(false);
                 itemEditTextInfo.setKey("fjApplicationAppendxs");
                 itemEditTextInfo.setFilesPath(fj);
                 itemEditTextInfos.add(itemEditTextInfo);
             }
+            if (pcgsgdhdwdbjy != null) {
+                for (FinBillFileVo pcgsgdhdwdb : pcgsgdhdwdbjy) {
+                    gsgdhdwdbjy.add(pcgsgdhdwdb.getFileUrl());
+                }
+                ItemEditTextInfo itemEditTextInfo = new ItemEditTextInfo();
+                itemEditTextInfo.setTitle("《公司股东会对外担保决议》(公司担保)");
+                itemEditTextInfo.setType(1);
+                itemEditTextInfo.setNullAble(false);
+                itemEditTextInfo.setKey("gsgdhdwdbjy");
+                itemEditTextInfo.setFilesPath(gsgdhdwdbjy);
+                itemEditTextInfos.add(itemEditTextInfo);
+            }
+            if (pczrrdbcns != null) {
+                for (FinBillFileVo pczrrdbcn : pczrrdbcns) {
+                    zrrdbcns.add(pczrrdbcn.getFileUrl());
+                }
+                ItemEditTextInfo itemEditTextInfo = new ItemEditTextInfo();
+                itemEditTextInfo.setTitle("《责任人担保承诺书》");
+                itemEditTextInfo.setType(1);
+                itemEditTextInfo.setNullAble(false);
+                itemEditTextInfo.setKey("zrrdbcns");
+                itemEditTextInfo.setFilesPath(zrrdbcns);
+                itemEditTextInfos.add(itemEditTextInfo);
+            }
+            if (pczfxsjt != null) {
+                for (FinBillFileVo pczfxs : pczfxsjt) {
+                    zfxsjt.add(pczfxs.getFileUrl());
+                }
+                ItemEditTextInfo itemEditTextInfo = new ItemEditTextInfo();
+                itemEditTextInfo.setTitle("资方信审截图");
+                itemEditTextInfo.setType(1);
+                itemEditTextInfo.setNullAble(false);
+                itemEditTextInfo.setKey("zfxsjt");
+                itemEditTextInfo.setFilesPath(zfxsjt);
+                itemEditTextInfos.add(itemEditTextInfo);
+            }
             qkkpFlowListVo.setList(itemEditTextInfos);
         }
         return rb.success().setData(qkkpFlowListVo);