From 332feba672d48b1df63396171f46eecff2c43add Mon Sep 17 00:00:00 2001
From: erzhongxmu <erzhongxmu@hotmail.com>
Date: Thu, 24 Dec 2020 23:20:34 +0800
Subject: [PATCH] =?UTF-8?q?1=E5=8F=B8=E6=9C=BA=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/TmsMdCheliangController.java   |  2 +-
 .../controller/TmsYwDingdanController.java    | 20 +++++++++++++++++--
 .../zzjee/tms/entity/TmsMdCheliangEntity.java |  4 ++--
 .../com/zzjee/tms/tmsMdCheliang-add.jsp       |  9 +++++----
 .../com/zzjee/tms/tmsMdCheliang-update.jsp    |  6 +++---
 .../com/zzjee/tms/tmsMdCheliangList.jsp       |  4 ++--
 6 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/zzjee/tms/controller/TmsMdCheliangController.java b/src/main/java/com/zzjee/tms/controller/TmsMdCheliangController.java
index 0437806c..2c6651ca 100644
--- a/src/main/java/com/zzjee/tms/controller/TmsMdCheliangController.java
+++ b/src/main/java/com/zzjee/tms/controller/TmsMdCheliangController.java
@@ -114,7 +114,7 @@ public class TmsMdCheliangController extends BaseController {
 //			}
 //
 //		}
-		cq.eq("zhuangtai","Y");
+//		cq.eq("zhuangtai","Y");
 		cq.add();
 		this.tmsMdCheliangService.getDataGridReturn(cq, true);
 		TagUtil.datagrid(response, dataGrid);
diff --git a/src/main/java/com/zzjee/tms/controller/TmsYwDingdanController.java b/src/main/java/com/zzjee/tms/controller/TmsYwDingdanController.java
index d56bd53d..2ef41a33 100644
--- a/src/main/java/com/zzjee/tms/controller/TmsYwDingdanController.java
+++ b/src/main/java/com/zzjee/tms/controller/TmsYwDingdanController.java
@@ -6,6 +6,7 @@ import com.zzjee.api.ResultDO;
 import com.zzjee.md.entity.MdGoodsEntity;
 import com.zzjee.rfid.entity.RfidBuseEntity;
 import com.zzjee.tms.entity.DdPage;
+import com.zzjee.tms.entity.TmsMdCheliangEntity;
 import com.zzjee.tms.entity.TmsMdDzEntity;
 import com.zzjee.tms.entity.TmsYwDingdanEntity;
 import com.zzjee.tms.service.TmsYwDingdanServiceI;
@@ -616,11 +617,26 @@ public class TmsYwDingdanController extends BaseController {
 			, HttpServletRequest request) {
 
 		try{
+            String hqlom = "from WmTmsNoticeHEntity where omBeizhu = ?";
+            List<WmTmsNoticeHEntity> listom = systemService.findHql(hqlom,username);
+            String sji = "siji";
+            try{
+				sji = listom.get(0).getReMember();
+			}catch (Exception e){
 
+			}
 			String hql = "from RfidBuseEntity where rfidId1 = ? order by createDate desc";
-			List<RfidBuseEntity> lista = systemService.findHql(hql,username);
+			List<RfidBuseEntity> lista = systemService.findHql(hql,sji);
 			if(lista!=null&&lista.size()>0){
-				return Result.success(lista.get(0));
+				RfidBuseEntity out = lista.get(0);
+				try{
+					TmsMdCheliangEntity tmsMdCheliangEntity = systemService.findUniqueByProperty(TmsMdCheliangEntity.class,"username",sji);
+					out.setRfidBuseno(tmsMdCheliangEntity.getZhuangtai());
+					out.setRfidBusecont(tmsMdCheliangEntity.getBeizhu());
+				}catch (Exception e){
+
+				}
+				return Result.success(out);
 			}else{
 				return Result.error("暂无司机位置");
 
diff --git a/src/main/java/com/zzjee/tms/entity/TmsMdCheliangEntity.java b/src/main/java/com/zzjee/tms/entity/TmsMdCheliangEntity.java
index 00ee0e1d..df6ac42c 100644
--- a/src/main/java/com/zzjee/tms/entity/TmsMdCheliangEntity.java
+++ b/src/main/java/com/zzjee/tms/entity/TmsMdCheliangEntity.java
@@ -57,10 +57,10 @@ public class TmsMdCheliangEntity implements java.io.Serializable {
     @Excel(name="准假驾照",width=15)
 	private String jiazhao;
 	/**是否可用*/
-    @Excel(name="是否可用",width=15,dicCode="sf_yn")
+    @Excel(name="姓名",width=15)
 	private String zhuangtai;
 	/**备注*/
-    @Excel(name="备注",width=15)
+    @Excel(name="电话",width=15)
 	private String beizhu;
 	/**默认司机*/
     @Excel(name="默认司机",width=15)
diff --git a/src/main/webapp/webpage/com/zzjee/tms/tmsMdCheliang-add.jsp b/src/main/webapp/webpage/com/zzjee/tms/tmsMdCheliang-add.jsp
index 9fa549d2..7da4ff84 100644
--- a/src/main/webapp/webpage/com/zzjee/tms/tmsMdCheliang-add.jsp
+++ b/src/main/webapp/webpage/com/zzjee/tms/tmsMdCheliang-add.jsp
@@ -50,12 +50,13 @@
 		      <span class="Validform_checktip"></span>
 		    </div>
 			<div class="form">
-		      <label class="Validform_label">是否可用:</label>
-					<t:dictSelect field="zhuangtai" type="radio"  typeGroupCode="sf_yn"   defaultVal="${tmsMdCheliangPage.zhuangtai}" hasLabel="false"  title="是否可用"></t:dictSelect>
-		      <span class="Validform_checktip"></span>
+		      <label class="Validform_label">姓名:</label>
+				<input id="zhuangtai" name="zhuangtai" type="text" style="width: 150px" class="inputxt"  ignore="ignore" />
+
+ 		      <span class="Validform_checktip"></span>
 		    </div>
 			<div class="form">
-		      <label class="Validform_label">备注:</label>
+		      <label class="Validform_label">电话:</label>
 					     	 <input id="beizhu" name="beizhu" type="text" style="width: 150px" class="inputxt"  ignore="ignore" />
 		      <span class="Validform_checktip"></span>
 		    </div>
diff --git a/src/main/webapp/webpage/com/zzjee/tms/tmsMdCheliang-update.jsp b/src/main/webapp/webpage/com/zzjee/tms/tmsMdCheliang-update.jsp
index 0a8e8dc3..5bc9f3ed 100644
--- a/src/main/webapp/webpage/com/zzjee/tms/tmsMdCheliang-update.jsp
+++ b/src/main/webapp/webpage/com/zzjee/tms/tmsMdCheliang-update.jsp
@@ -50,12 +50,12 @@
 		      <span class="Validform_checktip"></span>
 		    </div>
 			<div class="form">
-		      <label class="Validform_label">是否可用:</label>
-					<t:dictSelect field="zhuangtai" type="radio"   typeGroupCode="sf_yn"  defaultVal="${tmsMdCheliangPage.zhuangtai}" hasLabel="false"  title="是否可用"></t:dictSelect>
+		      <label class="Validform_label">姓名:</label>
+ 				<input id="zhuangtai" name="zhuangtai" type="text" style="width: 150px" class="inputxt"  ignore="ignore"  value='${tmsMdCheliangPage.zhuangtai}'/>
 		      <span class="Validform_checktip"></span>
 		    </div>
 			<div class="form">
-		      <label class="Validform_label">备注:</label>
+		      <label class="Validform_label">电话:</label>
 		     	 <input id="beizhu" name="beizhu" type="text" style="width: 150px" class="inputxt"  ignore="ignore"  value='${tmsMdCheliangPage.beizhu}'/>
 		      <span class="Validform_checktip"></span>
 		    </div>
diff --git a/src/main/webapp/webpage/com/zzjee/tms/tmsMdCheliangList.jsp b/src/main/webapp/webpage/com/zzjee/tms/tmsMdCheliangList.jsp
index 7bb8088f..a4d6b61e 100644
--- a/src/main/webapp/webpage/com/zzjee/tms/tmsMdCheliangList.jsp
+++ b/src/main/webapp/webpage/com/zzjee/tms/tmsMdCheliangList.jsp
@@ -20,8 +20,8 @@
    <t:dgCol title="载重"  field="zaizhong"  queryMode="group"  width="120"></t:dgCol>
    <t:dgCol title="载人数"  field="zairen"  queryMode="group"  width="120"></t:dgCol>
    <t:dgCol title="准驾驾照"  field="jiazhao"  query="true"  queryMode="single"  width="120"></t:dgCol>
-   <t:dgCol title="是否可用"  field="zhuangtai"  queryMode="group"  dictionary="sf_yn"  width="120"></t:dgCol>
-   <t:dgCol title="备注"  field="beizhu"  queryMode="group"  width="120"></t:dgCol>
+   <t:dgCol title="姓名"  field="zhuangtai"  queryMode="group"  width="120"></t:dgCol>
+   <t:dgCol title="电话"  field="beizhu"  queryMode="group"  width="120"></t:dgCol>
    <t:dgCol title="默认司机"  field="username"  queryMode="group"  width="120"></t:dgCol>
    <t:dgCol title="车牌号"  field="gpsid"  queryMode="group"  width="120"></t:dgCol>
    <t:dgCol title="区域"  field="quyu"  queryMode="single"  width="120"></t:dgCol>