git-svn-id: https://192.168.57.71/svn/hbghj@28 201dd7a2-ec1b-f84b-8b06-88221118ff88

gkaq/gkdata/trunk/src/main/java/com/xt/hb/data/aq/aqmap/AqcxMapper.java

@@ -123,4 +123,12 @@ public interface AqcxMapper {
 	 * @return
 	 */
 	List<Whzysq> selectWhzysqByBwid(String id);
+
+	/**
+	 * 根据船名查询船舶作业记录
+	 * 
+	 * @param cbmc
+	 * @return
+	 */
+	List<Whzysq> selectWhzysqByCbmc(String cbmc);
 }

gkaq/gkdata/trunk/src/main/java/com/xt/hb/data/aq/ctl/AqGisCtl.java

@@ -228,10 +228,34 @@ public class AqGisCtl {
 		PageHelper.startPage(page, size);
 		List<Whzysq> whzysqs = aqs.selectWhzysqByBwid(id);
 		PageInfo<Whzysq> pageResult = new PageInfo<>(whzysqs);
-//		if(pageResult.getSize()==0) {
-//			whzysqs = aqs.selectWhzysqByBwid(bwGisid);
-//			pageResult = new PageInfo<>(whzysqs);
-//		}
+		return pageResult;
+	}
+
+	/**
+	 * 根据船名查询船舶作业记录
+	 * 
+	 * @param cbmc
+	 *            船名
+	 * @param page
+	 * @param size
+	 * @return
+	 */
+	@RequestMapping(value = "aqgis/cbwhzysq")
+	@ResponseBody
+	public PageInfo<Whzysq> getWhzysqByCbmc(String cbmc, int page, int size) {
+		if (StringUtils.isEmpty(cbmc)) {
+			return null;
+		}
+		// 初始化参数
+		if (page < 1) {
+			page = 1;
+		}
+		if (size < 1) {
+			size = 1;
+		}
+		PageHelper.startPage(page, size);
+		List<Whzysq> whzysqs = aqs.selectWhzysqByCbmc(cbmc);
+		PageInfo<Whzysq> pageResult = new PageInfo<>(whzysqs);
 		return pageResult;
 	}
 

gkaq/gkdata/trunk/src/main/java/com/xt/hb/data/aq/svc/AqcxService.java

@@ -127,6 +127,14 @@ public interface AqcxService {
 	List<Whzysq> selectWhzysqByBwid(String id);
 
 	/**
+	 * 根据船名查询船舶作业记录
+	 * 
+	 * @param cbmc
+	 * @return
+	 */
+	List<Whzysq> selectWhzysqByCbmc(String cbmc);
+
+	/**
 	 * 根据港区查找危货企业
 	 * 
 	 * @param gq

gkaq/gkdata/trunk/src/main/java/com/xt/hb/data/aq/svcimpl/AqcxServiceImpl.java

@@ -183,6 +183,11 @@ public class AqcxServiceImpl implements AqcxService {
 	public List<Whzysq> selectWhzysqByBwid(String id) {
 		return aqcxMapper.selectWhzysqByBwid(id);
 	}
+	
+	@Override
+	public List<Whzysq> selectWhzysqByCbmc(String cbmc) {
+		return aqcxMapper.selectWhzysqByCbmc(cbmc);
+	}
 
 	@Override
 	public AQUser selectUserByName(String username) {

gkaq/gkdata/trunk/src/main/java/com/xt/hb/data/system/ctl/SystemCtl.java

@@ -49,6 +49,8 @@ public class SystemCtl implements ServletContextAware {
 		jo.put("cbyjArea", "/cbyjArea");
 		// 泊位作业记录分页
 		jo.put("bwPage", "/aqgis/whzysq?bwGisid=");
+		// 船舶作业记录分页
+		jo.put("cbPage", "/aqgis/cbwhzysq?cbmc=");
 		// 船名
 		jo.put("shipName", "/shipName");
 		// token验证