ClientApps/CN_Gather
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

检测开始、结束时间补充

Browse Source
This commit is contained in:
caozehui
2026-06-29 16:32:45 +08:00
parent 597f70edd1
commit 1de66ce4dc
6 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
detection/src/main/java/com/njcn/gather/device/pojo/po/PqDevSub.java
View File

@@ -62,7 +62,7 @@ public class PqDevSub {
private LocalDateTime checkStartTime;
/**
* 检测开始时间
* 检测结束时间
*/
@TableField("Check_End_Time")
private LocalDateTime checkEndTime;

10
detection/src/main/java/com/njcn/gather/device/pojo/vo/PqDevVO.java
View File

@@ -1,5 +1,6 @@
package com.njcn.gather.device.pojo.vo;
import com.baomidou.mybatisplus.annotation.TableField;
import com.njcn.gather.device.pojo.po.PqDev;
import com.njcn.gather.monitor.pojo.po.PqMonitor;
import lombok.Data;
@@ -73,9 +74,14 @@ public class PqDevVO extends PqDev {
private String checkBy;
/**
* 检测时间
* 检测开始时间
*/
private LocalDateTime checkTime;
private LocalDateTime checkStartTime;
/**
* 检测结束时间
*/
private LocalDateTime checkEndTime;
/**
* 预检测耗时

2
detection/src/main/java/com/njcn/gather/device/service/impl/PqDevServiceImpl.java
View File

@@ -660,7 +660,7 @@ public class PqDevServiceImpl extends ServiceImpl<PqDevMapper, PqDev> implements
}
pqDevVo.setRecheckNum(recheckNum);
pqDevVo.setCheckBy(userId);
pqDevVo.setCheckTime(LocalDateTime.now());
pqDevVo.setCheckEndTime(LocalDateTime.now());
pqDevCheckHistoryService.saveOrUpdateDeviceHistory(plan, pqDevVo);
}

3
detection/src/main/java/com/njcn/gather/plan/pojo/po/PqDevCheckHistory.java
View File

@@ -40,6 +40,9 @@ public class PqDevCheckHistory {
@TableField("Result")
private Integer result;
/**
* 检测结束时间
*/
@TableField("Check_Time")
private LocalDateTime checkTime;

2
detection/src/main/java/com/njcn/gather/plan/service/impl/PqDevCheckHistoryServiceImpl.java
View File

@@ -108,7 +108,7 @@ public class PqDevCheckHistoryServiceImpl extends ServiceImpl<PqDevCheckHistoryM
history.setManufacturer(device.getManufacturer());
history.setItemName(itemInfo.getItemName());
history.setResult(hasUnqualified ? 0 : 1);
history.setCheckTime(ObjectUtil.isNotNull(device.getCheckTime()) ? device.getCheckTime() : now);
history.setCheckTime(ObjectUtil.isNotNull(device.getCheckEndTime()) ? device.getCheckEndTime() : now);
history.setState(DataStateEnum.ENABLE.getCode());
history.setUpdateBy(device.getCheckBy());
history.setUpdateTime(now);

6
detection/src/main/java/com/njcn/gather/report/service/impl/PqReportServiceImpl.java
View File

@@ -2116,8 +2116,8 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
// 软件版本
baseModelMap.put(BaseReportKeyEnum.SW_VERSION.getKey(), StrUtil.isNotBlank(pqDevVO.getSoftwareVersion()) ? pqDevVO.getSoftwareVersion() : StrUtil.EMPTY);
// 调试日期
if (pqDevVO.getCheckTime() != null) {
baseModelMap.put(BaseReportKeyEnum.TEST_DATE.getKey(), DateUtil.format(pqDevVO.getCheckTime(), DatePattern.CHINESE_DATE_PATTERN));
if (pqDevVO.getCheckEndTime() != null) {
baseModelMap.put(BaseReportKeyEnum.TEST_DATE.getKey(), DateUtil.format(pqDevVO.getCheckEndTime(), DatePattern.CHINESE_DATE_PATTERN));
} else {
baseModelMap.put(BaseReportKeyEnum.TEST_DATE.getKey(), DateUtil.format(new Date(), DatePattern.CHINESE_DATE_PATTERN));
}
@@ -2161,7 +2161,7 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
// 收样日期
baseModelMap.put(BaseReportKeyEnum.ARRIVED_DATE.getKey(), Objects.isNull(pqDevVO.getArrivedDate()) ? StrPool.TAB : String.valueOf(pqDevVO.getArrivedDate()));
// 检测日期
baseModelMap.put(BaseReportKeyEnum.TEST_DATE.getKey(), Objects.isNull(pqDevVO.getCheckTime()) ? StrPool.TAB : String.valueOf(pqDevVO.getCheckTime()).substring(0, 10));
baseModelMap.put(BaseReportKeyEnum.TEST_DATE.getKey(), Objects.isNull(pqDevVO.getCheckEndTime()) ? StrPool.TAB : String.valueOf(pqDevVO.getCheckEndTime()).substring(0, 10));
baseModelMap.put(BaseReportKeyEnum.TEMPERATURE.getKey(), Objects.isNull(pqDevVO.getTemperature()) ? StrPool.TAB : pqDevVO.getTemperature().toString());
baseModelMap.put(BaseReportKeyEnum.HUMIDITY.getKey(), Objects.isNull(pqDevVO.getHumidity()) ? StrPool.TAB : pqDevVO.getHumidity().toString());
baseModelMap.put(BaseReportKeyEnum.YEAR.getKey(), DateUtil.format(new Date(), DatePattern.NORM_YEAR_PATTERN));