合并

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

@@ -174,4 +174,20 @@ public class TpTicketAndTransactionController {
         return responseBean;
     }
 
+    @ApiOperation(value = "app端个人中心话题管和工单管理是否展示", notes = "app端个人中心话题管和工单管理是否展示")
+    @ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "integer", name = "communityId", value = "小区Id"),
+            @ApiImplicitParam(paramType = "query", dataType = "String", name = "loginName", value = "手机号"),
+    })
+    @RequestMapping(value = "/accessAuthority/{communityId}", method = RequestMethod.GET)
+    public ResponseBean findUsedDetails(@PathVariable(value = "communityId") Integer communityId,@RequestParam("loginName") String loginName) {
+        ResponseBean responseBean = new ResponseBean();
+        TpUser tpUser= tpUserMapper.selectLoginName(loginName,communityId);
+         if (null == tpUser){
+             responseBean.addError("此号码无权限");
+             return responseBean;
+         }
+             responseBean.addSuccess("成功");
+        return responseBean;
+    }
+
 }

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

@@ -1158,6 +1158,7 @@ public class SocialServiceImpl implements SocialServiceI {
             tdImages.setCreateUser(id);
             tdImagesMapper.insert(tdImages);
         }
+        response.addSuccess(String.valueOf(tpTransaction.getId()));
         return response;
     }
 

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

@@ -279,31 +279,35 @@
 
   <select id="ticketList" resultMap="BaseResultMap">
     select
-    id,
-    community_id,
-    ta_user_id,
-    ticket_title,
-    ticket_content,
-    STATUS,
-    repair_type,
-    tp_user_id,
-    score,
-    COMMENT,
-    create_user,
-    create_date,
-    update_user,
-    update_date,
+    t.id,
+    t.community_id,
+    t.ta_user_id,
+    t.ticket_title,
+    t.ticket_content,
+    t.STATUS,
+    t.repair_type,
+    t.tp_user_id,
+    t.score,
+    t.COMMENT,
+    t.create_user,
+    t.create_date,
+    t.update_user,
+    t.update_date,
     (CASE type WHEN 1 THEN '投诉' WHEN 2 THEN '报修' WHEN 3 THEN '联系物业' ELSE	'未知' END) as type
-    from tp_ticket
+    from ta_user_verify uv
+    LEFT JOIN tp_ticket t on uv.id = t.create_user
     <where>
       <if test="status == 0 or status == 3 ">
-            status = #{status}
+        t.status = #{status}
       </if>
       <if test="status == 9 ">
-        and  `status` NOT in(0,3)
+        and  t.`status` NOT in(0,3)
       </if>
-      and community_id = #{communityId,jdbcType=INTEGER}
+      and t.id IS NOT NULL
+      and uv.community_id = #{communityId,jdbcType=INTEGER}
     </where>
+    GROUP BY t.id
+    order by  t.create_date desc
   </select>
 
   <select id="ticketDetails" resultType="com.community.huiju.vo.TpTicketVO">

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

@@ -345,7 +345,7 @@
                 and is_reported = 1
             </if>
             <if test="ManageStatus == 2">
-                (read_status IS NULL or read_status = 0)
+                and  (read_status IS NULL or read_status = 0)
             </if>
             <if test="ManageStatus == 3">
                 and  read_status= 1

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpTicketServiceImpl.java

@@ -84,9 +84,11 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
 
             /*查询当前工单创建人*/
             TaUserVerify taUserVerify= taUserVerifyMapper.selectById(tpTicket.getCreateUser());
+            if (null != taUserVerify ){
+                String createUserNmae=taUserMapper.selectLongNameAndcommunityId(taUserVerify.getUserId());
+                tpTicketVO.setCreateUserNmae(createUserNmae);
+            }
 
-            String createUserNmae=taUserMapper.selectLongNameAndcommunityId(taUserVerify.getUserId());
-            tpTicketVO.setCreateUserNmae(createUserNmae);
             tpTicketArrayList.add(tpTicketVO);
         }
         HashMap map=new HashMap<>();

CODE/smart-community/property-api/src/main/resources/mapper/TpTicketMapper.xml

@@ -19,8 +19,8 @@
     p.update_user,
     p.update_date,
     us.user_name
-    FROM
-    tp_ticket p
+    from ta_user_verify uv
+    LEFT JOIN tp_ticket p on uv.id = p.create_user
     LEFT JOIN ta_user AS us ON p.create_user=us.id
     LEFT JOIN tp_user AS u ON p.tp_user_id = u.id
 <where>
@@ -42,9 +42,11 @@
     <if test="updateUserNmae != null and updateUserNmae !=''">
         and u.user_name like concat('%',#{ updateUserNmae,jdbcType=VARCHAR},'%')
     </if>
-    and p.community_id=#{communityId,jdbcType=INTEGER}
+    and p.id IS NOT NULL
+    and uv.community_id=#{communityId,jdbcType=INTEGER}
 </where>
-        order by  create_date desc
+        GROUP BY p.id
+        order by  p.create_date desc
     </select>
 
     <select id="ticketDetails" resultType="com.community.huiju.vo.TpTicketVO">