Merge branch 'master' of https://gitee.com/boymi/YiFeiNN

mitao

2025-03-28 b44b174f656aac1fe03e7f96851e564c3982f67d

 medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppMwWarningRecordController.java

@@ -39,20 +39,29 @@
    @ApiOperation("预警记录")
    @PostMapping("/record")
    public R<Page<MwWarningRecord>> record(@RequestParam Integer pageNum,@RequestParam Integer pageSize) {
        SysUser sysUser = SecurityUtils.getLoginUser().getUser();
        Page<MwWarningRecord> page = mwWarningRecordService.lambdaQuery().eq(MwWarningRecord::getDepartmentId, sysUser.getDepartmentId()).page(Page.of(pageNum, pageSize));
        SysDepartment myDepartment = sysDepartmentService.getMyDepartment();
        Page<MwWarningRecord> page = mwWarningRecordService.lambdaQuery().eq(MwWarningRecord::getDepartmentId, myDepartment.getId()).page(Page.of(pageNum, pageSize));
        return R.ok(page);
    }

    @ApiOperation(value = "预警统计",tags = "监管人员")
    @PostMapping("/danger")
    public R<List<SysDepartment>> danger(String name) {
    public R<List<SysDepartment>> danger(String name, Long areaId) {
        SysDepartment byId = sysDepartmentService.getById(areaId);
        //
        List<SysDepartment> list = sysDepartmentService.lambdaQuery().like(name!=null,SysDepartment::getDepartmentName,name).eq(SysDepartment::getOrgType, 2).list();
        List<SysDepartment> list = sysDepartmentService.lambdaQuery().likeRight(SysDepartment::getTreeCode, byId.getTreeCode()).like(name!=null,SysDepartment::getDepartmentName,name).in(SysDepartment::getOrgType, 2,3).list();
        for (SysDepartment sysDepartment : list) {
            sysDepartment.setDangerCount(mwWarningRecordService.lambdaQuery().eq(MwWarningRecord::getDepartmentId,sysDepartment.getId()).count());
        }
        return R.ok(list);
    }


    @ApiOperation(value = "预警统计详情",tags = "监管人员")
    @PostMapping("/detail/record")
    public R<Page<MwWarningRecord>> record1(@RequestParam Long id,@RequestParam Integer pageNum,@RequestParam Integer pageSize) {
        Page<MwWarningRecord> page = mwWarningRecordService.lambdaQuery().eq(MwWarningRecord::getDepartmentId, id).page(Page.of(pageNum, pageSize));
        return R.ok(page);
    }

}