صفحهٔ اصلی گشت‌و‌گذار راهنما
ثبت نام ورود
hs
/
jsgkj
2
0
انشعاب 0
پرونده‌ها مشکلات 0 درخواست واکشی 0 ویکی
فهرست منبع

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

ld_xuhx 9 سال پیش
والد
30a473f30a
کامیت
a7a8d918b5
11فایلهای تغییر یافته به همراه107 افزوده شده و 107 حذف شده
نمای یکپارچه نمایش آمار تفاوت ها
  1. 2 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jgsq/jgsqview.jsp
  2. 3 7
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/xmxxgl/xmxxgladd.jsp
  3. 6 2
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/xmxxgl/xmxxgledit.jsp
  4. 5 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/xmxxgl/xmxxglview.jsp
  5. 19 3
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/jyrjbxx/gkjyrmain.jsp
  6. 3 2
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/xkzxx/xkzxxmain.jsp
  7. 6 6
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxksq/xkzsqjds.jsp
  8. 2 1
      gkjsjy/trunk/WebContent/static/biz/js/gkjsgl/jgsq/jgsqdetail.js
  9. 47 49
      gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/jyrjbxx/ctl/GkjyrCtl.java
  10. 9 2
      gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/jyrjbxx/vo/GkjyrVo.java
  11. 5 33
      gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/xkzxx/ctl/XkzxxCtl.java

+ 2 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jgsq/jgsqview.jsp
مشاهده فایل 

@@ -14,6 +14,7 @@
 
 		$(document).ready(function () {

 		$(document).ready(function () {

 			jgsq.detail.opflag="${opflag}"

 			jgsq.detail.opflag="${opflag}"

 			jgsq.detail.taskKey="${taskKey}";

 			jgsq.detail.taskKey="${taskKey}";

+			jgsq.detail.hqflag ="${hqflag}";

 			jgsq.detail.init();

 			jgsq.detail.init();

 			$('.close').click(function(){

 			$('.close').click(function(){

 				guanbi();

 				guanbi();

@@ -337,7 +338,7 @@
 
 

 

 					<div  id="buttons">

 					<div  id="buttons">

 					<c:if test="${flag=='audit' }">

 					<c:if test="${flag=='audit' }">

-					<c:if test="${roleCode != 'Y' }">

+					<c:if test="${roleCode != 'Y' && hqflag == true }">

 							<a class="btn btn-default btn-sm" href="#" onclick="showRy()">

 							<a class="btn btn-default btn-sm" href="#" onclick="showRy()">

 								<i class="glyphicon glyphicon-check"></i> 选择人员

 								<i class="glyphicon glyphicon-check"></i> 选择人员

 							</a>

 							</a>

+ 3 - 7
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/xmxxgl/xmxxgladd.jsp
مشاهده فایل 

@@ -34,7 +34,7 @@
 
 							$("#xzqhsel").append(str);

 							$("#xzqhsel").append(str);

 							

 							

 							$('.xzqhselectpicker').selectpicker({

 							$('.xzqhselectpicker').selectpicker({

-								width:'80%'

+								width:'92.5%%'

 							});

 							});

 						}

 						}

 						}, "json");

 						}, "json");

@@ -122,13 +122,9 @@
 
 					<table class="apply" cellpadding="0" cellspacing="0">

 					<table class="apply" cellpadding="0" cellspacing="0">

 						<tr>

 						<tr>

 						    <th><span class="needwrite">*</span>行政区划：&nbsp;</th>

 						    <th><span class="needwrite">*</span>行政区划：&nbsp;</th>

-							<td >

+							<td colspan="3">

 								<div id="xzqhsel"></div>

 								<div id="xzqhsel"></div>

-							</td>

-						

-							<th><span class="needwrite">*</span>项目编码：&nbsp;</th>

-							<td >

-								<input type="text"  readonly="readonly" class="form-control" id="xmbm" name="xmbm">

+								<input type="hidden"  id="xmbm" name="xmbm">

 							</td>

 							</td>

 						</tr>

 						</tr>

 						<tr>

 						<tr>

+ 6 - 2
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/xmxxgl/xmxxgledit.jsp
مشاهده فایل 

@@ -82,9 +82,13 @@
 
  <input type="hidden" name="fjids" id="fjids">	

  <input type="hidden" name="fjids" id="fjids">	

 					<table class="apply" cellpadding="0" cellspacing="0">

 					<table class="apply" cellpadding="0" cellspacing="0">

 						<tr>

 						<tr>

+							<th><span class="needwrite">*</span>行政区划：&nbsp;</th>

+							<td>

+								<input type="text" style="width: 92.5%;" readonly="readonly" class="form-control" value="${xzqhname}">

+							</td>

 							<th><span class="needwrite">*</span>项目编码：&nbsp;</th>

 							<th><span class="needwrite">*</span>项目编码：&nbsp;</th>

-							<td colspan="4">

-								<input type="text" style="width: 92.5%;" class="form-control" name="xmbm" value="${record.xmbm }">

+							<td>

+								<input type="text" style="width: 92.5%;" readonly="readonly" class="form-control" name="xmbm" value="${record.xmbm }">

 							</td>

 							</td>

 						</tr>

 						</tr>

 						<tr>

 						<tr>

+ 5 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/xmxxgl/xmxxglview.jsp
مشاهده فایل 

@@ -53,8 +53,12 @@
 
  <form  id="addform" method="post" enctype="multipart/form-data"> 		

  <form  id="addform" method="post" enctype="multipart/form-data"> 		

 					<table class="apply" cellpadding="0" cellspacing="0">

 					<table class="apply" cellpadding="0" cellspacing="0">

 						<tr>

 						<tr>

+							<th>行政区划：&nbsp;</th>

+							<td >

+								${xzqhname}

+							</td>

 							<th>项目编码：&nbsp;</th>

 							<th>项目编码：&nbsp;</th>

-							<td colspan="4" >

+							<td >

 								${record.xmbm }

 								${record.xmbm }

 							</td>

 							</td>

 						</tr>

 						</tr>

+ 19 - 3
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/jyrjbxx/gkjyrmain.jsp
مشاهده فایل 

@@ -19,16 +19,30 @@
 
 		gkjyr.main.ywlxbackData='${ywlx}';

 		gkjyr.main.ywlxbackData='${ywlx}';

 		gkjyr.main.szgkbackData = '${szgk}';

 		gkjyr.main.szgkbackData = '${szgk}';

 		gkjyr.main.szgqbackData = '${szgq}';

 		gkjyr.main.szgqbackData = '${szgq}';

+		sfred();

 		gkjyr.main.init();

 		gkjyr.main.init();

 		initJyrxkzsfdqSel('xkzsfdq','${jyrxkzsfdq}');

 		initJyrxkzsfdqSel('xkzsfdq','${jyrxkzsfdq}');

 		iFrameHeightIframe('${menuid}');//自适应高度

 		iFrameHeightIframe('${menuid}');//自适应高度

 	});

 	});

+	function sfred(){

+		var tbtrlength=$("#gkjyrtb").find("tr").length;

+		for(var i=1;i<tbtrlength;i++){

+			 if($('#sfwh'+i).val() == "是"){

+				$("#gkjyr"+i).css('background-color','#E53333');

+			}

+			 if($('#sfred'+i).val() == "1"){

+					$("#gkjyrtr"+i).css('background-color','#ccc');

+				}

+		}

+	}

+

 	function exportExcelAll(data2,data4,data5,data6,data7,data8,data9,data10,data11,data12,data13,data14,data15,data16,data17){

 	function exportExcelAll(data2,data4,data5,data6,data7,data8,data9,data10,data11,data12,data13,data14,data15,data16,data17){

 		location.href=$.app+"/gkjyr/exportExcelAll?bwyt="+data2+"&whfzbh="+data4+"&sfcswhzy="+data5+"&sfcyxkz="+data6+"&gkjyr="+data7+"&szdid="+data8+"&szgkid="+data9+"&szgqid="+data10+"&gkjyxkzh="+data11+"&fddbr="+data12+"&xkzstartDate="+data13+"&xkzendDate="+data14+"&fzstartDate="+data15+"&fzendDate="+data16+"&jyrxkzsfdq="+data17;

 		location.href=$.app+"/gkjyr/exportExcelAll?bwyt="+data2+"&whfzbh="+data4+"&sfcswhzy="+data5+"&sfcyxkz="+data6+"&gkjyr="+data7+"&szdid="+data8+"&szgkid="+data9+"&szgqid="+data10+"&gkjyxkzh="+data11+"&fddbr="+data12+"&xkzstartDate="+data13+"&xkzendDate="+data14+"&fzstartDate="+data15+"&fzendDate="+data16+"&jyrxkzsfdq="+data17;

 	}

 	}

 	function exportJyr(data1,data2){

 	function exportJyr(data1,data2){

 		location.href=$.app+"/gkjyr/exportJyr?id="+data1+"&jyr="+data2;

 		location.href=$.app+"/gkjyr/exportJyr?id="+data1+"&jyr="+data2;

 	}

 	}

+

 </script>

 </script>

 </head>

 </head>

 <body>

 <body>

@@ -148,7 +162,7 @@
 
 				</div>

 				</div>

 				<!-- 列表 -->

 				<!-- 列表 -->

 				<div style="background-color: #f4f4f4;">

 				<div style="background-color: #f4f4f4;">

-					<table class="main_table" cellpadding="0" cellspacing="0">

+					<table id="gkjyrtb" class="main_table" cellpadding="0" cellspacing="0">

 						<tr>

 						<tr>

 							<th width="5%">序号</th>

 							<th width="5%">序号</th>

 							<th width="15%">港口经营人</th>

 							<th width="15%">港口经营人</th>

@@ -161,9 +175,11 @@
 
 							<th width="1%" class="operatetd">操作</th>

 							<th width="1%" class="operatetd">操作</th>

 						</tr>

 						</tr>

 						<c:forEach items="${gkjyrlist}" var="gkjyr" varStatus="status">

 						<c:forEach items="${gkjyrlist}" var="gkjyr" varStatus="status">

-							<tr>

+							<tr id="gkjyrtr${status.count }">

+								<input type="hidden" id="sfred${status.count }" value='${gkjyr.sfred }'>

+								<input type="hidden" id="sfwh${status.count }" value="${gkjyr.sfwhqy }">

 								<td>${status.index+1 }</td>

 								<td>${status.index+1 }</td>

-								<td>${gkjyr.gkjyr }</td>

+								<td id="gkjyr${status.count }">${gkjyr.gkjyr }</td>

 								<td>${gkjyr.gkjyxkzh }</td>

 								<td>${gkjyr.gkjyxkzh }</td>

 								<td>${gkjyr.fddbr }</td>

 								<td>${gkjyr.fddbr }</td>

 								<td>${gkjyr.szgkzw }</td>

 								<td>${gkjyr.szgkzw }</td>

+ 3 - 2
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/xkzxx/xkzxxmain.jsp
مشاهده فایل 

@@ -45,6 +45,8 @@
 
 					$("#xkzxx"+i).css('background-color','red');

 					$("#xkzxx"+i).css('background-color','red');

 				}else if($("#sfred"+i).val()=='yellow'){

 				}else if($("#sfred"+i).val()=='yellow'){

 					$("#xkzxx"+i).css('background-color','yellow');

 					$("#xkzxx"+i).css('background-color','yellow');

+				}else if($('#sfyx').val() == "2"){

+					$("#xkzxx"+i).css('background-color','#ccc');

 				}

 				}

 			}

 			}

 		}

 		}

@@ -142,8 +144,7 @@
 
 		                </td>

 		                </td>

 		                <td>

 		                <td>

 			            	<select class='sfyxselectpicker' name="sfyx" id="sfyx">

 			            	<select class='sfyxselectpicker' name="sfyx" id="sfyx">

-			            	<option></option>

-			            	<option value="1">有效</option>

+			            	<option selected="selected" value="1">有效</option>

 			            	<option value="2">无效</option>

 			            	<option value="2">无效</option>

 			                </select>

 			                </select>

 			            </td>

 			            </td>

+ 6 - 6
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxksq/xkzsqjds.jsp
مشاهده فایل 

@@ -44,33 +44,33 @@
 
 			<td width="40%">${jds.ah }</td>
 
 			<td width="40%">${jds.ah }</td>
 
 		</tr>
 
 		</tr>
 
 		<tr>
 
 		<tr>
 
-			<td colspan="2"><input type="text" class="form-control" id="jyrmc" name="jyrmc" value="${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>
 
 		
 		
 		<tr>
 
 		<tr>
 
 			<td style="text-indent:2em" nowrap="true">你（单位）向本机关提出的&nbsp;</td>
 
 			<td style="text-indent:2em" nowrap="true">你（单位）向本机关提出的&nbsp;</td>
 
-			<td colspan="3"><input type="text" class="form-control" id="jyrfwmc" name="jyrfwmc" value="${jds.jyrfwmc }"></td>
 
+			<td colspan="3"><input type="text" readonly="readonly" class="form-control" id="jyrfwmc" name="jyrfwmc" value="${jds.jyrfwmc }"></td>
 
 		</tr>
 
 		</tr>
 
 		<tr>
 
 		<tr>
 
 			<td colspan="4">的交通行政许可申请。经审查，根据</td>
 
 			<td colspan="4">的交通行政许可申请。经审查，根据</td>
 
 		</tr>
 
 		</tr>
 
 		<tr>
 
 		<tr>
 
-			<td colspan="4"><textarea style="width: 99%;height: 60px" rows="3" cols="3" id="gjrn" name="gjrn" >${jds.gjrn }</textarea></td>
 
+			<td colspan="4"><textarea readonly="readonly" style="width: 99%;height: 60px" rows="3" cols="3" id="gjrn" name="gjrn" >${jds.gjrn }</textarea></td>
 
 		</tr>
 
 		</tr>
 
 		<tr>
 
 		<tr>
 
 			<td colspan="4">的规定，本机关作出如下行政许可决定：</td>
 
 			<td colspan="4">的规定，本机关作出如下行政许可决定：</td>
 
 		</tr>
 
 		</tr>
 
 		<tr>
 
 		<tr>
 
-		<td colspan="4"><textarea style="width: 99%;height: 120px" rows="5" cols="3" id="xkzrn" name="xkzrn" >${jds.xkzrn }</textarea></td>
 
+		<td colspan="4"><textarea readonly="readonly" style="width: 99%;height: 120px" rows="5" cols="3" id="xkzrn" name="xkzrn" >${jds.xkzrn }</textarea></td>
 
 		</tr>
 
 		</tr>
 
 		<tr>
 
 		<tr>
 
 			<td colspan="3" align="right">单位：</td>
 
 			<td colspan="3" align="right">单位：</td>
 
-			<td><input type="text" class="form-control" id="dw" name="dw" value="${jds.dw }"></td>
 
+			<td><input type="text" class="form-control" readonly="readonly" id="dw" name="dw" value="${jds.dw }"></td>
 
 		</tr>
 
 		</tr>
 
 		<tr>
 
 		<tr>
 
 			<td colspan="3" align="right">日期：</td>
 
 			<td colspan="3" align="right">日期：</td>
 
-			<td><input type="text" class="form-control" id="rq" name="rq" value="${jds.rq }"></td>
 
+			<td><input type="text" class="form-control" readonly="readonly" id="rq" name="rq" value="${jds.rq }"></td>
 
 		</tr>
 
 		</tr>
 
 	</table>
 
 	</table>

+ 2 - 1
gkjsjy/trunk/WebContent/static/biz/js/gkjsgl/jgsq/jgsqdetail.js
مشاهده فایل 

@@ -6,6 +6,7 @@ jgsq.detail.gk=null;
 
 jgsq.detail.gq=null;

 jgsq.detail.gq=null;

 jgsq.detail.taskKey=null;

 jgsq.detail.taskKey=null;

 jgsq.detail.opflag = null;

 jgsq.detail.opflag = null;

+jgsq.detail.hqflag == null

 jgsq.detail.init=function(){

 jgsq.detail.init=function(){

 }

 }

 

 

@@ -644,7 +645,7 @@ $('.gkselectpicker').selectpicker({
 
  

  

  

  

  jgsq.detail.audit=function(auditpass,id){

  jgsq.detail.audit=function(auditpass,id){

-	 if(auditpass=="Y" && jgsq.detail.taskKey != 'ldpz'){

+	 if(auditpass=="Y" && jgsq.detail.taskKey != 'ldpz' && jgsq.detail.hqflag  == 'true'){

 		 if(isEmpty($('#userids').val())){

 		 if(isEmpty($('#userids').val())){

 			 $.alert({

 			 $.alert({

 	       		    title: '提示',

 	       		    title: '提示',

+ 47 - 49
gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/jyrjbxx/ctl/GkjyrCtl.java
مشاهده فایل 

@@ -157,7 +157,7 @@ public class GkjyrCtl extends BaseWebCtl {
 
 	@RequestMapping(value = "/main")

 	@RequestMapping(value = "/main")

 	@RequiresPermissions("jyrjbxx:main")

 	@RequiresPermissions("jyrjbxx:main")

 	public String main(SimplePageRequest page, Model model, final String xkzywlx, final String bwyt, final String whfzbh, final String qyxz, final String sfcswhzy, final String sfcyxkz, final HttpServletRequest request, final String gkjyr, final String szdid, final String szgkid, final String szgqid, final String gkjyxkzh, final String fddbr, final String menuid, final Date xkzstartDate, final Date xkzendDate, final Date fzstartDate, final Date fzendDate, final String jyrxkzsfdq) throws JsonProcessingException {

 	public String main(SimplePageRequest page, Model model, final String xkzywlx, final String bwyt, final String whfzbh, final String qyxz, final String sfcswhzy, final String sfcyxkz, final HttpServletRequest request, final String gkjyr, final String szdid, final String szgkid, final String szgqid, final String gkjyxkzh, final String fddbr, final String menuid, final Date xkzstartDate, final Date xkzendDate, final Date fzstartDate, final Date fzendDate, final String jyrxkzsfdq) throws JsonProcessingException {

-		final Map<String, Object> cacheSCmap = CacheSearchCondition.cacheSCmap(request,"jyrjbxx");

+		final Map<String, Object> cacheSCmap = CacheSearchCondition.cacheSCmap(request, "jyrjbxx");

 		final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");

 		final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");

 		// 查询条件

 		// 查询条件

 		Specification<GkjyrEntity> spec = new Specification<GkjyrEntity>() {

 		Specification<GkjyrEntity> spec = new Specification<GkjyrEntity>() {

@@ -235,7 +235,7 @@ public class GkjyrCtl extends BaseWebCtl {
 
 				} else if (isGET(request)) {

 				} else if (isGET(request)) {

 

 

 					String sfcyxkzval = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "sfcyxkz");

 					String sfcyxkzval = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "sfcyxkz");

-					if (!"all".equals(sfcyxkzval)&&StringUtils.isNotEmpty(sfcyxkzval)) {

+					if (!"all".equals(sfcyxkzval) && StringUtils.isNotEmpty(sfcyxkzval)) {

 						if (!"201".equals(sfcyxkzval)) {

 						if (!"201".equals(sfcyxkzval)) {

 							list.add(cb.isNull(root.get("gkjyxkzh").as(String.class)));

 							list.add(cb.isNull(root.get("gkjyxkzh").as(String.class)));

 						} else {

 						} else {

@@ -420,31 +420,22 @@ public class GkjyrCtl extends BaseWebCtl {
 
 				return cb.and(list.toArray(new Predicate[] {}));

 				return cb.and(list.toArray(new Predicate[] {}));

 			}

 			}

 		};

 		};

-/*		String user1 = (String) Utils.getSession().getAttribute("user");

-		String user2 = SecUtils.getCurrUser().getId();

-		if (user2 != null) {

-			if (!user2.equals(user1)) {

-				SearchCondition.jyrpage = 1;

-				SearchCondition.gkjyr = "";

-				SearchCondition.fddbr = "";

-				SearchCondition.gkjyxkzh = "";

-				SearchCondition.szdid = "";

-				SearchCondition.szgkid = "";

-				SearchCondition.szgqid = "";

-				SearchCondition.whfzbh = "";

-				SearchCondition.sfcswhzy = "";

-				SearchCondition.sfcyxkz = "";

-				SearchCondition.bwyt = "";

-				SearchCondition.qyxz = "";

-				SearchCondition.xkzstartDate = null;

-				SearchCondition.xkzendDate = null;

-				SearchCondition.fzstartDate = null;

-				SearchCondition.fzendDate = null;

-				SearchCondition.jyrxkzsfdq = "";

-			}

-

-		}

-		Utils.getSession().setAttribute("user", user2);*/

+		/*

+		 * String user1 = (String) Utils.getSession().getAttribute("user");

+		 * String user2 = SecUtils.getCurrUser().getId(); if (user2 != null) {

+		 * if (!user2.equals(user1)) { SearchCondition.jyrpage = 1;

+		 * SearchCondition.gkjyr = ""; SearchCondition.fddbr = "";

+		 * SearchCondition.gkjyxkzh = ""; SearchCondition.szdid = "";

+		 * SearchCondition.szgkid = ""; SearchCondition.szgqid = "";

+		 * SearchCondition.whfzbh = ""; SearchCondition.sfcswhzy = "";

+		 * SearchCondition.sfcyxkz = ""; SearchCondition.bwyt = "";

+		 * SearchCondition.qyxz = ""; SearchCondition.xkzstartDate = null;

+		 * SearchCondition.xkzendDate = null; SearchCondition.fzstartDate =

+		 * null; SearchCondition.fzendDate = null; SearchCondition.jyrxkzsfdq =

+		 * ""; }

+		 * 

+		 * } Utils.getSession().setAttribute("user", user2);

+		 */

 

 

 		if (page.getPage() < 1) {

 		if (page.getPage() < 1) {

 			Object jyrpage = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "jyrpage");

 			Object jyrpage = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "jyrpage");

@@ -465,11 +456,19 @@ public class GkjyrCtl extends BaseWebCtl {
 
 				vo.setSzgkzw(null != entity.getSzgk() ? entity.getSzgk().getGkmc() : "");

 				vo.setSzgkzw(null != entity.getSzgk() ? entity.getSzgk().getGkmc() : "");

 				vo.setSzgqzw(null != entity.getSzgq() ? entity.getSzgq().getGqmc() : "");

 				vo.setSzgqzw(null != entity.getSzgq() ? entity.getSzgq().getGqmc() : "");

 				vo.setQyxzzw(null != entity.getQyxz() ? entity.getQyxz().getText() : "");

 				vo.setQyxzzw(null != entity.getQyxz() ? entity.getQyxz().getText() : "");

+				vo.setSfwhqy(null != entity.getSfwhqy() ? entity.getSfwhqy().getText() : "");

 				List<XkzxxEntity> xkzs = xkzxxService.findByJyrid(entity.getId());

 				List<XkzxxEntity> xkzs = xkzxxService.findByJyrid(entity.getId());

 				for (XkzxxEntity xkz : xkzs) {

 				for (XkzxxEntity xkz : xkzs) {

 					if (BaseEntity.RECORD_STATE_VALID == xkz.getRecordStatus() && Constants.XKZ_SX.equals(xkz.getSfyx())) {

 					if (BaseEntity.RECORD_STATE_VALID == xkz.getRecordStatus() && Constants.XKZ_SX.equals(xkz.getSfyx())) {

 						vo.setXkzyxq(xkz.getYxqz());

 						vo.setXkzyxq(xkz.getYxqz());

 						vo.setXkzyxqfmt(DateTime.toString(xkz.getYxqz()));

 						vo.setXkzyxqfmt(DateTime.toString(xkz.getYxqz()));

+						Date date = new Date();

+						long day = (xkz.getYxqz().getTime() - date.getTime()) / (24 * 60 * 60 * 1000);

+						if (day <= 30) {

+							vo.setSfred("1");

+						} else {

+							vo.setSfred("2");

+						}

 					}

 					}

 				}

 				}

 

 

@@ -654,7 +653,7 @@ public class GkjyrCtl extends BaseWebCtl {
 
 		try {

 		try {

 			if (!StringUtils.isEmpty(gkjyrEntity.getId())) {// 修改保存

 			if (!StringUtils.isEmpty(gkjyrEntity.getId())) {// 修改保存

 				GkjyrEntity yjyr = gkjyrService.findOne(gkjyrEntity.getId());

 				GkjyrEntity yjyr = gkjyrService.findOne(gkjyrEntity.getId());

-				//BeanUtils.copyProperties(yjyr, gkjyrEntity);

+				// BeanUtils.copyProperties(yjyr, gkjyrEntity);

 				gkjyrEntity.setCreateDateTime(yjyr.getCreateDateTime());

 				gkjyrEntity.setCreateDateTime(yjyr.getCreateDateTime());

 				gkjyrEntity.setCreateUser(yjyr.getCreateUser());

 				gkjyrEntity.setCreateUser(yjyr.getCreateUser());

 				gkjyrEntity.setAqid(yjyr.getAqid());

 				gkjyrEntity.setAqid(yjyr.getAqid());

@@ -674,7 +673,7 @@ public class GkjyrCtl extends BaseWebCtl {
 
 				if (StringUtils.isNotEmpty(qyxzid)) {

 				if (StringUtils.isNotEmpty(qyxzid)) {

 					CodeEntity qyxz = new CodeEntity(qyxzid);

 					CodeEntity qyxz = new CodeEntity(qyxzid);

 					gkjyrEntity.setQyxz(qyxz);

 					gkjyrEntity.setQyxz(qyxz);

-					

+

 				} else {

 				} else {

 					gkjyrEntity.setQyxz(yjyr.getQyxz());

 					gkjyrEntity.setQyxz(yjyr.getQyxz());

 				}

 				}

@@ -889,12 +888,12 @@ public class GkjyrCtl extends BaseWebCtl {
 
 		gkjyrVo.setMtjgxszw(null != gkjyr.getMtjgxs() ? gkjyr.getMtjgxs().getText() : "");

 		gkjyrVo.setMtjgxszw(null != gkjyr.getMtjgxs() ? gkjyr.getMtjgxs().getText() : "");

 		gkjyrVo.setQyxz(null != gkjyr.getQyxz() ? gkjyr.getQyxz().getId() : "");

 		gkjyrVo.setQyxz(null != gkjyr.getQyxz() ? gkjyr.getQyxz().getId() : "");

 

 

-		if(StringUtils.isEmpty(gkjyrVo.getZyid())){

+		if (StringUtils.isEmpty(gkjyrVo.getZyid())) {

 			SimpleDateFormat dateTimeFormat = new SimpleDateFormat("yyyyMMddHHmmss");

 			SimpleDateFormat dateTimeFormat = new SimpleDateFormat("yyyyMMddHHmmss");

 			String zyid = dateTimeFormat.format(new Date());

 			String zyid = dateTimeFormat.format(new Date());

 			gkjyrVo.setZyid(zyid);

 			gkjyrVo.setZyid(zyid);

 		}

 		}

-		

+

 		model.addAttribute("gkjyr", gkjyrVo);

 		model.addAttribute("gkjyr", gkjyrVo);

 		List<CodeEntity> codelist = securityMgr.codeService().findValidCodesByGroupCode(Constants.GROUP_CODE_SF);

 		List<CodeEntity> codelist = securityMgr.codeService().findValidCodesByGroupCode(Constants.GROUP_CODE_SF);

 		model.addAttribute("codedata", JSONArray.fromObject(codelist).toString());

 		model.addAttribute("codedata", JSONArray.fromObject(codelist).toString());

@@ -1082,9 +1081,9 @@ public class GkjyrCtl extends BaseWebCtl {
 
 				vo.setSzgk(entity.getSzgk() != null ? entity.getSzgk().getId() : "");

 				vo.setSzgk(entity.getSzgk() != null ? entity.getSzgk().getId() : "");

 				vo.setSzgq(entity.getSzgq() != null ? entity.getSzgq().getId() : "");

 				vo.setSzgq(entity.getSzgq() != null ? entity.getSzgq().getId() : "");

 				vo.setSsjyr(entity.getSsjyr() != null ? entity.getSsjyr().getId() : "");

 				vo.setSsjyr(entity.getSsjyr() != null ? entity.getSsjyr().getId() : "");

-				

-				vo.setFzsqh(entity.getFzsqh()!=null ? entity.getFzsqh():"");

-				vo.setWxhwpm(entity.getWxhwpm()!=null?entity.getWxhwpm():"");

+

+				vo.setFzsqh(entity.getFzsqh() != null ? entity.getFzsqh() : "");

+				vo.setWxhwpm(entity.getWxhwpm() != null ? entity.getWxhwpm() : "");

 				voList5.add(vo);

 				voList5.add(vo);

 			}

 			}

 		}

 		}

@@ -1371,13 +1370,12 @@ public class GkjyrCtl extends BaseWebCtl {
 
 				vo.setWxydjzw(entity.getWxydj() != null ? entity.getWxydj().getText() : "");

 				vo.setWxydjzw(entity.getWxydj() != null ? entity.getWxydj().getText() : "");

 				vo.setYwfhdzw(entity.getYwfhd() != null ? entity.getYwfhd().getText() : "");

 				vo.setYwfhdzw(entity.getYwfhd() != null ? entity.getYwfhd().getText() : "");

 				vo.setXkzid(entity.getXkzid() != null ? entity.getXkzid() : "");

 				vo.setXkzid(entity.getXkzid() != null ? entity.getXkzid() : "");

-				

-				vo.setCgmc(entity.getCgmc()!=null ? entity.getCgmc() : "");

-				vo.setHxpmc(entity.getHxpmc()!=null? entity.getHxpmc():"");

-				vo.setCgqmj(entity.getCgqmj()!=null ?entity.getCgqmj() :0);

-				vo.setAqgd(entity.getAqgd()!=null ? entity.getAqgd():0);

-				

-				

+

+				vo.setCgmc(entity.getCgmc() != null ? entity.getCgmc() : "");

+				vo.setHxpmc(entity.getHxpmc() != null ? entity.getHxpmc() : "");

+				vo.setCgqmj(entity.getCgqmj() != null ? entity.getCgqmj() : 0);

+				vo.setAqgd(entity.getAqgd() != null ? entity.getAqgd() : 0);

+

 				XkzglbEntity xkzglb = xkzglbService.findByCzidAndYwid(czid, entity.getId());

 				XkzglbEntity xkzglb = xkzglbService.findByCzidAndYwid(czid, entity.getId());

 				if (xkzglb != null) {

 				if (xkzglb != null) {

 					vo.setIsTrue(true);

 					vo.setIsTrue(true);

@@ -1483,15 +1481,15 @@ public class GkjyrCtl extends BaseWebCtl {
 
 				BeanUtils.copyProperties(entity, vo);

 				BeanUtils.copyProperties(entity, vo);

 				vo.setSzdzw(entity.getSzd() != null ? entity.getSzd().getText() : "");

 				vo.setSzdzw(entity.getSzd() != null ? entity.getSzd().getText() : "");

 				vo.setSzgkzw(entity.getSzgk() != null ? entity.getSzgk().getGkmc() : "");

 				vo.setSzgkzw(entity.getSzgk() != null ? entity.getSzgk().getGkmc() : "");

-				vo.setSzgqzw(entity.getSzgq() != null ? entity.getSzgq().getGqmc(): "");

+				vo.setSzgqzw(entity.getSzgq() != null ? entity.getSzgq().getGqmc() : "");

 				vo.setSsjyrzw(entity.getSsjyr() != null ? entity.getSsjyr().getGkjyr() : "");

 				vo.setSsjyrzw(entity.getSsjyr() != null ? entity.getSsjyr().getGkjyr() : "");

 				vo.setSsmtzw(entity.getSsmt() != null ? entity.getSsmt().getMtmc() : "");

 				vo.setSsmtzw(entity.getSsmt() != null ? entity.getSsmt().getMtmc() : "");

 				vo.setWxpdczw(entity.getWxpdc() != null ? entity.getWxpdc().getText() : "");

 				vo.setWxpdczw(entity.getWxpdc() != null ? entity.getWxpdc().getText() : "");

 				vo.setXkzid(entity.getXkzid() != null ? entity.getXkzid() : "");

 				vo.setXkzid(entity.getXkzid() != null ? entity.getXkzid() : "");

-				

-				vo.setZwdcyt(entity.getZwdcyt()!=null ? entity.getZwdcyt():"");

-				vo.setDczmj(entity.getDczmj()!=null ? entity.getDczmj():0);

-				

+

+				vo.setZwdcyt(entity.getZwdcyt() != null ? entity.getZwdcyt() : "");

+				vo.setDczmj(entity.getDczmj() != null ? entity.getDczmj() : 0);

+

 				XkzglbEntity xkzglb = xkzglbService.findByCzidAndYwid(czid, entity.getId());

 				XkzglbEntity xkzglb = xkzglbService.findByCzidAndYwid(czid, entity.getId());

 				if (xkzglb != null) {

 				if (xkzglb != null) {

 					vo.setIsTrue(true);

 					vo.setIsTrue(true);

@@ -1944,9 +1942,9 @@ public class GkjyrCtl extends BaseWebCtl {
 
 				vo.setSzgqzw(entity.getSzgq() != null ? entity.getSzgq().getGqmc() : "");

 				vo.setSzgqzw(entity.getSzgq() != null ? entity.getSzgq().getGqmc() : "");

 				vo.setSsjyrzw(entity.getSsjyr() != null ? entity.getSsjyr().getGkjyr() : "");

 				vo.setSsjyrzw(entity.getSsjyr() != null ? entity.getSsjyr().getGkjyr() : "");

 				vo.setXkzid(entity.getXkzid() != null ? entity.getXkzid() : "");

 				vo.setXkzid(entity.getXkzid() != null ? entity.getXkzid() : "");

-				

-				vo.setXhhgg(entity.getXhhgg()!=null ? entity.getXhhgg():"");

-				vo.setJxsl(entity.getJxsl()!=null ? entity.getJxsl():0);

+

+				vo.setXhhgg(entity.getXhhgg() != null ? entity.getXhhgg() : "");

+				vo.setJxsl(entity.getJxsl() != null ? entity.getJxsl() : 0);

 				XkzglbEntity xkzglb = xkzglbService.findByCzidAndYwid(czid, entity.getId());

 				XkzglbEntity xkzglb = xkzglbService.findByCzidAndYwid(czid, entity.getId());

 				if (xkzglb != null) {

 				if (xkzglb != null) {

 					vo.setIsTrue(true);

 					vo.setIsTrue(true);

+ 9 - 2
gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/jyrjbxx/vo/GkjyrVo.java
مشاهده فایل 

@@ -206,9 +206,16 @@ public class GkjyrVo extends BaseVo {
 
 	private Date xkzyxq;

 	private Date xkzyxq;

 	private String xkzyxqfmt;

 	private String xkzyxqfmt;

 	

 	

+	private String sfred;

 	

 	

-	

-	

+	public String getSfred() {

+		return sfred;

+	}

+

+	public void setSfred(String sfred) {

+		this.sfred = sfred;

+	}

+

 	public String getMtjgxszw() {

 	public String getMtjgxszw() {

 		return mtjgxszw;

 		return mtjgxszw;

 	}

 	}

+ 5 - 33
gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/xkzxx/ctl/XkzxxCtl.java
مشاهده فایل 

@@ -188,35 +188,18 @@ public class XkzxxCtl extends BaseWebCtl {
 
 						list.add(cb.like(root.get("gkjyxkzh").as(String.class), "%" + v + "%"));

 						list.add(cb.like(root.get("gkjyxkzh").as(String.class), "%" + v + "%"));

 					}

 					}

 				}

 				}

-				// else if (StringUtils.isNotEmpty(SearchCondition.xkzgkjyxkzh)

-				// && isGET(request)) {

-				// list.add(cb.like(root.get("gkjyxkzh").as(String.class), "%" +

-				// SearchCondition.xkzgkjyxkzh + "%"));

-				// }

 				if (StringUtils.isNotEmpty(sfyx)) {

 				if (StringUtils.isNotEmpty(sfyx)) {

-					// if ("1".equals(sfyx)) {

 					list.add(cb.equal(root.get("sfyx").as(String.class), sfyx));

 					list.add(cb.equal(root.get("sfyx").as(String.class), sfyx));

-					// } else {

-					// list.add(cb.notEqual(root.get("sfyx").as(String.class),

-					// "2"));

-					// }

 				} else if (isGET(request)) {

 				} else if (isGET(request)) {

 					String v = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "sfyx");

 					String v = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "sfyx");

-

 					if (StringUtils.isNotEmpty(v)) {

 					if (StringUtils.isNotEmpty(v)) {

-						// if ("1".equals(sfyx)) {

 						list.add(cb.equal(root.get("sfyx").as(String.class), v));

 						list.add(cb.equal(root.get("sfyx").as(String.class), v));

-						// } else {

-						// list.add(cb.notEqual(root.get("sfyx").as(String.class),

-						// v));

-						// }

+					} else {

+						if (StringUtils.isEmpty(sfyx)) {

+							list.add(cb.equal(root.get("sfyx").as(String.class), "1"));

+						}

 					}

 					}

 				}

 				}

-				// else if (StringUtils.isNotEmpty(SearchCondition.sfyx) &&

-				// isGET(request)) {

-				// list.add(cb.like(root.get("sfyx").as(String.class), "%" +

-				// SearchCondition.sfyx + "%"));

-				// }

 				if (yxq1 != null) {

 				if (yxq1 != null) {

 					list.add(cb.greaterThanOrEqualTo(root.get("yxqz").as(Date.class), yxq1));

 					list.add(cb.greaterThanOrEqualTo(root.get("yxqz").as(Date.class), yxq1));

 				} else if (isGET(request)) {

 				} else if (isGET(request)) {

@@ -324,18 +307,7 @@ public class XkzxxCtl extends BaseWebCtl {
 
 			}

 			}

 			page.setPage(Integer.valueOf(String.valueOf(xkzpage)));

 			page.setPage(Integer.valueOf(String.valueOf(xkzpage)));

 		}

 		}

-		// if (isPOST(request)) {

-		// SearchCondition.xkzpage = page.getPage();

-		// SearchCondition.xkzgkjyr = gkjyr;

-		// SearchCondition.xkzszdid = szdid;

-		// SearchCondition.xkzszgqid = szgqid;

-		// SearchCondition.xkzszgkid = szgkid;

-		// SearchCondition.xkzgkjyxkzh = gkjyxkzh;

-		// SearchCondition.sfyx = sfyx;

-		// SearchCondition.yxq1 = yxq1;

-		// SearchCondition.yxq2 = yxq2;

-		// SearchCondition.xkzsfdq = xkzsfdq;

-		// }

+

 		page.setOrder("asc");

 		page.setOrder("asc");

 		Page<XkzxxEntity> list = query.findAll(spec, toPageRequest(page), XkzxxEntity.class);

 		Page<XkzxxEntity> list = query.findAll(spec, toPageRequest(page), XkzxxEntity.class);

 		List<XkzxxVo> voList = new ArrayList<XkzxxVo>();

 		List<XkzxxVo> voList = new ArrayList<XkzxxVo>();