Merge branch 'master' of http://git.ycjcjy.com/xiangsong/xs-service

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

@@ -173,10 +173,9 @@ public class BillController extends BaseController {
     public ResponseBean getBillInvoice(@PathVariable Integer payType,
                                        @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                        @RequestParam(value ="pageSize",defaultValue = "5") Integer pageSize, HttpServletRequest request){
-        TaUser userElement = getTaUser(request);
         ResponseBean responseBean = new ResponseBean();
 
-        Map<String, Object> map = iBillService.getBillsList(userElement, payType, pageNum, pageSize);
+        Map<String, Object> map = iBillService.getBillsList(getPersonId(request), payType, pageNum, pageSize);
         responseBean.addSuccess(map);
         return responseBean;
     }

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

@@ -51,11 +51,11 @@ public interface BillInvoiceMapper extends BaseMapper<BillInvoice> {
     /**
      * 分页获取缴费和未缴费的数据
      * @param orgId
-     * @param roomNoId 房间id
+     * @param personId
      * @param payType
      * @return
      */
-    IPage<Map<String, Object>> getBillsList(IPage<Map<String, Object>> pg, @Param("orgId") Integer orgId, @Param("roomNoId") Integer roomNoId, @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);
 
     /**
      * 获取账单的详细信息

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

@@ -91,13 +91,13 @@ public interface IBillService extends IService<Bill> {
 	/**
 	 * 根据payType分页获取缴费或未缴费的数据
 	 *
-	 * @param userElement
+	 * @param personId
 	 * @param payType
 	 * @param pageNum
 	 * @param pageSize
 	 * @return
 	 */
-	Map<String, Object> getBillsList(TaUser userElement, Integer payType, Integer pageNum, Integer pageSize);
+	Map<String, Object> getBillsList(String personId, Integer payType, Integer pageNum, Integer pageSize);
 
 	/**
 	 * 获取账单的详细信息

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

@@ -688,14 +688,14 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
 
     /**
      * 根据payType分页获取缴费或未缴费的数据
-     * @param userElement
+     * @param personId
      * @param payType
      * @param pageNum
      * @param pageSize
      * @return
      */
     @Override
-    public Map<String, Object> getBillsList(TaUser userElement, Integer payType, Integer pageNum, Integer pageSize) {
+    public Map<String, Object> getBillsList(String personId, Integer payType, Integer pageNum, Integer pageSize) {
 
 
         /**
@@ -704,7 +704,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,userElement.getOrgId(), userElement.getRoomNoId(), payType);
+        IPage<Map<String,Object>> billsPage = billInvoiceMapper.getBillsList(page,1, personId, payType);
         List<Map<String, Object>> billsList = billsPage.getRecords();
         billsList.forEach(e-> {
             String payPrice = String.valueOf(e.get("payPrice"));

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

@@ -155,7 +155,9 @@
             AND (i.bill_status = 1 or i.bill_status = 2)
         </if>
         and i.status=1
-        AND i.room_no_id = #{roomNoId,jdbcType=INTEGER}
+        AND i.room_no_id in (SELECT room_no_id
+        from ta_user_verify WHERE person_id = #{personId}
+        )
     </select>
 
     <select id="getBillInvoiceDetail" resultType="map">