Merge remote-tracking branch 'origin/develop' into develop

WebContent/WEB-INF/views/modules/airline/verifyForm.jsp

@@ -38,7 +38,7 @@
 <form:form id="inputForm" modelAttribute="verifyEntity"
            action="${ctx}${verifyEntity.verifType == '06' or verifyEntity.verifType == '07' or verifyEntity.verifType == '08' or verifyEntity.verifType == '09'?'/airline/verify/save':'/airline/connect/save' }"
            method="post" class="form-horizontal">
-    
+
     <form:hidden path="id"/>
     <sys:message content="${message}"/>
     <div class="control-group">

WebContent/WEB-INF/views/modules/contact/airportList.jsp

@@ -76,7 +76,10 @@
         </li>
         <li>
             <label>三字码：</label>
-            <form:input path="airportIata" htmlEscape="false" maxlength="50" class="input-medium" onkeyup="this.value=(this.value.toUpperCase()).replace(/[^a-zA-Z]/g,'')" />
+                <%--            <form:input path="airportIata" htmlEscape="false" maxlength="50" class="input-medium" onkeyup="this.value=(this.value.toUpperCase()).replace(/[^a-zA-Z]/g,'')" />--%>
+            <form:input path="airportIata" htmlEscape="false" maxlength="50" class="input-medium"
+                        onchange="this.value=this.value.toUpperCase()" style='text-transform: uppercase'
+                        onkeyup="this.value=this.value.replace(/[^a-zA-Z\']/g,'')"/>
         </li>
         <li>
             <label>所属城市：</label>

src/com/ejweb/modules/airline/web/VerifyController.java

 package com.ejweb.modules.airline.web;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.ConstraintViolationException;
-
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.servlet.mvc.support.RedirectAttributes;
-
 import com.ejweb.core.base.BaseController;
 import com.ejweb.core.persistence.Page;
 import com.ejweb.core.utils.DateUtils;
@@ -30,10 +11,25 @@ import com.ejweb.modules.aircraft.entity.AircraftEntity;
 import com.ejweb.modules.aircraft.service.AircraftService;
 import com.ejweb.modules.airline.entity.ConnectEntity;
 import com.ejweb.modules.airline.entity.VerifyEntity;
+import com.ejweb.modules.airline.entity.VerifyError;
 import com.ejweb.modules.airline.service.VerifyService;
 import com.ejweb.modules.contact.entity.AirportEntity;
 import com.ejweb.modules.contact.service.AirportService;
-import com.ejweb.modules.airline.entity.VerifyError;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.ConstraintViolationException;
+import java.util.ArrayList;
+import java.util.List;
 
 
 /**
@@ -48,6 +44,7 @@ import com.ejweb.modules.airline.entity.VerifyError;
 @Controller
 @RequestMapping(value = "${adminPath}/airline/verify")
 public class VerifyController extends BaseController {
+    private final Logger LOG = LoggerFactory.getLogger(VerifyController.class);
 
     @Autowired
     private VerifyService verifyService;
@@ -58,11 +55,17 @@ public class VerifyController extends BaseController {
 
     @ModelAttribute
     public VerifyEntity get(@RequestParam(required = false) String id) {
+        LOG.info("论证单ID：" + id);
+        VerifyEntity verifyEntity = null;
         if (StringUtils.isNotBlank(id)) {
-            return verifyService.get(id);
-        } else {
-            return new VerifyEntity();
+            verifyEntity = verifyService.get(id);
+            LOG.info(verifyEntity.getVerifNo());
+        }
+        if (verifyEntity == null) {
+            LOG.info("未获取到相关论证数据");
+            verifyEntity = new VerifyEntity();
         }
+        return verifyEntity;
     }
 
     @RequiresPermissions("vrf:verify:view")