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

gkjsjy/trunk/WebContent/WEB-INF/pages/ggfwxxgl/hxhbgl/hxhbglmain.jsp

@@ -79,13 +79,13 @@
 		                 	航班录入&nbsp;&nbsp;<br>时间起：&nbsp;
 		                </td>
 		                <td >
-		                 	<input type="text" id="d1" class="form-control" name="hxlrsjq" value="${hxlrsjq }" onFocus="WdatePicker({lang:'zh-cn',skin:'default',dateFmt:'yyyy-MM-dd HH:mm:ss',maxDate: '#F{$dp.$D(\'d2\',{d:0})}'})">
+		                 	<input type="text" id="d1" class="form-control" name="hxlrsjq" value="${hxlrsjq }" onFocus="WdatePicker({lang:'zh-cn',skin:'default',dateFmt:'yyyy-MM-dd',maxDate: '#F{$dp.$D(\'d2\',{d:0})}'})">
 		                </td>
 		                <td class="right">
 		                 	航班录入&nbsp;&nbsp;<br>时间止：&nbsp;
 		                </td>
 		                <td >
-		                 	<input type="text" id="d2"  class="form-control" name="hxlrsjz" value="${hxlrsjz }" onFocus="WdatePicker({lang:'zh-cn',skin:'default',dateFmt:'yyyy-MM-dd HH:mm:ss',minDate: '#F{$dp.$D(\'d1\',{d:0})}'})"">
+		                 	<input type="text" id="d2"  class="form-control" name="hxlrsjz" value="${hxlrsjz }" onFocus="WdatePicker({lang:'zh-cn',skin:'default',dateFmt:'yyyy-MM-dd',minDate: '#F{$dp.$D(\'d1\',{d:0})}'})"">
 		                </td>
 		            </tr>
 	                <tr>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxksq/xkzsqjds.jsp

@@ -44,9 +44,9 @@
 			<td width="40%">${jds.ah }</td>
 		</tr>
 		<tr>
-			<td colspan="2">${jds.jyrmc }</td>
+			<td colspan="2">${jds.jyrmc }:</td>
 <%-- 			<td colspan="2"><input type="text" readonly="readonly" class="form-control" id="jyrmc" name="jyrmc" value="${jds.jyrmc }"></td> --%>
-			<td colspan="2">:</td>
+			<td colspan="2"></td>
 		</tr>
 		
 		<tr>
@@ -63,7 +63,7 @@
 			<td colspan="4">的规定，本机关作出如下行政许可决定：</td>
 		</tr>
 		<tr>
-		<td colspan="4">${jds.xkzrn }</td>
+			<td colspan="4" style="padding-left: 10px">${jds.xkzrn }</td>
 		</tr>
 		<tr>
 			<td colspan="3" align="right">单位：</td>

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

@@ -61,8 +61,8 @@ public class HxhbglCtl extends BaseWebCtl {
 	 */
 	@RequestMapping(value = "/main")
 	@RequiresPermissions("hxhbgl:main")
-	public String main(SimplePageRequest page, Model model, final HttpServletRequest request,final String ssjyr, final String szdid, final String szgkid, final String szgqid, final String hxlrsjq, final String hxlrsjz, String menuid) throws JsonProcessingException {
-		final Map<String, Object> cacheSCmap = CacheSearchCondition.cacheSCmap(request,"hxhbgl");
+	public String main(SimplePageRequest page, Model model, final HttpServletRequest request, final String ssjyr, final String szdid, final String szgkid, final String szgqid, final String hxlrsjq, final String hxlrsjz, String menuid) throws JsonProcessingException {
+		final Map<String, Object> cacheSCmap = CacheSearchCondition.cacheSCmap(request, "hxhbgl");
 		// 查詢條件
 		Specification<HxhbglEntity> spec = new Specification<HxhbglEntity>() {
 
@@ -71,71 +71,71 @@ public class HxhbglCtl extends BaseWebCtl {
 				List<Predicate> list = new ArrayList<Predicate>();
 				if (StringUtils.isNotEmpty(szdid)) {
 					list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + szdid + "%"));
-				}else if (isGET(request)) {
-					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, "id","szd","szdid");
+				} else if (isGET(request)) {
+					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, "id", "szd", "szdid");
 				}
 				if (StringUtils.isNotEmpty(szgkid)) {
 					list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + szgkid + "%"));
-				}else if (isGET(request)) {
-					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, "id","szgk","szgkid");
+				} else if (isGET(request)) {
+					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, "id", "szgk", "szgkid");
 				}
 				if (StringUtils.isNotEmpty(szgqid)) {
 					list.add(cb.like(root.get("szgq").get("id").as(String.class), "%" + szgqid + "%"));
-				}else if (isGET(request)) {
-					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, "id","szgq","szgqid");
+				} else if (isGET(request)) {
+					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, "id", "szgq", "szgqid");
 				}
 				if (StringUtils.isNotEmpty(ssjyr)) {
 					list.add(cb.like(root.get("ssjyr").get("gkjyr").as(String.class), "%" + ssjyr + "%"));
-				}else if (isGET(request)) {
-					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, "gkjyr","ssjyr");
+				} else if (isGET(request)) {
+					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, "gkjyr", "ssjyr");
 				}
 				SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 				Date date;
 				if (StringUtils.isNotEmpty(hxlrsjq)) {
 					try {
-						date = sdf.parse(hxlrsjq);
+						date = sdf.parse(hxlrsjq + " 00:00:00");
 					} catch (ParseException e) {
 						// TODO Auto-generated catch block
 						date = null;
 						e.printStackTrace();
 					}
 					list.add(cb.greaterThanOrEqualTo(root.get("createDateTime").as(Date.class), date));
-				}else if (isGET(request)) {
-					String val =(String)CacheSearchCondition.cacheSCmapVal(cacheSCmap,"hxlrsjq");
-					if(StringUtils.isNotEmpty(val)){
+				} else if (isGET(request)) {
+					String val = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "hxlrsjq");
+					if (StringUtils.isNotEmpty(val)) {
 						try {
-							date = sdf.parse(val);
+							date = sdf.parse(val + " 00:00:00");
 						} catch (ParseException e) {
 							// TODO Auto-generated catch block
 							date = null;
 							e.printStackTrace();
 						}
 						list.add(cb.greaterThanOrEqualTo(root.get("createDateTime").as(Date.class), date));
-					}					
-					
+					}
+
 				}
 				if (StringUtils.isNotEmpty(hxlrsjz)) {
 					try {
-						date = sdf.parse(hxlrsjz);
+						date = sdf.parse(hxlrsjz + " 23:59:59");
 					} catch (ParseException e) {
-						
+
 						date = null;
 						e.printStackTrace();
 					}
 					list.add(cb.lessThanOrEqualTo(root.get("createDateTime").as(Date.class), date));
-				}else if (isGET(request)) {
-					String val =(String)CacheSearchCondition.cacheSCmapVal(cacheSCmap,"hxlrsjz");
-					if(StringUtils.isNotEmpty(val)){
-						try {						
-							date = sdf.parse(val);
+				} else if (isGET(request)) {
+					String val = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "hxlrsjz");
+					if (StringUtils.isNotEmpty(val)) {
+						try {
+							date = sdf.parse(val + " 23:59:59");
 						} catch (ParseException e) {
-							
+
 							date = null;
 							e.printStackTrace();
 						}
 						list.add(cb.lessThanOrEqualTo(root.get("createDateTime").as(Date.class), date));
-					}			
-					
+					}
+
 				}
 				// 经营人只能查看自己企业下的数据，非经营人只能查看自己所在地的数据
 				if (isJyr()) {
@@ -155,7 +155,7 @@ public class HxhbglCtl extends BaseWebCtl {
 			}
 			page.setPage(Integer.valueOf(String.valueOf(hxhbpage)));
 		}
-		
+
 		page.setOrder("desc");
 		page.setSort("id");
 		Page<HxhbglEntity> list = query.findAll(spec, toPageRequest(page), HxhbglEntity.class);
@@ -205,10 +205,10 @@ public class HxhbglCtl extends BaseWebCtl {
 	@RequestMapping(value = "/save")
 	@RequiresPermissions("hxhbgl:add")
 	@ResponseBody
-	public WebJsonResult save(Model model, HxhbglEntity code, String ssjyrid,String rq) {
+	public WebJsonResult save(Model model, HxhbglEntity code, String ssjyrid, String rq) {
 		WebJsonResult wr = success();
-		String year = rq.substring(0,4);
-		String month = rq.substring(5,7);
+		String year = rq.substring(0, 4);
+		String month = rq.substring(5, 7);
 		if (StringUtils.isEmpty(ssjyrid)) {
 			wr.setSuccess(false);
 			wr.setMessage("请选择所属经营人！");
@@ -251,7 +251,7 @@ public class HxhbglCtl extends BaseWebCtl {
 				code.setSzgk(ssjyr.getSzgk());
 				code.setSzgq(ssjyr.getSzgq());
 				code.setSsgkglbm(ssjyr.getSsgkglbm());
-				
+
 				code.setYear(year);
 				code.setMonth(month);
 				hxhbglService.save(code);
@@ -272,10 +272,10 @@ public class HxhbglCtl extends BaseWebCtl {
 		BeanUtils.copyProperties(entity, vo);
 		vo.setSsjyr(entity.getSsjyr() != null ? entity.getSsjyr().getId() : "");
 		vo.setSsjyrzw(entity.getSsjyr() != null ? entity.getSsjyr().getGkjyr() : "");
-		vo.setSsgkglbm(entity.getSsgkglbm()!=null?entity.getSsgkglbm().getId():""); 
-        vo.setSsgkglbmzw(entity.getSsgkglbm()!=null?entity.getSsgkglbm().getGkglbmqc():""); 
-        String rq=entity.getYear()+"-"+entity.getMonth();
-        vo.setRq(rq);
+		vo.setSsgkglbm(entity.getSsgkglbm() != null ? entity.getSsgkglbm().getId() : "");
+		vo.setSsgkglbmzw(entity.getSsgkglbm() != null ? entity.getSsgkglbm().getGkglbmqc() : "");
+		String rq = entity.getYear() + "-" + entity.getMonth();
+		vo.setRq(rq);
 		model.addAttribute("record", vo);
 		model.addAttribute("jyr", getSsjyr() != null ? JSONObject.fromObject(getSsjyr()).toString() : null);
 		return "ggfwxxgl/hxhbgl/hxhbgledit";
@@ -288,9 +288,9 @@ public class HxhbglCtl extends BaseWebCtl {
 		HxhbglVo vo = new HxhbglVo();
 		BeanUtils.copyProperties(entity, vo);
 		vo.setSsjyrzw(entity.getSsjyr() != null ? entity.getSsjyr().getGkjyr() : "");
-        vo.setSsgkglbmzw(entity.getSsgkglbm()!=null?entity.getSsgkglbm().getGkglbmqc():""); 
-        String rq=entity.getYear()+"-"+entity.getMonth();
-        vo.setRq(rq);
+		vo.setSsgkglbmzw(entity.getSsgkglbm() != null ? entity.getSsgkglbm().getGkglbmqc() : "");
+		String rq = entity.getYear() + "-" + entity.getMonth();
+		vo.setRq(rq);
 		model.addAttribute("menuid", menuid);
 		model.addAttribute("record", vo);
 		return "ggfwxxgl/hxhbgl/hxhbglview";

gkjsjy/trunk/src/com/xt/jygl/ggfwxxgl/hxhbgl/entity/HxhbglEntity.java

@@ -34,31 +34,31 @@ public class HxhbglEntity extends BaseEntity<String> implements Cloneable {
 	/* 所属经营人 */
 	private GkjyrEntity ssjyr = null;
 	/* 内贸集装箱吞吐量 */
-	private Integer nmjzxttl = null;
+	private Double nmjzxttl = null;
 	/* 外贸集装箱吞吐量 */
-	private Integer wmjzxttl = null;
+	private Double wmjzxttl = null;
 	/* 远洋航线条数 */
-	private Integer yyhxts = null;
+	private Double yyhxts = null;
 	/* 远洋航线航班数 */
-	private Integer yyhxhbs = null;
+	private Double yyhxhbs = null;
 	/* 远洋航线备注 */
 	private String yyhxbz = null;
 	/* 近洋航线条数 */
-	private Integer jyhxts = null;
+	private Double jyhxts = null;
 	/* 近洋航线航班数 */
-	private Integer jyhxhbs = null;
+	private Double jyhxhbs = null;
 	/* 近洋航线备注 */
 	private String jyhxbz = null;
 	/* 内支线条数 */
-	private Integer nzxts = null;
+	private Double nzxts = null;
 	/* 内支线航班数 */
-	private Integer nzxhbs = null;
+	private Double nzxhbs = null;
 	/* 内支线备注 */
 	private String nzxbz = null;
 	/* 内贸航线条数 */
-	private Integer nmhxts = null;
+	private Double nmhxts = null;
 	/* 内贸航线航班数 */
-	private Integer nmhxhbs = null;
+	private Double nmhxhbs = null;
 	/* 内贸航线备注 */
 	private String nmhxbz = null;
 	/* 所在港口 */
@@ -87,35 +87,35 @@ public class HxhbglEntity extends BaseEntity<String> implements Cloneable {
 		this.id = id;
 	}
 
-	public Integer getNmjzxttl() {
+	public Double getNmjzxttl() {
 		return nmjzxttl;
 	}
 
-	public void setNmjzxttl(Integer nmjzxttl) {
+	public void setNmjzxttl(Double nmjzxttl) {
 		this.nmjzxttl = nmjzxttl;
 	}
 
-	public Integer getWmjzxttl() {
+	public Double getWmjzxttl() {
 		return wmjzxttl;
 	}
 
-	public void setWmjzxttl(Integer wmjzxttl) {
+	public void setWmjzxttl(Double wmjzxttl) {
 		this.wmjzxttl = wmjzxttl;
 	}
 
-	public Integer getYyhxts() {
+	public Double getYyhxts() {
 		return yyhxts;
 	}
 
-	public void setYyhxts(Integer yyhxts) {
+	public void setYyhxts(Double yyhxts) {
 		this.yyhxts = yyhxts;
 	}
 
-	public Integer getYyhxhbs() {
+	public Double getYyhxhbs() {
 		return yyhxhbs;
 	}
 
-	public void setYyhxhbs(Integer yyhxhbs) {
+	public void setYyhxhbs(Double yyhxhbs) {
 		this.yyhxhbs = yyhxhbs;
 	}
 
@@ -127,19 +127,19 @@ public class HxhbglEntity extends BaseEntity<String> implements Cloneable {
 		this.yyhxbz = yyhxbz;
 	}
 
-	public Integer getJyhxts() {
+	public Double getJyhxts() {
 		return jyhxts;
 	}
 
-	public void setJyhxts(Integer jyhxts) {
+	public void setJyhxts(Double jyhxts) {
 		this.jyhxts = jyhxts;
 	}
 
-	public Integer getJyhxhbs() {
+	public Double getJyhxhbs() {
 		return jyhxhbs;
 	}
 
-	public void setJyhxhbs(Integer jyhxhbs) {
+	public void setJyhxhbs(Double jyhxhbs) {
 		this.jyhxhbs = jyhxhbs;
 	}
 
@@ -151,19 +151,19 @@ public class HxhbglEntity extends BaseEntity<String> implements Cloneable {
 		this.jyhxbz = jyhxbz;
 	}
 
-	public Integer getNzxts() {
+	public Double getNzxts() {
 		return nzxts;
 	}
 
-	public void setNzxts(Integer nzxts) {
+	public void setNzxts(Double nzxts) {
 		this.nzxts = nzxts;
 	}
 
-	public Integer getNzxhbs() {
+	public Double getNzxhbs() {
 		return nzxhbs;
 	}
 
-	public void setNzxhbs(Integer nzxhbs) {
+	public void setNzxhbs(Double nzxhbs) {
 		this.nzxhbs = nzxhbs;
 	}
 
@@ -175,19 +175,19 @@ public class HxhbglEntity extends BaseEntity<String> implements Cloneable {
 		this.nzxbz = nzxbz;
 	}
 
-	public Integer getNmhxts() {
+	public Double getNmhxts() {
 		return nmhxts;
 	}
 
-	public void setNmhxts(Integer nmhxts) {
+	public void setNmhxts(Double nmhxts) {
 		this.nmhxts = nmhxts;
 	}
 
-	public Integer getNmhxhbs() {
+	public Double getNmhxhbs() {
 		return nmhxhbs;
 	}
 
-	public void setNmhxhbs(Integer nmhxhbs) {
+	public void setNmhxhbs(Double nmhxhbs) {
 		this.nmhxhbs = nmhxhbs;
 	}
 

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

@@ -830,9 +830,9 @@ public class XkzsqCtl extends BaseWebCtl {
 							vo.setSsgqzw(gq.getGqmc());
 						}
 					}
-					if(vo.getSzgk()!=null){
-						GkEntity gk= gkService.findOne(vo.getSzgk());
-						if(null!=gk){
+					if (vo.getSzgk() != null) {
+						GkEntity gk = gkService.findOne(vo.getSzgk());
+						if (null != gk) {
 							vo.setSzgkzw(gk.getGkmc());
 						}
 					}
@@ -2796,7 +2796,7 @@ public class XkzsqCtl extends BaseWebCtl {
 				}
 				jds.setJyrfwmc(jyfwstr);
 				jds.setGjrn("《中华人民共和国港口法》和《港口经营管理规定》（中华人民共和国交通部令2009年第13号）");
-				jds.setXkzrn("同意你（单位）人事以下港口经营业务：\n经营范围：" + jyfwstr2 + "\n经营地域：" + jylzstr + "\n办公地点：" + xkzsq.getBgdd() != null ? xkzsq.getBgdd() : "" + "\n法定代表人：" + xkzsq.getFddbr() != null ? xkzsq.getFddbr() : "");
+				jds.setXkzrn("法定代表人：" + (xkzsq.getFddbr() != null ? xkzsq.getFddbr() : "") + "<br/>办公地点：" + (xkzsq.getBgdd() != null ? xkzsq.getBgdd() : "") + "<br/>经营范围：" + jyfwstr2 + "<br/>经营地域：" + jylzstr);
 
 			}
 			UserEntity user = securityMgr.getCurrUser();