bug

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

@@ -95,19 +95,19 @@ public class BillController extends BaseController {
                                        @RequestParam(value = "file", required = false) MultipartFile file,
                                        @RequestParam("billExplain") String billExplain,
                                        @RequestParam("billName") String billName,
-                                       @RequestParam("endDate") String endDate,
+                                       @RequestParam("endDate") Date endDate,
                                        @RequestParam("billStatus") String billStatus) {
         ResponseBean responseBean = new ResponseBean();
         TaUser userElement = getTaUser(request);
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        Date date = null;
-        try {
-            String d = simpleDateFormat.format(new Long(endDate));
-            date = simpleDateFormat.parse(d);
-        } catch (ParseException e) {
-            e.printStackTrace();
-        }
-        responseBean = iBillService.getExcelData(billId, file, billExplain, billName, date, billStatus, userElement);
+//        Date date = null;
+//        try {
+//            String d = simpleDateFormat.format(new Long(endDate));
+//            date = simpleDateFormat.parse(d);
+//        } catch (ParseException e) {
+//            e.printStackTrace();
+//        }
+        responseBean = iBillService.getExcelData(billId, file, billExplain, billName, endDate, billStatus, userElement);
         return responseBean;
     }
 

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

@@ -377,7 +377,7 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
                         messageModelAPP.setMessageType("7");
                         messageModelAPP.setAdviceType("1");
                         messageModelAPP.setModelType("2");
-                        messageModelAPP.setUuid(e.getTaUserId().toString());
+                        messageModelAPP.setUuid(null != e.getTaUserId() ? e.getTaUserId().toString() : "");
                         messageModelAPP.setUuidType("1");
                         // 消息是物业端 发过来的, 就是 2
                         messageModelAPP.setSource("2");
@@ -390,7 +390,7 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
                         return messageModelAPP;
 
                     }).collect(Collectors.toList());
-                    iMessageService.saveBatch(messageList);
+//                    iMessageService.saveBatch(messageList);
                 }
 
             }
@@ -442,9 +442,9 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
             roomNoQueryWrapper.eq("org_id", orgId);
             roomNoQueryWrapper.eq("id", roomId);
             TpRoomNo tpRoomNo = tpRoomNoMapper.selectOne(roomNoQueryWrapper);
-            if (null == tpRoomNo) {
-                throw new WisdomException("编号: " + roomId + " 不是本小区的房产");
-            }
+//            if (null == tpRoomNo) {
+//                throw new WisdomException("编号: " + roomId + " 不是本小区的房产");
+//            }
             cell = getCell(row.getCell(1));
             if (null == cell) {
                 throw new WisdomException("第" + currentRow + "行 期/区 不能为空");