From 5dccf0dc687dfef1c91936af3cea06fe0609b918 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 11 十二月 2024 17:31:11 +0800
Subject: [PATCH] osd时间bug、离线工单bug等
---
ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/MonitorQualifyResult.java | 50 +++++++++++++++++++++++++-------------------------
1 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/MonitorQualifyResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/MonitorQualifyResult.java
index 3c48e69..b22f45d 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/MonitorQualifyResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/MonitorQualifyResult.java
@@ -108,31 +108,31 @@
public static MonitorQualifyResultVO getVO(MonitorQualifyResult result) {
MonitorQualifyResultVO vo = new MonitorQualifyResultVO();
- vo.setCivilCode(result.getCivilCode().getShowValue());
- vo.setCivilCodeError(result.getCivilCode().getError());
- vo.setIp(result.getIp().getShowValue());
- vo.setIpError(result.getIp().getError());
- vo.setIntegratedDevice(result.getIntegrated_device().getShowValue());
- vo.setIntegratedDeviceError(result.getIntegrated_device().getError());
- vo.setJkdwlx(result.getJkdwlx().getShowValue());
- vo.setJkdwlxError(result.getJkdwlx().getError());
- vo.setLatitude(result.getLatitude().getShowValue());
- vo.setLatitudeError(result.getLatitude().getError());
- vo.setLongitude(result.getLongitude().getShowValue());
- vo.setLongitudeError(result.getLongitude().getError());
- vo.setMacdz(result.getMacdz().getShowValue());
- vo.setMacdzError(result.getMacdz().getError());
- vo.setName(result.getName().getShowValue());
- vo.setNameError(result.getName().getError());
- vo.setSbzt(result.getSbzt().getShowValue());
- vo.setSbztError(result.getSbzt().getError());
- vo.setSerialNumber(result.getSerialNumber().getShowValue());
- vo.setSerialNumberError(result.getSerialNumber().getError());
- vo.setSxjcjqy(result.getSxjcjqy().getShowValue());
- vo.setSxjcjqyError(result.getSxjcjqy().getError());
- vo.setSxjgnlx(result.getSxjgnlx().getShowValue());
- vo.setSxjgnlxError(result.getSxjgnlx().getError());
- if (result.getNewDevice()) {
+ vo.setCivilCode(result.getCivilCode()!=null?result.getCivilCode().getShowValue():"");
+ vo.setCivilCodeError(result.getCivilCode()!=null?result.getCivilCode().getError():Boolean.FALSE);
+ vo.setIp(result.getIp()!=null?result.getIp().getShowValue():"");
+ vo.setIpError(result.getIp()!=null?result.getIp().getError():Boolean.FALSE);
+ vo.setIntegratedDevice(result.getIntegrated_device()!=null?result.getIntegrated_device().getShowValue():"");
+ vo.setIntegratedDeviceError(result.getIntegrated_device()!=null?result.getIntegrated_device().getError():Boolean.FALSE);
+ vo.setJkdwlx(result.getJkdwlx()!=null?result.getJkdwlx().getShowValue():"");
+ vo.setJkdwlxError(result.getJkdwlx()!=null?result.getJkdwlx().getError():Boolean.FALSE);
+ vo.setLatitude(result.getLatitude()!=null?result.getLatitude().getShowValue():"");
+ vo.setLatitudeError(result.getLatitude()!=null?result.getLatitude().getError():Boolean.FALSE);
+ vo.setLongitude(result.getLongitude()!=null?result.getLongitude().getShowValue():"");
+ vo.setLongitudeError(result.getLongitude()!=null?result.getLongitude().getError():Boolean.FALSE);
+ vo.setMacdz(result.getMacdz()!=null?result.getMacdz().getShowValue():"");
+ vo.setMacdzError(result.getMacdz()!=null?result.getMacdz().getError():Boolean.FALSE);
+ vo.setName(result.getName()!=null?result.getName().getShowValue():"");
+ vo.setNameError(result.getName()!=null?result.getName().getError():Boolean.FALSE);
+ vo.setSbzt(result.getSbzt()!=null?result.getSbzt().getShowValue():"");
+ vo.setSbztError(result.getSbzt()!=null?result.getSbzt().getError():Boolean.FALSE);
+ vo.setSerialNumber(result.getSerialNumber()!=null?result.getSerialNumber().getShowValue():"");
+ vo.setSerialNumberError(result.getSerialNumber()!=null?result.getSerialNumber().getError():Boolean.FALSE);
+ vo.setSxjcjqy(result.getSxjcjqy()!=null?result.getSxjcjqy().getShowValue():"");
+ vo.setSxjcjqyError(result.getSxjcjqy()!=null?result.getSxjcjqy().getError():Boolean.FALSE);
+ vo.setSxjgnlx(result.getSxjgnlx()!=null?result.getSxjgnlx().getShowValue():"");
+ vo.setSxjgnlxError(result.getSxjgnlx()!=null?result.getSxjgnlx().getError():Boolean.FALSE);
+ if (result.getNewDevice()!=null && result.getNewDevice()) {
vo.setNewDevice("鏄�");
} else {
vo.setNewDevice("鍚�");
--
Gitblit v1.8.0