supervision-spring.git

			@@ -130,11 +130,11 @@

			//根据区县、场景类型、时间获取各个问题数量
			override fun getStatisticalResult(areaVo: AreaVo): List<StatisticsVo> {
			val districtcode = areaVo.districtcode
			val sceneType = areaVo.scensetypeid
			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"))
			return problemlistMapper.getStatisticalResult(districtcode, startTime, endTime, sceneType, areaVo.sceneId)
			// val districtcode = areaVo.districtcode
			// val sceneType = areaVo.scensetypeid
			// 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"))
			return problemlistMapper.getStatisticalResult(areaVo)
			}

			override fun getChargeResult(areaVo: AreaVo): ChargeInfoVo {
			@@ -526,6 +526,7 @@
			return "success"
			}


			override fun changeProblem(problemId: String, files: Array<MultipartFile>): BaseResponse<String> {
			// 问题和问题图片合法性检查
			val p = problemlistMapper.selectByPrimaryKey(problemId) ?: return BaseResponse(false, "问题不存在")
			@@ -625,14 +626,13 @@

			override fun getSceneProSummary(
			areaVo: AreaVo,
			sortBy: String,
			page: Int,
			per_page: Int,
			): Pair<DataHead?, List<SceneProblemSummary>?> {
			areaVo.scensetypeid ?: throw BizException("缺少场景类型参数")
			val task = taskRep.findOneTask(areaVo) ?: throw BizException("未找到对应的巡查总任务")
			// areaVo.scensetypeid ?: throw BizException("缺少场景类型参数")
			// val task = taskRep.findOneTask(areaVo) ?: throw BizException("未找到对应的巡查总任务")
			val p = PageHelper.startPage<SceneProblemSummary>(page, per_page)
			val res = problemRep.selectSceneProSummary(task.tguid!!, areaVo.scensetypeid!!, areaVo.sort, sortBy)
			val res = problemRep.selectSceneProSummary(areaVo)
			return DataHead(p.pageNum, p.pages, p.total) to res
			}
			}