sql文件修改

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

@@ -9,6 +9,7 @@ import com.huyi.service.financeRecord.service.FinanceRecordService;
 import com.keao.tianhu.starter.mybatis.plus.entity.QueryRequest;
 import com.tianhu.common.core.constant.SalaryConstants;
 import com.tianhu.common.core.domain.R;
+import com.tianhu.common.core.exception.BaseException;
 import com.tianhu.common.core.utils.AmtUtil;
 import com.tianhu.common.core.utils.CommonUtil;
 import com.tianhu.common.core.utils.DateUtils;
@@ -304,6 +305,14 @@ public class FinanceRecordController extends BaseController {
                     }
                 }
             }
+            String amout =zcFinanceProduct.getZfpShortestPeriod();
+            //取得指定时间间隔后的系统时间
+            GregorianCalendar calendar = (GregorianCalendar) Calendar.getInstance();
+            calendar.add( Calendar.DAY_OF_MONTH, Integer.valueOf(amout));
+            SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            if(formatter.format(calendar.getTime()).compareTo(formatter.format(financeInf.getZfiExpireDate()))>0){
+                throw new BaseException("当前融信融资期限小于最短可融资期限,已被锁定,请等待核心企业正常结算该笔业务。");
+            }
             /*---------------新增融资表----------*/
             ZcFinanceRecord zcFinanceRecord = new ZcFinanceRecord();
             //主键

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

@@ -185,7 +185,7 @@ public class OwnCompanyRelController extends BaseController
      */
     @PreAuthorize(hasPermi = "service:rel:list")
     @GetMapping("/getListRel")
-    public R getListRel(String scyId, String companyName, String scpStatus,
+    public R getListRel(String scpName,String scyId, String companyName, String scpStatus,
                   String scrType, String scrStatus, String scpContarct, QueryRequest request)
     {
         //获取当前操作员
@@ -198,9 +198,12 @@ public class OwnCompanyRelController extends BaseController
             if (CommonUtil.isNotEmpty(scrStatus)) {
                 map.put("scrStatus", scrStatus);
             }
-            if (CommonUtil.isNotEmpty(scpStatus)) {
+            if (CommonUtil.isNotEmpty(scpStatus)&&!"02".equals(scpStatus)) {
                 map.put("scpStatus", scpStatus);
             }
+            if(CommonUtil.isNotEmpty(scpName)){
+                map.put("scpName",scpName);
+            }
             if(CommonUtil.isNotEmpty(scpContarct)){
                 map.put("scpContarct",scpContarct);
             }

sc-service/src/main/resources/mapper/rel/OwnCompanyRelMapper.xml

@@ -102,7 +102,10 @@
                 )
         </if>
         <if test="paramMap.scpContarct != null and paramMap.scpContarct != '' ">
-            AND e.scp_contarct LIKE CONCAT('%', #{paramMap.scpContarct}, '%')
+            AND p.scy_name LIKE CONCAT('%', #{paramMap.scpContarct}, '%')
+        </if>
+        <if test="paramMap.scpName != null and paramMap.scpName != '' ">
+            AND s.scy_name LIKE CONCAT('%', #{paramMap.scpName}, '%')
         </if>
         ORDER BY r.create_time DESC
     </select>