java/zhihuishenqu.git

			@@ -22,7 +22,6 @@
			public interface ComActMicroWishDAO extends BaseMapper<ComActMicroWishDO> {

			@Select("<script> " +
			"select * from ( "+
			"SELECT\n" +
			"w.id,\n" +
			"u.name sponsor_name,\n" +
			@@ -30,10 +29,15 @@
			"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" +
			@@ -42,21 +46,27 @@
			"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" +
			"<if test='comActMicroWishVO.sponsorName != null and comActMicroWishVO.sponsorName.trim() != ""'>" +
			"AND u.name = #{comActMicroWishVO.sponsorName} \n" +
			"AND u.name like concat(#{comActMicroWishVO.sponsorName},'%') \n" +
			" </if> " +
			"<if test='comActMicroWishVO.responsibleName == null or comActMicroWishVO.responsibleName.trim() == ""'>" +
			"LEFT JOIN sys_user su ON w.responsible_id = su.user_id \n" +
			"<if test='comActMicroWishVO.responsibleName != null and comActMicroWishVO.responsibleName.trim() != ""'>" +
			"AND su.`name` = #{comActMicroWishVO.responsibleName} \n" +
			" </if> " +
			"where w.status!=3 " +
			"<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" +
			" </if> " +
			" <where>" +
			"<if test='comActMicroWishVO.communityId != null and comActMicroWishVO.communityId != 0'>" +
			" and w.community_id=#{comActMicroWishVO.communityId} \n" +
			" </if> " +
			"<if test='comActMicroWishVO.sponsorPhone != null and comActMicroWishVO.sponsorPhone.trim() != ""'>" +
			"AND w.sponsor_phone = #{comActMicroWishVO.sponsorPhone} \n" +
			"AND w.sponsor_phone like concat(#{comActMicroWishVO.sponsorPhone},'%') \n" +
			" </if> " +
			"<if test='comActMicroWishVO.status != null and comActMicroWishVO.status!=0 '>" +
			"<if test='comActMicroWishVO.status != null and comActMicroWishVO.status!=0 and comActMicroWishVO.isPageMyWish==null'>" +
			"AND w.`status` = #{comActMicroWishVO.status} \n" +
			" </if> " +
			"<if test='comActMicroWishVO.status != null and comActMicroWishVO.status!=0 and comActMicroWishVO.isPageMyWish!=null and comActMicroWishVO.status==1'>" +
			"AND w.`status` in (1,2) \n" +
			" </if> " +
			"<if test='comActMicroWishVO.createBegin != null '>" +
			"AND w.create_at BETWEEN #{comActMicroWishVO.createBegin} \n" +
			@@ -68,61 +78,15 @@
			"<if test='comActMicroWishVO.userId != null and comActMicroWishVO.userId != 0'>" +
			"AND w.sponsor_id =#{comActMicroWishVO.userId} \n" +
			" </if> " +
			"<if test='comActMicroWishVO.backUserId != null and comActMicroWishVO.backUserId != 0 and comActMicroWishVO.status==3 '>" +
			"AND w.responsible_id =#{comActMicroWishVO.backUserId} \n" +
			" </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" +
			" </if> " +
			" </where>" +
			" group by w.id \n"+


			"union all "+

			"SELECT\n" +
			"w.id,\n" +
			"u.name sponsor_name,\n" +
			"u.image_url ,\n" +
			"w.sponsor_phone,\n" +
			"w.wish_name,\n" +
			"w.`status`,\n" +
			"w.`photo_path_list`,\n" +
			"count(wu.id)star_num,\n" +
			"w.`detail`,\n" +
			"w.form,\n" +
			"su.`name` responsible_name,\n" +
			"w.score,\n" +
			"w.create_at \n" +
			"FROM\n" +
			"com_act_micro_wish w\n" +
			"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" +
			"<if test='comActMicroWishVO.sponsorName != null and comActMicroWishVO.sponsorName.trim() != ""'>" +
			"AND u.name = #{comActMicroWishVO.sponsorName} \n" +
			" </if> " +
			"LEFT JOIN sys_user su ON w.responsible_id = su.user_id \n" +
			"<if test='comActMicroWishVO.responsibleName != null and comActMicroWishVO.responsibleName.trim() != ""'>" +
			"AND su.`name` = #{comActMicroWishVO.responsibleName} \n" +
			" </if> " +
			"where w.status=3 and w.form=1 \n" +
			"<if test='comActMicroWishVO.backUserId != null and comActMicroWishVO.backUserId != 0'>" +
			"and w.responsible_id=#{comActMicroWishVO.backUserId} \n"+
			" </if> " +
			"<if test='comActMicroWishVO.communityId != null and comActMicroWishVO.communityId != 0'>" +
			" and w.community_id=#{comActMicroWishVO.communityId} \n" +
			" </if> " +
			"<if test='comActMicroWishVO.sponsorPhone != null and comActMicroWishVO.sponsorPhone.trim() != ""'>" +
			"AND w.sponsor_phone = #{comActMicroWishVO.sponsorPhone} \n" +
			" </if> " +
			"<if test='comActMicroWishVO.status != null and comActMicroWishVO.status!=0 '>" +
			"AND w.`status` = #{comActMicroWishVO.status} \n" +
			" </if> " +
			"<if test='comActMicroWishVO.createBegin != null '>" +
			"AND w.create_at BETWEEN #{comActMicroWishVO.createBegin} \n" +
			"AND #{comActMicroWishVO.createEnd}" +
			" </if> " +
			"<if test='comActMicroWishVO.isApplets != null and comActMicroWishVO.isApplets != 0'>" +
			"AND w.status in (3,6) \n" +
			" </if> " +
			"<if test='comActMicroWishVO.userId != null and comActMicroWishVO.userId != 0'>" +
			"AND w.sponsor_id =#{comActMicroWishVO.userId} \n" +
			" </if> " +
			" group by w.id )t\n"+
			"ORDER BY t.`status`, t.create_at "+
			"ORDER BY w.`status` asc, w.create_at desc "+
			"</script>")
			IPage<ComActMicroWishVO> pageMicroWish(Page page, @Param("comActMicroWishVO") ComActMicroWishVO comActMicroWishVO);
			@Select("SELECT\n" +
			@@ -132,17 +96,23 @@
			"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" +
			@@ -156,9 +126,7 @@
			)
			ComActMicroWishVO detailMicroWish(Long id);
			@Select("SELECT\n" +
			"'微心愿' FUNCTION,\n" +
			"'待审核' behavior,\n" +
			"'新增微心愿动态待审核' words \n" +
			"'2' type\n" +
			"FROM\n" +
			"com_act_micro_wish w \n" +
			"WHERE\n" +
			@@ -168,9 +136,7 @@
			"union all \n" +
			"\n" +
			"SELECT\n" +
			"\t'微心愿' FUNCTION,\n" +
			"\t'需要进行反馈' behavior,\n" +
			"\t'微心愿有待反馈动态' words \n" +
			"'2' type\n" +
			"FROM\n" +
			"\tcom_act_micro_wish w \n" +
			"WHERE\n" +