From 91eeb185de1e8ccc632d4fc1efeb0f9abf315050 Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期二, 02 七月 2024 09:18:23 +0800
Subject: [PATCH] 上报数据与拉去任务初步版本
---
src/main/resources/mybatis/doublePrevention/PreventCJReportCheckTaskFromWorkMapper.xml | 46 ++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 44 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mybatis/doublePrevention/PreventCJReportCheckTaskFromWorkMapper.xml b/src/main/resources/mybatis/doublePrevention/PreventCJReportCheckTaskFromWorkMapper.xml
index a6abcb8..08f882a 100644
--- a/src/main/resources/mybatis/doublePrevention/PreventCJReportCheckTaskFromWorkMapper.xml
+++ b/src/main/resources/mybatis/doublePrevention/PreventCJReportCheckTaskFromWorkMapper.xml
@@ -18,6 +18,14 @@
<result column="check_cycle" property="checkCycle"/>
<result column="check_cycle_unit" property="checkCycleUnit"/>
<result column="work_id" property="workId"/>
+
+ <result column="troubleshoot_content" property="troubleshootContent"/>
+ <result column="task_start_time" property="taskStartTime"/>
+ <result column="work_start_time" property="workStartTime"/>
+ <result column="work_end_time" property="workEndTime"/>
+ <result column="work_day_type" property="workDayType"/>
+ <result column="work_type" property="workType"/>
+ <result column="task_num" property="taskNum"/>
</resultMap>
<!--IPage<PreventReportCheckTaskFromWork> getReportTaskFromWorkPage(Page<Object> objectPage, PreventReportCheckTaskFromWorkReqDTO queryReqDTO);-->
@@ -31,6 +39,18 @@
select * from prevent_cj_report_check_task_from_work
where report_status = 1
limit 200
+ </select>
+
+ <select id="listWork" resultMap="BaseResultMap">
+ select * from prevent_cj_report_check_task_from_work
+ where work_id >= 82 and 94 >= work_id and troubleshoot_content is null
+ limit 50
+ </select>
+
+ <select id="listWork1" resultMap="BaseResultMap">
+ select * from prevent_cj_report_check_task_from_work
+ where index_id > 800 and 1205 >= index_id and (82 > work_id or work_id > 94) and troubleshoot_content is null
+ limit 100
</select>
<!--int updateWorkReportStatus(HandlerReportParam handlerReportParam);-->
@@ -49,18 +69,40 @@
where id = #{id}
</update>
+<!-- int updateInfo(PreventCJReportCheckTaskFromWork work);-->
+ <update id="updateInfo">
+ update prevent_cj_report_check_task_from_work set
+ work_start_time = #{workStartTime},
+ work_end_time = #{workEndTime},
+ troubleshoot_content = #{troubleshootContent}
+ where index_id = #{indexId}
+ </update>
+<!-- int updateInfo1(PreventCJReportCheckTaskFromWork work);-->
+ <update id="updateInfo1">
+ update prevent_cj_report_check_task_from_work set
+ troubleshoot_content = #{troubleshootContent},
+ task_start_time = #{taskStartTime},
+ work_day_type = #{workDayType},
+ work_type = #{workType},
+ task_num = #{taskNum}
+
+ where index_id = #{indexId}
+
+ </update>
+
<!-- int insertTaskFromWorkList(PreventCJReportCheckTaskFromWork cjTaskFromWork);-->
<insert id="insertTaskFromWorkList">
insert into prevent_cj_report_check_task_from_work
values(null, #{id}, #{companyCode}, #{deleted}, #{createDate}, #{createBy}, #{updateDate}, #{updateBy}
, #{riskMeasureId}, #{checkCycle}, #{checkCycleUnit}
- , #{reportStatus}, #{reportTime}, #{dataSource}, #{workId})
+ , #{reportStatus}, #{reportTime}, #{dataSource}, #{workId}
+ , #{troubleshootContent},#{taskStartTime},#{workStartTime},#{workEndTime},#{workDayType},#{workType},#{taskNum})
</insert>
<!-- PreventCJReportCheckTaskFromWork geByMeasureUUidAndJobId(String measureUuid, Long jobId);-->
<select id="geByMeasureUUidAndJobId" resultMap="BaseResultMap">
select * from prevent_cj_report_check_task_from_work
- where work_id = #{jobId} and risk_measure_id = #{measureUuid}
+ where work_id = #{jobId} and risk_measure_id = #{measureUuid} and deleted = 0
</select>
--
Gitblit v1.9.2