融信word转pdf及签收，补充资料审批改成传实体类

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

@@ -7,9 +7,9 @@ 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.spire.doc.FileFormat;
 import com.tianhu.common.core.utils.CommonUtil;
 import com.tianhu.common.core.utils.DateUtils;
+import com.tianhu.common.core.utils.pdf.WordPdfUtil;
 import com.tianhu.common.core.utils.poi.WordUtil;
 import com.tianhu.common.core.web.controller.BaseController;
 import com.tianhu.common.core.web.domain.AjaxResult;
@@ -25,6 +25,7 @@ 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;
@@ -290,7 +291,12 @@ public class CreditHandleController extends BaseController {
         financeInf.setZfiSupplierStatus("03");
         financeInfService.updateById(financeInf);
         //调用补充资料审批
-        approvalService.addInformationApproval(map);
+        //获取融信编号
+        ZcFinanceInf finance =  financeInfService.getById(zfiId);
+        if(finance == null){
+            throw  new Exception("获取融信信息失败");
+        }
+        approvalService.addInformationApproval(CommonUtil.entityToMap(finance));
         return AjaxResult.success();
     }
 
@@ -356,8 +362,13 @@ public class CreditHandleController extends BaseController {
         financeInfService.updateById(financeInf);
         //通过
         if("00".equals(flag)){
+            //获取融信编号
+             ZcFinanceInf finance =  financeInfService.getById(zfiId);
+             if(finance == null){
+                 throw  new Exception("获取融信信息失败");
+             }
             // 调用签收审批流
-            approvalService.addSignApproval(map);
+            approvalService.addSignApproval(CommonUtil.entityToMap(finance));
         }
 
         return AjaxResult.success();
@@ -750,7 +761,8 @@ public class CreditHandleController extends BaseController {
                 //获取.的位置
                 int index  = fileNameList.get(i).indexOf(".");
                 String fileName = fileNameList.get(i).substring(0,index);
-                doc.saveToFile(directory + fileName + currecntDate + ".pdf", FileFormat.PDF);
+                //doc.saveToFile(directory + fileName + currecntDate + ".pdf", FileFormat.PDF);
+                WordPdfUtil.doc2pdf(filePath,directory + fileName + currecntDate + ".pdf");
                 filePath = directory + fileName + currecntDate + ".pdf";
                 File pdfFile = new File(filePath);
                 FileInputStream inputFile = new FileInputStream(pdfFile);

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

@@ -4,13 +4,11 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.huyi.service.base.entity.*;
 import com.huyi.service.base.service.*;
 import com.huyi.service.common.cfcaCommon.ICfcaFaceAuthService;
-import com.huyi.service.common.flowable.service.ApprovalService;
 import com.huyi.service.constant.FileConstants;
 import com.huyi.service.credit.service.OwnCreditService;
 import com.huyi.service.util.DocumentConstant;
 import com.keao.tianhu.core.util.AmtUtil;
 import com.spire.doc.Document;
-import com.spire.doc.FileFormat;
 import com.tianhu.common.core.cfca.AxqCommonUtil;
 import com.tianhu.common.core.cfca.CfcaUtil;
 import com.tianhu.common.core.cfca.connector.HttpConnector;
@@ -36,7 +34,6 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.xml.crypto.Data;
 import java.io.*;
 import java.net.HttpURLConnection;
 import java.net.URL;
@@ -501,7 +498,8 @@ public class OwnMessageController extends BaseController {
                 //获取.的位置
                 int index  = fileInfList.get(i).getPfiFileName().indexOf(".");
                 fileName = fileInfList.get(i).getPfiFileName().substring(0,index);
-                doc.saveToFile(directory + fileName + currecntDate + ".pdf", FileFormat.PDF);
+               // doc.saveToFile(directory + fileName + currecntDate + ".pdf", FileFormat.PDF);
+                WordPdfUtil.doc2pdf(filePath,directory + fileName + currecntDate + ".pdf");
                 filePath = directory + fileName + currecntDate + ".pdf";
                 /**-------- word 转PDF 结束--------**/
                 // 是已盖章文件