Merge remote-tracking branch 'origin/master'

sc-service/src/main/java/com/huyi/service/common/flowable/controller/FlowableController.java

@@ -589,9 +589,9 @@ public class  FlowableController extends BaseController
                 //待办标题
                 String tittle = "";
                 if("1".equals(zfiCreateType)){
-                    tittle = "【融资企业签收】由【"+coreName +"】发起的融信编号为【"+ zcFinanceInf.getZfiNumber()+"】的资料待签署";
+                    tittle = "【融资企业签收】由【"+coreName +"】发起的融信编号为【"+ zcFinanceInf.getZfiNumber()+"】的资料待签收";
                 }else {
-                    tittle = "【融资企业签收】由【"+supplierName +"】发起的融信编号为【"+ zcFinanceInf.getZfiNumber()+"】的资料待签署";
+                    tittle = "【融资企业签收】由【"+supplierName +"】发起的融信编号为【"+ zcFinanceInf.getZfiNumber()+"】的资料待签收";
                 }
 
                 remoteSystemService.sendNotice(companyId,id,tittle,"00","","03","0",userId,"", "01", "/credit/signFor/"+id);
@@ -1010,9 +1010,9 @@ public class  FlowableController extends BaseController
             String supplierName = supplierCompany.getScyName();
             String tittle = "";
             if("1".equals(zfiCreateType)){
-                tittle = "【融资签收】由【" + coreName + "】发起的：融信编号【" + zfiNumber + "】资料代签收";
+                tittle = "【融信签收】由【" + coreName + "】发起的：融信编号【" + zfiNumber + "】资料待签收";
             }else{
-                tittle = "【融资签收】由【" + supplierName + "】发起的：融信编号【" + zfiNumber + "】资料代签收";
+                tittle = "【融信签收】由【" + supplierName + "】发起的：融信编号【" + zfiNumber + "】资料待签收";
             }
 
             remoteSystemService.sendNotice(companyId, id, tittle, "00", null, "03", "0", userId, null, "01", "/credit/signFor/"+id);

sc-service/src/main/java/com/huyi/service/common/flowable/service/impl/ApprovalServiceImpl.java

@@ -424,9 +424,9 @@ public class ApprovalServiceImpl implements ApprovalService {
             //待办标题
             String tittle = "";
             if("1".equals(zfiCreateType)){
-                tittle = "【融资企业签收】由【"+coreName +"】发起的：融信编号为【"+ CommonUtil.objToString(map.get("zfiNumber"))+"】的资料待签署";
+                tittle = "【融资企业签收】由【"+coreName +"】发起的：融信编号为【"+ CommonUtil.objToString(map.get("zfiNumber"))+"】的资料待签收";
             }else {
-                tittle = "【融资企业签收】由【"+sysCompany.getScyName() +"】发起的：融信编号为【"+ CommonUtil.objToString(map.get("zfiNumber"))+"】的资料待签署";
+                tittle = "【融资企业签收】由【"+sysCompany.getScyName() +"】发起的：融信编号为【"+ CommonUtil.objToString(map.get("zfiNumber"))+"】的资料待签收";
             }
             remoteSystemService.sendNotice(companyId,CommonUtil.objToString(map.get("zfiId")),tittle,"00",null,"03","0",userId,null, "01", "/credit/addInformation/"+CommonUtil.objToString(map.get("zfiId")));
             //TODO 给融资企业经办人盖章待办

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

@@ -2,14 +2,8 @@ package com.huyi.service.conmany.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.huyi.service.base.entity.SysCompany;
-import com.huyi.service.base.entity.SysConfig;
-import com.huyi.service.base.entity.SysUser;
-import com.huyi.service.base.entity.SysUserCompanyRel;
-import com.huyi.service.base.service.ISysCompanyService;
-import com.huyi.service.base.service.ISysConfigService;
-import com.huyi.service.base.service.ISysUserCompanyRelService;
-import com.huyi.service.base.service.ISysUserService;
+import com.huyi.service.base.entity.*;
+import com.huyi.service.base.service.*;
 import com.huyi.service.conmany.service.IOwnCompanyManageService;
 import com.keao.tianhu.starter.mybatis.plus.entity.QueryRequest;
 import com.tianhu.common.core.cfca.AxqCommonUtil;
@@ -68,6 +62,10 @@ public class CompanyInformationController extends BaseController {
     @Autowired
     private ISysUserCompanyRelService relService;
 
+    @Autowired
+    private IPubFileInfService fileInfService;
+
+
     /**
      * 企业四要素认证状态;未认证
      */
@@ -116,8 +114,8 @@ public class CompanyInformationController extends BaseController {
                 sysUserCompanyRel.eq(SysUserCompanyRel::getSucrHandler,HANDER);
                 List<SysUserCompanyRel> contactsList = iSysUserCompanyRelService.findSysUserCompanyRels(sysUserCompanyRel);
                 List<Map> userList = null;
-                List<Map> handlerPositiveList = null;
-                List<Map> handlerNegativeList = null;
+                List<PubFileInf> handlerPositiveList = null;
+                List<PubFileInf> handlerNegativeList = null;
 
                 Map queryMap = new HashMap();
                 queryMap.put("companyId",scyId);
@@ -146,9 +144,24 @@ public class CompanyInformationController extends BaseController {
                     userMap.put("userId",sucrUserId);
                     userList = iOwnCompanyManageService.selectUserList(userMap);
                     Map handlerMap = new HashMap();
-                    handlerMap.put("userId",sucrUserId);
+                  /*  handlerMap.put("userId",sucrUserId);
                     handlerPositiveList  = iOwnCompanyManageService.handlerPositiveList(handlerMap);
-                    handlerNegativeList = iOwnCompanyManageService.handlerNegativeList(handlerMap);
+                    handlerNegativeList = iOwnCompanyManageService.handlerNegativeList(handlerMap);*/
+                    //身份证人面
+                    String positive = contactsList.get(0).getSucrCardFile();
+                    //身份证国徽面
+                    String otherSide = contactsList.get(0).getSucrCardBackFile();
+                    if(CommonUtil.isNotEmpty(positive)){
+                        LambdaQueryWrapper<PubFileInf> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+                        lambdaQueryWrapper.eq(PubFileInf::getPfiFileId,positive);
+                        handlerPositiveList = fileInfService.findPubFileInfs(lambdaQueryWrapper);
+                    }
+                    if(CommonUtil.isNotEmpty(otherSide)){
+                        LambdaQueryWrapper<PubFileInf> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+                        lambdaQueryWrapper.eq(PubFileInf::getPfiFileId,otherSide);
+                        handlerNegativeList = fileInfService.findPubFileInfs(lambdaQueryWrapper);
+                    }
+
                 }
                 map.put("contactsList", userList);
                 //发票信息

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

@@ -831,7 +831,7 @@ public class OwnMessageController extends BaseController {
                 if(openList.size() < 1){
                     //融资企业通过
                     finance.setZfiSupplierStatus("01");
-                    String tittle = "【融资企业签收】由【"+openName+"】发起的融信编号为【"+ financeInf.getZfiNumber()+"】的资料待签署";
+                    String tittle = "【融资企业签收】由【"+openName+"】发起的融信编号为【"+ financeInf.getZfiNumber()+"】的资料待签收";
                     remoteSystemService.sendNotice(zfiSupplierId,zfiId,tittle,"00","","03","0",supplierHandler,"", "01", "/credit/signFor/"+zfiId);
                     //签收待办改为已办
                     LambdaQueryWrapper<SysNotice> queryWrapper = new LambdaQueryWrapper<>();

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

@@ -308,7 +308,7 @@ public class FinanceRecordController extends BaseController {
             String amout =zcFinanceProduct.getZfpShortestPeriod();
             //取得指定时间间隔后的系统时间
             GregorianCalendar calendar = (GregorianCalendar) Calendar.getInstance();
-            calendar.add( Calendar.DAY_OF_MONTH, Integer.valueOf(amout));
+            calendar.add( Calendar.DAY_OF_MONTH, Integer.valueOf(amout)-1);
             SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             if(formatter.format(calendar.getTime()).compareTo(formatter.format(financeInf.getZfiExpireDate()))>0){
                 throw new BaseException("当前融信融资期限小于最短可融资期限,已被锁定,请等待核心企业正常结算该笔业务。");

sc-service/src/main/resources/mapper/common/ReportCreditMapper.xml

@@ -301,10 +301,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         zfr_id          'zfrId',
         zfi_number      'zfiNumber',
         zfi_amount      'afiAmount',
-        zfi_expire_date 'afiExpireDate',
+        DATE_FORMAT(zfi_expire_date, '%Y-%m-%d') 'zfiExpireDate',
         zfr_amount      'zfrAmount',
         zfr_loan_amount 'zfrLoanAmount',
-        CAST(ROUND(IFNULL(SUM(zfr_loan_amount), 0), 2) AS CHAR) 'allAmount'
+        zfr_number      'zfrNumber'
         FROM
         zc_finance_record
         LEFT JOIN zc_finance_inf