修改融信管理等问题

sc-service/src/main/java/com/huyi/service/common/company/controller/CompanyController.java

@@ -63,6 +63,19 @@ public class CompanyController extends BaseController {
     }
 
     /**
+     * 根据主键查询企业
+     * @return
+     */
+    @GetMapping("/getCompany/{scyId}")
+    public R getCompany(@PathVariable String scyId)
+    {
+        System.out.println("根据主键查询企业"+scyId);
+        SysCompany sysCompany = iSysCompanyService.getById(scyId);
+        System.out.println("企业列表=============>"+sysCompany);
+        return R.ok(sysCompany);
+    }
+
+    /**
      * 查询链属列表
      * @param companyName   企业名称
      * @return

sc-service/src/main/java/com/huyi/service/common/financeInf/controller/FinanceInfController.java

@@ -100,7 +100,7 @@ public class FinanceInfController extends BaseController {
                 if (termIng.indexOf("-") != -1){
                     termIng = StringUtils.substringAfter(termIng,"-");
                 }
-                termIng = AmtUtil.add(termIng,"1");
+                termIng = AmtUtil.add(termIng,"1",0);
                 /*融资成本：融资金额*融资费率*融资期限 / 365 + 融资金额 * 服务费率*/
                 String costIng = AmtUtil.multiply(zfiAmount,zfpcrRate,2);
                 costIng = AmtUtil.multiply(costIng,termIng,2);

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

@@ -261,11 +261,12 @@ public class ApprovalServiceImpl implements ApprovalService {
                 financeLog.addFinanceLog(CommonUtil.objToString(map.get("zfiId")), "平台资料审核【通过】，融信资料提交《"+coreName+"》确权", null, FinanceLog.STATUS_ONE);
                 financeLog.addFinanceLog(CommonUtil.objToString(map.get("zfiId")), "融信确权【审批中】融信资料提交于《"+coreName+"》确权", null, FinanceLog.STATUS_ONE);
             }else if ("2".equals(zfiCreateType)){
+                zcFinanceInf.setZfiStatus("");
                 //TODO 融资企业开立时， 给融资企业经办人生成盖章待办
                 String title = "【合同签署】由【"+supplierName+"】发起的融信【"+zfiNumber+"】资料待签署合同";
                 remoteSystemService.sendNotice(zfiSupplierId, zfiId,title,"00","","03","0",supplierUserId.toString(),"", "01", "/credit/creditSeal/"+zfiId);
                 /**融信操作日志*/
-                financeLog.addFinanceLog(CommonUtil.objToString(map.get("zfiId")), "平台资料审核【通过】", null, FinanceLog.STATUS_ONE);
+                financeLog.addFinanceLog(CommonUtil.objToString(map.get("zfiId")), "平台审核融信资料【通过】，请签署融信业务合同", null, FinanceLog.STATUS_ONE);
                 //financeLog.addFinanceLog(CommonUtil.objToString(map.get("zfiId")), "融信确权生效【审批中】融信资料提交于《"+coreName+"》确权", null, FinanceLog.STATUS_ONE);
             }
             // TODO 不管什么类型都给 核心企业经办人 确权待办

sc-service/src/main/java/com/huyi/service/common/report/controller/ReportCreditController.java

@@ -165,7 +165,7 @@ public class ReportCreditController extends BaseController {
 
     /**
      * 企业生效中额度
-     * @return
+     * @returnownFinanceLog
      */
     @GetMapping("/getEffectBalance")
     public AjaxResult getEffectBalance(String zfpType)
@@ -1106,4 +1106,4 @@ public class ReportCreditController extends BaseController {
         Date currYearLast = calendar.getTime();
         return new SimpleDateFormat("yyyy-MM-dd").format(currYearLast)+" 23:59:59";
     }
-}
+}

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

@@ -171,8 +171,12 @@ public class OwnCreditController extends BaseController {
 //            map.put("zfiRate",zfiRate);
 //        }
 //        //承诺付款日
-        map.put("zfiExpireDateStart",zfiExpireDate.get("zfiExpireDate[0]"));
-        map.put("zfiExpireDateEnd",zfiExpireDate.get("zfiExpireDate[1]"));
+        System.out.println("zfiExpireDate============..>"+zfiExpireDate);
+        if(CommonUtil.isNotEmpty(String.valueOf(zfiExpireDate.get("zfiExpireDate[0]")))){
+            map.put("zfiExpireDateStart",zfiExpireDate.get("zfiExpireDate[0]"));
+            map.put("zfiExpireDateEnd",zfiExpireDate.get("zfiExpireDate[1]"));
+        }
+
 //        if(!CommonUtil.isEmpty(startAmt)){
 //            if(!AmtUtil.isMoney(startAmt)){
 //                return R.fail("请输入正确的融信金额开始范围值");
@@ -1054,7 +1058,9 @@ public class OwnCreditController extends BaseController {
             System.out.println("签发有效期=========>"+formatter.format(date));
             System.out.println("承诺付款日=========>"+formatter.format(signDate));
             System.out.println("最短账期=========>"+Integer.valueOf(zfpShortestPeriod));
-            if(formatter.format(date).compareTo(formatter.format(signDate))>0){
+            System.out.println("修改日期=========>"+cal.getTime());
+            System.out.println("当前时间=========>"+new Date());
+            if(formatter.format(cal.getTime()).compareTo(formatter.format(signDate))>0){
                 throw new BaseException("签发有效期不可大于承诺付款日减最短账期！");
             }
         }

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

@@ -139,8 +139,11 @@ public class OwnStatisticalCreditAmountController extends BaseController {
             map.put("stateList", CommonUtil.listToStr4InSql(stateList));
         }
         //承诺付款日
-        map.put("zfiExpireDateStart", zfiExpireDate.get("zfiExpireDate[0]"));
-        map.put("zfiExpireDateEnd", zfiExpireDate.get("zfiExpireDate[1]"));
+        System.out.println("zfiExpireDate============..>"+zfiExpireDate);
+        if(CommonUtil.isNotEmpty(String.valueOf(zfiExpireDate.get("zfiExpireDate[0]")))){
+            map.put("zfiExpireDateStart",zfiExpireDate.get("zfiExpireDate[0]"));
+            map.put("zfiExpireDateEnd",zfiExpireDate.get("zfiExpireDate[1]"));
+        }
         if ("01".equals(zfiTypes)) {
             map.put("zfiSupplierId", companyId);
         } else if ("02".equals(zfiTypes)) {

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

@@ -545,11 +545,7 @@ public class repaymentController extends BaseController {
             map.put("zfpType","1");
         }else if("03".equals(companyType)){
             map.put("management",company);
-            //资方查反向
-            map.put("zfpType","1");
         }else if ("00".equals(companyType)){
-            //平台查反向
-            map.put("zfpType","1");
         }
         Map amount = ownRepaymentService.selectAmount(map);
         //待还款
@@ -564,11 +560,7 @@ public class repaymentController extends BaseController {
             dhkMap.put("zfpType","1");
         }else if("03".equals(companyType)){
             dhkMap.put("management",company);
-            //资方查反向
-            dhkMap.put("zfpType","1");
         }else if ("00".equals(companyType)){
-            //平台查反向
-            dhkMap.put("zfpType","1");
         }
             //待还款
             dhkMap.put("zfrApplyStatus","00");
@@ -585,11 +577,7 @@ public class repaymentController extends BaseController {
             yhkMap.put("zfpType","1");
         }else if("03".equals(companyType)){
             yhkMap.put("management",company);
-            //资方查反向
-            yhkMap.put("zfpType","1");
         }else if ("00".equals(companyType)){
-            //平台查反向
-            yhkMap.put("zfpType","1");
         }
         //已还款
           yhkMap.put("zfrApplyStatus","01");
@@ -606,11 +594,7 @@ public class repaymentController extends BaseController {
             yyqMap.put("zfpType","1");
         }else if("03".equals(companyType)){
             yyqMap.put("management",company);
-            //资方查反向
-            yyqMap.put("zfpType","1");
         }else if ("00".equals(companyType)){
-            //平台查反向
-            yyqMap.put("zfpType","1");
         }
         //已逾期
         yyqMap.put("zfrApplyStatus","02");

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

@@ -89,7 +89,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             zc_finance_inf
         LEFT JOIN zc_finance_product
         ON zfp_id = zfi_product_id
-        WHERE zfi_status IN ('02','04','05','07','08')
+        WHERE zfi_status IN ('04','05','07','08')
         <if test="productId != null  and productId != ''">
             AND zfi_product_id = #{productId}
         </if>