Merge remote-tracking branch 'origin/master'

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

@@ -47,7 +47,7 @@ public class FinanceInfController extends BaseController {
         //获取企业
         String companyId = user.getCompanyId();
         Map map = new HashMap();
-        if (!SalaryConstants.OPEX.equals(companyId)) {
+        if (!SalaryConstants.OPEX.equals(companyId)||!"03".equals(user.getCompanyType())) {
             map.put("companyId", companyId);
         }
         map.put("zfiId",zfrFinanceId);

sc-service/src/main/java/com/huyi/service/creditLine/controller/CreditLineController.java

@@ -626,10 +626,17 @@ public class CreditLineController extends BaseController {
         zcFinanceProComRel.setZfpcrRate(zfpcrRate);
         //有效期
         zcFinanceProComRel.setZfpcrDateType(zfpcrDateType);
-        //开始日期
-        zcFinanceProComRel.setZfpcrStartDate(zfpcrStartDate);
-        //结束日期
-        zcFinanceProComRel.setZfpcrEndDate(zfpcrEndDate);
+        if ("1".equals(zfpcrDateType)) {
+            //开始日期
+            zcFinanceProComRel.setZfpcrStartDate(zfpcrStartDate);
+            //结束日期
+            zcFinanceProComRel.setZfpcrEndDate(zfpcrEndDate);
+        }else{
+            //开始日期
+            zcFinanceProComRel.setZfpcrStartDate("");
+            //结束日期
+            zcFinanceProComRel.setZfpcrEndDate("");
+        }
         //融资网点
         zcFinanceProComRel.setZfpcrAddress(zfpcrAddress);
         //是否收取手续费(0:不收取, 1收取)
@@ -722,7 +729,7 @@ public class CreditLineController extends BaseController {
                 //当前日期和开始日期比较
                 int  ending =  CommonUtil.compare(zfpcrStartDate,currentDate);
                 //小于开始日期或者大于结束日期
-                if (ending == -1  || result == 1 ){
+                if (ending == 1  || result == -1 ){
                     return AjaxResult.error("请先修改授信的有效期范围,只有在有效期范围内才可以解冻");
                 }
             }

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

@@ -512,10 +512,10 @@ public class repaymentController extends BaseController {
             day = "90";
         }
         if(CommonUtil.isNotEmpty(day)){
-            int days = Integer.parseInt(day);
+           int days = Integer.parseInt(day);
             //将来日期
-            String date = DateUtils.getFetureDate(days);
-            map.put("day",date);
+           // String date = DateUtils.getFetureDate(days);
+            map.put("day",days);
         }
         Map amount = ownRepaymentService.selectRepaymentAmount(map);
         return AjaxResult.success(amount.get("zfrLoanAmount"));

sc-service/src/main/java/com/huyi/service/repayment/mapper/OwnRepaymentMapper.java

@@ -1,5 +1,6 @@
 package com.huyi.service.repayment.mapper;
 
+import com.baomidou.mybatisplus.annotation.SqlParser;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
@@ -43,5 +44,6 @@ public interface OwnRepaymentMapper
      * @param map
      * @return
      */
+    @SqlParser(filter = true)
     public Map selectRepaymentAmount(Map map);
 }

sc-service/src/main/resources/mapper/repayment/OwnRepaymentMapper.xml

@@ -153,9 +153,11 @@
             and p.zfp_management_id = #{management}
         </if>
         <if test="day != null  and day != ''">
-            <![CDATA[
+            <!--<![CDATA[
                 and r.zfr_repayment_date <= #{day}
-            ]]>
+            ]]>-->
+           and  DATE_SUB(now(), INTERVAL  #{day} DAY) &lt;= DATE(r.zfr_repayment_date)
+
         </if>
     </select>