bugfix

src/main/java/com/caimei/modules/baike/web/CmBaikeProductController.java

@@ -116,8 +116,8 @@ public class CmBaikeProductController extends BaseController {
 		cmBaikeType.setTypeSort(cmBaikeProduct.getCommodityType());
 		cmBaikeType.setStatus(1);
 		//去除义项名，词条概述格式
-//		cmBaikeProduct.setAlias(removerFormat(cmBaikeProduct.getAlias()));
-//		cmBaikeProduct.setDiscription(removerFormat(cmBaikeProduct.getDiscription()));
+		cmBaikeProduct.setAlias(removerFormat(cmBaikeProduct.getAlias()));
+		cmBaikeProduct.setDiscription(removerFormat(cmBaikeProduct.getDiscription()));
 		// 分类列表
 		List<CmBaikeType> typeList = cmBaikeTypeService.findList(cmBaikeType);
 		// 商品类型
@@ -125,11 +125,11 @@ public class CmBaikeProductController extends BaseController {
 		// 参数列表
 		List<CmBaikeProductParam> paramList = cmBaikeProductDao.findParamList(cmBaikeProduct.getId());
 		//去除信息栏内容格式
-//		if(null!=paramList&&paramList.size()>0){
-//			for (CmBaikeProductParam cp:paramList) {
-//				cp.setContent(removerFormat(cp.getContent()));
-//			}
-//		}
+		if(null!=paramList&&paramList.size()>0){
+			for (CmBaikeProductParam cp:paramList) {
+				cp.setContent(removerFormat(cp.getContent()));
+			}
+		}
 		cmBaikeProduct.setParamList(paramList);
 		// 产品/仪器认证图片列表
 		List<String> authImageList = cmBaikeProductDao.findImageList(cmBaikeProduct.getId(), 1);
@@ -157,13 +157,13 @@ public class CmBaikeProductController extends BaseController {
 		//正文
 		List<CmBaikeTextInfo> textInfo = cmBaikeProductDao.getTextInfo(cmBaikeProduct.getId());
 		//去除正文内容格式
-//		if(null!=textInfo&&textInfo.size()>0){
-//			for (CmBaikeTextInfo ct:textInfo) {
-//				if(null!=ct.getDictionaryType()&&ct.getDictionaryType()==3){
-//					ct.setDictionaryContent(removerFormat(ct.getDictionaryContent()));
-//				}
-//			}
-//		}
+		if(null!=textInfo&&textInfo.size()>0){
+			for (CmBaikeTextInfo ct:textInfo) {
+				if(null!=ct.getDictionaryType()&&ct.getDictionaryType()==3){
+					ct.setDictionaryContent(removerFormat(ct.getDictionaryContent()));
+				}
+			}
+		}
 		cmBaikeProduct.setTextInfolist(textInfo);
 		//参考资料
 		if(StringUtils.isNotEmpty(cmBaikeProduct.getId())){
@@ -387,9 +387,7 @@ public class CmBaikeProductController extends BaseController {
 	 */
 	public String removerFormat(String chara){
 		if(StringUtils.isNotEmpty(chara)){
-			Pattern p=Pattern.compile("\\s*|\t|\r|\n");
-			Matcher m=p.matcher(chara);
-			chara=m.replaceAll("");
+			chara=chara.replaceAll("\n","<br/>");
 		}
 		return chara;
 	}
@@ -411,19 +409,19 @@ public class CmBaikeProductController extends BaseController {
 	@RequestMapping(value = "check")
 	public String checkInfo(CmBaikeProduct cmBaikeProduct,Model model) {
 		//去除义项名，词条概述格式
-//		cmBaikeProduct.setAlias(removerFormat(cmBaikeProduct.getAlias()));
-//		cmBaikeProduct.setDiscription(removerFormat(cmBaikeProduct.getDiscription()));
+		cmBaikeProduct.setAlias(removerFormat(cmBaikeProduct.getAlias()));
+		cmBaikeProduct.setDiscription(removerFormat(cmBaikeProduct.getDiscription()));
 		model.addAttribute("cmBaikeProduct", cmBaikeProduct);
 		// 商品类型
 		String commodityType = cmBaikeProduct.getCommodityType() == 1 ? "产品" : "仪器";
 		// 参数列表
 		List<CmBaikeProductParam> paramList = cmBaikeProductDao.findParamList(cmBaikeProduct.getId());
 		//去除信息栏内容格式
-//		if(null!=paramList&&paramList.size()>0){
-//			for (CmBaikeProductParam cp:paramList) {
-//				cp.setContent(removerFormat(cp.getContent()));
-//			}
-//		}
+		if(null!=paramList&&paramList.size()>0){
+			for (CmBaikeProductParam cp:paramList) {
+				cp.setContent(removerFormat(cp.getContent()));
+			}
+		}
 		cmBaikeProduct.setParamList(paramList);
 		// 产品/仪器认证图片列表
 		List<String> authImageList = cmBaikeProductDao.findImageList(cmBaikeProduct.getId(), 1);
@@ -442,13 +440,13 @@ public class CmBaikeProductController extends BaseController {
 		//正文
 		List<CmBaikeTextInfo> textInfo = cmBaikeProductDao.getTextInfo(cmBaikeProduct.getId());
 		//去除正文内容格式
-//		if(null!=textInfo&&textInfo.size()>0){
-//			for (CmBaikeTextInfo ct:textInfo) {
-//				if(null!=ct.getDictionaryType()&&ct.getDictionaryType()==3){
-//					ct.setDictionaryContent(removerFormat(ct.getDictionaryContent()));
-//				}
-//			}
-//		}
+		if(null!=textInfo&&textInfo.size()>0){
+			for (CmBaikeTextInfo ct:textInfo) {
+				if(null!=ct.getDictionaryType()&&ct.getDictionaryType()==3){
+					ct.setDictionaryContent(removerFormat(ct.getDictionaryContent()));
+				}
+			}
+		}
 		cmBaikeProduct.setTextInfolist(textInfo);
 		//参考资料
 		if(StringUtils.isNotEmpty(cmBaikeProduct.getId())){
@@ -516,8 +514,8 @@ public class CmBaikeProductController extends BaseController {
 	@RequestMapping(value = "toAuditPage")
 	public String toAuditPage(CmBaikeProduct cmBaikeProduct,Model model) {
 		//去除义项名，词条概述格式
-//		cmBaikeProduct.setAlias(removerFormat(cmBaikeProduct.getAlias()));
-//		cmBaikeProduct.setDiscription(removerFormat(cmBaikeProduct.getDiscription()));
+		cmBaikeProduct.setAlias(removerFormat(cmBaikeProduct.getAlias()));
+		cmBaikeProduct.setDiscription(removerFormat(cmBaikeProduct.getDiscription()));
         model.addAttribute("cmBaikeProduct", cmBaikeProduct);
         cmBaikeProduct.setPublishSource(2);
         // 商品类型
@@ -525,11 +523,11 @@ public class CmBaikeProductController extends BaseController {
         // 参数列表
         List<CmBaikeProductParam> paramList = cmBaikeProductDao.findParamList(cmBaikeProduct.getId());
 		//去除信息栏内容格式
-//		if(null!=paramList&&paramList.size()>0){
-//			for (CmBaikeProductParam cp:paramList) {
-//				cp.setContent(removerFormat(cp.getContent()));
-//			}
-//		}
+		if(null!=paramList&&paramList.size()>0){
+			for (CmBaikeProductParam cp:paramList) {
+				cp.setContent(removerFormat(cp.getContent()));
+			}
+		}
         cmBaikeProduct.setParamList(paramList);
         // 产品/仪器认证图片列表
         List<String> authImageList = cmBaikeProductDao.findImageList(cmBaikeProduct.getId(), 1);
@@ -561,13 +559,13 @@ public class CmBaikeProductController extends BaseController {
 		//正文
 		List<CmBaikeTextInfo> textInfo = cmBaikeProductDao.getTextInfo(cmBaikeProduct.getId());
 		//去除正文内容格式
-//		if(null!=textInfo&&textInfo.size()>0){
-//			for (CmBaikeTextInfo ct:textInfo) {
-//				if(null!=ct.getDictionaryType()&&ct.getDictionaryType()==3){
-//					ct.setDictionaryContent(removerFormat(ct.getDictionaryContent()));
-//				}
-//			}
-//		}
+		if(null!=textInfo&&textInfo.size()>0){
+			for (CmBaikeTextInfo ct:textInfo) {
+				if(null!=ct.getDictionaryType()&&ct.getDictionaryType()==3){
+					ct.setDictionaryContent(removerFormat(ct.getDictionaryContent()));
+				}
+			}
+		}
 		cmBaikeProduct.setTextInfolist(textInfo);
 		//参考资料
 		if(StringUtils.isNotEmpty(cmBaikeProduct.getId())){

src/main/webapp/WEB-INF/views/modules/baikePage/auditBaikeProductPage.jsp

@@ -931,7 +931,7 @@
 <body>
 <ul class="nav nav-tabs">
 	<li><a href="${ctx}/baike/cmBaikeProduct/?commodityType=${cmBaikeProduct.commodityType}">采美词条</a></li>
-	<li class="active"><a id="createEntryGuidance"  href="${ctx}/baike/cmBaikeProduct/form?id=${cmBaikeProduct.id}&commodityType=${cmBaikeProduct.commodityType}">${not empty cmBaikeProduct.id?'编辑':'添加'}</a></li>
+	<li class="active"><a id="createEntryGuidance"  href="${ctx}/baike/cmBaikeProduct/form?id=${cmBaikeProduct.id}&commodityType=${cmBaikeProduct.commodityType}">${not empty cmBaikeProduct.id?'审核':'添加'}</a></li>
 </ul><br/>
 <%--	<div>--%>
 <%--		<button onclick="showlog_result(true,'展示正确内容的弹框')">展示正确弹框</button>--%>
@@ -1376,7 +1376,7 @@
 	<div class="control-group">
 		<label class="control-label keyClass">浏览量：</label>
 		<div class="controls">
-			<form:input path="basePv" htmlEscape="false" onkeyup="onlynum(this)" class="input-xlarge  digits " readonly="true"/>
+			<form:input path="actualPv" htmlEscape="false" onkeyup="onlynum(this)" class="input-xlarge  digits " readonly="true"/>
 		</div>
 	</div>
 	<div class="control-group">

src/main/webapp/WEB-INF/views/modules/baikePage/checkBaikePage.jsp

@@ -931,7 +931,7 @@
 <body>
 <ul class="nav nav-tabs">
 	<li><a href="${ctx}/baike/cmBaikeProduct/?commodityType=${cmBaikeProduct.commodityType}">采美词条</a></li>
-	<li class="active"><a id="createEntryGuidance"  href="${ctx}/baike/cmBaikeProduct/form?id=${cmBaikeProduct.id}&commodityType=${cmBaikeProduct.commodityType}">${not empty cmBaikeProduct.id?'编辑':'添加'}</a></li>
+	<li class="active"><a id="createEntryGuidance"  href="${ctx}/baike/cmBaikeProduct/form?id=${cmBaikeProduct.id}&commodityType=${cmBaikeProduct.commodityType}">${not empty cmBaikeProduct.id?'查看':'添加'}</a></li>
 </ul><br/>
 <%--	<div>--%>
 <%--		<button onclick="showlog_result(true,'展示正确内容的弹框')">展示正确弹框</button>--%>
@@ -1183,8 +1183,9 @@
 	<div class="control-group">
 		<label class="control-label">词条名称：</label>
 		<div class="controls">
-			<form:input path="name" htmlEscape="false" class="input-xlarge "/>
-			<label id="nameSensitiveWords" class="red"></label>
+			${cmBaikeProduct.name}
+<%--			<form:input path="name" htmlEscape="false" class="input-xlarge "/>--%>
+<%--			<label id="nameSensitiveWords" class="red"></label>--%>
 		</div>
 	</div>
 	<%--义项名--%>
@@ -1272,7 +1273,7 @@
 	<%--信息栏--%>
 	<div class="control-group paramList" id="paramList">
 		<label class="control-label titleClass">信息栏:（注：未填写的信息将不会显示在词条页上）</label>
-		<div class="controls add-button"><button class="btn btn-primary" type="button">增加信息项</button></div>
+<%--		<div class="controls add-button"><button class="btn btn-primary" type="button">增加信息项</button></div>--%>
 		<div class="controls param-controls not-overflow"></div>
 	</div>
 	<%--正文--%>
@@ -1298,8 +1299,8 @@
 						<span class="del">${videoFile.websiteName}.</span>
 						<span class="del">${videoFile.publishTime}.</span>
 						<span class="del">${videoFile.acitationTime}.</span>
-						<a class="del" style="margin-left: 12px" onclick="upMaterial(${videoFile.id})">编辑</a>
-						<a onclick="delMaterial(${videoFile.id})">删除</a>
+<%--						<a class="del" style="margin-left: 12px" onclick="upMaterial(${videoFile.id})">编辑</a>--%>
+<%--						<a onclick="delMaterial(${videoFile.id})">删除</a>--%>
 					</div>
 				</c:if>
 				<c:if test="${videoFile.referenceType eq '2'}">
@@ -1311,8 +1312,8 @@
 						<span class="del">${videoFile.press}.</span>
 						<span class="del">${videoFile.publicationYear}.</span>
 						<span class="del">${videoFile.acitationWeb}.</span>
-						<a class="del" style="margin-left: 12px" onclick="upMaterial(${videoFile.id})">编辑</a>
-						<a onclick="delMaterial(${videoFile.id})">删除</a>
+<%--						<a class="del" style="margin-left: 12px" onclick="upMaterial(${videoFile.id})">编辑</a>--%>
+<%--						<a onclick="delMaterial(${videoFile.id})">删除</a>--%>
 					</div>
 				</c:if>
 				<c:if test="${videoFile.referenceType eq '3'}">
@@ -1325,8 +1326,8 @@
 								<img id="imgaa"  src="${videoFile.imageUrl}" height="50px" width="50px" ></input>
 							</div>
 							--%>
-						<a class="del" style="margin-left: 12px" onclick="upMaterial(${videoFile.id})">编辑</a>
-						<a onclick="delMaterial(${videoFile.id})">删除</a>
+<%--						<a class="del" style="margin-left: 12px" onclick="upMaterial(${videoFile.id})">编辑</a>--%>
+<%--						<a onclick="delMaterial(${videoFile.id})">删除</a>--%>
 					</div>
 				</c:if>
 			</c:forEach>
@@ -1360,46 +1361,38 @@
 	<div class="control-group">
 		<label class="control-label">SEO关键词：</label>
 		<div class="auto-input">
-			<form:input cssStyle="margin-left: 20px" path="seoKeyword" htmlEscape="false" style="position: relative" class="input-xlarge"/>
+			<form:input cssStyle="margin-left: 20px" path="seoKeyword" htmlEscape="false" style="position: relative" class="input-xlarge" readonly="true"/>
 		</div>
 	</div>
-	<%--关联供应商--%>
+	<%--基础浏览量--%>
 	<div class="control-group">
-		<label class="control-label">关联供应商：</label>
+		<label class="control-label keyClass">浏览量：</label>
 		<div class="controls">
-			<form:select path="shopId" class="input-xlarge ">
-				<form:option value="" label="请选择供应商"/>
-				<form:options items="${cmBaikeProduct.shopList}" class="input-xlarge" itemLabel="name" itemValue="shopID" htmlEscape="false"/>
-			</form:select>
+			<form:input path="actualPv" htmlEscape="false" onkeyup="onlynum(this)" class="input-xlarge  digits " readonly="true"/>
 		</div>
 	</div>
-	<%--发布时间--%>
 	<div class="control-group">
-		<label class="control-label keyClass">发布时间：</label>
+		<label class="control-label keyClass">供应商：</label>
 		<div class="controls">
-			<input name="publishTime" type="text" readonly="readonly" maxlength="20" class="input-medium Wdate "
-				   value="<fmt:formatDate value="${cmBaikeProduct.publishTime}" pattern="yyyy-MM-dd HH:mm:ss"/>"
-				   onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm',isShowClear:false});"/>
+				${cmBaikeProduct.shopName}
 		</div>
 	</div>
-	<%--基础浏览量--%>
 	<div class="control-group">
-		<label class="control-label keyClass">基础浏览量：</label>
+		<label class="control-label keyClass">审核：</label>
 		<div class="controls">
-			<form:input path="basePv" htmlEscape="false" onkeyup="onlynum(this)" class="input-xlarge  digits "/>
+			<input type="radio" name="auditStatus" value="2" onclick="updateAuditStatus(2)" ${empty cmBaikeProduct.auditStatus?'checked=checked':cmBaikeProduct.auditStatus eq 1?'checked=checked':''}> 审核通过
+			<input type="radio" name="auditStatus" value="3" onclick="updateAuditStatus(3)" ${cmBaikeProduct.auditStatus eq 3?'checked=checked':''}> 审核失败
 		</div>
 	</div>
-	<%--状态--%>
-	<div class="control-group">
-		<label class="control-label keyClass">状态：</label>
+	<div class="control-group" id="failReasonDiv" style="${empty cmBaikeProduct.auditStatus or cmBaikeProduct.auditStatus eq 1?'display: none':''}">
+		<label class="control-label"><font color="red">*</font>失败原因</label>
 		<div class="controls">
-			<form:radiobutton path="status" label="发布" value="1" checked="${empty cmBaikeProduct.status?'checked':''}"/>
-			<form:radiobutton path="status" label="保存草稿箱" value="0"/>
+			<textarea type="text" id="failReason" name="failReason" required style="width: 400px;height: 90px">${cmBaikeProduct.failReason}</textarea>
 		</div>
 	</div>
 	<%--提交数据 --%>
 	<div class="form-actions">
-		<input id="btnSubmit" class="btn btn-primary" type="submit" value="保 存"/>&nbsp;
+<%--		<input id="btnSubmit" class="btn btn-primary" type="submit" value="保 存"/>&nbsp;--%>
 		<input id="btnCancel" class="btn" type="button" value="返 回" onclick="history.go(-1)"/>
 	</div>
 </form:form>
@@ -2070,6 +2063,14 @@
 			buttons: {"关闭": '-1'}
 		});
 	}
+	function updateAuditStatus(auditStatus) {
+		var elementById = document.getElementById("failReasonDiv");
+		if (auditStatus === 2) {
+			elementById.style.cssText = "display:none";
+		} else {
+			elementById.style.cssText = "";
+		}
+	}
 	//关键词联动
 	function autocomplete(text) {
 		var keywordlist=new Array();