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 | 160 ++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 115 insertions(+), 45 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
index cc0ddb0..e62b436 100644
--- a/src/main/java/org/springblade/modules/eCallEventTwo/mapper/EcCallEventTwoMapper.xml
+++ b/src/main/java/org/springblade/modules/eCallEventTwo/mapper/EcCallEventTwoMapper.xml
@@ -8,53 +8,123 @@
<select id="selectECallEventTwoPage" resultMap="eCallEventTwoResultMap">
- select * from jczz_e_call_event_two
+ select jecet.* from jczz_e_call_event_two jecet
<where>
- <if test="eCallEventTwo.orderId != null "> and order_id = #{orderId}</if>
- <if test="eCallEventTwo.orderCode != null and eCallEventTwo.orderCode != ''"> and order_code = #{orderCode}</if>
- <if test="eCallEventTwo.issueOrigin != null and eCallEventTwo.issueOrigin != ''"> and issue_origin = #{issueOrigin}</if>
- <if test="eCallEventTwo.issueTitle != null and eCallEventTwo.issueTitle != ''"> and issue_title = #{issueTitle}</if>
- <if test="eCallEventTwo.issueContent != null and eCallEventTwo.issueContent != ''"> and issue_content = #{issueContent}</if>
- <if test="eCallEventTwo.applicantType != null and eCallEventTwo.applicantType != ''"> and applicant_type = #{applicantType}</if>
- <if test="eCallEventTwo.applicantName != null and eCallEventTwo.applicantName != ''"> and applicant_name = #{applicantName}</if>
- <if test="eCallEventTwo.applicantGender != null and eCallEventTwo.applicantGender != ''"> and applicant_gender = #{applicantGender}</if>
- <if test="eCallEventTwo.applicantHomeaddr != null and eCallEventTwo.applicantHomeaddr != ''"> and applicant_homeaddr = #{applicantHomeaddr}</if>
- <if test="eCallEventTwo.applicantPhone != null and eCallEventTwo.applicantPhone != ''"> and applicant_phone = #{applicantPhone}</if>
- <if test="eCallEventTwo.applicantGrid != null and eCallEventTwo.applicantGrid != ''"> and applicant_grid = #{applicantGrid}</if>
- <if test="eCallEventTwo.applicantDistrict != null and eCallEventTwo.applicantDistrict != ''"> and applicant_district = #{applicantDistrict}</if>
- <if test="eCallEventTwo.sceneAddr != null and eCallEventTwo.sceneAddr != ''"> and scene_addr = #{sceneAddr}</if>
- <if test="eCallEventTwo.sceneAddrGrid != null and eCallEventTwo.sceneAddrGrid != ''"> and scene_addr_grid = #{sceneAddrGrid}</if>
- <if test="eCallEventTwo.sceneDistrict != null and eCallEventTwo.sceneDistrict != ''"> and scene_district = #{sceneDistrict}</if>
- <if test="eCallEventTwo.scenePlace != null and eCallEventTwo.scenePlace != ''"> and scene_place = #{scenePlace}</if>
- <if test="eCallEventTwo.sceneGeoLat != null "> and scene_geo_lat = #{sceneGeoLat}</if>
- <if test="eCallEventTwo.sceneGeoLng != null "> and scene_geo_lng = #{sceneGeoLng}</if>
- <if test="eCallEventTwo.isSecret != null and eCallEventTwo.isSecret != ''"> and is_secret = #{isSecret}</if>
- <if test="eCallEventTwo.isRepeat != null and eCallEventTwo.isRepeat != ''"> and is_repeat = #{isRepeat}</if>
- <if test="eCallEventTwo.issueType != null and eCallEventTwo.issueType != ''"> and issue_type = #{issueType}</if>
- <if test="eCallEventTwo.issueClazz != null and eCallEventTwo.issueClazz != ''"> and issue_clazz = #{issueClazz}</if>
- <if test="eCallEventTwo.issueLevel != null and eCallEventTwo.issueLevel != ''"> and issue_level = #{issueLevel}</if>
- <if test="eCallEventTwo.deadline != null "> and deadline = #{deadline}</if>
- <if test="eCallEventTwo.linkOrders != null and eCallEventTwo.linkOrders != ''"> and link_orders = #{linkOrders}</if>
- <if test="eCallEventTwo.linkOrdersCode != null and eCallEventTwo.linkOrdersCode != ''"> and link_orders_code = #{linkOrdersCode}</if>
- <if test="eCallEventTwo.wikiRef != null and eCallEventTwo.wikiRef != ''"> and wiki_ref = #{wikiRef}</if>
- <if test="eCallEventTwo.acptOrgCode != null and eCallEventTwo.acptOrgCode != ''"> and acpt_org_code = #{acptOrgCode}</if>
- <if test="eCallEventTwo.acptOrgName != null and eCallEventTwo.acptOrgName != ''"> and acpt_org_name = #{acptOrgName}</if>
- <if test="eCallEventTwo.handleWay != null and eCallEventTwo.handleWay != ''"> and handle_way = #{handleWay}</if>
- <if test="eCallEventTwo.externalHandleWay != null and eCallEventTwo.externalHandleWay != ''"> and external_handle_way = #{externalHandleWay}</if>
- <if test="eCallEventTwo.directFeed != null and eCallEventTwo.directFeed != ''"> and direct_feed = #{directFeed}</if>
- <if test="eCallEventTwo.directFeedHandler != null and eCallEventTwo.directFeedHandler != ''"> and direct_feed_handler = #{directFeedHandler}</if>
- <if test="eCallEventTwo.directFeedTime != null "> and direct_feed_time = #{directFeedTime}</if>
- <if test="eCallEventTwo.images != null and eCallEventTwo.images != ''"> and images = #{images}</if>
- <if test="eCallEventTwo.status != null and eCallEventTwo.status != ''"> and status = #{status}</if>
- <if test="eCallEventTwo.tagApply != null and eCallEventTwo.tagApply != ''"> and tag_apply = #{tagApply}</if>
- <if test="eCallEventTwo.tagDelay != null and eCallEventTwo.tagDelay != ''"> and tag_delay = #{tagDelay}</if>
- <if test="eCallEventTwo.tagDoing != null and eCallEventTwo.tagDoing != ''"> and tag_doing = #{tagDoing}</if>
- <if test="eCallEventTwo.tagResp != null and eCallEventTwo.tagResp != ''"> and tag_resp = #{tagResp}</if>
- <if test="eCallEventTwo.tagDone != null and eCallEventTwo.tagDone != ''"> and tag_done = #{tagDone}</if>
- <if test="eCallEventTwo.tagCheck != null and eCallEventTwo.tagCheck != ''"> and tag_check = #{tagCheck}</if>
- <if test="eCallEventTwo.tagChkTel != null and eCallEventTwo.tagChkTel != ''"> and tag_chk_tel = #{tagChkTel}</if>
- <if test="eCallEventTwo.tagRedo != null and eCallEventTwo.tagRedo != ''"> and tag_redo = #{tagRedo}</if>
+ <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>
--
Gitblit v1.9.3