融信查询,发票校验

sc-service/src/main/java/com/huyi/service/bill/controller/OwnBillController.java

@@ -278,7 +278,7 @@ public class OwnBillController extends BaseController {
             //校验结果
             String ziiCheckStt = CommonUtil.objToString(file.get("ziiCheckStt"));
             if (!"1".equals(ziiCheckStt)) {
-                return R.fail(500,"存在未验真或验真未通过发票，不可进行账款关联");
+                //return R.fail(500,"存在未验真或验真未通过发票，不可进行账款关联");
             }
             //贸易日期前一个月
             Calendar startDate = Calendar.getInstance();
@@ -291,7 +291,7 @@ public class OwnBillController extends BaseController {
             endDate.add(Calendar.MONTH, 2);
             Date end = endDate.getTime();
             if (start.compareTo(ziiDateParse) > 0 || end.compareTo(ziiDateParse) < 0) {
-                return R.fail(500, "存在不符合账款期限内发票，不可进行账款关联");
+                //return R.fail(500, "存在不符合账款期限内发票，不可进行账款关联");
             }
         }
         for (Map<String,String> file : fileList) {
@@ -498,7 +498,7 @@ public class OwnBillController extends BaseController {
             //校验结果
             String ziiCheckStt = CommonUtil.objToString(file.get("ziiCheckStt"));
             if (!"1".equals(ziiCheckStt)) {
-                return R.fail(500,"存在未验真或验真未通过发票，不可进行账款关联");
+                //return R.fail(500,"存在未验真或验真未通过发票，不可进行账款关联");
             }
             //贸易日期前一个月
             Calendar startDate = Calendar.getInstance();
@@ -511,7 +511,7 @@ public class OwnBillController extends BaseController {
             endDate.add(Calendar.MONTH, 2);
             Date end = endDate.getTime();
             if (start.compareTo(ziiDateParse) > 0 || end.compareTo(ziiDateParse) < 0) {
-                return R.fail(500, "存在不符合账款期限内发票，不可进行账款关联");
+                //return R.fail(500, "存在不符合账款期限内发票，不可进行账款关联");
             }
         }
         //查询关联往来账款的附件

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

@@ -56,7 +56,7 @@ public class FinanceInfController extends BaseController {
             Date nowDate = DateUtils.getNowDate();
             //承诺付款日期
             String zfiExpireDate = CommonUtil.objToString(m.get("zfiExpireDate"));
-            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");//注意月份是MM
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");//注意月份是MM
             Date expireDate = simpleDateFormat.parse("zfiExpireDate");
             /*预计融资期限：申请日期(当前日期) 到 承诺付款日期 间隔天数*/
             String term = DateUtils.getDatePoor(expireDate,nowDate);

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

@@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         zfi_payment_number                            'zfiPaymentNumber',
         DATE_FORMAT(zfi_effective_date,'%Y-%m-%d')    'zfiEffectiveDate',
         DATE_FORMAT(zfi_sign_date,'%Y-%m-%d')         'zfiSignDate',
-        DATE_FORMAT(zfi_expire_date,'%Y-%m-%d %H:%i:%s') AS 	'zfiExpireDate',
+        DATE_FORMAT(zfi_expire_date,'%Y-%m-%d') AS 	'zfiExpireDate',
         zfi_platform_status                           'zfiPlatformStatus',
         zfi_supplier_status                           'zfiSupplierStatus',
         zfi_core_status                               'zfiCoreStatus',