git-svn-id: https://192.168.57.71/svn/jsgkj@471 931142cf-59ea-a443-aa0e-51397b428577

gkjsjy/trunk/src/com/xt/jygl/gkjygl/cghzyxxgl/dcsb/webservice/DcsbWebService.java

@@ -26,6 +26,9 @@ import com.xt.jygl.gkjygl.cghzyxxgl.dcsb.service.DcsbService;
 import com.xt.jygl.gkjygl.gkjyr.jyrbw.service.BwService;
 import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.entity.BwEntity;
 import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.entity.GkjyrEntity;
+import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.service.GkjyrService;
+import com.xt.jygl.set.user.client.UserService;
+import com.xtframe.core.support.SecurityMgr;
 import com.xtframe.sec.code.entity.CodeEntity;
 import com.xtframe.sec.common.BaseEntity;
 import com.xtframe.sec.common.PredicateModel;
@@ -165,15 +168,6 @@ public class DcsbWebService extends BaseWebCtl {
 	}
 
 	/**
-	 * 返回当前地市系统的所在地列表
-	 * 
-	 * @return
-	 */
-	public List<CodeEntity> listSzd() {
-		return null;
-	}
-
-	/**
 	 * 根据所在地ID查询港口信息
 	 * 
 	 * @param szdId
@@ -185,7 +179,7 @@ public class DcsbWebService extends BaseWebCtl {
 	}
 
 	/**
-	 * 根据港口主键查询港区信息
+	 * 根据所在地和港口主键查询港区信息
 	 * 
 	 * @param gkId
 	 * @return
@@ -203,17 +197,50 @@ public class DcsbWebService extends BaseWebCtl {
 	 */
 	public List<MtEntity> getMtByJyr(String jyrid) {
 		List<MtEntity> list = mtService.findByJyrid(jyrid);
+		if (list != null) {
+			for (MtEntity mt : list) {
+				mt.setSfdwkf(null);
+				mt.setSfwhp(null);
+				mt.setMtsfwars(null);
+				mt.setSsgkglbm(null);
+				mt.setFwlx(null);
+				mt.setMtxsdm(null);
+			}
+		}
 		return list;
 	}
 
 	/**
-	 * 根据码头主键查询泊位信息
+	 * 根据经营人主键查询泊位信息
 	 * 
 	 * @param mtId
 	 * @return
 	 */
 	public List<BwEntity> getBwByJyrid(String jyrId) {
 		List<BwEntity> list = bwService.findByJyrid(jyrId);
+		if (list != null) {
+			for (BwEntity bw : list) {
+				bw.setBwszhd(null);
+				bw.setSszyq(null);
+				bw.setZls(null);
+				bw.setXp(null);
+				bw.setKbcblx(null);
+				bw.setSfdwkf(null);
+				bw.setFwlx(null);
+				bw.setZyhbwfl(null);
+				bw.setSffz(null);
+				bw.setBwsx(null);
+				bw.setSzgq(null);
+				bw.setSsmt(null);
+				bw.setWxpbw(null);
+				bw.setSzgk(null);
+				bw.setSsgkglbm(null);
+				bw.setSsjyr(null);
+				bw.setBwszsx(null);
+				bw.setSclx(null);
+				bw.setJgxs(null);
+			}
+		}
 		return list;
 	}
 
@@ -223,13 +250,22 @@ public class DcsbWebService extends BaseWebCtl {
 	 * @return
 	 */
 	public List<CodeEntity> getHwzl(String id) {
-		List<CodeEntity> list = new ArrayList<CodeEntity>();
-		if (StringUtils.isEmpty(id)) {
-			list = securityMgr.codeService().findValidCodesByPid("72");
-		} else {
-			list = securityMgr.codeService().findByPid(id);
-		}
+		List<CodeEntity> list = securityMgr.codeService().findByPid(id);
 		return list;
 	}
 
+	/**
+	 * 根据用户主键查询经营人信息
+	 * 
+	 * @param jyrId
+	 * @return
+	 */
+	public GkjyrEntity findJyr(String jyrId) {
+		UserEntity ue = securityMgr.userService().findById(jyrId);
+		if (ue != null && ue.getSsjyr() != null) {
+			return ue.getSsjyr();
+		}
+		return null;
+	}
+
 }