From 39c7b716cdf135450faf393003bb6acb1b99afbe Mon Sep 17 00:00:00 2001
From: wkc <978997012@qq.com>
Date: Mon, 10 Aug 2026 11:53:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=B5=81=E7=A8=8B=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E7=AD=9B=E9=80=89=E5=8F=8A=E6=9C=BA=E6=9E=84=E5=8F=B7?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domain/entity/LoanPricingWorkflow.java    | 11 ++++++
 .../domain/vo/LoanPricingWorkflowListVO.java  |  2 +
 .../loanpricing/LoanPricingWorkflowMapper.xml | 13 +++++++
 .../src/views/loanPricing/workflow/index.vue  | 39 ++++++++++++++++++-
 4 files changed, 64 insertions(+), 1 deletion(-)

diff --git a/ruoyi-loan-pricing/src/main/java/com/ruoyi/loanpricing/domain/entity/LoanPricingWorkflow.java b/ruoyi-loan-pricing/src/main/java/com/ruoyi/loanpricing/domain/entity/LoanPricingWorkflow.java
index 083127c..59eec55 100644
--- a/ruoyi-loan-pricing/src/main/java/com/ruoyi/loanpricing/domain/entity/LoanPricingWorkflow.java
+++ b/ruoyi-loan-pricing/src/main/java/com/ruoyi/loanpricing/domain/entity/LoanPricingWorkflow.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -164,6 +165,16 @@ public class LoanPricingWorkflow implements Serializable
     @TableField(exist = false)
     private Long dataScopeDeptId;
 
+    /** 创建时间查询起始值 */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @TableField(exist = false)
+    private Date beginCreateTime;
+
+    /** 创建时间查询结束值 */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @TableField(exist = false)
+    private Date endCreateTime;
+
     /** 创建时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField(fill = FieldFill.INSERT)
diff --git 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
index 67cda06..6f45db7 100644
--- 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
@@ -9,6 +9,8 @@ public class LoanPricingWorkflowListVO
 {
     private String serialNum;
 
+    private Long deptId;
+
     private String custIsn;
 
     private String custName;
diff --git a/ruoyi-loan-pricing/src/main/resources/mapper/loanpricing/LoanPricingWorkflowMapper.xml b/ruoyi-loan-pricing/src/main/resources/mapper/loanpricing/LoanPricingWorkflowMapper.xml
index 783228b..54d1be0 100644
--- a/ruoyi-loan-pricing/src/main/resources/mapper/loanpricing/LoanPricingWorkflowMapper.xml
+++ b/ruoyi-loan-pricing/src/main/resources/mapper/loanpricing/LoanPricingWorkflowMapper.xml
@@ -7,6 +7,7 @@
     <select id="selectWorkflowPageWithRates" resultType="com.ruoyi.loanpricing.domain.vo.LoanPricingWorkflowListVO">
         SELECT
             lpw.serial_num AS serialNum,
+            lpw.dept_id AS deptId,
             lpw.cust_isn AS custIsn,
             lpw.cust_name AS custName,
             lpw.cust_type AS custType,
@@ -49,6 +50,18 @@
             <if test="query != null and query.deptId != null">
                 AND lpw.dept_id = #{query.deptId}
             </if>
+            <if test="query != null and query.custType != null and query.custType != ''">
+                AND lpw.cust_type = #{query.custType}
+            </if>
+            <if test="query != null and query.guarType != null and query.guarType != ''">
+                AND lpw.guar_type = #{query.guarType}
+            </if>
+            <if test="query != null and query.beginCreateTime != null">
+                AND lpw.create_time &gt;= #{query.beginCreateTime}
+            </if>
+            <if test="query != null and query.endCreateTime != null">
+                AND lpw.create_time &lt;= #{query.endCreateTime}
+            </if>
         </where>
         ORDER BY lpw.update_time DESC
     </select>
diff --git a/ruoyi-ui/src/views/loanPricing/workflow/index.vue b/ruoyi-ui/src/views/loanPricing/workflow/index.vue
index 34203da..dd16102 100644
--- a/ruoyi-ui/src/views/loanPricing/workflow/index.vue
+++ b/ruoyi-ui/src/views/loanPricing/workflow/index.vue
@@ -9,6 +9,20 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="客户类型" prop="custType">
+        <el-select v-model="queryParams.custType" placeholder="请选择客户类型" clearable style="width: 160px">
+          <el-option label="个人" value="个人" />
+          <el-option label="企业" value="企业" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="担保方式" prop="guarType">
+        <el-select v-model="queryParams.guarType" placeholder="请选择担保方式" clearable style="width: 160px">
+          <el-option label="信用" value="信用" />
+          <el-option label="保证" value="保证" />
+          <el-option label="抵押" value="抵押" />
+          <el-option label="质押" value="质押" />
+        </el-select>
+      </el-form-item>
       <el-form-item label="创建者" prop="createBy">
         <el-input
           v-model="queryParams.createBy"
@@ -27,6 +41,17 @@
           style="width: 220px"
         />
       </el-form-item>
+      <el-form-item label="创建时间">
+        <el-date-picker
+          v-model="dateRange"
+          type="daterange"
+          value-format="yyyy-MM-dd"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          style="width: 240px"
+        />
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -69,6 +94,7 @@
         </template>
       </el-table-column>
       <el-table-column label="创建者" align="center" prop="createBy" min-width="220" class-name="workflow-important-column" />
+      <el-table-column label="机构号" align="center" prop="deptId" min-width="110" />
       <el-table-column label="操作" align="center" fixed="right" min-width="150" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -157,6 +183,8 @@ export default {
       workflowList: [],
       // 机构树选项
       deptOptions: [],
+      // 创建时间范围
+      dateRange: [],
       // 是否显示客户类型选择弹出层
       showTypeSelector: false,
       // 是否显示客户号查询选择弹出层
@@ -176,6 +204,8 @@ export default {
         pageNum: 1,
         pageSize: 10,
         custIsn: undefined,
+        custType: undefined,
+        guarType: undefined,
         createBy: undefined,
         deptId: undefined
       }
@@ -220,7 +250,13 @@ export default {
     /** 查询利率定价流程列表 */
     getList() {
       this.loading = true
-      listWorkflow(this.queryParams).then(response => {
+      const hasDateRange = Array.isArray(this.dateRange) && this.dateRange.length === 2
+      const query = {
+        ...this.queryParams,
+        beginCreateTime: hasDateRange ? `${this.dateRange[0]} 00:00:00` : undefined,
+        endCreateTime: hasDateRange ? `${this.dateRange[1]} 23:59:59` : undefined
+      }
+      listWorkflow(query).then(response => {
         this.workflowList = response.rows
         this.total = response.total
         this.loading = false
@@ -233,6 +269,7 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.dateRange = []
       this.resetForm("queryForm")
       this.handleQuery()
     },