补充流程列表测算利率联表查询

2026-03-28 12:13:48 +08:00
parent 750af8c07e
commit 39e2177280
16 changed files with 431 additions and 9 deletions
--- a/ruoyi-loan-pricing/src/main/java/com/ruoyi/loanpricing/controller/LoanPricingWorkflowController.java
+++ b/ruoyi-loan-pricing/src/main/java/com/ruoyi/loanpricing/controller/LoanPricingWorkflowController.java
@@ -12,6 +12,7 @@ import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.loanpricing.domain.dto.CorporateLoanPricingCreateDTO;
 import com.ruoyi.loanpricing.domain.dto.PersonalLoanPricingCreateDTO;
 import com.ruoyi.loanpricing.domain.entity.LoanPricingWorkflow;
+import com.ruoyi.loanpricing.domain.vo.LoanPricingWorkflowListVO;
 import com.ruoyi.loanpricing.domain.vo.LoanPricingWorkflowVO;
 import com.ruoyi.loanpricing.service.ILoanPricingWorkflowService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -68,8 +69,8 @@ public class LoanPricingWorkflowController extends BaseController
    public TableDataInfo list(LoanPricingWorkflow loanPricingWorkflow)
    {
        PageDomain pageDomain = TableSupport.buildPageRequest();
-        Page<LoanPricingWorkflow> page = new Page<>(pageDomain.getPageNum(), pageDomain.getPageSize());
-        IPage<LoanPricingWorkflow> result = loanPricingWorkflowService.selectLoanPricingPage(page, loanPricingWorkflow);
+        Page<LoanPricingWorkflowListVO> page = new Page<>(pageDomain.getPageNum(), pageDomain.getPageSize());
+        IPage<LoanPricingWorkflowListVO> result = loanPricingWorkflowService.selectLoanPricingPage(page, loanPricingWorkflow);
        TableDataInfo rspData = new TableDataInfo();
        rspData.setCode(200);
        rspData.setMsg("查询成功");
--- a/ruoyi-loan-pricing/src/main/java/com/ruoyi/loanpricing/domain/vo/LoanPricingWorkflowListVO.java
+++ b/ruoyi-loan-pricing/src/main/java/com/ruoyi/loanpricing/domain/vo/LoanPricingWorkflowListVO.java
@@ -0,0 +1,27 @@
+package com.ruoyi.loanpricing.domain.vo;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class LoanPricingWorkflowListVO
+{
+    private String serialNum;
+
+    private String custName;
+
+    private String custType;
+
+    private String guarType;
+
+    private String applyAmt;
+
+    private String calculateRate;
+
+    private String executeRate;
+
+    private Date createTime;
+
+    private String createBy;
+}
--- a/ruoyi-loan-pricing/src/main/java/com/ruoyi/loanpricing/mapper/LoanPricingWorkflowMapper.java
+++ b/ruoyi-loan-pricing/src/main/java/com/ruoyi/loanpricing/mapper/LoanPricingWorkflowMapper.java
@@ -1,7 +1,11 @@
 package com.ruoyi.loanpricing.mapper;

+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.loanpricing.domain.entity.LoanPricingWorkflow;
+import com.ruoyi.loanpricing.domain.vo.LoanPricingWorkflowListVO;
+import org.apache.ibatis.annotations.Param;

 /**
 * 利率定价流程Mapper接口
@@ -11,5 +15,6 @@ import com.ruoyi.loanpricing.domain.entity.LoanPricingWorkflow;
 */
 public interface LoanPricingWorkflowMapper extends BaseMapper<LoanPricingWorkflow>
 {
-
+    IPage<LoanPricingWorkflowListVO> selectWorkflowPageWithRates(Page<?> page,
+                                                                 @Param("query") LoanPricingWorkflow query);
 }
--- a/ruoyi-loan-pricing/src/main/java/com/ruoyi/loanpricing/service/ILoanPricingWorkflowService.java
+++ b/ruoyi-loan-pricing/src/main/java/com/ruoyi/loanpricing/service/ILoanPricingWorkflowService.java
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.loanpricing.domain.dto.CorporateLoanPricingCreateDTO;
 import com.ruoyi.loanpricing.domain.dto.PersonalLoanPricingCreateDTO;
 import com.ruoyi.loanpricing.domain.entity.LoanPricingWorkflow;
+import com.ruoyi.loanpricing.domain.vo.LoanPricingWorkflowListVO;
 import com.ruoyi.loanpricing.domain.vo.LoanPricingWorkflowVO;

 import java.util.List;
@@ -48,7 +49,7 @@ public interface ILoanPricingWorkflowService
     * @param loanPricingWorkflow 利率定价流程信息
     * @return 分页结果
     */
-    public IPage<LoanPricingWorkflow> selectLoanPricingPage(Page<LoanPricingWorkflow> page, LoanPricingWorkflow loanPricingWorkflow);
+    public IPage<LoanPricingWorkflowListVO> selectLoanPricingPage(Page<LoanPricingWorkflowListVO> page, LoanPricingWorkflow loanPricingWorkflow);

    /**
     * 查询利率定价流程详情
--- a/ruoyi-loan-pricing/src/main/java/com/ruoyi/loanpricing/service/impl/LoanPricingWorkflowServiceImpl.java
+++ b/ruoyi-loan-pricing/src/main/java/com/ruoyi/loanpricing/service/impl/LoanPricingWorkflowServiceImpl.java
@@ -8,6 +8,7 @@ import com.ruoyi.loanpricing.domain.dto.PersonalLoanPricingCreateDTO;
 import com.ruoyi.loanpricing.domain.entity.LoanPricingWorkflow;
 import com.ruoyi.loanpricing.domain.entity.ModelCorpOutputFields;
 import com.ruoyi.loanpricing.domain.entity.ModelRetailOutputFields;
+import com.ruoyi.loanpricing.domain.vo.LoanPricingWorkflowListVO;
 import com.ruoyi.loanpricing.domain.vo.LoanPricingWorkflowVO;
 import com.ruoyi.loanpricing.mapper.LoanPricingWorkflowMapper;
 import com.ruoyi.loanpricing.mapper.ModelCorpOutputFieldsMapper;
@@ -126,12 +127,9 @@ public class LoanPricingWorkflowServiceImpl implements ILoanPricingWorkflowServi
     * @return 利率定价流程
     */
    @Override
-    public IPage<LoanPricingWorkflow> selectLoanPricingPage(Page<LoanPricingWorkflow> page, LoanPricingWorkflow loanPricingWorkflow)
+    public IPage<LoanPricingWorkflowListVO> selectLoanPricingPage(Page<LoanPricingWorkflowListVO> page, LoanPricingWorkflow loanPricingWorkflow)
    {
-        LambdaQueryWrapper<LoanPricingWorkflow> wrapper = buildQueryWrapper(loanPricingWorkflow);
-        // 按更新时间倒序
-        wrapper.orderByDesc(LoanPricingWorkflow::getUpdateTime);
-        return loanPricingWorkflowMapper.selectPage(page, wrapper);
+        return loanPricingWorkflowMapper.selectWorkflowPageWithRates(page, loanPricingWorkflow);
    }

    /**
@@ -153,10 +151,18 @@ public class LoanPricingWorkflowServiceImpl implements ILoanPricingWorkflowServi
        if (Objects.nonNull(loanPricingWorkflow.getModelOutputId())){
            if (loanPricingWorkflow.getCustType().equals("个人")){
                ModelRetailOutputFields modelRetailOutputFields = modelRetailOutputFieldsMapper.selectById(loanPricingWorkflow.getModelOutputId());
+                if (Objects.nonNull(modelRetailOutputFields))
+                {
+                    loanPricingWorkflow.setLoanRate(modelRetailOutputFields.getCalculateRate());
+                }
                loanPricingWorkflowVO.setModelRetailOutputFields(modelRetailOutputFields);
            }
            if (loanPricingWorkflow.getCustType().equals("企业")){
                ModelCorpOutputFields modelCorpOutputFields = modelCorpOutputFieldsMapper.selectById(loanPricingWorkflow.getModelOutputId());
+                if (Objects.nonNull(modelCorpOutputFields))
+                {
+                    loanPricingWorkflow.setLoanRate(modelCorpOutputFields.getCalculateRate());
+                }
                loanPricingWorkflowVO.setModelCorpOutputFields(modelCorpOutputFields);
            }
        }
--- a/ruoyi-loan-pricing/src/main/resources/mapper/loanpricing/LoanPricingWorkflowMapper.xml
+++ b/ruoyi-loan-pricing/src/main/resources/mapper/loanpricing/LoanPricingWorkflowMapper.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.loanpricing.mapper.LoanPricingWorkflowMapper">
+
+    <select id="selectWorkflowPageWithRates" resultType="com.ruoyi.loanpricing.domain.vo.LoanPricingWorkflowListVO">
+        SELECT
+            lpw.serial_num AS serialNum,
+            lpw.cust_name AS custName,
+            lpw.cust_type AS custType,
+            lpw.guar_type AS guarType,
+            lpw.apply_amt AS applyAmt,
+            CASE
+                WHEN lpw.cust_type = '个人' THEN mr.calculate_rate
+                WHEN lpw.cust_type = '企业' THEN mc.calculate_rate
+                ELSE NULL
+            END AS calculateRate,
+            lpw.execute_rate AS executeRate,
+            lpw.create_time AS createTime,
+            lpw.create_by AS createBy
+        FROM loan_pricing_workflow lpw
+        LEFT JOIN model_retail_output_fields mr ON lpw.model_output_id = mr.id
+        LEFT JOIN model_corp_output_fields mc ON lpw.model_output_id = mc.id
+        <where>
+            <if test="query != null and query.createBy != null and query.createBy != ''">
+                AND lpw.create_by LIKE CONCAT('%', #{query.createBy}, '%')
+            </if>
+            <if test="query != null and query.custName != null and query.custName != ''">
+                AND lpw.cust_name LIKE CONCAT('%', #{query.custName}, '%')
+            </if>
+            <if test="query != null and query.orgCode != null and query.orgCode != ''">
+                AND lpw.org_code LIKE CONCAT('%', #{query.orgCode}, '%')
+            </if>
+        </where>
+        ORDER BY lpw.update_time DESC
+    </select>
+
+</mapper>