From d01be9f1ec9a393818ea64deca3cbe7fa9372e08 Mon Sep 17 00:00:00 2001
From: xyh <18782104331@139.com>
Date: 星期三, 23 六月 2021 18:21:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java | 229 ++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 136 insertions(+), 93 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java
index e18aee3..8b2cb6c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java
@@ -3,8 +3,10 @@
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.dtos.community.bigscreen.work.ScreenMicroListDTO;
import com.panzhihua.common.model.vos.community.ComActMicroWishVO;
import com.panzhihua.common.model.vos.community.TodoEventsVO;
+import com.panzhihua.common.model.vos.community.screen.work.MicroListVO;
import com.panzhihua.service_community.model.dos.ComActMicroWishDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -24,139 +26,139 @@
public interface ComActMicroWishDAO extends BaseMapper<ComActMicroWishDO> {
@Select("<script> " +
- "SELECT\n" +
- "w.id,\n" +
- "u.name sponsor_name,\n" +
- "u.nick_name userNickName,\n" +
- "u.image_url ,\n" +
- "w.sponsor_phone,\n" +
- "w.wish_name,\n" +
- "w.`status`,\n" +
- "w.`feedback_at`,\n" +
- "w.`examine_at`,\n" +
- "w.`distribution_at`,\n" +
- "w.`evaluate_at`,\n" +
- "w.`photo_path_list`,\n" +
- "count(wu.id)star_num,\n" +
- "w.`detail`,\n" +
- "w.form,\n" +
- "w.reject_reason,\n" +
- "su.`name` responsible_name,\n" +
- "w.score,\n" +
- "w.create_at \n" +
- "FROM\n" +
- "com_act_micro_wish w\n" +
+ "SELECT " +
+ "w.id, " +
+ "u.name sponsor_name, " +
+ "u.nick_name userNickName, " +
+ "u.image_url , " +
+ "w.sponsor_phone, " +
+ "w.wish_name, " +
+ "w.`status`, " +
+ "w.`feedback_at`, " +
+ "w.`examine_at`, " +
+ "w.`distribution_at`, " +
+ "w.`evaluate_at`, " +
+ "w.`photo_path_list`, " +
+ "count(wu.id)star_num, " +
+ "w.`detail`, " +
+ "w.form, " +
+ "w.reject_reason, " +
+ "su.`name` responsible_name, " +
+ "w.score, " +
+ "w.create_at " +
+ "FROM " +
+ "com_act_micro_wish w " +
"left join com_act_micro_wish_user wu on w.id=wu.micro_wish_id "+
- "JOIN sys_user u ON w.sponsor_id = u.user_id \n" +
+ "JOIN sys_user u ON w.sponsor_id = u.user_id " +
"<if test='comActMicroWishVO.sponsorName != null and comActMicroWishVO.sponsorName.trim() != ""'>" +
- "AND u.name like concat(#{comActMicroWishVO.sponsorName},'%') \n" +
+ "AND u.name like concat(#{comActMicroWishVO.sponsorName},'%') " +
" </if> " +
"<if test='comActMicroWishVO.responsibleName == null or comActMicroWishVO.responsibleName.trim() == ""'>" +
- "LEFT JOIN sys_user su ON w.responsible_id = su.user_id \n" +
+ "LEFT JOIN sys_user su ON w.responsible_id = su.user_id " +
" </if> " +
"<if test='comActMicroWishVO.responsibleName != null and comActMicroWishVO.responsibleName.trim() != ""'>" +
- " JOIN sys_user su ON w.responsible_id = su.user_id \n" +
- "AND su.`name` like concat(#{comActMicroWishVO.responsibleName},'%') \n" +
+ " JOIN sys_user su ON w.responsible_id = su.user_id " +
+ "AND su.`name` like concat(#{comActMicroWishVO.responsibleName},'%') " +
" </if> " +
" <where>" +
"<if test='comActMicroWishVO.communityId != null and comActMicroWishVO.communityId != 0'>" +
- " and w.community_id=#{comActMicroWishVO.communityId} \n" +
+ " and w.community_id=#{comActMicroWishVO.communityId} " +
" </if> " +
"<if test='comActMicroWishVO.sponsorPhone != null and comActMicroWishVO.sponsorPhone.trim() != ""'>" +
- "AND w.sponsor_phone like concat(#{comActMicroWishVO.sponsorPhone},'%') \n" +
+ "AND w.sponsor_phone like concat(#{comActMicroWishVO.sponsorPhone},'%') " +
" </if> " +
"<if test='comActMicroWishVO.status != null and comActMicroWishVO.status!=0 and comActMicroWishVO.status!=3 and comActMicroWishVO.isPageMyWish==null'>" +
- "AND w.`status` = #{comActMicroWishVO.status} \n" +
+ "AND w.`status` = #{comActMicroWishVO.status} " +
" </if> " +
"<if test='comActMicroWishVO.status == 3 and comActMicroWishVO.isPageMyWish==null'>" +
- "AND ( w.`status` = 3 or w.`status` = 5 )\n" +
+ "AND ( w.`status` = 3 or w.`status` = 5 ) " +
" </if> " +
"<if test='comActMicroWishVO.status != null and comActMicroWishVO.status!=0 and comActMicroWishVO.isPageMyWish!=null and comActMicroWishVO.status==1'>" +
- "AND w.`status` =1 \n" +
+ "AND w.`status` =1 " +
" </if> " +
"<if test='comActMicroWishVO.status != null and comActMicroWishVO.status==3 and comActMicroWishVO.isPageMyWish!=null '>" +
- "AND w.`status` in (2, 3) \n" +
+ "AND w.`status` in (2, 3) " +
" </if> " +
"<if test='comActMicroWishVO.createBegin != null '>" +
- "AND w.create_at BETWEEN #{comActMicroWishVO.createBegin} \n" +
+ "AND w.create_at BETWEEN #{comActMicroWishVO.createBegin} " +
"AND #{comActMicroWishVO.createEnd}" +
" </if> " +
"<if test='comActMicroWishVO.isApplets != null and comActMicroWishVO.isApplets != 0'>" +
- "AND w.status in (3, 5, 6) \n" +
+ "AND w.status in (3, 5, 6) " +
" </if> " +
"<if test='comActMicroWishVO.userId != null and comActMicroWishVO.userId != 0'>" +
- "AND w.sponsor_id =#{comActMicroWishVO.userId} \n" +
+ "AND w.sponsor_id =#{comActMicroWishVO.userId} " +
" </if> " +
"<if test='comActMicroWishVO.backUserId != null and comActMicroWishVO.backUserId != 0 and comActMicroWishVO.status==3 '>" +
- "AND w.responsible_id =#{comActMicroWishVO.backUserId} \n" +
+ "AND w.responsible_id =#{comActMicroWishVO.backUserId} " +
" </if> " +
"<if test='comActMicroWishVO.backUserId != null and comActMicroWishVO.backUserId != 0 and comActMicroWishVO.status==0 '>" +
- "and (w.status in(1,2,4,5,6) or (w.status=3 and w.responsible_id =#{comActMicroWishVO.backUserId}))\n" +
+ "and (w.status in(1,2,4,5,6) or (w.status=3 and w.responsible_id =#{comActMicroWishVO.backUserId})) " +
" </if> " +
" </where>" +
- " group by w.id \n"+
+ " group by w.id "+
"ORDER BY w.create_at desc "+
"</script>")
IPage<ComActMicroWishVO> pageMicroWish(Page page, @Param("comActMicroWishVO") ComActMicroWishVO comActMicroWishVO);
- @Select("SELECT\n" +
- "w.id,\n" +
- "u.name sponsor_name,\n" +
- "u.nick_name userNickName,\n" +
- "w.create_at,\n" +
- "u.image_url,\n" +
- "w.sponsor_phone,\n" +
- "w.`status`,\n" +
- "w.`sponsor_id`,\n" +
- "w.wish_name,\n" +
- "count(wu.id)starNum,\n" +
- "w.detail,\n" +
- "w.photo_path_list,\n" +
- "su.`name` responsible_name,\n" +
- "w.form,\n" +
- "w.reject_reason,\n" +
- "w.examine_at,\n" +
- "w.finish,\n" +
- "w.finish_photo_path_list,\n" +
- "w.finish_at,\n" +
- "w.score,\n" +
- "w.feedback,\n" +
- "w.feedback_at,\n" +
- "w.feedback_photo_path_list,\n" +
- "w.distribution_at,\n" +
- "w.evaluate_at,\n" +
- "w.evaluate \n" +
- "FROM\n" +
- "com_act_micro_wish w\n" +
- "JOIN sys_user u ON w.sponsor_id = u.user_id\n" +
- "LEFT JOIN sys_user su ON w.responsible_id = su.user_id \n" +
- "LEFT JOIN com_act_micro_wish_user wu ON w.id = wu.micro_wish_id \n" +
- "WHERE\n" +
+ @Select("SELECT " +
+ "w.id, " +
+ "u.name sponsor_name, " +
+ "u.nick_name userNickName, " +
+ "w.create_at, " +
+ "u.image_url, " +
+ "w.sponsor_phone, " +
+ "w.`status`, " +
+ "w.`sponsor_id`, " +
+ "w.wish_name, " +
+ "count(wu.id)starNum, " +
+ "w.detail, " +
+ "w.photo_path_list, " +
+ "su.`name` responsible_name, " +
+ "w.form, " +
+ "w.reject_reason, " +
+ "w.examine_at, " +
+ "w.finish, " +
+ "w.finish_photo_path_list, " +
+ "w.finish_at, " +
+ "w.score, " +
+ "w.feedback, " +
+ "w.feedback_at, " +
+ "w.feedback_photo_path_list, " +
+ "w.distribution_at, " +
+ "w.evaluate_at, " +
+ "w.evaluate " +
+ "FROM " +
+ "com_act_micro_wish w " +
+ "JOIN sys_user u ON w.sponsor_id = u.user_id " +
+ "LEFT JOIN sys_user su ON w.responsible_id = su.user_id " +
+ "LEFT JOIN com_act_micro_wish_user wu ON w.id = wu.micro_wish_id " +
+ "WHERE " +
"w.id =#{id}"+
" group by w.id " +
"order by w.create_at desc"
)
ComActMicroWishVO detailMicroWish(Long id);
- @Select("SELECT\n" +
- "'2' type\n" +
- "FROM\n" +
- "com_act_micro_wish w \n" +
- "WHERE\n" +
- "w.community_id = #{communityId} \n" +
- "AND w.`status` = 1\n" +
- "\n" +
- "union all \n" +
- "\n" +
- "SELECT\n" +
- "'2' type\n" +
- "FROM\n" +
- "\tcom_act_micro_wish w \n" +
- "WHERE\n" +
- "\tw.community_id = #{communityId} \n" +
- "\tAND w.`status` = 3 \n" +
- "\tAND w.form = 1 \n" +
- "\tAND w.responsible_id = #{userId} \n" +
- "GROUP BY\n" +
- "\tw.community_id\n")
+ @Select("SELECT " +
+ "'2' type " +
+ "FROM " +
+ "com_act_micro_wish w " +
+ "WHERE " +
+ "w.community_id = #{communityId} " +
+ "AND w.`status` = 1 " +
+ " " +
+ "union all " +
+ " " +
+ "SELECT " +
+ "'2' type " +
+ "FROM " +
+ " com_act_micro_wish w " +
+ "WHERE " +
+ " w.community_id = #{communityId} " +
+ " AND w.`status` = 3 " +
+ " AND w.form = 1 " +
+ " AND w.responsible_id = #{userId} " +
+ "GROUP BY " +
+ " w.community_id ")
List<TodoEventsVO> selectNeedToDo(@Param("communityId") Long communityId, @Param("userId") Long userId);
@Update("update com_act_micro_wish set `status`=6, evaluate_at=now() where `status`=5 and TIMESTAMPDIFF(HOUR, feedback_at, SYSDATE())>=72")
@@ -170,4 +172,45 @@
@Select("SELECT photo_path_list FROM com_act_micro_wish WHERE community_id = #{communityId} AND (status =1 OR status =2 OR status = 3 OR status = 5 OR status = 6) ORDER BY create_at DESC limit #{pageSize}")
List<String> getAllImgs(@Param("communityId") Long communityId,@Param("pageSize") Integer pageSize);
+
+ @Select("<script> " +
+ "SELECT " +
+ " camw.id, " +
+ " su.`name` AS userName, " +
+ " camw.sponsor_id, " +
+ " su.image_url, " +
+ " su.phone, " +
+ " camw.`status`, " +
+ " camw.create_at, " +
+ " camw.wish_name, " +
+ " camw.finish, " +
+ " camw.finish_photo_path_list, " +
+ " camw.form, " +
+ " camw.evaluate_at, " +
+ " su1.name as responsibleName, " +
+ " camw.score, " +
+ " camw.distribution_at, " +
+ " camw.detail, " +
+ " camw.photo_path_list " +
+ "FROM " +
+ " com_act_micro_wish AS camw " +
+ " LEFT JOIN sys_user AS su ON su.user_id = camw.sponsor_id " +
+ " LEFT JOIN sys_user AS su1 ON su1.user_id = camw.responsible_id " +
+ " <where> " +
+ "<if test='microListDTO.status != null'>" +
+ "AND camw.`status` =#{microListDTO.status} " +
+ " </if> " +
+ "<if test='microListDTO.communityId != null'>" +
+ "AND camw.community_id =#{microListDTO.communityId} " +
+ " </if> " +
+ "<if test='microListDTO.startTime!=null and microListDTO.startTime != ""'>" +
+ " AND DATE_FORMAT(camw.create_at,'%Y-%m-%d %H:%i:%s') <![CDATA[ >= ]]> #{microListDTO.startTime} " +
+ " </if> " +
+ "<if test='microListDTO.endTime!=null and microListDTO.endTime != ""'>" +
+ " AND DATE_FORMAT(camw.create_at,'%Y-%m-%d %H:%i:%s') <![CDATA[ <= ]]> #{microListDTO.endTime} " +
+ " </if> " +
+ " </where>" +
+ "ORDER BY camw.create_at desc "+
+ " </script>")
+ IPage<MicroListVO> getScreenMicroList(Page page, @Param("microListDTO") ScreenMicroListDTO microListDTO);
}
--
Gitblit v1.7.1