首页30天到期数据

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

@@ -925,9 +925,11 @@ public class OwnBillController extends BaseController {
         String token = SecurityUtils.getToken(ServletUtils.getRequest());
         for (String ziiId : ziiIds) {
             ZcInvoiceInf zcInvoiceInf = iZcInvoiceInfService.getById(ziiId);
-            zcInvoiceInf.setZiiStatus("99");
-            //删除发票
-            iZcInvoiceInfService.updateZcInvoiceInf(zcInvoiceInf);
+            if(zcInvoiceInf != null){
+                zcInvoiceInf.setZiiStatus("99");
+                //删除发票
+                iZcInvoiceInfService.updateZcInvoiceInf(zcInvoiceInf);
+            }
             LambdaQueryWrapper<ZcBillInvoiceRel> queryWrapper = new LambdaQueryWrapper<>();
             //发票id
             queryWrapper.eq(ZcBillInvoiceRel::getZbirInvoiceId, ziiId);

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

@@ -387,6 +387,49 @@ public class ReportCreditController extends BaseController {
     }
 
     /**
+     * 企业融信30天到期数据
+     * @return
+     */
+    @GetMapping("/getExpiredList")
+    public AjaxResult getExpiredList(String zfpType, QueryRequest request)
+    {
+        //获取当前企业的编号
+        LoginUser userInfo = tokenService.getLoginUser();
+        SysUser use = userInfo.getSysUser();
+        Map<String,String> map = new HashMap<>();
+        //获取企业
+        String companyId = use.getCompanyId();
+        //获取企业类型
+        String type = use.getCompanyType();
+        //开始时间 当天
+        String startDate = DateUtils.dateTimeNow("yyyy-MM-dd");
+        //结束时间 30后
+        String endDate = DateUtils.getFetureDate(30);
+        map.put("startDate",startDate);
+        map.put("endDate",endDate);
+        //默认反向
+        if(CommonUtil.isEmpty(zfpType)){
+            zfpType = "1";
+        }
+        if(COMPANYTYPE_CORE.equals(type)){
+            //核心企业
+            map.put("zfpType",zfpType);
+            map.put("coreCompanyId", companyId);
+        }else if(COMPANYTYPE_SUPPLIER.equals(type)){
+            //供应商
+            map.put("zfpType",zfpType);
+            map.put("supplierCompanyId", companyId);
+        }else if(COMPANYTYPE_MANAGEMENT.equals(type)){
+            //资金方
+            map.put("zfpType",zfpType);
+            map.put("managementCompanyId", companyId);
+        }
+        //即将到期融信
+        IPage<Map> list =  reportCreditService.getExpiredList(map,request);
+        return AjaxResult.success(list);
+    }
+
+    /**
      * 查询平台资金 -- 饼图
      * @return
      */

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

@@ -75,6 +75,14 @@ public interface ReportCreditMapper {
     String getExpiredBalance(Map map);
 
     /**
+     * 查询企业将到期融资
+     * @param page
+     * @param map
+     * @return
+     */
+    public IPage<Map> getExpiredList(Page<Map> page, @Param("paramMap") Map map);
+
+    /**
      * 企业渠道融信已用额度
      * @param page
      * @param map

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

@@ -73,6 +73,14 @@ public interface ReportCreditService {
     String getExpiredBalance(Map map);
 
     /**
+     * 获取企业将到期融资
+     * @param map
+     * @param request
+     * @return
+     */
+    public IPage<Map> getExpiredList(Map map, QueryRequest request);
+
+    /**
      * 企业渠道融信已用额度
      * @param map
      * @param request

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

@@ -64,6 +64,12 @@ public class ReportCreditServiceImpl implements ReportCreditService {
     }
 
     @Override
+    public IPage<Map> getExpiredList(Map map, QueryRequest request) {
+        Page page = new Page<>(request.getPageNum(), request.getPageSize());
+        return reportCreditMapper.getExpiredList(page, map);
+    }
+
+    @Override
     public IPage<Map> getCreditLineList(Map map, QueryRequest request) {
         Page page = new Page<>(request.getPageNum(), request.getPageSize());
         return reportCreditMapper.getCreditLineList(page, map);

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

@@ -291,6 +291,35 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     </select>
 
+    <!--企业将到期融资额度-->
+    <select id="getExpiredList" parameterType="map" resultType="java.lang.String">
+        SELECT
+        zfi_number      'zfiNumber',
+        zfi_amount      'afiAmount',
+        zfi_expire_date 'afiExpireDate'
+        FROM
+        zc_finance_inf
+        LEFT JOIN zc_finance_product
+        ON zfp_id = zfi_product_id
+        WHERE zfi_status IN ('02','04','05')
+        <if test="paramMap.coreCompanyId != null  and paramMap.coreCompanyId != ''">
+            AND zfi_core_id = #{paramMap.coreCompanyId}
+        </if>
+        <if test="paramMap.supplierCompanyId != null  and paramMap.supplierCompanyId != ''">
+            AND zfi_supplier_id = #{paramMap.supplierCompanyId}
+        </if>
+        <if test="paramMap.managementCompanyId != null  and paramMap.managementCompanyId != ''">
+            AND zfp_management_id = #{paramMap.managementCompanyId}
+        </if>
+        <if test="paramMap.startDate != null  and paramMap.startDate != ''">
+            AND zfi_expire_date BETWEEN #{paramMap.startDate} AND #{paramMap.endDate}
+        </if>
+        <if test="paramMap.zfpType != null  and paramMap.zfpType != ''">
+            AND zfp_type = #{paramMap.zfpType}
+        </if>
+
+    </select>
+
     <!--企业渠道已用融信-->
     <select id="getCreditLineList" parameterType="map" resultType="map">
         SELECT