From 764d883b5ea3bdc06abbec548b6df0511e567978 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Tue, 03 Sep 2024 09:46:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/binlog' into binlog
---
src/main/java/org/springblade/modules/eCallEventTwo/mapper/EcCallEventTwoMapper.xml | 284 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 284 insertions(+), 0 deletions(-)
diff --git a/src/main/java/org/springblade/modules/eCallEventTwo/mapper/EcCallEventTwoMapper.xml b/src/main/java/org/springblade/modules/eCallEventTwo/mapper/EcCallEventTwoMapper.xml
new file mode 100644
index 0000000..e62b436
--- /dev/null
+++ b/src/main/java/org/springblade/modules/eCallEventTwo/mapper/EcCallEventTwoMapper.xml
@@ -0,0 +1,284 @@
+<?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="org.springblade.modules.eCallEventTwo.mapper.EcCallEventTwoMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="eCallEventTwoResultMap" type="org.springblade.modules.eCallEventTwo.vo.ECallEventTwoVO">
+ </resultMap>
+
+
+ <select id="selectECallEventTwoPage" resultMap="eCallEventTwoResultMap">
+ select jecet.* from jczz_e_call_event_two jecet
+ <where>
+ <if test="eCallEventTwo.orderId != null "> and order_id = #{eCallEventTwo.orderId}</if>
+ <if test="eCallEventTwo.orderCode != null and eCallEventTwo.orderCode != ''"> and order_code like concat('%',#{eCallEventTwo.orderCode},'%') </if>
+ <if test="eCallEventTwo.issueOrigin != null and eCallEventTwo.issueOrigin != ''"> and issue_origin = #{eCallEventTwo.issueOrigin}</if>
+ <if test="eCallEventTwo.issueTitle != null and eCallEventTwo.issueTitle != ''"> and issue_title like concat('%',#{eCallEventTwo.issueTitle},'%') </if>
+ <if test="eCallEventTwo.issueContent != null and eCallEventTwo.issueContent != ''"> and issue_content = #{eCallEventTwo.issueContent}</if>
+ <if test="eCallEventTwo.applicantType != null and eCallEventTwo.applicantType != ''"> and applicant_type = #{eCallEventTwo.applicantType}</if>
+ <if test="eCallEventTwo.applicantName != null and eCallEventTwo.applicantName != ''"> and applicant_name like concat('%',#{eCallEventTwo.applicantName},'%') </if>
+ <if test="eCallEventTwo.applicantGender != null and eCallEventTwo.applicantGender != ''"> and applicant_gender = #{eCallEventTwo.applicantGender}</if>
+ <if test="eCallEventTwo.applicantHomeaddr != null and eCallEventTwo.applicantHomeaddr != ''"> and applicant_homeaddr = #{eCallEventTwo.applicantHomeaddr}</if>
+ <if test="eCallEventTwo.applicantPhone != null and eCallEventTwo.applicantPhone != ''"> and applicant_phone = #{eCallEventTwo.applicantPhone}</if>
+ <if test="eCallEventTwo.applicantGrid != null and eCallEventTwo.applicantGrid != ''"> and applicant_grid = #{eCallEventTwo.applicantGrid}</if>
+ <if test="eCallEventTwo.applicantDistrict != null and eCallEventTwo.applicantDistrict != ''"> and applicant_district = #{eCallEventTwo.applicantDistrict}</if>
+ <if test="eCallEventTwo.sceneAddr != null and eCallEventTwo.sceneAddr != ''"> and scene_addr = #{eCallEventTwo.sceneAddr}</if>
+ <if test="eCallEventTwo.sceneAddrGrid != null and eCallEventTwo.sceneAddrGrid != ''"> and scene_addr_grid = #{eCallEventTwo.sceneAddrGrid}</if>
+ <if test="eCallEventTwo.sceneDistrict != null and eCallEventTwo.sceneDistrict != ''"> and scene_district = #{eCallEventTwo.sceneDistrict}</if>
+ <if test="eCallEventTwo.scenePlace != null and eCallEventTwo.scenePlace != ''"> and scene_place = #{eCallEventTwo.scenePlace}</if>
+ <if test="eCallEventTwo.sceneGeoLat != null "> and scene_geo_lat = #{eCallEventTwo.sceneGeoLat}</if>
+ <if test="eCallEventTwo.sceneGeoLng != null "> and scene_geo_lng = #{eCallEventTwo.sceneGeoLng}</if>
+ <if test="eCallEventTwo.isSecret != null and eCallEventTwo.isSecret != ''"> and is_secret = #{eCallEventTwo.isSecret}</if>
+ <if test="eCallEventTwo.isRepeat != null and eCallEventTwo.isRepeat != ''"> and is_repeat = #{eCallEventTwo.isRepeat}</if>
+ <if test="eCallEventTwo.issueType != null and eCallEventTwo.issueType != ''"> and issue_type = #{eCallEventTwo.issueType}</if>
+ <if test="eCallEventTwo.issueClazz != null and eCallEventTwo.issueClazz != ''"> and issue_clazz = #{eCallEventTwo.issueClazz}</if>
+ <if test="eCallEventTwo.issueLevel != null and eCallEventTwo.issueLevel != ''"> and issue_level = #{eCallEventTwo.issueLevel}</if>
+ <if test="eCallEventTwo.deadline != null "> and deadline = #{eCallEventTwo.deadline}</if>
+ <if test="eCallEventTwo.linkOrders != null and eCallEventTwo.linkOrders != ''"> and link_orders = #{eCallEventTwo.linkOrders}</if>
+ <if test="eCallEventTwo.linkOrdersCode != null and eCallEventTwo.linkOrdersCode != ''"> and link_orders_code = #{leCallEventTwo.inkOrdersCode}</if>
+ <if test="eCallEventTwo.wikiRef != null and eCallEventTwo.wikiRef != ''"> and wiki_ref = #{eCallEventTwo.wikiRef}</if>
+ <if test="eCallEventTwo.acptOrgCode != null and eCallEventTwo.acptOrgCode != ''"> and acpt_org_code = #{eCallEventTwo.acptOrgCode}</if>
+ <if test="eCallEventTwo.acptOrgName != null and eCallEventTwo.acptOrgName != ''"> and acpt_org_name = #{eCallEventTwo.acptOrgName}</if>
+ <if test="eCallEventTwo.handleWay != null and eCallEventTwo.handleWay != ''"> and handle_way = #{eCallEventTwo.handleWay}</if>
+ <if test="eCallEventTwo.externalHandleWay != null and eCallEventTwo.externalHandleWay != ''"> and external_handle_way = #{eCallEventTwo.eCallEventTwo.externalHandleWay}</if>
+ <if test="eCallEventTwo.directFeed != null and eCallEventTwo.directFeed != ''"> and direct_feed = #{eCallEventTwo.directFeed}</if>
+ <if test="eCallEventTwo.directFeedHandler != null and eCallEventTwo.directFeedHandler != ''"> and direct_feed_handler = #{eCallEventTwo.directFeedHandler}</if>
+ <if test="eCallEventTwo.directFeedTime != null "> and direct_feed_time = #{eCallEventTwo.directFeedTime}</if>
+ <if test="eCallEventTwo.images != null and eCallEventTwo.images != ''">and images =
+ #{eCallEventTwo.images}
+ </if>
+ <if test="eCallEventTwo.status != null and eCallEventTwo.status != ''">and status =
+ #{eCallEventTwo.status}
+ </if>
+ <if test="eCallEventTwo.tagApply != null and eCallEventTwo.tagApply != ''">and tag_apply =
+ #{eCallEventTwo.tagApply}
+ </if>
+ <if test="eCallEventTwo.tagDelay != null and eCallEventTwo.tagDelay != ''">and tag_delay =
+ #{eCallEventTwo.tagDelay}
+ </if>
+ <if test="eCallEventTwo.tagDoing != null and eCallEventTwo.tagDoing != ''">and tag_doing =
+ #{eCallEventTwo.tagDoing}
+ </if>
+ <if test="eCallEventTwo.tagResp != null and eCallEventTwo.tagResp != ''">and tag_resp =
+ #{eCallEventTwo.tagResp}
+ </if>
+ <if test="eCallEventTwo.tagDone != null and eCallEventTwo.tagDone != ''">and tag_done =
+ #{eCallEventTwo.tagDone}
+ </if>
+ <if test="eCallEventTwo.tagCheck != null and eCallEventTwo.tagCheck != ''">and tag_check =
+ #{eCallEventTwo.tagCheck}
+ </if>
+ <if test="eCallEventTwo.tagChkTel != null and eCallEventTwo.tagChkTel != ''">and tag_chk_tel =
+ #{eCallEventTwo.tagChkTel}
+ </if>
+ <if test="eCallEventTwo.tagRedo != null and eCallEventTwo.tagRedo != ''">and tag_redo =
+ #{eCallEventTwo.tagRedo}
+ </if>
+ <if test="isAdministrator==2">
+ <choose>
+ <when test="eCallEventTwo.roleName != null and eCallEventTwo.roleName != ''">
+ <if test="eCallEventTwo.roleName=='wgy'">
+ <choose>
+ <when test="gridCodeList !=null and gridCodeList.size()>0">
+ and jecet.grid_code in
+ <foreach collection="gridCodeList" item="code" open="(" close=")" separator=",">
+ #{code}
+ </foreach>
+ </when>
+ <otherwise>
+ and jecet.grid_code in ('')
+ </otherwise>
+ </choose>
+ </if>
+ <if test="eCallEventTwo.roleName=='mj'">
+ <choose>
+ <when test="regionChildCodesList !=null and regionChildCodesList.size()>0">
+ and jecet.jw_grid_code in
+ <foreach collection="regionChildCodesList" item="code" open="(" close=")"
+ separator=",">
+ #{code}
+ </foreach>
+ </when>
+ <otherwise>
+ and jecet.jw_grid_code in ('')
+ </otherwise>
+ </choose>
+ </if>
+ </when>
+ <otherwise>
+ <choose>
+ <when test="regionChildCodesList !=null and regionChildCodesList.size()>0">
+ and
+ (
+ jecet.grid_code in
+ <foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
+ #{code}
+ </foreach>
+ )
+ </when>
+ <otherwise>
+ and ( jecet.grid_code in ('') )
+ </otherwise>
+ </choose>
+ </otherwise>
+ </choose>
+ </if>
+ </where>
+ order by order_id desc
+ </select>
+
+
+ <resultMap type="org.springblade.modules.eCallEventTwo.dto.ECallEventTwoDTO" id="ECallEventTwoDTOResult">
+ <result property="orderId" column="order_id" />
+ <result property="orderCode" column="order_code" />
+ <result property="issueOrigin" column="issue_origin" />
+ <result property="issueTitle" column="issue_title" />
+ <result property="issueContent" column="issue_content" />
+ <result property="applicantType" column="applicant_type" />
+ <result property="applicantName" column="applicant_name" />
+ <result property="applicantGender" column="applicant_gender" />
+ <result property="applicantHomeaddr" column="applicant_homeaddr" />
+ <result property="applicantPhone" column="applicant_phone" />
+ <result property="applicantGrid" column="applicant_grid" />
+ <result property="applicantDistrict" column="applicant_district" />
+ <result property="sceneAddr" column="scene_addr" />
+ <result property="sceneAddrGrid" column="scene_addr_grid" />
+ <result property="sceneDistrict" column="scene_district" />
+ <result property="scenePlace" column="scene_place" />
+ <result property="sceneGeoLat" column="scene_geo_lat" />
+ <result property="sceneGeoLng" column="scene_geo_lng" />
+ <result property="isSecret" column="is_secret" />
+ <result property="isRepeat" column="is_repeat" />
+ <result property="issueType" column="issue_type" />
+ <result property="issueClazz" column="issue_clazz" />
+ <result property="issueLevel" column="issue_level" />
+ <result property="deadline" column="deadline" />
+ <result property="linkOrders" column="link_orders" />
+ <result property="linkOrdersCode" column="link_orders_code" />
+ <result property="wikiRef" column="wiki_ref" />
+ <result property="acptOrgCode" column="acpt_org_code" />
+ <result property="acptOrgName" column="acpt_org_name" />
+ <result property="handleWay" column="handle_way" />
+ <result property="externalHandleWay" column="external_handle_way" />
+ <result property="directFeed" column="direct_feed" />
+ <result property="directFeedHandler" column="direct_feed_handler" />
+ <result property="directFeedTime" column="direct_feed_time" />
+ <result property="images" column="images" />
+ <result property="status" column="status" />
+ <result property="tagApply" column="tag_apply" />
+ <result property="tagDelay" column="tag_delay" />
+ <result property="tagDoing" column="tag_doing" />
+ <result property="tagResp" column="tag_resp" />
+ <result property="tagDone" column="tag_done" />
+ <result property="tagCheck" column="tag_check" />
+ <result property="tagChkTel" column="tag_chk_tel" />
+ <result property="tagRedo" column="tag_redo" />
+ </resultMap>
+
+ <sql id="selectECallEventTwo">
+ select
+ order_id,
+ order_code,
+ issue_origin,
+ issue_title,
+ issue_content,
+ applicant_type,
+ applicant_name,
+ applicant_gender,
+ applicant_homeaddr,
+ applicant_phone,
+ applicant_grid,
+ applicant_district,
+ scene_addr,
+ scene_addr_grid,
+ scene_district,
+ scene_place,
+ scene_geo_lat,
+ scene_geo_lng,
+ is_secret,
+ is_repeat,
+ issue_type,
+ issue_clazz,
+ issue_level,
+ deadline,
+ link_orders,
+ link_orders_code,
+ wiki_ref,
+ acpt_org_code,
+ acpt_org_name,
+ handle_way,
+ external_handle_way,
+ direct_feed,
+ direct_feed_handler,
+ direct_feed_time,
+ images,
+ status,
+ tag_apply,
+ tag_delay,
+ tag_doing,
+ tag_resp,
+ tag_done,
+ tag_check,
+ tag_chk_tel,
+ tag_redo
+ from
+ jczz_e_call_event_two
+ </sql>
+
+ <select id="selectECallEventTwoById" parameterType="long" resultMap="ECallEventTwoDTOResult">
+ <include refid="selectECallEventTwo"/>
+ where
+ order_id = #{orderId}
+ </select>
+
+ <select id="selectECallEventTwoList" parameterType="org.springblade.modules.eCallEventTwo.dto.ECallEventTwoDTO" resultMap="ECallEventTwoDTOResult">
+ <include refid="selectECallEventTwo"/>
+ <where>
+ <if test="orderId != null "> and order_id = #{orderId}</if>
+ <if test="orderCode != null and orderCode != ''"> and order_code = #{orderCode}</if>
+ <if test="issueOrigin != null and issueOrigin != ''"> and issue_origin = #{issueOrigin}</if>
+ <if test="issueTitle != null and issueTitle != ''"> and issue_title = #{issueTitle}</if>
+ <if test="issueContent != null and issueContent != ''"> and issue_content = #{issueContent}</if>
+ <if test="applicantType != null and applicantType != ''"> and applicant_type = #{applicantType}</if>
+ <if test="applicantName != null and applicantName != ''"> and applicant_name = #{applicantName}</if>
+ <if test="applicantGender != null and applicantGender != ''"> and applicant_gender = #{applicantGender}</if>
+ <if test="applicantHomeaddr != null and applicantHomeaddr != ''"> and applicant_homeaddr = #{applicantHomeaddr}</if>
+ <if test="applicantPhone != null and applicantPhone != ''"> and applicant_phone = #{applicantPhone}</if>
+ <if test="applicantGrid != null and applicantGrid != ''"> and applicant_grid = #{applicantGrid}</if>
+ <if test="applicantDistrict != null and applicantDistrict != ''"> and applicant_district = #{applicantDistrict}</if>
+ <if test="sceneAddr != null and sceneAddr != ''"> and scene_addr = #{sceneAddr}</if>
+ <if test="sceneAddrGrid != null and sceneAddrGrid != ''"> and scene_addr_grid = #{sceneAddrGrid}</if>
+ <if test="sceneDistrict != null and sceneDistrict != ''"> and scene_district = #{sceneDistrict}</if>
+ <if test="scenePlace != null and scenePlace != ''"> and scene_place = #{scenePlace}</if>
+ <if test="sceneGeoLat != null "> and scene_geo_lat = #{sceneGeoLat}</if>
+ <if test="sceneGeoLng != null "> and scene_geo_lng = #{sceneGeoLng}</if>
+ <if test="isSecret != null and isSecret != ''"> and is_secret = #{isSecret}</if>
+ <if test="isRepeat != null and isRepeat != ''"> and is_repeat = #{isRepeat}</if>
+ <if test="issueType != null and issueType != ''"> and issue_type = #{issueType}</if>
+ <if test="issueClazz != null and issueClazz != ''"> and issue_clazz = #{issueClazz}</if>
+ <if test="issueLevel != null and issueLevel != ''"> and issue_level = #{issueLevel}</if>
+ <if test="deadline != null "> and deadline = #{deadline}</if>
+ <if test="linkOrders != null and linkOrders != ''"> and link_orders = #{linkOrders}</if>
+ <if test="linkOrdersCode != null and linkOrdersCode != ''"> and link_orders_code = #{linkOrdersCode}</if>
+ <if test="wikiRef != null and wikiRef != ''"> and wiki_ref = #{wikiRef}</if>
+ <if test="acptOrgCode != null and acptOrgCode != ''"> and acpt_org_code = #{acptOrgCode}</if>
+ <if test="acptOrgName != null and acptOrgName != ''"> and acpt_org_name = #{acptOrgName}</if>
+ <if test="handleWay != null and handleWay != ''"> and handle_way = #{handleWay}</if>
+ <if test="externalHandleWay != null and externalHandleWay != ''"> and external_handle_way = #{externalHandleWay}</if>
+ <if test="directFeed != null and directFeed != ''"> and direct_feed = #{directFeed}</if>
+ <if test="directFeedHandler != null and directFeedHandler != ''"> and direct_feed_handler = #{directFeedHandler}</if>
+ <if test="directFeedTime != null "> and direct_feed_time = #{directFeedTime}</if>
+ <if test="images != null and images != ''"> and images = #{images}</if>
+ <if test="status != null and status != ''"> and status = #{status}</if>
+ <if test="tagApply != null and tagApply != ''"> and tag_apply = #{tagApply}</if>
+ <if test="tagDelay != null and tagDelay != ''"> and tag_delay = #{tagDelay}</if>
+ <if test="tagDoing != null and tagDoing != ''"> and tag_doing = #{tagDoing}</if>
+ <if test="tagResp != null and tagResp != ''"> and tag_resp = #{tagResp}</if>
+ <if test="tagDone != null and tagDone != ''"> and tag_done = #{tagDone}</if>
+ <if test="tagCheck != null and tagCheck != ''"> and tag_check = #{tagCheck}</if>
+ <if test="tagChkTel != null and tagChkTel != ''"> and tag_chk_tel = #{tagChkTel}</if>
+ <if test="tagRedo != null and tagRedo != ''"> and tag_redo = #{tagRedo}</if>
+ </where>
+ </select>
+
+</mapper>
--
Gitblit v1.9.3