From cc894ffd65ef7ecadf58065f74b873507fd6e55c Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 02 Dec 2021 17:18:49 +0800
Subject: [PATCH] 枪支修改

---
 src/main/java/org/springblade/modules/location/service/impl/LiveLocationServiceImpl.java |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/location/service/impl/LiveLocationServiceImpl.java b/src/main/java/org/springblade/modules/location/service/impl/LiveLocationServiceImpl.java
index fa83c3a..14798ab 100644
--- a/src/main/java/org/springblade/modules/location/service/impl/LiveLocationServiceImpl.java
+++ b/src/main/java/org/springblade/modules/location/service/impl/LiveLocationServiceImpl.java
@@ -111,11 +111,21 @@
 							locationVo.setRecordTime(gunLiveLocationVO.getDwsj());
 							locationVo.setLinkman(gunLiveLocationVO.getHwy());
 							locationVo.setCardNo(gunLiveLocationVO.getHwysfzh());
-							locationVo.setNumber(gunLiveLocationVO.getQzbh());
+							locationVo.setGunNum(gunLiveLocationVO.getQzbh());
+							locationVo.setNumber(gunLiveLocationVO.getQzxh());
 							locationVo.setQh(gunLiveLocationVO.getQh());
 							locationVo.setLongitude(gunLiveLocationVO.getDwjd().toString());
 							locationVo.setLatitude(gunLiveLocationVO.getDwwd().toString());
 							locationVo.setCompany(gunLiveLocationVO.getSzdw());
+							if (null!=gun.getIssueUnit() && !gun.getIssueUnit().equals("")){
+								locationVo.setIssueUnit(gun.getIssueUnit());
+							}
+							if (null!=gun.getIssueTime() && !gun.getIssueTime().equals("")){
+								locationVo.setIssueTime(gun.getIssueTime());
+							}
+							if (null!=gun.getValidTime() && !gun.getValidTime().equals("")){
+								locationVo.setValidTime(gun.getValidTime());
+							}
 							//存入集合
 							list.add(locationVo);
 						}

--
Gitblit v1.9.3