修改安环废水废弃查询

blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/InsTestMapper.xml

@@ -40,6 +40,9 @@
             <if test="bsInsTest.dosingTime!=null">
                 and n.DOSING_TIME like '%' || #{bsInsTest.dosingTime} || '%'
             </if>
+            <if test="bsInsTest.queryDosingTime!=null">
+                and n.DOSING_TIME BETWEEN to_date(#{bsInsTest.startDate},'YYYY-MM-DD HH24:MI:SS') AND to_date(#{bsInsTest.endDate},'YYYY-MM-DD HH24:MI:SS')
+            </if>
         </where>
     </select>
 

blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/WasteGasRunRecMapper.xml

@@ -45,6 +45,12 @@
             <if test="bsWasteGasRunRec.endTime !=null">
                 and n.END_TIME <![CDATA[ <= ]]> to_date(#{bsWasteGasRunRec.endTime},'YYYY-MM-DD HH24:MI:SS')
             </if>
+            <if test="bsWasteGasRunRec.queryStartTime!=null">
+                and n.START_TIME BETWEEN to_date(#{bsWasteGasRunRec.startStart},'YYYY-MM-DD HH24:MI:SS') AND to_date(#{bsWasteGasRunRec.startEnd},'YYYY-MM-DD HH24:MI:SS')
+            </if>
+            <if test="bsWasteGasRunRec.queryEndTime!=null">
+                and n.END_TIME BETWEEN to_date(#{bsWasteGasRunRec.endStart},'YYYY-MM-DD HH24:MI:SS') AND to_date(#{bsWasteGasRunRec.endEnd},'YYYY-MM-DD HH24:MI:SS')
+            </if>
         </where>
     </select>
 

blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsInsTestVO.java

@@ -25,6 +25,7 @@
  */
 package org.springblade.desk.energy.pojo.vo;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.desk.energy.pojo.entity.BsInsTestEntity;
@@ -43,4 +44,17 @@ public class BsInsTestVO extends BsInsTestEntity {
 	@Serial
 	private static final long serialVersionUID = 1L;
 
+	private String queryDosingTime;
+
+	/**
+	 * 开始时间
+	 */
+	@Schema(description = "开始时间")
+	private String startDate;
+	/**
+	 * 结束时间
+	 */
+	@Schema(description = "结束时间")
+	private String endDate;
+
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsWasteGasRunRecVO.java

@@ -43,4 +43,16 @@ public class BsWasteGasRunRecVO extends BsWasteGasRunRecEntity {
 	@Serial
 	private static final long serialVersionUID = 1L;
 
+	private String queryStartTime;
+
+	private String queryEndTime;
+
+	private String startStart;
+
+	private String startEnd;
+
+	private String endStart;
+
+	private String endEnd;
+
 }

blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsInsTestServiceImpl.java

@@ -28,6 +28,7 @@ package org.springblade.desk.energy.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.commons.lang3.StringUtils;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.desk.energy.excel.BsInsTestExcel;
 import org.springblade.desk.energy.mapper.BsInsTestMapper;
@@ -49,6 +50,10 @@ public class BsInsTestServiceImpl extends BaseServiceImpl<BsInsTestMapper, BsIns
 
 	@Override
 	public IPage<BsInsTestVO> selectBsInsTestPage(IPage<BsInsTestVO> page, BsInsTestVO bsInsTest) {
+		if(StringUtils.isNotEmpty(bsInsTest.getQueryDosingTime())){
+			bsInsTest.setStartDate(bsInsTest.getQueryDosingTime().split(",")[0]);
+			bsInsTest.setEndDate(bsInsTest.getQueryDosingTime().split(",")[1]);
+		}
 		return page.setRecords(baseMapper.selectBsInsTestPage(page, bsInsTest));
 	}
 

blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsWasteGasRunRecServiceImpl.java

@@ -27,6 +27,7 @@ package org.springblade.desk.energy.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.commons.lang3.StringUtils;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.desk.energy.excel.BsWasteGasRunRecExcel;
 import org.springblade.desk.energy.mapper.BsWasteGasRunRecMapper;
@@ -48,6 +49,14 @@ public class BsWasteGasRunRecServiceImpl extends BaseServiceImpl<BsWasteGasRunRe
 
 	@Override
 	public IPage<BsWasteGasRunRecVO> selectBsWasteGasRunRecPage(IPage<BsWasteGasRunRecVO> page, BsWasteGasRunRecVO bsWasteGasRunRec) {
+		if(StringUtils.isNotEmpty(bsWasteGasRunRec.getQueryStartTime())){
+			bsWasteGasRunRec.setStartStart(bsWasteGasRunRec.getQueryStartTime().split(",")[0]);
+			bsWasteGasRunRec.setStartEnd(bsWasteGasRunRec.getQueryStartTime().split(",")[1]);
+		}
+		if(StringUtils.isNotEmpty(bsWasteGasRunRec.getQueryEndTime())){
+			bsWasteGasRunRec.setEndStart(bsWasteGasRunRec.getQueryEndTime().split(",")[0]);
+			bsWasteGasRunRec.setEndEnd(bsWasteGasRunRec.getQueryEndTime().split(",")[1]);
+		}
 		return page.setRecords(baseMapper.selectBsWasteGasRunRecPage(page, bsWasteGasRunRec));
 	}
 

blade-service/blade-desk/src/main/java/org/springblade/desk/energy/util/ExportUtil.java

@@ -38,7 +38,6 @@ public class ExportUtil {
             Map<String, ReportModel> reports = ReportInfoReader.getReport();
             JasperPrint jp = JasperReportUtil.getJasperPrint(reportId, data, (Map)params);
             ReportModel rm = (ReportModel)reports.get(reportId);
-            jp.setName("测试");
             if (StringUtils.isBlank(fileName)) {
                 fileName = Function.toUtf8String(rm.getReportName());
             }