From fbf5402f03820ebc702871fc4c4933c024ff3087 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 29 七月 2024 18:08:26 +0800
Subject: [PATCH] 变更

---
 ruoyi-project/src/main/java/com/ruoyi/project/domain/VDonationworkflow.java                  |   23 +++++++++++++++++++++++
 ruoyi-project/src/main/java/com/ruoyi/project/service/impl/VDonationworkflowServiceImpl.java |    8 +++++++-
 ruoyi-project/src/main/resources/mapper/project/VDonationworkflowMapper.xml                  |   10 ++++++++--
 3 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/VDonationworkflow.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/VDonationworkflow.java
index 06aa241..88e2599 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/VDonationworkflow.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/VDonationworkflow.java
@@ -85,6 +85,13 @@
     private String reportername;
 
     /**
+     * 妗堜緥鍖哄煙
+     */
+    @ApiModelProperty("妗堜緥鍖哄煙")
+    @Excel(name = "妗堜緥鍖哄煙")
+    private String regionalLevel;
+
+    /**
      * 妗堜緥鏃堕棿
      */
     @ApiModelProperty("妗堜緥鏃堕棿")
@@ -93,6 +100,22 @@
     private Date donatetime;
 
     /**
+     * 寮�濮嬫椂闂�
+     */
+    @ApiModelProperty("寮�濮嬫椂闂�")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "寮�濮嬫椂闂�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date starttime;
+
+    /**
+     * 缁撴潫鏃堕棿
+     */
+    @ApiModelProperty("缁撴潫鏃堕棿")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "缁撴潫鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date endtime;
+
+    /**
      * 鎶ュ憡鏃堕棿
      */
     @ApiModelProperty("鎶ュ憡鏃堕棿")
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/VDonationworkflowServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/VDonationworkflowServiceImpl.java
index 3f833fc..55d798e 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/VDonationworkflowServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/VDonationworkflowServiceImpl.java
@@ -49,6 +49,9 @@
         if (StringUtils.isNotBlank(vDonationworkflow.getDeptname())){
             wrappers.like(VDonationworkflow::getDeptname ,vDonationworkflow.getDeptname());
         }
+        if (StringUtils.isNotBlank(vDonationworkflow.getRegionalLevel())){
+            wrappers.eq(VDonationworkflow::getRegionalLevel ,vDonationworkflow.getRegionalLevel());
+        }
         if (StringUtils.isNotBlank(vDonationworkflow.getReporterno())){
             wrappers.eq(VDonationworkflow::getReporterno ,vDonationworkflow.getReporterno());
         }
@@ -56,7 +59,10 @@
             wrappers.like(VDonationworkflow::getReportername ,vDonationworkflow.getReportername());
         }
         if (vDonationworkflow.getDonatetime() != null){
-            wrappers.eq(VDonationworkflow::getDonatetime ,vDonationworkflow.getDonatetime());
+            wrappers.ge(VDonationworkflow::getDonatetime ,vDonationworkflow.getStarttime());
+        }
+        if (vDonationworkflow.getDonatetime() != null){
+            wrappers.lt(VDonationworkflow::getDonatetime ,vDonationworkflow.getEndtime());
         }
         if (vDonationworkflow.getReporttime() != null){
             wrappers.eq(VDonationworkflow::getReporttime ,vDonationworkflow.getReporttime());
diff --git a/ruoyi-project/src/main/resources/mapper/project/VDonationworkflowMapper.xml b/ruoyi-project/src/main/resources/mapper/project/VDonationworkflowMapper.xml
index 452cdb1..404b5d0 100644
--- a/ruoyi-project/src/main/resources/mapper/project/VDonationworkflowMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/VDonationworkflowMapper.xml
@@ -24,6 +24,7 @@
         <result property="organcount" column="organcount"/>
         <result property="operationbegtime" column="operationBegTime"/>
         <result property="completetime" column="completeTime"/>
+        <result property="regionalLevel" column="regionalLevel"/>
     </resultMap>
 
     <sql id="selectVDonationworkflowVo">
@@ -45,7 +46,8 @@
                conclusionTime,
                organcount,
                operationBegTime,
-               completeTime
+               completeTime,
+               regionalLevel
         from v_donationworkflow
     </sql>
 
@@ -63,8 +65,11 @@
             <if test="reportername != null  and reportername != ''">and reporterName like concat('%', #{reportername},
                 '%')
             </if>
+            --
             <if test="donatetime != null ">and donatetime = #{donatetime}</if>
-            <if test="reporttime != null ">and ReportTime = #{reporttime}</if>
+            <if test="starttime != null ">and donatetime >= #{starttime}</if>
+            <if test="endtime != null ">and donatetime &lt;= #{endtime}
+            </if>
             <if test="coreteamassessconclusion != null  and coreteamassessconclusion != ''">and CoreTeamAssessConclusion
                 = #{coreteamassessconclusion}
             </if>
@@ -75,6 +80,7 @@
             <if test="organcount != null ">and organcount = #{organcount}</if>
             <if test="operationbegtime != null ">and operationBegTime = #{operationbegtime}</if>
             <if test="completetime != null ">and completeTime = #{completetime}</if>
+            <if test="regionalLevel != null ">and regionalLevel = #{regionalLevel}</if>
         </where>
     </select>
 

--
Gitblit v1.9.3