DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "设备维保调整字段和操作逻辑"

Browse Source 
This reverts commit d1af1c28a6.
This commit is contained in:
朱昊天
2026-07-08 10:49:00 +08:00
parent eadac22094
commit 1a3de775c8
9 changed files with 148 additions and 403 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
klp-flow/src/main/java/com/klp/flow/domain/EqpMaintenancePlanDetail.java
View File

@@ -55,30 +55,6 @@ public class EqpMaintenancePlanDetail extends BaseEntity {
* 维修内容描述
*/
private String repairContent;
/**
* 产线执行人员
*/
private String lineExecutor;
/**
* 设备执行人员
*/
private String equipmentExecutor;
/**
* 预计完成时间
*/
private String plannedCompleteTime;
/**
* 实际完成时间
*/
private String actualCompleteTime;
/**
* 总耗时（h）
*/
private String totalHours;
/**
* 验收人
*/
private String acceptanceUser;
/**
* 维修负责人
*/

24
klp-flow/src/main/java/com/klp/flow/domain/bo/EqpMaintenancePlanDetailBo.java
View File

@@ -62,30 +62,6 @@ public class EqpMaintenancePlanDetailBo extends BaseEntity {
* 维修内容描述
*/
private String repairContent;
/**
* 产线执行人员
*/
private String lineExecutor;
/**
* 设备执行人员
*/
private String equipmentExecutor;
/**
* 预计完成时间
*/
private String plannedCompleteTime;
/**
* 实际完成时间
*/
private String actualCompleteTime;
/**
* 总耗时（h）
*/
private String totalHours;
/**
* 验收人
*/
private String acceptanceUser;
/**
* 维修负责人

77
klp-flow/src/main/java/com/klp/flow/domain/vo/EqpMaintenancePlanDetailVo.java
View File

@@ -1,6 +1,8 @@
package com.klp.flow.domain.vo;
import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import com.klp.common.annotation.ExcelDictFormat;
@@ -23,7 +25,7 @@ public class EqpMaintenancePlanDetailVo {
/**
* 明细ID
*/
@ExcelProperty(value = "编号")
@ExcelProperty(value = "明细ID")
private Long detailId;
/**
@@ -33,66 +35,71 @@ public class EqpMaintenancePlanDetailVo {
private Long planId;
/**
* 时间
* 产线名称
*/
@ExcelProperty(value = "时间")
@ExcelProperty(value = "产线名称")
private String productionLine;
/**
* 设备部件名称
*/
@ExcelProperty(value = "设备部件名称")
private String componentName;
/**
* 单条维修项计划执行日期
*/
@ExcelProperty(value = "单条维修项计划执行日期")
private Date itemPlanDate;
/**
* 明细类型：0=保养 1=维修
*/
@ExcelProperty(value = "明细类型", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "0=保养,1=维修")
@ExcelProperty(value = "明细类型：0=保养 1=维修")
private Long maintenanceCategory;
/**
* 具体工作内容
* 明细完成状态：0=未开始 1=进行中 2=已完成
*/
@ExcelProperty(value = "具体工作内容")
@ExcelProperty(value = "明细完成状态：0=未开始 1=进行中 2=已完成")
private Long detailStatus;
/**
* 维修内容描述
*/
@ExcelProperty(value = "维修内容描述")
private String repairContent;
/**
* 产线执行人员
* 维修负责人
*/
@ExcelProperty(value = "产线执行人员")
private String lineExecutor;
@ExcelProperty(value = "维修负责人")
private String repairUser;
/**
* 设备执行人员
* 完成时间（打勾时记录）
*/
@ExcelProperty(value = "设备执行人员")
private String equipmentExecutor;
@ExcelProperty(value = "完成时间", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "打=勾时记录")
private Date completeTime;
/**
* 预计完成时间
* 实际支出金额(元)
*/
@ExcelProperty(value = "预计完成时间")
private String plannedCompleteTime;
@ExcelProperty(value = "实际支出金额(元)")
private BigDecimal actualCost;
/**
* 实际完成时间
* 完成进度百分比(0-100)
*/
@ExcelProperty(value = "实际完成时间")
private String actualCompleteTime;
@ExcelProperty(value = "完成进度百分比(0-100)")
private Long progressRate;
/**
* 总耗时(h)
* 目标厂家
*/
@ExcelProperty(value = "总耗时（h）")
private String totalHours;
/**
* 验收人
*/
@ExcelProperty(value = "验收人")
private String acceptanceUser;
/**
* 是否完成
*/
@ExcelProperty(value = "是否完成", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "0=否,1=否,2=是")
private Long detailStatus;
@ExcelProperty(value = "目标厂家")
private String targetManufacturer;
/**
* 备注

6
klp-flow/src/main/resources/mapper/flow/EqpMaintenancePlanDetailMapper.xml
View File

@@ -13,12 +13,6 @@
<result property="maintenanceCategory" column="maintenance_category"/>
<result property="detailStatus" column="detail_status"/>
<result property="repairContent" column="repair_content"/>
<result property="lineExecutor" column="line_executor"/>
<result property="equipmentExecutor" column="equipment_executor"/>
<result property="plannedCompleteTime" column="planned_complete_time"/>
<result property="actualCompleteTime" column="actual_complete_time"/>
<result property="totalHours" column="total_hours"/>
<result property="acceptanceUser" column="acceptance_user"/>
<result property="repairUser" column="repair_user"/>
<result property="completeTime" column="complete_time"/>
<result property="actualCost" column="actual_cost"/>