lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/dto/EamRepairOrderDto.java
@@ -55,6 +55,7 @@ /**报修人*/ @Excel(name = "报修人", width = 15) @ApiModelProperty(value = "报修人") @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname") private String reportPerson; /**报修ID*/ private String reportId; @@ -72,6 +73,12 @@ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") private Date actualEndTime ; /** 维修时长*/ @ApiModelProperty(name = "维修时长",notes = "") private String repairDuration; /**故障时长*/ @ApiModelProperty(name = "故障时长",notes = "") private String faultDuration; /** 维修确认 */ private String repairConfirm ; /** 维修确认意见 */ lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/dto/EamReportAccidentsRegisterDto.java
@@ -113,6 +113,7 @@ /**操作工*/ @Excel(name = "操作工", width = 15) @ApiModelProperty(value = "操作工") @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname") private String confirmer; /**操作工确认时间*/ @Excel(name = "操作工确认时间", width = 15, format = "yyyy-MM-dd") @@ -123,6 +124,7 @@ /**区长*/ @Excel(name = "区长", width = 15) @ApiModelProperty(value = "区长") @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname") private String district; /**区长确认*/ @Excel(name = "区长确认", width = 15) @@ -141,6 +143,7 @@ /**中心主任*/ @Excel(name = "中心主任", width = 15) @ApiModelProperty(value = "中心主任") @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname") private String centerDirector; /**中心主任确认*/ @Excel(name = "中心主任确认", width = 15) @@ -191,6 +194,7 @@ /**维修工确认*/ @Excel(name = "维修工确认", width = 15) @ApiModelProperty(value = "维修确认") @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname") private String repairConfirm; /**维修工确认结果*/ @Excel(name = "维修工确认结果", width = 15) @@ -209,6 +213,7 @@ /**维修组长确认*/ @Excel(name = "维修组长确认", width = 15) @ApiModelProperty(value = "维修组长确认") @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname") private String repairGroupLeader; /**维修组长意见*/ @Excel(name = "维修组长意见", width = 15) @@ -227,6 +232,7 @@ /**维修组长(区长)确认*/ @Excel(name = "维修组长(区长)确认", width = 15) @ApiModelProperty(value = "维修组长(区长)确认") @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname") private String repairDistrict; /**维修组长(区长)意见*/ @Excel(name = "维修组长(区长)意见", width = 15) @@ -261,6 +267,7 @@ /**技术负责人*/ @Excel(name = "技术负责人", width = 15) @ApiModelProperty(value = "技术负责人") @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname") private String technicalDirector; /**技术负责人确认意见*/ @Excel(name = "技术负责人确认意见", width = 15) @@ -279,6 +286,7 @@ /**技术主管室级领导*/ @Excel(name = "技术主管室级领导", width = 15) @ApiModelProperty(value = "技术主管室级领导") @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname") private String technicalDirectorLeader; /**技术主管室级领导确认意见*/ @Excel(name = "技术主管室级领导确认意见", width = 15) @@ -297,6 +305,7 @@ /**主管部级领导*/ @Excel(name = "主管部级领导", width = 15) @ApiModelProperty(value = "主管部级领导") @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname") private String technicalDirectorPart; /**主管部级领导确认时间*/ @Excel(name = "主管部级领导确认时间", width = 15, format = "yyyy-MM-dd") @@ -335,4 +344,9 @@ private String scrapPartValue; /**生产单位*/ private String factoryName; /**故障开始时间*/ @ApiModelProperty(name = "故障开始时间",notes = "") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") private Date faultStartTime; } lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/mapper/xml/EamReportAccidentsRegisterMapper.xml
@@ -31,6 +31,7 @@ wmo.scrap_part_number, wmo.scrap_part_quantity, wmo.scrap_part_value , wmo.fault_start_time, f.factory_name FROM eam_report_accidents_register aar LEFT JOIN eam_report_repair wmo lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/IEamRepairOrderService.java
@@ -2,7 +2,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import liquibase.pro.packaged.S; import org.jeecg.modules.eam.dto.EamRepairOrderDto; import org.jeecg.modules.eam.dto.EamRepairOrderExport; import org.jeecg.modules.eam.entity.EamEquipment; lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamRepairOrderServiceImpl.java
@@ -191,6 +191,7 @@ eamRepairOrderDtoList.add(eamRepairOrderDto); }); } return eamRepairOrderDtoList; }
@@ -1,7 +1,6 @@ package org.jeecg.modules.eam.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import liquibase.pro.packaged.Q; import org.jeecg.common.api.vo.Result; import org.jeecg.modules.eam.entity.EamMaintenanceStandardDetail; import org.jeecg.modules.eam.mapper.EamMaintenanceStandardDetailMapper; lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamSecondMaintenanceOrderServiceImpl.java
@@ -9,7 +9,6 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import liquibase.pro.packaged.Q; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; import org.flowable.engine.TaskService;
