diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/ExportModelJBController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/ExportModelJBController.java index d878af0dc..9c481f3b5 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/ExportModelJBController.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/ExportModelJBController.java @@ -2,9 +2,9 @@ package com.njcn.harmonic.controller; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.ObjectUtil; import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.exception.BusinessException; @@ -21,7 +21,6 @@ import com.njcn.device.pq.pojo.vo.LineDetailDataVO; import com.njcn.event.api.EventDetailFeignClient; import com.njcn.event.enums.EventResponseEnum; import com.njcn.event.pojo.param.EventCountParam; -import com.njcn.event.pojo.po.EventDetail; import com.njcn.event.pojo.po.RmpEventDetailPO; import com.njcn.harmonic.pojo.param.ReportQueryParam; import com.njcn.harmonic.pojo.po.report.EnumPass; @@ -1472,8 +1471,8 @@ public class ExportModelJBController extends BaseController { String s = value.get(i).getStartTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS")); String[] info= new String[]{(i+1)+"", s, - value.get(i).getFeatureAmplitude().toString(), - value.get(i).getDuration().toString(), + NumberUtil.round(value.get(i).getFeatureAmplitude()*100.0,2).toString(), + NumberUtil.round(value.get(i).getDuration(),2).toString(), advanceType, advanceReason, value.get(i).getSeverity().toString()}; diff --git a/pqs-harmonic/harmonic-boot/src/main/resources/file/reportModelJB.docx b/pqs-harmonic/harmonic-boot/src/main/resources/file/reportModelJB.docx index d96b3aac4..b0de482be 100644 Binary files a/pqs-harmonic/harmonic-boot/src/main/resources/file/reportModelJB.docx and b/pqs-harmonic/harmonic-boot/src/main/resources/file/reportModelJB.docx differ