set融信原融信金额，盖章判断文件是否存在时去掉节点判断

sc-service/src/main/java/com/huyi/service/base/entity/ZcFinanceInf.java

@@ -15,7 +15,7 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author xuefy
- * @since 2021-08-25
+ * @since 2021-09-16
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -80,6 +80,12 @@ public class ZcFinanceInf implements Serializable {
     private String zfiAmount;
 
     /**
+     * 原申请金额
+     */
+    @TableField("zfi_old_amount")
+    private String zfiOldAmount;
+
+    /**
      * 收款账号
      */
     @TableField("zfi_collection_account")
@@ -116,25 +122,37 @@ public class ZcFinanceInf implements Serializable {
     private Date zfiExpireDate;
 
     /**
-     * 平台审批状态
+     * 平台审批状态(00:审批中, 01:审批通过, 02:审批拒绝, 03:暂存)
      */
     @TableField("zfi_platform_status")
     private String zfiPlatformStatus;
 
     /**
-     * 融资方审批状态
+     * 融资方审批状态(00:审批中, 01:审批通过, 02:审批拒绝, 03:暂存)
      */
     @TableField("zfi_supplier_status")
     private String zfiSupplierStatus;
 
     /**
-     * 核心企业融资状态
+     * 核心企业融资状态(00:审批中, 01:审批通过, 02:审批拒绝, 03:暂存)
      */
     @TableField("zfi_core_status")
     private String zfiCoreStatus;
 
     /**
-     * 状态(00:待确权 01:待签收 02:已生效 03:已失效 04:融资中 05:已融资 06:平台退回)
+     * 核心企业CFCA人脸识别流水号
+     */
+    @TableField("zfi_cfca_core_no")
+    private String zfiCfcaCoreNo;
+
+    /**
+     * 融资企业CFCA人脸识别流水号
+     */
+    @TableField("zfi_cfca_supplier_no")
+    private String zfiCfcaSupplierNo;
+
+    /**
+     * 状态(00:待确权 01:待签收 02:已生效 03:已失效 04:融资中 05:已融资 06:平台退回 07:已失效(到期失效) 99:删除)
      */
     @TableField("zfi_status")
     private String zfiStatus;

sc-service/src/main/java/com/huyi/service/base/mapper/ZcFinanceInfMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * </p>
  *
  * @author xuefy
- * @since 2021-08-16
+ * @since 2021-09-16
  */
 public interface ZcFinanceInfMapper extends BaseMapper<ZcFinanceInf> {
 

sc-service/src/main/java/com/huyi/service/credit/controller/CreditHandleController.java

@@ -7,7 +7,6 @@ import com.huyi.service.common.financeLog.FinanceLog;
 import com.huyi.service.common.flowable.service.ApprovalService;
 import com.huyi.service.constant.FileConstants;
 import com.keao.tianhu.core.util.AmtUtil;
-import com.spire.doc.Document;
 import com.tianhu.common.core.utils.CommonUtil;
 import com.tianhu.common.core.utils.DateUtils;
 import com.tianhu.common.core.utils.pdf.WordPdfUtil;
@@ -26,7 +25,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 import sun.misc.BASE64Encoder;
-
 import java.io.*;
 import java.net.HttpURLConnection;
 import java.net.URL;
@@ -112,7 +110,7 @@ public class CreditHandleController extends BaseController {
             throw  new Exception("获取融信信息失败");
         }
         //获取原先的融信金额
-        String oldAmt = finance.getZfiAmount();
+        String oldAmt = finance.getZfiOldAmount();
         //获取签发金额
         String zfiAmount = CommonUtil.objToString(map.get("zfiAmount"));
         //现在的签发金额大于原先的融信金额
@@ -127,16 +125,10 @@ public class CreditHandleController extends BaseController {
         String zfpId = CommonUtil.objToString(map.get("zfpId"));
         //获取当前时间
         Date createTime = DateUtils.getNowDate();
-
         //核心企业
         SysCompany coreCompany =  companyService.getById(finance.getZfiCoreId());
         //核心企业名称
         String coreName = coreCompany.getScyName();
-        //核心企业
-        SysCompany supplierCompany =  companyService.getById(finance.getZfiSupplierId());
-        //核心企业名称
-        String supplierName = supplierCompany.getScyName();
-
         //供应商申请并且通过
         if("0".equals(zfiCreateType) && "00".equals(flag)){
             //获取授信额度

sc-service/src/main/java/com/huyi/service/credit/controller/OwnCreditController.java

@@ -544,7 +544,10 @@ public class OwnCreditController extends BaseController {
             rel.setZfbrBillId(billId);
             financeBillRelService.createZcFinanceBillRel(rel);
         }
+        //签发金额
         inf.setZfiAmount(zfiAmount);
+        //原签发金额
+        inf.setZfiOldAmount(zfiAmount);
         //修改数据
         financeInfService.updateById(inf);
         return AjaxResult.success();
@@ -869,7 +872,10 @@ public class OwnCreditController extends BaseController {
             rel.setZfbrBillId(billId);
             financeBillRelService.createZcFinanceBillRel(rel);
         }
+        //签发金额
         inf.setZfiAmount(zfiAmount);
+        //原签发金额
+        inf.setZfiOldAmount(zfiAmount);
         //插入数据
         financeInfService.createZcFinanceInf(inf);
         //核心开立

sc-service/src/main/java/com/huyi/service/credit/controller/OwnMessageController.java

@@ -455,14 +455,14 @@ public class OwnMessageController extends BaseController {
             fileRelLambdaQueryWrapper.eq(ZcFinanceFileRel::getZffrFinanceId, zfiId);
             fileRelLambdaQueryWrapper.eq(ZcFinanceFileRel::getZffrContractId, contractList.get(i).getZfcId());
             // 核心企业盖章
-            if ("01".equals(tokenService.getLoginUser().getSysUser().getCompanyType())) {
+            /*if ("01".equals(tokenService.getLoginUser().getSysUser().getCompanyType())) {
                 // 查询融资企业是否盖章
                 fileRelLambdaQueryWrapper.eq(ZcFinanceFileRel::getZffrSupplierNode, code);
                 // 融资企业盖章
             } else if ("02".equals(tokenService.getLoginUser().getSysUser().getCompanyType())) {
                 // 查询核心企业是否盖章
                 fileRelLambdaQueryWrapper.eq(ZcFinanceFileRel::getZffrCoreNode, code);
-            }
+            }*/
 
             List<ZcFinanceFileRel> financeFileList = financeFileRelService.findZcFinanceFileRels(fileRelLambdaQueryWrapper);
 

sc-service/src/main/resources/mapper/base/ZcFinanceInfMapper.xml

@@ -13,6 +13,7 @@
         <result column="zfi_product_id" property="zfiProductId" />
         <result column="zfi_create_type" property="zfiCreateType" />
         <result column="zfi_amount" property="zfiAmount" />
+        <result column="zfi_old_amount" property="zfiOldAmount" />
         <result column="zfi_collection_account" property="zfiCollectionAccount" />
         <result column="zfi_rate" property="zfiRate" />
         <result column="zfi_payment_number" property="zfiPaymentNumber" />
@@ -22,6 +23,8 @@
         <result column="zfi_platform_status" property="zfiPlatformStatus" />
         <result column="zfi_supplier_status" property="zfiSupplierStatus" />
         <result column="zfi_core_status" property="zfiCoreStatus" />
+        <result column="zfi_cfca_core_no" property="zfiCfcaCoreNo" />
+        <result column="zfi_cfca_supplier_no" property="zfiCfcaSupplierNo" />
         <result column="zfi_status" property="zfiStatus" />
         <result column="zfi_profit_spare1" property="zfiProfitSpare1" />
         <result column="zfi_profit_spare2" property="zfiProfitSpare2" />