bugfix

src/main/java/com/caimei/modules/baike/entity/CmBaikeHotSearch.java

@@ -24,6 +24,7 @@ public class CmBaikeHotSearch extends DataEntity<CmBaikeHotSearch> {
 	private Integer addBy;		// 添加人
 
 	private String addUserName;		//添加人名称
+	private Integer instrumentId;	// 仪器id
 	
 	public CmBaikeHotSearch() {
 		super();
@@ -106,4 +107,12 @@ public class CmBaikeHotSearch extends DataEntity<CmBaikeHotSearch> {
 	public void setAddUserName(String addUserName) {
 		this.addUserName = addUserName;
 	}
+
+	public Integer getInstrumentId() {
+		return instrumentId;
+	}
+
+	public void setInstrumentId(Integer instrumentId) {
+		this.instrumentId = instrumentId;
+	}
 }

src/main/java/com/caimei/modules/baike/service/CmBaikeHotSearchService.java

@@ -28,7 +28,11 @@ public class CmBaikeHotSearchService extends CrudService<CmBaikeHotSearchDao, Cm
 	private CmBaikeHotSearchDao cmBaikeHotSearchDao;
 
 	public CmBaikeHotSearch get(String id) {
-		return super.get(id);
+		CmBaikeHotSearch cmBaikeHotSearch = super.get(id);
+		if (cmBaikeHotSearch.getJumpType() == 3) {
+			cmBaikeHotSearch.setInstrumentId(cmBaikeHotSearch.getProductId());
+		}
+		return cmBaikeHotSearch;
 	}
 	
 	public List<CmBaikeHotSearch> findList(CmBaikeHotSearch cmBaikeHotSearch) {
@@ -41,6 +45,9 @@ public class CmBaikeHotSearchService extends CrudService<CmBaikeHotSearchDao, Cm
 	
 	@Transactional(readOnly = false)
 	public void save(CmBaikeHotSearch cmBaikeHotSearch) {
+		if (cmBaikeHotSearch.getJumpType() == 3) {
+			cmBaikeHotSearch.setProductId(cmBaikeHotSearch.getInstrumentId());
+		}
 		super.save(cmBaikeHotSearch);
 	}
 	

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

@@ -5,7 +5,9 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import com.caimei.modules.baike.dao.CmBaikeHotSearchDao;
+import com.caimei.modules.baike.dao.CmBaikeProductDao;
 import com.caimei.modules.baike.entity.CmBaikeBanner;
+import com.caimei.modules.baike.entity.CmBaikeProduct;
 import com.google.common.collect.Maps;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,6 +27,7 @@ import com.caimei.modules.baike.entity.CmBaikeHotSearch;
 import com.caimei.modules.baike.service.CmBaikeHotSearchService;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import static com.caimei.modules.newhome.web.NewPageQualitySupplierController.isInteger;
@@ -43,6 +46,9 @@ public class CmBaikeHotSearchController extends BaseController {
 	
 	@Resource
 	private CmBaikeHotSearchDao cmBaikeHotSearchDao;
+
+	@Resource
+	private CmBaikeProductDao cmBaikeProductDao;
 	
 	@ModelAttribute
 	public CmBaikeHotSearch get(@RequestParam(required=false) String id) {
@@ -66,6 +72,13 @@ public class CmBaikeHotSearchController extends BaseController {
 	@RequestMapping(value = "form")
 	public String form(CmBaikeHotSearch cmBaikeHotSearch, Model model) {
 		model.addAttribute("cmBaikeHotSearch", cmBaikeHotSearch);
+		CmBaikeProduct cmBaikeProduct = new CmBaikeProduct();
+		cmBaikeProduct.setCommodityType(1);
+		List<CmBaikeProduct> productList = cmBaikeProductDao.findList(cmBaikeProduct);
+		cmBaikeProduct.setCommodityType(2);
+		List<CmBaikeProduct> instrumentList = cmBaikeProductDao.findList(cmBaikeProduct);
+		model.addAttribute("productList", productList);
+		model.addAttribute("instrumentList", instrumentList);
 		return "modules/baike/cmBaikeHotSearchForm";
 	}
 

src/main/webapp/WEB-INF/views/modules/baike/cmBaikeBannerForm.jsp

@@ -96,7 +96,7 @@
 							alertx("请上传pc端banner");
 							return false;
 						}
-						if (productPcBanner === '') {
+						if (productAppBanner === '') {
 							alertx("请上传移动端banner");
 							return false;
 						}

src/main/webapp/WEB-INF/views/modules/baike/cmBaikeHotSearchForm.jsp

@@ -9,6 +9,9 @@
 			margin-left: 20px;
 			width: 400px;
 		}
+		.productList{
+			margin-left: 20px;
+		}
 	</style>
 	<script type="text/javascript">
 		$(document).ready(function() {
@@ -50,9 +53,17 @@
 			<div class="controls">
 				<form:radiobutton path="jumpType"  name="jumpType" value="1" label="仅搜索" checked="true"/>
 				<br> <br>
-				<form:radiobutton path="jumpType" name="jumpType" value="2" label="产品" />
+				<form:radiobutton path="jumpType" name="jumpType" value="2" label="产品" onclick="changeJumpType()"/>
+				<form:select path="productId" class="input-xlarge productList">
+					<form:option value="" label="请选择"/>
+					<form:options items="${productList}" itemLabel="name" itemValue="id" htmlEscape="false"/>
+				</form:select>
 				<br> <br>
-				<form:radiobutton path="jumpType" name="jumpType" value="3" label="仪器" />
+				<form:radiobutton path="jumpType" name="jumpType" value="3" label="仪器" onclick="changeJumpType()"/>
+				<form:select path="instrumentId" class="input-xlarge productList">
+					<form:option value="" label="请选择"/>
+					<form:options items="${instrumentList}" itemLabel="name" itemValue="id" htmlEscape="false"/>
+				</form:select>
 				<br> <br>
 				<form:radiobutton path="jumpType" name="jumpType" value="4" label="链接" />
 				<form:input path="jumpLink" htmlEscape="false" class="input-xlarge jumpType"/>
@@ -87,5 +98,26 @@
 			<input id="btnCancel" class="btn" type="button" value="返 回" onclick="history.go(-1)"/>
 		</div>
 	</form:form>
+<script>
+	$(function () {
+		changeJumpType()
+	});
+
+	function changeJumpType() {
+		var jumpType = $("input[name='jumpType']:checked").val();
+		var productList = $("#productId");
+		var instrumentList = $("#instrumentId");
+		if (jumpType == 2) {
+			productList.addClass("required");
+			instrumentList.removeClass("required");
+		} else if (jumpType == 3) {
+			productList.removeClass("required");
+			instrumentList.addClass("required");
+		} else {
+			productList.removeClass("required");
+			instrumentList.removeClass("required");
+		}
+	}
+</script>
 </body>
 </html>

src/main/webapp/WEB-INF/views/modules/baike/cmBaikeProductForm.jsp

@@ -154,10 +154,11 @@
 			//$("#name").focus();
 			$("#inputForm").validate({
 				submitHandler: function(form){
+					debugger
 					var commodityType = '${commodityType}';
 					var mainImage = $("#image").val();
-					var authImage0 = $("authImage0").val() == undefined?'':$("authImage0").val();
-					var displayImage0 = $("displayImage0").val() == undefined?'':$("authImage0").val();
+					var authImage0 = $("#authImage0").val() == undefined?'':$("#authImage0").val();
+					var displayImage0 = $("#displayImage0").val() == undefined?'':$("#authImage0").val();
 					if (mainImage === '') {
 						alertx("请上传" + commodityType + "图片");
 						return false;