最新调整

src/main/java/com/huiju/estateagents/common/CommConstant.java

@@ -939,4 +939,6 @@ public class CommConstant {
     public static final String TP_MESSAGE_BIRTHDAY = "birthday";    // 生日
     public static final String TP_MESSAGE_FESTIVAL= "festival";     // 节日
     public static final String TP_MESSAGE_TICKET= "ticket";         // 工单
+
+    public static  final String VERIFY_STATUS_PASS = "1";
 }

src/main/java/com/huiju/estateagents/controller/MiniAppController.java

@@ -5,6 +5,7 @@ import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;
 import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
@@ -266,6 +267,12 @@ public class MiniAppController extends BaseController {
             result.put("person", taPerson);
             result.put("sessionKey", session.getSessionKey());
             result.put("token", token);
+            // 已经审核通过的房产
+            LambdaQueryWrapper<TaUserVerify> taUserVerifyLambdaQueryWrapper = new LambdaQueryWrapper<>();
+            taUserVerifyLambdaQueryWrapper.eq(TaUserVerify::getPersonId,taPerson.getPersonId());
+            taUserVerifyLambdaQueryWrapper.eq(TaUserVerify::getVerifyStatus,CommConstant.VERIFY_STATUS_PASS);
+            List<TaUserVerify> houseList = taUserVerifyService.list(taUserVerifyLambdaQueryWrapper);
+            result.put("houseList", houseList);
             if (null != sceneParams) {
                 result.put("scene", sceneParams);
             }

src/main/java/com/huiju/estateagents/property/controller/BillController.java

@@ -180,11 +180,12 @@ public class BillController extends BaseController {
     })
     @RequestMapping(value = "/wx/bills/current_user/{payType}",method = RequestMethod.GET)
     public ResponseBean getBillInvoice(@PathVariable Integer payType,
+                                       @RequestParam(value = "taUserVerifyId",required = false) Integer taUserVerifyId,
                                        @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                        @RequestParam(value ="pageSize",defaultValue = "5") Integer pageSize, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
 
-        Map<String, Object> map = iBillService.getBillsList(getPersonId(request), payType, pageNum, pageSize);
+        Map<String, Object> map = iBillService.getBillsList(getPersonId(request), payType, pageNum, pageSize,taUserVerifyId);
         responseBean.addSuccess(map);
         return responseBean;
     }

src/main/java/com/huiju/estateagents/property/controller/SocialController.java

@@ -59,11 +59,12 @@ public class SocialController extends BaseController {
     public ResponseBean getAnnouncements(@PathVariable Integer orgId,
                                          @RequestParam(required = false) String title,
                                          @RequestParam(required = false) String annType,
+                                         @RequestParam(required = false) Integer communityId,
                                          @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                                          @RequestParam(value = "pageSize", defaultValue = "5") Integer pageSize) {
         ResponseBean responseBean = new ResponseBean();
 
-        ResponseBean announcementList = socialServiceI.getAnnouncements(orgId, title, annType, pageNum, pageSize);
+        ResponseBean announcementList = socialServiceI.getAnnouncements(orgId, title, annType, pageNum, pageSize, communityId);
         return announcementList;
     }
 

src/main/java/com/huiju/estateagents/property/controller/TpTicketController.java

@@ -262,12 +262,14 @@ public class TpTicketController extends BaseController {
                                        @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                                        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
                                        @RequestParam(value = "type") String type,
+                                       @RequestParam(value = "taUserVerifyId") Integer taUserVerifyId,
                                        HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         TpTicket tpTicket = new TpTicket();
         tpTicket.setOrgId(Integer.valueOf(orgId));
         tpTicket.setPersonId(getPersonId(request));
         tpTicket.setType(type);
+        tpTicket.setTaUserVerifyId(taUserVerifyId);
 
         responseBean = tpTicketService.getByTypeList(tpTicket, pageNum, pageSize);
 

src/main/java/com/huiju/estateagents/property/dao/BillInvoiceMapper.java

@@ -55,7 +55,7 @@ public interface BillInvoiceMapper extends BaseMapper<BillInvoice> {
      * @param payType
      * @return
      */
-    IPage<Map<String, Object>> getBillsList(IPage<Map<String, Object>> pg, @Param("orgId") Integer orgId, @Param("personId") String personId, @Param("payType") Integer payType);
+    IPage<Map<String, Object>> getBillsList(IPage<Map<String, Object>> pg, @Param("orgId") Integer orgId, @Param("personId") String personId, @Param("payType") Integer payType,@Param("taUserVerifyId") Integer taUserVerifyId);
 
     /**
      * 获取账单的详细信息

src/main/java/com/huiju/estateagents/property/dao/TpAnnouncementMapper.java

@@ -34,5 +34,5 @@ public interface TpAnnouncementMapper extends BaseMapper<TpAnnouncement> {
      */
 //    List<TpAnnouncement> getAnnouncement(@Param("orgId") Integer orgId, @Param("sum") Integer sum);
 
-    IPage<TpAnnouncement> getWxAnnouncements(Page page, @Param("orgId") Integer orgId, @Param("title") String title, @Param("annType") String annType);
+    IPage<TpAnnouncement> getWxAnnouncements(Page page, @Param("orgId") Integer orgId, @Param("title") String title, @Param("annType") String annType,@Param("communityId") Integer communityId);
 }

src/main/java/com/huiju/estateagents/property/dao/TpTicketMapper.java

@@ -30,7 +30,7 @@ public interface TpTicketMapper extends BaseMapper<TpTicket> {
      * @param map
      * @return
      */
-    IPage<TpTicket> selectByCommuniytIdAndByTaUserIdAndByType(Page page,@Param("type") String type,@Param("personId") String personId,@Param("orgId") Integer orgId);
+    IPage<TpTicket> selectByCommuniytIdAndByTaUserIdAndByType(Page page,@Param("type") String type,@Param("personId") String personId,@Param("orgId") Integer orgId,@Param("taUserVerifyId") Integer taUserVerifyId);
 
     TpTicket selectTpTicketName(@Param("orgId")Integer orgId, @Param("type")String type, @Param("ticketTitle")String ticketTitle);
 

src/main/java/com/huiju/estateagents/property/model/TpTicket.java

@@ -121,6 +121,11 @@ public class TpTicket implements Serializable {
      */
     private String workerName;
 
+    /**
+     * 用户审核通过
+     */
+    private Integer taUserVerifyId;
+
     /**
      * 用户姓名
      */

src/main/java/com/huiju/estateagents/property/service/IBillService.java

@@ -96,7 +96,7 @@ public interface IBillService extends IService<Bill> {
 	 * @param pageSize
 	 * @return
 	 */
-	Map<String, Object> getBillsList(String personId, Integer payType, Integer pageNum, Integer pageSize);
+	Map<String, Object> getBillsList(String personId, Integer payType, Integer pageNum, Integer pageSize,Integer taUserVerifyId);
 
 	/**
 	 * 获取账单的详细信息

src/main/java/com/huiju/estateagents/property/service/SocialServiceI.java

@@ -31,7 +31,7 @@ public interface SocialServiceI {
      * @param pageSize
      * @return
 	 */
-	ResponseBean getAnnouncements(Integer orgId, String title, String annType, Integer pageNum, Integer pageSize);
+	ResponseBean getAnnouncements(Integer orgId, String title, String annType, Integer pageNum, Integer pageSize, Integer communityId);
 
 	/**
 	 * 评价工单以及评分

src/main/java/com/huiju/estateagents/property/service/impl/BillServiceImpl.java

@@ -683,7 +683,7 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
      * @return
      */
     @Override
-    public Map<String, Object> getBillsList(String personId, Integer payType, Integer pageNum, Integer pageSize) {
+    public Map<String, Object> getBillsList(String personId, Integer payType, Integer pageNum, Integer pageSize,Integer taUserVerifyId) {
 
 
         /**
@@ -692,7 +692,7 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
 
         //使用分页插件
         IPage<Map<String,Object>> page = new Page<>(pageNum, pageSize);
-        IPage<Map<String,Object>> billsPage = billInvoiceMapper.getBillsList(page,1, personId, payType);
+        IPage<Map<String,Object>> billsPage = billInvoiceMapper.getBillsList(page,1, personId, payType,taUserVerifyId);
         List<Map<String, Object>> billsList = billsPage.getRecords();
         billsList.forEach(e-> {
             String payPrice = String.valueOf(e.get("payPrice"));

src/main/java/com/huiju/estateagents/property/service/impl/SocialServiceImpl.java

@@ -82,13 +82,13 @@ public class SocialServiceImpl implements SocialServiceI {
      * @return
      */
     @Override
-    public ResponseBean getAnnouncements(Integer orgId, String title, String annType, Integer pageNum, Integer pageSize) {
+    public ResponseBean getAnnouncements(Integer orgId, String title, String annType, Integer pageNum, Integer pageSize,Integer communityId) {
         ResponseBean responseBean = new ResponseBean();
         Map<String, Object> parameter = Maps.newHashMap();
         //使用分页插件
         Page<TpAnnouncement> page = new Page<>(pageNum, pageSize);
         // 获取数据
-        IPage<TpAnnouncement> wxAnnouncementsPage = tpAnnouncementMapper.getWxAnnouncements(page, orgId, title, annType);
+        IPage<TpAnnouncement> wxAnnouncementsPage = tpAnnouncementMapper.getWxAnnouncements(page, orgId, title, annType, communityId);
         responseBean.addSuccess(wxAnnouncementsPage);
         return responseBean;
     }

src/main/java/com/huiju/estateagents/property/service/impl/TpTicketServiceImpl.java

@@ -675,7 +675,7 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
         parameter.put("type", 2);
         // 报修
         Page<TpTicket> pageRepairs = new Page(pageNum, pageSize);
-        IPage<TpTicket> tpTicketIPage = tpTicketMapper.selectByCommuniytIdAndByTaUserIdAndByType(pageRepairs, tpTicket.getType(),tpTicket.getPersonId(),tpTicket.getOrgId());
+        IPage<TpTicket> tpTicketIPage = tpTicketMapper.selectByCommuniytIdAndByTaUserIdAndByType(pageRepairs, tpTicket.getType(),tpTicket.getPersonId(),tpTicket.getOrgId(),tpTicket.getTaUserVerifyId());
         List<TpTicket> tpTicketRepairsList = tpTicketIPage.getRecords();
         List<TpTicketVO> repairsList = Lists.newArrayList();
         tpTicketVOConvert(tpTicketRepairsList, repairsList);
@@ -684,7 +684,7 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
         //  1：投诉   2：报修 3：联系物业
         parameter.put("type", 1);
         Page<TpTicket> pageComplaint = new Page(pageNum, pageSize);
-        IPage<TpTicket> tpTicketIPageComplaint = tpTicketMapper.selectByCommuniytIdAndByTaUserIdAndByType(pageComplaint, tpTicket.getType(), tpTicket.getPersonId(),tpTicket.getOrgId());
+        IPage<TpTicket> tpTicketIPageComplaint = tpTicketMapper.selectByCommuniytIdAndByTaUserIdAndByType(pageComplaint, tpTicket.getType(), tpTicket.getPersonId(),tpTicket.getOrgId(),tpTicket.getTaUserVerifyId());
         List<TpTicket> tpTicketComplaintList = tpTicketIPageComplaint.getRecords();
         List<TpTicketVO> complaintList = Lists.newArrayList();
         tpTicketVOConvert(tpTicketComplaintList, complaintList);
@@ -693,7 +693,7 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
         //  1：投诉   2：报修 3：联系物业
         parameter.put("type", 3);
         Page<TpTicket> pageLiaison = new Page(pageNum, pageSize);
-        IPage<TpTicket> tpTicketIPageLiaison = tpTicketMapper.selectByCommuniytIdAndByTaUserIdAndByType(pageLiaison, tpTicket.getType(),tpTicket.getPersonId(),tpTicket.getOrgId());
+        IPage<TpTicket> tpTicketIPageLiaison = tpTicketMapper.selectByCommuniytIdAndByTaUserIdAndByType(pageLiaison, tpTicket.getType(),tpTicket.getPersonId(),tpTicket.getOrgId(),tpTicket.getTaUserVerifyId());
         List<TpTicket> tpTicketLiaisonList = tpTicketIPageLiaison.getRecords();
         List<TpTicketVO> liaisonList = Lists.newArrayList();
         tpTicketVOConvert(tpTicketLiaisonList, liaisonList);
@@ -794,7 +794,7 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
         parameter.put("type", tpTicket.getType());
 
         Page<TpTicket> pagelist = new Page<>(pageNum, pageSize);
-        IPage<TpTicket> tpTicketIPage = tpTicketMapper.selectByCommuniytIdAndByTaUserIdAndByType(pagelist, tpTicket.getType(),tpTicket.getPersonId(),tpTicket.getOrgId());
+        IPage<TpTicket> tpTicketIPage = tpTicketMapper.selectByCommuniytIdAndByTaUserIdAndByType(pagelist, tpTicket.getType(),tpTicket.getPersonId(),tpTicket.getOrgId(), tpTicket.getTaUserVerifyId());
         List<TpTicket> tpTicketList = tpTicketIPage.getRecords();
 
         List<TpTicketVO> tpTicketVOList = Lists.newArrayList();
@@ -881,6 +881,7 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
         ResponseBean response = new ResponseBean();
         JSONObject jsonObject = JSONObject.parseObject(parameter);
         String imageUrl = (String) jsonObject.get("imageUrl");
+        Integer taUserVerifyId = (Integer) jsonObject.get("taUserVerifyId");
 
 
         TpTicket tpTicket = JSONObject.parseObject(parameter, TpTicket.class);
@@ -897,6 +898,7 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
         tpTicket.setPersonId(personId);
         // 默认待分配
         tpTicket.setStatus("0");
+        tpTicket.setTaUserVerifyId(taUserVerifyId);
         // 2.1以后为ta_user_verify为中心不再是已用户ta_user为中心
         tpTicket.setCreateUser(personId);
         tpTicket.setCreateDate(LocalDateTime.now());

src/main/resources/mapper/property/BillInvoiceMapper.xml

@@ -156,7 +156,10 @@
         </if>
         and i.status=1
         AND i.room_no_id in (SELECT room_no_id
-        from ta_user_verify WHERE person_id = #{personId}
+        from ta_user_verify WHERE person_id = #{personId} and role_id = 1
+        <if test="taUserVerifyId != null">
+            AND id = #{taUserVerifyId}
+        </if>
         )
     </select>
 

src/main/resources/mapper/property/TpAnnouncementMapper.xml

@@ -107,6 +107,9 @@
     <if test="annType != null and annType != ''">
       and a.ann_type = #{annType}
     </if>
+    <if test="communityId != null and communityId != ''">
+      and a.community_id = #{communityId}
+    </if>
     ORDER BY
     a.sort DESC,
     a.update_date DESC,

src/main/resources/mapper/property/TpTicketMapper.xml

@@ -88,6 +88,9 @@
             <if test="type != null" >
                 and type = #{type,jdbcType=CHAR}
             </if>
+            <if test="taUserVerifyId != null" >
+                and ta_user_verify_id = #{taUserVerifyId}
+            </if>
         </trim>
         order by create_date DESC
     </select>