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 @@
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"
/>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
搜索
重置
@@ -69,6 +94,7 @@
+
{
+ 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()
},