优化代码

java110-bean/src/main/java/com/java110/dto/workEvent/WorkEventDto.java

@@ -19,7 +19,7 @@ public class WorkEventDto extends PageDto implements Serializable {
     private String preStaffName;
     private String preStaffId;
     private String staffName;
-    private String staffNameName;
+    private String staffNameLike;
     private String remark;
     private String communityId;
     private String storeId;
@@ -30,6 +30,8 @@ public class WorkEventDto extends PageDto implements Serializable {
     private String startTime;
     private String endTime;
 
+    private String queryStartTime;
+    private String queryEndTime;
 
     private Date createTime;
 
@@ -149,11 +151,27 @@ public class WorkEventDto extends PageDto implements Serializable {
         this.endTime = endTime;
     }
 
-    public String getStaffNameName() {
-        return staffNameName;
+    public String getStaffNameLike() {
+        return staffNameLike;
     }
 
-    public void setStaffNameName(String staffNameName) {
-        this.staffNameName = staffNameName;
+    public void setStaffNameLike(String staffNameLike) {
+        this.staffNameLike = staffNameLike;
+    }
+
+    public String getQueryStartTime() {
+        return queryStartTime;
+    }
+
+    public void setQueryStartTime(String queryStartTime) {
+        this.queryStartTime = queryStartTime;
+    }
+
+    public String getQueryEndTime() {
+        return queryEndTime;
+    }
+
+    public void setQueryEndTime(String queryEndTime) {
+        this.queryEndTime = queryEndTime;
     }
 }

java110-bean/src/main/java/com/java110/dto/workPoolFile/WorkPoolFileDto.java

@@ -31,6 +31,9 @@ public class WorkPoolFileDto extends PageDto implements Serializable {
     private String staffName;
     private String staffNameLike;
 
+    private String queryStartTime;
+    private String queryEndTime;
+
 
     private Date createTime;
 
@@ -125,4 +128,20 @@ public class WorkPoolFileDto extends PageDto implements Serializable {
     public void setStaffNameLike(String staffNameLike) {
         this.staffNameLike = staffNameLike;
     }
+
+    public String getQueryStartTime() {
+        return queryStartTime;
+    }
+
+    public void setQueryStartTime(String queryStartTime) {
+        this.queryStartTime = queryStartTime;
+    }
+
+    public String getQueryEndTime() {
+        return queryEndTime;
+    }
+
+    public void setQueryEndTime(String queryEndTime) {
+        this.queryEndTime = queryEndTime;
+    }
 }

java110-bean/src/main/java/com/java110/dto/workTask/WorkTaskDto.java

@@ -31,6 +31,8 @@ public class WorkTaskDto extends PageDto implements Serializable {
     private String staffId;
 
     private String staffNameLike;
+    private String queryStartTime;
+    private String queryEndTime;
 
 
     private Date createTime;
@@ -150,4 +152,20 @@ public class WorkTaskDto extends PageDto implements Serializable {
     public void setStaffNameLike(String staffNameLike) {
         this.staffNameLike = staffNameLike;
     }
+
+    public String getQueryStartTime() {
+        return queryStartTime;
+    }
+
+    public void setQueryStartTime(String queryStartTime) {
+        this.queryStartTime = queryStartTime;
+    }
+
+    public String getQueryEndTime() {
+        return queryEndTime;
+    }
+
+    public void setQueryEndTime(String queryEndTime) {
+        this.queryEndTime = queryEndTime;
+    }
 }

java110-db/src/main/resources/mapper/oa/WorkEventV1ServiceDaoImplMapper.xml

@@ -61,6 +61,12 @@
         <if test="staffId !=null and staffId != ''">
             and t.staff_id= #{staffId}
         </if>
+        <if test="queryStartTime !=null and queryStartTime != ''">
+            and t.create_time &gt; #{queryStartTime}
+        </if>
+        <if test="queryEndTime !=null and queryEndTime != ''">
+            and t.create_time &lt; #{queryEndTime}
+        </if>
         order by t.create_time desc
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}
@@ -151,6 +157,12 @@
         <if test="staffId !=null and staffId != ''">
             and t.staff_id= #{staffId}
         </if>
+        <if test="queryStartTime !=null and queryStartTime != ''">
+            and t.create_time &gt; #{queryStartTime}
+        </if>
+        <if test="queryEndTime !=null and queryEndTime != ''">
+            and t.create_time &lt; #{queryEndTime}
+        </if>
 
 
     </select>

java110-db/src/main/resources/mapper/oa/WorkPoolFileV1ServiceDaoImplMapper.xml

@@ -50,6 +50,12 @@
         <if test="staffNameLike !=null and staffNameLike != ''">
             and wt.staff_name like concat('%', #{staffNameLike},'%')
         </if>
+        <if test="queryStartTime !=null and queryStartTime != ''">
+            and t.create_time &gt; #{queryStartTime}
+        </if>
+        <if test="queryEndTime !=null and queryEndTime != ''">
+            and t.create_time &lt; #{queryEndTime}
+        </if>
         order by t.create_time desc
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}
@@ -124,7 +130,12 @@
         <if test="staffNameLike !=null and staffNameLike != ''">
             and wt.staff_name like concat('%', #{staffNameLike},'%')
         </if>
-
+        <if test="queryStartTime !=null and queryStartTime != ''">
+            and t.create_time &gt; #{queryStartTime}
+        </if>
+        <if test="queryEndTime !=null and queryEndTime != ''">
+            and t.create_time &lt; #{queryEndTime}
+        </if>
 
     </select>
 

java110-db/src/main/resources/mapper/oa/WorkTaskV1ServiceDaoImplMapper.xml

@@ -64,6 +64,12 @@
         <if test="staffId !=null and staffId != ''">
             and t.staff_id= #{staffId}
         </if>
+        <if test="queryStartTime !=null and queryStartTime != ''">
+            and t.create_time &gt; #{queryStartTime}
+        </if>
+        <if test="queryEndTime !=null and queryEndTime != ''">
+            and t.create_time &lt; #{queryEndTime}
+        </if>
         order by t.create_time desc
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}
@@ -154,6 +160,12 @@
         <if test="staffId !=null and staffId != ''">
             and t.staff_id= #{staffId}
         </if>
+        <if test="queryStartTime !=null and queryStartTime != ''">
+            and t.create_time &gt; #{queryStartTime}
+        </if>
+        <if test="queryEndTime !=null and queryEndTime != ''">
+            and t.create_time &lt; #{queryEndTime}
+        </if>
 
 
     </select>