andrew il y a 4 ans
Parent
révision
942050a808

+ 1
- 2
src/main/java/com/huiju/estateagents/property/controller/BillController.java Voir le fichier

173
     public ResponseBean getBillInvoice(@PathVariable Integer payType,
173
     public ResponseBean getBillInvoice(@PathVariable Integer payType,
174
                                        @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
174
                                        @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
175
                                        @RequestParam(value ="pageSize",defaultValue = "5") Integer pageSize, HttpServletRequest request){
175
                                        @RequestParam(value ="pageSize",defaultValue = "5") Integer pageSize, HttpServletRequest request){
176
-        TaUser userElement = getTaUser(request);
177
         ResponseBean responseBean = new ResponseBean();
176
         ResponseBean responseBean = new ResponseBean();
178
 
177
 
179
-        Map<String, Object> map = iBillService.getBillsList(userElement, payType, pageNum, pageSize);
178
+        Map<String, Object> map = iBillService.getBillsList(getPersonId(request), payType, pageNum, pageSize);
180
         responseBean.addSuccess(map);
179
         responseBean.addSuccess(map);
181
         return responseBean;
180
         return responseBean;
182
     }
181
     }

+ 2
- 2
src/main/java/com/huiju/estateagents/property/dao/BillInvoiceMapper.java Voir le fichier

51
     /**
51
     /**
52
      * 分页获取缴费和未缴费的数据
52
      * 分页获取缴费和未缴费的数据
53
      * @param orgId
53
      * @param orgId
54
-     * @param roomNoId 房间id
54
+     * @param personId
55
      * @param payType
55
      * @param payType
56
      * @return
56
      * @return
57
      */
57
      */
58
-    IPage<Map<String, Object>> getBillsList(IPage<Map<String, Object>> pg, @Param("orgId") Integer orgId, @Param("roomNoId") Integer roomNoId, @Param("payType") Integer payType);
58
+    IPage<Map<String, Object>> getBillsList(IPage<Map<String, Object>> pg, @Param("orgId") Integer orgId, @Param("personId") String personId, @Param("payType") Integer payType);
59
 
59
 
60
     /**
60
     /**
61
      * 获取账单的详细信息
61
      * 获取账单的详细信息

+ 2
- 2
src/main/java/com/huiju/estateagents/property/service/IBillService.java Voir le fichier

91
 	/**
91
 	/**
92
 	 * 根据payType分页获取缴费或未缴费的数据
92
 	 * 根据payType分页获取缴费或未缴费的数据
93
 	 *
93
 	 *
94
-	 * @param userElement
94
+	 * @param personId
95
 	 * @param payType
95
 	 * @param payType
96
 	 * @param pageNum
96
 	 * @param pageNum
97
 	 * @param pageSize
97
 	 * @param pageSize
98
 	 * @return
98
 	 * @return
99
 	 */
99
 	 */
100
-	Map<String, Object> getBillsList(TaUser userElement, Integer payType, Integer pageNum, Integer pageSize);
100
+	Map<String, Object> getBillsList(String personId, Integer payType, Integer pageNum, Integer pageSize);
101
 
101
 
102
 	/**
102
 	/**
103
 	 * 获取账单的详细信息
103
 	 * 获取账单的详细信息

+ 3
- 3
src/main/java/com/huiju/estateagents/property/service/impl/BillServiceImpl.java Voir le fichier

686
 
686
 
687
     /**
687
     /**
688
      * 根据payType分页获取缴费或未缴费的数据
688
      * 根据payType分页获取缴费或未缴费的数据
689
-     * @param userElement
689
+     * @param personId
690
      * @param payType
690
      * @param payType
691
      * @param pageNum
691
      * @param pageNum
692
      * @param pageSize
692
      * @param pageSize
693
      * @return
693
      * @return
694
      */
694
      */
695
     @Override
695
     @Override
696
-    public Map<String, Object> getBillsList(TaUser userElement, Integer payType, Integer pageNum, Integer pageSize) {
696
+    public Map<String, Object> getBillsList(String personId, Integer payType, Integer pageNum, Integer pageSize) {
697
 
697
 
698
 
698
 
699
         /**
699
         /**
702
 
702
 
703
         //使用分页插件
703
         //使用分页插件
704
         IPage<Map<String,Object>> page = new Page<>(pageNum, pageSize);
704
         IPage<Map<String,Object>> page = new Page<>(pageNum, pageSize);
705
-        IPage<Map<String,Object>> billsPage = billInvoiceMapper.getBillsList(page,userElement.getOrgId(), userElement.getRoomNoId(), payType);
705
+        IPage<Map<String,Object>> billsPage = billInvoiceMapper.getBillsList(page,1, personId, payType);
706
         List<Map<String, Object>> billsList = billsPage.getRecords();
706
         List<Map<String, Object>> billsList = billsPage.getRecords();
707
         billsList.forEach(e-> {
707
         billsList.forEach(e-> {
708
             String payPrice = String.valueOf(e.get("payPrice"));
708
             String payPrice = String.valueOf(e.get("payPrice"));

+ 3
- 1
src/main/resources/mapper/property/BillInvoiceMapper.xml Voir le fichier

155
             AND (i.bill_status = 1 or i.bill_status = 2)
155
             AND (i.bill_status = 1 or i.bill_status = 2)
156
         </if>
156
         </if>
157
         and i.status=1
157
         and i.status=1
158
-        AND i.room_no_id = #{roomNoId,jdbcType=INTEGER}
158
+        AND i.room_no_id in (SELECT room_no_id
159
+        from ta_user_verify WHERE person_id = #{personId}
160
+        )
159
     </select>
161
     </select>
160
 
162
 
161
     <select id="getBillInvoiceDetail" resultType="map">
163
     <select id="getBillInvoiceDetail" resultType="map">