supervision-spring.git

			@@ -7,6 +7,10 @@
			import cn.flightfeather.supervision.lightshare.service.DataProdBaseService
			import cn.flightfeather.supervision.lightshare.vo.ProblemListVo
			import cn.flightfeather.supervision.lightshare.vo.dataprod.*
			import cn.flightfeather.supervision.lightshare.vo.dataprod.base.DPEvaluateInfo
			import cn.flightfeather.supervision.lightshare.vo.dataprod.base.DPInspectionInfo
			import cn.flightfeather.supervision.lightshare.vo.dataprod.base.DPMonitorDataInfo
			import cn.flightfeather.supervision.lightshare.vo.dataprod.base.DPSceneInfo
			import org.springframework.beans.BeanUtils
			import org.springframework.stereotype.Service
			import tk.mybatis.mapper.entity.Example
			@@ -160,6 +164,20 @@
			val res = mutableListOf<DPInspectionInfo>()
			val subtaskList = aopDbMapper.subtaskMapper.selectByExample(Example(Subtask::class.java).apply {
			createCriteria().andEqualTo("tguid", queryOpt.topTaskId)
			.andEqualTo("provincecode", queryOpt.provinceCode)
			.andEqualTo("citycode", queryOpt.cityCode)
			.andEqualTo("districtcode", queryOpt.districtCode)
			.apply {
			// queryOpt.topTaskId?.let { topTaskId ->
			// andEqualTo("tguid", topTaskId)
			// }
			queryOpt.startTime?.let { startTime ->
			andGreaterThanOrEqualTo("planstarttime", startTime)
			}
			queryOpt.endTime?.let { endTime ->
			andLessThanOrEqualTo("planstarttime", endTime)
			}
			}
			})
			if (subtaskList.isEmpty()) return@queryCache emptyList<DPInspectionInfo>()