傅行帆 4 years ago
parent
commit
d7537c2253

+ 9
- 9
src/main/java/com/huiju/estateagents/property/controller/BillController.java View File

95
                                        @RequestParam(value = "file", required = false) MultipartFile file,
95
                                        @RequestParam(value = "file", required = false) MultipartFile file,
96
                                        @RequestParam("billExplain") String billExplain,
96
                                        @RequestParam("billExplain") String billExplain,
97
                                        @RequestParam("billName") String billName,
97
                                        @RequestParam("billName") String billName,
98
-                                       @RequestParam("endDate") String endDate,
98
+                                       @RequestParam("endDate") Date endDate,
99
                                        @RequestParam("billStatus") String billStatus) {
99
                                        @RequestParam("billStatus") String billStatus) {
100
         ResponseBean responseBean = new ResponseBean();
100
         ResponseBean responseBean = new ResponseBean();
101
         TaUser userElement = getTaUser(request);
101
         TaUser userElement = getTaUser(request);
102
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
102
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
103
-        Date date = null;
104
-        try {
105
-            String d = simpleDateFormat.format(new Long(endDate));
106
-            date = simpleDateFormat.parse(d);
107
-        } catch (ParseException e) {
108
-            e.printStackTrace();
109
-        }
110
-        responseBean = iBillService.getExcelData(billId, file, billExplain, billName, date, billStatus, userElement);
103
+//        Date date = null;
104
+//        try {
105
+//            String d = simpleDateFormat.format(new Long(endDate));
106
+//            date = simpleDateFormat.parse(d);
107
+//        } catch (ParseException e) {
108
+//            e.printStackTrace();
109
+//        }
110
+        responseBean = iBillService.getExcelData(billId, file, billExplain, billName, endDate, billStatus, userElement);
111
         return responseBean;
111
         return responseBean;
112
     }
112
     }
113
 
113
 

+ 5
- 5
src/main/java/com/huiju/estateagents/property/service/impl/BillServiceImpl.java View File

377
                         messageModelAPP.setMessageType("7");
377
                         messageModelAPP.setMessageType("7");
378
                         messageModelAPP.setAdviceType("1");
378
                         messageModelAPP.setAdviceType("1");
379
                         messageModelAPP.setModelType("2");
379
                         messageModelAPP.setModelType("2");
380
-                        messageModelAPP.setUuid(e.getTaUserId().toString());
380
+                        messageModelAPP.setUuid(null != e.getTaUserId() ? e.getTaUserId().toString() : "");
381
                         messageModelAPP.setUuidType("1");
381
                         messageModelAPP.setUuidType("1");
382
                         // 消息是物业端 发过来的, 就是 2
382
                         // 消息是物业端 发过来的, 就是 2
383
                         messageModelAPP.setSource("2");
383
                         messageModelAPP.setSource("2");
390
                         return messageModelAPP;
390
                         return messageModelAPP;
391
 
391
 
392
                     }).collect(Collectors.toList());
392
                     }).collect(Collectors.toList());
393
-                    iMessageService.saveBatch(messageList);
393
+//                    iMessageService.saveBatch(messageList);
394
                 }
394
                 }
395
 
395
 
396
             }
396
             }
442
             roomNoQueryWrapper.eq("org_id", orgId);
442
             roomNoQueryWrapper.eq("org_id", orgId);
443
             roomNoQueryWrapper.eq("id", roomId);
443
             roomNoQueryWrapper.eq("id", roomId);
444
             TpRoomNo tpRoomNo = tpRoomNoMapper.selectOne(roomNoQueryWrapper);
444
             TpRoomNo tpRoomNo = tpRoomNoMapper.selectOne(roomNoQueryWrapper);
445
-            if (null == tpRoomNo) {
446
-                throw new WisdomException("编号: " + roomId + " 不是本小区的房产");
447
-            }
445
+//            if (null == tpRoomNo) {
446
+//                throw new WisdomException("编号: " + roomId + " 不是本小区的房产");
447
+//            }
448
             cell = getCell(row.getCell(1));
448
             cell = getCell(row.getCell(1));
449
             if (null == cell) {
449
             if (null == cell) {
450
                 throw new WisdomException("第" + currentRow + "行 期/区 不能为空");
450
                 throw new WisdomException("第" + currentRow + "行 期/区 不能为空");