From 08f1b1f1804a8bd833d42f257908d80e88387b55 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 14 三月 2025 11:27:47 +0800
Subject: [PATCH] 3.5增加登录验证、修改密码、人员列表调整

---
 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbDynDAO.java |   52 ++++++++++++++++++++--------------------------------
 1 files changed, 20 insertions(+), 32 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbDynDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbDynDAO.java
index c34d62e..a4b278d 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbDynDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbDynDAO.java
@@ -8,7 +8,7 @@
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.panzhihua.common.model.vos.partybuilding.PartyBuildingComPbDynVO;
+import com.panzhihua.common.model.vos.partybuilding.west.PartyBuildingComPbDynVO;
 import com.panzhihua.service_dangjian.model.dos.ComPbDynDO;
 
 /**
@@ -19,45 +19,33 @@
  **/
 @Mapper
 public interface ComPbDynDAO extends BaseMapper<ComPbDynDO> {
-    // @Select("<script> " +
-    // " <where>" +
-    // "<if test='nameCn != null and nameCn.trim() != &quot;&quot;'>" +
-    // " </if> " +
-    // "<if test='nameCn != null and nameCn.trim() != &quot;&quot;'>" +
-    // " </if> " +
-    // "<if test='nameCn != null and nameCn.trim() != &quot;&quot;'>" +
-    // " </if> " +
-    // " </where>" +
-    // "</script>")
+//     @Select("<script> " +
+//     " <where>" +
+//     "<if test='nameCn != null and nameCn.trim() != &quot;&quot;'>" +
+//     " </if> " +
+//     "<if test='nameCn != null and nameCn.trim() != &quot;&quot;'>" +
+//     " </if> " +
+//     "<if test='nameCn != null and nameCn.trim() != &quot;&quot;'>" +
+//     " </if> " +
+//     " </where>" +
+//     "</script>")
 
-    @Select("<script> " + "SELECT\n" + "d.id,\n" + "d.title, d.jump_url, d.jump_type,\n" + "COUNT( u.id ) readingVolume,\n" + "d.`status`,\n"
-        + "d.publish_at,\n" + "d.content,\n" + "d.cover,\n" + "d.cover_mode,\n" + "d.dyn_type,\n" + "d.create_at,t.name as communityName,d.policy_type \n"
-        + "FROM\n" + "com_pb_dyn d\n" + "LEFT JOIN com_pb_dyn_user u ON d.id = u.dyn_id  left join com_act t on d.community_id = t.community_id\n"
-        + "where d.type=#{partyBuildingComPbDynVO.type}  \n"
-        + "<if test='partyBuildingComPbDynVO.communityId != null and partyBuildingComPbDynVO.communityId != 0'>"
-        + "and d.community_id = ${partyBuildingComPbDynVO.communityId} \n" + " </if> "
-        + "<if test='partyBuildingComPbDynVO.dynType != null and partyBuildingComPbDynVO.dynType != 0'>"
-        + "and d.dyn_type = #{partyBuildingComPbDynVO.dynType} \n" + " </if> "
-        + "<if test='partyBuildingComPbDynVO.policyType != null and partyBuildingComPbDynVO.policyType != 0'>"
-        + "and d.policy_type = #{partyBuildingComPbDynVO.policyType} \n" + " </if> "
-        + "<if test='partyBuildingComPbDynVO.policyType == 0'>"
-        + "and d.policy_type is not null \n" + " </if> "
-        + "<if test='partyBuildingComPbDynVO.title != null and partyBuildingComPbDynVO.title.trim() != &quot;&quot;'>"
-        + "and d.title like concat(#{partyBuildingComPbDynVO.title},'%')  \n" + " </if> "
-        + "<if test='partyBuildingComPbDynVO.status != null and partyBuildingComPbDynVO.status != 0'>"
-        + "AND d.`status` = #{partyBuildingComPbDynVO.status} \n" + " </if> "
-        + "<if test='partyBuildingComPbDynVO.publishAtBegin != null '>"
-        + "AND d.publish_at BETWEEN #{partyBuildingComPbDynVO.publishAtBegin} \n"
-        + "AND #{partyBuildingComPbDynVO.publishAtEnd} \n" + " </if> " + "GROUP BY\n" + "d.id\n"
-        + "ORDER BY d.publish_at <if test='partyBuildingComPbDynVO.sort !=null and partyBuildingComPbDynVO.sort !=&quot;&quot;'> asc </if> <if test='partyBuildingComPbDynVO.sort ==null'> desc</if>" + "</script>")
     IPage<PartyBuildingComPbDynVO> pageYnamic(Page page,
         @Param("partyBuildingComPbDynVO") PartyBuildingComPbDynVO partyBuildingComPbDynVO);
+
+
+
+    IPage<com.panzhihua.common.model.vos.partybuilding.PartyBuildingComPbDynVO> pageYnamics(Page page,
+                         @Param("partyBuildingComPbDynVO") com.panzhihua.common.model.vos.partybuilding.PartyBuildingComPbDynVO partyBuildingComPbDynVO);
+
+
+
 
     @Update("update com_pb_dyn set `status`=2  WHERE `status`=1 and TIMESTAMPDIFF(MINUTE,SYSDATE(),publish_at)<=0")
     int timedTaskPartyBuildingStatus();
 
     @Select("<script> " + "SELECT\n" + " distinct COUNT( u.id ) readingVolume,\n"
-        + " d.community_id, d.content, d.cover, d.cover_mode, d.create_at, d.create_by, d.dyn_type, d.id, d.publish_at, d.status, d.title, d.type,a.policy_type, \n"
+        + " d.community_id, d.content, d.cover, d.cover_mode, d.create_at, d.create_by, d.dyn_type, d.id, d.publish_at, d.status, d.title, d.type,d.policy_type, \n"
         + " act.name as createByName,d.jump_type,d.jump_url " + "FROM\n"
         + "com_pb_dyn d LEFT JOIN com_act act ON d.community_id = act.community_id  \n"
         + "LEFT JOIN com_pb_dyn_user u ON d.id = u.dyn_id " + "where d.id = #{id} " + " group by d.id " + "</script>")

--
Gitblit v1.7.1