From 46872a311da9480d3edb19223aca2e0833fb1e31 Mon Sep 17 00:00:00 2001
From: hcong <1050828145@qq.com>
Date: 星期二, 17 十二月 2024 11:41:00 +0800
Subject: [PATCH] 1. 完成数据产品中间结果基本信息和具体信息入库 2. 修改ColInspectionInfo.kt 监管时间格式修改为yyyy-mm-dd 3. 新增数据产品类型枚举类 DataProductType 4. 修改BaseTemplate实现类通过重写genData方法生成Template相关数据 5. TODO 其他未涉及到的产品对象的中间结果对象
---
src/main/resources/mapper/ds1/ProblemlistMapper.xml | 18 +-----------------
1 files changed, 1 insertions(+), 17 deletions(-)
diff --git a/src/main/resources/mapper/ds1/ProblemlistMapper.xml b/src/main/resources/mapper/ds1/ProblemlistMapper.xml
index 857d461..ff89068 100644
--- a/src/main/resources/mapper/ds1/ProblemlistMapper.xml
+++ b/src/main/resources/mapper/ds1/ProblemlistMapper.xml
@@ -53,6 +53,7 @@
<result property="endTime" column="endTime"/>
<result property="count" column="count"/>
<result property="changeCount" column="changeCount"/>
+<!-- <collection property="problems" ofType="cn.flightfeather.supervision.domain.ds1.entity.Problemlist" resultMap="BaseResultMap"/>-->
</resultMap>
<resultMap id="SceneProblemSummary" type="cn.flightfeather.supervision.lightshare.vo.SceneProblemSummary">
<id property="sceneId" column="sceneId"/>
@@ -75,23 +76,6 @@
LEFT JOIN sm_t_scense AS f ON a.S_GUID = f.S_GUID
LEFT JOIN tm_t_subtask AS c ON a.ST_GUID = c.ST_GUID
<where>
-<!-- a.ST_GUID IN (-->
-<!-- SELECT-->
-<!-- d.ST_GUID-->
-<!-- FROM-->
-<!-- tm_t_subtask AS d LEFT JOIN tm_t_task AS e ON d.T_GUID = e.T_GUID-->
-<!-- WHERE-->
-<!-- e.T_LevelNum = '2'-->
-<!-- <if test="startTime != null">-->
-<!-- AND e.T_StartTime <= #{startTime}-->
-<!-- </if>-->
-<!-- <if test="endTime != null">-->
-<!-- AND e.T_EndTime >= #{endTime}-->
-<!-- </if>-->
-<!-- <if test="districtCode != null">-->
-<!-- AND e.T_DistrictCode = #{districtCode}-->
-<!-- </if>-->
-<!-- )-->
<if test="startTime != null">
AND c.ST_PlanStartTime >= #{startTime}
</if>
--
Gitblit v1.9.3