From 6bd6019b6fb2e539a549bba9ebca6a9842d02d25 Mon Sep 17 00:00:00 2001
From: zhaozhengjie <237651143@qq.com>
Date: 星期三, 14 九月 2022 16:40:21 +0800
Subject: [PATCH] bug修改
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/acid/ComActAcidRecordDTO.java | 2 ++
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActAcidRecordMapper.xml | 12 ++++++++++++
2 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/acid/ComActAcidRecordDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/acid/ComActAcidRecordDTO.java
index 55c7bbc..674707c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/acid/ComActAcidRecordDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/acid/ComActAcidRecordDTO.java
@@ -65,4 +65,6 @@
@ApiModelProperty("登录的账号名")
private String loginAccount;
private Integer type;
+ private String dangerArea;
+ private String touristCity;
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActAcidRecordMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActAcidRecordMapper.xml
index 685cd1d..c1bcbe9 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActAcidRecordMapper.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActAcidRecordMapper.xml
@@ -60,6 +60,12 @@
<if test="commonPage.departureCity !=null and commonPage.departureCity !=''">
and departure_city like concat('%',#{commonPage.departureCity},'%')
</if>
+ <if test="commonPage.touristCity !=null and commonPage.touristCity !=''">
+ and tourist_city like concat('%',#{commonPage.touristCity},'%')
+ </if>
+ <if test="commonPage.dangerArea !=null and commonPage.dangerArea !=''">
+ and danger_area = #{commonPage.dangerArea}
+ </if>
<if test="commonPage.localCity !=null and commonPage.localCity !='' and commonPage.localCity !='panzhihua'">
and local_city like concat('%',#{commonPage.localCity},'%')
</if>
@@ -107,6 +113,12 @@
<if test="commonPage.departureCity !=null and commonPage.departureCity !=''">
and departure_city like concat('%',#{commonPage.departureCity},'%')
</if>
+ <if test="commonPage.touristCity !=null and commonPage.touristCity !=''">
+ and tourist_city like concat('%',#{commonPage.touristCity},'%')
+ </if>
+ <if test="commonPage.dangerArea !=null and commonPage.dangerArea !=''">
+ and danger_area = #{commonPage.dangerArea}
+ </if>
<if test="commonPage.localCity !=null and commonPage.localCity !='' and commonPage.localCity !='panzhihua'">
and local_city like concat('%',#{commonPage.localCity},'%')
</if>
--
Gitblit v1.7.1