Quellcode durchsuchen

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

张延森 vor 4 Jahren
Ursprung
Commit
0cd4d64894

+ 1
- 2
src/main/java/com/huiju/estateagents/property/controller/BillController.java Datei anzeigen

@@ -173,10 +173,9 @@ public class BillController extends BaseController {
173 173
     public ResponseBean getBillInvoice(@PathVariable Integer payType,
174 174
                                        @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
175 175
                                        @RequestParam(value ="pageSize",defaultValue = "5") Integer pageSize, HttpServletRequest request){
176
-        TaUser userElement = getTaUser(request);
177 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 179
         responseBean.addSuccess(map);
181 180
         return responseBean;
182 181
     }

+ 2
- 2
src/main/java/com/huiju/estateagents/property/dao/BillInvoiceMapper.java Datei anzeigen

@@ -51,11 +51,11 @@ public interface BillInvoiceMapper extends BaseMapper<BillInvoice> {
51 51
     /**
52 52
      * 分页获取缴费和未缴费的数据
53 53
      * @param orgId
54
-     * @param roomNoId 房间id
54
+     * @param personId
55 55
      * @param payType
56 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 Datei anzeigen

@@ -91,13 +91,13 @@ public interface IBillService extends IService<Bill> {
91 91
 	/**
92 92
 	 * 根据payType分页获取缴费或未缴费的数据
93 93
 	 *
94
-	 * @param userElement
94
+	 * @param personId
95 95
 	 * @param payType
96 96
 	 * @param pageNum
97 97
 	 * @param pageSize
98 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 Datei anzeigen

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

+ 3
- 1
src/main/resources/mapper/property/BillInvoiceMapper.xml Datei anzeigen

@@ -155,7 +155,9 @@
155 155
             AND (i.bill_status = 1 or i.bill_status = 2)
156 156
         </if>
157 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 161
     </select>
160 162
 
161 163
     <select id="getBillInvoiceDetail" resultType="map">