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

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/xmxxgl/xmxxgladd.jsp

@@ -63,6 +63,13 @@
 							});
 						}
 						}, "json");
+				}else{
+					$.alert({
+		       		    title: '提示',
+		       		    content: "用户没有配置所有管理部门！",
+		       		    confirm: function(){
+		       		    }
+		           	});
 				}
 			}
 				xmxxgl.detail.initBw('bwsel','',id);

gkjsjy/trunk/src/com/xt/jygl/ggfwxxgl/hxgl/ctl/HxglCtl.java

@@ -223,7 +223,7 @@ public class HxglCtl extends BaseWebCtl {
 		if (page.getPage() < 1) {
 			page.setPage(SearchCondition.hxpage);
 		}
-		page.setSort("createDateTime");
+		page.setSort("id");
 		Page<HxglEntity> list = query.findAll(spec, toPageRequest(page), HxglEntity.class);
 		List<HxglVo> voList = new ArrayList<HxglVo>();
 		for (HxglEntity entity : list) {

gkjsjy/trunk/src/com/xt/jygl/ggfwxxgl/hxhbgl/ctl/HxhbglCtl.java

@@ -156,7 +156,7 @@ public class HxhbglCtl extends BaseWebCtl {
 		}
 		
 		page.setOrder("desc");
-		page.setSort("createDateTime");
+		page.setSort("id");
 		Page<HxhbglEntity> list = query.findAll(spec, toPageRequest(page), HxhbglEntity.class);
 		List<HxhbglVo> voList = new ArrayList<HxhbglVo>();
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

gkjsjy/trunk/src/com/xt/jygl/ggfwxxgl/tzgg/ggxx/ctl/GgxxCtl.java

@@ -187,8 +187,8 @@ public class GgxxCtl extends BaseWebCtl {
 			}
 			page.setPage(Integer.valueOf(String.valueOf(ggpage)));
 		}
-		page.setSort("createDateTime");
-		page.setOrder("asc");
+		page.setSort("id");
+		page.setOrder("desc");
 		Page<GgxxEntity> list = query.findAll(spec, toPageRequest(page), GgxxEntity.class);
 		List<GgxxVo> voList = new ArrayList<GgxxVo>();
 		UserEntity user = securityMgr.getCurrUser();

gkjsjy/trunk/src/com/xt/jygl/gkjcxx/ax/ctl/AxCtl.java

@@ -170,7 +170,7 @@ public class AxCtl extends BaseWebCtl {
 
 		/*page.setSort("axmc");
 		page.setOrder("asc");*/
-		page.setSort("createDateTime");
+		page.setSort("id");
 		page.setOrder("desc");
 		Page<AxEntity> list = query.findAll(spec, toPageRequest(page), AxEntity.class);
 		List<AxVo> voList = new ArrayList<AxVo>();

gkjsjy/trunk/src/com/xt/jygl/gkjcxx/cb/ctl/CbCtl.java

@@ -107,7 +107,7 @@ public class CbCtl extends BaseWebCtl {
 			}
 			page.setPage(Integer.valueOf(String.valueOf(cbpage)));
 		}
-		page.setSort("createDateTime");
+		page.setSort("id");
 		page.setOrder("desc");
 		Page<CbEntity> list = query.findAll(spec, toPageRequest(page), CbEntity.class);
 		List<CbEntity> voList = new ArrayList<CbEntity>();

gkjsjy/trunk/src/com/xt/jygl/gkjcxx/fbd/ctl/FbdCtl.java

@@ -157,7 +157,7 @@ public class FbdCtl extends BaseWebCtl {
 		}
 		
 
-		page.setSort("createDateTime");
+		page.setSort("id");
 		page.setOrder("desc");
 		Page<FbdEntity> list = query.findAll(spec, toPageRequest(page), FbdEntity.class);
 		List<FbdVo> voList = new ArrayList<FbdVo>();

gkjsjy/trunk/src/com/xt/jygl/gkjcxx/gk/ctl/GkCtl.java

@@ -117,7 +117,7 @@ public class GkCtl extends BaseWebCtl {
 			}
 			page.setPage(Integer.valueOf(String.valueOf(gkpage)));
 		}
-		page.setSort("createDateTime");
+		page.setSort("id");
 		page.setOrder("desc");
 		Page<GkEntity> list = query.findAll(spec, toPageRequest(page), GkEntity.class);
 		List<GkVo> voList = new ArrayList<GkVo>();

gkjsjy/trunk/src/com/xt/jygl/gkjcxx/jghd/ctl/JghdCtl.java

@@ -131,7 +131,7 @@ public class JghdCtl extends BaseWebCtl {
 			}
 			page.setPage(Integer.valueOf(String.valueOf(hdpage)));
 		}
-		page.setSort("createDateTime");
+		page.setSort("id");
 		page.setOrder("desc");
 		Page<JghdEntity> list = query.findAll(spec, toPageRequest(page), JghdEntity.class);
 		List<JghdVo> voList = new ArrayList<JghdVo>();

gkjsjy/trunk/src/com/xt/jygl/gkjcxx/md/ctl/MdCtl.java

@@ -151,7 +151,7 @@ public class MdCtl extends BaseWebCtl {
 			page.setPage(Integer.valueOf(String.valueOf(mdpage)));
 		}
 		
-		page.setSort("createDateTime");
+		page.setSort("id");
 		page.setOrder("desc");
 		Page<MdEntity> list = query.findAll(spec, toPageRequest(page), MdEntity.class);
 		List<MdVo> voList = new ArrayList<MdVo>();

gkjsjy/trunk/src/com/xt/jygl/gkjcxx/mt/ctl/MtCtl.java

@@ -277,7 +277,7 @@ public class MtCtl extends BaseWebCtl {
 			}
 			page.setPage(Integer.valueOf(String.valueOf(mtpage)));
 		}
-		page.setSort("createDateTime");
+		page.setSort("id");
 		page.setOrder("desc");
 		Page<MtEntity> list = query.findAll(spec, toPageRequest(page), MtEntity.class);
 		List<MtVo> voList = new ArrayList<MtVo>();

gkjsjy/trunk/src/com/xt/jygl/gkjcxx/zyq/ctl/ZyqCtl.java

@@ -146,7 +146,7 @@ public class ZyqCtl extends BaseWebCtl {
 			page.setPage(Integer.valueOf(String.valueOf(zyqpage)));
 		}
 		
-		page.setSort("createDateTime");
+		page.setSort("id");
 		page.setOrder("desc");
 		Page<ZyqEntity> list = query.findAll(spec, toPageRequest(page), ZyqEntity.class);
 		List<ZyqVo> voList = new ArrayList<ZyqVo>();

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jgbg/ctl/JgbgCtl.java

@@ -169,7 +169,7 @@ public class JgbgCtl extends BaseWebCtl {
 			page.setPage(Integer.valueOf(String.valueOf(xmxxpage)));
 		}
 
-		page.setSort("createDateTime");
+		page.setSort("id");
 		page.setOrder("desc");
 		Page<JgbgEntity> list = query.findAll(spec, toPageRequest(page), JgbgEntity.class);
 		List<JgbgVo> voList = new ArrayList<JgbgVo>();

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jgsq/ctl/JgsqCtl.java

@@ -92,6 +92,23 @@ public class JgsqCtl extends BaseWebCtl {
 	private XmbwglbService xmbwglbService;
 	@Autowired
 	private BwService bwService;
+	
+	/**
+	 * 一览
+	 * @param page 分页
+	 * @param model
+	 * @param request
+	 * @param xmmc 项目名称
+	 * @param szgkid 所在港口ID
+	 * @param szgqid 所在港区ID
+	 * @param menuid
+	 * @param xmhzjbid
+	 * @param xmfr
+	 * @param szdid  所在地ID
+	 * @param sfyzjbzid
+	 * @return
+	 * @throws JsonProcessingException
+	 */
 	@RequestMapping(value = "/main")
 	@RequiresPermissions("jgsq: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) throws JsonProcessingException {
@@ -179,7 +196,7 @@ public class JgsqCtl extends BaseWebCtl {
 			page.setPage(Integer.valueOf(String.valueOf(xmxxpage)));
 		}
 
-		page.setSort("createDateTime");
+		page.setSort("id");
 		page.setOrder("desc");
 		Page<JgsqEntity> list = query.findAll(spec, toPageRequest(page), JgsqEntity.class);
 		List<JgsqVo> voList = new ArrayList<JgsqVo>();
@@ -273,6 +290,7 @@ public class JgsqCtl extends BaseWebCtl {
 		return "gkjsgl/jgsq/jgsqmain";
 	}
 
+	//删除
 	@RequestMapping(value = "/delete")
 	@ResponseBody
 	@RequiresPermissions("jgsq:delete")
@@ -289,6 +307,7 @@ public class JgsqCtl extends BaseWebCtl {
 		return wr;
 	}
 
+	//提交流程
 	@RequestMapping(value = "/submit")
 	@ResponseBody
 	public WebJsonResult submit(Model model, JgsqEntity code, String userids, String sylxid, String ssjyrid, String fjids, String accid, String xmlxid, String tzlxid, String xmhzjbid, String axspjbid, String szdid, String szgkid, String szgqid, String zyhbwflid) {
@@ -463,6 +482,7 @@ public class JgsqCtl extends BaseWebCtl {
 		return wr;
 	}
 
+	//退回后提交
 	@RequestMapping(value = "/submitAudit")
 	@ResponseBody
 	public WebJsonResult submitAudit(JgsqEntity code, String userids, String sylxid, String ssjyrid, String fjids, String accid, String xmlxid, String tzlxid, String xmhzjbid, String axspjbid, String szdid, String szgkid, String szgqid, String zyhbwflid) {
@@ -559,6 +579,7 @@ public class JgsqCtl extends BaseWebCtl {
 		return wr;
 	}
 
+	//保存
 	@RequestMapping(value = "/save")
 	@ResponseBody
 	public WebJsonResult save(Model model, JgsqEntity code, String sylxid, String ssjyrid, String fjids, String accid, String xmlxid, String tzlxid, String xmhzjbid, String axspjbid, String szdid, String szgkid, String szgqid, String zyhbwflid) {
@@ -731,6 +752,13 @@ public class JgsqCtl extends BaseWebCtl {
 		return wr;
 	}
 
+	/**
+	 * 编辑
+	 * @param model
+	 * @param id
+	 * @param flag
+	 * @return
+	 */
 	@RequestMapping(value = "/edit")
 	@RequiresPermissions("jgsq:edit")
 	public String edit(Model model, String id, String flag) {
@@ -866,6 +894,7 @@ public class JgsqCtl extends BaseWebCtl {
 		return "gkjsgl/jgsq/jgsqedit";
 	}
 
+	//获取泊位信息
 	public void getbwlist(Model model, String bwids) {
 		if (!StringUtils.isEmpty(bwids)) {
 			List<BwVo> slist = new ArrayList<BwVo>();
@@ -935,6 +964,7 @@ public class JgsqCtl extends BaseWebCtl {
 		}
 	}
 	
+	//查看
 	@RequestMapping(value = "/view")
 	public String view(Model model, String id, String flag, String opflag) {
 		model.addAttribute("flag", flag);
@@ -1181,6 +1211,7 @@ public class JgsqCtl extends BaseWebCtl {
 		return "gkjsgl/jgsq/jgsqview";
 	}
 
+	//新增
 	@RequestMapping(value = "/add")
 	@RequiresPermissions("jgsq:add")
 	public String add(Model model) {
@@ -1212,6 +1243,7 @@ public class JgsqCtl extends BaseWebCtl {
 		return "gkjsgl/jgsq/jgsqadd";
 	}
 
+	//项目类型
 	@RequestMapping(value = "/selectXmlx")
 	@ResponseBody
 	public List<CodeEntity> selectXmlx(Model model) {
@@ -1219,6 +1251,7 @@ public class JgsqCtl extends BaseWebCtl {
 		return list;
 	}
 
+	//投资类型
 	@RequestMapping(value = "/selectTzlx")
 	@ResponseBody
 	public List<CodeEntity> selectTzlx(Model model) {
@@ -1226,6 +1259,7 @@ public class JgsqCtl extends BaseWebCtl {
 		return list;
 	}
 
+	//项目核准级别
 	@RequestMapping(value = "/selectXmhzjb")
 	@ResponseBody
 	public List<CodeEntity> selectXmhzjb(Model model) {
@@ -1233,6 +1267,7 @@ public class JgsqCtl extends BaseWebCtl {
 		return list;
 	}
 
+	//岸线审批级别
 	@RequestMapping(value = "/selectAxspjb")
 	@ResponseBody
 	public List<CodeEntity> selectAxspjb(Model model) {
@@ -1240,9 +1275,19 @@ public class JgsqCtl extends BaseWebCtl {
 		return list;
 	}
 
+	/**
+	 * 审核流程
+	 * @param shyj 审核意见
+	 * @param id
+	 * @param flag 同意true 不同意 false
+	 * @param accid 附件ID
+	 * @param userids 用户ID
+	 * @param fjzdids
+	 * @return
+	 */
 	@RequestMapping(value = "/audit")
 	@ResponseBody
-	public WebJsonResult audit(String shyj, String id, boolean flag, String accid, String userids, String delid33, String delid34, String delid35, String fjzdids) {
+	public WebJsonResult audit(String shyj, String id, boolean flag, String accid, String userids,  String fjzdids) {
 		WebJsonResult wr = success();
 		JgsqEntity entity = jgsqService.findOne(id);
 		if (!StringUtils.isEmpty(accid)) {
@@ -1372,6 +1417,7 @@ public class JgsqCtl extends BaseWebCtl {
 		return wr;
 	}
 
+	//保存附件
 	@RequestMapping(value = "/savefj")
 	@ResponseBody
 	public WebJsonResult savefj(Model model, JgsqfjEntity fjzd) {
@@ -1390,6 +1436,7 @@ public class JgsqCtl extends BaseWebCtl {
 		return wr;
 	}
 
+	//删除附件
 	@RequestMapping(value = "/delFile")
 	@ResponseBody
 	public WebJsonResult delFile(String id, Model model) {

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jgsq/ctl/JgsqdsCtl.java

@@ -101,6 +101,22 @@ public class JgsqdsCtl extends BaseWebCtl {
 	@Autowired
 	private BwService bwService;
 
+	/**
+	 * 一览
+	 * @param page 分页
+	 * @param model
+	 * @param request
+	 * @param xmmc 项目名称
+	 * @param szgkid 所在港口ID
+	 * @param szgqid 所在港区ID
+	 * @param menuid
+	 * @param xmhzjbid
+	 * @param xmfr
+	 * @param szdid 所在地ID
+	 * @param sfyzjbzid
+	 * @return
+	 * @throws JsonProcessingException
+	 */
 	@RequestMapping(value = "/main")
 	@RequiresPermissions("jgsqds: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) throws JsonProcessingException {
@@ -188,7 +204,7 @@ public class JgsqdsCtl extends BaseWebCtl {
 			page.setPage(Integer.valueOf(String.valueOf(xmxxpage)));
 		}
 
-		page.setSort("createDateTime");
+		page.setSort("id");
 		page.setOrder("desc");
 		Page<JgsqEntity> list = query.findAll(spec, toPageRequest(page), JgsqEntity.class);
 		List<JgsqVo> voList = new ArrayList<JgsqVo>();
@@ -284,6 +300,7 @@ public class JgsqdsCtl extends BaseWebCtl {
 		return "gkjsgl/jgsq/jgsqdsmain";
 	}
 
+	//删除
 	@RequestMapping(value = "/delete")
 	@RequiresPermissions("jgsqds:delete")
 	@ResponseBody
@@ -300,6 +317,7 @@ public class JgsqdsCtl extends BaseWebCtl {
 		return wr;
 	}
 
+	//提交流程
 	@RequestMapping(value = "/submit")
 	@ResponseBody
 	public WebJsonResult submit(Model model, JgsqEntity code, String accids, String qtfjids, String qtfjzdids, String fjzdids, String userids, String sylxid, String ssjyrid, String fjids, String accid, String xmlxid, String tzlxid, String xmhzjbid, String axspjbid, String szdid, String szgkid, String szgqid, String zyhbwflid) {
@@ -484,6 +502,7 @@ public class JgsqdsCtl extends BaseWebCtl {
 		return wr;
 	}
 
+	//退回后提交
 	@RequestMapping(value = "/submitAudit")
 	@ResponseBody
 	public WebJsonResult submitAudit(JgsqEntity code, String userids, String sylxid, String ssjyrid, String fjids, String accid, String xmlxid, String tzlxid, String xmhzjbid, String axspjbid, String szdid, String szgkid, String szgqid, String zyhbwflid) {
@@ -568,6 +587,7 @@ public class JgsqdsCtl extends BaseWebCtl {
 		return wr;
 	}
 
+	//保存
 	@RequestMapping(value = "/save")
 	@ResponseBody
 	public WebJsonResult save(Model model, JgsqEntity code, String accids, String qtfjids, String qtfjzdids, String fjzdids, String delid31, String delid32, String sylxid, String ssjyrid, String fjids, String accid, String xmlxid, String tzlxid, String xmhzjbid, String axspjbid, String szdid, String szgkid, String szgqid, String zyhbwflid) {
@@ -749,6 +769,7 @@ public class JgsqdsCtl extends BaseWebCtl {
 		return wr;
 	}
 
+	//编辑
 	@RequestMapping(value = "/edit")
 	@RequiresPermissions("jgsqds:edit")
 	public String edit(Model model, String id, String flag) {
@@ -884,6 +905,7 @@ public class JgsqdsCtl extends BaseWebCtl {
 		return "gkjsgl/jgsq/jgsqdsedit";
 	}
 
+	//查看
 	@RequestMapping(value = "/view")
 	public String view(Model model, String id, String flag, String opflag) {
 		model.addAttribute("flag", flag);
@@ -1130,6 +1152,7 @@ public class JgsqdsCtl extends BaseWebCtl {
 		return "gkjsgl/jgsq/jgsqdsview";
 	}
 
+	//新增
 	@RequestMapping(value = "/add")
 	@RequiresPermissions("jgsqds:add")
 	public String add(Model model) {
@@ -1161,6 +1184,7 @@ public class JgsqdsCtl extends BaseWebCtl {
 		return "gkjsgl/jgsq/jgsqdsadd";
 	}
 
+	//项目类型
 	@RequestMapping(value = "/selectXmlx")
 	@ResponseBody
 	public List<CodeEntity> selectXmlx(Model model) {
@@ -1168,6 +1192,7 @@ public class JgsqdsCtl extends BaseWebCtl {
 		return list;
 	}
 
+	//投资类型
 	@RequestMapping(value = "/selectTzlx")
 	@ResponseBody
 	public List<CodeEntity> selectTzlx(Model model) {
@@ -1175,6 +1200,7 @@ public class JgsqdsCtl extends BaseWebCtl {
 		return list;
 	}
 
+	//项目核准级别
 	@RequestMapping(value = "/selectXmhzjb")
 	@ResponseBody
 	public List<CodeEntity> selectXmhzjb(Model model) {
@@ -1182,6 +1208,7 @@ public class JgsqdsCtl extends BaseWebCtl {
 		return list;
 	}
 
+	//岸线审批级别
 	@RequestMapping(value = "/selectAxspjb")
 	@ResponseBody
 	public List<CodeEntity> selectAxspjb(Model model) {
@@ -1189,6 +1216,19 @@ public class JgsqdsCtl extends BaseWebCtl {
 		return list;
 	}
 
+	/**
+	 * 审核流程
+	 * @param shyj 审核意见
+	 * @param id
+	 * @param flag 同意true 不同意 false
+	 * @param accid 附件ID
+	 * @param userids 用户ID
+	 * @param delid33
+	 * @param delid34
+	 * @param delid35
+	 * @param fjzdids
+	 * @return
+	 */
 	@RequestMapping(value = "/audit")
 	@ResponseBody
 	public WebJsonResult audit(String shyj, String id, boolean flag, String accid, String userids, String delid33, String delid34, String delid35, String fjzdids) {
@@ -1228,19 +1268,7 @@ public class JgsqdsCtl extends BaseWebCtl {
 			}
 
 			jgsqdsService.changeAudit(shyj, entity, flag, userids);
-			/*
-			 * if (flowflag) { if (flag) { entity.setFlowstatus("4"); } else {
-			 * entity.setFlowstatus("3"); } entity.setSftb(Constants.YES);
-			 * entity = jgsqdsService.save(entity); // 如果是省级审核通过或不通过后同步到市级 try {
-			 * String url = "/GK_OPERATION_JSJY_JGSQ_ONE_PC?condition=ID=" +
-			 * entity.getId(); boolean tbflag = getTbStatus(url); if (tbflag) {
-			 * entity.setTbzt("Y"); jgsqdsService.save(entity); }
-			 * 
-			 * } catch (Exception e) { e.printStackTrace(); }
-			 * 
-			 * } else { // rtx提醒 if (!StringUtils.isEmpty(userids)) {
-			 * rtxSend(userids, "", "你有一条建设进度竣工验收申请待办事务，请及时处理！"); } }
-			 */
+		
 		} catch (Exception e) {
 			wr.setSuccess(false);
 			wr.setMessage("操作失败！");
@@ -1336,6 +1364,7 @@ public class JgsqdsCtl extends BaseWebCtl {
 		return wr;
 	}
 
+	//保存附件
 	@RequestMapping(value = "/savefj")
 	@ResponseBody
 	public WebJsonResult savefj(Model model, JgsqfjEntity fjzd) {
@@ -1354,6 +1383,7 @@ public class JgsqdsCtl extends BaseWebCtl {
 		return wr;
 	}
 
+	//保存其他附件
 	@RequestMapping(value = "/saveQtfj")
 	@ResponseBody
 	public WebJsonResult saveQtfj(String opflag, MultipartFile qtfilename, Model model) {
@@ -1400,6 +1430,7 @@ public class JgsqdsCtl extends BaseWebCtl {
 		return jsjd;
 	}
 
+	//删除附件
 	@RequestMapping(value = "/delFile")
 	@ResponseBody
 	public WebJsonResult delFile(String id, Model model) {
@@ -1424,6 +1455,7 @@ public class JgsqdsCtl extends BaseWebCtl {
 		return wr;
 	}
 
+	//选择项目
 	@RequestMapping(value = "/choose")
 	public String choose(Model model, String id) {
 		XmxxglEntity entity = xmxxglService.findOne(id);
@@ -1492,6 +1524,7 @@ public class JgsqdsCtl extends BaseWebCtl {
 		return "gkjsgl/jgsq/jgsqdsadd";
 	}
 
+	//获取泊位数据
 	public void getbwlist(Model model, String bwids) {
 		if (!StringUtils.isEmpty(bwids)) {
 			List<BwVo> slist = new ArrayList<BwVo>();
@@ -1634,6 +1667,7 @@ public class JgsqdsCtl extends BaseWebCtl {
 		return wr;
 	}
 
+	//同步省级数据
 	@RequestMapping(value = "/saveTbzt")
 	@ResponseBody
 	public WebJsonResult saveTbzt(Model model, String id, String spflag) {
@@ -1736,6 +1770,7 @@ public class JgsqdsCtl extends BaseWebCtl {
 		model.addAttribute("fjvolist" + opflag, fjvolist);
 	}
 
+	//新增其他附件
 	@RequestMapping(value = "/xinzengqtfj")
 	@ResponseBody
 	public WebJsonResult xinzengqtfj(String opflag, String qtfjid, String id, Model model, String qtfbdw, Date qtfbsj, String qtwjh) {

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jgzx/ctl/JgzxCtl.java

@@ -171,7 +171,7 @@ public class JgzxCtl extends BaseWebCtl {
 			page.setPage(Integer.valueOf(String.valueOf(xmxxpage)));
 		}
 
-		page.setSort("createDateTime");
+		page.setSort("id");
 		page.setOrder("desc");
 		Page<JgzxEntity> list = query.findAll(spec, toPageRequest(page), JgzxEntity.class);
 		List<JgzxVo> voList = new ArrayList<JgzxVo>();

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdbg/ctl/JsjdbgCtl.java

@@ -95,6 +95,22 @@ public class JsjdbgCtl extends BaseWebCtl {
 	@Autowired
 	private BwService bwService;
 
+	/**
+	 * 一览
+	 * @param page 分页
+	 * @param model
+	 * @param request
+	 * @param xmmc 项目名称
+	 * @param szgkid 所在港口ID
+	 * @param szgqid 所在港区ID
+	 * @param menuid
+	 * @param xmhzjbid 
+	 * @param xmfr
+	 * @param szdid 所在地ID
+	 * @param sfyzjbzid
+	 * @return
+	 * @throws JsonProcessingException
+	 */
 	@RequestMapping(value = "/main")
 	@RequiresPermissions("jsjdbg: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) throws JsonProcessingException {
@@ -182,7 +198,7 @@ public class JsjdbgCtl extends BaseWebCtl {
 			page.setPage(Integer.valueOf(String.valueOf(xmxxpage)));
 		}
 
-		page.setSort("createDateTime");
+		page.setSort("id");
 		page.setOrder("desc");
 		Page<JsjdbgEntity> list = query.findAll(spec, toPageRequest(page), JsjdbgEntity.class);
 		List<JsjdbgVo> voList = new ArrayList<JsjdbgVo>();
@@ -236,26 +252,12 @@ public class JsjdbgCtl extends BaseWebCtl {
 				} else {
 					vo.setShowjsjd("N");
 				}
-				/*
-				 * List<TzjhglEntity> tzjh =
-				 * tzjhglService.findByXmid(entity.getId() != null ?
-				 * entity.getId() : ""); if (tzjh.size() != 0) { String
-				 * flagForYear = "1"; vo.setFlagForYear(flagForYear); }
-				 */
 				List<TaskInfoEntity> listtask = taskInfoService.findByBusIdAndBusKeyAndRecordStatus(entity.getId().toString(), JsjdbgEntity.PROCESS_DEFINITION_KEY);
 				String flag = "";
 				if (listtask.size() != 0 || entity.getRecordStatus() == BaseEntity.RECORD_STATE_COMPLETED) {
 					flag = "1";
 					vo.setFlag(flag);
 				}
-				/*
-				 * boolean judge = false; for (TzjhglEntity tz : tzjh) { if
-				 * (("是").equals(tz.getSfyzjbz().getText())) { judge = true; }
-				 * 
-				 * } if (judge) { vo.setSfyzjbz("是"); } else {
-				 * vo.setSfyzjbz("否"); }
-				 */
-
 				voList.add(vo);
 			}
 		}
@@ -281,6 +283,7 @@ public class JsjdbgCtl extends BaseWebCtl {
 		return "gkjsgl/jsjdbg/jsjdbgmain";
 	}
 
+	//删除
 	@RequestMapping(value = "/delete")
 	@ResponseBody
 	@RequiresPermissions("jsjdbg:delete")
@@ -303,6 +306,7 @@ public class JsjdbgCtl extends BaseWebCtl {
 		return wr;
 	}
 
+	//提交流程
 	@RequestMapping(value = "/submit")
 	@ResponseBody
 	public WebJsonResult submit(Model model, JsjdbgEntity code, String userids, String sylxid, String ssjyrid, String fjids, String accid, String xmlxid, String tzlxid, String xmhzjbid, String axspjbid, String szdid, String szgkid, String szgqid, String zyhbwflid) {
@@ -435,6 +439,7 @@ public class JsjdbgCtl extends BaseWebCtl {
 		return wr;
 	}
 
+	//退回提交
 	@RequestMapping(value = "/submitAudit")
 	@ResponseBody
 	public WebJsonResult submitAudit(JsjdbgEntity code, String sylxid, String ssjyrid, String fjids, String accid, String xmlxid, String tzlxid, String xmhzjbid, String axspjbid, String szdid, String szgkid, String szgqid, String zyhbwflid) {
@@ -530,6 +535,7 @@ public class JsjdbgCtl extends BaseWebCtl {
 		return wr;
 	}
 
+	//保存数据
 	@RequestMapping(value = "/save")
 	@ResponseBody
 	public WebJsonResult save(Model model, JsjdbgEntity code, String sylxid, String ssjyrid, String fjids, String accid, String xmlxid, String tzlxid, String xmhzjbid, String axspjbid, String szdid, String szgkid, String szgqid, String zyhbwflid) {
@@ -701,6 +707,7 @@ public class JsjdbgCtl extends BaseWebCtl {
 		return wr;
 	}
 
+	//编辑
 	@RequestMapping(value = "/edit")
 	@RequiresPermissions("jsjdbg:edit")
 	public String edit(Model model, String id, String flag) {
@@ -836,6 +843,7 @@ public class JsjdbgCtl extends BaseWebCtl {
 		return "gkjsgl/jsjdbg/jsjdbgedit";
 	}
 
+	//获取泊位信息
 	public void getbwlist(Model model, String bwids) {
 		if (!StringUtils.isEmpty(bwids)) {
 			List<BwVo> slist = new ArrayList<BwVo>();
@@ -905,6 +913,7 @@ public class JsjdbgCtl extends BaseWebCtl {
 		}
 	}
 
+	//查看
 	@RequestMapping(value = "/view")
 	public String view(Model model, String id, String flag, String opflag) {
 		model.addAttribute("flag", flag);
@@ -1149,6 +1158,7 @@ public class JsjdbgCtl extends BaseWebCtl {
 		return "gkjsgl/jsjdbg/jsjdbgview";
 	}
 
+	//新增
 	@RequestMapping(value = "/add")
 	@RequiresPermissions("jsjdbg:add")
 	public String add(Model model) {
@@ -1202,6 +1212,16 @@ public class JsjdbgCtl extends BaseWebCtl {
 		return list;
 	}
 
+	/**
+	 * 审核流程
+	 * @param shyj 审核意见
+	 * @param id 主键ID
+	 * @param flag 同意true 不同意 false
+	 * @param fjzdids 其他附件ID
+	 * @param accids 附件ID
+	 * @param userids 用户ID
+	 * @return
+	 */
 	@RequestMapping(value = "/audit")
 	@ResponseBody
 	public WebJsonResult audit(String shyj, String id, boolean flag, String fjzdids, String accids, String userids) {
@@ -1341,6 +1361,7 @@ public class JsjdbgCtl extends BaseWebCtl {
 		return wr;
 	}
 
+	//保存附件
 	@RequestMapping(value = "/savefj")
 	@ResponseBody
 	public WebJsonResult savefj(Model model, JsjdbgfjEntity fjzd) {
@@ -1359,6 +1380,7 @@ public class JsjdbgCtl extends BaseWebCtl {
 		return wr;
 	}
 
+	//删除附件
 	@RequestMapping(value = "/delFile")
 	@ResponseBody
 	public WebJsonResult delFile(String id, Model model) {
@@ -1371,6 +1393,7 @@ public class JsjdbgCtl extends BaseWebCtl {
 		return wr;
 	}
 
+	//删除附件信息
 	@RequestMapping(value = "/delFjzd")
 	@ResponseBody
 	public WebJsonResult delFjzd(String id, Model model) {

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdbg/ctl/JsjdbgdsCtl.java

@@ -100,6 +100,22 @@ public class JsjdbgdsCtl extends BaseWebCtl {
 	@Autowired
 	private BwService bwService;
 
+	/**
+	 * 一览
+	 * @param page 分页
+	 * @param model
+	 * @param request
+	 * @param xmmc 项目名称
+	 * @param szgkid 所在港口ID
+	 * @param szgqid 所在港区ID
+	 * @param menuid
+	 * @param xmhzjbid
+	 * @param xmfr
+	 * @param szdid 所在地ID
+	 * @param sfyzjbzid
+	 * @return
+	 * @throws JsonProcessingException
+	 */
 	@RequestMapping(value = "/main")
 	@RequiresPermissions("jsjdbgds: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) throws JsonProcessingException {
@@ -187,7 +203,7 @@ public class JsjdbgdsCtl extends BaseWebCtl {
 			page.setPage(Integer.valueOf(String.valueOf(xmxxpage)));
 		}
 
-		page.setSort("createDateTime");
+		page.setSort("id");
 		page.setOrder("desc");
 		Page<JsjdbgEntity> list = query.findAll(spec, toPageRequest(page), JsjdbgEntity.class);
 		List<JsjdbgVo> voList = new ArrayList<JsjdbgVo>();
@@ -272,6 +288,7 @@ public class JsjdbgdsCtl extends BaseWebCtl {
 		return "gkjsgl/jsjdbg/jsjdbgdsmain";
 	}
 
+	//删除
 	@RequestMapping(value = "/delete")
 	@RequiresPermissions("jsjdbgds:delete")
 	@ResponseBody
@@ -294,6 +311,7 @@ public class JsjdbgdsCtl extends BaseWebCtl {
 		return wr;
 	}
 
+	//提交流程
 	@RequestMapping(value = "/submit")
 	@ResponseBody
 	public WebJsonResult submit(Model model, JsjdbgEntity code, String accids, String qtfjids, String qtfjzdids, String fjzdids, String sylxid, String ssjyrid, String fjids, String accid, String xmlxid, String tzlxid, String xmhzjbid, String axspjbid, String szdid, String szgkid, String szgqid, String zyhbwflid) {

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdcbsj/ctl/JsjdcbsjCtl.java

@@ -93,6 +93,22 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 	@Autowired
 	private BwService bwService;
 
+	/**
+	 * 一览
+	 * @param page 分页
+	 * @param model
+	 * @param request
+	 * @param xmmc 项目名称
+	 * @param szgkid 所在港口ID
+	 * @param szgqid 所在港区ID
+	 * @param menuid
+	 * @param xmhzjbid 
+	 * @param xmfr
+	 * @param szdid 所在地ID
+	 * @param sfyzjbzid
+	 * @return
+	 * @throws JsonProcessingException
+	 */
 	@RequestMapping(value = "/main")
 	@RequiresPermissions("jsjdcbsj: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) throws JsonProcessingException {
@@ -180,7 +196,7 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 			page.setPage(Integer.valueOf(String.valueOf(xmxxpage)));
 		}
 
-		page.setSort("createDateTime");
+		page.setSort("id");
 		page.setOrder("desc");
 		Page<JsjdcbsjEntity> list = query.findAll(spec, toPageRequest(page), JsjdcbsjEntity.class);
 		List<JsjdcbsjVo> voList = new ArrayList<JsjdcbsjVo>();
@@ -276,6 +292,12 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 		return "gkjsgl/jsjdcbsj/jsjdcbsjmain";
 	}
 
+	/**
+	 * 删除
+	 * @param model
+	 * @param id
+	 * @return
+	 */
 	@RequestMapping(value = "/delete")
 	@ResponseBody
 	@RequiresPermissions("jsjdcbsj:delete")
@@ -292,6 +314,25 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 		return wr;
 	}
 
+	/**
+	 * 提交流程
+	 * @param model
+	 * @param code
+	 * @param sylxid 
+	 * @param userids
+	 * @param ssjyrid
+	 * @param fjids
+	 * @param accid
+	 * @param xmlxid
+	 * @param tzlxid
+	 * @param xmhzjbid
+	 * @param axspjbid
+	 * @param szdid
+	 * @param szgkid
+	 * @param szgqid
+	 * @param zyhbwflid
+	 * @return
+	 */
 	@RequestMapping(value = "/submit")
 	@ResponseBody
 	public WebJsonResult submit(Model model, JsjdcbsjEntity code, String sylxid, String userids, String ssjyrid, String fjids, String accid, String xmlxid, String tzlxid, String xmhzjbid, String axspjbid, String szdid, String szgkid, String szgqid, String zyhbwflid) {
@@ -463,6 +504,24 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 		return wr;
 	}
 
+	/**
+	 * 退回提交流程
+	 * @param code
+	 * @param userids
+	 * @param sylxid
+	 * @param ssjyrid
+	 * @param fjids
+	 * @param accid
+	 * @param xmlxid
+	 * @param tzlxid
+	 * @param xmhzjbid
+	 * @param axspjbid
+	 * @param szdid
+	 * @param szgkid
+	 * @param szgqid
+	 * @param zyhbwflid
+	 * @return
+	 */
 	@RequestMapping(value = "/submitAudit")
 	@ResponseBody
 	public WebJsonResult submitAudit(JsjdcbsjEntity code, String userids, String sylxid, String ssjyrid, String fjids, String accid, String xmlxid, String tzlxid, String xmhzjbid, String axspjbid, String szdid, String szgkid, String szgqid, String zyhbwflid) {
@@ -558,6 +617,24 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 		return wr;
 	}
 
+	/**
+	 * 保存数据
+	 * @param model
+	 * @param code
+	 * @param ssjyrid
+	 * @param sylxid
+	 * @param fjids
+	 * @param accid
+	 * @param xmlxid
+	 * @param tzlxid
+	 * @param xmhzjbid
+	 * @param axspjbid
+	 * @param szdid
+	 * @param szgkid
+	 * @param szgqid
+	 * @param zyhbwflid
+	 * @return
+	 */
 	@RequestMapping(value = "/save")
 	@ResponseBody
 	public WebJsonResult save(Model model, JsjdcbsjEntity code, String ssjyrid, String sylxid, String fjids, String accid, String xmlxid, String tzlxid, String xmhzjbid, String axspjbid, String szdid, String szgkid, String szgqid, String zyhbwflid) {
@@ -744,6 +821,7 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 	 * wr.setMessage("同步失败"); } return wr; }
 	 */
 
+	//编辑
 	@RequestMapping(value = "/edit")
 	@RequiresPermissions("jsjdcbsj:edit")
 	public String edit(Model model, String id, String flag) {
@@ -875,6 +953,7 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 		return "gkjsgl/jsjdcbsj/jsjdcbsjedit";
 	}
 
+	//获取泊位数据
 	public void getbwlist(Model model, String bwids) {
 		if (!StringUtils.isEmpty(bwids)) {
 			List<BwVo> slist = new ArrayList<BwVo>();
@@ -944,6 +1023,7 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 		}
 	}
 
+	//查看
 	@RequestMapping(value = "/view")
 	public String view(Model model, String id, String flag, String opflag) {
 		model.addAttribute("flag", flag);
@@ -1185,6 +1265,7 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 		return "gkjsgl/jsjdcbsj/jsjdcbsjview";
 	}
 
+	//新增
 	@RequestMapping(value = "/add")
 	@RequiresPermissions("jsjdcbsj:add")
 	public String add(Model model) {
@@ -1216,6 +1297,7 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 		return "gkjsgl/jsjdcbsj/jsjdcbsjadd";
 	}
 
+	//选择项目类型
 	@RequestMapping(value = "/selectXmlx")
 	@ResponseBody
 	public List<CodeEntity> selectXmlx(Model model) {
@@ -1223,6 +1305,7 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 		return list;
 	}
 
+	//投资类型
 	@RequestMapping(value = "/selectTzlx")
 	@ResponseBody
 	public List<CodeEntity> selectTzlx(Model model) {
@@ -1230,6 +1313,7 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 		return list;
 	}
 
+	//项目核准级别
 	@RequestMapping(value = "/selectXmhzjb")
 	@ResponseBody
 	public List<CodeEntity> selectXmhzjb(Model model) {
@@ -1237,6 +1321,7 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 		return list;
 	}
 
+	//岸线审批级别
 	@RequestMapping(value = "/selectAxspjb")
 	@ResponseBody
 	public List<CodeEntity> selectAxspjb(Model model) {
@@ -1244,9 +1329,19 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 		return list;
 	}
 
+	/**
+	 * 审核流程
+	 * @param shyj 审核意见
+	 * @param id 主键ID
+	 * @param flag 同意true 不同意 false
+	 * @param accids 附件ID
+	 * @param userids 人员ID
+	 * @param fjzdids 其他附件ID
+	 * @return
+	 */
 	@RequestMapping(value = "/audit")
 	@ResponseBody
-	public WebJsonResult audit(String shyj, String id, boolean flag, String accids, String userids, String delid34, String delid35, String delid36, String delid37, String delid38, String fjzdids) {
+	public WebJsonResult audit(String shyj, String id, boolean flag, String accids, String userids, String fjzdids) {
 		WebJsonResult wr = success();
 		JsjdcbsjEntity entity = jsjdcbsjService.findOne(id);
 		if (!StringUtils.isEmpty(accids)) {
@@ -1371,6 +1466,7 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 		return wr;
 	}
 
+	//保存其他附件
 	@RequestMapping(value = "/savefj")
 	@ResponseBody
 	public WebJsonResult savefj(Model model, JsjdcbsjfjEntity fjzd) {
@@ -1389,6 +1485,7 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 		return wr;
 	}
 
+	//删除附件
 	@RequestMapping(value = "/delFile")
 	@ResponseBody
 	public WebJsonResult delFile(String id, Model model) {

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdcbsj/ctl/JsjdcbsjdsCtl.java

@@ -101,6 +101,28 @@ public class JsjdcbsjdsCtl extends BaseWebCtl {
 	@Autowired
 	private XmxxglService xmxxglService;
 
+	/**
+	 * 一览
+	 * 
+	 * @param page
+	 *            分页
+	 * @param model
+	 * @param request
+	 * @param xmmc
+	 *            项目名称
+	 * @param szgkid
+	 *            所在港口ID
+	 * @param szgqid
+	 *            所在港区ID
+	 * @param menuid
+	 * @param xmhzjbid
+	 * @param xmfr
+	 * @param szdid
+	 *            所在地ID
+	 * @param sfyzjbzid
+	 * @return
+	 * @throws JsonProcessingException
+	 */
 	@RequestMapping(value = "/main")
 	@RequiresPermissions("jsjdcbsjds: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) throws JsonProcessingException {
@@ -188,7 +210,7 @@ public class JsjdcbsjdsCtl extends BaseWebCtl {
 			page.setPage(Integer.valueOf(String.valueOf(xmxxpage)));
 		}
 
-		page.setSort("createDateTime");
+		page.setSort("id");
 		page.setOrder("desc");
 		Page<JsjdcbsjEntity> list = query.findAll(spec, toPageRequest(page), JsjdcbsjEntity.class);
 		List<JsjdcbsjVo> voList = new ArrayList<JsjdcbsjVo>();
@@ -201,7 +223,7 @@ public class JsjdcbsjdsCtl extends BaseWebCtl {
 					TaskInfoEntity info = taskInfoService.findByStep(entity.getId(), JsjdcbsjEntity.PROCESS_DEFINITION_KEYDS);
 					if (info != null) {
 						vo.setCurrentname(info.getCurrName());
-					}else{
+					} else {
 						vo.setCurrentname("未提交");
 					}
 					List<TaskInfoEntity> lists = taskInfoService.findByBusIdAndBusKeyAndRecordStatus(entity.getId(), JsjdcbsjEntity.PROCESS_DEFINITION_KEYDS);
@@ -286,6 +308,7 @@ public class JsjdcbsjdsCtl extends BaseWebCtl {
 		return "gkjsgl/jsjdcbsj/jsjdcbsjdsmain";
 	}
 
+	// 删除
 	@RequestMapping(value = "/delete")
 	@RequiresPermissions("jsjdcbsjds:delete")
 	@ResponseBody
@@ -302,6 +325,7 @@ public class JsjdcbsjdsCtl extends BaseWebCtl {
 		return wr;
 	}
 
+	// 提交流程
 	@RequestMapping(value = "/submit")
 	@ResponseBody
 	public WebJsonResult submit(Model model, JsjdcbsjEntity code, String accids, String qtfjids, String qtfjzdids, String fjzdids, String sylxid, String userids, String ssjyrid, String fjids, String accid, String xmlxid, String tzlxid, String xmhzjbid, String axspjbid, String szdid, String szgkid, String szgqid, String zyhbwflid) {
@@ -482,6 +506,7 @@ public class JsjdcbsjdsCtl extends BaseWebCtl {
 		return wr;
 	}
 
+	// 退回提交
 	@RequestMapping(value = "/submitAudit")
 	@ResponseBody
 	public WebJsonResult submitAudit(JsjdcbsjEntity code, String userids, String sylxid, String ssjyrid, String fjids, String accid, String xmlxid, String tzlxid, String xmhzjbid, String axspjbid, String szdid, String szgkid, String szgqid, String zyhbwflid) {
@@ -577,6 +602,7 @@ public class JsjdcbsjdsCtl extends BaseWebCtl {
 		return wr;
 	}
 
+	// 保存
 	@RequestMapping(value = "/save")
 	@ResponseBody
 	public WebJsonResult save(Model model, JsjdcbsjEntity code, String accids, String qtfjids, String qtfjzdids, String fjzdids, String ssjyrid, String sylxid, String fjids, String accid, String xmlxid, String tzlxid, String xmhzjbid, String axspjbid, String szdid, String szgkid, String szgqid, String zyhbwflid) {
@@ -757,19 +783,7 @@ public class JsjdcbsjdsCtl extends BaseWebCtl {
 		return wr;
 	}
 
-	/*
-	 * @RequestMapping(value = "/saveTbzt")
-	 * 
-	 * @ResponseBody public WebJsonResult saveTbzt(Model model, String id) {
-	 * WebJsonResult wr = success(); JsjdcbsjEntity entity =
-	 * jsjdcbsjService.findOne(id); entity.setSftb(Constants.YES);
-	 * jsjdcbsjService.save(entity); String url =
-	 * "/GK_OPERATION_JSJY_JSJDCBSJ_ONE_CP?condition=ID=" + id; boolean flag =
-	 * getTbStatus(url); if (flag) { entity.setTbzt(Constants.YES);
-	 * jsjdcbsjService.save(entity); } else { wr.setSuccess(false);
-	 * wr.setMessage("同步失败"); } return wr; }
-	 */
-
+	// 编辑数据
 	@RequestMapping(value = "/edit")
 	@RequiresPermissions("jsjdcbsjds:edit")
 	public String edit(Model model, String id, String flag) {
@@ -818,7 +832,7 @@ public class JsjdcbsjdsCtl extends BaseWebCtl {
 				fjnamevo.setXhbz(accessoryList.get(i).getRemark().substring(2, accessoryList.get(i).getRemark().length()));
 				fjnamevo.setFjid(accid);
 				fjnamevo.setFjmc(accessoryList.get(i).getName());
-				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)  && GlobalData.FTP_FLAG.equals(Constants.YES)) {
+				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY) && GlobalData.FTP_FLAG.equals(Constants.YES)) {
 					try {
 						Ftp f = getftp();
 						// 本地目录
@@ -901,6 +915,7 @@ public class JsjdcbsjdsCtl extends BaseWebCtl {
 		return "gkjsgl/jsjdcbsj/jsjdcbsjdsedit";
 	}
 
+	// 获取泊位数据
 	public void getbwlist(Model model, String bwids) {
 		if (!StringUtils.isEmpty(bwids)) {
 			List<BwVo> slist = new ArrayList<BwVo>();
@@ -970,6 +985,7 @@ public class JsjdcbsjdsCtl extends BaseWebCtl {
 		}
 	}
 
+	// 查看
 	@RequestMapping(value = "/view")
 	public String view(Model model, String id, String flag, String opflag) {
 		model.addAttribute("flag", flag);
@@ -1211,6 +1227,8 @@ public class JsjdcbsjdsCtl extends BaseWebCtl {
 		return "gkjsgl/jsjdcbsj/jsjdcbsjdsview";
 	}
 
+	
+	//新增
 	@RequestMapping(value = "/add")
 	@RequiresPermissions("jsjdcbsjds:add")
 	public String add(Model model) {
@@ -1242,6 +1260,7 @@ public class JsjdcbsjdsCtl extends BaseWebCtl {
 		return "gkjsgl/jsjdcbsj/jsjdcbsjdsadd";
 	}
 
+	//项目选择
 	@RequestMapping(value = "/selectXmlx")
 	@ResponseBody
 	public List<CodeEntity> selectXmlx(Model model) {
@@ -1249,6 +1268,7 @@ public class JsjdcbsjdsCtl extends BaseWebCtl {
 		return list;
 	}
 
+	//投资类型
 	@RequestMapping(value = "/selectTzlx")
 	@ResponseBody
 	public List<CodeEntity> selectTzlx(Model model) {
@@ -1256,6 +1276,7 @@ public class JsjdcbsjdsCtl extends BaseWebCtl {
 		return list;
 	}
 
+	//项目核准级别
 	@RequestMapping(value = "/selectXmhzjb")
 	@ResponseBody
 	public List<CodeEntity> selectXmhzjb(Model model) {
@@ -1263,6 +1284,7 @@ public class JsjdcbsjdsCtl extends BaseWebCtl {
 		return list;
 	}
 
+	//岸线审批级别
 	@RequestMapping(value = "/selectAxspjb")
 	@ResponseBody
 	public List<CodeEntity> selectAxspjb(Model model) {
@@ -1270,9 +1292,19 @@ public class JsjdcbsjdsCtl extends BaseWebCtl {
 		return list;
 	}
 
+	/**
+	 * 审核流程
+	 * @param shyj 审核意见
+	 * @param id 主键ID
+	 * @param flag 同意true 不同意 false
+	 * @param accid 附件ID
+	 * @param userids 用户ID
+	 * @param fjzdids
+	 * @return
+	 */
 	@RequestMapping(value = "/audit")
 	@ResponseBody
-	public WebJsonResult audit(String shyj, String id, boolean flag, String accid, String userids, String delid34, String delid35, String delid36, String delid37, String delid38, String fjzdids) {
+	public WebJsonResult audit(String shyj, String id, boolean flag, String accid, String userids,String fjzdids) {
 		WebJsonResult wr = success();
 		JsjdcbsjEntity entity = jsjdcbsjdsService.findOne(id);
 		if (!StringUtils.isEmpty(accid)) {
@@ -1308,19 +1340,6 @@ public class JsjdcbsjdsCtl extends BaseWebCtl {
 			}
 
 			jsjdcbsjdsService.changeAudit(shyj, entity, flag, userids);
-			/*
-			 * if (flowflag) { if (flag) {// 流程完成状态 2.审核通过1.退回地市
-			 * entity.setFlowstatus("2"); } else { entity.setFlowstatus("1"); }
-			 * entity.setSftb(Constants.YES); entity =
-			 * jsjdcbsjdsService.save(entity); // 如果是省级审核通过或不通过后同步到市级 try {
-			 * String url = "/GK_OPERATION_JSJY_JSJDCBSJ_ONE_PC?condition=ID=" +
-			 * entity.getId(); boolean tbflag = getTbStatus(url); if (tbflag) {
-			 * entity.setTbzt("Y"); jsjdcbsjdsService.save(entity); } } catch
-			 * (Exception e) { e.printStackTrace(); }
-			 * 
-			 * } else { // rtx提醒 if (!StringUtils.isEmpty(userids)) {
-			 * rtxSend(userids, "", "你有一条建设进度初步设计申请待办事务，请及时处理！"); } }
-			 */
 		} catch (Exception e) {
 			wr.setSuccess(false);
 			wr.setMessage("操作失败！");
@@ -1384,6 +1403,7 @@ public class JsjdcbsjdsCtl extends BaseWebCtl {
 		return wr;
 	}
 
+	//保存附件
 	@RequestMapping(value = "/savefj")
 	@ResponseBody
 	public WebJsonResult savefj(Model model, JsjdcbsjfjEntity fjzd) {
@@ -1402,6 +1422,7 @@ public class JsjdcbsjdsCtl extends BaseWebCtl {
 		return wr;
 	}
 
+	//其他附件
 	@RequestMapping(value = "/saveQtfj")
 	@ResponseBody
 	public WebJsonResult saveQtfj(String opflag, MultipartFile qtfilename, Model model) {
@@ -1446,6 +1467,7 @@ public class JsjdcbsjdsCtl extends BaseWebCtl {
 		return jsjd;
 	}
 
+	//删除附件
 	@RequestMapping(value = "/delFile")
 	@ResponseBody
 	public WebJsonResult delFile(String id, Model model) {
@@ -1469,6 +1491,7 @@ public class JsjdcbsjdsCtl extends BaseWebCtl {
 		return wr;
 	}
 
+	//选择项目
 	@RequestMapping(value = "/choose")
 	public String choose(Model model, String id) {
 		XmxxglEntity entity = xmxxglService.findOne(id);
@@ -1589,6 +1612,7 @@ public class JsjdcbsjdsCtl extends BaseWebCtl {
 		return wr;
 	}
 
+	//同步省级数据 
 	@RequestMapping(value = "/saveTbzt")
 	@ResponseBody
 	public WebJsonResult saveTbzt(Model model, String id, String spflag) {
@@ -1600,7 +1624,7 @@ public class JsjdcbsjdsCtl extends BaseWebCtl {
 
 		String url = "GK_OPERATION_JSJY_JSJDCBSJ_ONE_CP?condition=ID=" + id;
 
-		boolean flag = getTbStatus(url,null);
+		boolean flag = getTbStatus(url, null);
 		if (flag) {
 			entity.setFlowstatus("0");
 			entity.setTbzt(Constants.YES);
@@ -1643,6 +1667,7 @@ public class JsjdcbsjdsCtl extends BaseWebCtl {
 		}
 	}
 
+	//新增其他附件
 	@RequestMapping(value = "/xinzengqtfj")
 	@ResponseBody
 	public WebJsonResult xinzengqtfj(String opflag, String qtfjid, String id, Model model, String qtfbdw, Date qtfbsj, String qtwjh) {

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdgl/ctl/JsjdglCtl.java

@@ -103,6 +103,22 @@ public class JsjdglCtl extends BaseWebCtl {
 	@Autowired
 	private BwService bwService;
 
+	/**
+	 * 一览
+	 * @param page 分页
+	 * @param model
+	 * @param request
+	 * @param xmmc 项目信息
+	 * @param szdid 所在地ID
+	 * @param szgkid 所在港口ID
+	 * @param szgqid 所在港区ID
+	 * @param menuid
+	 * @param dqzt
+	 * @param xmfr
+	 * @param lcjd
+	 * @return
+	 * @throws JsonProcessingException
+	 */
 	@RequestMapping(value = "/main")
 	@RequiresPermissions("jsjdgl:main")
 	public String main(SimplePageRequest page, Model model, final HttpServletRequest request, final String xmmc, final String szdid, final String szgkid, final String szgqid, String menuid, final String dqzt, final String xmfr, final String lcjd) throws JsonProcessingException {
@@ -238,7 +254,7 @@ public class JsjdglCtl extends BaseWebCtl {
 			}
 			page.setPage(Integer.valueOf(String.valueOf(jsjdpage)));
 		}
-		page.setSort("createDateTime");
+		page.setSort("id");
 		page.setOrder("desc");
 		Page<XmxxglEntity> list = query.findAll(spec, toPageRequest(page), XmxxglEntity.class);
 
@@ -330,6 +346,7 @@ public class JsjdglCtl extends BaseWebCtl {
 		return "gkjsgl/jsjdgl/jsjdglmain";
 	}
 
+	//保存附件
 	@RequestMapping(value = "/savefj")
 	@ResponseBody
 	public WebJsonResult savefj(Model model, JsjdfjEntity fjzd) {
@@ -348,6 +365,7 @@ public class JsjdglCtl extends BaseWebCtl {
 		return wr;
 	}
 
+	//同步省级数据
 	@RequestMapping(value = "/saveTbzt")
 	@ResponseBody
 	public WebJsonResult saveTbzt(Model model, String id, String spflag) {
@@ -378,6 +396,7 @@ public class JsjdglCtl extends BaseWebCtl {
 		return wr;
 	}
 
+	//保存数据
 	@RequestMapping(value = "/save")
 	@RequiresPermissions("jsjdgl:add")
 	@ResponseBody
@@ -591,6 +610,7 @@ public class JsjdglCtl extends BaseWebCtl {
 		}
 	}
 
+	//编辑数据
 	@RequestMapping(value = "/edit")
 	@RequiresPermissions("jsjdgl:edit")
 	public String edit(Model model, String id, String flag, String fhbz, String path, String type) {
@@ -713,6 +733,7 @@ public class JsjdglCtl extends BaseWebCtl {
 		return "gkjsgl/jsjdgl/jsjdgledit";
 	}
 
+	//流程历史
 	public void Tasklist(Model model, List<TaskInfoEntity> list, String id) {
 		if (list != null & list.size() > 0) {
 			TaskInfoEntity taskinfo = list.get(0);
@@ -784,6 +805,7 @@ public class JsjdglCtl extends BaseWebCtl {
 		}
 	}
 
+	//查看
 	@RequestMapping(value = "/view")
 	@RequiresPermissions("jsjdgl:main")
 	public String view(Model model, String id, String flag, String fhbz, String menuid) {
@@ -972,6 +994,7 @@ public class JsjdglCtl extends BaseWebCtl {
 		}
 	}
 
+	//其他附件
 	public void qtfjgtview(Model model, List<AccessoryEntity> acclist, String opflag) {
 		SimpleDateFormat dateFormater = new SimpleDateFormat("yyyy-MM-dd");
 		List<JsjdfjVo> fjvolist = new ArrayList<JsjdfjVo>();
@@ -999,12 +1022,14 @@ public class JsjdglCtl extends BaseWebCtl {
 
 	}
 
+	//新增
 	@RequestMapping(value = "/add")
 	@RequiresPermissions("jsjdgl:add")
 	public String add(Model model) {
 		return "gkjsgl/jsjdgl/jsjdgladd";
 	}
 
+	//保存附件
 	@RequestMapping(value = "/saveFile")
 	@ResponseBody
 	public WebJsonResult saveFile(String ssid, MultipartFile filename, Model model) {
@@ -1019,6 +1044,7 @@ public class JsjdglCtl extends BaseWebCtl {
 		return wr;
 	}
 
+	//删除附件
 	@RequestMapping(value = "/delFjzd")
 	@ResponseBody
 	public WebJsonResult delFjzd(String id, Model model) {
@@ -1089,6 +1115,7 @@ public class JsjdglCtl extends BaseWebCtl {
 		return wr;
 	}
 
+	//选择项目
 	@RequestMapping(value = "/choose")
 	public String choose(Model model, String id) {
 		XmxxglEntity entity = xmxxglService.findOne(id);
@@ -1156,6 +1183,7 @@ public class JsjdglCtl extends BaseWebCtl {
 		return "gkjsgl/jsjdgl/jsjdgladd";
 	}
 
+	//获取泊位信息
 	public void getbwlist(Model model, String bwids) {
 		if (!StringUtils.isEmpty(bwids)) {
 			List<BwVo> slist = new ArrayList<BwVo>();
@@ -1225,6 +1253,7 @@ public class JsjdglCtl extends BaseWebCtl {
 		}
 	}
 
+	//提交信息
 	@RequestMapping(value = "/submit")
 	@ResponseBody
 	public WebJsonResult submit(Model model, XmxxglEntity code, String fjzdids, String accids, String xmlxid, String tzlxid, String xmhzjbid, String axspjbid, String szgkid, String szgqid, String qtfjzdids, String qtfjids, String delid11, String zyhbwflid) {
@@ -1386,6 +1415,54 @@ public class JsjdglCtl extends BaseWebCtl {
 		return wr;
 	}
 
+	/**
+	 * 审核流程
+	 * @param code
+	 * @param spflag
+	 * @param fjzdids
+	 * @param accids
+	 * @param xmlxid
+	 * @param tzlxid
+	 * @param xmhzjbid
+	 * @param axspjbid
+	 * @param szgkid
+	 * @param szgqid
+	 * @param flag
+	 * @param shyj
+	 * @param qtfjzdids
+	 * @param qtfjids
+	 * @param delid11
+	 * @param delid21
+	 * @param delid31
+	 * @param delid32
+	 * @param delid33
+	 * @param delid34
+	 * @param delid35
+	 * @param delid36
+	 * @param delid37
+	 * @param delid38
+	 * @param delid41
+	 * @param delid42
+	 * @param delid51
+	 * @param delid52
+	 * @param delid53
+	 * @param delid54
+	 * @param delid55
+	 * @param delid56
+	 * @param delid61
+	 * @param delid62
+	 * @param delid71
+	 * @param delid72
+	 * @param delid81
+	 * @param delid82
+	 * @param delid83
+	 * @param delid84
+	 * @param delid85
+	 * @param opflag
+	 * @param sfjyr
+	 * @param zyhbwflid
+	 * @return
+	 */
 	@RequestMapping(value = "/audit")
 	@ResponseBody
 	public WebJsonResult audit(XmxxglEntity code, String spflag, String fjzdids, String accids, String xmlxid, String tzlxid, String xmhzjbid, String axspjbid, String szgkid, String szgqid, boolean flag, String shyj, String qtfjzdids, String qtfjids, String delid11, String delid21, String delid31, String delid32, String delid33, String delid34, String delid35, String delid36, String delid37, String delid38, String delid41, String delid42, String delid51, String delid52, String delid53, String delid54, String delid55, String delid56, String delid61, String delid62, String delid71, String delid72, String delid81, String delid82, String delid83, String delid84, String delid85, String opflag, String sfjyr, String zyhbwflid) {
@@ -1836,6 +1913,7 @@ public class JsjdglCtl extends BaseWebCtl {
 		return wr;
 	}
 
+	//编辑
 	@RequestMapping(value = "/xiugai")
 	public String xiugai(Model model, String id) {
 		// 附件
@@ -1914,6 +1992,7 @@ public class JsjdglCtl extends BaseWebCtl {
 		return "gkjsgl/jsjdgl/jsjdglxiugai";
 	}
 
+	//保存其他附件
 	@RequestMapping(value = "/saveQtfj")
 	@ResponseBody
 	public WebJsonResult saveQtfj(String opflag, MultipartFile qtfilename, Model model) {
@@ -1930,6 +2009,7 @@ public class JsjdglCtl extends BaseWebCtl {
 		return wr;
 	}
 
+	//新增其他附件
 	@RequestMapping(value = "/xinzengqtfj")
 	@ResponseBody
 	public WebJsonResult xinzengqtfj(String opflag, String qtfjid, String id, Model model, String qtfbdw, Date qtfbsj, String qtwjh) {
@@ -1986,6 +2066,7 @@ public class JsjdglCtl extends BaseWebCtl {
 		return jsjd;
 	}
 
+	//显示其他附件
 	@RequestMapping(value = "/showqtfj")
 	@ResponseBody
 	public List<JsjdfjVo> showqtfj(String id, String opflag, Model model) {

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdgl/ctl/JsjdglCtl2.java

@@ -189,7 +189,7 @@ public class JsjdglCtl2 extends BaseWebCtl {
 			}
 			page.setPage(Integer.valueOf(String.valueOf(jsjdpage)));
 		}
-		page.setSort("createDateTime");
+		page.setSort("id");
 		page.setOrder("desc");
 		Page<XmxxglEntity> list = query.findAll(spec, toPageRequest(page), XmxxglEntity.class);
 

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdzx/ctl/JsjdzxCtl.java

@@ -170,7 +170,7 @@ public class JsjdzxCtl extends BaseWebCtl {
 			page.setPage(Integer.valueOf(String.valueOf(xmxxpage)));
 		}
 
-		page.setSort("createDateTime");
+		page.setSort("id");
 		page.setOrder("desc");
 		Page<JsjdzxEntity> list = query.findAll(spec, toPageRequest(page), JsjdzxEntity.class);
 		List<JsjdzxVo> voList = new ArrayList<JsjdzxVo>();

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/tzjhgl/ctl/TzjhglCtl.java

@@ -213,7 +213,7 @@ public class TzjhglCtl extends BaseWebCtl {
 			}
 			page.setPage(Integer.valueOf(String.valueOf(tzjhpage)));
 		}
-		page.setSort("createDateTime");
+		page.setSort("id");
 		page.setOrder("desc");
 		Page<TzjhglEntity> list = query.findAll(spec, toPageRequest(page), TzjhglEntity.class);
 		List<TzjhglVo> voList = new ArrayList<TzjhglVo>();

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

@@ -222,7 +222,7 @@ public class XmxxglCtl extends BaseWebCtl {
 			page.setPage(Integer.valueOf(String.valueOf(xmxxpage)));
 		}
 
-		page.setSort("createDateTime");
+		page.setSort("id");
 		page.setOrder("desc");
 		Page<XmxxglEntity> list = query.findAll(spec, toPageRequest(page), XmxxglEntity.class);
 		List<XmxxglVo> voList = new ArrayList<XmxxglVo>();
@@ -761,9 +761,11 @@ public class XmxxglCtl extends BaseWebCtl {
 			jyr = gkjyrService.findOne(user.getSsjyr().getId());
 		} else {
 			XzglbmxxEntity glbm = user.getSsglbm();
-			List<GkEntity> list = gkService.findByGlbm(glbm.getId());
-			if (list != null && list.size() > 0) {
-				model.addAttribute("gk_glbm", list.get(0).getXzqh());
+			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());
+				}
 			}
 		}
 		model.addAttribute("jyr", jyr);

gkjsjy/trunk/src/com/xt/jygl/gkjygl/cghzyxxgl/dcsb/ctl/DcsbCtl.java

@@ -65,6 +65,26 @@ public class DcsbCtl extends BaseWebCtl {
 	@Autowired
 	private TaskInfoService taskInfoService;
 
+	/**
+	 * 一览
+	 * @param page 分页
+	 * @param model
+	 * @param gkjyr 经营人
+	 * @param szdid 所在地ID
+	 * @param szgkid 所在港口ID
+	 * @param szgqid 所在港区ID
+	 * @param zypmc 作业品名称
+	 * @param bh 编辑
+	 * @param hwzl 货物种类
+	 * @param shzt 审核状态
+	 * @param menuid 
+	 * @param zysjq
+	 * @param dydlid
+	 * @param zysjz
+	 * @param request
+	 * @return
+	 * @throws JsonProcessingException
+	 */
 	@RequestMapping(value = "/main")
 	//@RequiresPermissions("dcsb:main")
 	public String main(SimplePageRequest page, Model model, final String gkjyr, final String szdid, final String szgkid, final String szgqid, final String zypmc, final String bh, final String hwzl, final String shzt, final String menuid, final Date zysjq, final String dydlid, final Date zysjz, final HttpServletRequest request) throws JsonProcessingException {
@@ -83,12 +103,6 @@ public class DcsbCtl extends BaseWebCtl {
 						list.add(cb.like(root.get("ssjyr").get("gkjyr").as(String.class), "%" + v + "%"));
 					}
 				}
-				// else if(StringUtils.isNotEmpty(SearchCondition.dcsbjyr) &&
-				// isGET(request)){
-				// list.add(cb.like(
-				// root.get("ssjyr").get("gkjyr").as(String.class),
-				// "%" + SearchCondition.dcsbjyr + "%"));
-				// }
 
 				if (StringUtils.isNotEmpty(szdid)) {
 					list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + szdid + "%"));
@@ -98,13 +112,7 @@ public class DcsbCtl extends BaseWebCtl {
 						list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + v + "%"));
 					}
 				}
-				// else if(StringUtils.isNotEmpty(SearchCondition.dcsbszd) &&
-				// isGET(request)){
-				// list.add(cb.like(
-				// root.get("szd").get("id").as(String.class), "%"
-				// + SearchCondition.dcsbszd + "%"));
-				// }
-				//
+			
 				if (StringUtils.isNotEmpty(szgkid)) {
 					list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + szgkid + "%"));
 				} else if (isGET(request)) {
@@ -113,11 +121,6 @@ public class DcsbCtl extends BaseWebCtl {
 						list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + v + "%"));
 					}
 				}
-				// else if(StringUtils.isNotEmpty(SearchCondition.dcsbszgk) &&
-				// isGET(request)){
-				// list.add(cb.like(root.get("szgk").get("id")
-				// .as(String.class), "%" + SearchCondition.dcsbszgk + "%"));
-				// }
 
 				if (StringUtils.isNotEmpty(szgqid)) {
 					list.add(cb.like(root.get("szgq").get("id").as(String.class), "%" + szgqid + "%"));
@@ -127,11 +130,6 @@ public class DcsbCtl extends BaseWebCtl {
 						list.add(cb.like(root.get("szgq").get("id").as(String.class), "%" + v + "%"));
 					}
 				}
-				// else if(StringUtils.isNotEmpty(SearchCondition.dcsbszgq) &&
-				// isGET(request)){
-				// list.add(cb.like(root.get("szgq").get("id")
-				// .as(String.class), "%" + SearchCondition.dcsbszgq + "%"));
-				// }
 
 				if (StringUtils.isNotEmpty(zypmc)) {
 					list.add(cb.like(root.get("zypmc").as(String.class), "%" + zypmc + "%"));
@@ -141,28 +139,14 @@ public class DcsbCtl extends BaseWebCtl {
 						list.add(cb.like(root.get("zypmc").as(String.class), "%" + v + "%"));
 					}
 				}
-				// else if(StringUtils.isNotEmpty(SearchCondition.dcsbzypmc) &&
-				// isGET(request)){
-				// list.add(cb.like(root.get("zypmc").as(String.class), "%"
-				// + SearchCondition.dcsbzypmc + "%"));
-				// }
-				/*
-				 * if (StringUtils.isNotEmpty(bh)) {
-				 * list.add(cb.like(root.get("bh").as(String.class), "%" + bh +
-				 * "%")); }
-				 */
+				
 				if (StringUtils.isNotEmpty(dydlid)) {
 					list.add(cb.equal(root.get("hwzl").get("id").as(String.class), dydlid));
 				} else if (isGET(request)) {
-					// list.add(cb.equal(root.get("hwzl").as(String.class),
-					// SearchCondition.ybbhwzl));
+					
 					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, "id", "hwzl", "dydlid");
 				}
-				// else if(StringUtils.isNotEmpty(SearchCondition.dcsbhwzl) &&
-				// isGET(request)){
-				// list.add(cb.like(root.get("hwzl").as(String.class), "%"
-				// + SearchCondition.dcsbhwzl + "%"));
-				// }
+				
 
 				if (StringUtils.isNotEmpty(shzt)) {
 					list.add(cb.like(root.get("shzt").as(String.class), "%" + shzt + "%"));
@@ -172,12 +156,7 @@ public class DcsbCtl extends BaseWebCtl {
 						list.add(cb.like(root.get("shzt").as(String.class), "%" + v + "%"));
 					}
 				}
-				// else if(StringUtils.isNotEmpty(SearchCondition.dcsbshzt) &&
-				// isGET(request)){
-				// list.add(cb.like(root.get("shzt").as(String.class), "%"
-				// + SearchCondition.dcsbshzt + "%"));
-				// }
-				//
+				
 				if (null != zysjq) {
 					if (StringUtils.isNotEmpty(new SimpleDateFormat("yyyy-MM-dd").format(zysjq))) {
 						list.add(cb.equal(root.get("zysjq").as(Date.class), zysjq));
@@ -187,12 +166,7 @@ public class DcsbCtl extends BaseWebCtl {
 							list.add(cb.equal(root.get("zysjq").as(Date.class), v));
 						}
 					}
-					// else if(StringUtils.isNotEmpty(new SimpleDateFormat(
-					// "yyyy-MM-dd").format(SearchCondition.dcsbzysjq)) &&
-					// isGET(request)){
-					// list.add(cb.equal(root.get("zysjq").as(Date.class),
-					// SearchCondition.dcsbzysjq));
-					// }
+				
 				}
 				if (null != zysjz) {
 					if (StringUtils.isNotEmpty(new SimpleDateFormat("yyyy-MM-dd").format(zysjz))) {
@@ -203,12 +177,7 @@ public class DcsbCtl extends BaseWebCtl {
 							list.add(cb.equal(root.get("zysjz").as(Date.class), v));
 						}
 					}
-					// else if(StringUtils.isNotEmpty(new SimpleDateFormat(
-					// "yyyy-MM-dd").format(SearchCondition.dcsbzysjz)) &&
-					// isGET(request)){
-					// list.add(cb.equal(root.get("zysjz").as(Date.class),
-					// SearchCondition.dcsbzysjz));
-					// }
+				
 				}
 				// 经营人只能查看自己企业下的数据，非经营人只能查看自己所在地的数据
 				if (isJyr()) {
@@ -247,9 +216,6 @@ public class DcsbCtl extends BaseWebCtl {
 		}
 		Utils.getSession().setAttribute("userpre", user2);
 
-		// if (page.getPage() < 1) {
-		// page.setPage(SearchCondition.dcsbpage);
-		// }
 		if (page.getPage() < 1) {
 			Object dcsbpage = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "dcsbpage");
 			if (StringUtils.isEmpty(dcsbpage) || !org.apache.commons.lang.StringUtils.isNumeric(String.valueOf(dcsbpage))) {
@@ -289,47 +255,7 @@ public class DcsbCtl extends BaseWebCtl {
 				voList.add(vo);
 			}
 		}
-		// model.addAttribute("list", voList);
-		// model.addAttribute("gkjyr", isPOST(request)
-		// ?gkjyr:SearchCondition.dcsbjyr);
-		// model.addAttribute("szgk", isPOST(request)
-		// ?szgkid:SearchCondition.dcsbszgk);
-		// model.addAttribute("szd", isPOST(request)
-		// ?szdid:SearchCondition.dcsbszd);
-		// model.addAttribute("zypmc", isPOST(request)
-		// ?zypmc:SearchCondition.dcsbzypmc);
-		// model.addAttribute("szgq", isPOST(request)
-		// ?szgqid:SearchCondition.dcsbszgq);
-		// model.addAttribute("bh", bh);
-		// model.addAttribute("hwzl", isPOST(request)
-		// ?hwzl:SearchCondition.dcsbhwzl);
-		// model.addAttribute("shzt", isPOST(request)
-		// ?shzt:SearchCondition.dcsbshzt);
-		// if (null != zysjq) {
-		// model.addAttribute("zysjq",
-		// isPOST(request) ?new SimpleDateFormat("yyyy-MM-dd").format(zysjq):
-		// new
-		// SimpleDateFormat("yyyy-MM-dd").format(SearchCondition.dcsbzysjq));
-		// }
-		// if (null != zysjz) {
-		// model.addAttribute("zysjz",
-		// isPOST(request) ?new SimpleDateFormat("yyyy-MM-dd").format(zysjz):
-		// new
-		// SimpleDateFormat("yyyy-MM-dd").format(SearchCondition.dcsbzysjz));
-		// }
-		//
-		// if (isPOST(request)) {
-		// SearchCondition.dcsbpage = page.getPage();
-		// SearchCondition.dcsbjyr = gkjyr;
-		// SearchCondition.dcsbszd = szdid;
-		// SearchCondition.dcsbszgk = szgkid;
-		// SearchCondition.dcsbszgq = szgqid;
-		// SearchCondition.dcsbzypmc = zypmc;
-		// SearchCondition.dcsbhwzl = hwzl;
-		// SearchCondition.dcsbshzt = shzt;
-		// SearchCondition.dcsbzysjq = zysjq;
-		// SearchCondition.dcsbzysjz = zysjz;
-		// }
+	
 		if (isPOST(request)) {
 			cacheSCmap.put("dcsbpage", page.getPage());
 			CacheSearchCondition.putCacheSCmap(request.getParameterMap(), cacheSCmap);
@@ -391,24 +317,7 @@ public class DcsbCtl extends BaseWebCtl {
 	@RequestMapping(value = "/add")
 	//@RequiresPermissions("dcsb:add")
 	public String add(Model model) {
-		/*
-		 * SimpleDateFormat dateTimeFormat = new SimpleDateFormat("yyyy-MM-dd");
-		 * Date today = new Date(); String sTime =
-		 * dateTimeFormat.format(today)+" 00:00:00 "; String eTime =
-		 * dateTimeFormat.format(today)+" 23:59:59 "; Object count =
-		 * dcsbService.selectCount(sTime,eTime);
-		 * 
-		 * dateTimeFormat = new SimpleDateFormat("yyyyMMdd"); String bh =
-		 * GlobalData.DSJC + dateTimeFormat.format(today);
-		 * 
-		 * 
-		 * if (!StringUtils.isEmpty(count)) { String num = count.toString(); num
-		 * = num.substring(num.length() - 3); int n = Integer.parseInt(num) + 1;
-		 * if (n < 9) { bh = bh + "00" + n; } else if (n < 99) { bh = bh + "0" +
-		 * n; } else { bh = bh + n; } } else { bh = bh + "001"; }
-		 * 
-		 * model.addAttribute("bh", bh);
-		 */
+	
 		UserEntity user = securityMgr.getCurrUser();
 		if (user.getSsjyr() != null) {
 			GkjyrEntity jyr = gkjyrService.findOne(user.getSsjyr().getId());
@@ -419,11 +328,7 @@ public class DcsbCtl extends BaseWebCtl {
 		SimpleDateFormat dateTimeFormat = new SimpleDateFormat("yyyy-MM-dd");
 		Date today = new Date();
 		model.addAttribute("bgsj", dateTimeFormat.format(today));
-		/*
-		 * List<CodeEntity> hwzlList = securityMgr.codeService()
-		 * .findValidCodesByGroupCode(Constants.GROUP_CODE_HWZL);
-		 * model.addAttribute("hwzlList", hwzlList);
-		 */
+	
 		return "gkjygl/cghzyxxgl/dcsb/dcsbadd";
 	}
 
@@ -447,11 +352,7 @@ public class DcsbCtl extends BaseWebCtl {
 		}
 		model.addAttribute("record", entity);
 		model.addAttribute("recordvo", vo);
-		/*
-		 * List<CodeEntity> hwzlList = securityMgr.codeService()
-		 * .findValidCodesByGroupCode(Constants.GROUP_CODE_HWZL);
-		 * model.addAttribute("hwzlList", hwzlList);
-		 */
+		
 		return "gkjygl/cghzyxxgl/dcsb/dcsbview";
 	}
 
@@ -468,11 +369,7 @@ public class DcsbCtl extends BaseWebCtl {
 		vo.setHwzldedl(entity.getHwzldedl() != null ? entity.getHwzldedl().getId() : "");
 		model.addAttribute("record", entity);
 		model.addAttribute("recordvo", vo);
-		/*
-		 * List<CodeEntity> hwzlList = securityMgr.codeService()
-		 * .findValidCodesByGroupCode(Constants.GROUP_CODE_HWZL);
-		 * model.addAttribute("hwzlList", hwzlList);
-		 */
+		
 		return "gkjygl/cghzyxxgl/dcsb/dcsbedit";
 	}
 
@@ -506,12 +403,7 @@ public class DcsbCtl extends BaseWebCtl {
 			wr.setMessage("请填写 进出港！");
 			return wr;
 		}
-		/*
-		 * if (StringUtils.isEmpty(dcsb.getXg())) { wr.setSuccess(false);
-		 * wr.setMessage("请填写 下港！"); return wr; } if
-		 * (StringUtils.isEmpty(dcsb.getSg())) { wr.setSuccess(false);
-		 * wr.setMessage("请填写 上港 ！"); return wr; }
-		 */
+		
 		if (StringUtils.isEmpty(nwmid)) {
 			wr.setSuccess(false);
 			wr.setMessage("请填写 内外贸！");
@@ -527,10 +419,7 @@ public class DcsbCtl extends BaseWebCtl {
 			wr.setMessage("请填写 作业时间止！");
 			return wr;
 		}
-		/*
-		 * if (StringUtils.isEmpty(dcsb.getZydd())) { wr.setSuccess(false);
-		 * wr.setMessage("请填写 作业地点！"); return wr; }
-		 */
+	
 
 		DcsbEntity entity = new DcsbEntity();
 		try {
@@ -634,7 +523,7 @@ public class DcsbCtl extends BaseWebCtl {
 		return wr;
 	}
 
-	// 保存
+	// 提交流程
 	@RequestMapping(value = "/submit")
 	@ResponseBody
 	public WebJsonResult submit(Model model, DcsbEntity dcsb, String jyrid, String mtid, String bwid, String jcgid, String nwmid, String dydlid, String dedlid) {
@@ -664,12 +553,7 @@ public class DcsbCtl extends BaseWebCtl {
 			wr.setMessage("请填写 进出港！");
 			return wr;
 		}
-		/*
-		 * if (StringUtils.isEmpty(dcsb.getXg())) { wr.setSuccess(false);
-		 * wr.setMessage("请填写 下港！"); return wr; } if
-		 * (StringUtils.isEmpty(dcsb.getSg())) { wr.setSuccess(false);
-		 * wr.setMessage("请填写 上港 ！"); return wr; }
-		 */
+		
 		if (StringUtils.isEmpty(nwmid)) {
 			wr.setSuccess(false);
 			wr.setMessage("请填写 内外贸！");
@@ -786,6 +670,7 @@ public class DcsbCtl extends BaseWebCtl {
 		return wr;
 	}
 
+	//退回提交流程
 	@RequestMapping(value = "/submitAudit")
 	@ResponseBody
 	public WebJsonResult submitAudit(Model model, DcsbEntity dcsb, String jyrid, String mtid, String bwid, String jcgid, String nwmid, String dydlid, String dedlid) {
@@ -923,6 +808,13 @@ public class DcsbCtl extends BaseWebCtl {
 		return wr;
 	}
 
+	/**
+	 * 审核流程
+	 * @param shyj 审核意见
+	 * @param id 主键ID
+	 * @param flag 同意true,不同意 false
+	 * @return
+	 */
 	@RequestMapping(value = "/audit")
 	@ResponseBody
 	public WebJsonResult audit(String shyj, String id, boolean flag) {

gkjsjy/trunk/src/com/xt/jygl/gkjygl/cghzyxxgl/dcsb/ctl/DcsbybbCtl.java

@@ -179,25 +179,6 @@ public class DcsbybbCtl extends BaseWebCtl {
 			}
 		};
 
-		/*String user1 = (String) Utils.getSession().getAttribute("user");
-		String user2 = SecUtils.getCurrUser().getId();
-		if (user2 != null) {
-			if (!user2.equals(user1)) {
-				SearchCondition.ybbpage = 1;
-				SearchCondition.ybbjyr = "";
-				SearchCondition.ybbszd = "";
-				SearchCondition.ybbszgk = "";
-				SearchCondition.ybbszgq = "";
-				SearchCondition.ybbhwzl = "";
-				SearchCondition.ybbzysjq = null;
-				SearchCondition.ybbzysjz = null;
-			}
-		}
-		Utils.getSession().setAttribute("user", user2);
-		if (page.getPage() < 1) {
-			page.setPage(SearchCondition.ybbpage);
-		}*/
-
 		if (page.getPage() < 1) {
 			Object ybbpagepage = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "ybbpage");
 			if (StringUtils.isEmpty(ybbpagepage) || !org.apache.commons.lang.StringUtils.isNumeric(String.valueOf(ybbpagepage))) {

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/jyrbw/ctl/BwCtl.java

@@ -322,7 +322,7 @@ public class BwCtl extends BaseWebCtl {
 			}
 			page.setPage(Integer.valueOf(String.valueOf(bwpage)));
 		}
-		page.setSort("createDateTime");
+		page.setSort("id");
 		page.setOrder("desc");
 
 		List<BwEntity> textlist = query.findAll(spec, BwEntity.class);

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/jyrcg/ctl/CgCtl.java

@@ -204,7 +204,7 @@ public class CgCtl extends BaseWebCtl {
 			}
 			page.setPage(Integer.valueOf(String.valueOf(cgpage)));
 		}
-		page.setSort("createDateTime");
+		page.setSort("id");
 		page.setOrder("desc");
 
 		Page<CgEntity> list = query.findAll(spec, toPageRequest(page), CgEntity.class);

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/jyrck/ctl/CkCtl.java

@@ -222,7 +222,7 @@ public class CkCtl extends BaseWebCtl {
 			}
 			page.setPage(Integer.valueOf(String.valueOf(ckpage)));
 		}
-		page.setSort("createDateTime");
+		page.setSort("id");
 		page.setOrder("desc");
 
 		Page<CkEntity> list = query.findAll(spec, toPageRequest(page), CkEntity.class);

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/jyrdc/ctl/DcCtl.java

@@ -205,7 +205,7 @@ public class DcCtl extends BaseWebCtl {
 			}
 			page.setPage(Integer.valueOf(String.valueOf(dcpage)));
 		}
-		page.setSort("createDateTime");
+		page.setSort("id");
 		page.setOrder("desc");
 
 		Page<DcEntity> list = query.findAll(spec, toPageRequest(page), DcEntity.class);

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/jyrjbxx/ctl/GkjyrCtl.java

@@ -455,7 +455,7 @@ public class GkjyrCtl extends BaseWebCtl {
 			}
 			page.setPage(Integer.valueOf(String.valueOf(jyrpage)));
 		}
-		page.setSort("createDateTime");
+		page.setSort("id");
 		page.setOrder("desc");
 		Page<GkjyrEntity> list = query.findAll(spec, toPageRequest(page), GkjyrEntity.class);
 		List<GkjyrVo> voList = new ArrayList<GkjyrVo>();

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/qytz/ctl/QytzCtl.java

@@ -188,7 +188,7 @@ public class QytzCtl extends BaseWebCtl {
 			page.setPage(Integer.valueOf(String.valueOf(qytzpage)));
 		}
 		
-		page.setSort("createDateTime");
+		page.setSort("id");
 		page.setOrder("desc");
 		Page<QytzEntity> list = query.findAll(spec, toPageRequest(page), QytzEntity.class);
 		List<QytzVo> voList = new ArrayList<QytzVo>();

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/ry/ctl/RyCtl.java

@@ -207,7 +207,7 @@ public class RyCtl extends BaseWebCtl {
 			page.setPage(Integer.valueOf(String.valueOf(rypage)));
 		}
 		// 排序
-		page.setSort("createDateTime");
+		page.setSort("id");
 		page.setOrder("desc");
 
 		Page<RyEntity> list = query.findAll(spec, toPageRequest(page), RyEntity.class);

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/sssb/ctl/SssbCtl.java

@@ -201,7 +201,7 @@ public class SssbCtl extends BaseWebCtl {
 			}
 			page.setPage(Integer.valueOf(String.valueOf(sspage)));
 		}
-		page.setSort("createDateTime");
+		page.setSort("id");
 		page.setOrder("desc");
 
 		Page<SssbEntity> list = query.findAll(spec, toPageRequest(page), SssbEntity.class);

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/zxjx/ctl/ZxjxCtl.java

@@ -140,7 +140,7 @@ public class ZxjxCtl extends BaseWebCtl{
 		if (page.getPage() < 1) {
 			page.setPage(SearchCondition.zxjxpage);
 		}
-		page.setSort("createDateTime");
+		page.setSort("id");
 		page.setOrder("desc");
 		Page<ZxjxEntity> list = query.findAll(spec, toPageRequest(page), ZxjxEntity.class);
 		List<ZxjxVo> voList = new ArrayList<ZxjxVo>();

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxkbg/ctl/XkzbgCtl.java

@@ -185,6 +185,21 @@ public class XkzbgCtl extends BaseWebCtl {
 	@Autowired
 	private XzglbmxxService xzglbmxxService;
 
+	/**
+	 * 一览信息
+	 * @param page 分页
+	 * @param model
+	 * @param lczt 流程状态
+	 * @param szdid 所在地ID
+	 * @param szgkid 所在港口ID
+	 * @param szgqid 所在港区ID
+	 * @param gkjyr　经营人
+	 * @param fddbr　法定代表人
+	 * @param bgdd　办公地点
+	 * @param menuid
+	 * @return
+	 * @throws JsonProcessingException
+	 */
 	@RequestMapping(value = "/main")
 	@RequiresPermissions("gkjyxkbg:main")
 	public String main(SimplePageRequest page, Model model, final String lczt, final String szdid, final String szgkid, final String szgqid, final String gkjyr, final String fddbr, final String bgdd, String menuid) throws JsonProcessingException {
@@ -223,9 +238,6 @@ public class XkzbgCtl extends BaseWebCtl {
 				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_DELETE));
 				// 经营人只能查看自己企业下的数据，非经营人只能查看自己所在地的数据
 				if (!isJyr()) {
-					// list.add(cb.like(root.get("szd").get("id").as(String.class),
-					// "%" + SecUtils.getCurrUser().getSzd().getId() + "%"));
-
 					In<String> in = cb.in(root.get("szgq").get("id").as(String.class));
 					List<String> gqlist = (List<String>) Utils.getSession().getAttribute("gqList");
 					if (gqlist != null && gqlist.size() > 0) {
@@ -474,6 +486,11 @@ public class XkzbgCtl extends BaseWebCtl {
 		return "gkjygl/gkjyxkgl/gkjyxkbg/xkzbgaddmain";
 	}
 
+	/**
+	 * 得到附件信息
+	 * @param jyrid
+	 * @return
+	 */
 	private List<XkzbgfjEntity> getFjList(String jyrid) {
 		List<XkzbgfjEntity> xkzfjList = new ArrayList<XkzbgfjEntity>();
 		List<XkzsqEntity> sqlist = xkzsqService.findByJyrid(jyrid);
@@ -2033,7 +2050,23 @@ public class XkzbgCtl extends BaseWebCtl {
 		}
 	}
 
-	// 保存
+	/**
+	 * 提交流程
+	 * @param model
+	 * @param code 
+	 * @param jydyids  经营范围ID
+	 * @param accid  附件Id
+	 * @param mtids 码头ID
+	 * @param bwids 泊位ID
+	 * @param cgids 储罐ID
+	 * @param ckids
+	 * @param dcids
+	 * @param ryids
+	 * @param sssbids
+	 * @param qytzids
+	 * @param zxjxids
+	 * @return
+	 */
 	@RequestMapping(value = "/submit")
 	@ResponseBody
 	public WebJsonResult submit(Model model, XkzbgEntity code, String[] jydyids, String accid, String mtids, String bwids, String cgids, String ckids, String dcids, String ryids, String sssbids, String qytzids, String zxjxids) {
@@ -2313,6 +2346,22 @@ public class XkzbgCtl extends BaseWebCtl {
 		return wr;
 	}
 
+	/**
+	 * 退回再提交
+	 * @param code
+	 * @param jydyids 经营范围ID
+	 * @param accid 附件ID
+	 * @param mtids 码头ID
+	 * @param bwids 泊位ID
+	 * @param cgids 储罐ID
+	 * @param ckids 仓库ID
+	 * @param dcids 堆场ID
+	 * @param ryids 人员ID
+	 * @param sssbids 设备设施ID
+	 * @param qytzids 企业投资ID
+	 * @param zxjxids 装卸机械ID
+	 * @return
+	 */
 	@RequestMapping(value = "/submitAudit")
 	@ResponseBody
 	public WebJsonResult submitAudit(XkzbgEntity code, String[] jydyids, String accid, String mtids, String bwids, String cgids, String ckids, String dcids, String ryids, String sssbids, String qytzids, String zxjxids) {
@@ -2641,6 +2690,13 @@ public class XkzbgCtl extends BaseWebCtl {
 		return wr;
 	}
 
+	/**
+	 * 审核流程
+	 * @param shyj 审核意见
+	 * @param id 主键ID
+	 * @param flag 同意true 不同意 false
+	 * @return
+	 */
 	@RequestMapping(value = "/audit")
 	@ResponseBody
 	public WebJsonResult audit(String shyj, String id, boolean flag) {
@@ -2859,102 +2915,7 @@ public class XkzbgCtl extends BaseWebCtl {
 			// 原经营人
 			GkjyrEntity njyr = gkjyrService.findOne(bgjyr.getYjyrid());
 
-			/*
-			 * njyr.setAqbmfzr(bgjyr.getAqbmfzr());
-			 * njyr.setAqfzrlxdh(bgjyr.getAqfzrlxdh());
-			 * njyr.setAqfzrsj(bgjyr.getAqfzrsj());
-			 * njyr.setAqfzrzbdh(bgjyr.getAqfzrzbdh());
-			 * njyr.setAqgljg(bgjyr.getAqgljg()); njyr.setAqid(bgjyr.getAqid());
-			 * njyr.setAqzgbm(bgjyr.getAqzgbm()); njyr.setAxcd(bgjyr.getAxcd());
-			 * njyr.setBafzjg(bgjyr.getBafzjg());
-			 * njyr.setBafzrq(bgjyr.getBafzrq());
-			 * njyr.setBayxq(bgjyr.getBayxq()); njyr.setBgdz(bgjyr.getBgdz());
-			 * njyr.setBgyfmj(bgjyr.getBgyfmj());
-			 * njyr.setBwzcd(bgjyr.getBwzcd());
-			 * njyr.setCbzzzl(bgjyr.getCbzzzl()); njyr.setCgsl(bgjyr.getCgsl());
-			 * njyr.setCgzrl(bgjyr.getCgzrl()); njyr.setCkzmj(bgjyr.getCkzmj());
-			 * njyr.setCyrysl(bgjyr.getCyrysl()); njyr.setCz(bgjyr.getCz());
-			 * njyr.setDtsj(bgjyr.getDtsj()); njyr.setFddbr(bgjyr.getFddbr());
-			 * njyr.setFjsszmj(bgjyr.getFjsszmj());
-			 * njyr.setFscxbw(bgjyr.getFscxbw()); njyr.setFzjg(bgjyr.getFzjg());
-			 * njyr.setFzrq(bgjyr.getFzrq()); njyr.setFzyxq(bgjyr.getFzyxq());
-			 * njyr.setGddjgs(bgjyr.getGddjgs());
-			 * njyr.setGisStatus(bgjyr.getGisStatus());
-			 * njyr.setGjjgdm(bgjyr.getGjjgdm());
-			 * njyr.setGkjyr(bgjyr.getGkjyr());
-			 * njyr.setGkjyxkzh(bgjyr.getGkjyxkzh());
-			 * njyr.setGkssbafhzsbh(bgjyr.getGkssbafhzsbh());
-			 * njyr.setGkwxhwzyfzbh(bgjyr.getGkwxhwzyfzbh());
-			 * njyr.setGsyyzzbh(bgjyr.getGsyyzzbh());
-			 * njyr.setGygxcd(bgjyr.getGygxcd());
-			 * njyr.setGzcbgs(bgjyr.getGzcbgs()); njyr.setJyfw(bgjyr.getJyfw());
-			 * njyr.setJyqy(bgjyr.getJyqy()); njyr.setJzx(bgjyr.getJzx());
-			 * njyr.setLtqzjgs(bgjyr.getLtqzjgs());
-			 * njyr.setLxdh(bgjyr.getLxdh()); njyr.setLymj(bgjyr.getLymj());
-			 * njyr.setMtbwzs(bgjyr.getMtbwzs());
-			 * njyr.setMtjgxs(bgjyr.getMtjgxs());
-			 * njyr.setMtqyhdgc(bgjyr.getMtqyhdgc());
-			 * njyr.setMzdjgs(bgjyr.getMzdjgs());
-			 * njyr.setParentJyrId(bgjyr.getParentJyrId());
-			 * njyr.setQcqzjgs(bgjyr.getQcqzjgs());
-			 * njyr.setQtjxgs(bgjyr.getQtjxgs());
-			 * njyr.setQyaqdj(bgjyr.getQyaqdj()); njyr.setQylx(bgjyr.getQylx());
-			 * njyr.setQyxz(bgjyr.getQyxz());
-			 * njyr.setQyzzjgdm(bgjyr.getQyzzjgdm()); njyr.setRs(bgjyr.getRs());
-			 * njyr.setScxbw(bgjyr.getScxbw()); njyr.setSftb(bgjyr.getSftb());
-			 * njyr.setSfwhqy(bgjyr.getSfwhqy());
-			 * njyr.setSfzdsp(bgjyr.getSfzdsp());
-			 * njyr.setSjntgnl(bgjyr.getSjntgnl());
-			 * njyr.setSndwmjzx(bgjyr.getSndwmjzx());
-			 * njyr.setSndwmttl(bgjyr.getSndwmttl());
-			 * njyr.setSndzjzx(bgjyr.getSndzjzx());
-			 * njyr.setSndzttl(bgjyr.getSndzttl());
-			 * njyr.setSsgkglbm(bgjyr.getSsgkglbm());
-			 * njyr.setSshydl(bgjyr.getSshydl());
-			 * njyr.setSshyz(bgjyr.getSshyz());
-			 * njyr.setSssbgs(bgjyr.getSssbgs()); njyr.setSzd(bgjyr.getSzd());
-			 * njyr.setSzgk(bgjyr.getSzgk()); njyr.setSzgq(bgjyr.getSzgq());
-			 * njyr.setTbzt(bgjyr.getTbzt()); njyr.setTczmj(bgjyr.getTczmj());
-			 * njyr.setTlzyxcd(bgjyr.getTlzyxcd());
-			 * njyr.setTzze(bgjyr.getTzze());
-			 * njyr.setWdjysbwsl(bgjyr.getWdjysbwsl());
-			 * njyr.setXcglpxrysl(bgjyr.getXcglpxrysl());
-			 * njyr.setXcglrysl(bgjyr.getXcglrysl());
-			 * njyr.setXczyrypxsl(bgjyr.getXczyrypxsl());
-			 * njyr.setXczyrysl(bgjyr.getXczyrysl());
-			 * njyr.setXsje(bgjyr.getXsje()); njyr.setXzqh(bgjyr.getXzqh());
-			 * njyr.setYwcqzm(bgjyr.getYwcqzm());
-			 * njyr.setYwjgys(bgjyr.getYwjgys()); njyr.setYzbm(bgjyr.getYzbm());
-			 * njyr.setZczb(bgjyr.getZczb()); njyr.setZcze(bgjyr.getZcze());
-			 * njyr.setZdkbnl(bgjyr.getZdkbnl());
-			 * njyr.setZxsbgs(bgjyr.getZxsbgs()); njyr.setZyhz(bgjyr.getZyhz());
-			 * njyr.setZyid(bgjyr.getZyid());
-			 * njyr.setZyjspxrysl(bgjyr.getZyjspxrysl());
-			 * njyr.setZyjsrysl(bgjyr.getZyjspxrysl());
-			 * njyr.setZywxhwpm(bgjyr.getZywxhwpm());
-			 * njyr.setZzagrysl(bgjyr.getZzagrysl());
-			 * njyr.setRecordStatus(BaseEntity.RECORD_STATE_VALID);
-			 * gkjyrService.save(njyr);
-			 * 
-			 * // 原经营范围操作 if (!StringUtils.isEmpty(xkzbg.getXjydy())) {
-			 * xkzjyfwService.deleteByJyrid(njyr.getId()); // 删除后同步修改更新时间
-			 * List<XkzjyfwEntity> xkzjys =
-			 * xkzjyfwService.findByJyrid(njyr.getId()); for (XkzjyfwEntity
-			 * xkzjy : xkzjys) { xkzjy.setUpdateDateTime(new Timestamp(new
-			 * Date().getTime())); xkzjyfwService.save(xkzjy); } if (list !=
-			 * null && list.size() > 0) { for (int i = 0; i < list.size(); i++)
-			 * { XkzjyfwEntity entity = list.get(i);
-			 * entity.setJyrid(njyr.getId()); xkzjyfwService.save(entity); } } }
-			 */
-
-			// 原许可证操作
-			/*
-			 * List<XkzxxEntity> yxkzlist =
-			 * xkzxxService.findByJyrid(njyr.getId()); if (yxkzlist != null &&
-			 * yxkzlist.size() > 0) { for (XkzxxEntity xkzxx : yxkzlist) {
-			 * xkzxx.setSfyx(Constants.XKZ_WX); xkzxx.setIsflag("0");
-			 * xkzxxService.save(xkzxx); } }
-			 */
+			
 			XkzxxEntity xkz = new XkzxxEntity();
 			xkz.setGkjyr(njyr.getId());
 			xkz.setSpr(user.getName());
@@ -3009,195 +2970,6 @@ public class XkzbgCtl extends BaseWebCtl {
 					xkzglbService.save(xkzglb);
 				}
 			}
-			// 码头
-			// 原经营人码头操作
-			/*
-			 * List<MtEntity> ymtlist = mtService.findByJyrid(njyr.getId()); if
-			 * (ymtlist != null && ymtlist.size() > 0) { for (MtEntity mt :
-			 * ymtlist) { mt.setXkzid(""); mtService.logicDelete(mt.getId()); }
-			 * }
-			 * 
-			 * List<MtEntity> bgmtlist = mtService.findByJyrid(bgjyr.getId());
-			 * if (bgmtlist != null && bgmtlist.size() > 0) { List<XkzglbEntity>
-			 * xkzglb = xkzglbService.findByCzid(bgid, "1"); for (MtEntity mt :
-			 * bgmtlist) { MtEntity nmt = new MtEntity();
-			 * BeanUtils.copyProperties(mt, nmt); // 判断是否关联许可证 boolean flag =
-			 * false; if (xkzglb != null && xkzglb.size() > 0) { for
-			 * (XkzglbEntity v : xkzglb) { if (mt.getId().equals(v.getYwid())) {
-			 * flag = true; break; } } } if (flag) { nmt.setXkzid(xkz.getId());
-			 * }
-			 * 
-			 * if (StringUtils.isEmpty(mt.getYmtid())) { nmt.setId("");
-			 * nmt.setSsjyr(njyr);
-			 * nmt.setRecordStatus(BaseEntity.RECORD_STATE_VALID); nmt =
-			 * mtService.save(nmt); mt.setYmtid(nmt.getId());
-			 * mtService.save(mt); } else { nmt.setId(mt.getYmtid());
-			 * nmt.setSsjyr(njyr); nmt.setYmtid("");
-			 * nmt.setRecordStatus(BaseEntity.RECORD_STATE_VALID);
-			 * mtService.save(nmt); } } } // 泊位
-			 * 
-			 * // 原经营人泊位操作 List<BwEntity> ybwlist =
-			 * bwService.findByJyrid(njyr.getId()); if (ybwlist != null &&
-			 * ybwlist.size() > 0) { for (BwEntity bw : ybwlist) {
-			 * bw.setXkzid(""); bwService.logicDelete(bw.getId()); } }
-			 * 
-			 * List<BwEntity> bgbwlist = bwService.findByJyrid(bgjyr.getId());
-			 * if (bgbwlist != null && bgbwlist.size() > 0) { List<XkzglbEntity>
-			 * xkzglb = xkzglbService.findByCzid(bgid, "2"); for (BwEntity bw :
-			 * bgbwlist) { BwEntity nbw = new BwEntity();
-			 * BeanUtils.copyProperties(bw, nbw); // 判断是否关联许可证 boolean flag =
-			 * false; if (xkzglb != null && xkzglb.size() > 0) { for
-			 * (XkzglbEntity v : xkzglb) { if (bw.getId().equals(v.getYwid())) {
-			 * flag = true; break; } } } if (flag) { nbw.setXkzid(xkz.getId());
-			 * } if (!StringUtils.isEmpty(bw.getSsmt())) { MtEntity mt =
-			 * mtService.findOne(bw.getSsmt().getYmtid()); nbw.setSsmt(mt); } if
-			 * (StringUtils.isEmpty(bw.getYbwid())) { nbw.setId("");
-			 * nbw.setSsjyr(njyr);
-			 * nbw.setRecordStatus(BaseEntity.RECORD_STATE_VALID);
-			 * bwService.save(nbw); } else { nbw.setId(bw.getYbwid());
-			 * nbw.setSsjyr(njyr); nbw.setYbwid("");
-			 * nbw.setRecordStatus(BaseEntity.RECORD_STATE_VALID);
-			 * bwService.save(nbw); } } } // 储罐
-			 * 
-			 * // 原经营人储罐操作 List<CgEntity> ycglist =
-			 * cgService.findByJyrid(njyr.getId()); if (ycglist != null &&
-			 * ycglist.size() > 0) { for (CgEntity cg : ycglist) {
-			 * cg.setXkzid(""); cgService.logicDelete(cg.getId()); } }
-			 * 
-			 * List<CgEntity> bgcglist = cgService.findByJyrid(bgjyr.getId());
-			 * if (bgcglist != null && bgcglist.size() > 0) { List<XkzglbEntity>
-			 * xkzglb = xkzglbService.findByCzid(bgid, "3"); for (CgEntity cg :
-			 * bgcglist) { CgEntity ncg = new CgEntity();
-			 * BeanUtils.copyProperties(cg, ncg); // 判断是否关联许可证 boolean flag =
-			 * false; if (xkzglb != null && xkzglb.size() > 0) { for
-			 * (XkzglbEntity v : xkzglb) { if (cg.getId().equals(v.getYwid())) {
-			 * flag = true; break; } } } if (flag) { ncg.setXkzid(xkz.getId());
-			 * } if (StringUtils.isEmpty(cg.getYcgid())) { ncg.setId("");
-			 * ncg.setSsjyr(njyr);
-			 * ncg.setRecordStatus(BaseEntity.RECORD_STATE_VALID);
-			 * cgService.save(ncg); } else { ncg.setId(cg.getYcgid());
-			 * ncg.setSsjyr(njyr); ncg.setYcgid("");
-			 * ncg.setRecordStatus(BaseEntity.RECORD_STATE_VALID);
-			 * cgService.save(ncg); } } } // 仓库 // 原经营人仓库操作 List<CkEntity>
-			 * ycklist = ckService.findByJyrid(njyr.getId()); if (ycklist !=
-			 * null && ycklist.size() > 0) { for (CkEntity ck : ycklist) {
-			 * ck.setXkzid(""); ckService.logicDelete(ck.getId()); } }
-			 * 
-			 * List<CkEntity> bgcklist = ckService.findByJyrid(bgjyr.getId());
-			 * if (bgcklist != null && bgcklist.size() > 0) { List<XkzglbEntity>
-			 * xkzglb = xkzglbService.findByCzid(bgid, "4"); for (CkEntity ck :
-			 * bgcklist) { CkEntity nck = new CkEntity();
-			 * BeanUtils.copyProperties(ck, nck); // 判断是否关联许可证 boolean flag =
-			 * false; if (xkzglb != null && xkzglb.size() > 0) { for
-			 * (XkzglbEntity v : xkzglb) { if (ck.getId().equals(v.getYwid())) {
-			 * flag = true; break; } } } if (flag) { nck.setXkzid(xkz.getId());
-			 * } if (!StringUtils.isEmpty(ck.getSsmt())) { MtEntity mt =
-			 * mtService.findOne(ck.getSsmt().getYmtid()); nck.setSsmt(mt); } if
-			 * (StringUtils.isEmpty(ck.getYckid())) { nck.setId("");
-			 * nck.setSsjyr(njyr);
-			 * nck.setRecordStatus(BaseEntity.RECORD_STATE_VALID);
-			 * ckService.save(nck); } else { nck.setId(ck.getYckid());
-			 * nck.setSsjyr(njyr); nck.setYckid("");
-			 * nck.setRecordStatus(BaseEntity.RECORD_STATE_VALID);
-			 * ckService.save(nck); } } } // 堆场
-			 * 
-			 * // 原经营人堆场操作 List<DcEntity> ydclist =
-			 * dcService.findByJyrid(njyr.getId()); if (ydclist != null &&
-			 * ydclist.size() > 0) { for (DcEntity dc : ydclist) {
-			 * dc.setXkzid(""); dcService.logicDelete(dc.getId()); } }
-			 * List<DcEntity> bgdclist = dcService.findByJyrid(bgjyr.getId());
-			 * if (bgdclist != null && bgdclist.size() > 0) { List<XkzglbEntity>
-			 * xkzglb = xkzglbService.findByCzid(bgid, "5"); for (DcEntity dc :
-			 * bgdclist) { DcEntity ndc = new DcEntity();
-			 * BeanUtils.copyProperties(dc, ndc); // 判断是否关联许可证 boolean flag =
-			 * false; if (xkzglb != null && xkzglb.size() > 0) { for
-			 * (XkzglbEntity v : xkzglb) { if (dc.getId().equals(v.getYwid())) {
-			 * flag = true; break; } } } if (flag) { ndc.setXkzid(xkz.getId());
-			 * } if (!StringUtils.isEmpty(dc.getSsmt())) { MtEntity mt =
-			 * mtService.findOne(dc.getSsmt().getYmtid()); ndc.setSsmt(mt); } if
-			 * (StringUtils.isEmpty(dc.getYdcid())) { ndc.setId("");
-			 * ndc.setSsjyr(njyr);
-			 * ndc.setRecordStatus(BaseEntity.RECORD_STATE_VALID);
-			 * dcService.save(ndc); } else { ndc.setId(dc.getYdcid());
-			 * ndc.setSsjyr(njyr); ndc.setYdcid("");
-			 * ndc.setRecordStatus(BaseEntity.RECORD_STATE_VALID);
-			 * dcService.save(ndc); } } } // 人员 // 原经营人人员操作 List<RyEntity>
-			 * yrylist = ryService.findByJyrid(njyr.getId()); if (yrylist !=
-			 * null && yrylist.size() > 0) { for (RyEntity ry : yrylist) {
-			 * ry.setXkzid(""); ryService.logicDelete(ry.getId()); } }
-			 * 
-			 * List<RyEntity> bgrylist = ryService.findByJyrid(bgjyr.getId());
-			 * if (bgrylist != null && bgrylist.size() > 0) { List<XkzglbEntity>
-			 * xkzglb = xkzglbService.findByCzid(bgid, "6"); for (RyEntity ry :
-			 * bgrylist) { RyEntity nry = new RyEntity();
-			 * BeanUtils.copyProperties(ry, nry); // 判断是否关联许可证 boolean flag =
-			 * false; if (xkzglb != null && xkzglb.size() > 0) { for
-			 * (XkzglbEntity v : xkzglb) { if (ry.getId().equals(v.getYwid())) {
-			 * flag = true; break; } } } if (flag) { nry.setXkzid(xkz.getId());
-			 * } if (StringUtils.isEmpty(ry.getYryid())) { nry.setId("");
-			 * nry.setSsjyr(njyr); nry = ryService.save(nry); } else {
-			 * nry.setId(ry.getYryid()); nry.setSsjyr(njyr); nry.setYryid("");
-			 * nry = ryService.save(nry); } List<RyzsEntity> ryzslist =
-			 * ryzsService.findZs(ry); if (ryzslist != null && ryzslist.size() >
-			 * 0) { for (RyzsEntity ryzs : ryzslist) { RyzsEntity nryzs = new
-			 * RyzsEntity(); BeanUtils.copyProperties(ryzs, nryzs);
-			 * nryzs.setRyid(nry); nryzs.setId(null); ryzsService.save(nryzs); }
-			 * } } } // 设施设备 // 原经营人设施设备操作 List<SssbEntity> ysssblist =
-			 * sssbService.findByJyrid(njyr.getId()); if (ysssblist != null &&
-			 * ysssblist.size() > 0) { for (SssbEntity sssb : ysssblist) {
-			 * sssb.setXkzid(""); sssbService.logicDelete(sssb.getId()); } }
-			 * List<SssbEntity> bgsssblist =
-			 * sssbService.findByJyrid(bgjyr.getId()); if (bgsssblist != null &&
-			 * bgsssblist.size() > 0) { List<XkzglbEntity> xkzglb =
-			 * xkzglbService.findByCzid(bgid, "7"); for (SssbEntity sssb :
-			 * bgsssblist) { SssbEntity nsssb = new SssbEntity();
-			 * BeanUtils.copyProperties(sssb, nsssb); // 判断是否关联许可证 boolean flag
-			 * = false; if (xkzglb != null && xkzglb.size() > 0) { for
-			 * (XkzglbEntity v : xkzglb) { if
-			 * (nsssb.getId().equals(v.getYwid())) { flag = true; break; } } }
-			 * if (flag) { nsssb.setXkzid(xkz.getId()); } if
-			 * (StringUtils.isEmpty(sssb.getYsssbid())) { nsssb.setId("");
-			 * nsssb.setSsjyr(njyr); sssbService.save(nsssb); } else {
-			 * nsssb.setId(sssb.getYsssbid()); nsssb.setSsjyr(njyr);
-			 * nsssb.setYsssbid(""); sssbService.save(nsssb); } } } // 企业投资 //
-			 * 原经营人企业投资操作 List<QytzEntity> yqytzlist =
-			 * qytzService.findByJyrid(njyr.getId()); if (yqytzlist != null &&
-			 * yqytzlist.size() > 0) { for (QytzEntity qytz : yqytzlist) {
-			 * qytz.setXkzid(""); qytzService.logicDelete(qytz.getId()); } }
-			 * List<QytzEntity> bgqytzlist =
-			 * qytzService.findByJyrid(bgjyr.getId()); if (bgqytzlist != null &&
-			 * bgqytzlist.size() > 0) { List<XkzglbEntity> xkzglb =
-			 * xkzglbService.findByCzid(bgid, "8"); for (QytzEntity qytz :
-			 * bgqytzlist) { QytzEntity nqytz = new QytzEntity();
-			 * BeanUtils.copyProperties(qytz, nqytz); // 判断是否关联许可证 boolean flag
-			 * = false; if (xkzglb != null && xkzglb.size() > 0) { for
-			 * (XkzglbEntity v : xkzglb) { if (qytz.getId().equals(v.getYwid()))
-			 * { flag = true; break; } } } if (flag) {
-			 * nqytz.setXkzid(xkz.getId()); } if
-			 * (StringUtils.isEmpty(qytz.getYqytzid())) { nqytz.setId("");
-			 * nqytz.setSsjyr(njyr); qytzService.save(nqytz); } else {
-			 * nqytz.setId(qytz.getYqytzid()); nqytz.setSsjyr(njyr);
-			 * nqytz.setYqytzid(""); qytzService.save(nqytz); } } }
-			 * 
-			 * // 装卸机械 // 原经营人装卸机械操作 List<ZxjxEntity> yzxjxlist =
-			 * zxjxService.findByJyrid(njyr.getId()); if (yzxjxlist != null &&
-			 * yzxjxlist.size() > 0) { for (ZxjxEntity zxjx : yzxjxlist) {
-			 * zxjx.setXkzid(""); zxjxService.logicDelete(zxjx.getId()); } }
-			 * List<ZxjxEntity> bgzxjxlist =
-			 * zxjxService.findByJyrid(bgjyr.getId()); if (bgzxjxlist != null &&
-			 * bgzxjxlist.size() > 0) { List<XkzglbEntity> xkzglb =
-			 * xkzglbService.findByCzid(bgid, "9"); for (ZxjxEntity zxjx :
-			 * bgzxjxlist) { ZxjxEntity nzxjx = new ZxjxEntity();
-			 * BeanUtils.copyProperties(zxjx, nzxjx); // 判断是否关联许可证 boolean flag
-			 * = false; if (xkzglb != null && xkzglb.size() > 0) { for
-			 * (XkzglbEntity v : xkzglb) { if (zxjx.getId().equals(v.getYwid()))
-			 * { flag = true; break; } } } if (flag) {
-			 * nzxjx.setXkzid(xkz.getId()); } if
-			 * (StringUtils.isEmpty(zxjx.getYzxjxid())) { nzxjx.setId("");
-			 * nzxjx.setSsjyr(njyr); zxjxService.save(nzxjx); } else {
-			 * nzxjx.setId(zxjx.getYzxjxid()); nzxjx.setSsjyr(njyr);
-			 * nzxjx.setYzxjxid(""); zxjxService.save(nzxjx); } } }
-			 */
 
 		} catch (Exception e) {
 			e.printStackTrace();

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxksq/ctl/XkzsqCtl.java

@@ -168,6 +168,22 @@ public class XkzsqCtl extends BaseWebCtl {
 	@Autowired
 	private XzglbmxxService xzglbmxxService;
 
+	/**
+	 * 一览查询
+	 * @param page 页数
+	 * @param model 
+	 * @param request
+	 * @param lczt 流程状态
+	 * @param szdid 所在地Id
+	 * @param szgkid 所在港口ID
+	 * @param szgqid 所在港区ID
+	 * @param gkjyr 所属经营人
+	 * @param fddbr 法定代表人
+	 * @param bgdd 办公地址
+	 * @param menuid 
+	 * @return
+	 * @throws JsonProcessingException
+	 */
 	@RequestMapping(value = "/main")
 	@RequiresPermissions("gkjyxksq:main")
 	public String main(SimplePageRequest page, Model model, final HttpServletRequest request, final String lczt, final String szdid, final String szgkid, final String szgqid, final String gkjyr, final String fddbr, final String bgdd, String menuid) throws JsonProcessingException {
@@ -193,11 +209,7 @@ public class XkzsqCtl extends BaseWebCtl {
 						list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + v + "%"));
 					}
 				}
-				// else if (StringUtils.isNotEmpty(SearchCondition.xkzsqszdid)
-				// && isGET(request)) {
-				// list.add(cb.like(root.get("szd").get("id").as(String.class),
-				// "%" + SearchCondition.xkzsqszdid + "%"));
-				// }
+			
 				if (StringUtils.isNotEmpty(szgkid)) {
 					list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + szgkid + "%"));
 				} else if (isGET(request)) {
@@ -206,11 +218,7 @@ public class XkzsqCtl extends BaseWebCtl {
 						list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + v + "%"));
 					}
 				}
-				// else if (StringUtils.isNotEmpty(SearchCondition.xkzsqszgkid)
-				// && isGET(request)) {
-				// list.add(cb.like(root.get("szgk").get("id").as(String.class),
-				// "%" + SearchCondition.xkzsqszgkid + "%"));
-				// }
+			
 				if (StringUtils.isNotEmpty(szgqid)) {
 					list.add(cb.like(root.get("szgq").get("id").as(String.class), "%" + szgqid + "%"));
 				} else if (isGET(request)) {
@@ -219,11 +227,7 @@ public class XkzsqCtl extends BaseWebCtl {
 						list.add(cb.like(root.get("szgq").get("id").as(String.class), "%" + v + "%"));
 					}
 				}
-				// else if (StringUtils.isNotEmpty(SearchCondition.xkzsqszgqid)
-				// && isGET(request)) {
-				// list.add(cb.like(root.get("szgq").get("id").as(String.class),
-				// "%" + SearchCondition.xkzsqszgqid + "%"));
-				// }
+				
 				if (StringUtils.isNotEmpty(gkjyr)) {
 					list.add(cb.like(root.get("jyrmc").as(String.class), "%" + gkjyr + "%"));
 				} else if (isGET(request)) {
@@ -232,11 +236,7 @@ public class XkzsqCtl extends BaseWebCtl {
 						list.add(cb.like(root.get("jyrmc").as(String.class), "%" + v + "%"));
 					}
 				}
-				// else if (StringUtils.isNotEmpty(SearchCondition.xkzsqgkjyr)
-				// && isGET(request)) {
-				// list.add(cb.like(root.get("jyrmc").as(String.class), "%" +
-				// SearchCondition.xkzsqgkjyr + "%"));
-				// }
+				
 				if (StringUtils.isNotEmpty(fddbr)) {
 					list.add(cb.like(root.get("fddbr").as(String.class), "%" + fddbr + "%"));
 				} else if (isGET(request)) {
@@ -245,11 +245,7 @@ public class XkzsqCtl extends BaseWebCtl {
 						list.add(cb.like(root.get("fddbr").as(String.class), "%" + v + "%"));
 					}
 				}
-				// else if (StringUtils.isNotEmpty(SearchCondition.xkzsqfddbr)
-				// && isGET(request)) {
-				// list.add(cb.like(root.get("fddbr").as(String.class), "%" +
-				// SearchCondition.xkzsqfddbr + "%"));
-				// }
+				
 				if (StringUtils.isNotEmpty(bgdd)) {
 					list.add(cb.like(root.get("bgdd").as(String.class), "%" + bgdd + "%"));
 				} else if (isGET(request)) {
@@ -258,11 +254,7 @@ public class XkzsqCtl extends BaseWebCtl {
 						list.add(cb.like(root.get("bgdd").as(String.class), "%" + v + "%"));
 					}
 				}
-				// else if (StringUtils.isNotEmpty(SearchCondition.xkzsqbgdd) &&
-				// isGET(request)) {
-				// list.add(cb.like(root.get("bgdd").as(String.class), "%" +
-				// SearchCondition.xkzsqbgdd + "%"));
-				// }
+				
 				// 经营人只能查看自己企业下的数据，非经营人只能查看自己所在地的数据
 				if (isJyr()) {
 					list.add(cb.like(root.get("jyrid").as(String.class), "%" + getSsjyr().getId() + "%"));
@@ -275,8 +267,7 @@ public class XkzsqCtl extends BaseWebCtl {
 						}
 						list.add(in);
 					}
-					// list.add(cb.like(root.get("szd").get("id").as(String.class),
-					// "%" + SecUtils.getCurrUser().getSzd().getId() + "%"));
+				
 				}
 				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_DELETE));
 
@@ -299,9 +290,7 @@ public class XkzsqCtl extends BaseWebCtl {
 		}
 		Utils.getSession().setAttribute("userpre", user2);
 
-		// if (page.getPage() < 1) {
-		// page.setPage(SearchCondition.xkzsqpage);
-		// }
+		
 		if (page.getPage() < 1) {
 			Object xkzsqpage = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "xkzsqpage");
 			if (StringUtils.isEmpty(xkzsqpage) || !org.apache.commons.lang.StringUtils.isNumeric(String.valueOf(xkzsqpage))) {
@@ -309,7 +298,7 @@ public class XkzsqCtl extends BaseWebCtl {
 			}
 			page.setPage(Integer.valueOf(String.valueOf(xkzsqpage)));
 		}
-		page.setSort("createDateTime");
+		page.setSort("id");
 		page.setOrder("desc");
 		Page<XkzsqEntity> list = query.findAll(spec, toPageRequest(page), XkzsqEntity.class);
 		List<XkzsqVo> voList = new ArrayList<XkzsqVo>();
@@ -339,37 +328,13 @@ public class XkzsqCtl extends BaseWebCtl {
 				}
 			}
 		}
-		// if (isPOST(request)) {
-		// model.addAttribute("szdid", szdid);
-		// model.addAttribute("szgkid", szgkid);
-		// model.addAttribute("szgqid", szgqid);
-		// model.addAttribute("lczt", lczt);
-		// model.addAttribute("gkjyr", gkjyr);
-		// model.addAttribute("fddbr", fddbr);
-		// model.addAttribute("bgdd", bgdd);
-		//
-		// SearchCondition.xkzsqpage = page.getPage();
-		// SearchCondition.xkzsqbgdd = bgdd;
-		// SearchCondition.xkzsqfddbr = fddbr;
-		// SearchCondition.xkzsqgkjyr = gkjyr;
-		// SearchCondition.xkzsqszdid = szdid;
-		// SearchCondition.xkzsqszgkid = szgkid;
-		// SearchCondition.xkzsqszgqid = szgqid;
-		// } else {
-		// model.addAttribute("szdid", SearchCondition.xkzsqszdid);
-		// model.addAttribute("szgkid", SearchCondition.xkzsqszgkid);
-		// model.addAttribute("szgqid", SearchCondition.xkzsqszgqid);
-		// model.addAttribute("gkjyr", SearchCondition.xkzsqgkjyr);
-		// model.addAttribute("fddbr", SearchCondition.xkzsqfddbr);
-		// model.addAttribute("bgdd", SearchCondition.xkzsqbgdd);
-		//
-		// }
+		
 		if (isPOST(request)) {
 			cacheSCmap.put("xkzsqpage", page.getPage());
 			CacheSearchCondition.putCacheSCmap(request.getParameterMap(), cacheSCmap);
 			System.out.println(JSONObject.fromObject(cacheSCmap));
 		}
-		System.out.println(isPOST(request));
+		
 
 		model.addAttribute("list", voList);
 		model.addAttribute("menuid", menuid);
@@ -385,6 +350,7 @@ public class XkzsqCtl extends BaseWebCtl {
 		return "gkjygl/gkjyxkgl/gkjyxksq/xkzsqmain";
 	}
 
+	
 	// 删除
 	@RequestMapping(value = "/delete")
 	@ResponseBody
@@ -394,7 +360,9 @@ public class XkzsqCtl extends BaseWebCtl {
 		try {
 			// 逻辑删除
 			xkzsqService.logicDelete(id);
+			//获取经营人信息
 			XkzsqEntity entity = xkzsqService.findOne(id);
+			//得到经营人信息，改状态
 			GkjyrEntity gkjyr = gkjyrService.findOne(entity.getJyrid());
 			gkjyr.setRecordStatus(BaseEntity.RECORD_STATE_VALID);
 			gkjyrService.save(gkjyr);
@@ -447,7 +415,6 @@ public class XkzsqCtl extends BaseWebCtl {
 			final String jyrid = gkjyr.getId();
 			// 许可证信息
 			Specification<XkzxxEntity> spec4 = new Specification<XkzxxEntity>() {
-
 				@Override
 				public Predicate toPredicate(Root<XkzxxEntity> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
 					List<Predicate> list = new ArrayList<Predicate>();
@@ -470,9 +437,8 @@ public class XkzsqCtl extends BaseWebCtl {
 							vo.setSsgqzw(gq.getGqmc());
 						}
 					}
-
+					//获取经营人名称
 					if (vo.getGkjyr() != null) {
-
 						GkjyrEntity jyr = gkjyrService.findOne(vo.getGkjyr());
 						if (null != jyr) {
 							vo.setGkjyrzw(jyr.getGkjyr());
@@ -485,7 +451,6 @@ public class XkzsqCtl extends BaseWebCtl {
 
 			// 许可证附证
 			Specification<XkzfzEntity> spec5 = new Specification<XkzfzEntity>() {
-
 				@Override
 				public Predicate toPredicate(Root<XkzfzEntity> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
 					List<Predicate> list = new ArrayList<Predicate>();
@@ -528,7 +493,6 @@ public class XkzsqCtl extends BaseWebCtl {
 		SimpleDateFormat dateTimeFormat = new SimpleDateFormat("yyyy-MM-dd");
 		Date today = new Date();
 		model.addAttribute("sqsj", dateTimeFormat.format(today));
-
 		model.addAttribute("path", path);
 		model.addAttribute("flag", flag);
 
@@ -544,8 +508,10 @@ public class XkzsqCtl extends BaseWebCtl {
 				gkjyrVo.setParentJyrIdzw(p.getGkjyr());
 			}
 		}
+		//获取许可证信息，经营人页面显示
 		List<XkzxxEntity> xkzs = xkzxxService.findByJyrid(gkjyr.getId());
 		for (XkzxxEntity xkz : xkzs) {
+			//判断许可证是否有效，并存在
 			if (BaseEntity.RECORD_STATE_VALID == xkz.getRecordStatus() && Constants.XKZ_SX.equals(xkz.getSfyx())) {
 				gkjyrVo.setXkzyxq(xkz.getYxqz());
 				gkjyrVo.setXkzyxqfmt(DateTime.toString(xkz.getYxqz()));
@@ -556,6 +522,7 @@ public class XkzsqCtl extends BaseWebCtl {
 				gkjyrVo.setJyqy(xkz.getCq());
 			}
 		}
+		//获取各个字典的中文
 		gkjyrVo.setSfwhqyzw(null != gkjyr.getSfwhqy() ? gkjyr.getSfwhqy().getText() : "");
 		gkjyrVo.setSfzdsp(null != gkjyr.getSfzdsp() ? gkjyr.getSfzdsp().getText() : "");
 		gkjyrVo.setYwcqzmzw(null != gkjyr.getYwcqzm() ? gkjyr.getYwcqzm().getText() : "");
@@ -578,7 +545,7 @@ public class XkzsqCtl extends BaseWebCtl {
 		Date today = new Date();
 		model.addAttribute("sj", dateTimeFormat.format(today));
 		XkzsqEntity xkzsq = xkzsqService.findOne(id);
-
+		//获取当前流程状态
 		List<TaskInfoEntity> lists = taskInfoService.findByBusIdAndBusKeyAndRecordStatus(id, XkzsqEntity.PROCESS_DEFINITION_KEY);
 		if (lists != null & lists.size() > 0) {
 			TaskInfoEntity taskinfo = lists.get(0);
@@ -647,6 +614,7 @@ public class XkzsqCtl extends BaseWebCtl {
 			}
 			model.addAttribute("jyfwstr", jyfwstr);
 			model.addAttribute("jylzstr", jylzstr);
+			//获取各个附件的中文名称
 			List<Integer> list = fjlist(jyfwids);
 			if (list.size() > 0 && list != null) {
 				List<XkzsqzscsEntity> fjList = new ArrayList<XkzsqzscsEntity>();
@@ -1494,6 +1462,23 @@ public class XkzsqCtl extends BaseWebCtl {
 		return wr;
 	}
 
+	/**
+	 * 提交流程
+	 * @param model
+	 * @param code
+	 * @param jydyids  经营地域IDS
+	 * @param accid 附件ID
+	 * @param mtids 码头ID
+ 	 * @param bwids 泊位ID
+	 * @param cgids 储罐ID
+	 * @param ckids 仓库ID
+	 * @param dcids 堆场ID
+	 * @param ryids 人员ID
+	 * @param sssbids  设备设施ID
+	 * @param qytzids 企业投资ID
+	 * @param zxjxids 装卸机械ID
+	 * @return
+	 */
 	@RequestMapping(value = "/submit")
 	@ResponseBody
 	public WebJsonResult submit(Model model, XkzsqEntity code, String[] jydyids, String accid, String mtids, String bwids, String cgids, String ckids, String dcids, String ryids, String sssbids, String qytzids, String zxjxids) {
@@ -1808,6 +1793,22 @@ public class XkzsqCtl extends BaseWebCtl {
 		return wr;
 	}
 
+	/**
+	 * 流程退回后提交
+	 * @param code
+	 * @param jydyids
+	 * @param accid
+	 * @param mtids
+	 * @param bwids
+	 * @param cgids
+	 * @param ckids
+	 * @param dcids
+	 * @param ryids
+	 * @param sssbids
+	 * @param qytzids
+	 * @param zxjxids
+	 * @return
+	 */
 	@RequestMapping(value = "/submitAudit")
 	@ResponseBody
 	public WebJsonResult submitAudit(XkzsqEntity code, String[] jydyids, String accid, String mtids, String bwids, String cgids, String ckids, String dcids, String ryids, String sssbids, String qytzids, String zxjxids) {
@@ -2085,6 +2086,12 @@ public class XkzsqCtl extends BaseWebCtl {
 		return gqlist;
 	}
 
+	/**
+	 * 删除经营地址
+	 * @param model
+	 * @param id
+	 * @return
+	 */
 	@RequestMapping(value = "/deletejydy")
 	@ResponseBody
 	public WebJsonResult deletejydy(Model model, String id) {
@@ -2529,7 +2536,7 @@ public class XkzsqCtl extends BaseWebCtl {
 	}
 
 	/**
-	 * 许可证保存
+	 * 许可证决定书保存
 	 * 
 	 * @param model
 	 * @param sqid
@@ -2598,7 +2605,7 @@ public class XkzsqCtl extends BaseWebCtl {
 			if (!StringUtils.isEmpty(user.getSsglbm())) {
 				jds.setDw(user.getSsglbm().getGkglbmqc());
 			}
-
+			//获取时间
 			SimpleDateFormat dateTimeFormat = new SimpleDateFormat("yyyy-MM-dd");
 			Date today = new Date();
 			jds.setRq(dateTimeFormat.format(today));
@@ -2854,6 +2861,12 @@ public class XkzsqCtl extends BaseWebCtl {
 		return wr;
 	}
 
+	/**
+	 * 保存其他附件
+	 * @param filename
+	 * @param model
+	 * @return
+	 */
 	@RequestMapping(value = "/saveQtFile")
 	@ResponseBody
 	public WebJsonResult saveQtFile(MultipartFile filename, Model model) {
@@ -2869,6 +2882,12 @@ public class XkzsqCtl extends BaseWebCtl {
 		return wr;
 	}
 
+	/**
+	 * 删除附件
+	 * @param id  附件ID
+	 * @param model
+	 * @return
+	 */
 	@RequestMapping(value = "/delFile")
 	@ResponseBody
 	public WebJsonResult delFile(String id, Model model) {

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxkyx/ctl/XkzyxCtl.java

@@ -147,12 +147,12 @@ public class XkzyxCtl extends BaseWebCtl {
 	/**
 	 * 一览
 	 * 
-	 * @param page
+	 * @param page 分页
 	 * @param model
-	 * @param gkjyr
-	 * @param fddbr
-	 * @param bgdd
-	 * @param menuid
+	 * @param gkjyr 经营人
+	 * @param fddbr 法定代表人
+	 * @param bgdd 办公地址
+	 * @param menuid 
 	 * @return
 	 * @throws JsonProcessingException
 	 */
@@ -194,8 +194,6 @@ public class XkzyxCtl extends BaseWebCtl {
 				if (isJyr()) {
 					list.add(cb.like(root.get("jyrid").as(String.class), "%" + getSsjyr().getId() + "%"));
 				} else {
-					// list.add(cb.like(root.get("szd").get("id").as(String.class),
-					// "%" + SecUtils.getCurrUser().getSzd().getId() + "%"));
 					In<String> in = cb.in(root.get("szgq").get("id").as(String.class));
 					List<String> gqlist = (List<String>) Utils.getSession().getAttribute("gqList");
 					if (gqlist != null && gqlist.size() > 0) {
@@ -364,6 +362,7 @@ public class XkzyxCtl extends BaseWebCtl {
 				gkjyrVo.setParentJyrIdzw(p.getGkjyr());
 			}
 		}
+		//许可证信息
 		List<XkzxxEntity> xkzs = xkzxxService.findByJyrid(gkjyr.getId());
 		for (XkzxxEntity xkz : xkzs) {
 			if (BaseEntity.RECORD_STATE_VALID == xkz.getRecordStatus() && Constants.XKZ_SX.equals(xkz.getSfyx())) {
@@ -382,7 +381,7 @@ public class XkzyxCtl extends BaseWebCtl {
 		gkjyrVo.setYwjgyszw(null != gkjyr.getYwjgys() ? gkjyr.getYwjgys().getText() : "");
 		gkjyrVo.setFzrqstr(transFormatDate(gkjyr.getFzrq()));
 		model.addAttribute("gkjyr", gkjyrVo);
-
+		//经营许可种类范围
 		List<XkzjyfwEntity> jyfwlist = xkzjyfwService.findByJyrid(gkjyr.getId());
 		if (jyfwlist != null && jyfwlist.size() > 0) {
 			List<String> jyfwids = new ArrayList<String>();
@@ -432,6 +431,7 @@ public class XkzyxCtl extends BaseWebCtl {
 			}
 			model.addAttribute("jyfwstr", jyfwstr);
 			model.addAttribute("jydystr", jydystr);
+			//经营范围种类附件信息
 			List<Integer> list = fjlist(jyfwids);
 			if (list.size() > 0 && list != null) {
 				List<XkzsqzscsEntity> fjList = new ArrayList<XkzsqzscsEntity>();
@@ -468,6 +468,11 @@ public class XkzyxCtl extends BaseWebCtl {
 		return "gkjygl/gkjyxkgl/gkjyxkyx/xkzyxaddmain";
 	}
 
+	/**
+	 * 经营范围种类附件信息
+	 * @param jyrid
+	 * @return
+	 */
 	private List<XkzyxfjEntity> getFjList(String jyrid) {
 		List<XkzyxfjEntity> xkzfjList = new ArrayList<XkzyxfjEntity>();
 		List<XkzsqEntity> sqlist = xkzsqService.findByJyrid(jyrid);
@@ -607,6 +612,7 @@ public class XkzyxCtl extends BaseWebCtl {
 				}
 				model.addAttribute("opflag", opflag);
 			}
+			//经营范围种类信息
 			List<XkzjyfwEntity> jyfwlist = xkzjyfwService.findByJyrid(xkzyxentity.getJyrid());
 			List<String> jyfwids = new ArrayList<String>();
 			String jyfwstr = "";
@@ -705,6 +711,7 @@ public class XkzyxCtl extends BaseWebCtl {
 			}
 			model.addAttribute("jyfwstr", jyfwstr);
 			model.addAttribute("jydystr", jydystr);
+			//经营范围种类附件信息
 			List<Integer> list = fjlist(jyfwids);
 			if (list.size() > 0 && list != null) {
 				List<XkzsqzscsEntity> fjList = new ArrayList<XkzsqzscsEntity>();
@@ -831,6 +838,7 @@ public class XkzyxCtl extends BaseWebCtl {
 				gkjyrVo.setParentJyrIdzw(p.getGkjyr());
 			}
 		}
+		//许可证信息
 		List<XkzxxEntity> xkzs = xkzxxService.findByJyrid(gkjyr.getId());
 		for (XkzxxEntity xkz : xkzs) {
 			if (BaseEntity.RECORD_STATE_VALID == xkz.getRecordStatus() && Constants.XKZ_SX.equals(xkz.getSfyx())) {
@@ -870,6 +878,7 @@ public class XkzyxCtl extends BaseWebCtl {
 			qtfjvoList.add(vo);
 		}
 		model.addAttribute("qtfj", qtfjvoList);
+		//经营范围种类信息
 		List<XkzjyfwEntity> jyfwlist = xkzjyfwService.findByJyrid(xkzyxentity.getJyrid());
 		List<String> jyfwids = new ArrayList<String>();
 		String jyfwstr = "";
@@ -1374,7 +1383,7 @@ public class XkzyxCtl extends BaseWebCtl {
 		return wr;
 	}
 
-	// 保存
+	// 提交流程
 	@RequestMapping(value = "/submit")
 	@ResponseBody
 	public WebJsonResult submit(Model model, XkzyxEntity code, String accid) {
@@ -1424,7 +1433,7 @@ public class XkzyxCtl extends BaseWebCtl {
 		return wr;
 	}
 
-	// 保存
+	// 退回提交流程
 	@RequestMapping(value = "/submitAudit")
 	@ResponseBody
 	public WebJsonResult submitAudit(Model model, XkzyxEntity code, String accid) {
@@ -1708,6 +1717,13 @@ public class XkzyxCtl extends BaseWebCtl {
 		return wr;
 	}
 
+	/**
+	 * 审核流程（同意 ，不同意）
+	 * @param shyj 审核意见
+	 * @param id 主键ID
+	 * @param flag  同意true 不同意False
+	 * @return
+	 */
 	@RequestMapping(value = "/audit")
 	@ResponseBody
 	public WebJsonResult audit(String shyj, String id, boolean flag) {
@@ -1851,6 +1867,12 @@ public class XkzyxCtl extends BaseWebCtl {
 		}
 	}
 
+	/**
+	 * 决定书操作
+	 * @param model
+	 * @param yxid
+	 * @return
+	 */
 	@RequestMapping(value = "/addXkzjds")
 	public String addXkzjds(Model model, String yxid) {
 		XkzyxEntity xkzyx = xkzyxService.findOne(yxid);
@@ -1940,6 +1962,12 @@ public class XkzyxCtl extends BaseWebCtl {
 		return wr;
 	}
 
+	/**
+	 * 删除附件
+	 * @param id
+	 * @param model
+	 * @return
+	 */
 	@RequestMapping(value = "/delFile")
 	@ResponseBody
 	public WebJsonResult delFile(String id, Model model) {

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxkzx/ctl/XkzzxCtl.java

@@ -189,9 +189,9 @@ public class XkzzxCtl extends BaseWebCtl {
 	 * 
 	 * @param page
 	 * @param model
-	 * @param gkjyr
-	 * @param fddbr
-	 * @param bgdd
+	 * @param gkjyr 经营人
+	 * @param fddbr 法定代表人
+	 * @param bgdd 办公地址
 	 * @param menuid
 	 * @return
 	 * @throws JsonProcessingException
@@ -232,8 +232,6 @@ public class XkzzxCtl extends BaseWebCtl {
 				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_DELETE));
 				// 经营人只能查看自己企业下的数据，非经营人只能查看自己所在地的数据
 				if (!isJyr()) {
-					// list.add(cb.like(root.get("szd").get("id").as(String.class),
-					// "%" + SecUtils.getCurrUser().getSzd().getId() + "%"));
 					In<String> in = cb.in(root.get("szgq").get("id").as(String.class));
 					List<String> gqlist = (List<String>) Utils.getSession().getAttribute("gqList");
 					if (gqlist != null && gqlist.size() > 0) {
@@ -431,6 +429,8 @@ public class XkzzxCtl extends BaseWebCtl {
 		gkjyrVo.setYwjgyszw(null != gkjyr.getYwjgys() ? gkjyr.getYwjgys().getText() : "");
 		gkjyrVo.setFzrqstr(transFormatDate(gkjyr.getFzrq()));
 		model.addAttribute("gkjyr", gkjyrVo);
+		
+		//获取经营种类信息
 		List<XkzjyfwEntity> jyfwlist = xkzjyfwService.findByJyrid(gkjyr.getId());
 		List<String> jyfwids = new ArrayList<String>();
 		String jyfwstr = "";
@@ -479,6 +479,7 @@ public class XkzzxCtl extends BaseWebCtl {
 		}
 		model.addAttribute("jyfwstr", jyfwstr);
 		model.addAttribute("jydystr", jydystr);
+		//经营种类的附件信息
 		List<Integer> list = fjlist(jyfwids);
 		if (list.size() > 0 && list != null) {
 			List<XkzsqzscsEntity> fjList = new ArrayList<XkzsqzscsEntity>();
@@ -512,6 +513,11 @@ public class XkzzxCtl extends BaseWebCtl {
 		return "gkjygl/gkjyxkgl/gkjyxkzx/xkzzxaddmain";
 	}
 
+	/**
+	 * 获取最新附件列表
+	 * @param jyrid
+	 * @return
+	 */
 	private List<XkzzxfjEntity> getFjList(String jyrid) {
 		List<XkzzxfjEntity> xkzfjList = new ArrayList<XkzzxfjEntity>();
 		List<XkzsqEntity> sqlist = xkzsqService.findByJyrid(jyrid);
@@ -1642,7 +1648,7 @@ public class XkzzxCtl extends BaseWebCtl {
 		}
 	}
 
-	// 保存
+	// 流程提交
 	@RequestMapping(value = "/submit")
 	@ResponseBody
 	public WebJsonResult submit(Model model, XkzzxEntity code, String accid) {
@@ -1700,7 +1706,7 @@ public class XkzzxCtl extends BaseWebCtl {
 		return wr;
 	}
 
-	// 保存
+	// 退回后提交
 	@RequestMapping(value = "/submitAudit")
 	@ResponseBody
 	public WebJsonResult submitAudit(Model model, XkzzxEntity code, String accid) {
@@ -1966,6 +1972,13 @@ public class XkzzxCtl extends BaseWebCtl {
 		return wr;
 	}
 
+	/**
+	 * 流程处理（同意，不同意）
+	 * @param shyj 审核意见
+	 * @param id   主键ID
+	 * @param flag 是否同意
+	 * @return
+	 */
 	@RequestMapping(value = "/audit")
 	@ResponseBody
 	public WebJsonResult audit(String shyj, String id, boolean flag) {
@@ -2039,6 +2052,12 @@ public class XkzzxCtl extends BaseWebCtl {
 		}
 	}
 
+	/**
+	 * 许可决定书
+	 * @param model
+	 * @param zxid
+	 * @return
+	 */
 	@RequestMapping(value = "/addXkzjds")
 	public String addXkzjds(Model model, String zxid) {
 		XkzzxEntity xkzzx = xkzzxService.findOne(zxid);

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gklhxkgl/gkjylhbg/ctl/LhbgCtl.java

@@ -90,6 +90,22 @@ public class LhbgCtl extends BaseWebCtl {
 	private XkzxxService xkzxxService;
 	@Autowired
 	private XzglbmxxService xzglbmxxService;
+
+	/**
+	 * 
+	 * @param page
+	 * @param model
+	 * @param lczt
+	 * @param szdid
+	 * @param szgkid
+	 * @param szgqid
+	 * @param gkjyr
+	 * @param fddbr
+	 * @param bgdd
+	 * @param menuid
+	 * @return
+	 * @throws JsonProcessingException
+	 */
 	@RequestMapping(value = "/main")
 	@RequiresPermissions("lhbg:main")
 	public String main(SimplePageRequest page, Model model, final String lczt, final String szdid, final String szgkid, final String szgqid, final String gkjyr, final String fddbr, final String bgdd, String menuid) throws JsonProcessingException {
@@ -216,7 +232,14 @@ public class LhbgCtl extends BaseWebCtl {
 		return "gkjygl/gklhxkgl/gkjylhbg/lhbgadd";
 	}
 
-	// 新增
+	/**
+	 * 查看
+	 * @param model
+	 * @param id
+	 * @param flag
+	 * @param opflag
+	 * @return
+	 */
 	@RequestMapping(value = "/view")
 	public String view(Model model, String id, String flag, String opflag) {
 		model.addAttribute("flag", flag);
@@ -227,7 +250,7 @@ public class LhbgCtl extends BaseWebCtl {
 			model.addAttribute("fjlist", list);
 			for (LhbgfjEntity fj : list) {
 				AccessoryEntity acc = accessoryService.findOne(fj.getFjid());
-				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)  && GlobalData.FTP_FLAG.equals(Constants.YES)) {
+				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY) && GlobalData.FTP_FLAG.equals(Constants.YES)) {
 					try {
 						Ftp f = getftp();
 						// 本地目录
@@ -256,6 +279,7 @@ public class LhbgCtl extends BaseWebCtl {
 		}
 		model.addAttribute("record", lhbg);
 
+		//流程状态
 		String roleCode = "";
 		String currName = "";
 		TaskInfoEntity taskinfo = taskInfoService.findByStep(id, LhbgEntity.PROCESS_DEFINITION_KEY);
@@ -279,6 +303,7 @@ public class LhbgCtl extends BaseWebCtl {
 		model.addAttribute("currName", currName);
 		model.addAttribute("roleCode", roleCode);
 
+		//流程环节
 		List<TaskInfoEntity> slist = taskInfoService.findByBusIdAndBusKeyOrderByIdAsc(id, LhbgEntity.PROCESS_DEFINITION_KEY);
 		List<TaskInfoVo> volist = new ArrayList<TaskInfoVo>();
 		for (int i = 0; i < slist.size(); i++) {
@@ -316,7 +341,13 @@ public class LhbgCtl extends BaseWebCtl {
 		return "gkjygl/gklhxkgl/gkjylhbg/lhbgview";
 	}
 
-	// 新增
+	/**
+	 * 编辑
+	 * @param model
+	 * @param id
+	 * @param flag
+	 * @return
+	 */
 	@RequestMapping(value = "/edit")
 	@RequiresPermissions("lhbg:edit")
 	public String edit(Model model, String id, String flag) {
@@ -387,7 +418,7 @@ public class LhbgCtl extends BaseWebCtl {
 		return wr;
 	}
 
-	// 保存
+	// 同步保存
 	@RequestMapping(value = "/saveTb")
 	@ResponseBody
 	public WebJsonResult saveTb(Model model, LhbgEntity code, String accid) {
@@ -436,6 +467,7 @@ public class LhbgCtl extends BaseWebCtl {
 		return wr;
 	}
 
+	//同步数据
 	@RequestMapping(value = "/saveTbzt")
 	@ResponseBody
 	public WebJsonResult saveTbzt(Model model, String id) {
@@ -470,7 +502,7 @@ public class LhbgCtl extends BaseWebCtl {
 		return wr;
 	}
 
-	// 保存
+	// 提交流程
 	@RequestMapping(value = "/submit")
 	@ResponseBody
 	public WebJsonResult submit(Model model, LhbgEntity code, String accid, String userids) {
@@ -519,9 +551,26 @@ public class LhbgCtl extends BaseWebCtl {
 		return wr;
 	}
 
+	/**
+	 * 退回提交
+	 * @param code
+	 * @param jydyids
+	 * @param accid
+	 * @param userids
+	 * @param mtids
+	 * @param bwids
+	 * @param cgids
+	 * @param ckids
+	 * @param dcids
+	 * @param ryids
+	 * @param sssbids
+	 * @param qytzids
+	 * @param zxjxids
+	 * @return
+	 */
 	@RequestMapping(value = "/submitAudit")
 	@ResponseBody
-	public WebJsonResult submitAudit(LhbgEntity code, String[] jydyids, String accid, String userids, String mtids, String bwids, String cgids, String ckids, String dcids, String ryids, String sssbids, String qytzids, String zxjxids) {
+	public WebJsonResult submitAudit(LhbgEntity code, String userids) {
 		WebJsonResult wr = success();
 		LhbgEntity lhbgEntity = new LhbgEntity();
 		try {
@@ -639,6 +688,14 @@ public class LhbgCtl extends BaseWebCtl {
 		return wr;
 	}
 
+	/**
+	 * 审核流程
+	 * @param shyj 审批意见
+	 * @param id 主键ID
+	 * @param flag 同意True 不同意Flase
+	 * @param userids 用户
+	 * @return
+	 */
 	@RequestMapping(value = "/audit")
 	@ResponseBody
 	public WebJsonResult audit(String shyj, String id, boolean flag, String userids) {
@@ -663,7 +720,7 @@ public class LhbgCtl extends BaseWebCtl {
 				// entity.setSftb(Constants.YES);
 				entity = lhbgService.save(entity);
 				if (flag && StringUtils.isEmpty(entity.getTyyy())) {
-					if(StringUtils.isEmpty(entity.getTyyy())){
+					if (StringUtils.isEmpty(entity.getTyyy())) {
 						UserEntity user = securityMgr.getCurrUser();
 						GkjyrEntity jyr = gkjyrService.findOne(entity.getJyrid());
 						XkzxxEntity xkz = new XkzxxEntity();
@@ -687,7 +744,7 @@ public class LhbgCtl extends BaseWebCtl {
 							xkz.setSzgk(jyr.getSzgk().getId());
 							xkz.setSzd(jyr.getSzd());
 						}
-						
+
 						xkz.setLxdh(entity.getLxr());
 						xkz.setZyqyfw(jyr.getJyfw());
 						xkz.setCq(jyr.getJyqy());
@@ -717,18 +774,18 @@ public class LhbgCtl extends BaseWebCtl {
 				if (!flag || !StringUtils.isEmpty(entity.getTyyy())) {
 					entity.setSftb(Constants.YES);
 					entity = lhbgService.save(entity);
-					
+
 					List<XkzxxEntity> list = xkzxxService.findByJyrid(entity.getJyrid());
 					if (list != null && list.size() > 0) {
 						for (XkzxxEntity xkzxxentity : list) {
-							if("1".equals(xkzxxentity.getSfyx())){
+							if ("1".equals(xkzxxentity.getSfyx())) {
 								xkzxxentity.setSfyx(Constants.XKZ_WX);
 								xkzxxentity.setIsflag("0");
 								xkzxxService.save(xkzxxentity);
 							}
 						}
 					}
-					
+
 					// 如果是省级审核通过或不通过后同步到市级
 					try {
 						List<LhbgfjEntity> fjlist = lhbgfjService.findByBgid(id);
@@ -739,7 +796,7 @@ public class LhbgCtl extends BaseWebCtl {
 							}
 							fjid = fjid.substring(0, fjid.length() - 1);
 						}
-						String url = "GK_OPERATION_JSJY_LHBG_ONE_PC?condition=ID=" + entity.getId() + ";FJID=" + fjid+";JYRID="+entity.getJyrid();
+						String url = "GK_OPERATION_JSJY_LHBG_ONE_PC?condition=ID=" + entity.getId() + ";FJID=" + fjid + ";JYRID=" + entity.getJyrid();
 						boolean tbflag = getTbStatus(url, entity.getSzd().getId());
 						if (tbflag) {
 							entity.setTbzt("Y");

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gklhxkgl/gkjylhsq/ctl/LhsqCtl.java

@@ -79,6 +79,21 @@ public class LhsqCtl extends BaseWebCtl {
 	@Autowired
 	private XzglbmxxService xzglbmxxService;
 
+	/**
+	 * 一览
+	 * @param page 分页
+	 * @param model
+	 * @param lczt 流程状态
+	 * @param szdid 所在地ID
+	 * @param szgkid 所在港口ID
+	 * @param szgqid 所在港区ID
+	 * @param gkjyr 经营人
+	 * @param fddbr 法定代表人
+	 * @param bgdd 办公地址
+	 * @param menuid
+	 * @return
+	 * @throws JsonProcessingException
+	 */
 	@RequestMapping(value = "/main")
 	@RequiresPermissions("lhsq:main")
 	public String main(SimplePageRequest page, Model model, final String lczt, final String szdid, final String szgkid, final String szgqid, final String gkjyr, final String fddbr, final String bgdd, String menuid) throws JsonProcessingException {
@@ -217,7 +232,7 @@ public class LhsqCtl extends BaseWebCtl {
 		return "gkjygl/gklhxkgl/gkjylhsq/lhsqadd";
 	}
 
-	// 新增
+	// 编辑
 	@RequestMapping(value = "/edit")
 	@RequiresPermissions("lhsq:edit")
 	public String edit(Model model, String id, String flag) {
@@ -256,7 +271,7 @@ public class LhsqCtl extends BaseWebCtl {
 		return "gkjygl/gklhxkgl/gkjylhsq/lhsqedit";
 	}
 
-	// 新增
+	// 查看
 	@RequestMapping(value = "/view")
 	public String view(Model model, String id, String flag) {
 		model.addAttribute("flag", flag);
@@ -435,7 +450,7 @@ public class LhsqCtl extends BaseWebCtl {
 		return wr;
 	}
 
-	// 保存
+	// 同步保存
 	@RequestMapping(value = "/saveTb")
 	@ResponseBody
 	public WebJsonResult saveTb(Model model, LhsqEntity code, String accid) {
@@ -582,6 +597,7 @@ public class LhsqCtl extends BaseWebCtl {
 		return wr;
 	}
 
+	//同步 到省级
 	@RequestMapping(value = "/saveTbzt")
 	@ResponseBody
 	public WebJsonResult saveTbzt(Model model, String id) {
@@ -616,7 +632,7 @@ public class LhsqCtl extends BaseWebCtl {
 		return wr;
 	}
 
-	// 保存
+	// 提交流程
 	@RequestMapping(value = "/submit")
 	@ResponseBody
 	public WebJsonResult submit(Model model, LhsqEntity code, String accid, String userids) {
@@ -678,6 +694,13 @@ public class LhsqCtl extends BaseWebCtl {
 		return wr;
 	}
 
+	/**
+	 * 退回提交
+	 * @param code
+	 * @param accid
+	 * @param userids
+	 * @return
+	 */
 	@RequestMapping(value = "/submitAudit")
 	@ResponseBody
 	public WebJsonResult submitAudit(LhsqEntity code, String accid, String userids) {
@@ -729,6 +752,14 @@ public class LhsqCtl extends BaseWebCtl {
 		return wr;
 	}
 
+	/**
+	 * 审核流程
+	 * @param shyj 审核意见
+	 * @param id 主键ID
+	 * @param flag  同意true 不同意 false
+	 * @param userids
+	 * @return
+	 */
 	@RequestMapping(value = "/audit")
 	@ResponseBody
 	public WebJsonResult audit(String shyj, String id, boolean flag, String userids) {

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gklhxkgl/gkjylhyx/ctl/LhyxCtl.java

@@ -89,6 +89,21 @@ public class LhyxCtl extends BaseWebCtl {
 	@Autowired
 	private XkzxxService xkzxxService;
 
+	/**
+	 * 一览
+	 * @param page
+	 * @param model
+	 * @param lczt 流程状态
+	 * @param szdid 所在地ID
+	 * @param szgkid 所在港口Id
+	 * @param szgqid 所在港区ID
+	 * @param gkjyr 经营人
+	 * @param fddbr 法定代表人
+	 * @param bgdd 办地地址
+	 * @param menuid 
+	 * @return
+	 * @throws JsonProcessingException
+	 */
 	@RequestMapping(value = "/main")
 	@RequiresPermissions("lhyx:main")
 	public String main(SimplePageRequest page, Model model, final String lczt, final String szdid, final String szgkid, final String szgqid, final String gkjyr, final String fddbr, final String bgdd, String menuid) throws JsonProcessingException {
@@ -224,7 +239,7 @@ public class LhyxCtl extends BaseWebCtl {
 		return "gkjygl/gklhxkgl/gkjylhyx/lhyxadd";
 	}
 
-	// 新增
+	// 查看
 	@RequestMapping(value = "/view")
 	public String view(Model model, String id, String flag, String opflag) {
 		model.addAttribute("flag", flag);
@@ -323,7 +338,7 @@ public class LhyxCtl extends BaseWebCtl {
 		return "gkjygl/gklhxkgl/gkjylhyx/lhyxview";
 	}
 
-	// 新增
+	// 编辑
 	@RequestMapping(value = "/edit")
 	@RequiresPermissions("lhyx:edit")
 	public String edit(Model model, String id, String flag) {
@@ -399,7 +414,7 @@ public class LhyxCtl extends BaseWebCtl {
 		return wr;
 	}
 
-	// 保存
+	// 同步保存
 	@RequestMapping(value = "/saveTb")
 	@ResponseBody
 	public WebJsonResult saveTb(Model model, LhyxEntity code, String accid) {
@@ -452,7 +467,7 @@ public class LhyxCtl extends BaseWebCtl {
 		return wr;
 	}
 
-	// 保存
+	// 提交流程
 	@RequestMapping(value = "/submit")
 	@ResponseBody
 	public WebJsonResult submit(Model model, LhyxEntity code, String accid, String userids) {
@@ -504,6 +519,13 @@ public class LhyxCtl extends BaseWebCtl {
 		return wr;
 	}
 
+	/**
+	 * 退回提交
+	 * @param code
+	 * @param accid
+	 * @param userids
+	 * @return
+	 */
 	@RequestMapping(value = "/submitAudit")
 	@ResponseBody
 	public WebJsonResult submitAudit(LhyxEntity code, String accid, String userids) {
@@ -627,6 +649,14 @@ public class LhyxCtl extends BaseWebCtl {
 		return wr;
 	}
 
+	/**
+	 * 审核流程
+	 * @param shyj 审核意见
+	 * @param id 主键ID
+	 * @param flag 同意true 不同意false
+	 * @param userids 选择人员
+	 * @return
+	 */
 	@RequestMapping(value = "/audit")
 	@ResponseBody
 	public WebJsonResult audit(String shyj, String id, boolean flag, String userids) {
@@ -730,6 +760,12 @@ public class LhyxCtl extends BaseWebCtl {
 		return wr;
 	}
 
+	/**
+	 * 同步省级状态
+	 * @param model
+	 * @param id
+	 * @return
+	 */
 	@RequestMapping(value = "/saveTbzt")
 	@ResponseBody
 	public WebJsonResult saveTbzt(Model model, String id) {

gkjsjy/trunk/src/com/xt/jygl/gkyxtjyfx/gkaxzyhmtsslyxlfx/ctl/GkaxzytjCtl.java

@@ -57,7 +57,7 @@ public class GkaxzytjCtl extends BaseWebCtl{
 		if (page.getPage() < 1) {
 			page.setPage(SearchCondition.xmxxpage);
 		}
-		page.setSort("createDateTime");
+		page.setSort("id");
 		page.setOrder("desc");
 		Page<XmxxglEntity> list = query.findAll(spec, toPageRequest(page), XmxxglEntity.class);
 		List<GkaxzytjVo> voList = new ArrayList<GkaxzytjVo>();

gkjsjy/trunk/src/com/xt/jygl/sys/ctl/MainCtl.java

@@ -218,13 +218,13 @@ public class MainCtl extends BaseWebCtl {
 			volist = getJsjdbgList();
 		} else if ("jgsq".equals(type)) {
 			volist = getJgsqList();
-		} else if ("jdtx".equals(type)){
+		} else if ("jdtx".equals(type)) {
 			volist = getJdtxxxList();
-		}else if ("qt".equals(type)) {
+		} else if ("qt".equals(type)) {
 			volist = getJsjdcbsjdsList();
 			volist.addAll(getJsjdbgdsList());
 			volist.addAll(getJgsqdsList());
-			
+
 		}
 
 		// 判断省市区别
@@ -324,41 +324,43 @@ public class MainCtl extends BaseWebCtl {
 		if (getSsjyr() != null) {
 			List<XkzxxEntity> list = xkzxxService.queryNeedWarn(ca.getTime(), getSsjyr().getId());
 			ws.setAttr("warn", "您有<span>" + list.size() + "</span>条许可证即将过期，请处理！");
-			//List<Object> jdtxjyr = txService.findByJyrid(getSsjyr().getId());
-			//ws.setAttr("jdtxwarn", "您有<span>" + jdtxjyr.size() + "</span>条监督提醒即将过期，请及时处理！");
+			// List<Object> jdtxjyr = txService.findByJyrid(getSsjyr().getId());
+			// ws.setAttr("jdtxwarn", "您有<span>" + jdtxjyr.size() +
+			// "</span>条监督提醒即将过期，请及时处理！");
 			// 通知公告
 			List<GgxxtxEntity> ggtx = ggxxtxService.findByJyridAndFlag(getSsjyr().getId(), "1");
 			ws.setAttr("tzggwarn", "您有<span>" + ggtx.size() + "</span>条通知公告尚未阅读，请查看！");
-			
-			//初步设计 省通过 flowstatus 为2 ，不通过 flowstatus 为1
-			List<JsjdcbsjEntity> tlist = jsjdcbsjdsService.findByJyridAndFLowstatus(getSsjyr().getId(),"2");
-			List<JsjdcbsjEntity> flist = jsjdcbsjdsService.findByJyridAndFLowstatus(getSsjyr().getId(),"1");
-			ws.setAttr("jsjdcbsjwarn", "项目初步设计申请<span>" + tlist.size() + "</span>条已通过，<span>"+flist.size()+"</span>条未通过请查看！");
-			
-			//初步设计变更 省通过 flowstatus 为2 ，不通过 flowstatus 为1
-			List<JsjdbgEntity> ttlist = jsjdbgdsService.findByJyridAndFLowstatus(getSsjyr().getId(),"2");
-			List<JsjdbgEntity> fflist = jsjdbgdsService.findByJyridAndFLowstatus(getSsjyr().getId(),"1");
-			ws.setAttr("jsjdbgwarn", "项目初步设计变更<span>" + tlist.size() + "</span>条已通过，<span>"+flist.size()+"</span>条未通过请查看！");
-			
+
+			// 初步设计 省通过 flowstatus 为2 ，不通过 flowstatus 为1
+			List<JsjdcbsjEntity> tlist = jsjdcbsjdsService.findByJyridAndFLowstatus(getSsjyr().getId(), "2");
+			List<JsjdcbsjEntity> flist = jsjdcbsjdsService.findByJyridAndFLowstatus(getSsjyr().getId(), "1");
+			ws.setAttr("jsjdcbsjwarn", "项目初步设计申请<span>" + tlist.size() + "</span>条已通过，<span>" + flist.size() + "</span>条未通过请查看！");
+
+			// 初步设计变更 省通过 flowstatus 为2 ，不通过 flowstatus 为1
+			List<JsjdbgEntity> ttlist = jsjdbgdsService.findByJyridAndFLowstatus(getSsjyr().getId(), "2");
+			List<JsjdbgEntity> fflist = jsjdbgdsService.findByJyridAndFLowstatus(getSsjyr().getId(), "1");
+			ws.setAttr("jsjdbgwarn", "项目初步设计变更<span>" + tlist.size() + "</span>条已通过，<span>" + flist.size() + "</span>条未通过请查看！");
+
 			// 竣工 省通过 flowstatus 为2 ，不通过 flowstatus 为1
-			List<JgsqEntity> jgtlist = jgsqdsService.findByJyridAndFLowstatus(getSsjyr().getId(),"2");
-			List<JgsqEntity> jgflist = jgsqdsService.findByJyridAndFLowstatus(getSsjyr().getId(),"1");
-			ws.setAttr("jgsqwarn", "项目竣工验收申请<span>" + tlist.size() + "</span>条已通过，<span>"+flist.size()+"</span>条未通过请查看！");
-			
-			
-			messageNum = list.size()  + ggtx.size();
+			List<JgsqEntity> jgtlist = jgsqdsService.findByJyridAndFLowstatus(getSsjyr().getId(), "2");
+			List<JgsqEntity> jgflist = jgsqdsService.findByJyridAndFLowstatus(getSsjyr().getId(), "1");
+			ws.setAttr("jgsqwarn", "项目竣工验收申请<span>" + tlist.size() + "</span>条已通过，<span>" + flist.size() + "</span>条未通过请查看！");
+
+			messageNum = list.size() + ggtx.size();
 		} else if (SecUtils.getCurrUser().getSsglry() != null) {
 			// 过滤掉自己所发布的监督提醒
-			/*List<Object> jdtxzj = txService.findByXzryidAndCu(SecUtils.getCurrUser().getSsglry().getId());
-			if (jdtxzj.size() > 0) {
-				if (jdtxzj.get(0).equals(SecUtils.getCurrUser().getSsglry().getId())) {
-					ws.setAttr("jdtxwarn", "");
-				} else {
-					List<Object> jdtxxzry = txService.findByXzryid(SecUtils.getCurrUser().getSsglry().getId());
-					ws.setAttr("jdtxwarn", "您有<span>" + jdtxxzry.size() + "</span>条监督提醒即将过期，请及时处理！");
-					messageNum += jdtxxzry.size();
-				}
-			}*/
+			/*
+			 * List<Object> jdtxzj =
+			 * txService.findByXzryidAndCu(SecUtils.getCurrUser
+			 * ().getSsglry().getId()); if (jdtxzj.size() > 0) { if
+			 * (jdtxzj.get(0
+			 * ).equals(SecUtils.getCurrUser().getSsglry().getId())) {
+			 * ws.setAttr("jdtxwarn", ""); } else { List<Object> jdtxxzry =
+			 * txService
+			 * .findByXzryid(SecUtils.getCurrUser().getSsglry().getId());
+			 * ws.setAttr("jdtxwarn", "您有<span>" + jdtxxzry.size() +
+			 * "</span>条监督提醒即将过期，请及时处理！"); messageNum += jdtxxzry.size(); } }
+			 */
 			// 通知公告,过滤自己所发布的监督提醒
 			List<Object> tzggzj = ggxxtxService.findByJyridAndCu(SecUtils.getCurrUser().getSsglry().getId());
 			if (tzggzj.size() > 0) {
@@ -461,7 +463,9 @@ public class MainCtl extends BaseWebCtl {
 			list = dcsbService.findByJyrid(getSsjyr().getId());
 		} else {
 			List<String> gqlist = (List<String>) Utils.getSession().getAttribute("gqList");
-			list = dcsbService.findByGqids(gqlist);
+			if (!StringUtils.isEmpty(gqlist) && gqlist.size() > 0) {
+				list = dcsbService.findByGqids(gqlist);
+			}
 		}
 
 		if (list != null && list.size() > 0) {
@@ -1127,7 +1131,7 @@ public class MainCtl extends BaseWebCtl {
 		List<Object> list = new ArrayList<Object>();
 		if (!StringUtils.isEmpty(jyrid)) {
 			list = dcsbService.findByJyrid(jyrid);
-		} else {
+		} else if (!StringUtils.isEmpty(gqids) && gqids.size() > 0) {
 			list = dcsbService.findByGqids(gqids);
 		}
 
@@ -1155,7 +1159,7 @@ public class MainCtl extends BaseWebCtl {
 		List<Object> list = new ArrayList<Object>();
 		if (!StringUtils.isEmpty(jyrid)) {
 			list = xkzsqService.findByJyrids(jyrid);
-		} else {
+		} else if (!StringUtils.isEmpty(gqids) && gqids.size() > 0) {
 			list = xkzsqService.findByGqids(gqids);
 		}
 		int sum = 0;
@@ -1180,7 +1184,7 @@ public class MainCtl extends BaseWebCtl {
 		List<Object> list = new ArrayList<Object>();
 		if (!StringUtils.isEmpty(jyrid)) {
 			list = xkzbgService.findByJyrids(jyrid);
-		} else {
+		} else if (!StringUtils.isEmpty(gqids) && gqids.size() > 0) {
 			list = xkzbgService.findByGqids(gqids);
 		}
 		int sum = 0;
@@ -1204,7 +1208,7 @@ public class MainCtl extends BaseWebCtl {
 		List<Object> list = new ArrayList<Object>();
 		if (!StringUtils.isEmpty(jyrid)) {
 			list = xkzyxService.findByJyrids(jyrid);
-		} else {
+		} else if (!StringUtils.isEmpty(gqids) && gqids.size() > 0) {
 			list = xkzyxService.findByGqids(gqids);
 		}
 		int sum = 0;
@@ -1227,7 +1231,7 @@ public class MainCtl extends BaseWebCtl {
 		List<Object> list = new ArrayList<Object>();
 		if (!StringUtils.isEmpty(jyrid)) {
 			list = xkzzxService.findByJyrids(jyrid);
-		} else {
+		} else if (!StringUtils.isEmpty(gqids) && gqids.size() > 0) {
 			list = xkzzxService.findByGqids(gqids);
 		}
 		int sum = 0;
@@ -1314,7 +1318,7 @@ public class MainCtl extends BaseWebCtl {
 		List<Object> list = new ArrayList<Object>();
 		if (!StringUtils.isEmpty(jyrid)) {
 			list = jsjdcbsjdsService.findByJyrids(jyrid);
-		} else {
+		} else if (!StringUtils.isEmpty(gqids) && gqids.size() > 0) {
 			list = jsjdcbsjdsService.findByGqids(gqids);
 		}
 
@@ -1341,7 +1345,7 @@ public class MainCtl extends BaseWebCtl {
 		List<Object> list = new ArrayList<Object>();
 		if (!StringUtils.isEmpty(jyrid)) {
 			list = jsjdbgdsService.findByJyrids(jyrid);
-		} else {
+		} else if (!StringUtils.isEmpty(gqids) && gqids.size() > 0) {
 			list = jsjdbgdsService.findByGqids(gqids);
 		}
 
@@ -1368,7 +1372,7 @@ public class MainCtl extends BaseWebCtl {
 		List<Object> list = new ArrayList<Object>();
 		if (!StringUtils.isEmpty(jyrid)) {
 			list = jgsqdsService.findByJyrids(jyrid);
-		} else {
+		} else if (!StringUtils.isEmpty(gqids) && gqids.size() > 0) {
 			list = jgsqdsService.findByGqids(gqids);
 		}
 
@@ -1460,7 +1464,7 @@ public class MainCtl extends BaseWebCtl {
 		List<Object> list = new ArrayList<Object>();
 		if (!StringUtils.isEmpty(jyrid)) {
 			list = jdtxxxService.findByJyrid(jyrid);
-		} else {
+		} else if (!StringUtils.isEmpty(gqids) && gqids.size() > 0) {
 			list = jdtxxxService.findByGqids(gqids);
 		}