Merge remote-tracking branch 'origin/master'

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

@@ -368,7 +368,7 @@ public class ReportCreditController extends BaseController {
         String companyId = use.getCompanyId();
         //获取企业类型
         String type = use.getCompanyType();
-        //开始时间 当天
+   /*     //开始时间 当天
         String startDate = DateUtils.dateTimeNow("yyyy-MM-dd");
         //结束时间 30后
         String endDate = DateUtils.getFetureDate(30);
@@ -377,18 +377,18 @@ public class ReportCreditController extends BaseController {
         //默认反向
         if(CommonUtil.isEmpty(zfpType)){
             zfpType = "1";
-        }
+        }*/
         if(COMPANYTYPE_CORE.equals(type)){
             //核心企业
-            map.put("zfpType",zfpType);
+           /* map.put("zfpType",zfpType);*/
             map.put("coreCompanyId", companyId);
         }else if(COMPANYTYPE_SUPPLIER.equals(type)){
             //供应商
-            map.put("zfpType",zfpType);
+          /*  map.put("zfpType",zfpType);*/
             map.put("supplierCompanyId", companyId);
         }else if(COMPANYTYPE_MANAGEMENT.equals(type)){
             //资金方
-            map.put("zfpType",zfpType);
+           /* map.put("zfpType",zfpType);*/
             map.put("managementCompanyId", companyId);
         }
         //融信额度
@@ -434,9 +434,11 @@ public class ReportCreditController extends BaseController {
             //供应商
             Map map1 = new HashMap();
             map1.put("supplierCompanyId", companyId);
-            List<Map> dateInf = reportCreditService.listCreditDate(map1);
-            List<String> idList = new ArrayList<>();
-            for (int i = 0; i < dateInf.size(); i++) {
+            IPage<Map> list = reportCreditService.listCreditDate(map1,request);
+            return AjaxResult.success(list);
+
+            /* List<String> idList = new ArrayList<>();
+           for (int i = 0; i < dateInf.size(); i++) {
                 //融信id
                 String zfiId = dateInf.get(i).get("zfiId")+"";
                 //承诺付款日
@@ -463,7 +465,7 @@ public class ReportCreditController extends BaseController {
                 queryWrapper.in(ZcFinanceInf::getZfiId, idList);
                 IPage<ZcFinanceInf> list = iZcFinanceInfService.findZcFinanceInfs(request, queryWrapper);
                 return AjaxResult.success(list);
-            }
+            }*/
         }
         return AjaxResult.success();
     }

sc-service/src/main/java/com/huyi/service/common/report/mapper/ReportCreditMapper.java

@@ -73,6 +73,7 @@ public interface ReportCreditMapper {
      * @param map
      * @return
      */
+    @SqlParser(filter = true)
     String getExpiredBalance(Map map);
 
     /**
@@ -154,5 +155,6 @@ public interface ReportCreditMapper {
      * @param map
      * @return
      */
-    List<Map> listCreditDate(Map map);
+    @SqlParser(filter = true)
+    public IPage<Map> listCreditDate(Page<Map> page, @Param("paramMap") Map map);
 }

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

@@ -151,5 +151,5 @@ public interface ReportCreditService {
      * @param map
      * @return
      */
-    List<Map> listCreditDate(Map map);
+    public IPage<Map> listCreditDate(Map map, QueryRequest request);
 }

sc-service/src/main/java/com/huyi/service/common/report/service/impl/ReportCreditServiceImpl.java

@@ -118,7 +118,9 @@ public class ReportCreditServiceImpl implements ReportCreditService {
     }
 
     @Override
-    public List<Map> listCreditDate(Map map){
-        return reportCreditMapper.listCreditDate(map);
+    public IPage<Map> listCreditDate(Map map, QueryRequest request) {
+        Page page = new Page<>(request.getPageNum(), request.getPageSize());
+        return reportCreditMapper.listCreditDate(page, map);
     }
+
 }

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

@@ -1068,6 +1068,10 @@ public class OwnMessageController extends BaseController {
         String handler = CommonUtil.objToString(relList.get(0).getSucrUserId());
         //身份证号
         String idCard = relList.get(0).getSucrCard();
+        //判断身份证是否为空
+        if(CommonUtil.isEmpty(idCard)){
+            throw  new Exception("请先维护该企业经办人的身份证号");
+        }
         LambdaQueryWrapper<com.huyi.service.base.entity.SysUser> sysUserLambdaQueryWrapper = new LambdaQueryWrapper<>();
         //非删除
         sysUserLambdaQueryWrapper.eq(com.huyi.service.base.entity.SysUser::getDelFlag,"0");

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

@@ -696,6 +696,8 @@ public class CreditLineController extends BaseController {
         ZcFinanceProComRel proComRel = iZcFinanceProComRelService.getById(zfpcrId);
         //到期时间
         String zfpcrEndDate = proComRel.getZfpcrEndDate();
+        //开始日期
+        String zfpcrStartDate = proComRel.getZfpcrStartDate();
 
         ZcFinanceProComRel zcFinanceProComRel = new ZcFinanceProComRel();
         //授信id
@@ -709,14 +711,19 @@ public class CreditLineController extends BaseController {
                 return AjaxResult.error("此授信正在使用无法冻结");
             }
         }else {
-            if (CommonUtil.isNotEmpty(zfpcrEndDate)){
+            if (CommonUtil.isNotEmpty(zfpcrEndDate) && CommonUtil.isNotEmpty(zfpcrStartDate)){
                 Date EndDate = DateUtils.parseDate(zfpcrEndDate,"yyyy-MM-dd");
                 zfpcrEndDate = DateUtils.parseDateToStr("yyyyMMdd",EndDate);
                 //当前时间
                 String currentDate = DateUtils.dateTimeNow("yyyyMMdd");
                 int result = CommonUtil.compare(zfpcrEndDate,currentDate);
-                if (result <= 0){
-                    return AjaxResult.error("此授信已到期,请修改到期时间后解冻");
+                Date beginDate = DateUtils.parseDate(zfpcrStartDate,"yyyy-MM-dd");
+                zfpcrStartDate = DateUtils.parseDateToStr("yyyyMMdd",beginDate);
+                //当前日期和开始日期比较
+                int  ending =  CommonUtil.compare(zfpcrStartDate,currentDate);
+                //小于开始日期或者大于结束日期
+                if (ending == -1  || result == 1 ){
+                    return AjaxResult.error("请先修改授信的有效期范围,只有在有效期范围内才可以解冻");
                 }
             }
             zcFinanceProComRel.setZfpcrStatus("00");

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/common/ReportCreditMapper.xml

@@ -272,7 +272,11 @@ 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')
+        WHERE zfi_status = '02'
+        AND (
+            DATE_SUB(zfi_expire_date, INTERVAL zfp_shortest_period DAY)   >= now()
+            AND  DATE_SUB(zfi_expire_date, INTERVAL zfp_shortest_period DAY) <= DATE_SUB(now(), INTERVAL -30 DAY)
+        )
         <if test="coreCompanyId != null  and coreCompanyId != ''">
             AND zfi_core_id = #{coreCompanyId}
         </if>
@@ -282,12 +286,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="managementCompanyId != null  and managementCompanyId != ''">
             AND zfp_management_id = #{managementCompanyId}
         </if>
-        <if test="startDate != null  and startDate != ''">
+        <!--<if test="startDate != null  and startDate != ''">
             AND zfi_expire_date BETWEEN #{startDate} AND #{endDate}
         </if>
         <if test="zfpType != null  and zfpType != ''">
             AND zfp_type = #{zfpType}
-        </if>
+        </if>-->
 
     </select>
 
@@ -562,14 +566,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT
         zfi_id 'zfiId',
         DATE_FORMAT(zfi_expire_date, '%Y-%m-%d') 'zfiExpireDate',
-        zfp_shortest_period 'zfpShortestPeriod'
+        zfp_shortest_period 'zfpShortestPeriod',
+        zfi_number  'zfiNumber',
+        zfi_amount  'zfiAmount'
         FROM zc_finance_inf
         LEFT JOIN zc_finance_product
         ON zfp_id = zfi_product_id
         WHERE
         zfi_status='02'
-        <if test="supplierCompanyId != null  and supplierCompanyId != ''">
-            AND zfi_supplier_id = #{supplierCompanyId}
+        AND (
+             DATE_SUB(zfi_expire_date, INTERVAL zfp_shortest_period DAY)   &gt;= now()
+            AND  DATE_SUB(zfi_expire_date, INTERVAL zfp_shortest_period DAY) &lt;= DATE_SUB(now(), INTERVAL -30 DAY)
+        )
+        <if test="paramMap.supplierCompanyId != null  and paramMap.supplierCompanyId != ''">
+            AND zfi_supplier_id = #{paramMap.supplierCompanyId}
         </if>
+
     </select>
 </mapper>

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>