Merge branch 'master' of http://47.112.200.206:3000/shenhao/sys

src/main/java/com/ssj/bean/sys/fx/domain/Device.java

@@ -52,7 +52,12 @@ public class Device extends PersistentEntity {
     private String deviceColor;
     
 	private String deviceNumber;
-	
+
+	/**
+	 * 真实小塾号
+	 */
+	private String deviceRealNumber;
+
 	private String deviceModel;
 	 
 	private String deviceCode;
@@ -339,9 +344,14 @@ public class Device extends PersistentEntity {
 	public void setLastMerchantId(String lastMerchantId) {
 		this.lastMerchantId = lastMerchantId;
 	}
-	
-	
 
+	public String getDeviceRealNumber() {
+		return deviceRealNumber;
+	}
+
+	public void setDeviceRealNumber(String deviceRealNumber) {
+		this.deviceRealNumber = deviceRealNumber;
+	}
 }
 	
 

src/main/java/com/ssj/sys/controller/FxController.java

@@ -140,6 +140,7 @@ public class FxController  extends BaseController {
         Map<String, Object> params = new HashMap<String, Object>();
         params.put("LIKE_imei", request.getParameter("LIKE_imei")==null?"":request.getParameter("LIKE_imei"));
         params.put("LIKE_deviceNumber", request.getParameter("LIKE_deviceNumber")==null?"":request.getParameter("LIKE_deviceNumber"));
+        params.put("LIKE_deviceRealNumber", request.getParameter("LIKE_deviceRealNumber")==null?"":request.getParameter("LIKE_deviceRealNumber"));
         params.put("LIKE_deviceModel", request.getParameter("LIKE_deviceModel")==null?"":request.getParameter("LIKE_deviceModel"));
         params.put("LIKE_deviceCode", request.getParameter("LIKE_deviceCode")==null?"":request.getParameter("LIKE_deviceCode"));
         
@@ -183,6 +184,7 @@ public class FxController  extends BaseController {
         Map<String, Object> params = new HashMap<String, Object>();
         params.put("LIKE_imei", request.getParameter("LIKE_imei")==null?"":request.getParameter("LIKE_imei"));
         params.put("LIKE_deviceNumber", request.getParameter("LIKE_deviceNumber")==null?"":request.getParameter("LIKE_deviceNumber"));
+        params.put("LIKE_deviceRealNumber", request.getParameter("LIKE_deviceRealNumber")==null?"":request.getParameter("LIKE_deviceRealNumber"));
         params.put("LIKE_deviceModel", request.getParameter("LIKE_deviceModel")==null?"":request.getParameter("LIKE_deviceModel"));
         params.put("LIKE_deviceCode", request.getParameter("LIKE_deviceCode")==null?"":request.getParameter("LIKE_deviceCode"));
         
@@ -1400,6 +1402,7 @@ public class FxController  extends BaseController {
 			olddevice.setDeviceModel(device.getDeviceModel());
 			olddevice.setDeviceName(device.getDeviceName());
 			olddevice.setDeviceNumber(device.getDeviceNumber());
+			olddevice.setDeviceRealNumber(device.getDeviceRealNumber());
 			olddevice.setDeviceSn(device.getDeviceSn());
 			olddevice.setImei(device.getImei());
 			olddevice.setUpdateTime(new Date());

src/main/java/com/ssj/sys/utils/ExcelUtils.java

@@ -48,17 +48,18 @@ public class ExcelUtils {
   			device.setImei(gettxt(row.getCell(0)));
   			device.setDeviceName(gettxt(row.getCell(1)));
   			device.setDeviceColor(gettxt(row.getCell(2)));
-  			device.setDeviceNumber(gettxt(row.getCell(3)));
-  			device.setDeviceModel(gettxt(row.getCell(4)));
-  			device.setDeviceCode(gettxt(row.getCell(5)));
-  			device.setDeviceSn(gettxt(row.getCell(6)));
-  			device.setPosCode(gettxt(row.getCell(7)));
-  			device.setRemarks(gettxt(row.getCell(8)));
+  			device.setDeviceRealNumber(gettxt(row.getCell(3)));
+  			device.setDeviceNumber(gettxt(row.getCell(4)));
+  			device.setDeviceModel(gettxt(row.getCell(5)));
+  			device.setDeviceCode(gettxt(row.getCell(6)));
+  			device.setDeviceSn(gettxt(row.getCell(7)));
+  			device.setPosCode(gettxt(row.getCell(8)));
+  			device.setRemarks(gettxt(row.getCell(9)));
   			
-  			device.setEmsNumber(gettxt(row.getCell(9)));
-  			device.setEmsAddress(gettxt(row.getCell(10)));
-  			device.setEmsUsername(gettxt(row.getCell(11)));
-  			device.setEmsTelephone(gettxt(row.getCell(12)));
+  			device.setEmsNumber(gettxt(row.getCell(10)));
+  			device.setEmsAddress(gettxt(row.getCell(11)));
+  			device.setEmsUsername(gettxt(row.getCell(12)));
+  			device.setEmsTelephone(gettxt(row.getCell(13)));
   			
 			device.setIsSpan(1);
   			devices.add(device);

src/main/resources/templates/sys/fx/deviceAllList.html

@@ -36,6 +36,10 @@
 			</li>
 			
 			<li>
+				<label>真实小塾号</label>
+				<input type="text" id="imei1" name="LIKE_deviceRealNumber" th:value="${search.get('LIKE_deviceRealNumber')}" class="scinput date_width " placeholder="真实小塾号">
+			</li>
+			<li>
 				<label>小塾号</label>
 				<input type="text" id="imei1" name="LIKE_deviceNumber" th:value="${search.get('LIKE_deviceNumber')}" class="scinput date_width " placeholder="小塾号">
 			</li>
@@ -160,6 +164,7 @@
 		    <tr>
 				<th style="width: 50px;"><input id="basecheckbox"  type="checkbox"></th>
 				<th>imei号</th>
+				<th>真实小塾号</th>
 				<th>小塾号</th>
 				<th>设备型号</th>
 				<th>设备代码</th>
@@ -183,8 +188,9 @@
 			<tr th:each="item:${list}" >
 					<td ><input type="checkbox" name="imeicheckbox" class="imeicheckbox"  th:data-imei="${item.imei}" th:value="${item.id}"></td>
 					<td th:text="${item.imei}"></td>
+					<td th:text="${item.deviceRealNumber}"></td>
 					<td th:text="${item.deviceNumber}"></td>
-					
+
 					<td th:text="${item.deviceModel}"></td>
 					<td th:text="${item.deviceCode}"></td>
 					

src/main/resources/templates/sys/fx/deviceEdit.html

@@ -34,6 +34,10 @@
 				<input type="text" id="devicename" class="dfinput fl" name="devicename"  th:value="${device.deviceName}"/>
 			</li>
 			<li>
+				<label>真实小塾号：<b></b></label>
+				<input type="text" id="deviceRealNumber" class="dfinput fl" name="deviceRealNumber" th:value="${device.deviceRealNumber}"/>
+			</li>
+			<li>
 				<label>小塾号：<b></b></label>
 				<input type="text" id="devicenumber" class="dfinput fl" name="devicenumber" th:value="${device.deviceNumber}"/>
 			</li>
@@ -118,6 +122,7 @@ function push_user(){
 		            'deviceColor' : $("#devicecolor").val(),
 		            'deviceName' : $("#devicename").val(),
 		            'deviceNumber' : $("#devicenumber").val(),
+		            'deviceRealNumber' : $("#deviceRealNumber").val(),
 		            'deviceModel' : $("#devicemodel").val(),
 		            'deviceCode' : $("#devicecode").val(),
 		            'deviceSn' : $("#devicesn").val(),

src/main/resources/templates/sys/fx/deviceList.html

@@ -36,7 +36,11 @@
 				<label>IMEI号</label>
 				<input type="text" id="imei1" name="LIKE_imei" th:value="${search.get('LIKE_imei')}" class="scinput date_width " placeholder="IMEI号">
 			</li>
-			
+		  <li>
+			  <label>真实小塾号</label>
+			  <input type="text" id="imei1" name="LIKE_deviceRealNumber" th:value="${search.get('LIKE_deviceRealNumber')}" class="scinput date_width " placeholder="小塾号">
+		  </li>
+
 			<li>
 				<label>小塾号</label>
 				<input type="text" id="imei1" name="LIKE_deviceNumber" th:value="${search.get('LIKE_deviceNumber')}" class="scinput date_width " placeholder="小塾号">
@@ -163,6 +167,7 @@
 		    <tr>
 				<th style="width: 50px;"><input id="basecheckbox"  type="checkbox"></th>
 				<th>imei号</th>
+				<th>真实小塾号</th>
 				<th>小塾号</th>
 				<th>设备型号</th>
 				<th>设备代码</th>
@@ -188,8 +193,9 @@
 			<tr th:each="item:${list}" >
 					<td ><input th:if="${merchant.posCode eq item.posCode }"  type="checkbox" name="imeicheckbox" class="imeicheckbox"  th:data-imei="${item.imei}" th:data-status="${item.status}" th:value="${item.id}"></td>
 					<td th:text="${item.imei}"></td>
+					<td th:text="${item.deviceRealNumber}"></td>
 					<td th:text="${item.deviceNumber}"></td>
-					
+
 					<td th:text="${item.deviceModel}"></td>
 					<td th:text="${item.deviceCode}"></td>