首页统计接口优化

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

@@ -457,7 +457,7 @@ public class ReportCreditController extends BaseController {
      * @return
      */
     @GetMapping("/getCoreCreditLine")
-    public AjaxResult getCoreCreditLine()
+    public AjaxResult getCoreCreditLine(String zfpType)
     {
         //获取当前企业的编号
         LoginUser userInfo = tokenService.getLoginUser();
@@ -465,10 +465,15 @@ public class ReportCreditController extends BaseController {
         Map<String,String> map = new HashMap<>();
         //获取企业
         String companyId = use.getCompanyId();
+        //默认反向
+        if(CommonUtil.isEmpty(zfpType)){
+            zfpType = "1";
+        }
         //获取企业类型
         String type = use.getCompanyType();
         if(COMPANYTYPE_CORE.equals(type)){
             //核心企业
+            map.put("zfpType",zfpType);
             map.put("coreCompanyId", companyId);
         }
         //融信额度
@@ -644,8 +649,7 @@ public class ReportCreditController extends BaseController {
                 //周
                 map.put("returnDate",date);
             }
-            map.put("applyStatus","01");
-            //报销所含项目
+            //还款金额
             String amt = reportCreditService.financeRecordMonth(map);
             returnData.add(amt);
         }
@@ -661,67 +665,6 @@ public class ReportCreditController extends BaseController {
     }
 
     /**
-     * 融资开立最近30天统计 -- 柱状图
-     * @return
-     */
-    @GetMapping("/financeRecord")
-    public AjaxResult financeRecord(){
-        //获取当前企业的编号
-        LoginUser userInfo = tokenService.getLoginUser();
-        SysUser use = userInfo.getSysUser();
-        //企业id
-        String companyId = use.getCompanyId();
-        //获取企业类型
-        String type = use.getCompanyType();
-        //默认当年
-        //月份集合
-        List<String> dateList = findDaysStr(DateUtils.getPastDate(30),DateUtils.dateTimeNow("yyyy-MM-dd"));
-        //数据集合
-        List<Map> dataList = new ArrayList<>();
-        //开立额度
-        List<String> data = new ArrayList<>();
-        for (String date : dateList) {
-            Map map = new HashMap();
-            if(COMPANYTYPE_CORE.equals(type)){
-                //核心企业
-                map.put("coreCompanyId", companyId);
-            }
-            map.put("date",date);
-            //报销所含项目
-            String amt = reportCreditService.financeRecordMonth(map);
-            data.add(amt);
-        }
-        //开立额度数据对象
-        Map dataMap = new HashMap();
-        dataMap.put("name","开立额度");
-        dataMap.put("data",data);
-        dataList.add(dataMap);
-        //还款额度
-        List<String> returnData = new ArrayList<>();
-        for (String date : dateList) {
-            Map map = new HashMap();
-            if(COMPANYTYPE_CORE.equals(type)){
-                //核心企业
-                map.put("coreCompanyId", companyId);
-            }
-            map.put("returnDate",date);
-            map.put("applyStatus","01");
-            //报销所含项目
-            String amt = reportCreditService.financeRecordMonth(map);
-            returnData.add(amt);
-        }
-        //还款额度数据对象
-        Map returnDataMap = new HashMap();
-        returnDataMap.put("name","还款额度");
-        returnDataMap.put("data",returnData);
-        dataList.add(returnDataMap);
-        Map result = new HashMap();
-        result.put("dataList",dataList);
-        result.put("dateList",dateList);
-        return AjaxResult.success(result);
-    }
-
-    /**
      * 获取月份集合
      * @return
      */

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

@@ -318,33 +318,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="financeRecordMonth" parameterType="map" resultType="String">
         SELECT
         CAST(
-        ROUND(IFNULL(SUM(zfr_loan_amount), 0), 2) AS CHAR
+        ROUND(IFNULL(SUM(zfi_amount), 0), 2) AS CHAR
         ) 'allAmount'
-        FROM
-        zc_finance_record
-        LEFT JOIN zc_finance_inf
-        ON zfi_id = zfr_finance_id
+        FROM zc_finance_inf
         LEFT JOIN zc_finance_product
         ON zfp_id = zfi_product_id
-        WHERE zfr_approve_stt = '01'
-        AND zfr_status IN ('01','03')
+        WHERE zfi_status IN ('02','04','05','07')
         <if test="coreCompanyId != null  and coreCompanyId != ''">
             AND zfi_core_id = #{coreCompanyId}
         </if>
-        <if test="status != null  and status != ''">
-            AND zfr_status = #{status}
-        </if>
-        <if test="applyStatus != null  and applyStatus != ''">
-            AND zfr_apply_status = #{applyStatus}
-        </if>
         <if test="month != null  and month != ''">
             AND DATE_FORMAT(zfi_sign_date, '%Y-%m') = #{month}
         </if>
         <if test="returnMonth != null  and returnMonth != ''">
-            AND DATE_FORMAT(zfr_pay_date, '%Y-%m') = #{returnMonth}
+            AND DATE_FORMAT(zfi_expire_date, '%Y-%m') = #{returnMonth}
         </if>
         <if test="returnDate != null  and returnDate != ''">
-            AND DATE_FORMAT(zfr_pay_date, '%Y-%m-%d') = #{returnDate}
+            AND DATE_FORMAT(zfi_expire_date, '%Y-%m-%d') = #{returnDate}
         </if>
         <if test="date != null  and date != ''">
             AND DATE_FORMAT(zfi_sign_date, '%Y-%m-%d') = #{date}
@@ -355,6 +345,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="productId != null  and productId != ''">
             AND zfi_product_id = #{productId}
         </if>
+        <if test="zfpType != null  and zfpType != ''">
+            AND zfp_type = #{zfpType}
+        </if>
     </select>
 
     <!--核心企业额度比例-->