浏览代码

开栓搜索

qinhouyu 1 年之前
父节点
当前提交
dab6186fd3

+ 5 - 0
ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/bo/ZComprehensiveBo.java

@@ -101,7 +101,12 @@ public class ZComprehensiveBo extends BaseEntity {
     private String remark;
 
 
+    //职工
     private String personBy;
+    //开始时间
+    private String constructTime;
+    //结束时间
+    private String constructEndTime;
 
 
     @JsonProperty(value = "picIds")

+ 6 - 0
ruoyi-zdsz/src/main/resources/mapper/zdsz/ZComprehensiveMapper.xml

@@ -31,6 +31,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="p.buildingId != null and p.buildingId != ''">
             AND building_id = #{p.buildingId}
         </if>
+        <if test="p.constructTime != null and p.constructTime != '' and p.constructEndTime != null and p.constructEndTime != ''">
+            AND create_time BETWEEN #{p.constructTime} AND #{p.constructEndTime}
+        </if>
         <if test="p.personBy != null and p.personBy != ''">
             AND create_by = #{p.personBy}
         </if>
@@ -73,6 +76,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="p.unitId != null and p.unitId != ''">
             AND unit_id = #{p.unitId}
         </if>
+        <if test="p.constructTime != null and p.constructTime != '' and p.constructEndTime != null and p.constructEndTime != ''">
+            AND create_time BETWEEN #{p.constructTime} AND #{p.constructEndTime}
+        </if>
         <if test="p.district != null and p.district != ''">
             AND district = #{p.district}
         </if>