From 59c1b69bf4d8c7ceb05d64aa7b1e78a2f6bde48e Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期一, 24 十月 2022 11:05:11 +0800
Subject: [PATCH] Merge branch 'local_20221024' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComPbDynMapper.xml | 71 +++++++++++++++++++++++++++++++++++
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/ComPbDynDAO.java | 21 ----------
2 files changed, 71 insertions(+), 21 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 9cfef95..4198c8d 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
@@ -30,27 +30,6 @@
// " </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.communityIds != null and partyBuildingComPbDynVO.communityIds > 0 '>" + " and d.community_id in "
- + "<foreach item=\"item\" collection=\"partyBuildingComPbDynVO.communityIds\" separator=\",\" open=\"(\" close=\")\" index=\"\"> \n"
- + "#{item}\n" + "</foreach>\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() != ""'>"
- + "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 !=""'> asc </if> <if test='partyBuildingComPbDynVO.sort ==null'> desc</if>" + "</script>")
IPage<PartyBuildingComPbDynVO> pageYnamic(Page page,
@Param("partyBuildingComPbDynVO") PartyBuildingComPbDynVO partyBuildingComPbDynVO);
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComPbDynMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComPbDynMapper.xml
new file mode 100644
index 0000000..cae0d0c
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComPbDynMapper.xml
@@ -0,0 +1,71 @@
+<?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="com.panzhihua.service_dangjian.dao.ComPbDynDAO">
+
+ <resultMap type="com.panzhihua.service_dangjian.model.dos.ComPbDynDO" id="ComPbOrgMap">
+ <result property="id" column="id" jdbcType="INTEGER"/>
+ <result property="title" column="title"/>
+ <result property="status" column="status"/>
+ <result property="publishAt" column="publish_at"/>
+ <result property="cover" column="cover"/>
+ <result property="createAt" column="create_at"/>
+ <result property="content" column="content"/>
+ <result property="createBy" column="create_by"/>
+ <result property="type" column="type"/>
+ <result property="communityId" column="community_id"/>
+ <result property="dynType" column="dyn_type"/>
+ <result property="coverMode" column="cover_mode"/>
+ <result property="jumpUrl" column="jump_url"/>
+ <result property="jumpType" column="jump_type"/>
+ <result property="policyType" column="policy_type"/>
+ </resultMap>
+ <select id="pageYnamic" resultType="com.panzhihua.common.model.vos.partybuilding.west.PartyBuildingComPbDynVO">
+ SELECT
+ d.id,
+ d.title, d.jump_url, d.jump_type,
+ COUNT( u.id ) readingVolume,
+ d.`status`,
+ d.publish_at,
+ d.content,
+ d.cover,
+ d.cover_mode,
+ d.dyn_type,
+ d.create_at,t.name as communityName,d.policy_type
+ FROM
+ com_pb_dyn d
+ 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
+ where d.type=#{partyBuildingComPbDynVO.type}
+ <if test='partyBuildingComPbDynVO.communityIds != null and partyBuildingComPbDynVO.communityIds.size() > 0 '>
+ and d.community_id in
+ <foreach item="item" collection="partyBuildingComPbDynVO.communityIds" separator="," open="(" close=")"
+ index="index">
+ #{item}
+ </foreach>
+ </if>
+ <if test='partyBuildingComPbDynVO.dynType != null and partyBuildingComPbDynVO.dynType != 0'>
+ and d.dyn_type = #{partyBuildingComPbDynVO.dynType}
+ </if>
+ <if test='partyBuildingComPbDynVO.policyType != null and partyBuildingComPbDynVO.policyType != 0'>
+ and d.policy_type = #{partyBuildingComPbDynVO.policyType}
+ </if>
+ <if test='partyBuildingComPbDynVO.policyType == 0'>
+ and d.policy_type is not null
+ </if>
+ <if test='partyBuildingComPbDynVO.title != null and partyBuildingComPbDynVO.title.trim() != ""'>
+ and d.title like concat(#{partyBuildingComPbDynVO.title},'%')
+ </if>
+ <if test='partyBuildingComPbDynVO.status != null and partyBuildingComPbDynVO.status != 0'>
+ AND d.`status` = #{partyBuildingComPbDynVO.status}
+ </if>
+ <if test='partyBuildingComPbDynVO.publishAtBegin != null '>
+ AND d.publish_at BETWEEN #{partyBuildingComPbDynVO.publishAtBegin} AND #{partyBuildingComPbDynVO.publishAtEnd}
+ </if>
+ GROUP BY d.id
+ ORDER BY d.publish_at
+ <if test="partyBuildingComPbDynVO.sort !=null and partyBuildingComPbDynVO.sort !=""">asc</if>
+ <if test='partyBuildingComPbDynVO.sort ==null'>desc</if>
+ </select>
+
+
+</mapper>
+
--
Gitblit v1.7.1