From 6cd2da8eb7d7aefecd96a19ebbfe9caba59ea88c Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 18 May 2023 14:25:58 +0800
Subject: [PATCH] 巡查任务巡查责任人完成任务逻辑修改
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/mapper/ReportFloodRecordMapper.xml | 41 +++++++++++++++++++++++++++++++++++++----
1 files changed, 37 insertions(+), 4 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/mapper/ReportFloodRecordMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/mapper/ReportFloodRecordMapper.xml
index ee6ce1c..518ad84 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/mapper/ReportFloodRecordMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/reportFlood/mapper/ReportFloodRecordMapper.xml
@@ -1,14 +1,47 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.gistack.sm.reportFlood.mapper.ReportFloodRecordMapper">
+ <resultMap id="vo" type="cn.gistack.sm.reportFlood.vo.ReportFloodRecordVO">
+ <id property="id" column="id"/>
+ <result property="reservoirName" column="reservoirName"/>
+ <result property="updateTime" column="update_time"/>
+ <result property="content" column="content"/>
+ <result property="solution" column="solution"/>
+ <result property="isDeleted" column="is_deleted"/>
+ <result property="status" column="status"/>
+ <result property="images" column="images" typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/>
+ <result property="videos" column="videos" typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/>
+ <result property="curDrp" column="cur_drp"/>
+ <result property="gateStatus" column="gate_status"/>
+ <result property="isOver" column="is_over"/>
+ <result property="overZ" column="over_z"/>
+ <result property="personWatch" column="person_watch"/>
+ <result property="processDefinitionId" column="process_definition_id"/>
+ <result property="processInstanceId" column="process_instance_id"/>
+ <result property="reservoirId" column="reservoir_id"/>
+ <result property="sysReport" column="sys_report"/>
+ <result property="createDept" column="create_dept"/>
+ <result property="createUser" column="create_user"/>
+ <result property="updateUser" column="update_user"/>
+ <result property="createTime" column="create_time"/>
+ <result property="handleContent" column="handleContent"/>
+ <result property="handleImages" column="handleImages" typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/>
+ <result property="handleVideos" column="handleVideos" typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/>
+ <result property="handleSolution" column="handleSolution"/>
+
+ </resultMap>
<select id="selectReportFloodRecordPages" resultType="cn.gistack.sm.reportFlood.entity.ReportFloodRecord">
</select>
- <select id="customizeGetDetail" resultType="cn.gistack.sm.reportFlood.vo.ReportFloodRecordVO">
- SELECT R.*,atb."name" reservoirName FROM SM_REPORT_FLOOD_RECORD R
- LEFT JOIN "SJZT_MD"."att_res_base" atb ON atb."guid" = R.reservoir_id
- WHERE IS_DELETED = 0 AND R.ID = #{id}
+ <select id="customizeGetDetail" resultMap="vo">
+ SELECT R.*,atb."name" reservoirName,handle.content handleContent,handle.solution handleSolution,handle.images handleImages,handle.videos handleVideos FROM SM_REPORT_FLOOD_RECORD r
+ LEFT JOIN "SJZT_MD"."att_res_base" atb ON atb."guid" = r.reservoir_id
+ LEFT JOIN SM_REPORT_FLOOD_HANDLE handle ON handle.record_id = r.id
+ WHERE r.IS_DELETED = 0 AND r.ID = #{reportFloodRecord.id}
+ <if test="reportFloodRecord.currentUserId != null and reportFloodRecord.currentUserId !=''">
+ AND handle.create_user = #{reportFloodRecord.currentUserId}
+ </if>
</select>
</mapper>
--
Gitblit v1.9.3