Merge remote-tracking branch 'origin/master'

“mitao”

2026-01-28 0a0bbb964267bf53b35ae67dc946b7e5d1aaa8e8

Merge remote-tracking branch 'origin/master'

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

@@ -78,6 +78,8 @@
                    screenUserVo.setCommentType(param.getCommentType());
                    screenUserVo.setSafetyId(param.getSafetyId());
                    screenUserVo.setDeviceTemplateId(param.getDeviceTemplateId());
                    screenUserVo.setBigHiddenDanger(param.getBigHiddenDanger());
                    screenUserVo.setGeneralHiddenDanger(param.getGeneralHiddenDanger());
                }
            }else if(type==2){
                Project project = projectService.getById(id);
@@ -90,6 +92,8 @@
                    screenUserVo.setCommentType(param.getCommentType());
                    screenUserVo.setSafetyId(param.getSafetyId());
                    screenUserVo.setDeviceTemplateId(param.getDeviceTemplateId());
                    screenUserVo.setBigHiddenDanger(param.getBigHiddenDanger());
                    screenUserVo.setGeneralHiddenDanger(param.getGeneralHiddenDanger());
                }
                screenUserVo.setName(project.getName());
                screenUserVo.setPermissionProject(project.getPermission());

 ruoyi-system/src/main/java/com/ruoyi/system/model/ErrorReview.java

@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -35,12 +36,14 @@
    private Integer id;
    @TableField("create_time")
    @ApiModelProperty(value = "创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createTime;
    private Boolean deleted;
    @ApiModelProperty(value = "名称")
    private String name;
    @TableField("update_time")
    @ApiModelProperty(value = "更新时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date updateTime;
    @ApiModelProperty(value = "复核内容")
    private String content;

 ruoyi-system/src/main/java/com/ruoyi/system/vo/EntrustDeviceListVo.java

@@ -14,6 +14,8 @@
    private Integer id;
    @ApiModelProperty("项目名称")
    private String projectName;
    @ApiModelProperty("委托方id")
    private Integer clientId;
    @ApiModelProperty("设备类型：1-塔式起重机 2-施工升降机 3-物料提升机 4-桥式起重机 5-附着式升降脚手架 6-流动式起重机 7-高处作业吊篮 8-门式起重机 9-架桥机 10-其他")
    private Integer type;
    @ApiModelProperty("设备编号")

 ruoyi-system/src/main/java/com/ruoyi/system/vo/ScreenUserVo.java

@@ -28,4 +28,10 @@

    @ApiModelProperty(value = "设备模板id")
    private Integer deviceTemplateId;

    @ApiModelProperty(value = "1开启 2关闭 重大隐患")
    private Integer bigHiddenDanger;

    @ApiModelProperty(value = "1开启 2关闭 一般隐患")
    private Integer generalHiddenDanger;
}

 ruoyi-system/src/main/resources/mapper/system/DeviceUsageMapper.xml

@@ -55,7 +55,10 @@
        group by device_id
        ) latest on t2.id = latest.device_id
        left join project t3 on t1.project_id = t3.id
        where t1.project_id = #{query.projectId} and t1.deleted = 0 and t1.disabled = 0
        where  t1.deleted = 0 and t1.disabled = 0 and t3.client_id =#{query.clientId}
        <if test="query.projectId != null">
            and t1.project_id = #{query.projectId}
        </if>
        <if test="query.type != null">
            and t2.type = #{query.type}
        </if>