fix: 导入和报案方式

wl

2022-12-28 d759812b05ceffc6021dee9ebf61bc0c22472df3

 src/main/java/com/example/jz/controller/WxAppController.java

@@ -164,7 +164,7 @@
        report.setIsInGroup(0);
        report.setCtime(new Date());
        report.setStatus(0);
        report.setReportMethod("现场录入");
        report.setReportMethod("扫码报案");
        return R.ok(reportService.save(report));
    }

@@ -177,18 +177,13 @@
    @GetMapping("/manager/group/list")
    public R getMessage(@RequestParam Integer id, @RequestParam String newDate, @RequestParam String lastDate) {
        ArrayList<Map<String, Object>> list = new ArrayList<>();
//        List<GroupUser> groupUsers = groupUserService.list(new QueryWrapper<GroupUser>().eq("user_id", id));
        List<Group> groupUsers = groupService.list(new QueryWrapper<Group>().eq("user_id", id));
        if (groupUsers != null && groupUsers.size() != 0) {
        if (!groupUsers.isEmpty()) {
            groupUsers.forEach(item -> {
                HashMap<String, Object> groupMap = new HashMap<>();
                List<Message> message = messageService.list(new QueryWrapper<Message>().eq("group_id", item.getId()).isNotNull("user_id").orderByDesc("ctime"));
                List<Message> message = messageService.list(new QueryWrapper<Message>().eq("group_id", item.getId()).orderByDesc("ctime"));
                groupMap.put("groupName", item.getGroupName());
                if (message != null && message.size() != 0) {
                    groupMap.put("message", message.get(0).getText());
                    groupMap.put("name", message.get(0).getReportName());
                    groupMap.put("time", message.get(0).getCtime());
                }
                getMessage(groupMap, message);
                if (StringUtils.isNotBlank(lastDate)) {
                    int count = messageService.count(new QueryWrapper<Message>().eq("group_id", item.getId()).between("ctime", lastDate, newDate));
                    groupMap.put("count", count);
@@ -200,21 +195,30 @@
        return R.ok(list);
    }

    private void getMessage(HashMap<String, Object> groupMap, List<Message> message) {
        if (!message.isEmpty()) {
            groupMap.put("message", message.get(0).getText());
            if (message.get(0).getUserId() == null) {
                groupMap.put("name", userDao.selectOne(new QueryWrapper<User>().eq("id", message.get(0).getCopId())).getRealName());
            } else {
                groupMap.put("name", message.get(0).getReportName());
            }
            groupMap.put("time", message.get(0).getCtime());
        }
    }


    @GetMapping("/user/group/list")
    public R getUserMessage(@RequestParam Integer id, @RequestParam String newDate, @RequestParam String lastDate) {
        ArrayList<Map<String, Object>> list = new ArrayList<>();
        reportService.list((new QueryWrapper<Report>().eq("user_id", id)))
        reportService.listGroup(id)
                .forEach(item ->
                        {
                            GroupUser groupUser = groupUserService.getOne(new QueryWrapper<GroupUser>().eq("user_id", item.getId()));
                            if (groupUser != null) {
                                HashMap<String, Object> groupMap = new HashMap<>();
                                List<Message> message = messageService.list(new QueryWrapper<Message>().eq("group_id", groupUser.getGroupId()).orderByDesc("ctime"));
                                if (message != null && message.size() != 0) {
                                    groupMap.put("message", message.get(0).getText());
                                    groupMap.put("time", message.get(0).getCtime());
                                }
                                getMessage(groupMap, message);
                                Group group = groupService.getOne(new QueryWrapper<Group>().eq("id", groupUser.getGroupId()));
                                groupMap.put("groupName", group.getGroupName());
                                groupMap.put("id", group.getId());