Merge remote-tracking branch 'origin/master'

sc-service/src/main/java/com/huyi/service/conmany/controller/OwnCompanyManageController.java

@@ -680,7 +680,7 @@ public class OwnCompanyManageController extends BaseController
                 map.put("scrContarct",scrContarct);
             }
         }
-        IPage<Map> list = iOwnCompanyRelService.selectCompanyRelList(request,map);
+        IPage<Map> list = iOwnCompanyManageService.selectCompanyRelList(request,map);
         return R.ok(list,companyId);
     }
 

sc-service/src/main/java/com/huyi/service/conmany/mapper/OwnCompanyManageMapper.java

@@ -103,4 +103,10 @@ public interface OwnCompanyManageMapper extends BaseMapper<SysCompany> {
      */
     public IPage<Map> selectCompanyList(Page<Map> page, @Param("paramMap")Map map);
 
+    /**
+     * 查询企业链属信息
+     * @param map
+     * @return
+     */
+    public IPage<Map> selectCompanyRelList(Page<Map> page, @Param("paramMap")Map map);
 }

sc-service/src/main/java/com/huyi/service/conmany/service/IOwnCompanyManageService.java

@@ -101,4 +101,11 @@ public interface IOwnCompanyManageService extends IService<SysCompany> {
      * @return
      */
     public IPage<Map> selectCompanyList(QueryRequest request, Map map);
+
+    /**
+     * 查询企业链属信息
+     * @param map
+     * @return
+     */
+    public IPage<Map> selectCompanyRelList(QueryRequest request, Map map);
 }

sc-service/src/main/java/com/huyi/service/conmany/service/impl/OwnCompanyManageServiceImpl.java

@@ -93,4 +93,10 @@ public class OwnCompanyManageServiceImpl extends ServiceImpl<OwnCompanyManageMap
         Page page = new Page<>(request.getPageNum(), request.getPageSize());
         return ownCompanyManageMapper.selectCompanyList(page,map);
     }
+
+    @Override
+    public IPage<Map> selectCompanyRelList(QueryRequest request, Map map) {
+        Page page = new Page<>(request.getPageNum(), request.getPageSize());
+        return ownCompanyManageMapper.selectCompanyRelList(page,map);
+    }
 }

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 结束--------**/
                 // 是已盖章文件

sc-service/src/main/resources/mapper/company/OwnCompanyManageMapper.xml

@@ -292,4 +292,66 @@
         ORDER BY s.create_time DESC
     </select>
 
+    <select id="selectCompanyRelList" parameterType="map" resultType="map">
+        SELECT
+        r.scr_id                'launchScrId',
+        r.scr_launch_company_id 'launchCompanyId',
+        r.scr_receive_company_id'launchReceiveScrCompanyId',
+        r.scr_status		    'launchScrStatus',
+        r.scr_contarct          'launchScrContarct',
+        r.scr_contarct_phone    'launchScrContarctPhone',
+        r.scr_contarct_email    'launchScrContarctEmail',
+        r.scr_launch_type       'launchScrLaunchType',
+        r.scr_receive_type      'launchScrReceiveType',
+        s.scy_id		        'launchScyId',
+        s.scy_social_code	    'launchScySocialCode',
+        s.scy_name		        'launchScyName',
+        s.scy_type		        'launchScyType',
+        s.scy_legal		        'launchScyLegal',
+        s.scy_phone		        'launchScyPhone',
+        p.scy_id		        'receiveScyId',
+        p.scy_social_code	    'receiveScySocialCode',
+        p.scy_name		        'receiveScyName',
+        p.scy_type		        'receiveScyType',
+        p.scy_legal		        'receiveScyLegal',
+        p.scy_phone		        'receiveScyPhone'
+        FROM sys_company_rel r
+        LEFT JOIN sys_company s ON r.scr_launch_company_id = s.scy_id
+        LEFT JOIN sys_company p ON r.scr_receive_company_id = p.scy_id
+        WHERE 1=1
+        AND r.scr_status != '99'
+        <if test="paramMap.companyId != null and paramMap.companyId != '' ">
+            AND (r.scr_launch_company_id = #{paramMap.companyId} OR r.scr_receive_company_id = #{paramMap.companyId})
+        </if>
+        --      用户用查询条件
+        <if test="paramMap.companyName != null and paramMap.companyName != '' ">
+            AND (s.scy_name LIKE CONCAT('%', #{paramMap.companyName}, '%') AND r.scr_receive_company_id = #{paramMap.companyId})
+            OR (p.scy_name LIKE CONCAT('%', #{paramMap.companyName}, '%') AND r.scr_launch_company_id = #{paramMap.companyId})
+        </if>
+        <if test="paramMap.scySocialCode != null and paramMap.scySocialCode != '' ">
+            AND (s.scy_social_code LIKE CONCAT('%', #{paramMap.scySocialCode}, '%') AND r.scr_receive_company_id = #{paramMap.companyId})
+            OR (p.scy_social_code LIKE CONCAT('%', #{paramMap.scySocialCode}, '%') AND r.scr_launch_company_id = #{paramMap.companyId})
+        </if>
+        <if test="paramMap.scrType != null and paramMap.scrType != '' and paramMap.scrType == '00' ">
+            AND ((r.scr_launch_company_id = #{paramMap.companyId} AND r.scr_launch_type = '01')
+            OR (r.scr_receive_company_id = #{paramMap.companyId} AND r.scr_receive_type = '01'))
+        </if>
+        <if test="paramMap.scrType != null and paramMap.scrType != '' and paramMap.scrType == '01' ">
+            AND ((r.scr_launch_company_id = #{paramMap.companyId} AND r.scr_launch_type = '00')
+            OR (r.scr_receive_company_id = #{paramMap.companyId} AND r.scr_receive_type = '00'))
+        </if>
+        <if test="paramMap.scrStatus != null and paramMap.scrStatus != '' ">
+            AND r.scr_status = #{paramMap.scrStatus}
+        </if>
+        --      平台用查询
+        <if test="paramMap.name != null and paramMap.name != '' ">
+            AND (s.scy_name LIKE CONCAT('%', #{paramMap.name}, '%')
+            OR p.scy_name LIKE CONCAT('%', #{paramMap.name}, '%'))
+        </if>
+        <if test="paramMap.scrContarct != null and paramMap.scrContarct != '' ">
+            AND r.scr_contarct LIKE CONCAT('%', #{paramMap.scrContarct}, '%')
+        </if>
+        ORDER BY r.create_time DESC
+    </select>
+
 </mapper>