supervision-spring.git

			@@ -116,8 +116,8 @@
			override fun getStatisticalResult(areaVo: AreaVo): List<StatisticsVo> {
			val districtcode = areaVo.districtcode
			val sceneType = areaVo.scensetypeid
			val startTime = areaVo.starttime
			val endTime = areaVo.endtime
			val startTime = areaVo.starttime?.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))
			val endTime = areaVo.endtime?.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))
			val maps = problemlistMapper.getStatisticalResult(districtcode,startTime, endTime, sceneType)
			val statisticsVos = mutableListOf<StatisticsVo>()
			maps.forEach {
			@@ -146,7 +146,12 @@
			// .andGreaterThanOrEqualTo("endtime", areaVo.endtime)
			// .andEqualTo("districtcode", areaVo.districtcode)
			val chargeInfoVo = ChargeInfoVo()
			val sql = "select T_GUID, T_Name from tm_t_task where TS_GUID IS NULL and T_StartTime <= '" + areaVo.starttime + "' and T_EndTime >= '" + areaVo.endtime + "' and T_DistrictCode = '" + areaVo.districtcode +"'"
			val sTime = areaVo.starttime?.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))
			val eTime = areaVo.endtime?.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"))
			val sql =
			"select T_GUID, T_Name from tm_t_task where TS_GUID IS NULL and T_StartTime <= '" + sTime + "' and T_EndTime" +
			" >= '" + eTime + "' and T_DistrictCode = '" + areaVo.districtcode + "'"

			val maps1 = taskMapper.selectSE(sql)
			var topTaskId = String()
			var topTaskName = String()
			@@ -556,4 +561,22 @@

			return BaseResponse(true)
			}

			override fun getBySubTask(stGuid: String): List<ProblemlistVo> {
			//根据子任务ID获取问题列表
			val problemListVo = findBySubtaskId(stGuid)
			//判断是否有问题列表
			if (!problemListVo.isEmpty()) {
			//根据每个问题,获取媒体文件
			problemListVo.forEach {
			val mediafileVo = mediafileService.findByBusinessGUID(it.guid!!)
			//判断是否有媒体资料
			if (!mediafileVo.isEmpty()) {
			//赋值
			it.mediafileList = mediafileVo
			}
			}
			}
			return problemListVo
			}
			}