提交测风塔信息

energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/anemometertower/AnemometerTowerPageDto.java

@@ -26,11 +26,16 @@ public class AnemometerTowerPageDto extends BaseDto {
     @ApiModelProperty("测风塔名称")
     private String anemometerName;
 
-
     /**
      * 状态
      */
     @ApiModelProperty("状态")
     private Integer state;
 
+    @ApiModelProperty("开始时间")
+    private String beginTime;
+
+    @ApiModelProperty("结束时间")
+    private String endTime;
+
 }

energy-manage-service/src/main/java/com/energy/manage/service/domain/dto/windenginemill/WindEngineMillPageDto.java

@@ -24,5 +24,10 @@ public class WindEngineMillPageDto extends BaseDto {
     @ApiModelProperty("品牌")
     private String brand;
 
+    @ApiModelProperty("开始时间")
+    private String beginTime;
+
+    @ApiModelProperty("结束时间")
+    private String endTime;
 
 }

energy-manage-service/src/main/java/com/energy/manage/service/service/windenginemill/impl/WindEngineMillServiceImpl.java

@@ -134,6 +134,13 @@ public class WindEngineMillServiceImpl extends BaseServiceImpl<com.energy.manage
         if (!StringUtils.isEmpty(windEngineMillPageDto.getBrand())) {
             criteria.andEqualTo("brand", windEngineMillPageDto.getBrand());
         }
+
+        if (!StringUtils.isEmpty(windEngineMillPageDto.getBeginTime())&&!StringUtils.isEmpty(windEngineMillPageDto.getEndTime())) {
+            criteria.andGreaterThanOrEqualTo("createTime", windEngineMillPageDto.getBeginTime());
+            criteria.andLessThanOrEqualTo("createTime", windEngineMillPageDto.getEndTime());
+        }
+
+
         criteria.andEqualTo("delState", DeleteStatusEnum.NODELETE.getCode());
         List<WindEngineMillPO> list = windEngineMillMapper.selectByExample(queryExample);
 

energy-manage-service/src/main/resources/mybatis/anemometertower/AnemometerTowerMapper.xml

@@ -23,13 +23,19 @@
         group by tower_code) aotr on at.anemometer_code = aotr.tower_code
         where 1=1 and del_state  = 0
         <if test="item.anemometerName!=null">
-            and anemometer_name = #{item.anemometerName}
+            and at.anemometer_name = #{item.anemometerName}
         </if>
         <if test="item.anemometerCode!=null">
-        and anemometer_code = #{item.anemometerCode}
+        and at.anemometer_code = #{item.anemometerCode}
         </if>
         <if test="item.state!=null">
-        and state = #{item.state}
+        and at.state = #{item.state}
+        </if>
+        <if test="item.beginTime != null and item.beginTime != ''">
+            and at.create_time  <![CDATA[>= ]]>  #{item.beginTime}
+        </if>
+        <if test="item.endTime != null and item.endTime != ''">
+            and at.create_time <![CDATA[<= ]]> #{item.endTime}
         </if>
      </select>