合并

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/SocialController.java

@@ -299,7 +299,7 @@ public class SocialController extends BaseController {
 
     @ApiOperation(value = "获取所有的二手租赁帖子", notes = "获取所有的二手租赁帖子")
     @ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
-            @ApiImplicitParam(paramType = "query", dataType = "String", name = "type", value = "帖子类型"),
+            @ApiImplicitParam(paramType = "query", dataType = "String", name = "type", value = "帖子类型0 代表 议事大厅 1 是邻里互助 2 是二手/租赁 3 是其他话题"),
             @ApiImplicitParam(paramType = "query", dataType = "String", name = "transactionTitle", value = "帖子标题"),
             @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
             @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度")}
@@ -369,7 +369,7 @@ public class SocialController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
         Integer userId = userElement.getId();
-        ResponseBean response = socialServiceI.selectAllTransaction(userId, pageNum, pageSize,type);
+        ResponseBean response = socialServiceI.selectAllTransaction(userId, pageNum, pageSize,type,userElement.getCommunityId());
         return response;
     }
 

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpTransactionMapper.java

@@ -23,7 +23,7 @@ public interface TpTransactionMapper {
 
     List<TpTransaction> findAllTransaction(@Param("communityId") Integer communityId, @Param("transactionTitle") String transactionTitle, @Param("type") String type);
 
-    List<TpTransaction> selectTransaction(@Param("userId")Integer userId, @Param("communityId")Integer communityId,@Param("type") Integer type);
+    List<TpTransaction> selectTransaction(@Param("id")Integer userId, @Param("communityId")Integer communityId,@Param("type") Integer type);
 
     void updateTransaction(@Param("id")Integer id, @Param("transactionTitle")String transactionTitle, @Param("transactionContent")String transactionContent, @Param("userId")Integer userId);
 

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/SocialServiceI.java

@@ -116,7 +116,7 @@ public interface SocialServiceI {
 	 * @param userId
 	 * @return
 	 */
-	ResponseBean selectAllTransaction(Integer userId,Integer pageNum,Integer pageSize,Integer type);
+	ResponseBean selectAllTransaction(Integer userId,Integer pageNum,Integer pageSize,Integer type,Integer communityId);
 
 	/**
 	 * 修改当前帖子

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/SocialServiceImpl.java

@@ -406,10 +406,9 @@ public class SocialServiceImpl implements SocialServiceI {
         }
     }
     @Override
-    public ResponseBean selectAllTransaction(Integer userId,Integer pageNum,Integer paeSize,Integer type) {
+    public ResponseBean selectAllTransaction(Integer userId,Integer pageNum,Integer paeSize,Integer type,Integer communityId) {
         ResponseBean responseBean = new ResponseBean();
         TaUser user=taUserMapper.selectByPrimaryKey(userId);
-         Integer communityId=user.getCommunityId();
 
         //判断身份是否为业主且状态为已停用
         TaSysRole sysRole = taSysRoleMapper.findRoleByUserId(userId);

CODE/smart-community/app-api/src/main/resources/mapper/TpTransactionMapper.xml

@@ -218,16 +218,32 @@ LEFT JOIN ta_sys_role sr ON sr.id = tsur.role_id
   </select>
 
   <select id="selectTransaction" resultMap="BaseResultMap">
-    select
+    SELECT
     <include refid="Base_Column_List" />
-    from tp_transaction
-    where community_id = #{communityId,jdbcType=INTEGER}
-    and ta_user_id = #{userId,jdbcType=INTEGER}
+    FROM
+    tp_transaction t
+    WHERE t.create_user=#{id,jdbcType=INTEGER}
+    AND t.community_id=#{communityId,jdbcType=INTEGER}
+    UNION ALL
+    SELECT
+    <include refid="Base_Column_List" />
+    FROM
+    tp_transaction t
+    INNER JOIN(SELECT
+    y.transaction_id
+    FROM
+    tp_transaction_reply y
+    LEFT JOIN tp_transaction t ON y.transaction_id = t.id
+    WHERE
+    y.ta_user_id = #{id,jdbcType=INTEGER}
     <if test="type != null and type != ''">
-      and type = #{type,jdbcType=INTEGER}
+      and  t.type = #{type,jdbcType=INTEGER}
     </if>
-    and status = 1
-    order by update_date DESC, create_date DESC
+    AND y.community_id = #{communityId,jdbcType=INTEGER}
+    AND y.transaction_id NOT IN ( SELECT t.id FROM tp_transaction t WHERE t.create_user = #{id,jdbcType=INTEGER} AND t.community_id = #{communityId,jdbcType=INTEGER}  )
+    GROUP BY
+    y.transaction_id) a ON a.transaction_id = t.id
+    order by create_date DESC
   </select>
 
   <update id="updateTransaction" parameterType="com.community.huiju.model.TpTransaction" >

VUECODE/smart-property-manage/src/views/social/activity/info/index.vue

@@ -26,7 +26,7 @@
       </div>
       <div class="circular"/>
       <div class="people-limit">限制{{ ruleForm.signUpMax }}人</div>
-      <el-button type="primary" style="float: left;" @click="lockSignUp">查看报名名单</el-button>
+      <a type="primary" style="float: left;" @click="lockSignUp">查看报名名单</a>
     </div>
     <span>报名截止时间：{{ formatDate(ruleForm.registrationEndTime) }}</span>
     <div class="bom-button">
@@ -103,14 +103,19 @@ export default {
       this.$router.push({ name: 'activity-signIn-index', query: { id: this.ruleForm.id }})
     },
     // 下载图片
-     downloadCodeImg(){
-      console.log('下载图片')
-      var a = document.createElement('a')
-      a.download = this.ruleForm.activityCode
-       // 设置图片地址
-      a.href = this.ruleForm.activityCode
-      a.click();
-            }
+//      downloadCodeImg(){
+//       var a = document.createElement('a')
+//       a.download = this.ruleForm.activityCode
+//        // 设置图片地址
+//       a.href = this.ruleForm.activityCode
+//       a.click();
+//     }
+   downloadCodeImg(){
+  var alink = document.createElement("a");
+  alink.href = this.ruleForm.activityCode;
+  alink.download = "pic"; //图片名
+  alink.click();
+  }
 }
   }
 </script>