关键词

src/main/java/com/caimei/modules/info/entity/Info.java

@@ -11,7 +11,7 @@ import com.thinkgem.jeesite.common.persistence.DataEntity;
  * @version 2016-06-27
  */
 public class Info extends DataEntity<Info> {
-	
+
 	private static final long serialVersionUID = 1L;
 	private InfoType infoType;		// 信息分类
 	private String title;		// 标题
@@ -44,6 +44,7 @@ public class Info extends DataEntity<Info> {
 	private Integer auditFlag;		// 是否审核保存，1是
 	private String relatedLabels; //关联标签库
 	private String labelIds;
+	private String isRelevance;
 
 	public Info() {
 		super();
@@ -80,11 +81,11 @@ public class Info extends DataEntity<Info> {
 	public InfoType getInfoType() {
 		return infoType;
 	}
-	
+
 	public void setInfoType(InfoType infoType) {
 		this.infoType = infoType;
 	}
-	
+
 	public String getTitle() {
 		return title;
 	}
@@ -92,7 +93,7 @@ public class Info extends DataEntity<Info> {
 	public void setTitle(String title) {
 		this.title = title;
 	}
-	
+
 	public String getLabel() {
 		return label;
 	}
@@ -100,7 +101,7 @@ public class Info extends DataEntity<Info> {
 	public void setLabel(String label) {
 		this.label = label;
 	}
-	
+
 	public String getPublisher() {
 		return publisher;
 	}
@@ -108,7 +109,7 @@ public class Info extends DataEntity<Info> {
 	public void setPublisher(String publisher) {
 		this.publisher = publisher;
 	}
-	
+
 	public String getSource() {
 		return source;
 	}
@@ -132,7 +133,7 @@ public class Info extends DataEntity<Info> {
 	public void setRecommendContent(String recommendContent) {
 		this.recommendContent = recommendContent;
 	}
-	
+
 	public String getInfoContent() {
 		return infoContent;
 	}
@@ -140,7 +141,7 @@ public class Info extends DataEntity<Info> {
 	public void setInfoContent(String infoContent) {
 		this.infoContent = infoContent;
 	}
-	
+
 	public String getGuidanceImage() {
 		return guidanceImage;
 	}
@@ -165,7 +166,7 @@ public class Info extends DataEntity<Info> {
 	public void setPubdate(Date pubdate) {
 		this.pubdate = pubdate;
 	}
-	
+
 	public String getRecommendStatus() {
 		return recommendStatus;
 	}
@@ -173,7 +174,7 @@ public class Info extends DataEntity<Info> {
 	public void setRecommendStatus(String recommendStatus) {
 		this.recommendStatus = recommendStatus;
 	}
-	
+
 	public Long getBasePraise() {
 		return basePraise;
 	}
@@ -181,7 +182,7 @@ public class Info extends DataEntity<Info> {
 	public void setBasePraise(Long basePraise) {
 		this.basePraise = basePraise;
 	}
-	
+
 	public Long getRealPraise() {
 		return realPraise;
 	}
@@ -301,4 +302,12 @@ public class Info extends DataEntity<Info> {
 	public void setOnlineStatus(Integer onlineStatus) {
 		this.onlineStatus = onlineStatus;
 	}
-}
+
+	public String getIsRelevance() {
+		return isRelevance;
+	}
+
+	public void setIsRelevance(String isRelevance) {
+		this.isRelevance = isRelevance;
+	}
+}

src/main/java/com/caimei/modules/order/service/NewOrderService.java

@@ -2761,7 +2761,7 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
     }
 
     public String productDataVerification(Integer orderID,String firstClubType) {
-        String mes = "";
+        String mes = null;
         List<NewOrderProduct> productList = newOrderProductDao.findListProductOrderID(orderID);
         if (!"1".equals(firstClubType)) {
             for (NewOrderProduct product : productList) {

src/main/resources/mappings/modules/info/InfoMapper.xml

@@ -124,6 +124,14 @@
 			</if>
 			<if test="endPubDate != null and endPubDate != ''">
 				AND a.pubdate <![CDATA[   <=  ]]> #{endPubDate}
+			</if>
+			<if test="isRelevance != null and isRelevance != ''">
+				<if test="isRelevance == 1">
+					AND a.labelIds IS NOT NULL
+				</if>
+				<if test="isRelevance == 2">
+					AND a.labelIds IS NULL
+				</if>
 			</if>
 				<!--  AND b.enabledStatus='1' -->
 		</where>

src/main/webapp/WEB-INF/views/modules/info/infoList.jsp

@@ -216,6 +216,14 @@
 				<form:option value="1" label="是"/>
 				<form:option value="0" label="否"/>
 			</form:select>
+			<div class="item">
+				<label>关联标签库：</label>
+				<form:select path="isRelevance" class="input-medium">
+					<form:option value="" label="请选择"/>
+					<form:option value="1" label="已关联"/>
+					<form:option value="2" label="未关联"/>
+				</form:select>
+			</div>
 			&nbsp;&nbsp;<input id="btnSubmit" class="btn btn-primary" type="submit" value="查询"/>
 			<div class="clearfix"></div>
 		</div>
@@ -237,6 +245,7 @@
 				<%--<th>优先级</th>--%>
 				<th>发布时间</th>
 				<th>添加时间</th>
+				<th>关联标签库</th>
 				<th>推荐状态</th>
 				<th>状态</th>
 				<shiro:hasPermission name="info:info:edit"><th>操作</th></shiro:hasPermission>
@@ -266,6 +275,14 @@
 				<%--<td>${empty info.priorityIndex?0:(info.priorityIndex)}</td>--%>
 				<td><fmt:formatDate value="${info.pubdate}" pattern="yyyy-MM-dd HH:mm"/></td>
 				<td><fmt:formatDate value="${info.createDate}" pattern="yyyy-MM-dd HH:mm:ss"/></td>
+				<td>
+					<c:if test="${!empty info.labelIds}">
+						已关联
+					</c:if>
+					<c:if test="${empty info.labelIds}">
+						未关联
+					</c:if>
+				</td>
 				<td>
 					<c:if test="${info.recommendStatus eq 1 }">
 						<a href="javascript:void(0);" onclick="updateStatus('0','${info.id}','recommendStatus','${info.enabledStatus}');" >

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

@@ -357,7 +357,7 @@
                 </select>&nbsp;&nbsp;&nbsp;&nbsp;
                 <c:if test="${!empty product.keywords}">
                     <span style="display: inline-block; width: 120px">供应商关联标签：（${product.shopName}）</span>
-                    <span><textarea rows="5" style="width: 750px;">${product.keywords}</textarea></span>
+                    <span><textarea rows="6" style="width: 700px;">${product.keywords}</textarea></span>
                 </c:if>
             </td>
         </tr>

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

@@ -703,10 +703,8 @@
                                    onclick="auditThis(${product.id},'${product.brand.name}','${product.brand.status}','${product.costCheckFlag}','${product.costPrice}','${product.sqlCostProportional}','${product.newvalidFlag}','${product.showTime}','${product.addTime}','${product.newProductType}')">上架审核</a>
                             </c:if>
                             <c:if test="${product.newProductType eq 1 &&  product.newvalidFlag != 1 && product.validFlag == 2}"><a
-                                    class="red" href="javascript:void(0);"
-                                    onclick="auditThis(${product.id},'${product.brand.name}','${product.brand.status}','${product.costCheckFlag}','${product.costPrice}','${product.sqlCostProportional}','${product.newvalidFlag}','${product.showTime}','${product.addTime}','${product.newProductType}','${product.validFlag}')">新品展示审核</a></c:if>
                                     href="javascript:void(0);"
-                                    onclick="auditThis(${product.id},'${product.brand.name}','${product.brand.status}','${product.costCheckFlag}','${product.costPrice}','${product.costProportional}','${product.newvalidFlag}','${product.showTime}','${product.addTime}','${product.newProductType}','${product.validFlag}')">新品展示审核</a><br></c:if>
+                                    onclick="auditThis(${product.id},'${product.brand.name}','${product.brand.status}','${product.costCheckFlag}','${product.costPrice}','${product.sqlCostProportional}','${product.newvalidFlag}','${product.showTime}','${product.addTime}','${product.newProductType}','${product.validFlag}')">新品展示审核</a></c:if>
                             <c:if test="${product.validFlag ne 10 && product.validFlag ne 1 && product.validFlag ne 8}">
                                 <a class="red" href="javascript:void(0);"
                                    onclick="validChange(${product.id}, 10)">冻结</a>