数据修改

common/src/main/java/com/huoran/common/utils/CustomDateSerializer.java

@@ -0,0 +1,29 @@
+package com.huoran.common.utils;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.SerializerProvider;
+
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+public class CustomDateSerializer extends JsonSerializer<Date> {
+
+    private static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd");
+    private static final SimpleDateFormat DATETIME_FORMAT = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+    @Override
+    public void serialize(Date value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
+        if (value != null) {
+            String formattedDate = DATETIME_FORMAT.format(value);
+            if (formattedDate.endsWith(" 00:00:00")) {
+                gen.writeString(DATE_FORMAT.format(value));
+            } else {
+                gen.writeString(formattedDate);
+            }
+        } else {
+            gen.writeNull();
+        }
+    }
+}

judgment_point/src/main/java/com/huoran/judgment_point/entity/vo/CompanyLoanListVO.java

@@ -1,5 +1,7 @@
 package com.huoran.judgment_point.entity.vo;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.huoran.common.utils.CustomDateSerializer;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -21,15 +23,18 @@ public class CompanyLoanListVO {
     private String applicationNumber;
 
     @ApiModelProperty(value = "申请时间")
+    @JsonSerialize(using = CustomDateSerializer.class)
     private Date createTime;
 
     @ApiModelProperty(value = "贷款类型")
     private String loanType;
 
     @ApiModelProperty(value = "放款日期")
+    @JsonSerialize(using = CustomDateSerializer.class)
     private Date loanDate;
 
     @ApiModelProperty(value = "贷款申请日期")
+    @JsonSerialize(using = CustomDateSerializer.class)
     private Date loanApplicationDate;
 
     @ApiModelProperty(value = "贷款状态（用户最后操作状态）")
@@ -42,6 +47,7 @@ public class CompanyLoanListVO {
     private String loanApplicationAmount;
 
     @ApiModelProperty(value = "处理日期")
+    @JsonSerialize(using = CustomDateSerializer.class)
     private Date updateTime;
 
     @ApiModelProperty(value = "不良贷款")

judgment_point/src/main/java/com/huoran/judgment_point/mapper/xml/BankCompanyLoansMapper.xml

@@ -2,8 +2,73 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huoran.judgment_point.mapper.BankCompanyLoansMapper">
 
+<!--    <select id="companyLoanList"-->
+<!--            resultType="com.huoran.judgment_point.entity.vo.CompanyLoanListVO">-->
+<!--        SELECT-->
+<!--        cl.company_loan_id,-->
+<!--        cl.application_number,-->
+<!--        cl.create_time,-->
+<!--        cl.loan_status,-->
+<!--        cl.extension_period,-->
+<!--        cl.loan_date,-->
+<!--        cl.update_time,-->
+<!--        cl.non_performing_loan,-->
+<!--        cl.bad_debt_recognition,-->
+<!--        cl.built_in,-->
+<!--        cl.processing_results,-->
+<!--        cl.submit,-->
+<!--        CASE-->
+<!--        WHEN cl.submit = 0 THEN-->
+<!--        '进行中'-->
+<!--        WHEN cl.submit = 1 THEN-->
+<!--        '已通过'-->
+<!--        END AS processing_status,-->
+<!--        ca.customer_name,-->
+<!--        ca.loan_type,-->
+<!--        ca.loan_application_amount,-->
+<!--        ca.total_interest_amount,-->
+<!--        ca.loan_amount,-->
+<!--        ca.loan_application_date,-->
+<!--        pi.business_status,-->
+<!--        pi.debt_paying_ability,-->
+<!--        pi.credit_status,-->
+<!--        pi.adverse_changes,-->
+<!--        pi.five_level_classification,-->
+<!--        IFNULL(	(-->
+<!--        SELECT-->
+<!--        sum( amount_due )-->
+<!--        FROM-->
+<!--        bank_company_repayment_plan p-->
+<!--        WHERE-->
+<!--        p.company_loan_id = cl.company_loan_id-->
+<!--        AND p.STATUS = '已还款'-->
+<!--        ),0) AS totalRepaymentAmount-->
+<!--        FROM-->
+<!--        bank_company_loans cl-->
+<!--        LEFT JOIN bank_credit_evaluation ce ON cl.company_loan_id = ce.company_loan_id-->
+<!--        LEFT JOIN bank_loan_application ca ON cl.company_loan_id = ca.company_loan_id-->
+<!--        LEFT JOIN bank_post_loan_investigation pi ON cl.company_loan_id = pi.company_loan_id-->
+<!--        where cl.account_id = #{req.accountId}-->
+<!--        and cl.project_id = #{req.projectId}-->
+<!--        and cl.school_id = #{req.schoolId}-->
+<!--        and cl.built_in = 0-->
+<!--        <if test='req.searchContent !=null and req.searchContent !=""'>-->
+<!--            AND ce.customer_name LIKE CONCAT('%',#{req.searchContent},'%')-->
+<!--        </if>-->
+<!--        <if test='req.typeId !=null and req.typeId > 2'>-->
+<!--            AND cl.loan_date IS NOT NULL-->
+<!--        </if>-->
+<!--        <if test='req.typeId !=null and req.typeId = 2'>-->
+<!--            AND cl.submit = 1-->
+<!--        </if>-->
+<!--        GROUP BY cl.company_loan_id-->
+<!--        ORDER BY cl.create_time DESC-->
+<!--    </select>-->
+
     <select id="companyLoanList"
             resultType="com.huoran.judgment_point.entity.vo.CompanyLoanListVO">
+        SELECT *
+        FROM (
         SELECT
         cl.company_loan_id,
         cl.application_number,
@@ -18,10 +83,8 @@
         cl.processing_results,
         cl.submit,
         CASE
-        WHEN cl.submit = 0 THEN
-        '进行中'
-        WHEN cl.submit = 1 THEN
-        '已通过'
+        WHEN cl.submit = 0 THEN '进行中'
+        WHEN cl.submit = 1 THEN '已通过'
         END AS processing_status,
         ce.customer_name,
         ca.loan_type,
@@ -34,35 +97,86 @@
         pi.credit_status,
         pi.adverse_changes,
         pi.five_level_classification,
-        IFNULL(	(
-        SELECT
-        sum( amount_due )
+        IFNULL((
+        SELECT SUM(amount_due)
+        FROM bank_company_repayment_plan p
+        WHERE p.company_loan_id = cl.company_loan_id
+        AND p.status = '已还款'
+        ), 0) AS totalRepaymentAmount
         FROM
-        bank_company_repayment_plan p
+        bank_company_loans cl
+        LEFT JOIN bank_credit_evaluation ce ON cl.company_loan_id = ce.company_loan_id
+        LEFT JOIN bank_loan_application ca ON cl.company_loan_id = ca.company_loan_id
+        LEFT JOIN bank_post_loan_investigation pi ON cl.company_loan_id = pi.company_loan_id
         WHERE
-        p.company_loan_id = cl.company_loan_id
-        AND p.STATUS = '已还款'
-        ),0) AS totalRepaymentAmount
+        cl.account_id = #{req.accountId}
+        AND cl.project_id = #{req.projectId}
+        AND cl.school_id = #{req.schoolId}
+        AND cl.built_in = 0
+        <if test='req.searchContent !=null and req.searchContent !=""'>
+            AND ce.customer_name LIKE CONCAT('%',#{req.searchContent},'%')
+        </if>
+        <if test='req.typeId !=null and req.typeId > 2'>
+            AND cl.loan_date IS NOT NULL
+        </if>
+        <if test='req.typeId !=null and req.typeId == 2'>
+            AND cl.submit = 1
+        </if>
+
+        UNION ALL
+
+        SELECT
+        cl.company_loan_id,
+        cl.application_number,
+        cl.create_time,
+        cl.loan_status,
+        cl.extension_period,
+        cl.loan_date,
+        cl.update_time,
+        cl.non_performing_loan,
+        cl.bad_debt_recognition,
+        cl.built_in,
+        cl.processing_results,
+        cl.submit,
+        CASE
+        WHEN cl.submit = 0 THEN '进行中'
+        WHEN cl.submit = 1 THEN '已通过'
+        END AS processing_status,
+        ce.customer_name,
+        ca.loan_type,
+        ca.loan_application_amount,
+        ca.total_interest_amount,
+        ca.loan_amount,
+        ca.loan_application_date,
+        pi.business_status,
+        pi.debt_paying_ability,
+        pi.credit_status,
+        pi.adverse_changes,
+        pi.five_level_classification,
+        IFNULL((
+        SELECT SUM(amount_due)
+        FROM bank_company_repayment_plan p
+        WHERE p.company_loan_id = cl.company_loan_id
+        AND p.status = '已还款'
+        ), 0) AS totalRepaymentAmount
         FROM
         bank_company_loans cl
         LEFT JOIN bank_credit_evaluation ce ON cl.company_loan_id = ce.company_loan_id
         LEFT JOIN bank_loan_application ca ON cl.company_loan_id = ca.company_loan_id
         LEFT JOIN bank_post_loan_investigation pi ON cl.company_loan_id = pi.company_loan_id
-        where cl.account_id = #{req.accountId}
-        and cl.project_id = #{req.projectId}
-        and cl.school_id = #{req.schoolId}
-        and cl.built_in = 0
+        WHERE
+         cl.built_in = 1
         <if test='req.searchContent !=null and req.searchContent !=""'>
             AND ce.customer_name LIKE CONCAT('%',#{req.searchContent},'%')
         </if>
         <if test='req.typeId !=null and req.typeId > 2'>
             AND cl.loan_date IS NOT NULL
         </if>
-        <if test='req.typeId !=null and req.typeId = 2'>
+        <if test='req.typeId !=null and req.typeId == 2'>
             AND cl.submit = 1
         </if>
-        GROUP BY cl.company_loan_id
-        ORDER BY cl.create_time DESC
+        ) AS combined_results
+        ORDER BY create_time DESC
     </select>
     <select id="companyLoanListDefault" resultType="com.huoran.judgment_point.entity.vo.CompanyLoanListVO">
         SELECT
@@ -85,7 +199,7 @@
         cl.non_performing_loan,
         cl.bad_debt_recognition,
         cl.built_in,
-        ce.customer_name,
+        ca.customer_name,
         ca.loan_type,
         ca.loan_application_amount,
         ca.total_interest_amount,
@@ -115,6 +229,12 @@
         <if test='req.searchContent !=null and req.searchContent !=""'>
             AND ce.customer_name LIKE CONCAT('%',#{req.searchContent},'%')
         </if>
+        <if test='req.typeId !=null and req.typeId > 2'>
+            AND cl.loan_date IS NOT NULL
+        </if>
+        <if test='req.typeId !=null and req.typeId = 2'>
+            AND cl.submit = 1
+        </if>
         GROUP BY
         cl.company_loan_id
         ORDER BY cl.create_time DESC

judgment_point/src/main/java/com/huoran/judgment_point/service/impl/BankCompanyLoansServiceImpl.java

@@ -13,7 +13,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
-import java.util.*;
 
 /**
  * <p>
@@ -30,48 +29,9 @@ public class BankCompanyLoansServiceImpl extends ServiceImpl<BankCompanyLoansMap
     public R companyLoanList(CompanyLoanListReq companyLoanListReq) {
         // 创建分页对象
         Page<CompanyLoanListVO> page1 = new Page<>(companyLoanListReq.getPageNum(), companyLoanListReq.getPageSize());
-
-        // 查询学校项目中学生创建数据
+        // 查询学校项目中学生创建数据和默认数据进行分页查询
         IPage<CompanyLoanListVO> iPage = baseMapper.companyLoanList(page1, companyLoanListReq);
 
-        // 查询默认数据
-        List<CompanyLoanListVO> iPageDefault = baseMapper.companyLoanListDefault(companyLoanListReq);
-
-        // 合并两个分页查询的结果，并去重
-        Map<Long, CompanyLoanListVO> uniqueResults = new LinkedHashMap<>();
-
-        // 添加第一个查询的结果
-        iPage.getRecords().forEach(record -> uniqueResults.put(Long.valueOf(record.getCompanyLoanId()), record));
-
-        // 添加第二个查询的结果
-        iPageDefault.forEach(record -> uniqueResults.put(Long.valueOf(record.getCompanyLoanId()), record));
-
-        // 获取去重后的结果列表
-        List<CompanyLoanListVO> resultList = new ArrayList<>(uniqueResults.values());
-
-        // 对合并后的结果进行排序
-        resultList.sort(Comparator.comparing(CompanyLoanListVO::getCreateTime).reversed());
-
-        // 计算总记录数
-        long total = iPage.getTotal() + iPageDefault.size();
-
-        // 截取分页的数据
-        int pageNum = companyLoanListReq.getPageNum();
-        int pageSize = companyLoanListReq.getPageSize();
-        int start = Math.max(0, (pageNum - 1) * pageSize);
-        int end = Math.min(start + pageSize, resultList.size());
-
-        // 确保 start 不大于 end
-        if (start >= end) {
-            end = Math.min(start + 1, resultList.size());
-            start = Math.max(0, end - 1);
-        }
-
-        List<CompanyLoanListVO> paginatedResult = resultList.subList(start, end);
-
-        // 设置分页对象的结果
-        iPage.setRecords(paginatedResult);
-        iPage.setTotal(total);
 
         for (CompanyLoanListVO item : iPage.getRecords()) {
             if (item.getLoanAmount()!= null){