bugfix

src/main/java/com/caimei/modules/product/dao/ProductDao.java

@@ -151,6 +151,8 @@ public interface ProductDao extends CrudDao<Product> {
 
     ProductDetailInfo queryProductDetailInfo(@Param("productID") Integer productID);
 
+    Product qualification(@Param("productID") Integer productID);
+
     List<ProductLadderPrice> findProductLadderPrice(@Param("productId") Integer productId, @Param("userType") Integer userType);
 
     void updateByPrimaryKeySelective(Product product);

src/main/java/com/caimei/modules/product/entity/Product.java

@@ -269,7 +269,7 @@ public String productName;
 /*
 *证书有效日期
  */
-    public Date qualificationTime;
+    public String qualificationTime;
 
     /**
      *证书有效链接
@@ -291,12 +291,12 @@ public String productName;
     public void setProductName(String productName) {
         this.productName = productName;
     }
-
-    public Date getQualificationTime() {
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    public String getQualificationTime() {
         return qualificationTime;
     }
 
-    public void setQualificationTime(Date qualificationTime) {
+    public void setQualificationTime(String qualificationTime) {
         this.qualificationTime = qualificationTime;
     }
 

src/main/java/com/caimei/modules/product/service/ProductService.java

@@ -346,6 +346,10 @@ public class ProductService extends CrudService<ProductDao, Product> {
         return productDao.queryProductDetailInfo(productID);
     }
 
+    public Product qualification(Integer productID){
+        return productDao.qualification(productID);
+    }
+
     public List<ProductLadderPrice> findLadderPrice(Integer productID) {
         // userType用户类型，1游客，2普通用户，3会员用户
         return productDao.findProductLadderPrice(productID, 3);

src/main/java/com/caimei/modules/product/web/ProductNewController.java

@@ -296,6 +296,11 @@ public class ProductNewController extends BaseController {
     public String editProduct(Product product, Model model) {
         if (null != product.getProductID()) {
             ProductDetailInfo productDetailInfo = productService.getProductDetailInfo(product.getProductID());
+            Product produ=productService.qualification(product.getProductID());
+            product.setQualificationLink(produ.getQualificationLink());
+            product.setQualificationNo(produ.getQualificationNo());
+            product.setQualificationTime(produ.getQualificationTime());
+            product.setProductName(produ.getProductName());
             List<ProductLadderPrice> ladderPriceList = productService.findLadderPrice(product.getProductID());
             if (null != productDetailInfo) {
                 product.setDetailInfo(productDetailInfo.getDetailInfo());

src/main/resources/mappings/modules/product/ProductNewMapper.xml

@@ -6,6 +6,7 @@
         <result property="name" column="name"/>
     </resultMap>
     <sql id="productColumns">
+
         a.newvalidFlag,
       ifnull(a.newProductType,2) as newProductType,
         ifnull(a.announType,1) as announType,

src/main/webapp/WEB-INF/views/modules/product-new/productEdit.jsp

@@ -531,18 +531,24 @@
             </td>
         </tr>
         </c:if>
+        <c:if test="${product.productType ==2}">
         <tr class="machineType">
             <th><span class="red">*</span>产品名称：</th>
             <td colspan="2">
                 <form:input path="productName" maxlength="80" class="input-small required"/>
             </td>
         </tr>
+        </c:if>
+        <c:if test="${product.productType ==2}">
         <tr class="machineType">
             <th><span class="red">*</span>证书有效期：</th>
             <td colspan="3">
-                <form:input path="qualificationTime" type="text" maxlength="20" class="input-medium Wdate" value="" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/>
+                <form:input path="qualificationTime" type="text" maxlength="20" class="input-medium Wdate" value="${product.qualificationTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false});"/>
+<%--    <fmt:formatDate value="${product.qualificationTime}" pattern="yyyy-MM-dd"/>--%>
             </td>
         </tr>
+        </c:if>
+        <c:if test="${product.productType ==2}">
         <tr class="machineType">
             <th><span class="red">*</span>证书基本信息链接：</th>
             <td colspan="4">
@@ -550,7 +556,7 @@
                             class="input-small required"/>
             </td>
         </tr>
-
+        </c:if>
 
         <tr>
             <th><span class="red">*</span>市场价：</th>