浏览代码

修复 bug

weiximei 6 年前
父节点
当前提交
7e6faed0c4

+ 9
- 3
CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/BillServiceImpl.java 查看文件

229
 
229
 
230
         bill.setPayedNum(0);
230
         bill.setPayedNum(0);
231
         bill.setBillStatus(billStatus);
231
         bill.setBillStatus(billStatus);
232
-        bill.setCreateUser(userElement.getId());
233
         //为草稿时不创建时间
232
         //为草稿时不创建时间
234
         if(!"2".equals(billStatus)) {
233
         if(!"2".equals(billStatus)) {
235
             bill.setCreateDate(new Date());
234
             bill.setCreateDate(new Date());
235
+            bill.setCreateUser(userElement.getId());
236
         }
236
         }
237
         bill.setCommunityId(userElement.getCommunityId());
237
         bill.setCommunityId(userElement.getCommunityId());
238
         Integer payTotalNum = tempBills.size() != 0 ? tempBills.size() : records != null ? records.size() : 0;
238
         Integer payTotalNum = tempBills.size() != 0 ? tempBills.size() : records != null ? records.size() : 0;
250
         if (billId != null) {
250
         if (billId != null) {
251
             bill.setCreateUser(null);
251
             bill.setCreateUser(null);
252
             bill.setCreateDate(null);
252
             bill.setCreateDate(null);
253
+            if(!"2".equals(billStatus)) {
254
+                bill.setCreateDate(new Date());
255
+                bill.setCreateUser(userElement.getId());
256
+            }
253
             // 设置主键, 表示修改
257
             // 设置主键, 表示修改
254
             bill.setId(billId);
258
             bill.setId(billId);
255
         }
259
         }
500
         Integer pageSize = 10;
504
         Integer pageSize = 10;
501
         Page<TpBuildingOwnerInfo> page = new Page(pageNum,pageSize);
505
         Page<TpBuildingOwnerInfo> page = new Page(pageNum,pageSize);
502
         // 分页查询
506
         // 分页查询
503
-        IPage<TpBuildingOwnerInfo> infoIPage = tpBuildingOwnerInfoMapper.selectPage(page, new QueryWrapper<>());
507
+        QueryWrapper<TpBuildingOwnerInfo> buildingOwnerInfoQueryWrapper = new QueryWrapper<>();
508
+        buildingOwnerInfoQueryWrapper.eq("community_id", userElement.getCommunityId());
509
+        IPage<TpBuildingOwnerInfo> infoIPage = tpBuildingOwnerInfoMapper.selectPage(page, buildingOwnerInfoQueryWrapper);
504
         List<TpBuildingOwnerInfo> records = infoIPage.getRecords();
510
         List<TpBuildingOwnerInfo> records = infoIPage.getRecords();
505
         // 总页数
511
         // 总页数
506
         Long pages = infoIPage.getPages();
512
         Long pages = infoIPage.getPages();
534
             if (index == records.size()) {
540
             if (index == records.size()) {
535
                 index = 0;
541
                 index = 0;
536
                 page = new Page(infoIPage.getCurrent() + 1,pageSize);
542
                 page = new Page(infoIPage.getCurrent() + 1,pageSize);
537
-                infoIPage = tpBuildingOwnerInfoMapper.selectPage(page, new QueryWrapper<>());
543
+                infoIPage = tpBuildingOwnerInfoMapper.selectPage(page, buildingOwnerInfoQueryWrapper);
538
                 records = infoIPage.getRecords();
544
                 records = infoIPage.getRecords();
539
             }
545
             }
540
         } while (infoIPage.getCurrent() <= pages);
546
         } while (infoIPage.getCurrent() <= pages);