修改还款管理及融资盖章

sc-service/src/main/java/com/huyi/service/financeRecord/controller/RecordSealController.java

@@ -306,11 +306,9 @@ public class RecordSealController extends BaseController {
                 //保存为PDF格式
                 //截取文件名称
                 //获取.的位置
-                int index  = fileNameList.get(i).indexOf(".");
-                String fileName = fileNameList.get(i).substring(0,index);
 //                doc.saveToFile(directory + fileName + currecntDate + ".pdf", FileFormat.PDF);
-                WordPdfUtil.doc2pdf(filePath,directory + fileName + currecntDate + ".pdf");
-                filePath = directory + fileName + currecntDate + ".pdf";
+                WordPdfUtil.doc2pdf(filePath,directory + fileNameList.get(i) + currecntDate + ".pdf");
+                filePath = directory + fileNameList.get(i) + currecntDate + ".pdf";
                 File pdfFile = new File(filePath);
                 FileInputStream inputFile = new FileInputStream(pdfFile);
                 byte[] buffer = new byte[(int)pdfFile.length()];

sc-service/src/main/java/com/huyi/service/rel/controller/OwnCompanyRelController.java

@@ -32,7 +32,7 @@ import java.util.regex.Pattern;
 
 /**
  * 链属Controller
- * 
+ *
  * @author keao
  * @date 2020-12-16
  */
@@ -216,8 +216,6 @@ public class OwnCompanyRelController extends BaseController
 
     /**
      * 查询链属未认证列表
-     * @param scySocialCode 社会统一信用代码
-     * @param companyName   企业名称
      * @param scrType   企业类型
      * @param request
      * @return
@@ -968,7 +966,11 @@ public class OwnCompanyRelController extends BaseController
         receiveWrapper.eq(SysUserCompanyRel::getSucrCompanyId,receiveCompanyId);
         receiveWrapper.eq(SysUserCompanyRel::getSucrHandler,"1");
         List<SysUserCompanyRel> receiveUserList = iSysUserCompanyRelService.findSysUserCompanyRels(receiveWrapper);
-        Long receiveUser = receiveUserList.get(0).getSucrUserId();
+        Long receiveUser =null ;
+        if(receiveUserList.size()>0){
+            receiveUser = receiveUserList.get(0).getSucrUserId();
+        }
+
         //如果发起方为供应商，接收方为核心企业
         if("00".equals(launchType) && "01".equals(receiveType)){
             //查询企业是否含有正在存在的业务(第二种情况（发起者为核心企业，接收者为供应商）)
@@ -1031,12 +1033,12 @@ public class OwnCompanyRelController extends BaseController
         if(companyId.equals(launchCompanyId)) {
             //发送站内消息
             String receiveTitle = "【" + launchCompanyName + "】" + "已取消与您的链属关系";
-            remoteSystemService.sendNotice(receiveCompanyId, scrId, receiveTitle, "01", "03", null, "0", receiveUser.toString(), null, null, null);
+            remoteSystemService.sendNotice(receiveCompanyId, scrId, receiveTitle, "01", "03", null, "0", String.valueOf(receiveUser), null, null, null);
         }
         if(companyId.equals(receiveCompanyId)) {
             //发送站内消息
             String launchTitle = "【" + receiveCompanyName + "】" + "已取消与您的链属关系";
-            remoteSystemService.sendNotice(launchCompanyId, scrId, launchTitle, "01", "03", null, "0", launchUser.toString(), null, null, null);
+            remoteSystemService.sendNotice(launchCompanyId, scrId, launchTitle, "01", "03", null, "0", String.valueOf(receiveUser), null, null, null);
         }
         return R.ok();
     }

sc-service/src/main/java/com/huyi/service/repayment/controller/repaymentController.java

@@ -541,6 +541,8 @@ public class repaymentController extends BaseController {
             map.put("zfpType","0");
         }else if("01".equals(companyType)){
             map.put("coreId",company);
+            //核心企业查反向
+            map.put("zfpType","1");
         }else if("03".equals(companyType)){
             map.put("management",company);
             //资方查反向
@@ -559,6 +561,7 @@ public class repaymentController extends BaseController {
             dhkMap.put("zfpType","0");
         }else if("01".equals(companyType)){
             dhkMap.put("coreId",company);
+            dhkMap.put("zfpType","1");
         }else if("03".equals(companyType)){
             dhkMap.put("management",company);
             //资方查反向
@@ -567,8 +570,8 @@ public class repaymentController extends BaseController {
             //平台查反向
             dhkMap.put("zfpType","1");
         }
-        //待还款
-        dhkMap.put("zfrApplyStatus","00");
+            //待还款
+            dhkMap.put("zfrApplyStatus","00");
         Map dhkAmount = ownRepaymentService.selectAmount(dhkMap);
         //已还款
         Map yhkMap = new HashMap();
@@ -579,6 +582,7 @@ public class repaymentController extends BaseController {
             yhkMap.put("zfpType","0");
         }else if("01".equals(companyType)){
             yhkMap.put("coreId",company);
+            yhkMap.put("zfpType","1");
         }else if("03".equals(companyType)){
             yhkMap.put("management",company);
             //资方查反向
@@ -599,6 +603,7 @@ public class repaymentController extends BaseController {
             yyqMap.put("zfpType","0");
         }else if("01".equals(companyType)){
             yyqMap.put("coreId",company);
+            yyqMap.put("zfpType","1");
         }else if("03".equals(companyType)){
             yyqMap.put("management",company);
             //资方查反向