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

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/xmxxgl/ctl/XmxxglCtl.java

@@ -92,26 +92,32 @@ public class XmxxglCtl extends BaseWebCtl {
 	private BwService bwService;
 	@Autowired
 	private XmbwglbService xmbwglbService;
-	
+
 	/**
 	 * 一览
-	 * @param page 分页
+	 * 
+	 * @param page
+	 *            分页
 	 * @param model
 	 * @param request
-	 * @param xmmc 项目名称 
-	 * @param szgkid 所在港口ID
-	 * @param szgqid 所在港区ID
+	 * @param xmmc
+	 *            项目名称
+	 * @param szgkid
+	 *            所在港口ID
+	 * @param szgqid
+	 *            所在港区ID
 	 * @param menuid
 	 * @param xmhzjbid
 	 * @param xmfr
-	 * @param szdid 所在地ID
+	 * @param szdid
+	 *            所在地ID
 	 * @param sfyzjbzid
 	 * @return
 	 * @throws JsonProcessingException
 	 */
 	@RequestMapping(value = "/main")
 	@RequiresPermissions("xmxxgl:main")
-	public String main(SimplePageRequest page, Model model, final HttpServletRequest request, final String xmmc, final String szgkid, final String szgqid, String menuid, final String xmhzjbid, final String xmfr, final String szdid, final String sfyzjbzid,final String xmbm) throws JsonProcessingException {
+	public String main(SimplePageRequest page, Model model, final HttpServletRequest request, final String xmmc, final String szgkid, final String szgqid, String menuid, final String xmhzjbid, final String xmfr, final String szdid, final String sfyzjbzid, final String xmbm) throws JsonProcessingException {
 
 		final Map<String, Object> cacheSCmap = CacheSearchCondition.cacheSCmap(request, "xmxxgl");
 		// final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
@@ -126,7 +132,7 @@ public class XmxxglCtl extends BaseWebCtl {
 				} else if (isGET(request)) {
 					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, null, "xmmc");
 				}
-				//新增项目编码条件查询
+				// 新增项目编码条件查询
 				if (StringUtils.isNotEmpty(xmbm)) {
 					list.add(cb.like(root.get("xmbm").as(String.class), "%" + xmbm + "%"));
 				} else if (isGET(request)) {
@@ -275,7 +281,7 @@ public class XmxxglCtl extends BaseWebCtl {
 		}
 
 		if (isPOST(request)) {
-			SearchCondition.xmxxpage= page.getPage();
+			SearchCondition.xmxxpage = page.getPage();
 		}
 
 		model.addAttribute("list", voList);
@@ -285,7 +291,7 @@ public class XmxxglCtl extends BaseWebCtl {
 		model.addAttribute("szd", szdid);
 		model.addAttribute("szgk", szgkid);
 		model.addAttribute("szgq", szgqid);
-		model.addAttribute("xmhzjbid",xmhzjbid);
+		model.addAttribute("xmhzjbid", xmhzjbid);
 		model.addAttribute("menuid", menuid);
 		model.addAttribute("sfyzjbzid", sfyzjbzid);
 		// 翻页共通
@@ -293,7 +299,7 @@ public class XmxxglCtl extends BaseWebCtl {
 		return "gkjsgl/xmxxgl/xmxxglmain";
 	}
 
-	//删除
+	// 删除
 	@RequestMapping(value = "/delete")
 	@RequiresPermissions("xmxxgl:delete")
 	@ResponseBody
@@ -316,7 +322,7 @@ public class XmxxglCtl extends BaseWebCtl {
 		return wr;
 	}
 
-	//保存数据
+	// 保存数据
 	@RequestMapping(value = "/save")
 	@RequiresPermissions("xmxxgl:add")
 	@ResponseBody
@@ -540,7 +546,7 @@ public class XmxxglCtl extends BaseWebCtl {
 		return wr;
 	}
 
-	//编辑
+	// 编辑
 	@RequestMapping(value = "/edit")
 	@RequiresPermissions("xmxxgl:edit")
 	public String edit(Model model, String id) {
@@ -589,7 +595,7 @@ public class XmxxglCtl extends BaseWebCtl {
 		return "gkjsgl/xmxxgl/xmxxgledit";
 	}
 
-	//查看
+	// 查看
 	@RequestMapping(value = "/view")
 	@RequiresPermissions("xmxxgl:main")
 	public String view(Model model, String id) {
@@ -744,7 +750,7 @@ public class XmxxglCtl extends BaseWebCtl {
 			jyr = gkjyrService.findOne(user.getSsjyr().getId());
 		} else {
 			XzglbmxxEntity glbm = user.getSsglbm();
-			if(!StringUtils.isEmpty(glbm)){
+			if (!StringUtils.isEmpty(glbm)) {
 				List<GkEntity> list = gkService.findByGlbm(glbm.getId());
 				if (list != null && list.size() > 0) {
 					model.addAttribute("gk_glbm", list.get(0).getXzqh());
@@ -804,9 +810,9 @@ public class XmxxglCtl extends BaseWebCtl {
 		return list;
 	}
 
-	//导出
+	// 导出
 	@RequestMapping(value = "/exportExcelAll")
-	public String exportExcelAll(HttpServletResponse response, final String xmmc, final String xmfr, final String szdid, final String szgkid, final String szgqid, final String xmhzjbid, final String sfyzjbzid) {
+	public String exportExcelAll(HttpServletResponse response, final String xmmc, final String xmfr, final String szdid, final String szgkid, final String szgqid, final String xmhzjbid, final String sfyzjbzid, final String xmbm) {
 		Specification<XmxxglEntity> spec = new Specification<XmxxglEntity>() {
 			// 查询条件
 			@Override
@@ -815,6 +821,9 @@ public class XmxxglCtl extends BaseWebCtl {
 				if (StringUtils.isNotEmpty(xmmc)) {
 					list.add(cb.like(root.get("xmmc").as(String.class), "%" + xmmc + "%"));
 				}
+				if (StringUtils.isNotEmpty(xmbm)) {
+					list.add(cb.like(root.get("xmbm").as(String.class), "%" + xmbm + "%"));
+				}
 				if (StringUtils.isNotEmpty(xmfr)) {
 					list.add(cb.like(root.get("xmfr").as(String.class), "%" + xmfr + "%"));
 				}