zhijiezhao před 2 roky
rodič
revize
58bc515c1e

+ 13 - 11
src/main/java/com/caimei/modules/product/entity/Product.java

@@ -132,7 +132,7 @@ public class Product extends DataEntity<Product> {
     private Integer trainingMethod; //仪器培训方式:1线上培训,2线下培训
     private Integer trainingMethod; //仪器培训方式:1线上培训,2线下培训
     private Integer trainingType; //售价是否包含:1售价未包含,2售价已包含
     private Integer trainingType; //售价是否包含:1售价未包含,2售价已包含
     private BigDecimal trainingFee; //培训费用(售价未包含)
     private BigDecimal trainingFee; //培训费用(售价未包含)
-    private Integer svipFlag;	//超级会员商品标识:1是,2不是
+    private Integer svipFlag;    //超级会员商品标识:1是,2不是
     private Integer publishIdentity; //发布者身份 1,个人,2.公司
     private Integer publishIdentity; //发布者身份 1,个人,2.公司
     private String companyName; //公司名称
     private String companyName; //公司名称
     private String image1;
     private String image1;
@@ -226,7 +226,7 @@ public class Product extends DataEntity<Product> {
     private Integer searchType;
     private Integer searchType;
 
 
     /*
     /*
-    *发布类型1.二手预成交商品 2.二手估价商品
+     *发布类型1.二手预成交商品 2.二手估价商品
      */
      */
     private Integer announType;
     private Integer announType;
 
 
@@ -258,21 +258,22 @@ public class Product extends DataEntity<Product> {
 
 
     /**
     /**
      * 证书编号
      * 证书编号
+     *
      * @return
      * @return
      */
      */
-   public String qualificationNo;
+    public String qualificationNo;
 
 
     /**
     /**
-     *产品名称
+     * 产品名称
+     */
+    public String productName;
+    /*
+     *证书有效日期
      */
      */
-public String productName;
-/*
-*证书有效日期
- */
     public String qualificationTime;
     public String qualificationTime;
 
 
     /**
     /**
-     *证书有效链接
+     * 证书有效链接
      */
      */
     public String qualificationLink;
     public String qualificationLink;
 
 
@@ -291,6 +292,7 @@ public String productName;
     public void setProductName(String productName) {
     public void setProductName(String productName) {
         this.productName = productName;
         this.productName = productName;
     }
     }
+
     @JsonFormat(pattern = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd")
     public String getQualificationTime() {
     public String getQualificationTime() {
         return qualificationTime;
         return qualificationTime;
@@ -323,6 +325,7 @@ public String productName;
     public void setShowFlag(Integer showFlag) {
     public void setShowFlag(Integer showFlag) {
         this.showFlag = showFlag;
         this.showFlag = showFlag;
     }
     }
+
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     public String getShowTime() {
     public String getShowTime() {
         return showTime;
         return showTime;
@@ -333,8 +336,6 @@ public String productName;
     }
     }
 
 
 
 
-
-
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     public String getNewshowTime() {
     public String getNewshowTime() {
         return newshowTime;
         return newshowTime;
@@ -551,6 +552,7 @@ public String productName;
     public void setIds(List<Integer> ids) {
     public void setIds(List<Integer> ids) {
         this.ids = ids;
         this.ids = ids;
     }
     }
+
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
 
 
     public String getDetailInfo() {
     public String getDetailInfo() {

+ 5 - 1
src/main/resources/mappings/modules/product/ProductNewMapper.xml

@@ -107,7 +107,11 @@
         cb.name as "brandName",
         cb.name as "brandName",
         if(csp.id is not null,1,0) as "svipFlag",
         if(csp.id is not null,1,0) as "svipFlag",
         cshd.companyName as "companyName",
         cshd.companyName as "companyName",
-        cshd.publishIdentity as "publishIdentity"
+        cshd.publishIdentity as "publishIdentity",
+        a.qualificationNo,
+        a.productName,
+        a.qualificationTime,
+        a.qualificationLink
     </sql>
     </sql>
 
 
     <sql id="productJoins">
     <sql id="productJoins">