From d657af4cb9347bd9739936dc74162c14ea5fdd61 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期三, 12 五月 2021 15:05:07 +0800
Subject: [PATCH] bugfixed:党员状态缓存删除
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java | 42 +++++++++++++++++++++++++++++++++---------
1 files changed, 33 insertions(+), 9 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java
index 2565426..e61363b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java
@@ -16,12 +16,14 @@
import com.panzhihua.common.model.vos.user.AdministratorsUserVO;
import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
import com.panzhihua.common.model.vos.user.SysUserVO;
+import com.panzhihua.common.model.vos.user.UpdateUserArchivesVO;
import com.panzhihua.service_user.model.dos.SysUserDO;
import com.panzhihua.service_user.model.dtos.DataKanbanDTO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.apache.ibatis.annotations.Update;
+import org.springframework.web.bind.annotation.RequestParam;
import java.util.Date;
import java.util.List;
@@ -159,7 +161,7 @@
"from sys_user u\n" +
"left join com_act a on u.community_id=a.community_id\n" +
" where\n" +
- "u.type=1\n" +
+ "u.type=1 and u.community_id is not null \n" +
"<if test='pageUserAppletsBackstageDTO.phone != null and pageUserAppletsBackstageDTO.phone.trim() != ""'>" +
"and u.phone=#{pageUserAppletsBackstageDTO.phone}\n" +
" </if> " +
@@ -227,7 +229,7 @@
@Select("SELECT \n" +
"COUNT(DISTINCT u.user_id)allUser,\n" +
"(select COUNT(m.id) from com_mng_volunteer_mng m where m.community_id=#{communityId} and m.`state`=2)volunteerUser,\n" +
- "COUNT(DISTINCT case when u.is_partymember=1 then u.user_id else null end )partymemberUser,\n" +
+ " (select count(id) from com_pb_member cpm where cpm.audit_result = 1 and cpm.community_id = #{communityId}) partymemberUser,\n" +
"COUNT(h.id)house\n" +
"FROM\n" +
"sys_user u\n" +
@@ -244,7 +246,8 @@
"u.continuous_landing_days + 1,\n" +
"0)")
int timedTaskContinuousLandingDays();
- @Select("select state from com_mng_volunteer_mng where phone=#{phone} order by create_at desc limit 1")
+ @Select("select id,create_at,state,name,phone,photo_path,political_face,reject_reson,apply_reson,address,age,job,integral,community_id,submit_user_id " +
+ " from com_mng_volunteer_mng where phone=#{phone} order by create_at desc limit 1")
ComMngVolunteerMngVO selectVolunteerMngByPhone(String phone);
@Update("update sys_user set face_state=null where user_id=#{userId}")
int updateFaceState(Long userId);
@@ -315,16 +318,16 @@
"FROM\n" +
"\t com_pb_member_role a \n" +
"WHERE\n" +
- "\t a.phone = #{phone}")
- Integer selectCountMemberRole(@Param("phone")String phone);
+ "\t a.phone = #{phone} and community_id=#{userCommunityId} ")
+ Integer selectCountMemberRole(@Param("phone")String phone, @Param("userCommunityId")Long userCommunityId);
@Select("SELECT\n" +
"\t COUNT(a.id)\n" +
"FROM\n" +
"\t com_pb_service_team a \n" +
"WHERE\n" +
- "\t a.phone = #{phone}")
- Integer selectCountTeam(@Param("phone")String phone);
+ "\t a.phone = #{phone} and community_id=#{userCommunityId} ")
+ Integer selectCountTeam(@Param("phone")String phone, @Param("userCommunityId")Long userCommunityId);
@Update("update com_pb_member_role u set u.phone=#{newphone},is_reg=1 where u.phone=#{oldphone}")
@@ -337,6 +340,27 @@
"FROM\n" +
"\t sys_user u LEFT JOIN sys_user_role ur ON u.user_id = ur.user_id \n" +
"\t LEFT JOIN sys_role r ON ur.role_id = r.role_id \n" +
- "WHERE ur.role_id IS NOT NULL AND u.phone = #{phone} ")
- Integer selectCountSysUser(@Param("phone")String phone);
+ "WHERE ur.role_id IS NOT NULL AND u.phone = #{phone} and r.community_id=#{userCommunityId} ")
+ Integer selectCountSysUser(@Param("phone")String phone, @Param("userCommunityId")Long userCommunityId);
+
+ @Select("update com_shop_store set sys_user_id = #{sysUserId} where phone = #{phone}")
+ void updateStoreByPhone(@Param("phone")String phone, @Param("sysUserId")Long sysUserId);
+
+ @Select("delete from com_shop_store where delete_status = 1 and phone = #{phone}")
+ void deleteStoreByPhoneAndStatus(@RequestParam("phone") String phone);
+
+ @Select("update sys_user set" +
+ " card_photo_front = #{userArchivesVO.cardPhotoFront} \n" +
+ ", card_photo_back = #{userArchivesVO.cardPhotoBack} \n" +
+ ",family_book = #{userArchivesVO.familyBook} \n" +
+ ",job = #{userArchivesVO.job} \n" +
+ " where user_id = #{userArchivesVO.userId}")
+ void updateUserArchives(@Param("userArchivesVO") UpdateUserArchivesVO userArchivesVO);
+
+ @Select("update com_pb_member set user_id = #{userId} where audit_result = 1 and id_card = #{idCard}")
+ void updateComPbMemberUserId(@Param("idCard")String idCard, @Param("userId")Long userId);
+
+ @Select("select id from com_pb_member where audit_result = 1 and id_card = #{idCard}")
+ Long getPartyBuildingByIdCard(@Param("idCard")String idCard);
+
}
--
Gitblit v1.7.1