Merge remote-tracking branch 'origin/master'

“mitao”

2026-04-01 b9b1c54aacf1d97e3a80104659696d1f6dbf61a5

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DashboardStatisticsController.java

@@ -62,6 +62,7 @@
    public R<ScreenUserVo> getLoginInfo(Integer type, Integer id) {
        ScreenUserVo screenUserVo = new ScreenUserVo();
        screenUserVo.setType(type);

        if(type!=null && id !=null){

            if(type==1){
@@ -69,6 +70,7 @@
                if(client==null){
                    return R.fail("委托方不存在");
                }
                screenUserVo.setClientId(id);
                ClientParam param = clientParamService.getOne(new LambdaQueryWrapper<ClientParam>().eq(ClientParam::getClientId, client.getId()));
                if(param!=null){
                    screenUserVo.setLogo(param.getLogo());
@@ -77,7 +79,12 @@
                    screenUserVo.setPermissionProject(param.getPermissionProject());
                    screenUserVo.setCommentType(param.getCommentType());
                    screenUserVo.setSafetyId(param.getSafetyId());
                    String name = clientParamService.getTemplateName(param.getSafetyId());
                    screenUserVo.setSafetyName(name);

                    screenUserVo.setDeviceTemplateId(param.getDeviceTemplateId());
                    screenUserVo.setDeviceTemplateName(clientParamService.getTemplateName(param.getDeviceTemplateId()));

                    screenUserVo.setBigHiddenDanger(param.getBigHiddenDanger());
                    screenUserVo.setGeneralHiddenDanger(param.getGeneralHiddenDanger());
                }
@@ -87,15 +94,22 @@
                    return R.fail("项目不存在");
                }
                Client client = clientService.getById(project.getClientId());
                screenUserVo.setClientId(client.getId());
                ClientParam param = clientParamService.getOne(new LambdaQueryWrapper<ClientParam>().eq(ClientParam::getClientId, client.getId()));
                if(param!=null){
                    screenUserVo.setLogo(param.getLogo());
                    screenUserVo.setName(param.getName());
                    screenUserVo.setCommentType(param.getCommentType());
                    screenUserVo.setSafetyId(param.getSafetyId());
                    String name = clientParamService.getTemplateName(param.getSafetyId());
                    screenUserVo.setSafetyName(name);
                    screenUserVo.setDeviceTemplateId(param.getDeviceTemplateId());
                    String name1 = clientParamService.getTemplateName(param.getDeviceTemplateId());
                    screenUserVo.setDeviceTemplateName(name1);
                    screenUserVo.setBigHiddenDanger(param.getBigHiddenDanger());
                    screenUserVo.setGeneralHiddenDanger(param.getGeneralHiddenDanger());
                }
                screenUserVo.setName(project.getName());
                screenUserVo.setProjectName(project.getName());
                screenUserVo.setPermissionProject(project.getPermission());
            }

@@ -118,6 +132,13 @@
        if(query.getCity()!=null && !query.getCity().isEmpty()){
            wrapper.eq(AccidentBrief::getCity, query.getCity());
        }
        if(query.getProvince()!=null && !query.getProvince().isEmpty()){
            wrapper.eq(AccidentBrief::getProvince, query.getProvince());
        }
        if(query.getArea()!=null && !query.getArea().isEmpty()){
            wrapper.eq(AccidentBrief::getArea, query.getArea());
        }

        if(query.getClassifyId()!=null){
            wrapper.eq(AccidentBrief::getClassifyId, query.getClassifyId());
        }