maven
昨天 5ddf7af4a2817c39e1fab512b56741619ec5c4ec
yys
维修,保养添加督办人
已修改4个文件
16 ■■■■■ 文件已修改
src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/device/pojo/DeviceRepair.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/device/pojo/MaintenanceTask.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/device/DeviceRepairMapper.xml 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java
@@ -13,6 +13,12 @@
@Data
public class DeviceRepairDto {
    @ApiModelProperty("督办人")
    private String supervisoryName;
    @ApiModelProperty("审核人")
    private String auditName;
    @ApiModelProperty("设备报修id")
    private Long id;
src/main/java/com/ruoyi/device/pojo/DeviceRepair.java
@@ -58,6 +58,9 @@
    @ApiModelProperty("审核人")
    private String auditName;
    @ApiModelProperty("督办人")
    private String supervisoryName;
    @ApiModelProperty("创建时间")
    @TableField(fill = FieldFill.INSERT)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
src/main/java/com/ruoyi/device/pojo/MaintenanceTask.java
@@ -82,6 +82,9 @@
    @Excel(name = "审核人")
    private String auditName;
    @ApiModelProperty("督办人")
    private String supervisoryName;
    @ApiModelProperty(value = "软删除标志,0=未删除,1=已删除")
    private Integer deleted;
src/main/resources/mapper/device/DeviceRepairMapper.xml
@@ -22,7 +22,9 @@
               dr.repair_price,
               dr.tenant_id,
               dl.device_name,
               dl.device_model
               dl.device_model,
               dr.audit_name,
               dr.supervisory_name
        from device_repair dr
        left join device_ledger dl on dr.device_ledger_id = dl.id
        <where>