소스 검색

百科/文章优化part4

Aslee 3 년 전
부모
커밋
66bd16c345

+ 0 - 12
src/main/java/com/caimei/modules/baike/entity/CmBaikeProduct.java

@@ -84,7 +84,6 @@ public class CmBaikeProduct extends DataEntity<CmBaikeProduct> {
 		this.commodityType = commodityType;
 	}
 	
-	@Length(min=0, max=50, message="名称长度必须介于 0 和 50 之间")
 	public String getName() {
 		return name;
 	}
@@ -93,7 +92,6 @@ public class CmBaikeProduct extends DataEntity<CmBaikeProduct> {
 		this.name = name;
 	}
 	
-	@Length(min=0, max=50, message="别名长度必须介于 0 和 50 之间")
 	public String getAlias() {
 		return alias;
 	}
@@ -102,7 +100,6 @@ public class CmBaikeProduct extends DataEntity<CmBaikeProduct> {
 		this.alias = alias;
 	}
 	
-	@Length(min=0, max=300, message="描述长度必须介于 0 和 300 之间")
 	public String getDiscription() {
 		return discription;
 	}
@@ -119,7 +116,6 @@ public class CmBaikeProduct extends DataEntity<CmBaikeProduct> {
 		this.image = image;
 	}
 	
-	@Length(min=0, max=500, message="优点长度必须介于 0 和 500 之间")
 	public String getAdvantage() {
 		return advantage;
 	}
@@ -128,7 +124,6 @@ public class CmBaikeProduct extends DataEntity<CmBaikeProduct> {
 		this.advantage = advantage;
 	}
 	
-	@Length(min=0, max=500, message="缺点长度必须介于 0 和 500 之间")
 	public String getDisadvantage() {
 		return disadvantage;
 	}
@@ -137,7 +132,6 @@ public class CmBaikeProduct extends DataEntity<CmBaikeProduct> {
 		this.disadvantage = disadvantage;
 	}
 	
-	@Length(min=0, max=500, message="原理长度必须介于 0 和 500 之间")
 	public String getPrinciple() {
 		return principle;
 	}
@@ -146,7 +140,6 @@ public class CmBaikeProduct extends DataEntity<CmBaikeProduct> {
 		this.principle = principle;
 	}
 	
-	@Length(min=0, max=50, message="品牌长度必须介于 0 和 50 之间")
 	public String getBrand() {
 		return brand;
 	}
@@ -155,7 +148,6 @@ public class CmBaikeProduct extends DataEntity<CmBaikeProduct> {
 		this.brand = brand;
 	}
 	
-	@Length(min=0, max=50, message="产地长度必须介于 0 和 50 之间")
 	public String getProducePlace() {
 		return producePlace;
 	}
@@ -164,7 +156,6 @@ public class CmBaikeProduct extends DataEntity<CmBaikeProduct> {
 		this.producePlace = producePlace;
 	}
 	
-	@Length(min=0, max=50, message="公司/供应商长度必须介于 0 和 50 之间")
 	public String getCompany() {
 		return company;
 	}
@@ -189,7 +180,6 @@ public class CmBaikeProduct extends DataEntity<CmBaikeProduct> {
 		this.nmpaTime = nmpaTime;
 	}
 
-	@Length(min=0, max=500, message="适应人群长度必须介于 0 和 500 之间")
 	public String getAdaptiveMan() {
 		return adaptiveMan;
 	}
@@ -198,7 +188,6 @@ public class CmBaikeProduct extends DataEntity<CmBaikeProduct> {
 		this.adaptiveMan = adaptiveMan;
 	}
 	
-	@Length(min=0, max=500, message="不适应人群长度必须介于 0 和 500 之间")
 	public String getUnAdaptiveMan() {
 		return unAdaptiveMan;
 	}
@@ -207,7 +196,6 @@ public class CmBaikeProduct extends DataEntity<CmBaikeProduct> {
 		this.unAdaptiveMan = unAdaptiveMan;
 	}
 	
-	@Length(min=0, max=500, message="术前术后长度必须介于 0 和 500 之间")
 	public String getAroundOperation() {
 		return aroundOperation;
 	}

+ 0 - 1
src/main/java/com/caimei/modules/baike/web/CmBaikeProductController.java

@@ -120,7 +120,6 @@ public class CmBaikeProductController extends BaseController {
 		if (!beanValidator(model, cmBaikeProduct)){
 			return form(cmBaikeProduct, model);
 		}
-		if (null != cmBaikeProduct.getAuditStatus())
 		cmBaikeProductService.save(cmBaikeProduct);
         String commodityType = cmBaikeProduct.getCommodityType() == 1 ? "产品" : "仪器";
         addMessage(redirectAttributes, "保存" + commodityType + "成功");

+ 2 - 4
src/main/webapp/WEB-INF/views/modules/baikePage/cmBaikeProductForm.jsp

@@ -584,10 +584,8 @@
 		<div class="control-group">
 			<label class="control-label keyClass">状态:</label>
 			<div class="controls">
-				<form:select path="status" class="input-xlarge ">
-					<form:option value="1" label="发布"/>
-					<form:option value="0" label="保存草稿箱"/>
-				</form:select>
+				<form:radiobutton path="status" label="发布" value="1" checked="${empty cmBaikeProduct.status?'checked':''}"/>
+				<form:radiobutton path="status" label="保存草稿箱" value="0"/>
 			</div>
 		</div>
 		<div class="form-actions">

+ 8 - 2
src/main/webapp/WEB-INF/views/modules/info/auditInfoPage.jsp

@@ -135,10 +135,10 @@
 				<input type="radio" name="auditStatus" value="3" onclick="updateAuditStatus(3)" ${info.auditStatus eq 3?'checked=checked':''}> 审核失败
 			</td>
 		</tr>
-		<tr id="failReasonDiv" style="${empty info.auditStatus or info.auditStatus ne 3?'display: none':''}">
+		<tr id="failReasonDiv" style="${(empty info.auditStatus or info.auditStatus ne 3)?'display: none':''}">
 			<th><span class="red">*</span>失败原因:</th>
 			<td colspan="3">
-				<textarea type="text" id="failReason" name="failReason" required style="width: 400px;height: 90px">${info.failReason}</textarea>
+				<textarea type="text" id="failReason" name="failReason" style="width: 400px;height: 90px">${info.failReason}</textarea>
 			</td>
 		</tr>
 		<tr>
@@ -203,6 +203,12 @@
 					alertx("请输入基础浏览量");
 					return false;
 				}
+				var auditStatus = $("input[name='auditStatus']:checked").val();
+				var failReason = $("#failReason").val().trim();
+				if (3 == auditStatus && "" == failReason){
+					alertx("请输入失败原因");
+					return false;
+				}
 				loading('正在提交,请稍等...');
 				form.submit();
 			},

+ 2 - 0
src/main/webapp/WEB-INF/views/modules/info/infoForm.jsp

@@ -158,6 +158,7 @@
 		$("#inputForm").validate({
 			ignore:"",
 			submitHandler: function(form){
+				debugger
 				if ($("#title").val() == '') {
 					alertx("请输入文章标题");
 					return false;
@@ -232,6 +233,7 @@
 
 	//富文本框编辑
 	function checkInfo() {
+		debugger
 		var infoContent = infoDetailEditor.getData();
 		$("#infoContent").val(infoContent);
 		console.log(infoContent);