From 821d80e9876575bda25999785081e2e2eb2d9101 Mon Sep 17 00:00:00 2001 From: haungxing <1203316822@qq.com> Date: Mon, 8 Jan 2024 18:58:07 +0800 Subject: [PATCH] =?UTF-8?q?#=20=E6=97=A5=E5=B8=B8=E7=BB=B4=E6=8A=A4?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=94=9F=E6=88=90=E6=94=B9=E9=80=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/OperMaintenanceTaskEntity.java | 3 ++ .../maintenance/vo/MaintenanceTaskQueryVO.java | 62 ++++++++++++++++++++++ .../controller/MaintenanceTaskQueryController.java | 24 +++++++++ .../service/IMaintenanceTaskQueryService.java | 4 ++ .../impl/MaintenanceTaskQueryServiceImpl.java | 14 +++++ .../safeproduct/src/main/resources/db/1.0.2.sql | 1 + 6 files changed, 108 insertions(+) create mode 100644 hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/maintenance/vo/MaintenanceTaskQueryVO.java create mode 100644 hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/controller/MaintenanceTaskQueryController.java create mode 100644 hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/IMaintenanceTaskQueryService.java create mode 100644 hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/MaintenanceTaskQueryServiceImpl.java create mode 100644 hzims-service/safeproduct/src/main/resources/db/1.0.2.sql diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/maintenance/entity/OperMaintenanceTaskEntity.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/maintenance/entity/OperMaintenanceTaskEntity.java index 9cd3385..5e490db 100644 --- a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/maintenance/entity/OperMaintenanceTaskEntity.java +++ b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/maintenance/entity/OperMaintenanceTaskEntity.java @@ -191,4 +191,7 @@ public class OperMaintenanceTaskEntity extends TenantEntity { */ @ApiModelProperty("当前任务名") private String flowTaskId; + + @ApiModelProperty("是否延期") + private Boolean isDelay; } diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/maintenance/vo/MaintenanceTaskQueryVO.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/maintenance/vo/MaintenanceTaskQueryVO.java new file mode 100644 index 0000000..a565168 --- /dev/null +++ b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/maintenance/vo/MaintenanceTaskQueryVO.java @@ -0,0 +1,62 @@ +package com.hnac.hzims.operational.maintenance.vo; + +import com.alibaba.excel.annotation.ExcelProperty; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.io.Serializable; + +@Data +@EqualsAndHashCode +@ApiModel("日常维护任务查询导出对象") +public class MaintenanceTaskQueryVO implements Serializable { + + @ApiModelProperty(value = "序号") + @ExcelProperty("序号") + private Integer index; + + @ApiModelProperty(value = "创建机构名称") + @ExcelProperty("单位") + private String deptName; + + @ApiModelProperty(value = "维护类型 01=定期试验 02=定期保养 03=定期操作 04=其他") + private String typeCode; + + @ExcelProperty("维护类型") + @ApiModelProperty(value = "维护类型名称") + private String typeName; + + @ApiModelProperty(value = "设备编号") + private String emCode; + + @ApiModelProperty(value = "维护设备") + @ExcelProperty("维护设备") + private String emName; + + @ApiModelProperty(value = "维护内容") + @ExcelProperty("维护内容") + private String content; + + @ApiModelProperty(value = "计划执行时间") + @ExcelProperty("计划执行时间") + private String planDisposeTime; + + @ApiModelProperty(value = "实际执行时间") + @ExcelProperty("实际执行时间") + private String disposeTime; + + @ApiModelProperty(value = "执行人") + @ExcelProperty("执行人") + private String disposerName; + + @ApiModelProperty(value = "逾期状态") + @ExcelProperty("逾期状态") + private String delayStatus; + + @ApiModelProperty(value = "状态") + @ExcelProperty("状态") + private String status; + +} diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/controller/MaintenanceTaskQueryController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/controller/MaintenanceTaskQueryController.java new file mode 100644 index 0000000..6cf12dc --- /dev/null +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/controller/MaintenanceTaskQueryController.java @@ -0,0 +1,24 @@ +package com.hnac.hzims.operational.maintenance.controller; + +import io.swagger.annotations.Api; +import lombok.AllArgsConstructor; +import org.springblade.core.boot.ctrl.BladeController; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @ClassName MaintenanceTaskQueryController + * @description: + * @author: hx + * @create: 2024-01-08 14:35 + * @Version 4.0 + **/ +@RestController +@RequestMapping("/maintenance/task/query") +@Api(value = "日常维护任务导出管理",tags = "日常维护任务导出管理") +@AllArgsConstructor +public class MaintenanceTaskQueryController extends BladeController { + + + +} diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/IMaintenanceTaskQueryService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/IMaintenanceTaskQueryService.java new file mode 100644 index 0000000..31a3078 --- /dev/null +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/IMaintenanceTaskQueryService.java @@ -0,0 +1,4 @@ +package com.hnac.hzims.operational.maintenance.service; + +public interface IMaintenanceTaskQueryService { +} diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/MaintenanceTaskQueryServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/MaintenanceTaskQueryServiceImpl.java new file mode 100644 index 0000000..8e75845 --- /dev/null +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/MaintenanceTaskQueryServiceImpl.java @@ -0,0 +1,14 @@ +package com.hnac.hzims.operational.maintenance.service.impl; + +import com.hnac.hzims.operational.maintenance.service.IMaintenanceTaskQueryService; +import com.hnac.hzims.operational.maintenance.service.IOperMaintenanceTaskService; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@AllArgsConstructor +public class MaintenanceTaskQueryServiceImpl implements IMaintenanceTaskQueryService { + + private final IOperMaintenanceTaskService operMaintenanceTaskService; + +} diff --git a/hzims-service/safeproduct/src/main/resources/db/1.0.2.sql b/hzims-service/safeproduct/src/main/resources/db/1.0.2.sql new file mode 100644 index 0000000..548567a --- /dev/null +++ b/hzims-service/safeproduct/src/main/resources/db/1.0.2.sql @@ -0,0 +1 @@ +alter table `hzims_oper_maintenance_task` add column `is_delay` tinyint(2) default 0 comment '是否延期'; \ No newline at end of file