change(dms): 将设备效率报表中的数值类型从Long改为BigDecimal

- 修改DmsReportDeviceEfficiency类中所有数值字段类型为BigDecimal
- 更新DmsReportDeviceEfficiencyBo类中对应字段类型
- 调整DmsReportDeviceEfficiencyVo类中相关字段类型
- 引入java.math.BigDecimal包以支持精确计算
-保持Excel导出格式与数据类型一致性
master
zangch@mesnac.com 2 months ago
parent cb940a66c4
commit f8bdaf3a72

@ -1,12 +1,14 @@
package org.dromara.dms.domain; package org.dromara.dms.domain;
import com.baomidou.mybatisplus.annotation.TableName; import org.dromara.common.tenant.core.TenantEntity;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.dromara.common.tenant.core.TenantEntity; import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.io.Serial; import java.io.Serial;
import java.util.Date;
/** /**
* dms_report_device_efficiency * dms_report_device_efficiency
@ -75,62 +77,62 @@ public class DmsReportDeviceEfficiency extends TenantEntity {
/** /**
* *
*/ */
private Long outputQty; private BigDecimal outputQty;
/** /**
* / * /
*/ */
private Long processStdMachineHours; private BigDecimal processStdMachineHours;
/** /**
* *
*/ */
private Long debugHours; private BigDecimal debugHours;
/** /**
* *
*/ */
private Long runHours; private BigDecimal runHours;
/** /**
* *
*/ */
private Long standbyHours; private BigDecimal standbyHours;
/** /**
* *
*/ */
private Long faultHours; private BigDecimal faultHours;
/** /**
* *
*/ */
private Long shutdownHours; private BigDecimal shutdownHours;
/** /**
* = × * = ×
*/ */
private Long outputMachineHours; private BigDecimal outputMachineHours;
/** /**
* = + + * = + +
*/ */
private Long totalHours; private BigDecimal totalHours;
/** /**
* = ( + ) / * = ( + ) /
*/ */
private Long uptimeRate; private BigDecimal uptimeRate;
/** /**
* = / (++++) * = / (++++)
*/ */
private Long overallEfficiency; private BigDecimal overallEfficiency;
/** /**
* = / * = /
*/ */
private Long runtimeEfficiency; private BigDecimal runtimeEfficiency;
/** /**
* *

@ -8,6 +8,7 @@ import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*; import jakarta.validation.constraints.*;
import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
@ -86,73 +87,73 @@ public class DmsReportDeviceEfficiencyBo extends BaseEntity {
* *
*/ */
@NotNull(message = "产量(件)不能为空", groups = { AddGroup.class, EditGroup.class }) @NotNull(message = "产量(件)不能为空", groups = { AddGroup.class, EditGroup.class })
private Long outputQty; private BigDecimal outputQty;
/** /**
* / * /
*/ */
@NotNull(message = "工序标准机时(小时/件)不能为空", groups = { AddGroup.class, EditGroup.class }) @NotNull(message = "工序标准机时(小时/件)不能为空", groups = { AddGroup.class, EditGroup.class })
private Long processStdMachineHours; private BigDecimal processStdMachineHours;
/** /**
* *
*/ */
@NotNull(message = "调试时间(小时)不能为空", groups = { AddGroup.class, EditGroup.class }) @NotNull(message = "调试时间(小时)不能为空", groups = { AddGroup.class, EditGroup.class })
private Long debugHours; private BigDecimal debugHours;
/** /**
* *
*/ */
@NotNull(message = "运行时长(小时)不能为空", groups = { AddGroup.class, EditGroup.class }) @NotNull(message = "运行时长(小时)不能为空", groups = { AddGroup.class, EditGroup.class })
private Long runHours; private BigDecimal runHours;
/** /**
* *
*/ */
@NotNull(message = "待机时长(小时)不能为空", groups = { AddGroup.class, EditGroup.class }) @NotNull(message = "待机时长(小时)不能为空", groups = { AddGroup.class, EditGroup.class })
private Long standbyHours; private BigDecimal standbyHours;
/** /**
* *
*/ */
@NotNull(message = "故障时长(小时)不能为空", groups = { AddGroup.class, EditGroup.class }) @NotNull(message = "故障时长(小时)不能为空", groups = { AddGroup.class, EditGroup.class })
private Long faultHours; private BigDecimal faultHours;
/** /**
* *
*/ */
@NotNull(message = "关机时长(小时)不能为空", groups = { AddGroup.class, EditGroup.class }) @NotNull(message = "关机时长(小时)不能为空", groups = { AddGroup.class, EditGroup.class })
private Long shutdownHours; private BigDecimal shutdownHours;
/** /**
* = × * = ×
*/ */
@NotNull(message = "产出机时(小时)= 产量 × 工序标准机时不能为空", groups = { AddGroup.class, EditGroup.class }) @NotNull(message = "产出机时(小时)= 产量 × 工序标准机时不能为空", groups = { AddGroup.class, EditGroup.class })
private Long outputMachineHours; private BigDecimal outputMachineHours;
/** /**
* = + + * = + +
*/ */
@NotNull(message = "合计时长(小时)= 运行时长 + 待机时长 + 故障时长不能为空", groups = { AddGroup.class, EditGroup.class }) @NotNull(message = "合计时长(小时)= 运行时长 + 待机时长 + 故障时长不能为空", groups = { AddGroup.class, EditGroup.class })
private Long totalHours; private BigDecimal totalHours;
/** /**
* = ( + ) / * = ( + ) /
*/ */
@NotNull(message = "开机率 = (运行时长 + 调试时间) / 合计时长不能为空", groups = { AddGroup.class, EditGroup.class }) @NotNull(message = "开机率 = (运行时长 + 调试时间) / 合计时长不能为空", groups = { AddGroup.class, EditGroup.class })
private Long uptimeRate; private BigDecimal uptimeRate;
/** /**
* = / (++++) * = / (++++)
*/ */
@NotNull(message = "综合效率 = 产出机时 / (运行+待机+故障+关机+调试)不能为空", groups = { AddGroup.class, EditGroup.class }) @NotNull(message = "综合效率 = 产出机时 / (运行+待机+故障+关机+调试)不能为空", groups = { AddGroup.class, EditGroup.class })
private Long overallEfficiency; private BigDecimal overallEfficiency;
/** /**
* = / * = /
*/ */
@NotNull(message = "运行效率 = 产出机时 / 运行时长不能为空", groups = { AddGroup.class, EditGroup.class }) @NotNull(message = "运行效率 = 产出机时 / 运行时长不能为空", groups = { AddGroup.class, EditGroup.class })
private Long runtimeEfficiency; private BigDecimal runtimeEfficiency;
/** /**
* *

@ -1,5 +1,6 @@
package org.dromara.dms.domain.vo; package org.dromara.dms.domain.vo;
import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import org.dromara.dms.domain.DmsReportDeviceEfficiency; import org.dromara.dms.domain.DmsReportDeviceEfficiency;
@ -99,81 +100,81 @@ public class DmsReportDeviceEfficiencyVo implements Serializable {
*/ */
@ExcelProperty(value = "产量", converter = ExcelDictConvert.class) @ExcelProperty(value = "产量", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "件=") @ExcelDictFormat(readConverterExp = "件=")
private Long outputQty; private BigDecimal outputQty;
/** /**
* / * /
*/ */
@ExcelProperty(value = "工序标准机时", converter = ExcelDictConvert.class) @ExcelProperty(value = "工序标准机时", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "小=时/件") @ExcelDictFormat(readConverterExp = "小=时/件")
private Long processStdMachineHours; private BigDecimal processStdMachineHours;
/** /**
* *
*/ */
@ExcelProperty(value = "调试时间", converter = ExcelDictConvert.class) @ExcelProperty(value = "调试时间", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "小=时") @ExcelDictFormat(readConverterExp = "小=时")
private Long debugHours; private BigDecimal debugHours;
/** /**
* *
*/ */
@ExcelProperty(value = "运行时长", converter = ExcelDictConvert.class) @ExcelProperty(value = "运行时长", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "小=时") @ExcelDictFormat(readConverterExp = "小=时")
private Long runHours; private BigDecimal runHours;
/** /**
* *
*/ */
@ExcelProperty(value = "待机时长", converter = ExcelDictConvert.class) @ExcelProperty(value = "待机时长", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "小=时") @ExcelDictFormat(readConverterExp = "小=时")
private Long standbyHours; private BigDecimal standbyHours;
/** /**
* *
*/ */
@ExcelProperty(value = "故障时长", converter = ExcelDictConvert.class) @ExcelProperty(value = "故障时长", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "小=时") @ExcelDictFormat(readConverterExp = "小=时")
private Long faultHours; private BigDecimal faultHours;
/** /**
* *
*/ */
@ExcelProperty(value = "关机时长", converter = ExcelDictConvert.class) @ExcelProperty(value = "关机时长", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "小=时") @ExcelDictFormat(readConverterExp = "小=时")
private Long shutdownHours; private BigDecimal shutdownHours;
/** /**
* = × * = ×
*/ */
@ExcelProperty(value = "产出机时", converter = ExcelDictConvert.class) @ExcelProperty(value = "产出机时", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "小=时") @ExcelDictFormat(readConverterExp = "小=时")
private Long outputMachineHours; private BigDecimal outputMachineHours;
/** /**
* = + + * = + +
*/ */
@ExcelProperty(value = "合计时长", converter = ExcelDictConvert.class) @ExcelProperty(value = "合计时长", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "小=时") @ExcelDictFormat(readConverterExp = "小=时")
private Long totalHours; private BigDecimal totalHours;
/** /**
* = ( + ) / * = ( + ) /
*/ */
@ExcelProperty(value = "开机率 = (运行时长 + 调试时间) / 合计时长") @ExcelProperty(value = "开机率 = (运行时长 + 调试时间) / 合计时长")
private Long uptimeRate; private BigDecimal uptimeRate;
/** /**
* = / (++++) * = / (++++)
*/ */
@ExcelProperty(value = "综合效率 = 产出机时 / (运行+待机+故障+关机+调试)") @ExcelProperty(value = "综合效率 = 产出机时 / (运行+待机+故障+关机+调试)")
private Long overallEfficiency; private BigDecimal overallEfficiency;
/** /**
* = / * = /
*/ */
@ExcelProperty(value = "运行效率 = 产出机时 / 运行时长") @ExcelProperty(value = "运行效率 = 产出机时 / 运行时长")
private Long runtimeEfficiency; private BigDecimal runtimeEfficiency;
/** /**
* *

Loading…
Cancel
Save