홈 탐색 도움말
가입하기 로그인
hs
/
jsgkj
2
0
포크 0
파일 이슈 0 풀 리퀘스트 0 위키
소스 검색

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

ld_xuhx 8 년 전
부모
a3afcf00ab
커밋
8a19fae3a3
47개의 변경된 파일과 2928개의 추가작업 그리고 1210개의 파일을 삭제
분할 보기 변경상태 보기
  1. 3 0
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdgl/jsjdgledit.jsp
  2. 1854 0
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdgl/jsjdgledittest.jsp
  3. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdgl/jsjdglmain.jsp
  4. 2 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/zxjx/zxjxmain.jsp
  5. 45 0
      gkjsjy/trunk/WebContent/static/biz/js/gkjsgl/jsjdgl/jsjdgldetail.js
  6. 4 0
      gkjsjy/trunk/WebContent/static/biz/js/gkjsgl/jsjdgl/jsjdglmain.js
  7. 2 0
      gkjsjy/trunk/WebContent/static/biz/js/gkjygl/gkjyr/zxjx/zxjxmain.js
  8. 72 43
      gkjsjy/trunk/src/com/xt/jygl/common/SearchCondition.java
  9. 4 6
      gkjsjy/trunk/src/com/xt/jygl/ggfwxxgl/jdtxxx/ctl/JdtxxxCtl.java
  10. 4 6
      gkjsjy/trunk/src/com/xt/jygl/ggfwxxgl/tzgg/ggxx/ctl/GgxxCtl.java
  11. 6 7
      gkjsjy/trunk/src/com/xt/jygl/gkjcxx/ax/ctl/AxCtl.java
  12. 6 9
      gkjsjy/trunk/src/com/xt/jygl/gkjcxx/cb/ctl/CbCtl.java
  13. 44 33
      gkjsjy/trunk/src/com/xt/jygl/gkjcxx/fbd/ctl/FbdCtl.java
  14. 4 6
      gkjsjy/trunk/src/com/xt/jygl/gkjcxx/gk/ctl/GkCtl.java
  15. 14 19
      gkjsjy/trunk/src/com/xt/jygl/gkjcxx/gq/ctl/GqCtl.java
  16. 5 26
      gkjsjy/trunk/src/com/xt/jygl/gkjcxx/jghd/ctl/JghdCtl.java
  17. 26 30
      gkjsjy/trunk/src/com/xt/jygl/gkjcxx/md/ctl/MdCtl.java
  18. 4 79
      gkjsjy/trunk/src/com/xt/jygl/gkjcxx/mt/ctl/MtCtl.java
  19. 34 30
      gkjsjy/trunk/src/com/xt/jygl/gkjcxx/zyq/ctl/ZyqCtl.java
  20. 4 8
      gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jgsq/ctl/JgsqCtl.java
  21. 4 8
      gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jgsq/ctl/JgsqdsCtl.java
  22. 39 31
      gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdbg/ctl/JsjdbgCtl.java
  23. 4 8
      gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdbg/ctl/JsjdbgdsCtl.java
  24. 3 10
      gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdcbsj/ctl/JsjdcbsjCtl.java
  25. 3 8
      gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdcbsj/ctl/JsjdcbsjdsCtl.java
  26. 309 10
      gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdgl/ctl/JsjdglCtl.java
  27. 10 9
      gkjsjy/trunk/src/com/xt/jygl/gkjsgl/tzjhgl/ctl/TzjhglCtl.java
  28. 3 7
      gkjsjy/trunk/src/com/xt/jygl/gkjsgl/xmxxgl/ctl/XmxxglCtl.java
  29. 57 51
      gkjsjy/trunk/src/com/xt/jygl/gkjygl/cghzyxxgl/dcsb/ctl/DcsbCtl.java
  30. 8 118
      gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/jyrbw/ctl/BwCtl.java
  31. 11 55
      gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/jyrcg/ctl/CgCtl.java
  32. 13 60
      gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/jyrck/ctl/CkCtl.java
  33. 85 134
      gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/jyrdc/ctl/DcCtl.java
  34. 5 15
      gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/jyrjbxx/ctl/GkjyrCtl.java
  35. 16 49
      gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/qytz/ctl/QytzCtl.java
  36. 12 79
      gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/ry/ctl/RyCtl.java
  37. 10 37
      gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/sssb/ctl/SssbCtl.java
  38. 10 91
      gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/xkzfz/ctl/XkzfzCtl.java
  39. 5 43
      gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/xkzxx/ctl/XkzxxCtl.java
  40. 75 36
      gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxkbg/ctl/XkzbgCtl.java
  41. 6 8
      gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxksq/ctl/XkzsqCtl.java
  42. 9 2
      gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxkyx/ctl/XkzyxCtl.java
  43. 33 17
      gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxkzx/ctl/XkzzxCtl.java
  44. 34 13
      gkjsjy/trunk/src/com/xt/jygl/gkjygl/gklhxkgl/gkjylhbg/ctl/LhbgCtl.java
  45. 8 1
      gkjsjy/trunk/src/com/xt/jygl/gkjygl/gklhxkgl/gkjylhsq/ctl/LhsqCtl.java
  46. 8 1
      gkjsjy/trunk/src/com/xt/jygl/gkjygl/gklhxkgl/gkjylhyx/ctl/LhyxCtl.java
  47. 10 5
      gkjsjy/trunk/src/com/xt/jygl/set/user/ctl/UserCtl.java

+ 3 - 0
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdgl/jsjdgledit.jsp
파일 보기 

@@ -1850,6 +1850,9 @@
 
 					</c:if>

 					<c:if test="${sfjyr==1 }">

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

+					  <a class="btn btn-default btn-sm" href="#"  onclick="jsjdgl.detail.saveAll('N','${record.id}')">

+							   <i class="glyphicon glyphicon-floppy-disk"></i> 

+							            保存</a>

 					<a id="auditbt" class="btn btn-default btn-sm" href="#"  onclick="jsjdgl.detail.audit('Y','${record.id}')">

 							   <i class="glyphicon glyphicon-ok-sign"></i> 

 							            提交</a>

+ 1854 - 0
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdgl/jsjdgledittest.jsp
파일 보기 

@@ -0,0 +1,1854 @@
 
+<%@ page language="java" contentType="text/html; charset=UTF-8"

+	pageEncoding="UTF-8"%>

+

+<!DOCTYPE html>

+<html lang="en">

+<head>

+    <meta charset="utf-8">

+    <title>江苏省港口建设与经营管理信息系统</title>

+    <meta name="viewport" content="width=device-width, initial-scale=1">

+

+    <%@ include file="../../common.jsp"%>

+	<script type="text/javascript" src="${app }/static/biz/js/gkjsgl/jsjdgl/jsjdgldetail.js"></script>

+	<script type="text/javascript" src="${app }/static/biz/js/gkjsgl/xmxxgl/xmxxgldetail.js"></script>

+	<script type="text/javascript">

+		$(document).ready(function () {

+			if('${record.tzlx }' == "1903") {

+				$("#zftzDiv").css("display","table-row");

+				var ztz = '${record.ztz}';

+				var zftze = '${record.zftze}';

+				if(isEmpty(ztz) || isEmpty(zftze)) {

+					return;

+				}

+				if(isFDS(ztz) && isFDS(zftze)) {

+					var rate = (zftze/ztz)*100;

+					$("#zftzTd").html(rate.toFixed(2));

+				}

+			} else {

+				$("#zftzDiv").css("display","none");

+			}

+			jsjdgl.detail.init();

+			jsjdgl.detail.path='${path}';

+			jsjdgl.detail.type='${type}';

+			initSylxSelect('sylxsel', '${record.sylx }', '80%');

+			initTzlxSelect('tzlxsel','${record.tzlx }','80%');

+			initXmhzjbSelect('xmhzjbsel','${record.xmhzjb }','80%');

+			initAxspjbSelect('axspjbsel','${record.axspjb }','80%');

+			xmxxgl.detail.initszdSelect('szdsel', '${jyr.szd.id }', 'showgk', '80%','disable');

+			xmxxgl.detail.initgkSelect('gksel','${record.szgk }','${jyr.szd.id }','showgq','80%','disable');

+			xmxxgl.detail.initgqSelect('gqsel','${record.szgq }','${jyr.szd.id }','${record.szgk }',null,'80%','disable');

+			//初始化实施过程

+			jsjdgl.detail.initssgc('${record.id }');

+			xmxxgl.detail.initBwyt('bwytsel', '${record.bwyt }');

+			xmxxgl.detail.initZyhbwfl('zyhbwflsel', '${record.zyhbwfl }','${record.bwyt }');

+			jsjdgl.detail.opflag="${opflag}";

+			var opflag = "${opflag}";

+			var isjyr ='${isjyr}';

+			if(opflag == 2 || isjyr ==2){

+				$("#xmsphzbali").addClass("active");

+				$("#xmsphzba").addClass("tab-pane fade in active");

+				$("#spyj1").attr("readonly","readonly");

+				//附件

+				jsjdgl.detail.fjid21='${fjList21.fjid }';

+				fjgt(jsjdgl.detail.fjid21,'scbt21','tjbt21');

+			}else if(opflag== 3 || isjyr ==2){

+				$("#cbsjspli").addClass("active");

+				$("#cbsjsp").addClass("tab-pane fade in active");

+				$("#spyj1").attr("readonly","readonly");

+				$("#spyj2").attr("readonly","readonly");

+				//附件

+				jsjdgl.detail.fjid31='${fjList31.fjid }';

+				fjgt(jsjdgl.detail.fjid31,'scbt31','tjbt31');

+				jsjdgl.detail.fjid32='${fjList32.fjid }';

+				fjgt(jsjdgl.detail.fjid32,'scbt32','tjbt32');

+				/* jsjdgl.detail.fjid33='${fjList33.fjid }';

+				fjgt(jsjdgl.detail.fjid33,'scbt33','tjbt33');

+				jsjdgl.detail.fjid34='${fjList34.fjid }';

+				fjgt(jsjdgl.detail.fjid34,'scbt34','tjbt34');

+				jsjdgl.detail.fjid35='${fjList35.fjid }';

+				fjgt(jsjdgl.detail.fjid35,'scbt35','tjbt35');

+				jsjdgl.detail.fjid36='${fjList36.fjid }';

+				fjgt(jsjdgl.detail.fjid36,'scbt36','tjbt34');

+				jsjdgl.detail.fjid37='${fjList37.fjid }';

+				fjgt(jsjdgl.detail.fjid37,'scbt37','tjbt37');

+				jsjdgl.detail.fjid38='${fjList38.fjid }';

+				fjgt(jsjdgl.detail.fjid38,'scbt38','tjbt38'); */

+			}else if(opflag== 4 || isjyr ==2){

+				$("#sgtsjspli").addClass("active");

+				$("#sgtsjsp").addClass("tab-pane fade in active");

+				$("#spyj1").attr("readonly","readonly");

+				$("#spyj2").attr("readonly","readonly");

+				$("#spyj3").attr("readonly","readonly");

+				//附件

+				jsjdgl.detail.fjid41='${fjList41.fjid }';

+				fjgt(jsjdgl.detail.fjid41,'scbt41','tjbt41');

+				jsjdgl.detail.fjid42='${fjList42.fjid }';

+				fjgt(jsjdgl.detail.fjid42,'scbt42','tjbt42');

+			}else if(opflag== 5 || isjyr ==2){

+				$("#kgbali").addClass("active");

+				$("#kgba").addClass("tab-pane fade in active");

+				$("#spyj1").attr("readonly","readonly");

+				$("#spyj2").attr("readonly","readonly");

+				$("#spyj3").attr("readonly","readonly");

+				$("#spyj4").attr("readonly","readonly");

+				//附件

+				jsjdgl.detail.fjid51='${fjList51.fjid }';

+				fjgt(jsjdgl.detail.fjid51,'scbt51','tjbt51');

+				jsjdgl.detail.fjid52='${fjList52.fjid }';

+				fjgt(jsjdgl.detail.fjid52,'scbt52','tjbt52');

+				jsjdgl.detail.fjid53='${fjList53.fjid }';

+				fjgt(jsjdgl.detail.fjid53,'scbt53','tjbt53');

+				jsjdgl.detail.fjid54='${fjList54.fjid }';

+				fjgt(jsjdgl.detail.fjid54,'scbt54','tjbt54');

+				jsjdgl.detail.fjid55='${fjList55.fjid }';

+				fjgt(jsjdgl.detail.fjid55,'scbt55','tjbt55');

+				jsjdgl.detail.fjid56='${fjList56.fjid }';

+				fjgt(jsjdgl.detail.fjid56,'scbt56','tjbt56');

+			}else if(opflag== 6 || isjyr ==2){

+				$("#jgys1li").addClass("active");

+				$("#jgys1").addClass("tab-pane fade in active");

+				$("#spyj1").attr("readonly","readonly");

+				$("#spyj2").attr("readonly","readonly");

+				$("#spyj3").attr("readonly","readonly");

+				$("#spyj4").attr("readonly","readonly");

+				$("#spyj5").attr("readonly","readonly");

+				//附件

+				jsjdgl.detail.fjid61='${fjList61.fjid }';

+				fjgt(jsjdgl.detail.fjid61,'scbt61','tjbt61');

+				jsjdgl.detail.fjid62='${fjList62.fjid }';

+				fjgt(jsjdgl.detail.fjid62,'scbt62','tjbt62');

+			}else if(opflag== 7 || isjyr ==2){

+				$("#syxbali").addClass("active");

+				$("#syxba").addClass("tab-pane fade in active");

+				$("#spyj1").attr("readonly","readonly");

+				$("#spyj2").attr("readonly","readonly");

+				$("#spyj3").attr("readonly","readonly");

+				$("#spyj4").attr("readonly","readonly");

+				$("#spyj5").attr("readonly","readonly");

+				$("#spyj6").attr("readonly","readonly");

+				//附件

+				jsjdgl.detail.fjid71='${fjList71.fjid }';

+				fjgt(jsjdgl.detail.fjid71,'scbt71','tjbt71');

+				jsjdgl.detail.fjid72='${fjList72.fjid }';

+				fjgt(jsjdgl.detail.fjid72,'scbt72','tjbt72');

+			}else if(opflag== 8 || isjyr ==2){

+				$("#jgys2li").addClass("active");

+				$("#jgys2").addClass("tab-pane fade in active");

+				$("#spyj1").attr("readonly","readonly");

+				$("#spyj2").attr("readonly","readonly");

+				$("#spyj3").attr("readonly","readonly");

+				$("#spyj4").attr("readonly","readonly");

+				$("#spyj5").attr("readonly","readonly");

+				$("#spyj6").attr("readonly","readonly");

+				$("#spyj7").attr("readonly","readonly");

+				//附件

+				jsjdgl.detail.fjid81='${fjList81.fjid }';

+				fjgt(jsjdgl.detail.fjid81,'scbt81','tjbt81');

+				jsjdgl.detail.fjid82='${fjList82.fjid }';

+				fjgt(jsjdgl.detail.fjid82,'scbt82','tjbt82');

+				/* jsjdgl.detail.fjid83='${fjList83.fjid }';

+				fjgt(jsjdgl.detail.fjid83,'scbt83','tjbt83');

+				jsjdgl.detail.fjid84='${fjList84.fjid }';

+				fjgt(jsjdgl.detail.fjid84,'scbt84','tjbt84');

+				jsjdgl.detail.fjid85='${fjList85.fjid }';

+				fjgt(jsjdgl.detail.fjid85,'scbt85','tjbt85'); */

+			}else {

+				$("#axlyspli").addClass("active");

+				$("#axlysp").addClass("tab-pane fade in active");

+				//附件

+				jsjdgl.detail.fjid11='${fjList11.fjid }';

+				fjgt(jsjdgl.detail.fjid11,'scbt11','tjbt11');

+			}

+			 //返回判断

+			jsjdgl.detail.fhpd(opflag);

+		});

+		

+		function showgk(){

+			initgkSelect('gksel','${record.szgk }',$('.szdselectpicker').val(),"showgq",'80%');

+			showgq();

+		}

+

+		function showgq(){

+			initgqSelect('gqsel','${record.szgq }',$('.szdselectpicker').val(),$('.gkselectpicker').val(),null,'80%');

+		}

+		

+		function tanchu(){

+			//此处可以先进行ajax请求获取数据，然后再回掉中再显示弹出框

+			$('.theme-popover-mask').fadeIn(100);

+			$('.theme-popover').slideDown(0);

+		}

+		function guanbi(){

+			$('.theme-popover-mask').fadeOut(100);

+			$('.theme-popover').slideUp(0);

+		}

+		function ytsel(){

+			xmxxgl.detail.initZyhbwfl('zyhbwflsel', '',$('.bwytselectpicker').val()+"");

+		}

+		function fjgt(fjid,scbtid,tjbtid){

+			if(fjid!=null&&fjid!=''){

+				   $("#"+scbtid).show();

+				   $("#"+tjbtid).hide();

+				}else{

+				   $("#"+scbtid).hide();

+				   $("#"+tjbtid).show();

+				}

+		}

+		function guanbipop(){

+			$('.theme-popover-mask').fadeOut(100);

+			$('.theme-popover').slideUp(0);

+		}

+	</script>

+

+</head>

+<jsp:include page="../../showbwview.jsp"></jsp:include>

+<body>

+	<div class="box" >

+		<div class="box-content" >

+			<div class="apply_fill">

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

+ <input type="hidden" class="form-control"  name="fjzdids" id="fjzdids">

+ <input type="hidden" class="form-control"  name="accids" id="accids">

+ <input type="hidden" class="form-control" id="xiazaibz" value="${xiazaibz }">

+ <input type="hidden" id="fhbz"  value="${fhbz }">

+ <input type="hidden" id ="id" name="id" value="${record.id }"/>

+ <input type="hidden" id ="opflag" name="opflag" value="${opflag }"/>

+  <input type="hidden" id ="spflag" name="spflag" value="${spflag }"/>

+ <input type="hidden" id ="sfjyr" name="sfjyr" value="${sfjyr }">

+ <input type="hidden" id ="isjyr" name="isjyr" value="${isjyr }">

+ 					<table class="apply3" cellpadding="0" cellspacing="0" style="table-layout: fixed;">

+ 					<tr>

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

+							<td >

+								<input type="text" class="form-control" name="xmbm" readonly value="${record.xmbm }">

+							</td>

+						

+							<th><span class="needwrite">*</span>项目名称：&nbsp;</th>

+							<td  style="position:relative;">

+								<input type="text"  class="form-control" id="xmmc" name="xmmc" readonly value="${record.xmmc }">

+							</td>

+						</tr>

+						<tr>

+						

+							<th>项目概况：&nbsp;</th>

+							<td colspan="3">

+								<input type="text" class="form-control" name="xmgk" value="${record.xmgk }">

+							</td>

+						</tr>

+						<tr>

+						 	<th>建设规模：&nbsp;</th>

+							<td colspan="3">

+								<input type="text" class="form-control" name="jsgm" value="${record.jsgm }">

+							</td>

+						</tr>

+

+						<tr>

+							<th><span class="needwrite">*</span>项目法人：&nbsp;</th>

+							<td>

+								<input type="text" class="form-control" id="xmfr" name="xmfr" value="${record.xmfr }">

+							</td>

+							<th><span class="needwrite">*</span>建设单位：&nbsp;</th>

+							<td >

+								<input type="hidden" class="form-control" id="ssjyrid" name="ssjyrid" value="${jyr.id }">

+								<input type="text"  readonly class="form-control" id="jyrmc" value="${jyr.gkjyr }">

+							</td>

+						</tr>

+						<tr>

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

+							<td>

+								<input type="text"  readonly="readonly" class="form-control" value="${xzqhname}">

+							</td>

+					    	<th><span class="needwrite">*</span>所在地：&nbsp;</th>

+							<td>

+								<div id="szdsel"></div>

+							</td>

+							

+						</tr>

+						<tr>

+							<th><span class="needwrite">*</span>所在港口：&nbsp;</th>

+							<td >

+								<div id="gksel"></div>

+							</td>

+						    <th><span class="needwrite">*</span>所在港区：&nbsp;</th>

+							<td>

+								<div id="gqsel"></div>

+							</td>

+						</tr>

+						<tr>

+						    <th><span class="needwrite">*</span>项目类型：&nbsp;</th>

+						    <td >

+					    	<input type="text" readonly class="form-control" id="xmlx" name="xmlx" value="${record.xmlxzw }">

+					    	<input type="hidden" id="xmlxid" name="xmlxid" value="${record.xmlx }">

+					    	</td>

+							<th><span class="needwrite">*</span>建设地址：&nbsp;</th>

+							<td >

+								<input type="text" class="form-control" id="jsdd" name="jsdd" value="${record.jsdd }">

+							</td>

+						</tr>

+						<tr>

+							

+							<th>总投资 （万元）：&nbsp;</th>

+				 			<td>

+								<input type="text" class="form-control" id="ztz" name="ztz" value="${record.ztz }">

+							</td>

+							<th>投资类型：&nbsp;</th>

+							<td>

+								<div id="tzlxsel"></div>

+							</td>

+						</tr>

+						<tr id="zftzDiv" style="display:none">

+						    <th>政府投资（万元）：&nbsp;</th>

+							<td >

+								<input type="text" class="form-control" name="zftze" value="${record.zftze }" onchange="ratesub()">

+							</td>

+							<th>政府投资占比（%）：&nbsp;</th>

+							<td >

+								<input type="text" class="form-control" readonly="readonly" id="zftzezb">

+							</td>

+						</tr>

+						<tr>

+						 	<th>建成时间：&nbsp;</th>

+							<td>

+							<input type="text" class="Wdate" name="jcsj" value="${fn:substring(record.jcsj,0,10)}" onFocus="WdatePicker({lang:'zh-cn',skin:'default',dateFmt:'yyyy-MM-dd'})">

+							</td>

+							<th>泊位个数：&nbsp;</th>

+								<td>

+								<input type="text" class="form-control" id="bwgs" value="${bwgs }">

+								</td>

+						</tr>

+						<tr>

+					    	

+							<th>项目核准级别：&nbsp;</th>

+							<td>

+								<div id="xmhzjbsel"></div>

+							</td>

+							<th>通过能力（万吨）：&nbsp;</th>

+							<td >

+								<input type="text" class="form-control" id="tgnl" name="tgnl" value="${record.tgnl }">

+							</td>

+						

+						</tr>

+						<tr>

+						    <th>岸线审批级别：&nbsp;</th>

+							<td >

+								<div id="axspjbsel"></div>

+							</td>

+							<th>岸线长度 （米）：&nbsp;</th>

+							<td >

+								<input type="text" class="form-control" id="axcd" name="axcd" value="${record.axcd }">

+							</td>

+						</tr>

+						<tr>

+							<th>水域类型：&nbsp;</th>

+							<td >

+								<div id="sylxsel"></div>

+							</td>

+						   

+						</tr>

+						

+					</table>

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

+				     <thead>

+					    <tr>

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

+			    			<th width="10%">泊位名称</th>

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

+							<th width="10%">码头名称</th>

+							<th width="10%">所在港口</th>

+							<th width="10%">所在港区</th>

+							<th width="15%">泊位用途</th>

+							<th width="5%">是否<br>危险品泊位</th>

+							<th width="5%">是否<br>对外开放泊位</th>

+					    </tr>

+				    </thead>

+				      <c:forEach items="${bwlist}" var="bw" varStatus="status">

+					    <tr >

+					    	<td >${status.count }</td>

+							<td ><a onclick="jsjdgl.detail.viewBw('${bw.id}')">${bw.bwmc }</a></td>

+					        <td >${bw.ssjyrzw }</td>

+							<td >${bw.ssmtzw }</td>

+							<td >${bw.szgkzw }</td>

+							<td >${bw.szgqzw }</td>

+							<td >${bw.bwytzw }</td>

+							<td >${bw.wxpbwzw }</td>

+							<td >${bw.sfdwkfzw }</td>

+					    </tr>

+				    </c:forEach>

+				    </table>	

+<ul id="myTab" class="nav nav-tabs">

+

+   <li  style="width:11%;font-size:14px;text-align:center" id="axlyspli">

+      <a href="#axlysp" data-toggle="tab" onclick ="jsjdgl.detail.show(1)">

+        岸线利<br>用审批

+      </a>

+   </li>

+ 

+ <c:if test="${opflag > 1 }">

+  <li  style="width:11%;font-size:14px;text-align:center" id="xmsphzbali">

+      <a href="#xmsphzba" data-toggle="tab" onclick ="jsjdgl.detail.show(2)">

+        项目审批<br>核准备案

+      </a>

+   </li>

+   </c:if>

+ <c:if test="${opflag > 2}">

+   <li style="width:10%;font-size:14px;text-align:center" id="cbsjspli">

+      <a href="#cbsjsp" data-toggle="tab" onclick ="jsjdgl.detail.show(3)">

+        初步设<br>计审批

+      </a>

+   </li>

+   </c:if>

+   <c:if test="${opflag > 3 }">

+   <li  style="width:12%;font-size:14px;text-align:center" id="sgtsjspli">

+      <a href="#sgtsjsp" data-toggle="tab" onclick ="jsjdgl.detail.show(4)">

+        施工图设<br>计审批

+      </a>

+   </li>

+   </c:if>

+   <c:if test="${opflag > 4 }">

+   <li  style="width:9%;font-size:14px;text-align:center" id="kgbali">

+      <a href="#kgba" data-toggle="tab" onclick ="jsjdgl.detail.show(5)">

+        开工<br>备案

+      </a>

+   </li>

+   </c:if>

+   

+   <c:if test="${opflag > 5 }">

+   <li style="width:9%;font-size:14px;text-align:center" id="jgys1li">

+      <a href="#jgys1" data-toggle="tab" onclick ="jsjdgl.detail.show(6)">

+        交工<br>验收

+      </a>

+   </li>

+   </c:if>

+    <c:if test="${record.xmlx!=2202 }">

+   <c:if test="${opflag > 6 }">

+   <li style="width:10%;font-size:14px;text-align:center" id="syxbali">

+      <a href="#syxba" data-toggle="tab" onclick ="jsjdgl.detail.show(7)">

+       试运行<br>备案

+      </a>

+   </li>

+   </c:if>

+   </c:if>

+   <c:if test="${opflag > 7 }">

+   <li style="width:9%;font-size:14px;text-align:center" id="jgys2li">

+      <a href="#jgys2" data-toggle="tab" onclick ="jsjdgl.detail.show(8)">

+        竣工<br>验收

+      </a>

+   </li>

+   </c:if>

+   <li  style="width:9%;font-size:14px;text-align:center" id="ssgcli">

+      <a href="#ssgc" data-toggle="tab" >

+        实施<br>过程

+      </a>

+   </li>

+   <li style="width:10%;font-size:14px;text-align:center" >

+      <a href="#lcls" data-toggle="tab" onclick ="jsjdgl.detail.lcls('${record.id }')">

+        流程<br>历史

+      </a>

+   </li>

+</ul>

+<div id="myTabContent" class="tab-content">

+   <div class="tab-pane fade" id="axlysp">

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

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

+					<tr>

+						<th width="10%">序号</th>	

+						<th width="10%">材料名称</th>

+						<th width="10%">上传附件名称</th>

+						<th width="10%">批文单位</th>

+						<th width="10%">文号</th>

+						<th width="10%">批文时间</th>

+						<c:if test="${spflag!=1 && opflag == 1 || sfjyr ==2 }">

+						<th width="15%">操作</th>

+						</c:if>

+					</tr>

+				<tr height="40px">

+				    <td>

+								1

+					</td>

+					<td>

+								岸线使用批复文件复印件

+					</td>

+					<td>

+					            <input type="hidden" class="form-control" name="delid11" id="delid11" value="${fjList11.fjid }">

+					            <input type="hidden" class="form-control" id="fjzdid11">

+					            <a class='main_title' href="#" onclick="jsjdgl.detail.download('11')"><span id="fjmc11">${fjList11.fjmc }</span></a>

+					</td>

+					<td>

+								<span id="fbdw11">${recordfj11.fbdw }</span>

+					</td>

+					<td>

+								<span id="wjh11">${recordfj11.wjh }</span>

+					</td>

+					<td>

+								<span id="fbsj11">${recordfj11.fbsj }</span>

+					</td>

+					

+					<c:if test="${spflag!=1 && opflag == 1 || sfjyr ==2 }">

+					<td>

+					<a id="tjbt11" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.tianjiafj('11')">

+							           添加</a>

+					<a id="scbt11" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.delFile('11')">

+							           删除</a>

+					</td>           

+					</c:if>	           

+				</tr>

+				<c:forEach items="${fjvolist}" var="qtfj" varStatus="status">

+						<tr height="40px">

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

+							<td>其他附件</td>

+							<td><a class="main_title" href='/jsjy/accessory/download?id=${qtfj.fjid }'>${qtfj.fjmc }</a></td>

+							<td>${qtfj.fbdw }</td>

+							<td>${qtfj.wjh }</td>

+							<td>${qtfj.fbsj }</td>

+						</tr>

+				</c:forEach>

+				<tbody id="viewqtfj1"></tbody>

+				<c:if test="${sfjyr!=1 }">

+				<c:if test="${spflag==1 || opflag > 1  }">

+				<tr height=100px>

+				<td colspan=1 >

+			                           审批意见

+				</td>

+				<td colspan=5> 

+				     <textarea  class="form-control" name="spyj1" id="spyj1" style="height:100px;" value="${xmxxfb.yj }"></textarea>

+				</td>

+				</tr>

+				</c:if>

+				</c:if>

+				</table>

+				

+</div>

+</div>

+

+   <div class="tab-pane fade " id="xmsphzba">

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

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

+					<tr>

+						<th width="10%">序号</th>	

+						<th width="10%">材料名称</th>

+						<th width="10%">上传附件名称</th>

+						<th width="10%">批文单位</th>

+						<th width="10%">文号</th>

+						<th width="10%">批文时间</th>

+						<c:if test="${spflag!=2 && opflag == 2 || sfjyr ==2 }">

+						<th width="15%">操作</th>

+						</c:if>

+					</tr>

+				<tr height="40px">

+				    <td>

+								1

+					</td>

+					 <td>

+								项目批准或者核准、备案文件的复印件

+					</td>

+					<td>

+					            <input type="hidden" class="form-control" name="delid21" id="delid21" value="${fjList21.fjid }">

+					            <input type="hidden" class="form-control" id="fjzdid21">

+					            <a class='main_title' href="#" onclick="jsjdgl.detail.download('21')"><span id="fjmc21">${fjList21.fjmc}</span></a>

+					</td>

+					<td>

+								<span id="fbdw21">${recordfj21.fbdw }</span>

+					</td>

+					<td>

+								<span id="wjh21">${recordfj21.wjh }</span>

+					</td>

+					<td>

+								<span id="fbsj21">${recordfj21.fbsj }</span>

+					</td>

+					

+					<c:if test="${spflag!=2 && opflag == 2  || sfjyr ==2}">

+					<td>

+					<a id="tjbt21" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.tianjiafj('21')">

+							           添加</a>

+					<a id="scbt21" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.delFile('21')">

+							           删除</a>

+					</td> 

+					</c:if>	           

+					

+				</tr>

+				<c:forEach items="${fjvolist2}" var="qtfj" varStatus="status">

+						<tr height="40px">

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

+							<td>其他附件</td>

+							<td><a class="main_title" href='/jsjy/accessory/download?id=${qtfj.fjid }'>${qtfj.fjmc }</a></td>

+							<td>${qtfj.fbdw }</td>

+							<td>${qtfj.wjh }</td>

+							<td>${qtfj.fbsj }</td>

+						</tr>

+					</c:forEach>

+				<tbody id="viewqtfj2"></tbody>

+				<c:if test="${sfjyr!=1 }">

+				<c:if test="${spflag==2 || opflag > 2  }">

+				<tr height=100px>

+				<td colspan=1 >

+			                           审批意见

+				</td>

+				<td colspan=5> 

+				     <textarea  class="form-control" name="spyj2" id="spyj2" style="height:100px;" value="${xmxxfb.yj }"></textarea>

+				</td>

+				</tr>

+				</c:if>

+				</c:if>

+				<tbody id="qtfjtb2"></tbody>

+				</table>

+</div>

+</div>

+

+   <div class="tab-pane fade" id="cbsjsp">

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

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

+					<tr>

+						<th width="10%">序号</th>	

+						<th width="10%">材料名称</th>

+						<th width="10%">上传附件名称</th>

+						<th width="10%">批文单位</th>

+						<th width="10%">文号</th>

+						<th width="10%">批文时间</th>

+						<c:if test="${spflag!=3 && opflag == 3 || sfjyr ==2 }">

+						<th width="15%">操作</th>

+						</c:if>

+					</tr>

+				<tr height="40px">

+				    <td>

+								1

+					</td>

+					 <td>

+								初步设计文件

+					</td>

+					<td>

+					            <input type="hidden" class="form-control" name="delid31" id="delid31" value="${fjList31.fjid }">

+					            <input type="hidden" class="form-control" id="fjzdid31">

+					            <a class='main_title' href="#" onclick="jsjdgl.detail.download('31')"><span id="fjmc31">${fjList31.fjmc }</span></a>

+					</td>

+					<td>

+								<span id="fbdw31">${recordfj31.fbdw }</span>

+					</td>

+					<td>

+								<span id="wjh31">${recordfj31.wjh }</span>

+					</td>

+					<td>

+								<span id="fbsj31">${recordfj31.fbsj }</span>

+					</td>

+					<c:if test="${spflag!=3 && opflag == 3 || sfjyr ==2 }">

+					<td>

+					<a id="tjbt31" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.tianjiafj('31')">

+							           添加</a>

+					<a id="scbt31" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.delFile('31')">

+							           删除</a>

+					</td> 

+					</c:if>   

+				</tr>

+				

+				<tr height="40px">

+				    <td>

+								2

+					</td>

+					 <td>

+								初步设计批复文件

+					</td>

+					<td>

+					            <input type="hidden" class="form-control" name="delid32" id="delid32" value="${fjList32.fjid }">

+					            <input type="hidden" class="form-control" id="fjzdid32">

+					            <a class='main_title' href="#" onclick="jsjdgl.detail.download('32')"><span id="fjmc32">${fjList32.fjmc }</span></a>

+					</td>

+					<td>

+								<span id="fbdw32">${recordfj32.fbdw }</span>

+					</td>

+					<td>

+								<span id="wjh32">${recordfj32.wjh }</span>

+					</td>

+					<td>

+								<span id="fbsj32">${recordfj32.fbsj }</span>

+					</td>

+					<c:if test="${spflag!=3  && opflag == 3  || sfjyr ==2}">

+					<td>

+					<a id="tjbt32" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.tianjiafj('32')">

+							           添加</a>

+					<a id="scbt32" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.delFile('32')">

+							           删除</a>

+					</td> 

+					</c:if>	           

+					

+				</tr>

+			<%-- 	<tr height="40px">

+				    <td>

+								3

+					</td>

+					 <td>

+								港口建设项目批准或者核准、备案文件

+					</td>

+					<td>

+					            <input type="hidden" class="form-control" name="delid33" id="delid33" value="${fjList33.fjid }">

+					            <input type="hidden" class="form-control" id="fjzdid33">

+					            <a class='main_title' href="#" onclick="jsjdgl.detail.download('33')"><span id="fjmc33">${fjList33.fjmc }</span></a>

+					</td>

+					<td>

+								<span id="fbdw33">${recordfj33.fbdw }</span>

+					</td>

+					<td>

+								<span id="wjh33">${recordfj33.wjh }</span>

+					</td>

+					<td>

+								<span id="fbsj33">${recordfj33.fbsj }</span>

+					</td>

+					<c:if test="${record.flowstatus == '' || record.flowstatus == null }">

+					<c:if test="${spflag!=3  && opflag == 3 }">

+					<td>

+					<a id="tjbt33" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.tianjiafj('33')">

+							           添加</a>

+					<a id="scbt33" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.delFile('33')">

+							           删除</a>

+					</td> 

+					</c:if>	  

+					<c:if test="${spflag==3  && opflag == 3 }">

+					<td></td>

+					</c:if> 

+					</c:if>           

+					<tr>

+					<td>4</td>

+					<td>审查会议纪要</td>

+					<td><input type="hidden" class="form-control"

+						name="delid34" id="delid34" value="${fjList34.fjid }">

+						<input type="hidden" class="form-control" id="fjzdid34">

+						<a class='main_title' href="#"

+						onclick="jsjdgl.detail.download('34')"><span id="fjmc34">${fjList34.fjmc }</span></a>

+					</td>

+					<td><span id="fbdw34">${recordfj34.fbdw }</span></td>

+					<td><span id="wjh34">${recordfj34.wjh }</span></td>

+					<td><span id="fbsj34">${recordfj34.fbsj }</span></td>

+					<c:if test="${record.flowstatus == '' || record.flowstatus == null }">

+					<c:if test="${spflag ==3  && opflag == 3 }">

+					<td>

+					<a id="tjbt34" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.tianjiafj('34')">

+							           添加</a>

+					<a id="scbt34" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.delFile('34')">

+							           删除</a>

+					</td> 

+					</c:if>	 

+					<c:if test="${spflag!=3  && opflag == 3 }">

+					<td></td>

+					</c:if>  

+					</c:if>      

+				</tr>

+				<tr>

+					<td>5</td>

+					<td>专家审查意见</td>

+					<td><input type="hidden" class="form-control"

+						name="delid35" id="delid35" value="${fjList35.fjid }">

+						<input type="hidden" class="form-control" id="fjzdid35">

+						<a class='main_title' href="#"

+						onclick="jsjdgl.detail.download('35')"><span id="fjmc35">${fjList35.fjmc }</span></a>

+					</td>

+					<td><span id="fbdw35">${recordfj35.fbdw }</span></td>

+					<td><span id="wjh35">${recordfj35.wjh }</span></td>

+					<td><span id="fbsj35">${recordfj35.fbsj }</span></td>

+					<c:if test="${record.flowstatus == '' || record.flowstatus == null }">

+					<c:if test="${spflag==3  && opflag == 3 }">

+					<td>

+					<a id="tjbt35" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.tianjiafj('35')">

+							           添加</a>

+					<a id="scbt35" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.delFile('35')">

+							           删除</a>

+					</td> 

+					</c:if>	

+					<c:if test="${spflag!=3  && opflag == 3 }">

+					<td></td>

+					</c:if> 

+					</c:if>           

+				</tr>

+				<tr>

+					<td>6</td>

+					<td>对审查意见的答复</td>

+					<td><input type="hidden" class="form-control"

+						name="delid36" id="delid36" value="${fjList36.fjid }">

+						<input type="hidden" class="form-control" id="fjzdid36">

+						<a class='main_title' href="#"

+						onclick="jsjdgl.detail.download('36')"><span id="fjmc36">${fjList36.fjmc }</span></a>

+					</td>

+					<td><span id="fbdw36">${recordfj36.fbdw }</span></td>

+					<td><span id="wjh36">${recordfj36.wjh }</span></td>

+					<td><span id="fbsj36">${recordfj36.fbsj }</span></td>

+					<c:if test="${record.flowstatus == '' || record.flowstatus == null }">

+					<c:if test="${spflag==3  && opflag == 3 }">

+					<td>

+					<a id="tjbt36" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.tianjiafj('36')">

+							           添加</a>

+					<a id="scbt36" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.delFile('36')">

+							           删除</a>

+					</td> 

+					</c:if>	 

+					<c:if test="${spflag!=3  && opflag == 3 }">

+					<td></td>

+					</c:if>    

+					 </c:if>   

+				</tr>

+				<tr>

+					<td>7</td>

+					<td>第三方审查咨询报告 （ 可选 ）</td>

+					<td><input type="hidden" class="form-control"

+						name="delid37" id="delid37" value="${fjList37.fjid }">

+						<input type="hidden" class="form-control" id="fjzdid37">

+						<a class='main_title' href="#"

+						onclick="jsjdgl.detail.download('37')"><span id="fjmc37">${fjList37.fjmc }</span></a>

+					</td>

+					<td><span id="fbdw37">${recordfj37.fbdw }</span></td>

+					<td><span id="wjh37">${recordfj37.wjh }</span></td>

+					<td><span id="fbsj37">${recordfj37.fbsj }</span></td>

+					<c:if test="${record.flowstatus == '' || record.flowstatus == null }">

+					<c:if test="${spflag==3  && opflag == 3 }">

+					<td>

+					<a id="tjbt37" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.tianjiafj('37')">

+							           添加</a>

+					<a id="scbt37" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.delFile('37')">

+							           删除</a>

+					</td> 

+					</c:if>	 

+					<c:if test="${spflag!=3  && opflag == 3 }">

+					<td></td>

+					</c:if>    

+					</c:if>        

+				</tr>

+				<tr>

+					<td>8</td>

+					<td>初步设计文件报批稿</td>

+					<td><input type="hidden" class="form-control"

+						name="delid38" id="delid38" value="${fjList38.fjid }">

+						<input type="hidden" class="form-control" id="fjzdid38">

+						<a class='main_title' href="#"

+						onclick="jsjdgl.detail.download('38')"><span id="fjmc38">${fjList38.fjmc }</span></a>

+					</td>

+					<td><span id="fbdw38">${recordfj38.fbdw }</span></td>

+					<td><span id="wjh38">${recordfj38.wjh }</span></td>

+					<td><span id="fbsj38">${recordfj38.fbsj }</span></td>

+					<c:if test="${record.flowstatus == '' || record.flowstatus == null }">

+					<c:if test="${spflag==3  && opflag == 3 }">

+					<td>

+					<a id="tjbt38" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.tianjiafj('38')">

+							           添加</a>

+					<a id="scbt38" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.delFile('38')">

+							           删除</a>

+					</td> 

+					</c:if>	 

+					<c:if test="${spflag!=3  && opflag == 3 }">

+					<td></td>

+					</c:if> 

+					</c:if>           

+				</tr> --%>

+				<c:forEach items="${fjvolist3}" var="qtfj" varStatus="status">

+						<tr height="40px">

+						<c:if test="${ record.flowstatus > 0  }">

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

+						</c:if>

+						<c:if test="${ record.flowstatus == null ||  record.flowstatus == ''}">

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

+						</c:if>

+							<td>其他附件</td>

+							<td><a class="main_title" href='/jsjy/accessory/download?id=${qtfj.fjid }'>${qtfj.fjmc }</a></td>

+							<td>${qtfj.fbdw }</td>

+							<td>${qtfj.wjh }</td>

+							<td>${qtfj.fbsj }</td>

+						</tr>

+					</c:forEach>

+				<tbody id="viewqtfj3"></tbody>

+				<c:if test="${sfjyr!=1 }">

+				<c:if test="${spflag==3  || opflag > 3 }">

+				<tr height=100px>

+				<td colspan=1 >

+			                           审批意见

+				</td>

+				<td colspan=6> 

+				     <textarea  class="form-control" name="spyj3" id="spyj3" style="height:100px;" value="${xmxxfb.yj }"></textarea>

+				</td>

+				</tr>

+				</c:if>

+				</c:if>

+				<tbody id="qtfjtb3"></tbody>

+				</table>

+</div>

+</div>

+

+<div class="tab-pane fade" id="sgtsjsp">

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

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

+					<tr>

+						<th width="10%">序号</th>	

+						<th width="10%">材料名称</th>

+						<th width="10%">上传附件名称</th>

+						<th width="10%">批文单位</th>

+						<th width="10%">文号</th>

+						<th width="10%">批文时间</th>

+						<c:if test="${spflag!=4 && opflag == 4 || sfjyr ==2}">

+						<th width="15%">操作</th>

+						</c:if>

+					</tr>

+				<tr height="40px">

+				    <td>

+								1

+					</td>

+					 <td>

+								施工图设计文件

+					</td>

+					<td>

+					            <input type="hidden" class="form-control" name="delid41" id="delid41" value="${fjList41.fjid }">

+					            <input type="hidden" class="form-control" id="fjzdid41">

+					            <a class='main_title' href="#" onclick="jsjdgl.detail.download('41')"><span id="fjmc41">${fjList41.fjmc }</span></a>

+					</td>

+					<td>

+								<span id="fbdw41">${recordfj41.fbdw }</span>

+					</td>

+					<td>

+								<span id="wjh41">${recordfj41.wjh }</span>

+					</td>

+					<td>

+								<span id="fbsj41">${recordfj41.fbsj }</span>

+					</td>

+					

+					<c:if test="${spflag!=4  && opflag == 4 || sfjyr ==2}">

+					<td>

+					<a id="tjbt41" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.tianjiafj('41')">

+							           添加</a>

+					<a id="scbt41" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.delFile('41')">

+							           删除</a>

+					</td> 

+					</c:if>	           

+				</tr>

+				

+				<tr height="40px">

+				    <td>

+								2

+					</td>

+					 <td>

+								施工图设计批复文件

+					</td>

+					<td>

+					            <input type="hidden" class="form-control" name="delid42" id="delid42" value="${fjList42.fjid }">

+					            <input type="hidden" class="form-control" id="fjzdid42">

+					            <a class='main_title' href="#" onclick="jsjdgl.detail.download(42')"><span id="fjmc42">${fjList42.fjmc }</span></a>

+					</td>

+					<td>

+								<span id="fbdw42">${recordfj42.fbdw }</span>

+					</td>

+					<td>

+								<span id="wjh42">${recordfj42.wjh }</span>

+					</td>

+					<td>

+								<span id="fbsj42">${recordfj42.fbsj }</span>

+					</td>

+					

+					<c:if test="${spflag!=4   && opflag == 4 || sfjyr ==2 }">

+					<td>

+					<a id="tjbt42" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.tianjiafj('42')">

+							           添加</a>

+					<a id="scbt42" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.delFile('42')">

+							           删除</a>

+					</td> 

+					</c:if>	           

+					

+				</tr>

+				<c:forEach items="${fjvolist4}" var="qtfj" varStatus="status">

+						<tr height="40px">

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

+							<td>其他附件</td>

+							<td><a class="main_title" href='/jsjy/accessory/download?id=${qtfj.fjid }'>${qtfj.fjmc }</a></td>

+							<td>${qtfj.fbdw }</td>

+							<td>${qtfj.wjh }</td>

+							<td>${qtfj.fbsj }</td>

+						</tr>

+					</c:forEach>

+					<tbody id="viewqtfj4"></tbody>

+				<c:if test="${sfjyr!=1 }">

+				<c:if test="${spflag==4 || opflag > 4 }">

+				<tr height=100px>

+				<td colspan=1 >

+			                           审批意见

+				</td>

+				<td colspan=5> 

+				     <textarea  class="form-control" name="spyj4" id="spyj4" style="height:100px;" value="${xmxxfb.yj }"></textarea>

+				</td>

+				</tr>

+				</c:if>

+				</c:if>

+				<tbody id="qtfjtb4"></tbody>

+				</table>

+</div>

+</div>

+

+<div class="tab-pane fade" id="kgba">

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

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

+					<tr>

+						<th width="10%">序号</th>	

+						<th width="10%">材料名称</th>

+						<th width="10%">上传附件名称</th>

+						<th width="10%">批文单位</th>

+						<th width="10%">文号</th>

+						<th width="10%">批文时间</th>

+						<c:if test="${spflag!=5  && opflag == 5 || sfjyr ==2 }">

+						<th width="15%">操作</th>

+						</c:if>

+					</tr>

+				<tr height="40px">

+				    <td>

+								1

+					</td>

+					 <td>

+								控制性用地的批复(可选)

+					</td>

+					<td>

+					            <input type="hidden" class="form-control" name="delid51" id="delid51" value="${fjList51.fjid }">

+					            <input type="hidden" class="form-control" id="fjzdid51">

+					            <a class='main_title' href="#" onclick="jsjdgl.detail.download('51')"><span id="fjmc51">${fjList51.fjmc }</span></a>

+					</td>

+					<td>

+								<span id="fbdw51">${recordfj51.fbdw }</span>

+					</td>

+					<td>

+								<span id="wjh51">${recordfj51.wjh }</span>

+					</td>

+					<td>

+								<span id="fbsj51">${recordfj51.fbsj }</span>

+					</td>

+					

+					<c:if test="${spflag!=5 && opflag == 5 || sfjyr ==2 }">

+					<td>

+					<a id="tjbt51" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.tianjiafj('51')">

+							           添加</a>

+					<a id="scbt51" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.delFile('51')">

+							           删除</a>

+					</td> 

+					 </c:if>	           

+					

+				</tr>

+				

+				<tr height="40px">

+				    <td>

+								2

+					</td>

+					 <td>

+								与施工单位和监理单位签订的合同复印件

+					</td>

+					<td>

+					            <input type="hidden" class="form-control" name="delid52" id="delid52" value="${fjList52.fjid }">

+					            <input type="hidden" class="form-control" id="fjzdid52">

+					            <a class='main_title' href="#" onclick="jsjdgl.detail.download('52')"><span id="fjmc52">${fjList52.fjmc }</span></a>

+					</td>

+					<td>

+								<span id="fbdw52">${recordfj52.fbdw }</span>

+					</td>

+					<td>

+								<span id="wjh52">${recordfj52.wjh }</span>

+					</td>

+					<td>

+								<span id="fbsj52">${recordfj52.fbsj }</span>

+					</td>

+					

+					<c:if test="${spflag!=5  && opflag == 5 || sfjyr ==2}">

+					<td>

+					<a id="tjbt52" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.tianjiafj('52')">

+							           添加</a>

+					<a id="scbt52" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.delFile('52')">

+							           删除</a>

+					</td> 

+					 </c:if>	           

+					

+				</tr>

+				

+				<tr height="40px">

+				    <td>

+								3

+					</td>

+					 <td>

+								质量监督手续材料复印件

+					</td>

+					<td>

+					            <input type="hidden" class="form-control" name="delid53" id="delid53" value="${fjList53.fjid }">  

+					            <input type="hidden" class="form-control" id="fjzdid53">

+					            <a class='main_title' href="#" onclick="jsjdgl.detail.download('53')"><span id="fjmc53">${fjList53.fjmc }</span></a>

+					</td>

+					<td>

+								<span id="fbdw53">${recordfj53.fbdw }</span>

+					</td>

+					<td>

+								<span id="wjh53">${recordfj53.wjh }</span>

+					</td>

+					<td>

+								<span id="fbsj53">${recordfj53.fbsj }</span>

+					</td>

+					

+					<c:if test="${spflag!=5 && opflag == 5 || sfjyr ==2}">

+					<td>

+					<a id="tjbt53" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.tianjiafj('53')">

+							           添加</a>

+					<a id="scbt53" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.delFile('53')">

+							           删除</a>

+					</td> 

+					 </c:if>	           

+					

+				</tr>

+				

+				<tr height="40px">

+				    <td>

+								4

+					</td>

+					 <td>

+								建设资金落实证明复印件

+					</td>

+					<td>

+					            <input type="hidden" class="form-control" name="delid54" id="delid54" value="${fjList54.fjid }">

+					            <input type="hidden" class="form-control" id="fjzdid54">

+					            <a class='main_title' href="#" onclick="jsjdgl.detail.download('54')"><span id="fjmc54">${fjList54.fjmc }</span></a>

+					</td>

+					<td>

+								<span id="fbdw54">${recordfj54.fbdw }</span>

+					</td>

+					<td>

+								<span id="wjh54">${recordfj54.wjh }</span>

+					</td>

+					<td>

+								<span id="fbsj54">${recordfj54.fbsj }</span>

+					</td>

+					

+					<c:if test="${spflag!=5 && opflag == 5 || sfjyr ==2}">

+					<td>

+					<a id="tjbt54" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.tianjiafj('54')">

+							           添加</a>

+					<a id="scbt54" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.delFile('54')">

+							           删除</a>

+					</td> 

+					 </c:if>	           

+					

+				</tr>

+				

+				<tr height="40px">

+				    <td>

+								5

+					</td>

+					 <td>

+								评标结果备案文件复印件(可选)

+					</td>

+					<td>

+					            <input type="hidden" class="form-control" name="delid55" id="delid55" value="${fjList55.fjid }">

+					            <input type="hidden" class="form-control" id="fjzdid55">

+					            <a class='main_title' href="#" onclick="jsjdgl.detail.download('55')"><span id="fjmc55">${fjList55.fjmc }</span></a>

+					</td>

+					<td>

+								<span id="fbdw55">${recordfj55.fbdw }</span>

+					</td>

+					<td>

+								<span id="wjh55">${recordfj55.wjh }</span>

+					</td>

+					<td>

+								<span id="fbsj55">${recordfj55.fbsj }</span>

+					</td>

+					

+					<c:if test="${spflag!=5  && opflag == 5 || sfjyr ==2}">

+					<td>

+					<a id="tjbt55" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.tianjiafj('55')">

+							           添加</a>

+					<a id="scbt55" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.delFile('55')">

+							           删除</a>

+					</td> 

+					 </c:if>	           

+					

+				</tr>

+				

+				<tr height="40px">

+				    <td>

+								6

+					</td>

+					 <td>

+								《开工备案表》

+					</td>

+					<td>

+					            <input type="hidden" class="form-control" name="delid56" id="delid56" value="${fjList56.fjid }">

+					            <input type="hidden" class="form-control" id="fjzdid56">

+					            <a class='main_title' href="#" onclick="jsjdgl.detail.download('56')"><span id="fjmc56">${fjList56.fjmc }</span></a>

+					</td>

+					<td>

+								<span id="fbdw56">${recordfj56.fbdw }</span>

+					</td>

+					<td>

+								<span id="wjh56">${recordfj56.wjh }</span>

+					</td>

+					<td>

+								<span id="fbsj56">${recordfj56.fbsj }</span>

+					</td>

+					

+					<c:if test="${spflag!=5  && opflag == 5 || sfjyr ==2}">

+					<td>

+					<a id="tjbt56" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.tianjiafj('56')">

+							           添加</a>

+					<a id="scbt56" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.delFile('56')">

+							           删除</a>

+					</td> 

+					 </c:if>	           

+					

+				</tr>

+				<c:forEach items="${fjvolist5}" var="qtfj" varStatus="status">

+						<tr height="40px">

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

+							<td>其他附件</td>

+							<td><a class="main_title" href='/jsjy/accessory/download?id=${qtfj.fjid }'>${qtfj.fjmc }</a></td>

+							<td>${qtfj.fbdw }</td>

+							<td>${qtfj.wjh }</td>

+							<td>${qtfj.fbsj }</td>

+						</tr>

+					</c:forEach>

+					<tbody id="viewqtfj5"></tbody>

+				<c:if test="${sfjyr!=1 }">

+				<c:if test="${spflag==5 || opflag > 5 }">

+				<tr height=100px>

+				<td colspan=1 >

+			                           审批意见

+				</td>

+				<td colspan=5> 

+				     <textarea  class="form-control" name="spyj5" id="spyj5" style="height:100px;" value="${xmxxfb.yj }"></textarea>

+				</td>

+				</tr>

+				</c:if>

+				</c:if>

+				<tbody id="qtfjtb5"></tbody>

+				</table>

+</div>

+</div>

+

+<div class="tab-pane fade" id="ssgc">

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

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

+					<tr>

+						<th>年度</th>	

+						<th>年度计划投资额</th>

+						<th>当月实际完成投资额（万元）</th>

+						<th>当前形象进度</th>

+						<th>形象进度完成情况分析</th>

+						<th>操作</th>

+					</tr>

+					<tbody id="ssgctb"></tbody>

+				</table>

+</div>

+</div>

+

+<div class="tab-pane fade" id="jgys1">

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

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

+					<tr>

+						<th width="10%">序号</th>	

+						<th width="10%">材料名称</th>

+						<th width="10%">上传附件名称</th>

+						<th width="10%">批文单位</th>

+						<th width="10%">文号</th>

+						<th width="10%">批文时间</th>

+						<c:if test="${spflag!=6  && opflag == 6 || sfjyr ==2}">

+						<th width="15%">操作</th>

+						</c:if>

+					</tr>

+				<tr height="40px">

+				    <td>

+								1

+					</td>

+					 <td>

+								质监机构关于工程质量鉴定意见书

+					</td>

+					<td>

+					            <input type="hidden" class="form-control" name="delid61" id="delid61" value="${fjList61.fjid }">

+					            <input type="hidden" class="form-control" id="fjzdid61">

+					            <a class='main_title' href="#" onclick="jsjdgl.detail.download('61')"><span id="fjmc61">${fjList61.fjmc }</span></a>

+					</td>

+					<td>

+								<span id="fbdw61">${recordfj61.fbdw }</span>

+					</td>

+					<td>

+								<span id="wjh61">${recordfj61.wjh }</span>

+					</td>

+					<td>

+								<span id="fbsj61">${recordfj61.fbsj }</span>

+					</td>

+					

+					<c:if test="${spflag!=6  && opflag == 6 || sfjyr ==2 }">

+					<td>

+					<a id="tjbt61" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.tianjiafj('61')">

+							           添加</a>

+					<a id="scbt61" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.delFile('61')">

+							           删除</a>

+					</td> 

+					 </c:if>	           

+					

+				</tr>

+				

+				<tr height="40px">

+				    <td>

+								2

+					</td>

+					 <td>

+								交工验收证书

+					</td>

+					<td>

+					            <input type="hidden" class="form-control" name="delid62" id="delid62" value="${fjList62.fjid }">

+					            <input type="hidden" class="form-control" id="fjzdid62">

+					            <a class='main_title' href="#" onclick="jsjdgl.detail.download('62')"><span id="fjmc62">${fjList62.fjmc }</span></a>

+					</td>

+					<td>

+								<span id="fbdw62">${recordfj62.fbdw }</span>

+					</td>

+					<td>

+								<span id="wjh62">${recordfj62.wjh }</span>

+					</td>

+					<td>

+								<span id="fbsj62">${recordfj62.fbsj }</span>

+					</td>

+					

+					<c:if test="${spflag!=6  && opflag == 6 || sfjyr ==2 }">

+					<td>

+					<a id="tjbt62" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.tianjiafj('62')">

+							           添加</a>

+					<a id="scbt62" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.delFile('62')">

+							           删除</a>

+					</td> 

+					 </c:if>	           

+					

+				</tr>

+				<c:forEach items="${fjvolist6}" var="qtfj" varStatus="status">

+						<tr height="40px">

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

+							<td>其他附件</td>

+							<td><a class="main_title" href='/jsjy/accessory/download?id=${qtfj.fjid }'>${qtfj.fjmc }</a></td>

+							<td>${qtfj.fbdw }</td>

+							<td>${qtfj.wjh }</td>

+							<td>${qtfj.fbsj }</td>

+						</tr>

+					</c:forEach>

+					<tbody id="viewqtfj6"></tbody>

+				<c:if test="${sfjyr!=1 }">

+				<c:if test="${spflag==6 || opflag > 6 }">

+				<tr height=100px>

+				<td colspan=1 >

+			                           审批意见

+				</td>

+				<td colspan=5> 

+				     <textarea  class="form-control" name="spyj6" id="spyj6" style="height:100px;" value="${xmxxfb.yj }"></textarea>

+				</td>

+				</tr>

+				</c:if>

+				</c:if>

+				<tbody id="qtfjtb6"></tbody>

+				</table>

+</div>

+</div>

+

+<div class="tab-pane fade" id="syxba">

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

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

+					<tr>

+						<th width="10%">序号</th>	

+						<th width="10%">材料名称</th>

+						<th width="10%">上传附件名称</th>

+						<th width="10%">批文单位</th>

+						<th width="10%">文号</th>

+						<th width="10%">批文时间</th>

+						<c:if test="${spflag!=7  && opflag == 7 || sfjyr ==2 }">

+						<th width="15%">操作</th>

+						</c:if>

+					</tr>

+				<tr height="40px">

+				    <td>

+								1

+					</td>

+					 <td>

+								环境保护、劳动安全卫生、消防主管部门关于试运行的准许意见

+					</td>

+					<td>

+					            <input type="hidden" class="form-control" name="delid71" id="delid71" value="${fjList71.fjid }">

+					            <input type="hidden" class="form-control" id="fjzdid71">

+					            <a class='main_title' href="#" onclick="jsjdgl.detail.download('71')"><span id="fjmc71">${fjList71.fjmc }</span></a>

+					</td>

+					<td>

+								<span id="fbdw71">${recordfj71.fbdw }</span>

+					</td>

+					<td>

+								<span id="wjh71">${recordfj71.wjh }</span>

+					</td>

+					<td>

+								<span id="fbsj71">${recordfj71.fbsj }</span>

+					</td>

+					

+					<c:if test="${spflag!=7  && opflag == 7 || sfjyr ==2 }">

+					<td>

+					<a id="tjbt71" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.tianjiafj('71')">

+							           添加</a>

+					<a id="scbt71" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.delFile('71')">

+							           删除</a>

+					</td> 

+					 </c:if>	           

+					

+				</tr>

+				

+				<tr height="40px">

+				    <td>

+								2

+					</td>

+					 <td>

+								试运行备案表

+					</td>

+					<td>

+					            <input type="hidden" class="form-control" name="delid72" id="delid72" value="${fjList72.fjid }">

+					            <input type="hidden" class="form-control" id="fjzdid72">

+					            <a class='main_title' href="#" onclick="jsjdgl.detail.download('72')"><span id="fjmc72">${fjList72.fjmc }</span></a>

+					</td>

+					<td>

+								<span id="fbdw72">${recordfj72.fbdw }</span>

+					</td>

+					<td>

+								<span id="wjh72">${recordfj72.wjh }</span>

+					</td>

+					<td>

+								<span id="fbsj72">${recordfj72.fbsj }</span>

+					</td>

+					

+					<c:if test="${spflag!=7  && opflag == 7 || sfjyr ==2 }">

+					<td>

+					<a id="tjbt72" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.tianjiafj('72')">

+							           添加</a>

+					<a id="scbt72" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.delFile('72')">

+							           删除</a>

+					</td> 

+					 </c:if>	           

+					

+				</tr>

+				<c:forEach items="${fjvolist7}" var="qtfj" varStatus="status">

+						<tr height="40px">

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

+							<td>其他附件</td>

+							<td><a class="main_title" href='/jsjy/accessory/download?id=${qtfj.fjid }'>${qtfj.fjmc }</a></td>

+							<td>${qtfj.fbdw }</td>

+							<td>${qtfj.wjh }</td>

+							<td>${qtfj.fbsj }</td>

+						</tr>

+					</c:forEach>

+					<tbody id="viewqtfj7"></tbody>

+				<c:if test="${sfjyr!=1 }">

+				<c:if test="${spflag==7 || opflag > 7  }">

+				<tr height=100px>

+				<td colspan=1 >

+			                           审批意见

+				</td>

+				<td colspan=5> 

+				     <textarea  class="form-control" name="spyj7" id="spyj7" style="height:100px;" value="${xmxxfb.yj }"></textarea>

+				</td>

+				</tr>

+				</c:if>

+				</c:if>

+				<tbody id="qtfjtb7"></tbody>

+				</table>

+</div>

+</div>

+

+<div class="tab-pane fade" id="jgys2">

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

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

+					<tr>

+						<th width="10%">序号</th>	

+						<th width="10%">材料名称</th>

+						<th width="10%">上传附件名称</th>

+						<th width="10%">批文单位</th>

+						<th width="10%">文号</th>

+						<th width="10%">批文时间</th>

+						<c:if test="${spflag!=8 && opflag == 8 || sfjyr ==2 }">

+						<th width="15%">操作</th>

+						</c:if>

+					</tr>

+				<tr height="40px">

+				    <td>

+								1

+					</td>

+					 <td>

+								竣工资料汇编

+					</td>

+					<td>

+					            <input type="hidden" class="form-control" name="delid81" id="delid81" value="${fjList81.fjid }">

+					            <input type="hidden" class="form-control" id="fjzdid81">

+					            <a class='main_title' href="#" onclick="jsjdgl.detail.download('81')"><span id="fjmc81">${fjList81.fjmc }</span></a>

+					</td>

+					<td>

+								<span id="fbdw81">${recordfj81.fbdw }</span>

+					</td>

+					<td>

+								<span id=wjh81>${recordfj81.wjh }</span>

+					</td>

+					<td>

+								<span id="fbsj81">${recordfj81.fbsj }</span>

+					</td>

+					<c:if test="${spflag!=8 && opflag == 8  || sfjyr ==2}">

+					<td>

+					<a id="tjbt81" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.tianjiafj('81')">

+							           添加</a>

+					<a id="scbt81" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.delFile('81')">

+							           删除</a>

+					</td> 

+					 </c:if>	           

+				</tr>

+				

+				<tr height="40px">

+				    <td>

+								2

+					</td>

+					 <td>

+								竣工验收证书(多个，新码头，老码头改造)

+					</td>

+					<td>

+					            <input type="hidden" class="form-control" name="delid82" id="delid82" value="${fjList82.fjid }">

+					            <input type="hidden" class="form-control" id="fjzdid82">

+					            <a class='main_title' href="#" onclick="jsjdgl.detail.download('82')"><span id="fjmc82">${fjList82.fjmc }</span></a>

+					</td>

+					<td>

+								<span id="fbdw82">${recordfj82.fbdw }</span>

+					</td>

+					<td>

+								<span id="wjh82">${recordfj82.wjh }</span>

+					</td>

+					<td>

+								<span id="fbsj82">${recordfj82.fbsj }</span>

+					</td>

+						<c:if test="${spflag!=8 && opflag == 8 || sfjyr ==2}">

+					<td>

+					<a id="tjbt82" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.tianjiafj('82')">

+							           添加</a>

+					<a id="scbt82" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.delFile('82')">

+							           删除</a>

+					</td> 

+					 </c:if>	           

+					

+				</tr>

+				

+				<%-- <tr>

+					<td>3</td>

+					<td>竣工验收鉴定书</td>

+					<td><input type="hidden" class="form-control"

+						name="delid83" id="delid83" value="${fjList83.fjid }">

+						<input type="hidden" class="form-control" id="fjzdid83">

+						<a class='main_title' href="#"

+						onclick="jsjdgl.detail.download('83')"><span id="fjmc83">${fjList83.fjmc }</span></a>

+					</td>

+					<td><span id="fbdw83">${recordfj83.fbdw }</span></td>

+					<td><span id="wjh83">${recordfj83.wjh }</span></td>

+					<td><span id="fbsj83">${recordfj83.fbsj }</span></td>

+					<c:if test="${record.flowstatus == 2 || record.flowstatus == null }">

+					<c:if test="${spflag==8 && opflag == 8 }">

+					<td>

+					<a id="tjbt83" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.tianjiafj('83')">

+							           添加</a>

+					<a id="scbt83" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.delFile('83')">

+							           删除</a>

+					</td> 

+					 </c:if>

+					  <c:if test="${spflag!=8 && opflag == 8 }">

+					 <Td></Td>

+					 </c:if>

+					 </c:if>		    

+				</tr>

+				<Tr>

+					<td>4</td>

+					<td>专家审查意见</td>

+					<td><input type="hidden" class="form-control"

+						name="delid84" id="delid84" value="${fjList84.fjid }">

+						<input type="hidden" class="form-control" id="fjzdid84">

+						<a class='main_title' href="#"

+						onclick="jsjdgl.detail.download('84')"><span id="fjmc84">${fjList84.fjmc }</span></a>

+					</td>

+					<td><span id="fbdw84">${recordfj84.fbdw }</span></td>

+					<td><span id="wjh84">${recordfj84.wjh }</span></td>

+					<td><span id="fbsj84">${recordfj84.fbsj }</span></td>

+					<c:if test="${record.flowstatus == 2 || record.flowstatus == null }">

+					<c:if test="${spflag==8 && opflag == 8 }">

+					<td>

+					<a id="tjbt84" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.tianjiafj('84')">

+							           添加</a>

+					<a id="scbt84" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.delFile('84')">

+							           删除</a>

+					</td> 

+					 </c:if>	

+					  <c:if test="${spflag!=8 && opflag == 8 }">

+					 <Td></Td>

+					 </c:if>	    

+					 </c:if>

+				</tr>

+				<tr>

+					<td>5</td>

+					<td>对验收意见的答复</td>

+					<td><input type="hidden" class="form-control"

+						name="delid85" id="delid85" value="${fjList85.fjid }">

+						<input type="hidden" class="form-control" id="fjzdid85">

+						<a class='main_title' href="#"

+						onclick="jsjdgl.detail.download('85')"><span id="fjmc85">${fjList85.fjmc }</span></a>

+					</td>

+					<td><span id="fbdw85">${recordfj85.fbdw }</span></td>

+					<td><span id="wjh85">${recordfj85.wjh }</span></td>

+					<td><span id="fbsj85">${recordfj85.fbsj }</span></td>

+					<c:if test="${record.flowstatus == 2 || record.flowstatus == null }">

+					<c:if test="${spflag==8 && opflag == 8 }">

+					<td>

+					<a id="tjbt85" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.tianjiafj('85')">

+							           添加</a>

+					<a id="scbt85" class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.delFile('85')">

+							           删除</a>

+					</td> 

+					 </c:if>

+					 <c:if test="${spflag!=8 && opflag == 8 }">

+					 <Td></Td>

+					 </c:if>	    

+					 </c:if>

+				</tr> --%>

+				

+				<c:forEach items="${fjvolist8}" var="qtfj" varStatus="status">

+						<tr height="40px">

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

+							<td>其他附件</td>

+							<td><a class="main_title" href='/jsjy/accessory/download?id=${qtfj.fjid }'>${qtfj.fjmc }</a></td>

+							<td>${qtfj.fbdw }</td>

+							<td>${qtfj.wjh }</td>

+							<td>${qtfj.fbsj }</td>

+						</tr>

+					</c:forEach>

+					<tbody id="viewqtfj8"></tbody>

+				<c:if test="${sfjyr!=1 }">

+				<c:if test="${spflag==8 || opflag > 8  }">

+				<tr height=100px>

+				<td colspan=1 >

+			                           审批意见

+				</td>

+				<td colspan=6> 

+				     <textarea  class="form-control" name="spyj8" id="spyj8" style="height:100px;" value="${xmxxfb.yj }"></textarea>

+				</td>

+				</tr>

+				</c:if>

+				</c:if>

+				<tbody id="qtfjtb8"></tbody>

+				</table>

+</div>

+</div>

+

+<div class="tab-pane fade" id="lcls">

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

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

+					<tr>

+						<th width="10%">序号</th>	

+						<th width="10%">流程节点名</th>

+						<th width="10%">处理结果</th>

+						<th width="10%">审批人</th>

+						<th width="10%">审批时间</th>

+						<th width="10%">审批意见</th>

+					</tr>

+					<tbody id="lclstb"></tbody>

+				</table>

+</div>

+</div>

+</div>  

+

+<div class="theme-popover" id="qtfjpopover" style="width: 900px;height: 400px;">

+<div class="theme-poptit">

+ <input type="hidden" class="form-control" id="qtfjid" name="qtfjid">

+ <input type="hidden" class="form-control" id="qtfjzdids" name="qtfjzdids">

+ <input type="hidden" class="form-control" id="qtfjids" name="qtfjids">

+	          <div class="close-tc">

+	          		<a href="#" title="关闭" onclick="jsjdgl.detail.qtfjguanbipop()" >×</a>

+	          </div>

+	     </div>

+		<div class="popContent-tc" >

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

+		<tr>

+			<th>文号 : &nbsp;</th>

+			<td>

+				 <input type="text" class="form-control" name="qtwjh" id="wjh">

+			</td>

+		</tr>

+		<tr>

+			<th>批文时间: &nbsp;</th> 

+			<td>

+			<input class="Wdate" name="qtfbsj" id="fbsj" type="text" onFocus="WdatePicker({lang:'zh-cn',skin:'default',dateFmt:'yyyy-MM-dd'})">

+            </td>

+		</tr>

+		<tr>

+			<th>批文单位: &nbsp;</th>

+			<td>

+			<input type="text" class="form-control" name="qtfbdw" id="fbdw">

+			</td>

+		</tr>

+		<tr>

+		<th>上传附件名称： &nbsp;</th>

+		<td>

+		     <div>

+			 <a href="#" id="scqtfjbt" class="file"><input type="file" name="qtfilename" id="qtfileid"   onchange="jsjdgl.detail.saveQtfj()">选择本地文件</a>

+			 </div>

+			 <div id="qtfjxq">

+			 </div>

+			 <span>（上传文件最大50M，只可上传pdf、doc、docx、xls、xlsx格式文件）</span>

+		</td>

+		</tr>

+	</table>

+

+		<div  id="buttons">

+  	<a class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.xinzengqtfj()">

+  <i></i> 

+           保存</a>

+            <a class="btn btn-default btn-sm" href="#"  onclick="jsjdgl.detail.qtfjguanbipop()">

+  <i></i> 

+           关闭</a>

+  		</div>

+		</div>

+	</div>

+	<div class="theme-popover-mask" id="qtfjmask"></div>	 

+<div class="theme-popover" id="theme-popover" style="width: 900px;height: 400px;">

+<div class="theme-poptit">

+<input type="hidden" class="form-control"  id="flag">

+	          <div class="close-tc">

+	          		<a href="#" title="关闭" onclick="jsjdgl.detail.guanbipop()" >×</a>

+	          </div>

+	     </div>

+		<div class="popContent-tc" >

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

+		<tr>

+			<th>文号 : &nbsp;</th>

+			<td>

+				 <input type="text" class="form-control" name="wjh" id="wjh1">

+			</td>

+		</tr>

+		<tr>

+			<th>批文时间: &nbsp;</th> 

+			<td>

+			<input class="Wdate" name="fbsj" id="fbsj1" type="text" onFocus="WdatePicker({lang:'zh-cn',skin:'default',dateFmt:'yyyy-MM-dd'})">

+            </td>

+		</tr>

+		<tr>

+			<th>批文单位: &nbsp;</th>

+			<td>

+			<input type="text" class="form-control" name="fbdw" id="fbdw1">

+			</td>

+		</tr>

+		<tr>

+		<th>上传附件名称： &nbsp;</th>

+		<td>

+		    <div>

+			<a href="#" id="scfjbt" class="file"><input type="file" name="filename" id="fileid"   onchange="jsjdgl.detail.saveFile()">选择本地文件</a>

+			</div>

+			<div id="fjxq">

+			</div>

+			<span>（上传文件最大50M，只可上传pdf、doc、docx、xls、xlsx格式文件）</span>

+		</td>

+		</tr>

+	</table>

+

+		<div  id="buttons">

+  	<a class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.xinzengfj()">

+           保存</a>

+            <a class="btn btn-default btn-sm" href="#"  onclick="jsjdgl.detail.guanbipop()">

+           关闭</a>

+  		</div>

+		</div>

+	</div>

+	<div class="theme-popover-mask" id="theme-popover-mask"></div>

+</form>

+

+					<%-- <div  id="buttons">

+					<c:if test="${sfjyr==1 }">

+                    <a class="btn btn-default btn-sm" href="#" onclick="jsjdgl.detail.qtfj()">

+							            其他附件</a>

+                    </c:if>

+                    <c:if test="${sfjyr=='' }">

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

+						<c:if test="${ spflag !='3' && spflag !='8'  }">

+							<a id="auditbt" class="btn btn-default btn-sm" href="#"  onclick="jsjdgl.detail.audit('Y','${record.id}')">

+							   <i class="glyphicon glyphicon-ok-sign"></i> 

+							            同意</a>

+							<c:if test="${sfjyr!=1 }">	            

+							<a id="tuihuibt" class="btn btn-default btn-sm" href="#"  onclick="jsjdgl.detail.audit('N','${record.id}')">

+								   <i class="glyphicon glyphicon-ban-circle"></i> 

+								           退回</a>

+							</c:if>

+						</c:if>

+						

+						<c:if test="${ spflag =='3' }">

+								<c:if test="${record.flowstatus == '1'  }">

+									<c:if test="${sfjyr!=1 }">	            

+									<a id="tuihuibt" class="btn btn-default btn-sm" href="#"  onclick="jsjdgl.detail.audit('N','${record.id}')">

+									   <i class="glyphicon glyphicon-ban-circle"></i> 

+									            退回</a>

+									</c:if>

+								</c:if>

+								<c:if test="${record.flowstatus == '2' || record.flowstatus == '' || record.flowstatus == null }">

+										<a id="auditbt" class="btn btn-default btn-sm" href="#"  onclick="jsjdgl.detail.audit('Y','${record.id}')">

+											   <i class="glyphicon glyphicon-ok-sign"></i> 

+											            同意</a>

+										<c:if test="${record.flowstatus == '' || record.flowstatus == null }">	            

+											      <a id="auditbt" class="btn btn-default btn-sm" href="#"  onclick="jsjdgl.detail.saveTbzt('${record.id}')">

+												   <i class="glyphicon glyphicon-ok-sign"></i> 

+												    转报省级</a>      

+										</c:if>            

+										<c:if test="${sfjyr!=1 }">	            

+										<a id="tuihuibt" class="btn btn-default btn-sm" href="#"  onclick="jsjdgl.detail.audit('N','${record.id}')">

+											   <i class="glyphicon glyphicon-ban-circle"></i> 

+											           退回</a>

+								

+										</c:if>

+								</c:if>

+					</c:if>

+					

+					<c:if test="${ spflag =='8' }">

+								<c:if test="${record.flowstatus == '3'  }">

+									<c:if test="${sfjyr!=1 }">	            

+									<a id="tuihuibt" class="btn btn-default btn-sm" href="#"  onclick="jsjdgl.detail.audit('N','${record.id}')">

+									   <i class="glyphicon glyphicon-ban-circle"></i> 

+									            退回</a>

+									</c:if>

+								</c:if>

+								<c:if test="${ record.flowstatus == '2'  || record.flowstatus == '4'  || record.flowstatus == '' || record.flowstatus == null }">

+										<a id="auditbt" class="btn btn-default btn-sm" href="#"  onclick="jsjdgl.detail.audit('Y','${record.id}')">

+											   <i class="glyphicon glyphicon-ok-sign"></i> 

+											            同意</a>

+										<c:if test="${ record.flowstatus == '2'  || record.flowstatus == '' || record.flowstatus == null }">	            

+											      <a id="auditbt" class="btn btn-default btn-sm" href="#"  onclick="jsjdgl.detail.saveTbzt('${record.id}')">

+												   <i class="glyphicon glyphicon-ok-sign"></i> 

+												    转报省级</a>      

+										</c:if>            

+										<c:if test="${sfjyr!=1 }">	            

+										<a id="tuihuibt" class="btn btn-default btn-sm" href="#"  onclick="jsjdgl.detail.audit('N','${record.id}')">

+											   <i class="glyphicon glyphicon-ban-circle"></i> 

+											           退回</a>

+								

+										</c:if>

+								</c:if>

+					</c:if>

+					</c:if>

+					</c:if>

+					

+					

+					<c:if test="${sfjyr==1 }">

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

+					<a id="auditbt" class="btn btn-default btn-sm" href="#"  onclick="jsjdgl.detail.audit('Y','${record.id}')">

+							   <i class="glyphicon glyphicon-share"></i> 

+							            提交</a>

+					</c:if>	

+					</c:if>

+					

+					     <a class="btn btn-default btn-sm" href="#"  onclick="jsjdgl.detail.back()">

+							   <i class="glyphicon glyphicon-arrow-left"></i> 

+							            返回</a>	            		            		            		            

+          			</div> --%>

+          			<div  id="buttons">

+          			<c:if test="${sfjyr==2 }">

+          			  <a class="btn btn-default btn-sm" href="#"  onclick="jsjdgl.detail.saveAll('N','${record.id}')">

+							   <i class="glyphicon glyphicon-floppy-disk"></i> 

+							            保存</a>

+          			</c:if>

+				

+							             <a class="btn btn-default btn-sm" href="#"  onclick="jsjdgl.detail.back()">

+							   <i class="glyphicon glyphicon-arrow-left"></i> 

+							            返回</a>

+							            

+							            

+							                       

+          			</div>

+			</div>

+		</div>

+</div>

+	

+</body>

+

+</html>

+ 1 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdgl/jsjdglmain.jsp
파일 보기 

@@ -230,7 +230,7 @@
 
 									          </a>

 							</c:if>

 							<c:if test="${isjyr == 2}">

-							<a class="btn btn-default btn-xs" href="#"  onclick="jsjdgl.main.banli('${jsjdgl.id}')" title="上传">

+							<a class="btn btn-default btn-xs" href="#"  onclick="jsjdgl.main.banlitest('${jsjdgl.id}')" title="上传">

 									   <i class="glyphicon glyphicon-check"></i> 

 									          </a>

 							</c:if>

+ 2 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/zxjx/zxjxmain.jsp
파일 보기 

@@ -44,9 +44,10 @@
 
 </head>

 

 <body>

+

 	<div class="box">

+	<form action="${app }/zxjx/main" id="zxjxform" method="post"> 

     		<div class="box-content">

-<form action="${app }/zxjx/main" id="zxjxform" method="post"> 			

     				<!-- 查询条件 -->

    			<div>

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

+ 45 - 0
gkjsjy/trunk/WebContent/static/biz/js/gkjsgl/jsjdgl/jsjdgldetail.js
파일 보기 

@@ -1300,4 +1300,49 @@ jsjdgl.detail.saveTbzt=function(data){
 
      	 });

          }

      }, "json");

+}

+

+

+jsjdgl.detail.saveAll=function(auditpass,id){

+	 //验证浮点类型

+	 if(van($('#addform input[name=ztz]'),"总投资")==false){return false;}

+	 if(van($('#addform input[name=axcd]'),"岸线长度 ")==false){return false;}

+	 if(van($('#addform input[name=bwdj]'),"泊位吨级 ")==false){return false;}

+	 if(van($('#addform input[name=tgnl]'),"通过能力")==false){return false;}

+	var flag = jsjdgl.detail.opflag;

+	var shyj="";

+	var audit;

+	if(auditpass=="Y"){

+		audit=true;

+		shyj=$('#spyj'+flag).val();

+	}else{

+		audit=false;

+		shyj=$('#spyj'+flag).val();

+	}

+	 $(".btn").attr("disabled",true);

+	 $.ajax({

+	       url:$.app + "/jsjdgl/saveAll?flag="+audit+"&shyj="+encodeURI(encodeURI(shyj)),

+	       data:$("#addform").serialize(),

+	       type:"post",

+	       dataType:"json",

+	       success:function(data){//ajax返回的数据

+		           if (data.success) {

+			           	$.alert({

+			       		    title: '提示',

+			       		    content: '操作成功',

+			       		    confirm: function(){

+			       		    	jsjdgl.detail.back();

+			       		    }

+			           	});

+		           }else {

+			           	$.alert({

+			       		    title: '提示',

+			       		    content: data.message,

+			       		    confirm: function(){

+			       		    	$(".btn").attr("disabled",false);

+			       		    }

+			           	});

+		           }

+		     }

+	  }); 

 }

+ 4 - 0
gkjsjy/trunk/WebContent/static/biz/js/gkjsgl/jsjdgl/jsjdglmain.js
파일 보기 

@@ -15,6 +15,10 @@ jsjdgl.main.banli=function(data){
 
 	location.href=$.app+"/jsjdgl/edit?id="+data+"&flag=audit";

 }

 

+jsjdgl.main.banlitest=function(data){

+	location.href=$.app+"/jsjdgl/edittest?id="+data+"&flag=audit";

+}

+

 jsjdgl.main.edit=function(data){

 	location.href=$.app+"/jsjdgl/edit?id="+data;

 }

+ 2 - 0
gkjsjy/trunk/WebContent/static/biz/js/gkjygl/gkjyr/zxjx/zxjxmain.js
파일 보기 

@@ -8,10 +8,12 @@ $.namespace("zxjx.main");
 
 

 zxjx.main.init=function(){

 	//把form传入，构造翻页控件

+	$

 	pageinfo($("#zxjxform"));

 };

 

 zxjx.main.search=function(){

+	$('#pagejump').val(1);

 	$("#zxjxform").submit();

 };

+ 72 - 43
gkjsjy/trunk/src/com/xt/jygl/common/SearchCondition.java
파일 보기 

@@ -139,38 +139,38 @@ public class SearchCondition {
 
 	public static String cgmc = "";

 	public static String wxpcg = "";

 

-	//===============项目信息管理====================

-	public static int xmxxpage=1;

-	public static String xmszd="";

-	public static String xmszgk="";

-	public static String xmszgq="";

-	public static String xmxmmc="";

-	public static String xmxmfr="";

-	public static String xmxmhzjb="";

-	public static String xmsfyzjbz="";

-	

-	//===============建设进度管理====================

-	public static int jsjdpage=1;

-	public static String jsszd="";

-	public static String jsszgk="";

-	public static String jsszgq="";

-	public static String jsxmmc="";

-	public static String jsxmfr="";

-	public static String jsdqzt="";

-	public static String jslcjd="";

-	//===============投资计划管理====================

-	public static int tzjhpage=1;

-	public static String tzjhszd="";

-	public static String tzjhszgk="";

-	public static String tzjhszgq="";

-	public static String tzjhxmmc="";

-	public static String tzjhxmfr="";

-	public static String tzjhssjh="";

-	public static String tzjhjhnd="";

-	public static String tzjhndjhtz1="";

-	public static String tzjhndjhtz2="";

-	public static String tzsfyzjbz="";

-	

+	// ===============项目信息管理====================

+	public static int xmxxpage = 1;

+	public static String xmszd = "";

+	public static String xmszgk = "";

+	public static String xmszgq = "";

+	public static String xmxmmc = "";

+	public static String xmxmfr = "";

+	public static String xmxmhzjb = "";

+	public static String xmsfyzjbz = "";

+

+	// ===============建设进度管理====================

+	public static int jsjdpage = 1;

+	public static String jsszd = "";

+	public static String jsszgk = "";

+	public static String jsszgq = "";

+	public static String jsxmmc = "";

+	public static String jsxmfr = "";

+	public static String jsdqzt = "";

+	public static String jslcjd = "";

+	// ===============投资计划管理====================

+	public static int tzjhpage = 1;

+	public static String tzjhszd = "";

+	public static String tzjhszgk = "";

+	public static String tzjhszgq = "";

+	public static String tzjhxmmc = "";

+	public static String tzjhxmfr = "";

+	public static String tzjhssjh = "";

+	public static String tzjhjhnd = "";

+	public static String tzjhndjhtz1 = "";

+	public static String tzjhndjhtz2 = "";

+	public static String tzsfyzjbz = "";

+

 	// ===============仓库====================

 	public static int ckpage = 1;

 	public static String ckszd = "";

@@ -218,7 +218,6 @@ public class SearchCondition {
 
 	public static int todopage = 1;

 	public static String type = "";

 

-	

 	// =================装卸机械==========================

 	public static int zxjxpage = 1;

 	public static String zxjxszd = "";

@@ -235,8 +234,7 @@ public class SearchCondition {
 
 	public static String lhxkglgkjyr = "";

 	public static String lhxkglfddbr = "";

 	public static String lhxkglsqrdz = "";

-	public static int lhxkglpage = 1;

-			

+	public static int lhsqpage = 1;

 	// 许可证申请

 	public static String xkzsqszdid = "";

 	public static String xkzsqszgkid = "";

@@ -245,7 +243,7 @@ public class SearchCondition {
 
 	public static String xkzsqfddbr = "";

 	public static String xkzsqbgdd = "";

 	public static int xkzsqpage = 1;

-	

+

 	// 航线航班

 	public static String hxszdid = "";

 	public static String hxszgkid = "";

@@ -255,9 +253,9 @@ public class SearchCondition {
 
 	public static String hxhxlx = "";

 	public static String hxsfth = "";

 	public static int hxpage = 1;

-	

-	//单船申报

-	public static int dcsbpage = 1; 

+

+	// 单船申报

+	public static int dcsbpage = 1;

 	public static String dcsbjyr = "";

 	public static String dcsbszd = "";

 	public static String dcsbszgk = "";

@@ -267,8 +265,8 @@ public class SearchCondition {
 
 	public static String dcsbshzt = "";

 	public static Date dcsbzysjq = null;

 	public static Date dcsbzysjz = null;

-	

-	//港口月度作业量申报

+

+	// 港口月度作业量申报

 	public static int ybbpage = 1;

 	public static String ybbjyr = "";

 	public static String ybbszd = "";

@@ -279,9 +277,40 @@ public class SearchCondition {
 
 	public static String ybbhwzl = "";

 	public static Date ybbzysjq = null;

 	public static Date ybbzysjz = null;

-	

-	//航线航班统计

+

+	// 航线航班统计

 	public static int hxhbtjpage = 1;

 	public static String hxhbtjszgk = "";

 	public static String hxhbtjrq = "";

+

+	// 用户

+	public static int userpage = 1;

+

+	// 许可证变更

+	public static int xkzbgpage = 1;

+

+	// 许可证延续

+	public static int xkzyxpage = 1;

+

+	// 许可证注销

+	public static int xkzzxpage = 1;

+

+	// 理货延续

+	public static int lhyxpage = 1;

+	// 理货变更

+	public static int lhbgpage = 1;

+	// 建设初步设计申请

+	public static int jsjdcbsjdspage = 1;

+	public static int jsjdcbsjpage = 1;

+	// 建设初步设计变更

+	public static int jsjdbgdspage = 1;

+	public static int jsjdbgpage = 1;

+	// 建设竣工申请

+	public static int jgsqpage = 1;

+	public static int jgsqdspage = 1;

+	// 监督提醒

+	public static int jdtxpage = 1;

+

+	// 通知公告

+	public static int ggpage = 1;

 }

+ 4 - 6
gkjsjy/trunk/src/com/xt/jygl/ggfwxxgl/jdtxxx/ctl/JdtxxxCtl.java
파일 보기 

@@ -34,6 +34,7 @@ import com.xt.jygl.accessory.service.AccessoryService;
 
 import com.xt.jygl.common.BaseWebCtl;

 import com.xt.jygl.common.Constants;

 import com.xt.jygl.common.GlobalData;

+import com.xt.jygl.common.SearchCondition;

 import com.xt.jygl.common.Utils;

 import com.xt.jygl.ggfwxxgl.jdjc.entity.JdjcfjEntity;

 import com.xt.jygl.ggfwxxgl.jdjc.service.JdjcfjService;

@@ -153,11 +154,7 @@ public class JdtxxxCtl extends BaseWebCtl {
 
 			}

 		};

 		if (page.getPage() < 1) {

-			Object jdtxpage = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "jdtxpage");

-			if (StringUtils.isEmpty(jdtxpage) || !org.apache.commons.lang.StringUtils.isNumeric(String.valueOf(jdtxpage))) {

-				jdtxpage = "1";

-			}

-			page.setPage(Integer.valueOf(String.valueOf(jdtxpage)));

+			page.setPage(SearchCondition.jdtxpage);

 		}

 

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

@@ -216,7 +213,8 @@ public class JdtxxxCtl extends BaseWebCtl {
 
 			}

 		}

 		if (isPOST(request)) {

-			cacheSCmap.put("jdtxpage", page.getPage());

+			SearchCondition.jdtxpage = page.getPage();

+			//cacheSCmap.put("jdtxpage", page.getPage());

 			CacheSearchCondition.putCacheSCmap(request.getParameterMap(), cacheSCmap);

 		}

 		model.addAttribute("list", voList);

+ 4 - 6
gkjsjy/trunk/src/com/xt/jygl/ggfwxxgl/tzgg/ggxx/ctl/GgxxCtl.java
파일 보기 

@@ -35,6 +35,7 @@ import com.xt.jygl.accessory.entity.AccessoryEntity;
 
 import com.xt.jygl.accessory.service.AccessoryService;

 import com.xt.jygl.common.BaseWebCtl;

 import com.xt.jygl.common.Constants;

+import com.xt.jygl.common.SearchCondition;

 import com.xt.jygl.ggfwxxgl.tzgg.ggxx.entity.GgxxEntity;

 import com.xt.jygl.ggfwxxgl.tzgg.ggxx.entity.GgxxtxEntity;

 import com.xt.jygl.ggfwxxgl.tzgg.ggxx.service.GgxxService;

@@ -197,11 +198,7 @@ public class GgxxCtl extends BaseWebCtl {
 
 			}

 		};

 		if (page.getPage() < 1) {

-			Object ggpage = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "ggpage");

-			if (StringUtils.isEmpty(ggpage) || !org.apache.commons.lang.StringUtils.isNumeric(String.valueOf(ggpage))) {

-				ggpage = "1";

-			}

-			page.setPage(Integer.valueOf(String.valueOf(ggpage)));

+			page.setPage(SearchCondition.ggpage);

 		}

 		page.setSort("id");

 		page.setOrder("desc");

@@ -236,7 +233,8 @@ public class GgxxCtl extends BaseWebCtl {
 
 			}

 		}

 		if (isPOST(request)) {

-			cacheSCmap.put("ggpage", page.getPage());

+			SearchCondition.ggpage = page.getPage();

+			//cacheSCmap.put("ggpage", page.getPage());

 			CacheSearchCondition.putCacheSCmap(request.getParameterMap(), cacheSCmap);

 		}

 		model.addAttribute("list", voList);

+ 6 - 7
gkjsjy/trunk/src/com/xt/jygl/gkjcxx/ax/ctl/AxCtl.java
파일 보기 

@@ -1,3 +1,4 @@
 
+

 package com.xt.jygl.gkjcxx.ax.ctl;

 

 import java.io.BufferedReader;

@@ -42,6 +43,7 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 
 import com.xt.jygl.common.BaseWebCtl;

 import com.xt.jygl.common.Constants;

 import com.xt.jygl.common.GlobalData;

+import com.xt.jygl.common.SearchCondition;

 import com.xt.jygl.common.Utils;

 import com.xt.jygl.gkjcxx.ax.client.AxWebService;

 import com.xt.jygl.gkjcxx.ax.entity.AxEntity;

@@ -154,12 +156,8 @@ public class AxCtl extends BaseWebCtl {
 
 			}

 		};

 	

-		if (page.getPage() < 1) {

-			Object axpage = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "axpage");

-			if (StringUtils.isEmpty(axpage) || !org.apache.commons.lang.StringUtils.isNumeric(String.valueOf(axpage))) {

-				axpage = "1";

-			}

-			page.setPage(Integer.valueOf(String.valueOf(axpage)));

+		if(page.getPage() <1){

+			page.setPage(SearchCondition.axpage);

 		}

 

 		page.setSort("id");

@@ -191,7 +189,8 @@ public class AxCtl extends BaseWebCtl {
 
 		}

 	

 		if (isPOST(request)) {

-			cacheSCmap.put("axpage", page.getPage());

+			SearchCondition.axpage=page.getPage();

+			//cacheSCmap.put("axpage", page.getPage());

 			CacheSearchCondition.putCacheSCmap(request.getParameterMap(), cacheSCmap);

 		}

+ 6 - 9
gkjsjy/trunk/src/com/xt/jygl/gkjcxx/cb/ctl/CbCtl.java
파일 보기 

@@ -24,14 +24,12 @@ import cache.CacheSearchCondition;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 
 import com.xt.jygl.common.BaseWebCtl;
 
 import com.xt.jygl.common.SearchCondition;
 
-import com.xt.jygl.common.Utils;
 
 import com.xt.jygl.gkjcxx.cb.entity.CbEntity;
 
 import com.xt.jygl.gkjcxx.cb.service.CbService;
 
 import com.xt.jygl.gkjcxx.cb.vo.CbVo;
 
 import com.xtframe.core.support.SecurityMgr;
 
 import com.xtframe.sec.common.QueryService;
 
 import com.xtframe.sec.common.SimplePageRequest;
 
-import com.xtframe.sec.utils.SecUtils;
 
 import com.xtframe.util.StringUtils;
 
 
 /**
 
@@ -85,13 +83,11 @@ public class CbCtl extends BaseWebCtl {
 
 			}
 
 		};
 
 		
-		if (page.getPage() < 1) {
 
-			Object cbpage = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "cbpage");
 
-			if (StringUtils.isEmpty(cbpage) || !org.apache.commons.lang.StringUtils.isNumeric(String.valueOf(cbpage))) {
 
-				cbpage = "1";
 
-			}
 
-			page.setPage(Integer.valueOf(String.valueOf(cbpage)));
 
+	
+		if(page.getPage()<1){
 
+			page.setPage(SearchCondition.cbpage);
 
 		}
 
+	
 		page.setSort("id");
 
 		page.setOrder("desc");
 
 		Page<CbEntity> list = query.findAll(spec, toPageRequest(page), CbEntity.class);
 
@@ -101,7 +97,8 @@ public class CbCtl extends BaseWebCtl {
 
 		}
 
 		
 		if (isPOST(request)) {
 
-			cacheSCmap.put("cbpage", page.getPage());
 
+			SearchCondition.cbpage= page.getPage();
 
+			//cacheSCmap.put("cbpage", page.getPage());
 
 			CacheSearchCondition.putCacheSCmap(request.getParameterMap(), cacheSCmap);
 
 		}
 
 		model.addAttribute("list", voList);

+ 44 - 33
gkjsjy/trunk/src/com/xt/jygl/gkjcxx/fbd/ctl/FbdCtl.java
파일 보기 

@@ -28,6 +28,7 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 
 import com.xt.jygl.common.BaseWebCtl;

 import com.xt.jygl.common.Constants;

 import com.xt.jygl.common.GlobalData;

+import com.xt.jygl.common.SearchCondition;

 import com.xt.jygl.common.Utils;

 import com.xt.jygl.gkjcxx.fbd.client.FbdWebService;

 import com.xt.jygl.gkjcxx.fbd.entity.FbdEntity;

@@ -73,14 +74,21 @@ public class FbdCtl extends BaseWebCtl {
 
 

 	/**

 	 * 一览信息

-	 * @param page 分页

+	 * 

+	 * @param page

+	 *            分页

 	 * @param model

 	 * @param request

-	 * @param fbdmc 防波堤名称

-	 * @param szgkid 所在港口ID

-	 * @param szgqid 所在港区ID

-	 * @param szdid 所在地ID

-	 * @param fbdlx 防波堤类型

+	 * @param fbdmc

+	 *            防波堤名称

+	 * @param szgkid

+	 *            所在港口ID

+	 * @param szgqid

+	 *            所在港区ID

+	 * @param szdid

+	 *            所在地ID

+	 * @param fbdlx

+	 *            防波堤类型

 	 * @param menuid

 	 * @return

 	 * @throws JsonProcessingException

@@ -88,7 +96,7 @@ public class FbdCtl extends BaseWebCtl {
 
 	@RequestMapping(value = "/main")

 	@RequiresPermissions("fbd:main")

 	public String main(SimplePageRequest page, Model model, final HttpServletRequest request, final String fbdmc, final String szgkid, final String szgqid, final String szdid, final String fbdlx, String menuid) throws JsonProcessingException {

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

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

 		// 查詢條件

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

 			@Override

@@ -97,32 +105,37 @@ public class FbdCtl extends BaseWebCtl {
 
 				if (StringUtils.isNotEmpty(fbdmc)) {

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

 				} else if (isGET(request)) {

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

-					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, null,"fbdmc");

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

+					// + SearchCondition.fbdmc + "%"));

+					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, null, "fbdmc");

 				}

 				if (StringUtils.isNotEmpty(fbdlx)) {

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

 				} else if (isGET(request)) {

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

-					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, null,"fbdlx");

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

+					// + SearchCondition.fbdlx + "%"));

+					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, null, "fbdlx");

 				}

 				if (StringUtils.isNotEmpty(szgkid)) {

 					list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + szgkid + "%"));

 				} else if (isGET(request)) {

-					//list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + SearchCondition.fbdszgk + "%"));

-					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, "id","szgk","szgkid");

+					// list.add(cb.like(root.get("szgk").get("id").as(String.class),

+					// "%" + SearchCondition.fbdszgk + "%"));

+					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)) {

-					//list.add(cb.like(root.get("szgq").get("id").as(String.class), "%" + SearchCondition.fbdszgq + "%"));

-					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, "id","szgq","szgqid");

+					// list.add(cb.like(root.get("szgq").get("id").as(String.class),

+					// "%" + SearchCondition.fbdszgq + "%"));

+					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, "id", "szgq", "szgqid");

 				}

 				if (StringUtils.isNotEmpty(szdid)) {

 					list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + szdid + "%"));

 				} else if (isGET(request)) {

-					//list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + SearchCondition.fbdszd + "%"));

-					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, "id","szd","szdid");

+					// list.add(cb.like(root.get("szd").get("id").as(String.class),

+					// "%" + SearchCondition.fbdszd + "%"));

+					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, "id", "szd", "szdid");

 				}

 				// 经营人只能查看自己企业下的数据，非经营人只能查看自己所在地的数据

 				if (isJyr()) {

@@ -130,8 +143,7 @@ public class FbdCtl extends BaseWebCtl {
 
 				} else {

 					In<String> in = cb.in(root.get("szgq").get("id").as(String.class));

 					@SuppressWarnings("unchecked")

-					List<String> gqlist = (List<String>) Utils.getSession()

-							.getAttribute("gqList");

+					List<String> gqlist = (List<String>) Utils.getSession().getAttribute("gqList");

 					if (gqlist != null && gqlist.size() > 0) {

 						for (int i = 0; i < gqlist.size(); i++) {

 							in.value(gqlist.get(i));

@@ -144,14 +156,10 @@ public class FbdCtl extends BaseWebCtl {
 
 			}

 		};

 

+	

 		if (page.getPage() < 1) {

-			Object fbdpage = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "fbdpage");

-			if (StringUtils.isEmpty(fbdpage) || !org.apache.commons.lang.StringUtils.isNumeric(String.valueOf(fbdpage))) {

-				fbdpage = "1";

-			}

-			page.setPage(Integer.valueOf(String.valueOf(fbdpage)));

+			page.setPage(SearchCondition.fbdpage);

 		}

-		

 

 		page.setSort("id");

 		page.setOrder("desc");

@@ -184,7 +192,7 @@ public class FbdCtl extends BaseWebCtl {
 
 		return "gkjcxx/fbd/fbdmain";

 	}

 

-	//删除

+	// 删除

 	@RequestMapping(value = "/delete")

 	@RequiresPermissions("fbd:delete")

 	@ResponseBody

@@ -214,7 +222,7 @@ public class FbdCtl extends BaseWebCtl {
 
 		return wr;

 	}

 

-	//保存数据

+	// 保存数据

 	@RequestMapping(value = "/save")

 	@RequiresPermissions("fbd:add")

 	@ResponseBody

@@ -253,7 +261,7 @@ public class FbdCtl extends BaseWebCtl {
 
 			szgq.setId(szgqid);

 			fbdEntity.setSzgq(szgq);

 

-			if(!StringUtils.isEmpty(ssjyrid)){

+			if (!StringUtils.isEmpty(ssjyrid)) {

 				GkjyrEntity ssjyr = new GkjyrEntity();

 				ssjyr.setId(ssjyrid);

 				fbdEntity.setSsjyr(ssjyr);

@@ -265,7 +273,7 @@ public class FbdCtl extends BaseWebCtl {
 
 			CodeEntity szd = new CodeEntity(szdid);

 			fbdEntity.setSzd(szd);

 			fbdService.save(fbdEntity);

-			

+

 		} catch (Exception e) {

 			wr.setSuccess(false);

 			wr.setMessage("操作失败！");

@@ -276,6 +284,7 @@ public class FbdCtl extends BaseWebCtl {
 
 

 	/**

 	 * 编辑数据

+	 * 

 	 * @param model

 	 * @param id

 	 * @return

@@ -302,6 +311,7 @@ public class FbdCtl extends BaseWebCtl {
 
 

 	/**

 	 * 查看

+	 * 

 	 * @param model

 	 * @param id

 	 * @return

@@ -328,18 +338,19 @@ public class FbdCtl extends BaseWebCtl {
 
 

 	/**

 	 * 新增

+	 * 

 	 * @param model

 	 * @return

 	 */

 	@RequestMapping(value = "/add")

 	@RequiresPermissions("fbd:add")

 	public String add(Model model) {

-		if(SecUtils.getCurrUser() != null){

+		if (SecUtils.getCurrUser() != null) {

 			List<CodeEntity> list = securityMgr.codeService().findValidCodesByGroupCodeAndCity(Constants.GROUP_CODE_SZD, GlobalData.CITY_CODE);

-			model.addAttribute("sz",list.size()==1?list.get(0).getId():"");

-			if(list.size()==1){

+			model.addAttribute("sz", list.size() == 1 ? list.get(0).getId() : "");

+			if (list.size() == 1) {

 				List<GkEntity> gklist = gkService.findBySzd(list.get(0).getId());

-				model.addAttribute("gk",gklist.size()==1?gklist.get(0).getId():"");

+				model.addAttribute("gk", gklist.size() == 1 ? gklist.get(0).getId() : "");

 			}

 		}

 		model.addAttribute("jyr", getSsjyr() != null ? JSONObject.fromObject(getSsjyr()).toString() : null);

+ 4 - 6
gkjsjy/trunk/src/com/xt/jygl/gkjcxx/gk/ctl/GkCtl.java
파일 보기 

@@ -25,6 +25,7 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 
 import com.xt.jygl.common.BaseWebCtl;

 import com.xt.jygl.common.Constants;

 import com.xt.jygl.common.GlobalData;

+import com.xt.jygl.common.SearchCondition;

 import com.xt.jygl.gkjcxx.gk.client.GkWebService;

 import com.xt.jygl.gkjcxx.gk.entity.GkEntity;

 import com.xt.jygl.gkjcxx.gk.service.GkService;

@@ -92,11 +93,7 @@ public class GkCtl extends BaseWebCtl {
 
 			}

 		};

 		if (page.getPage() < 1) {

-			Object gkpage = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "gkpage");

-			if (StringUtils.isEmpty(gkpage) || !org.apache.commons.lang.StringUtils.isNumeric(String.valueOf(gkpage))) {

-				gkpage = "1";

-			}

-			page.setPage(Integer.valueOf(String.valueOf(gkpage)));

+			page.setPage(SearchCondition.gkpage);

 		}

 		page.setSort("id");

 		page.setOrder("desc");

@@ -110,7 +107,8 @@ public class GkCtl extends BaseWebCtl {
 
 			}

 		}

 		if (isPOST(request)) {

-			cacheSCmap.put("gkpage", page.getPage());

+			SearchCondition.gkpage = page.getPage();

+			//cacheSCmap.put("gkpage", page.getPage());

 			CacheSearchCondition.putCacheSCmap(request.getParameterMap(), cacheSCmap);

 		}

+ 14 - 19
gkjsjy/trunk/src/com/xt/jygl/gkjcxx/gq/ctl/GqCtl.java
파일 보기 

@@ -28,6 +28,7 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 
 import com.xt.jygl.common.BaseWebCtl;

 import com.xt.jygl.common.Constants;

 import com.xt.jygl.common.GlobalData;

+import com.xt.jygl.common.SearchCondition;

 import com.xt.jygl.common.Utils;

 import com.xt.jygl.gkjcxx.gk.entity.GkEntity;

 import com.xt.jygl.gkjcxx.gk.service.GkService;

@@ -123,13 +124,9 @@ public class GqCtl extends BaseWebCtl {
 
 			}

 		};

 		if (page.getPage() < 1) {

-			Object gqpage = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "gqpage");

-			if (StringUtils.isEmpty(gqpage) || !org.apache.commons.lang.StringUtils.isNumeric(String.valueOf(gqpage))) {

-				gqpage = "1";

-			}

-			page.setPage(Integer.valueOf(String.valueOf(gqpage)));

+			page.setPage(SearchCondition.gqpage);

 		}

-		page.setSort("gqmc");

+		page.setSort("id");

 		page.setOrder("desc");

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

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

@@ -147,7 +144,8 @@ public class GqCtl extends BaseWebCtl {
 
 		}

 

 		if (isPOST(request)) {

-			cacheSCmap.put("gqpage", page.getPage());

+			SearchCondition.gqpage = page.getPage();

+			// cacheSCmap.put("gqpage", page.getPage());

 			CacheSearchCondition.putCacheSCmap(request.getParameterMap(), cacheSCmap);

 		}

 		List<CodeEntity> listSylx = securityMgr.codeService().findValidCodesByGroupCode(Constants.GQ_CODE_GQSZSYLX);

@@ -240,7 +238,7 @@ public class GqCtl extends BaseWebCtl {
 
 			if (gqList != null && gqList.size() > 0) {

 				Utils.getSession().setAttribute("gkList", gkService.findByGqList(gqList));

 			}

-			

+

 		} catch (Exception e) {

 			wr.setSuccess(false);

 			wr.setMessage("操作失败！");

@@ -342,17 +340,14 @@ public class GqCtl extends BaseWebCtl {
 
 			if (gqList != null && gqList.size() > 0) {

 				Utils.getSession().setAttribute("gkList", gkService.findByGqList(gqList));

 			}

-			/*try {

-				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY) && needWS()) {

-					GqWebService webService = gqService.getWebService(null);

-					webService.delete(id);

-					gq.setTbzt(Constants.YES);

-					gqService.save(gq);

-				}

-			} catch (Exception e) {

-				gq.setTbzt(Constants.NO);

-				gqService.save(gq);

-			}*/

+			/*

+			 * try { if

+			 * (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY) &&

+			 * needWS()) { GqWebService webService =

+			 * gqService.getWebService(null); webService.delete(id);

+			 * gq.setTbzt(Constants.YES); gqService.save(gq); } } catch

+			 * (Exception e) { gq.setTbzt(Constants.NO); gqService.save(gq); }

+			 */

 		} catch (Exception e) {

 			wr.setSuccess(false);

 			wr.setMessage("删除失败！");

+ 5 - 26
gkjsjy/trunk/src/com/xt/jygl/gkjcxx/jghd/ctl/JghdCtl.java
파일 보기 

@@ -26,6 +26,7 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 
 import com.xt.jygl.common.BaseWebCtl;

 import com.xt.jygl.common.Constants;

 import com.xt.jygl.common.GlobalData;

+import com.xt.jygl.common.SearchCondition;

 import com.xt.jygl.common.Utils;

 import com.xt.jygl.gkjcxx.gk.entity.GkEntity;

 import com.xt.jygl.gkjcxx.gk.service.GkService;

@@ -121,29 +122,11 @@ public class JghdCtl extends BaseWebCtl {
 
 			}

 		};

 

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

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

-		if(user2!=null){

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

-				SearchCondition.hdpage=1;

-				SearchCondition.hdmc="";

-				SearchCondition.hdszdid="";

-				SearchCondition.hdszgkid="";

-			}

-			

-		}

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

 		

 		if(page.getPage()<1){

 			page.setPage(SearchCondition.hdpage);

-		}*/

-		if (page.getPage() < 1) {

-			Object hdpage = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "hdpage");

-			if (StringUtils.isEmpty(hdpage) || !org.apache.commons.lang.StringUtils.isNumeric(String.valueOf(hdpage))) {

-				hdpage = "1";

-			}

-			page.setPage(Integer.valueOf(String.valueOf(hdpage)));

 		}

+	

 		page.setSort("id");

 		page.setOrder("desc");

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

@@ -157,14 +140,10 @@ public class JghdCtl extends BaseWebCtl {
 
 				voList.add(vo);

 			}

 		}

-		/*if(isPOST(request)){

-			SearchCondition.hdpage=page.getPage();

-			SearchCondition.hdmc=hdmc;

-			SearchCondition.hdszdid=szdid;

-			SearchCondition.hdszgkid=szgkid;

-		}*/

+		

 		if (isPOST(request)) {

-			cacheSCmap.put("hdpage", page.getPage());

+			SearchCondition.hdpage=page.getPage();

+			//cacheSCmap.put("hdpage", page.getPage());

 			CacheSearchCondition.putCacheSCmap(request.getParameterMap(), cacheSCmap);

 		}

 		model.addAttribute("list", voList);

+ 26 - 30
gkjsjy/trunk/src/com/xt/jygl/gkjcxx/md/ctl/MdCtl.java
파일 보기 

@@ -77,8 +77,8 @@ public class MdCtl extends BaseWebCtl {
 
 	 */
 
 	@RequestMapping(value = "/main")
 
 	@RequiresPermissions("md:main")
 
-	public String main(SimplePageRequest page, Model model, final HttpServletRequest request, final String mdmc, final String szgkid, final String szdid, String menuid,final String xzhghid) throws JsonProcessingException {
 
-		final Map<String, Object> cacheSCmap = CacheSearchCondition.cacheSCmap(request,"md");
 
+	public String main(SimplePageRequest page, Model model, final HttpServletRequest request, final String mdmc, final String szgkid, final String szdid, String menuid, final String xzhghid) throws JsonProcessingException {
 
+		final Map<String, Object> cacheSCmap = CacheSearchCondition.cacheSCmap(request, "md");
 
 		// 查詢條件
 
 		Specification<MdEntity> spec = new Specification<MdEntity>() {
 
 
@@ -88,22 +88,22 @@ public class MdCtl extends BaseWebCtl {
 
 				if (StringUtils.isNotEmpty(mdmc)) {
 
 					list.add(cb.like(root.get("mdmc").as(String.class), "%" + mdmc + "%"));
 
 				} else if (StringUtils.isNotEmpty(SearchCondition.mdmc) && isGET(request)) {
 
-					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, null,"mdmc");
 
+					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, null, "mdmc");
 
 				}
 
 				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");
 
+					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, "id", "szgk", "szgkid");
 
 				}
 
 				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");
 
+					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, "id", "szd", "szdid");
 
 				}
 
 				if (StringUtils.isNotEmpty(xzhghid)) {
 
 					list.add(cb.like(root.get("xzhgh").get("id").as(String.class), "%" + xzhghid + "%"));
 
 				} else if (isGET(request)) {
 
-					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, "id","xzhgh","xzhghid");
 
+					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, "id", "xzhgh", "xzhghid");
 
 				}
 
 				if (isJyr()) {
 
 				} else {
 
@@ -123,13 +123,8 @@ public class MdCtl extends BaseWebCtl {
 
 		};
 
 
 		if (page.getPage() < 1) {
 
-			Object mdpage = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "mdpage");
 
-			if (StringUtils.isEmpty(mdpage) || !org.apache.commons.lang.StringUtils.isNumeric(String.valueOf(mdpage))) {
 
-				mdpage = "1";
 
-			}
 
-			page.setPage(Integer.valueOf(String.valueOf(mdpage)));
 
+			page.setPage(SearchCondition.mdpage);
 
 		}
 
-		
 		page.setSort("id");
 
 		page.setOrder("desc");
 
 		Page<MdEntity> list = query.findAll(spec, toPageRequest(page), MdEntity.class);
 
@@ -143,35 +138,36 @@ public class MdCtl extends BaseWebCtl {
 
 			vo.setSzgkzw(entity.getSzgk() == null ? "" : entity.getSzgk().getGkmc());
 
 			vo.setXzhghzw(entity.getXzhgh() != null ? entity.getXzhgh().getText() : "");
 
 			vo.setXzhgh(entity.getXzhgh() != null ? entity.getXzhgh().getId() : "");
 
-			
-			if(entity.getZyyt() != null){
 
-				if(entity.getZyyt().length()>=20){
 
-					vo.setZyytfmt(entity.getZyyt().substring(0, 20)+"...");
 
-				}else{
 
+
 
+			if (entity.getZyyt() != null) {
 
+				if (entity.getZyyt().length() >= 20) {
 
+					vo.setZyytfmt(entity.getZyyt().substring(0, 20) + "...");
 
+				} else {
 
 					vo.setZyytfmt(entity.getZyyt());
 
 				}
 
-				
+
 
 			}
 
 			voList.add(vo);
 
 		}
 
-		
+
 
 		if (isPOST(request)) {
 
-			cacheSCmap.put("mdpage", page.getPage());
 
+			SearchCondition.mdpage = page.getPage();
 
+			// cacheSCmap.put("mdpage", page.getPage());
 
 			CacheSearchCondition.putCacheSCmap(request.getParameterMap(), cacheSCmap);
 
 		}
 
 		model.addAttribute("mdmc", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "mdmc"));
 
 		model.addAttribute("szgk", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "szgkid"));
 
 		model.addAttribute("list", voList);
 
 		model.addAttribute("szd", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "szdid"));
 
-		model.addAttribute("xzhgh",CacheSearchCondition.cacheSCmapVal(cacheSCmap, "xzhghid"));
 
+		model.addAttribute("xzhgh", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "xzhghid"));
 
 		model.addAttribute("menuid", menuid);
 
-		
+
 
 		// 翻页共通
 
 		putPageInfo(model, page, list);
 
 		return "gkjcxx/md/mdmain";
 
 	}
 
 
-	//删除
 
+	// 删除
 
 	@RequestMapping(value = "/delete")
 
 	@RequiresPermissions("md:delete")
 
 	@ResponseBody
 
@@ -200,7 +196,7 @@ public class MdCtl extends BaseWebCtl {
 
 		return wr;
 
 	}
 
 
-	//保存
 
+	// 保存
 
 	@RequestMapping(value = "/save")
 
 	@ResponseBody
 
 	@RequiresPermissions("md:add")
 
@@ -257,7 +253,7 @@ public class MdCtl extends BaseWebCtl {
 
 			}
 
 
 			mdService.save(entity);
 
-			
+
 
 		} catch (Exception e) {
 
 			wr.setSuccess(false);
 
 			wr.setMessage("操作失败！");
 
@@ -276,7 +272,7 @@ public class MdCtl extends BaseWebCtl {
 
 		vo.setSzgk(md.getSzgk() != null ? md.getSzgk().getId() : "");
 
 		vo.setXzhghzw(md.getXzhgh() != null ? md.getXzhgh().getText() : "");
 
 		vo.setXzhgh(md.getXzhgh() != null ? md.getXzhgh().getId() : "");
 
-		if(StringUtils.isEmpty(vo.getZyid())){
 
+		if (StringUtils.isEmpty(vo.getZyid())) {
 
 			SimpleDateFormat dateTimeFormat = new SimpleDateFormat("yyyyMMddHHmmss");
 
 			String zyid = dateTimeFormat.format(new Date());
 
 			vo.setZyid(zyid);
 
@@ -312,12 +308,12 @@ public class MdCtl extends BaseWebCtl {
 
 	@RequestMapping(value = "/add")
 
 	@RequiresPermissions("md:add")
 
 	public String add(Model model) {
 
-		if(SecUtils.getCurrUser() != null){
 
+		if (SecUtils.getCurrUser() != null) {
 
 			List<CodeEntity> list = securityMgr.codeService().findValidCodesByGroupCodeAndCity(Constants.GROUP_CODE_SZD, GlobalData.CITY_CODE);
 
-			model.addAttribute("sz",list.size()==1?list.get(0).getId():"");
 
-			if(list.size()==1){
 
+			model.addAttribute("sz", list.size() == 1 ? list.get(0).getId() : "");
 
+			if (list.size() == 1) {
 
 				List<GkEntity> gklist = gkService.findBySzd(list.get(0).getId());
 
-				model.addAttribute("gk",gklist.size()==1?gklist.get(0).getId():"");
 
+				model.addAttribute("gk", gklist.size() == 1 ? gklist.get(0).getId() : "");
 
 			}
 
 		}
 
 		SimpleDateFormat dateTimeFormat = new SimpleDateFormat("yyyyMMddHHmmss");

+ 4 - 79
gkjsjy/trunk/src/com/xt/jygl/gkjcxx/mt/ctl/MtCtl.java
파일 보기 

@@ -12,7 +12,6 @@ import javax.persistence.criteria.CriteriaBuilder.In;
 
 import javax.persistence.criteria.CriteriaQuery;

 import javax.persistence.criteria.Predicate;

 import javax.persistence.criteria.Root;

-import javax.persistence.criteria.Subquery;

 import javax.servlet.ServletOutputStream;

 import javax.servlet.http.HttpServletRequest;

 import javax.servlet.http.HttpServletResponse;

@@ -49,7 +48,6 @@ import com.xt.jygl.gkjcxx.mt.vo.MtVo;
 
 import com.xt.jygl.gkjcxx.xzdwxxgl.xzglbmxx.service.XzglbmxxService;

 import com.xt.jygl.gkjcxx.zyq.entity.ZyqEntity;

 import com.xt.jygl.gkjcxx.zyq.service.ZyqService;

-import com.xt.jygl.gkjsgl.tzjhgl.entity.TzjhglEntity;

 import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.entity.GkjyrEntity;

 import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.service.GkjyrService;

 import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.vo.GkjyrVo;

@@ -114,9 +112,6 @@ public class MtCtl extends BaseWebCtl {
 
 						list.add(cb.like(root.get("mtmc").as(String.class), "%" + v + "%"));

 					}

 				}

-//				else if (StringUtils.isNotEmpty(SearchCondition.mtmc) && isGET(request)) {

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

-//				}

 				if (StringUtils.isNotEmpty(szgqid)) {

 					list.add(cb.like(root.get("szgq").get("id").as(String.class), "%" + szgqid + "%"));

 				}else if(isGET(request)){

@@ -125,9 +120,6 @@ public class MtCtl extends BaseWebCtl {
 
 						list.add(cb.like(root.get("szgq").get("id").as(String.class), "%" + v + "%"));

 					}

 				}

-//				else if (StringUtils.isNotEmpty(SearchCondition.mtszgqid) && isGET(request)) {

-//					list.add(cb.like(root.get("szgq").get("id").as(String.class), "%" + SearchCondition.mtszgqid + "%"));

-//				}

 

 				if (StringUtils.isNotEmpty(szgkid)) {

 					list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + szgkid + "%"));

@@ -137,9 +129,6 @@ public class MtCtl extends BaseWebCtl {
 
 						list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + v + "%"));

 					}

 				}

-//				else if (StringUtils.isNotEmpty(SearchCondition.mtszgkid) && isGET(request)) {

-//					list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + SearchCondition.mtszgkid + "%"));

-//				}

 

 				if (StringUtils.isNotEmpty(szdid)) {

 					list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + szdid + "%"));

@@ -149,9 +138,6 @@ public class MtCtl extends BaseWebCtl {
 
 						list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + v + "%"));

 					}

 				}

-//				else if (StringUtils.isNotEmpty(SearchCondition.mtszdid) && isGET(request)) {

-//					list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + SearchCondition.mtszdid + "%"));

-//				}

 				if (StringUtils.isNotEmpty(jyr)) {

 					list.add(cb.like(root.get("ssjyr").get("gkjyr").as(String.class), "%" + jyr + "%"));

 				}else if(isGET(request)){

@@ -160,9 +146,6 @@ public class MtCtl extends BaseWebCtl {
 
 						list.add(cb.like(root.get("ssjyr").get("gkjyr").as(String.class), "%" + v + "%"));

 					}

 				}

-//				else if (StringUtils.isNotEmpty(SearchCondition.mtgkjyr) && isGET(request)) {

-//					list.add(cb.like(root.get("ssjyr").as(String.class), "%" + SearchCondition.mtgkjyr + "%"));

-//				}

 				if (StringUtils.isNotEmpty(sfdwkfid)) {

 					list.add(cb.like(root.get("sfdwkf").get("id").as(String.class), "%" + sfdwkfid + "%"));

 				}else if(isGET(request)){

@@ -171,9 +154,6 @@ public class MtCtl extends BaseWebCtl {
 
 						list.add(cb.like(root.get("sfdwkf").get("id").as(String.class), "%" + v + "%"));

 					}

 				}

-//				else if (StringUtils.isNotEmpty(SearchCondition.sfdwkfid) && isGET(request)) {

-//					list.add(cb.like(root.get("sfdwkf").as(String.class), "%" + SearchCondition.sfdwkfid + "%"));

-//				}

 				if (StringUtils.isNotEmpty(sfwhpid)) {

 					list.add(cb.like(root.get("sfwhp").get("id").as(String.class), "%" + sfwhpid + "%"));

 				}else if(isGET(request)){

@@ -182,9 +162,6 @@ public class MtCtl extends BaseWebCtl {
 
 						list.add(cb.like(root.get("sfwhp").get("id").as(String.class), "%" + v + "%"));

 					}

 				}

-//				else if (StringUtils.isNotEmpty(SearchCondition.sfwhpid) && isGET(request)) {

-//					list.add(cb.like(root.get("sfwhp").get("id").as(String.class), "%" + SearchCondition.sfwhpid + "%"));

-//				}

 				if (StringUtils.isNotEmpty(fwlxid)) {

 					list.add(cb.like(root.get("fwlx").get("id").as(String.class), "%" + fwlxid + "%"));

 				}else if(isGET(request)){

@@ -193,9 +170,6 @@ public class MtCtl extends BaseWebCtl {
 
 						list.add(cb.like(root.get("fwlx").get("id").as(String.class), "%" + v + "%"));

 					}

 				}

-//				else if (StringUtils.isNotEmpty(SearchCondition.mtfwlx) && isGET(request)) {

-//					list.add(cb.like(root.get("fwlx").get("id").as(String.class), "%" + SearchCondition.mtfwlx + "%"));

-//				}

 				if (StringUtils.isNotEmpty(mtyt)) {

 					In<String> in = cb.in(root.get("mtyt").as(String.class));

 					String[] mtytStr = mtyt.split(",");

@@ -203,7 +177,6 @@ public class MtCtl extends BaseWebCtl {
 
 						in.value(tmp);

 					}

 					list.add(in);

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

 				}else if(isGET(request)){

 					Object v= CacheSearchCondition.cacheSCmapVal(cacheSCmap, "mtyt");

 					if(v!=null&&!"".equals(v)){

@@ -218,11 +191,7 @@ public class MtCtl extends BaseWebCtl {
 
 						list.add(in);

 						

 					}

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

 				}

-//				else if (StringUtils.isNotEmpty(SearchCondition.mtyt) && isGET(request)) {

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

-//				}

 				// 经营人只能查看自己企业下的数据，非经营人只能查看自己所在地的数据

 				if (isJyr()) {

 					list.add(cb.like(root.get("ssjyr").get("id").as(String.class), "%" + getSsjyr().getId() + "%"));

@@ -267,16 +236,10 @@ public class MtCtl extends BaseWebCtl {
 
 		}

 		Utils.getSession().setAttribute("user", user2);

 

-//		if (page.getPage() < 1) {

-//			page.setPage(SearchCondition.mtpage);

-//		}

 		if (page.getPage() < 1) {

-			Object mtpage = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "mtpage");

-			if (StringUtils.isEmpty(mtpage) || !org.apache.commons.lang.StringUtils.isNumeric(String.valueOf(mtpage))) {

-				mtpage = "1";

-			}

-			page.setPage(Integer.valueOf(String.valueOf(mtpage)));

+			page.setPage(SearchCondition.mtpage);

 		}

+		

 		page.setSort("id");

 		page.setOrder("desc");

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

@@ -330,50 +293,12 @@ public class MtCtl extends BaseWebCtl {
 
 				voList.add(vo);

 			}

 		}

-		/*List<CodeEntity> listSfdwkf = securityMgr.codeService().findValidCodesByGroupCode(Constants.GROUP_CODE_SF);

-		List<CodeEntity> listSfdwkf1 = new ArrayList<CodeEntity>();

-		if(listSfdwkf != null && listSfdwkf.size()>0 ){

-			for(CodeEntity cd:listSfdwkf){

-				CodeEntity c=new CodeEntity();

-				c.setId(cd.getId());

-				c.setText(cd.getText());

-				listSfdwkf1.add(c);

-			}

-		}

-		model.addAttribute("listSfdwkf", listSfdwkf1);

-		//List<CodeEntity> listSfwhp = securityMgr.codeService().findValidCodesByGroupCode(Constants.GROUP_CODE_SF);

-		model.addAttribute("listSfwhp", listSfdwkf1);*/

 		

-//		model.addAttribute("szgq", isPOST(request) ? szgqid : SearchCondition.mtszgqid);

-//		model.addAttribute("mtmc", isPOST(request) ? mtmc : SearchCondition.mtmc);

-//		model.addAttribute("list", voList);

-//		model.addAttribute("menuid", menuid);

-//		model.addAttribute("szd", isPOST(request) ? szdid : SearchCondition.mtszdid);

-//		model.addAttribute("szgk", isPOST(request) ? szgkid : SearchCondition.mtszgkid);

-//		model.addAttribute("jyr", isPOST(request) ? jyr : SearchCondition.mtgkjyr);

-//		model.addAttribute("sfwhpid", isPOST(request) ? sfwhpid : SearchCondition.sfwhpid);

-//		model.addAttribute("sfdwkfid", isPOST(request) ? sfdwkfid : SearchCondition.sfdwkfid);

-//		model.addAttribute("fwlx",isPOST(request) ? fwlxid : SearchCondition.mtfwlx);

-//		model.addAttribute("mtyt",isPOST(request) ? mtyt : SearchCondition.mtyt);

-//

-//		if (isPOST(request)) {

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

-//			SearchCondition.mtszdid = szdid;

-//			SearchCondition.mtszgkid = szgkid;

-//			SearchCondition.mtszgqid = szgqid;

-//			SearchCondition.mtgkjyr = jyr;

-//			SearchCondition.mtmc = mtmc;

-//			SearchCondition.sfwhpid = sfwhpid;

-//			SearchCondition.sfdwkfid = sfdwkfid;

-//			SearchCondition.mtfwlx = fwlxid;

-//			SearchCondition.mtyt = mtyt;

-//		}

 		if (isPOST(request)) {

-			cacheSCmap.put("mtpage", page.getPage());

+			SearchCondition.mtpage=page.getPage();

+			//cacheSCmap.put("mtpage", page.getPage());

 			CacheSearchCondition.putCacheSCmap(request.getParameterMap(), cacheSCmap);

-			System.out.println(JSONObject.fromObject(cacheSCmap));

 		}

-		System.out.println(isPOST(request));

 

 		model.addAttribute("list", voList);

 		model.addAttribute("mtmc", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "mtmc"));

+ 34 - 30
gkjsjy/trunk/src/com/xt/jygl/gkjcxx/zyq/ctl/ZyqCtl.java
파일 보기 

@@ -28,6 +28,7 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 
 import com.xt.jygl.common.BaseWebCtl;

 import com.xt.jygl.common.Constants;

 import com.xt.jygl.common.GlobalData;

+import com.xt.jygl.common.SearchCondition;

 import com.xt.jygl.common.Utils;

 import com.xt.jygl.gkjcxx.gk.entity.GkEntity;

 import com.xt.jygl.gkjcxx.gk.service.GkService;

@@ -72,13 +73,19 @@ public class ZyqCtl extends BaseWebCtl {
 
 

 	/**

 	 * 一览页面

-	 * @param page 分页

+	 * 

+	 * @param page

+	 *            分页

 	 * @param model

 	 * @param request

-	 * @param zyqmc 作业区名称

-	 * @param szgkid 所在港口ID

-	 * @param szgqid 所在港区ID

-	 * @param szdid 所在地ID

+	 * @param zyqmc

+	 *            作业区名称

+	 * @param szgkid

+	 *            所在港口ID

+	 * @param szgqid

+	 *            所在港区ID

+	 * @param szdid

+	 *            所在地ID

 	 * @param menuid

 	 * @return

 	 * @throws JsonProcessingException

@@ -86,7 +93,7 @@ public class ZyqCtl extends BaseWebCtl {
 
 	@RequestMapping(value = "/main")

 	@RequiresPermissions("zyqgl:main")

 	public String main(SimplePageRequest page, Model model, final HttpServletRequest request, final String zyqmc, final String szgkid, final String szgqid, final String szdid, String menuid) throws JsonProcessingException {

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

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

 		// 查詢條件

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

 			@Override

@@ -95,22 +102,22 @@ public class ZyqCtl extends BaseWebCtl {
 
 				if (StringUtils.isNotEmpty(zyqmc)) {

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

 				} else if (isGET(request)) {

-					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, null,"zyqmc");

+					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, null, "zyqmc");

 				}

 				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");

+					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");

+					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, "id", "szgq", "szgqid");

 				}

 				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");

+					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, "id", "szd", "szdid");

 				}

 				if (isJyr()) {

 				} else {

@@ -130,13 +137,9 @@ public class ZyqCtl extends BaseWebCtl {
 
 		};

 

 		if (page.getPage() < 1) {

-			Object zyqpage = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "zyqpage");

-			if (StringUtils.isEmpty(zyqpage) || !org.apache.commons.lang.StringUtils.isNumeric(String.valueOf(zyqpage))) {

-				zyqpage = "1";

-			}

-			page.setPage(Integer.valueOf(String.valueOf(zyqpage)));

+			page.setPage(SearchCondition.zyqpage);

 		}

-		

+

 		page.setSort("id");

 		page.setOrder("desc");

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

@@ -153,14 +156,15 @@ public class ZyqCtl extends BaseWebCtl {
 
 			voList.add(vo);

 		}

 		if (isPOST(request)) {

-			cacheSCmap.put("zyqpage", page.getPage());

+			SearchCondition.zyqpage = page.getPage();

+			// cacheSCmap.put("zyqpage", page.getPage());

 			CacheSearchCondition.putCacheSCmap(request.getParameterMap(), cacheSCmap);

 		}

-		

-		model.addAttribute("szd",  CacheSearchCondition.cacheSCmapVal(cacheSCmap, "szdid"));

-		model.addAttribute("zyqmc",  CacheSearchCondition.cacheSCmapVal(cacheSCmap, "zyqmc"));

-		model.addAttribute("szgq",  CacheSearchCondition.cacheSCmapVal(cacheSCmap, "szgqid"));

-		model.addAttribute("szgk",  CacheSearchCondition.cacheSCmapVal(cacheSCmap, "szgkid"));

+

+		model.addAttribute("szd", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "szdid"));

+		model.addAttribute("zyqmc", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "zyqmc"));

+		model.addAttribute("szgq", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "szgqid"));

+		model.addAttribute("szgk", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "szgkid"));

 		model.addAttribute("menuid", menuid);

 		model.addAttribute("list", voList);

 		// 翻页共通

@@ -172,12 +176,12 @@ public class ZyqCtl extends BaseWebCtl {
 
 	@RequestMapping(value = "/add")

 	@RequiresPermissions("zyqgl:add")

 	public String add(Model model) {

-		if(SecUtils.getCurrUser() != null){

+		if (SecUtils.getCurrUser() != null) {

 			List<CodeEntity> list = securityMgr.codeService().findValidCodesByGroupCodeAndCity(Constants.GROUP_CODE_SZD, GlobalData.CITY_CODE);

-			model.addAttribute("sz",list.size()==1?list.get(0).getId():"");

-			if(list.size()==1){

+			model.addAttribute("sz", list.size() == 1 ? list.get(0).getId() : "");

+			if (list.size() == 1) {

 				List<GkEntity> gklist = gkService.findBySzd(list.get(0).getId());

-				model.addAttribute("gk",gklist.size()==1?gklist.get(0).getId():"");

+				model.addAttribute("gk", gklist.size() == 1 ? gklist.get(0).getId() : "");

 			}

 		}

 		SimpleDateFormat dateTimeFormat = new SimpleDateFormat("yyyyMMddHHmmss");

@@ -186,7 +190,7 @@ public class ZyqCtl extends BaseWebCtl {
 
 		return "gkjcxx/zyq/zyqadd";

 	}

 

-	//保存数据

+	// 保存数据

 	@RequestMapping(value = "/save")

 	@ResponseBody

 	@RequiresPermissions("zyqgl:add")

@@ -227,7 +231,7 @@ public class ZyqCtl extends BaseWebCtl {
 
 			zyq.setBz(code.getBz());

 			zyq.setZyid(code.getZyid());

 			zyqService.save(zyq);

-		

+

 		} catch (Exception e) {

 			wr.setSuccess(false);

 			wr.setMessage("操作失败！");

@@ -244,7 +248,7 @@ public class ZyqCtl extends BaseWebCtl {
 
 		try {

 			zyqService.logicDelete(id);

 			// 如果是市级删除，省级也删除

-			ZyqEntity  zyq=zyqService.findOne(id);

+			ZyqEntity zyq = zyqService.findOne(id);

 			try {

 				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY) && needWS()) {

 					ZyqWebService webService = zyqService.getWebService(null);

@@ -273,7 +277,7 @@ public class ZyqCtl extends BaseWebCtl {
 
 		vo.setSzd(zyq.getSzd() != null ? zyq.getSzd().getId() : "");

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

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

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

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

 			SimpleDateFormat dateTimeFormat = new SimpleDateFormat("yyyyMMddHHmmss");

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

 			vo.setZyid(zyid);

+ 4 - 8
gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jgsq/ctl/JgsqCtl.java
파일 보기 

@@ -32,6 +32,7 @@ import com.xt.jygl.accessory.service.AccessoryService;
 
 import com.xt.jygl.common.BaseWebCtl;

 import com.xt.jygl.common.Constants;

 import com.xt.jygl.common.GlobalData;

+import com.xt.jygl.common.SearchCondition;

 import com.xt.jygl.ftp.Ftp;

 import com.xt.jygl.ftp.FtpUtil;

 import com.xt.jygl.gkjcxx.gk.entity.GkEntity;

@@ -189,11 +190,8 @@ public class JgsqCtl extends BaseWebCtl {
 
 		};

 

 		if (page.getPage() < 1) {

-			Object xmxxpage = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "xmxxpage");

-			if (StringUtils.isEmpty(xmxxpage) || !org.apache.commons.lang.StringUtils.isNumeric(String.valueOf(xmxxpage))) {

-				xmxxpage = "1";

-			}

-			page.setPage(Integer.valueOf(String.valueOf(xmxxpage)));

+			

+			page.setPage(SearchCondition.jgsqpage);

 		}

 

 		page.setSort("id");

@@ -266,9 +264,7 @@ public class JgsqCtl extends BaseWebCtl {
 
 		}

 

 		if (isPOST(request)) {

-			cacheSCmap.put("xmxxpage", page.getPage());

-			CacheSearchCondition.putCacheSCmap(request.getParameterMap(), cacheSCmap);

-			// System.out.println(JSONObject.fromObject(cacheSCmap));

+			SearchCondition.jgsqpage = page.getPage();

 		}

 

 		model.addAttribute("list", voList);

+ 4 - 8
gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jgsq/ctl/JgsqdsCtl.java
파일 보기 

@@ -35,6 +35,7 @@ import com.xt.jygl.accessory.service.AccessoryService;
 
 import com.xt.jygl.common.BaseWebCtl;

 import com.xt.jygl.common.Constants;

 import com.xt.jygl.common.GlobalData;

+import com.xt.jygl.common.SearchCondition;

 import com.xt.jygl.ftp.Ftp;

 import com.xt.jygl.ftp.FtpUtil;

 import com.xt.jygl.gkjcxx.gk.entity.GkEntity;

@@ -197,11 +198,8 @@ public class JgsqdsCtl extends BaseWebCtl {
 
 		};

 

 		if (page.getPage() < 1) {

-			Object xmxxpage = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "xmxxpage");

-			if (StringUtils.isEmpty(xmxxpage) || !org.apache.commons.lang.StringUtils.isNumeric(String.valueOf(xmxxpage))) {

-				xmxxpage = "1";

-			}

-			page.setPage(Integer.valueOf(String.valueOf(xmxxpage)));

+			

+			page.setPage(SearchCondition.jgsqdspage);

 		}

 

 		page.setSort("id");

@@ -276,9 +274,7 @@ public class JgsqdsCtl extends BaseWebCtl {
 
 		}

 

 		if (isPOST(request)) {

-			cacheSCmap.put("xmxxpage", page.getPage());

-			CacheSearchCondition.putCacheSCmap(request.getParameterMap(), cacheSCmap);

-			// System.out.println(JSONObject.fromObject(cacheSCmap));

+			SearchCondition.jgsqdspage = page.getPage();

 		}

 

 		model.addAttribute("list", voList);

+ 39 - 31
gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdbg/ctl/JsjdbgCtl.java
파일 보기 

@@ -32,6 +32,7 @@ import com.xt.jygl.accessory.service.AccessoryService;
 
 import com.xt.jygl.common.BaseWebCtl;

 import com.xt.jygl.common.Constants;

 import com.xt.jygl.common.GlobalData;

+import com.xt.jygl.common.SearchCondition;

 import com.xt.jygl.ftp.Ftp;

 import com.xt.jygl.ftp.FtpUtil;

 import com.xt.jygl.gkjcxx.gk.entity.GkEntity;

@@ -97,16 +98,22 @@ public class JsjdbgCtl extends BaseWebCtl {
 
 

 	/**

 	 * 一览

-	 * @param page 分页

+	 * 

+	 * @param page

+	 *            分页

 	 * @param model

 	 * @param request

-	 * @param xmmc 项目名称

-	 * @param szgkid 所在港口ID

-	 * @param szgqid 所在港区ID

+	 * @param xmmc

+	 *            项目名称

+	 * @param szgkid

+	 *            所在港口ID

+	 * @param szgqid

+	 *            所在港区ID

 	 * @param menuid

-	 * @param xmhzjbid 

+	 * @param xmhzjbid

 	 * @param xmfr

-	 * @param szdid 所在地ID

+	 * @param szdid

+	 *            所在地ID

 	 * @param sfyzjbzid

 	 * @return

 	 * @throws JsonProcessingException

@@ -191,11 +198,7 @@ public class JsjdbgCtl extends BaseWebCtl {
 
 		};

 

 		if (page.getPage() < 1) {

-			Object xmxxpage = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "xmxxpage");

-			if (StringUtils.isEmpty(xmxxpage) || !org.apache.commons.lang.StringUtils.isNumeric(String.valueOf(xmxxpage))) {

-				xmxxpage = "1";

-			}

-			page.setPage(Integer.valueOf(String.valueOf(xmxxpage)));

+			page.setPage(SearchCondition.jsjdbgpage);

 		}

 

 		page.setSort("id");

@@ -263,9 +266,7 @@ public class JsjdbgCtl extends BaseWebCtl {
 
 		}

 

 		if (isPOST(request)) {

-			cacheSCmap.put("xmxxpage", page.getPage());

-			CacheSearchCondition.putCacheSCmap(request.getParameterMap(), cacheSCmap);

-			// System.out.println(JSONObject.fromObject(cacheSCmap));

+			SearchCondition.jsjdbgpage = page.getPage();

 		}

 

 		model.addAttribute("list", voList);

@@ -283,7 +284,7 @@ public class JsjdbgCtl extends BaseWebCtl {
 
 		return "gkjsgl/jsjdbg/jsjdbgmain";

 	}

 

-	//删除

+	// 删除

 	@RequestMapping(value = "/delete")

 	@ResponseBody

 	@RequiresPermissions("jsjdbg:delete")

@@ -306,7 +307,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) {

@@ -439,7 +440,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) {

@@ -535,7 +536,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) {

@@ -707,7 +708,7 @@ public class JsjdbgCtl extends BaseWebCtl {
 
 		return wr;

 	}

 

-	//编辑

+	// 编辑

 	@RequestMapping(value = "/edit")

 	@RequiresPermissions("jsjdbg:edit")

 	public String edit(Model model, String id, String flag) {

@@ -843,7 +844,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>();

@@ -913,7 +914,7 @@ public class JsjdbgCtl extends BaseWebCtl {
 
 		}

 	}

 

-	//查看

+	// 查看

 	@RequestMapping(value = "/view")

 	public String view(Model model, String id, String flag, String opflag) {

 		model.addAttribute("flag", flag);

@@ -1158,7 +1159,7 @@ public class JsjdbgCtl extends BaseWebCtl {
 
 		return "gkjsgl/jsjdbg/jsjdbgview";

 	}

 

-	//新增

+	// 新增

 	@RequestMapping(value = "/add")

 	@RequiresPermissions("jsjdbg:add")

 	public String add(Model model) {

@@ -1214,12 +1215,19 @@ public class JsjdbgCtl extends BaseWebCtl {
 
 

 	/**

 	 * 审核流程

-	 * @param shyj 审核意见

-	 * @param id 主键ID

-	 * @param flag 同意true 不同意 false

-	 * @param fjzdids 其他附件ID

-	 * @param accids 附件ID

-	 * @param userids 用户ID

+	 * 

+	 * @param shyj

+	 *            审核意见

+	 * @param id

+	 *            主键ID

+	 * @param flag

+	 *            同意true 不同意 false

+	 * @param fjzdids

+	 *            其他附件ID

+	 * @param accids

+	 *            附件ID

+	 * @param userids

+	 *            用户ID

 	 * @return

 	 */

 	@RequestMapping(value = "/audit")

@@ -1361,7 +1369,7 @@ public class JsjdbgCtl extends BaseWebCtl {
 
 		return wr;

 	}

 

-	//保存附件

+	// 保存附件

 	@RequestMapping(value = "/savefj")

 	@ResponseBody

 	public WebJsonResult savefj(Model model, JsjdbgfjEntity fjzd) {

@@ -1380,7 +1388,7 @@ public class JsjdbgCtl extends BaseWebCtl {
 
 		return wr;

 	}

 

-	//删除附件

+	// 删除附件

 	@RequestMapping(value = "/delFile")

 	@ResponseBody

 	public WebJsonResult delFile(String id, Model model) {

@@ -1393,7 +1401,7 @@ public class JsjdbgCtl extends BaseWebCtl {
 
 		return wr;

 	}

 

-	//删除附件信息

+	// 删除附件信息

 	@RequestMapping(value = "/delFjzd")

 	@ResponseBody

 	public WebJsonResult delFjzd(String id, Model model) {

+ 4 - 8
gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdbg/ctl/JsjdbgdsCtl.java
파일 보기 

@@ -35,6 +35,7 @@ import com.xt.jygl.accessory.service.AccessoryService;
 
 import com.xt.jygl.common.BaseWebCtl;

 import com.xt.jygl.common.Constants;

 import com.xt.jygl.common.GlobalData;

+import com.xt.jygl.common.SearchCondition;

 import com.xt.jygl.ftp.Ftp;

 import com.xt.jygl.ftp.FtpUtil;

 import com.xt.jygl.gkjcxx.gk.entity.GkEntity;

@@ -196,11 +197,8 @@ public class JsjdbgdsCtl extends BaseWebCtl {
 
 		};

 

 		if (page.getPage() < 1) {

-			Object xmxxpage = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "xmxxpage");

-			if (StringUtils.isEmpty(xmxxpage) || !org.apache.commons.lang.StringUtils.isNumeric(String.valueOf(xmxxpage))) {

-				xmxxpage = "1";

-			}

-			page.setPage(Integer.valueOf(String.valueOf(xmxxpage)));

+			

+			page.setPage(SearchCondition.jsjdbgdspage);

 		}

 

 		page.setSort("id");

@@ -268,9 +266,7 @@ public class JsjdbgdsCtl extends BaseWebCtl {
 
 		}

 

 		if (isPOST(request)) {

-			cacheSCmap.put("xmxxpage", page.getPage());

-			CacheSearchCondition.putCacheSCmap(request.getParameterMap(), cacheSCmap);

-			// System.out.println(JSONObject.fromObject(cacheSCmap));

+			SearchCondition.jsjdbgdspage = page.getPage();

 		}

 

 		model.addAttribute("list", voList);

+ 3 - 10
gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdcbsj/ctl/JsjdcbsjCtl.java
파일 보기 

@@ -32,6 +32,7 @@ import com.xt.jygl.accessory.service.AccessoryService;
 
 import com.xt.jygl.common.BaseWebCtl;

 import com.xt.jygl.common.Constants;

 import com.xt.jygl.common.GlobalData;

+import com.xt.jygl.common.SearchCondition;

 import com.xt.jygl.ftp.Ftp;

 import com.xt.jygl.ftp.FtpUtil;

 import com.xt.jygl.gkjcxx.gk.entity.GkEntity;

@@ -187,15 +188,9 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 
 				return cb.and(list.toArray(new Predicate[] {}));

 			}

 		};

-

 		if (page.getPage() < 1) {

-			Object xmxxpage = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "xmxxpage");

-			if (StringUtils.isEmpty(xmxxpage) || !org.apache.commons.lang.StringUtils.isNumeric(String.valueOf(xmxxpage))) {

-				xmxxpage = "1";

-			}

-			page.setPage(Integer.valueOf(String.valueOf(xmxxpage)));

+			page.setPage(SearchCondition.jsjdcbsjpage);

 		}

-

 		page.setSort("id");

 		page.setOrder("desc");

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

@@ -268,9 +263,7 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 
 		}

 

 		if (isPOST(request)) {

-			cacheSCmap.put("xmxxpage", page.getPage());

-			CacheSearchCondition.putCacheSCmap(request.getParameterMap(), cacheSCmap);

-			// System.out.println(JSONObject.fromObject(cacheSCmap));

+			SearchCondition.jsjdcbsjpage = page.getPage();

 		}

 

 		model.addAttribute("list", voList);

+ 3 - 8
gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdcbsj/ctl/JsjdcbsjdsCtl.java
파일 보기 

@@ -35,6 +35,7 @@ import com.xt.jygl.accessory.service.AccessoryService;
 
 import com.xt.jygl.common.BaseWebCtl;

 import com.xt.jygl.common.Constants;

 import com.xt.jygl.common.GlobalData;

+import com.xt.jygl.common.SearchCondition;

 import com.xt.jygl.ftp.Ftp;

 import com.xt.jygl.ftp.FtpUtil;

 import com.xt.jygl.gkjcxx.gk.entity.GkEntity;

@@ -203,11 +204,7 @@ public class JsjdcbsjdsCtl extends BaseWebCtl {
 
 		};

 

 		if (page.getPage() < 1) {

-			Object xmxxpage = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "xmxxpage");

-			if (StringUtils.isEmpty(xmxxpage) || !org.apache.commons.lang.StringUtils.isNumeric(String.valueOf(xmxxpage))) {

-				xmxxpage = "1";

-			}

-			page.setPage(Integer.valueOf(String.valueOf(xmxxpage)));

+			page.setPage(SearchCondition.jsjdcbsjdspage);

 		}

 

 		page.setSort("id");

@@ -284,9 +281,7 @@ public class JsjdcbsjdsCtl extends BaseWebCtl {
 
 		}

 

 		if (isPOST(request)) {

-			cacheSCmap.put("xmxxpage", page.getPage());

-			CacheSearchCondition.putCacheSCmap(request.getParameterMap(), cacheSCmap);

-			// System.out.println(JSONObject.fromObject(cacheSCmap));

+			SearchCondition.jsjdcbsjdspage = page.getPage();

 		}

 

 		model.addAttribute("list", voList);

+ 309 - 10
gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdgl/ctl/JsjdglCtl.java
파일 보기 

@@ -1,6 +1,5 @@
 
 package com.xt.jygl.gkjsgl.jsjdgl.ctl;

 

-import java.io.File;

 import java.io.UnsupportedEncodingException;

 import java.math.BigDecimal;

 import java.net.URLDecoder;

@@ -39,10 +38,8 @@ import com.xt.jygl.accessory.entity.AccessoryEntity;
 
 import com.xt.jygl.accessory.service.AccessoryService;

 import com.xt.jygl.common.BaseWebCtl;

 import com.xt.jygl.common.Constants;

-import com.xt.jygl.common.GlobalData;

+import com.xt.jygl.common.SearchCondition;

 import com.xt.jygl.common.Utils;

-import com.xt.jygl.ftp.Ftp;

-import com.xt.jygl.ftp.FtpUtil;

 import com.xt.jygl.gkjcxx.gk.entity.GkEntity;

 import com.xt.jygl.gkjcxx.gq.entity.GqEntity;

 import com.xt.jygl.gkjsgl.jsjdgl.entity.JsjdfjEntity;

@@ -244,11 +241,7 @@ public class JsjdglCtl extends BaseWebCtl {
 
 		};

 

 		if (page.getPage() < 1) {

-			Object jsjdpage = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "jsjdpage");

-			if (StringUtils.isEmpty(jsjdpage) || !org.apache.commons.lang.StringUtils.isNumeric(String.valueOf(jsjdpage))) {

-				jsjdpage = "1";

-			}

-			page.setPage(Integer.valueOf(String.valueOf(jsjdpage)));

+			page.setPage(SearchCondition.jsjdpage);

 		}

 		page.setSort("id");

 		page.setOrder("desc");

@@ -316,7 +309,8 @@ public class JsjdglCtl extends BaseWebCtl {
 
 			}

 		}

 		if (isPOST(request)) {

-			cacheSCmap.put("jsjdpage", page.getPage());

+			SearchCondition.jsjdpage = page.getPage();

+			//cacheSCmap.put("jsjdpage", page.getPage());

 			CacheSearchCondition.putCacheSCmap(request.getParameterMap(), cacheSCmap);

 			// System.out.println(JSONObject.fromObject(cacheSCmap));

 		}

@@ -737,6 +731,122 @@ public class JsjdglCtl extends BaseWebCtl {
 
 		return "gkjsgl/jsjdgl/jsjdgledit";

 	}

 

+	

+	// 编辑数据

+		@RequestMapping(value = "/edittest")

+		@RequiresPermissions("jsjdgl:edit")

+		public String edittest(Model model, String id, String flag, String fhbz, String path, String type) {

+			// 附件

+			List<AccessoryEntity> accessoryList = accessoryService.queryBySsidAndSstype(id, "jsjd");

+			for (int i = 0; i < accessoryList.size(); i++) {

+				if (StringUtils.isNotEmpty(accessoryList.get(i).getRemark())) {

+					AccessoryEntity acc = accessoryList.get(i);

+					String s = accessoryList.get(i).getRemark().substring(0, 2);

+					String accid = accessoryList.get(i).getId();

+					JsjdfjVo fjnamevo = new JsjdfjVo();

+					fjnamevo.setXhbz(accessoryList.get(i).getRemark().substring(2, accessoryList.get(i).getRemark().length()));

+					fjnamevo.setFjid(accid);

+					fjnamevo.setFjmc(accessoryList.get(i).getName());

+					model.addAttribute("fjList" + s, fjnamevo);

+					model.addAttribute("xiazaibz", s);

+				}

+			}

+			// 工作流参数

+			model.addAttribute("flag", flag);

+			model.addAttribute("fhbz", fhbz);

+			model.addAttribute("path", path);

+			model.addAttribute("type", type);

+			XmxxglEntity entity = xmxxglService.findOne(id);

+			XmxxglfbVo vo = new XmxxglfbVo();

+			BeanUtils.copyProperties(entity, vo);

+			vo.setTzlxzw(entity.getTzlx() != null ? entity.getTzlx().getText() : "");

+			vo.setXmlxzw(entity.getXmlx() != null ? entity.getXmlx().getText() : "");

+			vo.setXmhzjbzw(entity.getXmhzjb() != null ? entity.getXmhzjb().getText() : "");

+			vo.setAxspjbzw(entity.getAxspjb() != null ? entity.getAxspjb().getText() : "");

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

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

+

+			vo.setTzlx(entity.getTzlx() != null ? entity.getTzlx().getId() : "");

+			vo.setXmlx(entity.getXmlx() != null ? entity.getXmlx().getId() : "");

+			vo.setXmhzjb(entity.getXmhzjb() != null ? entity.getXmhzjb().getId() : "");

+			vo.setAxspjb(entity.getAxspjb() != null ? entity.getAxspjb().getId() : "");

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

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

+			vo.setZyhbwfl(entity.getZyhbwfl() != null ? entity.getZyhbwfl().getId() : "");

+			vo.setSylx(entity.getSylx() != null ? entity.getSylx().getId() : "");

+			vo.setSylxzw(entity.getSylx() != null ? entity.getSylx().getText() : "");

+			if (StringUtils.isNotEmpty(entity.getXmbm())) {

+				String codeid = entity.getXmbm().substring(4, 10);

+				CodeEntity code = securityMgr.codeService().findOne(codeid);

+				model.addAttribute("xzqhname", code.getText());

+			}

+			String bwids = "";

+			List<XmbwglbEntity> bwlist = xmbwglbService.findByXmid(entity.getId());

+			if (bwlist != null && bwlist.size() > 0) {

+				model.addAttribute("bwgs", bwlist.size());

+				for (XmbwglbEntity xmbw : bwlist) {

+					bwids = bwids + xmbw.getBwid() + ",";

+				}

+				bwids = bwids.substring(0, bwids.length() - 1);

+				getbwlist(model, bwids);

+			}

+			vo.setBwids(bwids);

+			model.addAttribute("record", vo);

+			model.addAttribute("jyr", entity.getJyrid());

+

+			// 附件字段

+			List<JsjdfjEntity> fjlist = jsjdfjService.findByEntity(entity, "jsjd");

+			SimpleDateFormat dateFormater = new SimpleDateFormat("yyyy-MM-dd");

+

+			for (int i = 0; i < fjlist.size(); i++) {

+				// 从发布单位中获取标识位

+				if (StringUtils.isNotEmpty(fjlist.get(i).getFjbz())) {

+					String s = fjlist.get(i).getFjbz().substring(0, 2);

+					Date date = fjlist.get(i).getFbsj();

+					if (date != null) {

+						dateFormater.format(date);

+					}

+

+					JsjdfjVo fjvo = new JsjdfjVo();

+					fjvo.setFjbz(fjlist.get(i).getFjbz().substring(2, fjlist.get(i).getFjbz().length()));

+					if (date != null) {

+						String date2 = dateFormater.format(date);

+						fjvo.setFbsj(date2);

+					}

+					fjvo.setFbdw(fjlist.get(i).getFbdw());

+					fjvo.setWjh(fjlist.get(i).getWjh());

+					fjvo.setId(fjlist.get(i).getId());

+					model.addAttribute("recordfj" + s, fjvo);

+				}

+			}

+			// 其他附件和字段

+			List<JsjdfjEntity> qtfjzdlist = jsjdfjService.findByEntity(entity, "jsjdqtfj");

+			qtfjview(model, qtfjzdlist);

+			if (entity.getXmlx().getId().equals("2202")) {

+				List<TaskInfoEntity> list = taskInfoService.findByBusIdAndBusKeyAndRecordStatus(id, XmxxglEntity.PROCESS_DEFINITION_KEY2);

+				Tasklist(model, list, id);

+			} else {

+				List<TaskInfoEntity> list = taskInfoService.findByBusIdAndBusKeyAndRecordStatus(id, XmxxglEntity.PROCESS_DEFINITION_KEY);

+				Tasklist(model, list, id);

+			}

+

+			String sfjyr = "";

+			if (securityMgr.getCurrUser().getSfjyr().getText().equals("是")) {

+				sfjyr = "1";

+				model.addAttribute("sfjyr", sfjyr);

+			} else {

+

+				if ("admin".equals(securityMgr.getCurrUser().getUname())) {

+					model.addAttribute("sfjyr", "2");

+				} else {

+					model.addAttribute("sfjyr", "");

+				}

+			}

+			model.addAttribute("opflag", 10);

+			model.addAttribute("spflag", 10);

+			return "gkjsgl/jsjdgl/jsjdgledittest";

+		}

+	

 	// 流程历史

 	public void Tasklist(Model model, List<TaskInfoEntity> list, String id) {

 		if (list != null & list.size() > 0) {

@@ -1688,6 +1798,195 @@ public class JsjdglCtl extends BaseWebCtl {
 
 		return wr;

 	}

 

+	@RequestMapping(value = "/saveAll")

+	@ResponseBody

+	public WebJsonResult saveAll(XmxxglEntity code, String sfjyr, 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 zyhbwflid) {

+		try {

+			shyj = URLDecoder.decode(shyj, "UTF-8");

+		} catch (UnsupportedEncodingException e1) {

+			e1.printStackTrace();

+		}

+		WebJsonResult wr = success();

+		// 如果是经营人，需要做附件上传check

+		if ("1".equals(sfjyr)) {

+			if ("1".equals(opflag)) {

+				if (StringUtils.isEmpty(delid11)) {

+					wr.setSuccess(false);

+					wr.setMessage("请上传岸线使用批复文件复印件!");

+					return wr;

+				}

+			}

+			if ("2".equals(opflag)) {

+				if (StringUtils.isEmpty(delid21)) {

+					wr.setSuccess(false);

+					wr.setMessage("请上传项目批准或者核准、备案文件的复印件!");

+					return wr;

+				}

+			}

+			if ("3".equals(opflag)) {

+				if (StringUtils.isEmpty(delid31)) {

+					wr.setSuccess(false);

+					wr.setMessage("请上传初步设计文件!");

+					return wr;

+				}

+				if (StringUtils.isEmpty(delid32)) {

+					wr.setSuccess(false);

+					wr.setMessage("初步设计批复文件!");

+					return wr;

+				}

+				/*

+				 * if (StringUtils.isEmpty(delid33)) { wr.setSuccess(false);

+				 * wr.setMessage("请上传港口建设项目批准或者核准、备案文件!"); return wr; }

+				 */

+			}

+			if ("4".equals(opflag)) {

+				if (StringUtils.isEmpty(delid41)) {

+					wr.setSuccess(false);

+					wr.setMessage("请上传施工图设计文件!");

+					return wr;

+				}

+				if (StringUtils.isEmpty(delid42)) {

+					wr.setSuccess(false);

+					wr.setMessage("请上传施工图设计批复文件!");

+					return wr;

+				}

+			}

+			if ("5".equals(opflag)) {

+				if (StringUtils.isEmpty(delid52)) {

+					wr.setSuccess(false);

+					wr.setMessage("请上传与施工单位和监理单位签订的合同复印件!");

+					return wr;

+				}

+				if (StringUtils.isEmpty(delid53)) {

+					wr.setSuccess(false);

+					wr.setMessage("请上传质量监督手续材料复印件!");

+					return wr;

+				}

+				if (StringUtils.isEmpty(delid54)) {

+					wr.setSuccess(false);

+					wr.setMessage("请上传建设资金落实证明复印件!");

+					return wr;

+				}

+				if (StringUtils.isEmpty(delid56)) {

+					wr.setSuccess(false);

+					wr.setMessage("请上传《开工备案表》!");

+					return wr;

+				}

+			}

+			if ("6".equals(opflag)) {

+				if (StringUtils.isEmpty(delid61)) {

+					wr.setSuccess(false);

+					wr.setMessage("请上传质监机构关于工程质量鉴定意见书!");

+					return wr;

+				}

+				if (StringUtils.isEmpty(delid62)) {

+					wr.setSuccess(false);

+					wr.setMessage("请上传交工验收证书!");

+					return wr;

+				}

+			}

+			if ("7".equals(opflag)) {

+				if (StringUtils.isEmpty(delid71)) {

+					wr.setSuccess(false);

+					wr.setMessage("请上传环境保护、劳动安全卫生、消防主管部门关于试运行的准许意见!");

+					return wr;

+				}

+				if (StringUtils.isEmpty(delid72)) {

+					wr.setSuccess(false);

+					wr.setMessage("请上传试运行备案表!");

+					return wr;

+				}

+			}

+			if ("8".equals(opflag)) {

+				if (StringUtils.isEmpty(delid81)) {

+					wr.setSuccess(false);

+					wr.setMessage("请上传竣工资料汇编!");

+					return wr;

+				}

+				if (StringUtils.isEmpty(delid82)) {

+					wr.setSuccess(false);

+					wr.setMessage("请上传竣工验收证书(多个，新码头，老码头改造)!");

+					return wr;

+				}

+			}

+		}

+		XmxxglEntity xmxxgl = null;

+		try {

+			// 修改

+			xmxxgl = xmxxglService.findOne(code.getId());

+			xmxxgl.setXmmc(code.getXmmc());

+			xmxxgl.setXmfr(code.getXmfr());

+			xmxxgl.setJsdd(code.getJsdd());

+			xmxxgl.setJsgm(code.getJsgm());

+			xmxxgl.setZtz(code.getZtz());

+			xmxxgl.setBwhz(code.getBwhz());

+			xmxxgl.setTgnl(code.getTgnl());

+			xmxxgl.setSddx(code.getSddx());

+			xmxxgl.setSddy(code.getSddy());

+			xmxxgl.setXddx(code.getXddx());

+			xmxxgl.setXddy(code.getXddy());

+			xmxxgl.setAxcd(code.getAxcd());

+			xmxxgl.setBwdj(code.getBwdj());

+

+			if (!StringUtils.isEmpty(szgkid)) {

+				GkEntity szgk = new GkEntity();

+				szgk.setId(szgkid);

+				xmxxgl.setSzgk(szgk);

+			}

+			if (!StringUtils.isEmpty(szgqid)) {

+				GqEntity szgq = new GqEntity();

+				szgq.setId(szgqid);

+				xmxxgl.setSzgq(szgq);

+			}

+			if (!StringUtils.isEmpty(zyhbwflid)) {

+				CodeEntity zyhbwfl = new CodeEntity(zyhbwflid);

+				xmxxgl.setZyhbwfl(zyhbwfl);

+			}

+			if (!StringUtils.isEmpty(xmlxid)) {

+				CodeEntity xmlxdx = new CodeEntity();

+				xmlxdx.setId(xmlxid);

+				xmxxgl.setXmlx(xmlxdx);

+			}

+			if (!StringUtils.isEmpty(tzlxid)) {

+				CodeEntity tzlxdx = new CodeEntity();

+				tzlxdx.setId(tzlxid);

+				xmxxgl.setTzlx(tzlxdx);

+			}

+			if (!StringUtils.isEmpty(xmhzjbid)) {

+				CodeEntity xmhzjbdx = new CodeEntity();

+				xmhzjbdx.setId(xmhzjbid);

+				xmxxgl.setXmhzjb(xmhzjbdx);

+			}

+			if (!StringUtils.isEmpty(axspjbid)) {

+				CodeEntity axspjbdx = new CodeEntity();

+				axspjbdx.setId(axspjbid);

+				xmxxgl.setAxspjb(axspjbdx);

+

+			}

+			// 附件保存

+			fjzdgt(fjzdids, code);

+			fjgt(accids, code);

+			// 其他附件

+			qtfjgt(qtfjids, code);

+			qtfjzdgt(qtfjzdids, code);

+			xmxxglService.save(xmxxgl);

+

+			if (xmxxgl.getXmlx().getId().equals("2202")) {

+				List<TaskInfoEntity> list = taskInfoService.findByBusIdAndBusKeyAndRecordStatus(code.getId(), XmxxglEntity.PROCESS_DEFINITION_KEY2);

+				auditlist(list, xmxxgl, shyj);

+			} else {

+				List<TaskInfoEntity> list = taskInfoService.findByBusIdAndBusKeyAndRecordStatus(code.getId(), XmxxglEntity.PROCESS_DEFINITION_KEY);

+				auditlist(list, xmxxgl, shyj);

+			}

+		} catch (Exception e) {

+			wr.setSuccess(false);

+			wr.setMessage("操作失败!");

+			return wr;

+		}

+		

+		return wr;

+	}

+	

 	public void auditlist(List<TaskInfoEntity> list, XmxxglEntity xmxxgl, String shyj) {

 		if (list != null & list.size() > 0) {

 			TaskInfoEntity taskinfo = list.get(0);

+ 10 - 9
gkjsjy/trunk/src/com/xt/jygl/gkjsgl/tzjhgl/ctl/TzjhglCtl.java
파일 보기 

@@ -210,16 +210,16 @@ public class TzjhglCtl extends BaseWebCtl {
 
 		}

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

 		

-		/*if (page.getPage() < 1) {

-			page.setPage(SearchCondition.tzjhpage);

-		}*/

 		if (page.getPage() < 1) {

-			Object tzjhpage = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "tzjhpage");

-			if (StringUtils.isEmpty(tzjhpage) || !org.apache.commons.lang.StringUtils.isNumeric(String.valueOf(tzjhpage))) {

-				tzjhpage = "1";

-			}

-			page.setPage(Integer.valueOf(String.valueOf(tzjhpage)));

+			page.setPage(SearchCondition.tzjhpage);

 		}

+//		if (page.getPage() < 1) {

+//			Object tzjhpage = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "tzjhpage");

+//			if (StringUtils.isEmpty(tzjhpage) || !org.apache.commons.lang.StringUtils.isNumeric(String.valueOf(tzjhpage))) {

+//				tzjhpage = "1";

+//			}

+//			page.setPage(Integer.valueOf(String.valueOf(tzjhpage)));

+//		}

 		page.setSort("id");

 		page.setOrder("desc");

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

@@ -248,7 +248,8 @@ public class TzjhglCtl extends BaseWebCtl {
 
 			}

 		}

 		if(isPOST(request)){

-			cacheSCmap.put("tzjhpage",page.getPage());

+			SearchCondition.tzjhpage = page.getPage();

+			//cacheSCmap.put("tzjhpage",page.getPage());

 			CacheSearchCondition.putCacheSCmap(request.getParameterMap(), cacheSCmap);

 			//System.out.println(JSONObject.fromObject(cacheSCmap));

 		}

+ 3 - 7
gkjsjy/trunk/src/com/xt/jygl/gkjsgl/xmxxgl/ctl/XmxxglCtl.java
파일 보기 

@@ -35,6 +35,7 @@ import com.xt.jygl.accessory.service.AccessoryService;
 
 import com.xt.jygl.common.BaseWebCtl;

 import com.xt.jygl.common.Constants;

 import com.xt.jygl.common.GlobalData;

+import com.xt.jygl.common.SearchCondition;

 import com.xt.jygl.common.Utils;

 import com.xt.jygl.gkjcxx.gk.entity.GkEntity;

 import com.xt.jygl.gkjcxx.gk.service.GkService;

@@ -203,11 +204,7 @@ public class XmxxglCtl extends BaseWebCtl {
 
 		};

 

 		if (page.getPage() < 1) {

-			Object xmxxpage = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "xmxxpage");

-			if (StringUtils.isEmpty(xmxxpage) || !org.apache.commons.lang.StringUtils.isNumeric(String.valueOf(xmxxpage))) {

-				xmxxpage = "1";

-			}

-			page.setPage(Integer.valueOf(String.valueOf(xmxxpage)));

+			page.setPage(SearchCondition.xmxxpage);

 		}

 

 		page.setSort("id");

@@ -271,8 +268,7 @@ public class XmxxglCtl extends BaseWebCtl {
 
 		}

 

 		if (isPOST(request)) {

-			cacheSCmap.put("xmxxpage", page.getPage());

-			CacheSearchCondition.putCacheSCmap(request.getParameterMap(), cacheSCmap);

+			SearchCondition.xmxxpage= page.getPage();

 		}

 

 		model.addAttribute("list", voList);

+ 57 - 51
gkjsjy/trunk/src/com/xt/jygl/gkjygl/cghzyxxgl/dcsb/ctl/DcsbCtl.java
파일 보기 

@@ -13,8 +13,6 @@ import javax.persistence.criteria.Predicate;
 
 import javax.persistence.criteria.Root;

 import javax.servlet.http.HttpServletRequest;

 

-import net.sf.json.JSONObject;

-

 import org.activiti.engine.ActivitiException;

 import org.springframework.beans.BeanUtils;

 import org.springframework.beans.factory.annotation.Autowired;

@@ -40,7 +38,6 @@ import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.service.GkjyrService;
 
 import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxksq.entity.XkzsqEntity;

 import com.xt.jygl.workflow.entity.TaskInfoEntity;

 import com.xt.jygl.workflow.service.TaskInfoService;

-import com.xtframe.core.anon.auth.RequiresPermissions;

 import com.xtframe.core.base.ctl.WebJsonResult;

 import com.xtframe.core.support.SecurityMgr;

 import com.xtframe.sec.code.entity.CodeEntity;

@@ -67,17 +64,27 @@ public class DcsbCtl extends BaseWebCtl {
 
 

 	/**

 	 * 一览

-	 * @param page 分页

+	 * 

+	 * @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 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

@@ -86,10 +93,9 @@ public class DcsbCtl extends BaseWebCtl {
 
 	 * @throws JsonProcessingException

 	 */

 	@RequestMapping(value = "/main")

-	//@RequiresPermissions("dcsb: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 {

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

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

 		// 查询条件

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

 			@Override

@@ -112,7 +118,7 @@ public class DcsbCtl extends BaseWebCtl {
 
 						list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + v + "%"));

 					}

 				}

-			

+

 				if (StringUtils.isNotEmpty(szgkid)) {

 					list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + szgkid + "%"));

 				} else if (isGET(request)) {

@@ -139,14 +145,13 @@ public class DcsbCtl extends BaseWebCtl {
 
 						list.add(cb.like(root.get("zypmc").as(String.class), "%" + v + "%"));

 					}

 				}

-				

+

 				if (StringUtils.isNotEmpty(dydlid)) {

 					list.add(cb.equal(root.get("hwzl").get("id").as(String.class), dydlid));

 				} else if (isGET(request)) {

-					

+

 					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, "id", "hwzl", "dydlid");

 				}

-				

 

 				if (StringUtils.isNotEmpty(shzt)) {

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

@@ -156,7 +161,7 @@ public class DcsbCtl extends BaseWebCtl {
 
 						list.add(cb.like(root.get("shzt").as(String.class), "%" + v + "%"));

 					}

 				}

-				

+

 				if (null != zysjq) {

 					if (StringUtils.isNotEmpty(new SimpleDateFormat("yyyy-MM-dd").format(zysjq))) {

 						list.add(cb.equal(root.get("zysjq").as(Date.class), zysjq));

@@ -166,7 +171,7 @@ public class DcsbCtl extends BaseWebCtl {
 
 							list.add(cb.equal(root.get("zysjq").as(Date.class), v));

 						}

 					}

-				

+

 				}

 				if (null != zysjz) {

 					if (StringUtils.isNotEmpty(new SimpleDateFormat("yyyy-MM-dd").format(zysjz))) {

@@ -177,7 +182,7 @@ public class DcsbCtl extends BaseWebCtl {
 
 							list.add(cb.equal(root.get("zysjz").as(Date.class), v));

 						}

 					}

-				

+

 				}

 				// 经营人只能查看自己企业下的数据，非经营人只能查看自己所在地的数据

 				if (isJyr()) {

@@ -216,14 +221,11 @@ public class DcsbCtl extends BaseWebCtl {
 
 		}

 		Utils.getSession().setAttribute("userpre", user2);

 

+		page.setSort("id");

+		page.setOrder("desc");

 		if (page.getPage() < 1) {

-			Object dcsbpage = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "dcsbpage");

-			if (StringUtils.isEmpty(dcsbpage) || !org.apache.commons.lang.StringUtils.isNumeric(String.valueOf(dcsbpage))) {

-				dcsbpage = "1";

-			}

-			page.setPage(Integer.valueOf(String.valueOf(dcsbpage)));

+			page.setPage(SearchCondition.dcsbpage);

 		}

-

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

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

 		for (DcsbEntity entity : list) {

@@ -255,13 +257,12 @@ public class DcsbCtl extends BaseWebCtl {
 
 				voList.add(vo);

 			}

 		}

-	

+

 		if (isPOST(request)) {

-			cacheSCmap.put("dcsbpage", page.getPage());

+			SearchCondition.dcsbpage = page.getPage();

+			// cacheSCmap.put("dcsbpage", 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);

@@ -315,9 +316,9 @@ public class DcsbCtl extends BaseWebCtl {
 
 

 	// 新增

 	@RequestMapping(value = "/add")

-	//@RequiresPermissions("dcsb:add")

+	// @RequiresPermissions("dcsb:add")

 	public String add(Model model) {

-	

+

 		UserEntity user = securityMgr.getCurrUser();

 		if (user.getSsjyr() != null) {

 			GkjyrEntity jyr = gkjyrService.findOne(user.getSsjyr().getId());

@@ -328,7 +329,7 @@ public class DcsbCtl extends BaseWebCtl {
 
 		SimpleDateFormat dateTimeFormat = new SimpleDateFormat("yyyy-MM-dd");

 		Date today = new Date();

 		model.addAttribute("bgsj", dateTimeFormat.format(today));

-	

+

 		return "gkjygl/cghzyxxgl/dcsb/dcsbadd";

 	}

 

@@ -352,13 +353,13 @@ public class DcsbCtl extends BaseWebCtl {
 
 		}

 		model.addAttribute("record", entity);

 		model.addAttribute("recordvo", vo);

-		

+

 		return "gkjygl/cghzyxxgl/dcsb/dcsbview";

 	}

 

 	// 修改

 	@RequestMapping(value = "/edit")

-	//@RequiresPermissions("dcsb:edit")

+	// @RequiresPermissions("dcsb:edit")

 	public String edit(Model model, String id, String flag, String path, String type) {

 		model.addAttribute("flag", flag);

 		model.addAttribute("path", path);

@@ -369,7 +370,7 @@ public class DcsbCtl extends BaseWebCtl {
 
 		vo.setHwzldedl(entity.getHwzldedl() != null ? entity.getHwzldedl().getId() : "");

 		model.addAttribute("record", entity);

 		model.addAttribute("recordvo", vo);

-		

+

 		return "gkjygl/cghzyxxgl/dcsb/dcsbedit";

 	}

 

@@ -403,7 +404,7 @@ public class DcsbCtl extends BaseWebCtl {
 
 			wr.setMessage("请填写 进出港！");

 			return wr;

 		}

-		

+

 		if (StringUtils.isEmpty(nwmid)) {

 			wr.setSuccess(false);

 			wr.setMessage("请填写 内外贸！");

@@ -419,7 +420,6 @@ public class DcsbCtl extends BaseWebCtl {
 
 			wr.setMessage("请填写 作业时间止！");

 			return wr;

 		}

-	

 

 		DcsbEntity entity = new DcsbEntity();

 		try {

@@ -553,7 +553,7 @@ public class DcsbCtl extends BaseWebCtl {
 
 			wr.setMessage("请填写 进出港！");

 			return wr;

 		}

-		

+

 		if (StringUtils.isEmpty(nwmid)) {

 			wr.setSuccess(false);

 			wr.setMessage("请填写 内外贸！");

@@ -670,7 +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) {

@@ -778,7 +778,7 @@ public class DcsbCtl extends BaseWebCtl {
 
 			if (dcsbService.getCandidateTaskByUserAndBusKey(SecUtils.getCurrUser().getId().toString(), dcsb.getId()) != null) {

 				dcsbService.claim(dcsb.getId(), SecUtils.getCurrUser().getId().toString());

 			}

-			dcsbService.submit( entity);

+			dcsbService.submit(entity);

 		} catch (Exception e) {

 			wr.setSuccess(false);

 			wr.setMessage("操作失败！");

@@ -790,7 +790,7 @@ public class DcsbCtl extends BaseWebCtl {
 
 	// 删除

 	@RequestMapping(value = "/delete")

 	@ResponseBody

-	//@RequiresPermissions("dcsb:delete")

+	// @RequiresPermissions("dcsb:delete")

 	public WebJsonResult delete(Model model, String id) {

 		WebJsonResult wr = success();

 		try {

@@ -810,9 +810,13 @@ public class DcsbCtl extends BaseWebCtl {
 
 

 	/**

 	 * 审核流程

-	 * @param shyj 审核意见

-	 * @param id 主键ID

-	 * @param flag 同意true,不同意 false

+	 * 

+	 * @param shyj

+	 *            审核意见

+	 * @param id

+	 *            主键ID

+	 * @param flag

+	 *            同意true,不同意 false

 	 * @return

 	 */

 	@RequestMapping(value = "/audit")

@@ -851,10 +855,12 @@ public class DcsbCtl extends BaseWebCtl {
 
 			if (dcsbService.getCandidateTaskByUserAndBusKey(SecUtils.getCurrUser().getId().toString(), id) != null) {

 				dcsbService.claim(id, SecUtils.getCurrUser().getId().toString());

 			}

-			boolean jflag  = dcsbService.changeAudit(shyj, entity, flag);

-			if(!jflag){

-				/*// rtx提醒

-				rtxSend(entity.getSzgq().getId(), Constants.ROLE_DCSBSC, "你有一条单船申报待办事务，请及时处理！");*/

+			boolean jflag = dcsbService.changeAudit(shyj, entity, flag);

+			if (!jflag) {

+				/*

+				 * // rtx提醒 rtxSend(entity.getSzgq().getId(),

+				 * Constants.ROLE_DCSBSC, "你有一条单船申报待办事务，请及时处理！");

+				 */

 			}

 		} catch (Exception e) {

 			wr.setSuccess(false);

+ 8 - 118
gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/jyrbw/ctl/BwCtl.java
파일 보기 

@@ -93,8 +93,6 @@ public class BwCtl extends BaseWebCtl {
 
 	@RequiresPermissions("bwxx:main")
 
 	public String main(SimplePageRequest page, Model model, final HttpServletRequest request, final String ssjyr, final String ssmt, final String szdid, final String szgkid, final String szgqid, final String bwmc, final String menuid, final String wxpbwid, final String bwsxid, final String fwlxid, final String sfdwkfid, final String bwbwyt, final String bz) throws JsonProcessingException {
 
 		final Map<String, Object> cacheSCmap = CacheSearchCondition.cacheSCmap(request, "bwxx");
 
-		final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 
-
 
 		// 查詢條件
 
 		Specification<BwEntity> spec = new Specification<BwEntity>() {
 
 
@@ -104,18 +102,6 @@ public class BwCtl extends BaseWebCtl {
 
 				// 标志位，判断查询条件
 
 				String flag = bz;
 
 				if (flag != null) {
 
-
 
-					// if (StringUtils.isNotEmpty(ssjyr)) {
 
-					// list.add(cb.like(root.get("ssjyr").get("gkjyr").as(String.class),
 
-					// "%" + ssjyr + "%"));
 
-					// } else if (isGET(request)) {
 
-					// String v = (String)
 
-					// CacheSearchCondition.cacheSCmapVal(cacheSCmap, "ssjyr");
 
-					// if (StringUtils.isNotEmpty(v)) {
 
-					// list.add(cb.like(root.get("ssjyr").get("gkjyr").as(String.class),
 
-					// "%" + v + "%"));
 
-					// }
 
-					// }
 
 					if (cacheSCmap != null) {
 
 						cacheSCmap.remove("ssjyr");
 
 					}
 
@@ -142,11 +128,6 @@ public class BwCtl extends BaseWebCtl {
 
 							list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + v + "%"));
 
 						}
 
 					}
 
-					// else if (StringUtils.isNotEmpty(SearchCondition.bwszd) &&
 
-					// isGET(request)) {
 
-					// list.add(cb.like(root.get("szd").get("id").as(String.class),
 
-					// "%" + SearchCondition.bwszd + "%"));
 
-					// }
 
 					if (StringUtils.isNotEmpty(szgkid)) {
 
 						list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + szgkid + "%"));
 
 					} else if (isGET(request)) {
 
@@ -156,11 +137,6 @@ public class BwCtl extends BaseWebCtl {
 
 						}
 
 					}
 
 
-					// else if (StringUtils.isNotEmpty(SearchCondition.bwszgk)
 
-					// && isGET(request)) {
 
-					// list.add(cb.like(root.get("szgk").get("id").as(String.class),
 
-					// "%" + SearchCondition.bwszgk + "%"));
 
-					// }
 
 					if (StringUtils.isNotEmpty(szgqid)) {
 
 						list.add(cb.like(root.get("szgq").get("id").as(String.class), "%" + szgqid + "%"));
 
 					} else if (isGET(request)) {
 
@@ -169,11 +145,6 @@ public class BwCtl extends BaseWebCtl {
 
 							list.add(cb.like(root.get("szgq").get("id").as(String.class), "%" + v + "%"));
 
 						}
 
 					}
 
-					// else if (StringUtils.isNotEmpty(SearchCondition.bwszgq)
 
-					// && isGET(request)) {
 
-					// list.add(cb.like(root.get("szgq").get("id").as(String.class),
 
-					// "%" + SearchCondition.bwszgq + "%"));
 
-					// }
 
 					if (StringUtils.isNotEmpty(ssjyr)) {
 
 						list.add(cb.like(root.get("ssjyr").get("gkjyr").as(String.class), "%" + ssjyr + "%"));
 
 					} else if (isGET(request)) {
 
@@ -182,11 +153,6 @@ public class BwCtl extends BaseWebCtl {
 
 							list.add(cb.like(root.get("ssjyr").get("gkjyr").as(String.class), "%" + v + "%"));
 
 						}
 
 					}
 
-					// else if (StringUtils.isNotEmpty(SearchCondition.bwssjyr)
 
-					// && isGET(request)) {
 
-					// list.add(cb.like(root.get("ssjyr").get("gkjyr").as(String.class),
 
-					// "%" + SearchCondition.bwssjyr + "%"));
 
-					// }
 
 					if (StringUtils.isNotEmpty(bwmc)) {
 
 						list.add(cb.like(root.get("bwmc").as(String.class), "%" + bwmc + "%"));
 
 					} else if (isGET(request)) {
 
@@ -195,11 +161,6 @@ public class BwCtl extends BaseWebCtl {
 
 							list.add(cb.like(root.get("bwmc").as(String.class), "%" + v + "%"));
 
 						}
 
 					}
 
-					// else if (StringUtils.isNotEmpty(SearchCondition.bwmc) &&
 
-					// isGET(request)) {
 
-					// list.add(cb.like(root.get("bwmc").as(String.class), "%" +
 
-					// SearchCondition.bwmc + "%"));
 
-					// }
 
 					if (StringUtils.isNotEmpty(wxpbwid)) {
 
 						list.add(cb.like(root.get("wxpbw").get("id").as(String.class), "%" + wxpbwid + "%"));
 
 					} else if (isGET(request)) {
 
@@ -208,11 +169,6 @@ public class BwCtl extends BaseWebCtl {
 
 							list.add(cb.like(root.get("wxpbw").get("id").as(String.class), "%" + v + "%"));
 
 						}
 
 					}
 
-					// else if (StringUtils.isNotEmpty(SearchCondition.wxpbw) &&
 
-					// isGET(request)) {
 
-					// list.add(cb.like(root.get("wxpbw").get("id").as(String.class),
 
-					// "%" + SearchCondition.wxpbw + "%"));
 
-					// }
 
 					if (StringUtils.isNotEmpty(bwsxid)) {
 
 						list.add(cb.like(root.get("bwsx").get("id").as(String.class), "%" + bwsxid + "%"));
 
 					} else if (isGET(request)) {
 
@@ -221,11 +177,6 @@ public class BwCtl extends BaseWebCtl {
 
 							list.add(cb.like(root.get("bwsx").get("id").as(String.class), "%" + v + "%"));
 
 						}
 
 					}
 
-					// else if (StringUtils.isNotEmpty(SearchCondition.bwsx) &&
 
-					// isGET(request)) {
 
-					// list.add(cb.like(root.get("bwsx").get("id").as(String.class),
 
-					// "%" + SearchCondition.bwsx + "%"));
 
-					// }
 
 					if (StringUtils.isNotEmpty(fwlxid)) {
 
 						list.add(cb.like(root.get("fwlx").get("id").as(String.class), "%" + fwlxid + "%"));
 
 					} else if (isGET(request)) {
 
@@ -234,11 +185,6 @@ public class BwCtl extends BaseWebCtl {
 
 							list.add(cb.like(root.get("fwlx").get("id").as(String.class), "%" + v + "%"));
 
 						}
 
 					}
 
-					// else if (StringUtils.isNotEmpty(SearchCondition.fwlx) &&
 
-					// isGET(request)) {
 
-					// list.add(cb.like(root.get("fwlx").get("id").as(String.class),
 
-					// "%" + SearchCondition.fwlx + "%"));
 
-					// }
 
 					if (StringUtils.isNotEmpty(sfdwkfid)) {
 
 						list.add(cb.like(root.get("sfdwkf").get("id").as(String.class), "%" + sfdwkfid + "%"));
 
 					} else if (isGET(request)) {
 
@@ -247,11 +193,6 @@ public class BwCtl extends BaseWebCtl {
 
 							list.add(cb.like(root.get("sfdwkf").get("id").as(String.class), "%" + v + "%"));
 
 						}
 
 					}
 
-					// else if (StringUtils.isNotEmpty(SearchCondition.sfdwkfbw)
 
-					// && isGET(request)) {
 
-					// list.add(cb.like(root.get("sfdwkf").get("id").as(String.class),
 
-					// "%" + SearchCondition.sfdwkfbw + "%"));
 
-					// }
 
 					if (StringUtils.isNotEmpty(bwbwyt)) {
 
 						list.add(cb.like(root.get("bwyt").as(String.class), "%" + bwbwyt + "%"));
 
 					} else if (isGET(request)) {
 
@@ -260,13 +201,9 @@ public class BwCtl extends BaseWebCtl {
 
 							list.add(cb.like(root.get("bwyt").as(String.class), "%" + v + "%"));
 
 						}
 
 					}
 
-					// else if (StringUtils.isNotEmpty(SearchCondition.bwbwyt)
 
-					// && isGET(request)) {
 
-					// list.add(cb.like(root.get("bwyt").as(String.class), "%" +
 
-					// SearchCondition.bwbwyt + "%"));
 
-					// }
 
-					// 经营人只能查看自己企业下的数据，非经营人只能查看自己所在地的数据
 
+					
 				}
 
+				// 经营人只能查看自己企业下的数据，非经营人只能查看自己所在地的数据
 
 				if (isJyr()) {
 
 					list.add(cb.like(root.get("ssjyr").get("id").as(String.class), "%" + getSsjyr().getId() + "%"));
 
 				} else {
 
@@ -312,21 +249,12 @@ public class BwCtl extends BaseWebCtl {
 
 		}
 
 		Utils.getSession().setAttribute("user", user2);
 
 
-		// if (page.getPage() < 1) {
 
-		// page.setPage(SearchCondition.bwpage);
 
-		// }
 
-		if (page.getPage() < 1) {
 
-			Object bwpage = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "bwpage");
 
-			if (StringUtils.isEmpty(bwpage) || !org.apache.commons.lang.StringUtils.isNumeric(String.valueOf(bwpage))) {
 
-				bwpage = "1";
 
-			}
 
-			page.setPage(Integer.valueOf(String.valueOf(bwpage)));
 
-		}
 
+		 if (page.getPage() < 1) {
 
+		 page.setPage(SearchCondition.bwpage);
 
+		 }
 
 		page.setSort("id");
 
 		page.setOrder("desc");
 
 
-		List<BwEntity> textlist = query.findAll(spec, BwEntity.class);
 
-
 
 		Page<BwEntity> list = query.findAll(spec, toPageRequest(page), BwEntity.class);
 
 		List<BwVo> voList = new ArrayList<BwVo>();
 
 		for (BwEntity entity : list) {
 
@@ -395,50 +323,12 @@ public class BwCtl extends BaseWebCtl {
 
 
 		}
 
 
-		// if (isPOST(request)) {
 
-		// model.addAttribute("bwmc", bwmc);
 
-		// model.addAttribute("ssjyr", ssjyr);
 
-		// model.addAttribute("szd", szdid);
 
-		// model.addAttribute("szgk", szgkid);
 
-		// model.addAttribute("szgq", szgqid);
 
-		// model.addAttribute("sfwxpbw", wxpbwid);
 
-		// model.addAttribute("bwsx", bwsxid);
 
-		// model.addAttribute("fwlx", fwlxid);
 
-		// model.addAttribute("sfdwkfbw",sfdwkfid);
 
-		// model.addAttribute("bwyt",bwbwyt);
 
-		//
 
-		// SearchCondition.bwpage = page.getPage();
 
-		// SearchCondition.bwmc = bwmc;
 
-		// SearchCondition.bwssjyr = ssjyr;
 
-		// SearchCondition.bwszd = szdid;
 
-		// SearchCondition.bwszgk = szgkid;
 
-		// SearchCondition.bwszgq = szgqid;
 
-		// SearchCondition.wxpbw = wxpbwid;
 
-		// SearchCondition.bwsx = bwsxid;
 
-		// SearchCondition.fwlx = fwlxid;
 
-		// SearchCondition.sfdwkfbw=sfdwkfid;
 
-		// SearchCondition.bwbwyt = bwbwyt;
 
-		//
 
-		// } else {
 
-		// model.addAttribute("bwmc", SearchCondition.bwmc);
 
-		// model.addAttribute("ssjyr", SearchCondition.bwssjyr);
 
-		// model.addAttribute("szd", SearchCondition.bwszd);
 
-		// model.addAttribute("szgk", SearchCondition.bwszgk);
 
-		// model.addAttribute("szgq", SearchCondition.bwszgq);
 
-		// model.addAttribute("sfwxpbw", SearchCondition.wxpbw);
 
-		// model.addAttribute("bwsx", SearchCondition.bwsx);
 
-		// model.addAttribute("fwlx", SearchCondition.fwlx);
 
-		// model.addAttribute("sfdwkfbw",SearchCondition.sfdwkfbw);
 
-		// model.addAttribute("bwyt",SearchCondition.bwbwyt);
 
-		// }
 
-		// model.addAttribute("list", voList);
 
-		// model.addAttribute("menuid", menuid);
 
+	
 		if (isPOST(request)) {
 
-			cacheSCmap.put("bwpage", page.getPage());
 
+			SearchCondition.bwpage=page.getPage();
 
+			//cacheSCmap.put("bwpage", page.getPage());
 
 			CacheSearchCondition.putCacheSCmap(request.getParameterMap(), cacheSCmap);
 
-			System.out.println(JSONObject.fromObject(cacheSCmap));
 
 		}
 
-		System.out.println(isPOST(request));
 
 
 		model.addAttribute("list", voList);
 
 		model.addAttribute("bwmc", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "bwmc"));

+ 11 - 55
gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/jyrcg/ctl/CgCtl.java
파일 보기 

@@ -6,15 +6,18 @@ import java.util.ArrayList;
 
 import java.util.Date;

 import java.util.List;

 import java.util.Map;

+

 import javax.persistence.criteria.CriteriaBuilder;

+import javax.persistence.criteria.CriteriaBuilder.In;

 import javax.persistence.criteria.CriteriaQuery;

 import javax.persistence.criteria.Predicate;

 import javax.persistence.criteria.Root;

-import javax.persistence.criteria.CriteriaBuilder.In;

 import javax.servlet.ServletOutputStream;

 import javax.servlet.http.HttpServletRequest;

 import javax.servlet.http.HttpServletResponse;

+

 import net.sf.json.JSONObject;

+

 import org.springframework.beans.BeanUtils;

 import org.springframework.beans.factory.annotation.Autowired;

 import org.springframework.data.domain.Page;

@@ -23,7 +26,9 @@ import org.springframework.stereotype.Controller;
 
 import org.springframework.ui.Model;

 import org.springframework.web.bind.annotation.RequestMapping;

 import org.springframework.web.bind.annotation.ResponseBody;

+

 import cache.CacheSearchCondition;

+

 import com.fasterxml.jackson.core.JsonProcessingException;

 import com.xt.jygl.common.BaseWebCtl;

 import com.xt.jygl.common.Constants;

@@ -79,7 +84,6 @@ public class CgCtl extends BaseWebCtl {
 
 	@RequiresPermissions("cgxx:main")

 	public String main(SimplePageRequest page, Model model, final HttpServletRequest request, final String szdid, final String szgkid, final String szgqid, final String ssjyr, final String sfwxpcgid, final String cgmc, String menuid) throws JsonProcessingException {

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

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

 		// 查詢條件

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

 			@Override

@@ -93,9 +97,6 @@ public class CgCtl extends BaseWebCtl {
 
 						list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + v + "%"));

 					}

 				}

-//				else if (StringUtils.isNotEmpty(SearchCondition.cgszd) && isGET(request)) {

-//					list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + SearchCondition.cgszd + "%"));

-//				}

 				if (StringUtils.isNotEmpty(szgkid)) {

 					list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + szgkid + "%"));

 				} else if(isGET(request)){

@@ -104,9 +105,6 @@ public class CgCtl extends BaseWebCtl {
 
 						list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + v + "%"));

 					}

 				}

-//				else if (StringUtils.isNotEmpty(SearchCondition.cgszgk) && isGET(request)) {

-//					list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + SearchCondition.cgszgk + "%"));

-//				}

 				if (StringUtils.isNotEmpty(szgqid)) {

 					list.add(cb.like(root.get("szgq").get("id").as(String.class), "%" + szgqid + "%"));

 				} else if(isGET(request)){

@@ -115,9 +113,6 @@ public class CgCtl extends BaseWebCtl {
 
 						list.add(cb.like(root.get("szgq").get("id").as(String.class), "%" + v + "%"));

 					}

 				}

-//				else if (StringUtils.isNotEmpty(SearchCondition.cgszgq) && isGET(request)) {

-//					list.add(cb.like(root.get("szgq").get("id").as(String.class), "%" + SearchCondition.cgszgq + "%"));

-//				}

 				if (StringUtils.isNotEmpty(ssjyr)) {

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

 				} else if(isGET(request)){

@@ -126,9 +121,6 @@ public class CgCtl extends BaseWebCtl {
 
 						list.add(cb.like(root.get("ssjyr").get("gkjyr").as(String.class), "%" + v + "%"));

 					}

 				}

-//				else if (StringUtils.isNotEmpty(SearchCondition.cgssjyr) && isGET(request)) {

-//					list.add(cb.like(root.get("ssjyr").get("gkjyr").as(String.class), "%" + SearchCondition.cgssjyr + "%"));

-//				}

 				if (StringUtils.isNotEmpty(cgmc)) {

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

 				} else if(isGET(request)){

@@ -137,9 +129,6 @@ public class CgCtl extends BaseWebCtl {
 
 						list.add(cb.like(root.get("cgmc").as(String.class), "%" + v + "%"));

 					}

 				} 

-//				else if (StringUtils.isNotEmpty(SearchCondition.cgmc) && isGET(request)) {

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

-//				}

 				if (StringUtils.isNotEmpty(sfwxpcgid)) {

 					list.add(cb.like(root.get("sfwxpcg").get("id").as(String.class), "%" + sfwxpcgid + "%"));

 				} else if(isGET(request)){

@@ -148,9 +137,6 @@ public class CgCtl extends BaseWebCtl {
 
 						list.add(cb.like(root.get("sfwxpcg").get("id").as(String.class), "%" + v + "%"));

 					}

 				}

-//				else if (StringUtils.isNotEmpty(SearchCondition.wxpcg) && isGET(request)) {

-//					list.add(cb.like(root.get("sfwxpcg").get("id").as(String.class), "%" + SearchCondition.wxpcg + "%"));

-//				}

 

 				// 经营人只能查看自己企业下的数据，非经营人只能查看自己所在地的数据

 				if (isJyr()) {

@@ -194,16 +180,10 @@ public class CgCtl extends BaseWebCtl {
 
 		}

 		Utils.getSession().setAttribute("user", user2);

 

-//		if (page.getPage() < 1) {

-//			page.setPage(SearchCondition.cgpage);

-//		}

 		if (page.getPage() < 1) {

-			Object cgpage = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "cgpage");

-			if (StringUtils.isEmpty(cgpage) || !org.apache.commons.lang.StringUtils.isNumeric(String.valueOf(cgpage))) {

-				cgpage = "1";

-			}

-			page.setPage(Integer.valueOf(String.valueOf(cgpage)));

+			page.setPage(SearchCondition.cgpage);

 		}

+		

 		page.setSort("id");

 		page.setOrder("desc");

 

@@ -233,36 +213,12 @@ public class CgCtl extends BaseWebCtl {
 
 		}

 

 

-//		

-//		if (isPOST(request)) {

-//			model.addAttribute("cgmc", cgmc);

-//			model.addAttribute("ssjyr", ssjyr);

-//			model.addAttribute("szd", szdid);

-//			model.addAttribute("szgk", szgkid);

-//			model.addAttribute("szgq", szgqid);

-//			model.addAttribute("sfwxpcg", sfwxpcgid);

-//

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

-//			SearchCondition.cgmc = cgmc;

-//			SearchCondition.cgssjyr = ssjyr;

-//			SearchCondition.cgszd = szdid;

-//			SearchCondition.cgszgk = szgkid;

-//			SearchCondition.cgszgq = szgqid;

-//			SearchCondition.wxpcg = sfwxpcgid;

-//		} else {

-//			model.addAttribute("cgmc", SearchCondition.cgmc);

-//			model.addAttribute("ssjyr", SearchCondition.cgssjyr);

-//			model.addAttribute("szd", SearchCondition.cgszd);

-//			model.addAttribute("szgk", SearchCondition.cgszgk);

-//			model.addAttribute("szgq", SearchCondition.cgszgq);

-//			model.addAttribute("sfwxpcg", SearchCondition.wxpcg);

-//		}

+

 		if (isPOST(request)) {

-			cacheSCmap.put("cgpage", page.getPage());

+			SearchCondition.cgpage=page.getPage();

+			//cacheSCmap.put("cgpage", 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);

+ 13 - 60
gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/jyrck/ctl/CkCtl.java
파일 보기 

@@ -1,19 +1,21 @@
 
 package com.xt.jygl.gkjygl.gkjyr.jyrck.ctl;

 

 import java.io.IOException;

-import java.text.SimpleDateFormat;

 import java.util.ArrayList;

 import java.util.List;

 import java.util.Map;

+

 import javax.persistence.criteria.CriteriaBuilder;

+import javax.persistence.criteria.CriteriaBuilder.In;

 import javax.persistence.criteria.CriteriaQuery;

 import javax.persistence.criteria.Predicate;

 import javax.persistence.criteria.Root;

-import javax.persistence.criteria.CriteriaBuilder.In;

 import javax.servlet.ServletOutputStream;

 import javax.servlet.http.HttpServletRequest;

 import javax.servlet.http.HttpServletResponse;

+

 import net.sf.json.JSONObject;

+

 import org.springframework.beans.BeanUtils;

 import org.springframework.beans.factory.annotation.Autowired;

 import org.springframework.data.domain.Page;

@@ -22,7 +24,9 @@ import org.springframework.stereotype.Controller;
 
 import org.springframework.ui.Model;

 import org.springframework.web.bind.annotation.RequestMapping;

 import org.springframework.web.bind.annotation.ResponseBody;

+

 import cache.CacheSearchCondition;

+

 import com.fasterxml.jackson.core.JsonProcessingException;

 import com.xt.jygl.common.BaseWebCtl;

 import com.xt.jygl.common.Constants;

@@ -83,7 +87,6 @@ public class CkCtl extends BaseWebCtl {
 
 	@RequiresPermissions("ckxx:main")

 	public String main(SimplePageRequest page, Model model, final HttpServletRequest request, final String ssmt, final String szdid, final String szgkid, final String szgqid, final String ckmc, final String ssjyr, final String wxpckid, String menuid) throws JsonProcessingException {

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

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

 		// 查詢條件

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

 

@@ -98,9 +101,6 @@ public class CkCtl extends BaseWebCtl {
 
 						list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + v + "%"));

 					}

 				}

-//				else if (StringUtils.isNotEmpty(SearchCondition.ckszd) && isGET(request)) {

-//					list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + SearchCondition.ckszd + "%"));

-//				}

 				if (StringUtils.isNotEmpty(szgkid)) {

 					list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + szgkid + "%"));

 				} else if(isGET(request)){

@@ -109,9 +109,6 @@ public class CkCtl extends BaseWebCtl {
 
 						list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + v + "%"));

 					}

 				}

-//				else if (StringUtils.isNotEmpty(SearchCondition.ckszgk) && isGET(request)) {

-//					list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + SearchCondition.ckszgk + "%"));

-//				}

 				if (StringUtils.isNotEmpty(szgqid)) {

 					list.add(cb.like(root.get("szgq").get("id").as(String.class), "%" + szgqid + "%"));

 				} else if(isGET(request)){

@@ -120,9 +117,6 @@ public class CkCtl extends BaseWebCtl {
 
 						list.add(cb.like(root.get("szgq").get("id").as(String.class), "%" + v + "%"));

 					}

 				}

-//				else if (StringUtils.isNotEmpty(SearchCondition.ckszgq) && isGET(request)) {

-//					list.add(cb.like(root.get("szgq").get("id").as(String.class), "%" + SearchCondition.ckszgq + "%"));

-//				}

 				if (StringUtils.isNotEmpty(ssjyr)) {

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

 				} else if(isGET(request)){

@@ -131,9 +125,6 @@ public class CkCtl extends BaseWebCtl {
 
 						list.add(cb.like(root.get("ssjyr").get("gkjyr").as(String.class), "%" + v + "%"));

 					}

 				}

-//				else if (StringUtils.isNotEmpty(SearchCondition.ckssjyr) && isGET(request)) {

-//					list.add(cb.like(root.get("ssjyr").get("gkjyr").as(String.class), "%" + SearchCondition.ckssjyr + "%"));

-//				}

 				if (StringUtils.isNotEmpty(ssmt)) {

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

 				} else if(isGET(request)){

@@ -142,9 +133,6 @@ public class CkCtl extends BaseWebCtl {
 
 						list.add(cb.like(root.get("ssmt").get("mtmc").as(String.class), "%" + v + "%"));

 					}

 				}

-//				else if (StringUtils.isNotEmpty(SearchCondition.ckssmt) && isGET(request)) {

-//					list.add(cb.like(root.get("ssmt").get("mtmc").as(String.class), "%" + SearchCondition.ckssmt + "%"));

-//				}

 				if (StringUtils.isNotEmpty(wxpckid)) {

 					list.add(cb.like(root.get("wxpck").get("id").as(String.class), "%" + wxpckid + "%"));

 				} else if(isGET(request)){

@@ -153,9 +141,6 @@ public class CkCtl extends BaseWebCtl {
 
 						list.add(cb.like(root.get("wxpck").get("id").as(String.class), "%" + v + "%"));

 					}

 				} 

-//				else if (StringUtils.isNotEmpty(SearchCondition.wxpck) && isGET(request)) {

-//					list.add(cb.like(root.get("wxpck").get("id").as(String.class), "%" + SearchCondition.wxpck + "%"));

-//				}

 				if (StringUtils.isNotEmpty(ckmc)) {

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

 				} else if(isGET(request)){

@@ -164,9 +149,6 @@ public class CkCtl extends BaseWebCtl {
 
 						list.add(cb.like(root.get("ckmc").as(String.class), "%" + v + "%"));

 					}

 				}

-//				else if (StringUtils.isNotEmpty(SearchCondition.ckmc) && isGET(request)) {

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

-//				}

 

 				// 经营人只能查看自己企业下的数据，非经营人只能查看自己所在地的数据

 				if (isJyr()) {

@@ -212,16 +194,16 @@ public class CkCtl extends BaseWebCtl {
 
 		}

 		Utils.getSession().setAttribute("user", user2);

 		

-//		if (page.getPage() < 1) {

-//			page.setPage(SearchCondition.ckpage);

-//		}

 		if (page.getPage() < 1) {

+			page.setPage(SearchCondition.ckpage);

+		}

+		/*if (page.getPage() < 1) {

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

 			if (StringUtils.isEmpty(ckpage) || !org.apache.commons.lang.StringUtils.isNumeric(String.valueOf(ckpage))) {

 				ckpage = "1";

 			}

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

-		}

+		}*/

 		page.setSort("id");

 		page.setOrder("desc");

 

@@ -251,41 +233,12 @@ public class CkCtl extends BaseWebCtl {
 
 			}

 		}

 

-//		if (isPOST(request)) {

-//			model.addAttribute("ckmc", ckmc);

-//			model.addAttribute("ssjyr", ssjyr);

-//			model.addAttribute("szd", szdid);

-//			model.addAttribute("szgk", szgkid);

-//			model.addAttribute("szgq", szgqid);

-//			model.addAttribute("ssmt", ssmt);

-//			model.addAttribute("wxpck", wxpckid);

-//

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

-//			SearchCondition.ckmc = ckmc;

-//			SearchCondition.ckssjyr = ssjyr;

-//			SearchCondition.ckszd = szdid;

-//			SearchCondition.ckszgk = szgkid;

-//			SearchCondition.ckszgq = szgqid;

-//			SearchCondition.ckssmt = ssmt;

-//			SearchCondition.wxpck = wxpckid;

-//		} else {

-//			model.addAttribute("ckmc", SearchCondition.ckmc);

-//			model.addAttribute("ssjyr", SearchCondition.ckssjyr);

-//			model.addAttribute("szd", SearchCondition.ckszd);

-//			model.addAttribute("szgk", SearchCondition.ckszgk);

-//			model.addAttribute("szgq", SearchCondition.ckszgq);

-//			model.addAttribute("wxpck", SearchCondition.wxpck);

-//			model.addAttribute("ssmt", SearchCondition.ckssmt);

-//		}

-//

-//		model.addAttribute("list", voList);

-//		model.addAttribute("menuid", menuid);

+

 		if (isPOST(request)) {

-			cacheSCmap.put("ckpage", page.getPage());

+			SearchCondition.ckpage=page.getPage();

+			//cacheSCmap.put("ckpage", 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);

+ 85 - 134
gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/jyrdc/ctl/DcCtl.java
파일 보기 

@@ -1,19 +1,21 @@
 
 package com.xt.jygl.gkjygl.gkjyr.jyrdc.ctl;

 

 import java.io.IOException;

-import java.text.SimpleDateFormat;

 import java.util.ArrayList;

 import java.util.List;

 import java.util.Map;

+

 import javax.persistence.criteria.CriteriaBuilder;

+import javax.persistence.criteria.CriteriaBuilder.In;

 import javax.persistence.criteria.CriteriaQuery;

 import javax.persistence.criteria.Predicate;

 import javax.persistence.criteria.Root;

-import javax.persistence.criteria.CriteriaBuilder.In;

 import javax.servlet.ServletOutputStream;

 import javax.servlet.http.HttpServletRequest;

 import javax.servlet.http.HttpServletResponse;

+

 import net.sf.json.JSONObject;

+

 import org.springframework.beans.BeanUtils;

 import org.springframework.beans.factory.annotation.Autowired;

 import org.springframework.data.domain.Page;

@@ -22,7 +24,9 @@ import org.springframework.stereotype.Controller;
 
 import org.springframework.ui.Model;

 import org.springframework.web.bind.annotation.RequestMapping;

 import org.springframework.web.bind.annotation.ResponseBody;

+

 import cache.CacheSearchCondition;

+

 import com.fasterxml.jackson.core.JsonProcessingException;

 import com.xt.jygl.common.BaseWebCtl;

 import com.xt.jygl.common.Constants;

@@ -79,8 +83,7 @@ public class DcCtl extends BaseWebCtl {
 
 	@RequestMapping(value = "/main")

 	@RequiresPermissions("dcxx:main")

 	public String main(SimplePageRequest page, Model model, final HttpServletRequest request, final String szdid, final String szgkid, final String szgqid, final String ssjyr, final String dcmc, String menuid, final String wxpdcid) throws JsonProcessingException {

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

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

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

 		// 查詢條件

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

 

@@ -89,78 +92,59 @@ public class DcCtl 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)){

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

-					if(StringUtils.isNotEmpty(v)){

+				} else if (isGET(request)) {

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

+					if (StringUtils.isNotEmpty(v)) {

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

 					}

 				}

-//				else if (StringUtils.isNotEmpty(SearchCondition.dcszd) && isGET(request)) {

-//					list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + SearchCondition.dcszd + "%"));

-//				}

 				if (StringUtils.isNotEmpty(szgkid)) {

 					list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + szgkid + "%"));

-				} else if(isGET(request)){

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

-					if(StringUtils.isNotEmpty(v)){

+				} else if (isGET(request)) {

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

+					if (StringUtils.isNotEmpty(v)) {

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

 					}

-				} 

-//				else if (StringUtils.isNotEmpty(SearchCondition.dcszgk) && isGET(request)) {

-//					list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + SearchCondition.dcszgk + "%"));

-//				}

+				}

 				if (StringUtils.isNotEmpty(szgqid)) {

 					list.add(cb.like(root.get("szgq").get("id").as(String.class), "%" + szgqid + "%"));

-				} else if(isGET(request)){

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

-					if(StringUtils.isNotEmpty(v)){

+				} else if (isGET(request)) {

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

+					if (StringUtils.isNotEmpty(v)) {

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

 					}

 				}

-//				else if (StringUtils.isNotEmpty(SearchCondition.dcszgq) && isGET(request)) {

-//					list.add(cb.like(root.get("szgq").get("id").as(String.class), "%" + SearchCondition.dcszgq + "%"));

-//				}

 				if (StringUtils.isNotEmpty(ssjyr)) {

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

-				} else if(isGET(request)){

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

-					if(StringUtils.isNotEmpty(v)){

+				} else if (isGET(request)) {

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

+					if (StringUtils.isNotEmpty(v)) {

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

 					}

 				}

-//				else if (StringUtils.isNotEmpty(SearchCondition.dcssjyr) && isGET(request)) {

-//					list.add(cb.like(root.get("ssjyr").get("gkjyr").as(String.class), "%" + SearchCondition.dcssjyr + "%"));

-//				}

 				if (StringUtils.isNotEmpty(dcmc)) {

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

-				} else if(isGET(request)){

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

-					if(StringUtils.isNotEmpty(v)){

+				} else if (isGET(request)) {

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

+					if (StringUtils.isNotEmpty(v)) {

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

 					}

 				}

-//				else if (StringUtils.isNotEmpty(SearchCondition.dcmc) && isGET(request)) {

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

-//				}

 				if (StringUtils.isNotEmpty(wxpdcid)) {

 					list.add(cb.like(root.get("wxpdc").get("id").as(String.class), "%" + wxpdcid + "%"));

-				} else if(isGET(request)){

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

-					if(StringUtils.isNotEmpty(v)){

+				} else if (isGET(request)) {

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

+					if (StringUtils.isNotEmpty(v)) {

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

 					}

 				}

-//				else if (StringUtils.isNotEmpty(SearchCondition.wxpdc) && isGET(request)) {

-//					list.add(cb.like(root.get("wxpdc").get("id").as(String.class), "%" + SearchCondition.wxpdc + "%"));

-//				}

 				// 经营人只能查看自己企业下的数据，非经营人只能查看自己所在地的数据

 				if (isJyr()) {

 					list.add(cb.like(root.get("ssjyr").get("id").as(String.class), "%" + getSsjyr().getId() + "%"));

 				} else {

 					In<String> in = cb.in(root.get("szgq").get("id").as(String.class));

 					@SuppressWarnings("unchecked")

-					List<String> gqlist = (List<String>) Utils.getSession()

-							.getAttribute("gqList");

+					List<String> gqlist = (List<String>) Utils.getSession().getAttribute("gqList");

 					if (gqlist != null && gqlist.size() > 0) {

 						for (int i = 0; i < gqlist.size(); i++) {

 							in.value(gqlist.get(i));

@@ -168,7 +152,7 @@ public class DcCtl extends BaseWebCtl {
 
 						list.add(in);

 					}

 				}

-				//状态为0,9,10,11不显示

+				// 状态为0,9,10,11不显示

 				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORE_STATE_COPY));

 				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_DELETE));

 				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORE_STATE_BGFLAG));

@@ -177,12 +161,11 @@ public class DcCtl extends BaseWebCtl {
 
 			}//

 		};

 

-		

-		//判断登录用户是否和上次登录用户相同，若不同则清空查询条件

+		// 判断登录用户是否和上次登录用户相同，若不同则清空查询条件

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

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

-		if(user2!=null){

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

+		if (user2 != null) {

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

 				SearchCondition.dcpage = 1;

 				SearchCondition.dcmc = "";

 				SearchCondition.dcssjyr = "";

@@ -191,20 +174,20 @@ public class DcCtl extends BaseWebCtl {
 
 				SearchCondition.dcszgq = "";

 				SearchCondition.wxpck = "";

 			}

-			

+

 		}

 		Utils.getSession().setAttribute("user", user2);

-		

-//		if (page.getPage() < 1) {

-//			page.setPage(SearchCondition.dcpage);

-//		}

+

 		if (page.getPage() < 1) {

-			Object dcpage = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "dcpage");

-			if (StringUtils.isEmpty(dcpage) || !org.apache.commons.lang.StringUtils.isNumeric(String.valueOf(dcpage))) {

-				dcpage = "1";

-			}

-			page.setPage(Integer.valueOf(String.valueOf(dcpage)));

+			page.setPage(SearchCondition.dcpage);

 		}

+//		if (page.getPage() < 1) {

+//			Object dcpage = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "dcpage");

+//			if (StringUtils.isEmpty(dcpage) || !org.apache.commons.lang.StringUtils.isNumeric(String.valueOf(dcpage))) {

+//				dcpage = "1";

+//			}

+//			page.setPage(Integer.valueOf(String.valueOf(dcpage)));

+//		}

 		page.setSort("id");

 		page.setOrder("desc");

 

@@ -220,46 +203,19 @@ public class DcCtl extends BaseWebCtl {
 
 				vo.setSsjyrzw(entity.getSsjyr() != null ? entity.getSsjyr().getGkjyr() : "");

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

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

-				if(!StringUtils.isEmpty(vo.getZwdcyt())){

-					vo.setZwdcyt(vo.getZwdcyt().substring(0,vo.getZwdcyt().length()-1));

+				if (!StringUtils.isEmpty(vo.getZwdcyt())) {

+					vo.setZwdcyt(vo.getZwdcyt().substring(0, vo.getZwdcyt().length() - 1));

 				}

 				voList.add(vo);

 			}

 		}

 

-//		if (isPOST(request)) {

-//			model.addAttribute("dcmc", dcmc);

-//			model.addAttribute("ssjyr", ssjyr);

-//			model.addAttribute("szd", szdid);

-//			model.addAttribute("szgk", szgkid);

-//			model.addAttribute("szgq", szgqid);

-//			model.addAttribute("wxpdc", wxpdcid);

-//

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

-//			SearchCondition.dcmc = dcmc;

-//			SearchCondition.dcssjyr = ssjyr;

-//			SearchCondition.dcszd = szdid;

-//			SearchCondition.dcszgk = szgkid;

-//			SearchCondition.dcszgq = szgqid;

-//			SearchCondition.wxpck = wxpdcid;

-//

-//		} else {

-//			model.addAttribute("dcmc", SearchCondition.dcmc);

-//			model.addAttribute("ssjyr", SearchCondition.dcssjyr);

-//			model.addAttribute("szd", SearchCondition.dcszd);

-//			model.addAttribute("szgk", SearchCondition.dcszgk);

-//			model.addAttribute("szgq", SearchCondition.dcszgq);

-//			model.addAttribute("wxpdc", SearchCondition.wxpdc);

-//		}

-//

-//		model.addAttribute("list", voList);

-//		model.addAttribute("menuid", menuid);

+		

 		if (isPOST(request)) {

+			SearchCondition.dcpage=page.getPage();

 			cacheSCmap.put("dcpage", 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);

@@ -269,8 +225,7 @@ public class DcCtl extends BaseWebCtl {
 
 		model.addAttribute("szgk", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "szgkid"));

 		model.addAttribute("szgq", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "szgqid"));

 		model.addAttribute("wxpdc", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "wxpdcid"));

-	

-	

+

 		// 翻页共通

 		putPageInfo(model, page, list);

 		return "gkjygl/gkjyr/jyrdc/dcmain";

@@ -313,7 +268,7 @@ public class DcCtl extends BaseWebCtl {
 
 	@RequestMapping(value = "/save")

 	@RequiresPermissions("dcxx:add")

 	@ResponseBody

-	public WebJsonResult save(Model model, String path, DcEntity code, String szdid, String szgkid, String szgqid, String ssmtid, String ssjyrid, String wxpdcid,String dcsclxid) {

+	public WebJsonResult save(Model model, String path, DcEntity code, String szdid, String szgkid, String szgqid, String ssmtid, String ssjyrid, String wxpdcid, String dcsclxid) {

 		WebJsonResult wr = success();

 		if (StringUtils.isEmpty(szdid)) {

 			wr.setSuccess(false);

@@ -340,17 +295,16 @@ public class DcCtl extends BaseWebCtl {
 
 			wr.setMessage("请选择堆场生产类型！");

 			return wr;

 		}

-		/*if (StringUtils.isEmpty(ssmtid)) {

-			wr.setSuccess(false);

-			wr.setMessage("请选择所属码头！");

-			return wr;

-		}*/

+		/*

+		 * if (StringUtils.isEmpty(ssmtid)) { wr.setSuccess(false);

+		 * wr.setMessage("请选择所属码头！"); return wr; }

+		 */

 		if (StringUtils.isEmpty(code.getDcmc())) {

 			wr.setSuccess(false);

 			wr.setMessage("请输入堆场名称！");

 			return wr;

 		}

-		DcEntity entity =  new DcEntity();

+		DcEntity entity = new DcEntity();

 		try {

 			if (!StringUtils.isEmpty(code.getId())) {

 				entity = dcService.findOne(code.getId());

@@ -398,11 +352,11 @@ public class DcCtl extends BaseWebCtl {
 
 				CodeEntity wxpdc = new CodeEntity(wxpdcid);

 				entity.setWxpdc(wxpdc);

 			}

-			

-			/*if (!StringUtils.isEmpty(dcsclxid)) {

-				CodeEntity dcsclx = new CodeEntity(dcsclxid);

-				entity.setDclx(dcsclx);

-			}*/

+

+			/*

+			 * if (!StringUtils.isEmpty(dcsclxid)) { CodeEntity dcsclx = new

+			 * CodeEntity(dcsclxid); entity.setDclx(dcsclx); }

+			 */

 			CodeEntity dcsclx = new CodeEntity(dcsclxid);

 			entity.setDclx(dcsclx);

 			// 你找啥 查询方法

@@ -411,8 +365,8 @@ public class DcCtl extends BaseWebCtl {
 
 				ssmt.setId(ssmtid);

 				entity.setSsmt(ssmt);

 			}

-			

-			/*entity.setDclx(code.getDclx());*/

+

+			/* entity.setDclx(code.getDclx()); */

 			entity.setMcmj(code.getMcmj());

 			entity.setMcrl(code.getMcrl());

 			entity.setKsdcmj(code.getKsdcmj());

@@ -435,17 +389,15 @@ public class DcCtl extends BaseWebCtl {
 
 			}

 			dcService.save(entity);

 			// 如果是市级新增或者修改，保存后同步到省级

-			/*try {

-				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY) && needWS()) {

-					DcWebService webService = dcService.getWebService(null);

-					webService.save(entity);

-					code.setTbzt(Constants.YES);

-					dcService.save(entity);

-				}

-			} catch (Exception e) {

-				code.setTbzt(Constants.NO);

-				dcService.save(entity);

-			}*/

+			/*

+			 * try { if

+			 * (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY) &&

+			 * needWS()) { DcWebService webService =

+			 * dcService.getWebService(null); webService.save(entity);

+			 * code.setTbzt(Constants.YES); dcService.save(entity); } } catch

+			 * (Exception e) { code.setTbzt(Constants.NO);

+			 * dcService.save(entity); }

+			 */

 		} catch (Exception e) {

 			wr.setSuccess(false);

 			wr.setMessage("操作失败！");

@@ -511,8 +463,8 @@ public class DcCtl extends BaseWebCtl {
 
 		vo.setSsmtzw(entity.getSsmt() != null ? entity.getSsmt().getMtmc() : "");

 		vo.setDclx(entity.getDclx() != null ? entity.getDclx().getId() : "");

 		vo.setDclxzw(entity.getDclx() != null ? entity.getDclx().getText() : "");

-		if(!StringUtils.isEmpty(vo.getZwdcyt())){

-			vo.setZwdcyt(vo.getZwdcyt().substring(0,vo.getZwdcyt().length()-1));

+		if (!StringUtils.isEmpty(vo.getZwdcyt())) {

+			vo.setZwdcyt(vo.getZwdcyt().substring(0, vo.getZwdcyt().length() - 1));

 		}

 		model.addAttribute("record", vo);

 		model.addAttribute("menuid", menuid);

@@ -543,12 +495,12 @@ public class DcCtl extends BaseWebCtl {
 
 		}

 		model.addAttribute("path", path);

 		model.addAttribute("menuid", menuid);

-		if(SecUtils.getCurrUser() != null){

+		if (SecUtils.getCurrUser() != null) {

 			List<CodeEntity> list = securityMgr.codeService().findValidCodesByGroupCodeAndCity(Constants.GROUP_CODE_SZD, GlobalData.CITY_CODE);

-			model.addAttribute("sz",list.size()==1?list.get(0).getId():"");

-			if(list.size()==1){

+			model.addAttribute("sz", list.size() == 1 ? list.get(0).getId() : "");

+			if (list.size() == 1) {

 				List<GkEntity> gklist = gkService.findBySzd(list.get(0).getId());

-				model.addAttribute("gk",gklist.size()==1?gklist.get(0).getId():"");

+				model.addAttribute("gk", gklist.size() == 1 ? gklist.get(0).getId() : "");

 			}

 		}

 		return "gkjygl/gkjyr/jyrdc/dcadd";

@@ -567,14 +519,14 @@ public class DcCtl extends BaseWebCtl {
 
 		List<CodeEntity> list = securityMgr.codeService().findValidCodesByGroupCode(Constants.GROUP_CODE_DCYT);

 		return list;

 	}

-	

+

 	@RequestMapping(value = "/selectDcsclx")

 	@ResponseBody

 	public List<CodeEntity> selectDcsclx() {

 		List<CodeEntity> list = securityMgr.codeService().findValidCodesByGroupCode("KCSCLX");

 		return list;

 	}

-	

+

 	@RequestMapping(value = "/exportExcelAll")

 	public String exportExcelAll(HttpServletResponse response, final String szdid, final String szgkid, final String szgqid, final String ssjyr, final String dcmc, final String wxpdcid) {

 		// 查詢條件

@@ -607,8 +559,7 @@ public class DcCtl extends BaseWebCtl {
 
 				} else {

 					In<String> in = cb.in(root.get("szgq").get("id").as(String.class));

 					@SuppressWarnings("unchecked")

-					List<String> gqlist = (List<String>) Utils.getSession()

-							.getAttribute("gqList");

+					List<String> gqlist = (List<String>) Utils.getSession().getAttribute("gqList");

 					if (gqlist != null && gqlist.size() > 0) {

 						for (int i = 0; i < gqlist.size(); i++) {

 							in.value(gqlist.get(i));

@@ -616,7 +567,7 @@ public class DcCtl extends BaseWebCtl {
 
 						list.add(in);

 					}

 				}

-				//状态为0,9,10,11不显示

+				// 状态为0,9,10,11不显示

 				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORE_STATE_COPY));

 				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_DELETE));

 				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORE_STATE_BGFLAG));

@@ -626,7 +577,7 @@ public class DcCtl extends BaseWebCtl {
 
 		};

 		List<DcEntity> list = query.findAll(spec, DcEntity.class);

 		List<DcVo> voList = entityToVo(list);

-		

+

 		response.setContentType("application/binary;charset=iso-8859-1");

 		try {

 			ServletOutputStream outputStream = response.getOutputStream();

@@ -638,10 +589,10 @@ public class DcCtl extends BaseWebCtl {
 
 		}

 		return null;

 	}

-	

+

 	public List<DcVo> entityToVo(List<DcEntity> list) {

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

-		

+

 		for (DcEntity entity : list) {

 			DcVo vo = new DcVo();

 			if (null != entity) {

@@ -654,14 +605,14 @@ public class DcCtl extends BaseWebCtl {
 
 				vo.setSsmtzw(entity.getSsmt() != null ? entity.getSsmt().getMtmc() : "");

 				vo.setDclx(entity.getDclx() != null ? entity.getDclx().getId() : "");

 				vo.setDclxzw(entity.getDclx() != null ? entity.getDclx().getText() : "");

-				if(!StringUtils.isEmpty(vo.getZwdcyt())){

-					vo.setZwdcyt(vo.getZwdcyt().substring(0,vo.getZwdcyt().length()-1));

+				if (!StringUtils.isEmpty(vo.getZwdcyt())) {

+					vo.setZwdcyt(vo.getZwdcyt().substring(0, vo.getZwdcyt().length() - 1));

 				}

-				

+

 				voList.add(vo);

 			}

 		}

 		return voList;

 	}

-	

+

 }

+ 5 - 15
gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/jyrjbxx/ctl/GkjyrCtl.java
파일 보기 

@@ -21,9 +21,6 @@ import javax.servlet.http.HttpServletResponse;
 
 import net.sf.json.JSONArray;

 import net.sf.json.JSONObject;

 

-import oracle.net.aso.f;

-

-import org.apache.commons.lang.ObjectUtils.Null;

 import org.springframework.beans.BeanUtils;

 import org.springframework.beans.factory.annotation.Autowired;

 import org.springframework.data.domain.Page;

@@ -40,6 +37,7 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 
 import com.xt.jygl.common.BaseWebCtl;

 import com.xt.jygl.common.Constants;

 import com.xt.jygl.common.GlobalData;

+import com.xt.jygl.common.SearchCondition;

 import com.xt.jygl.common.Utils;

 import com.xt.jygl.ggfwxxgl.jdtx.entity.TxEntity;

 import com.xt.jygl.ggfwxxgl.jdtx.service.TxService;

@@ -51,11 +49,9 @@ import com.xt.jygl.gkjcxx.gk.entity.GkEntity;
 
 import com.xt.jygl.gkjcxx.gk.service.GkService;

 import com.xt.jygl.gkjcxx.gq.entity.GqEntity;

 import com.xt.jygl.gkjcxx.gq.service.GqService;

-import com.xt.jygl.gkjcxx.mt.ctl.MtCtl;

 import com.xt.jygl.gkjcxx.mt.entity.MtEntity;

 import com.xt.jygl.gkjcxx.mt.service.MtService;

 import com.xt.jygl.gkjcxx.mt.vo.MtVo;

-import com.xt.jygl.gkjygl.gkjyr.jyrbw.ctl.BwCtl;

 import com.xt.jygl.gkjygl.gkjyr.jyrbw.service.BwService;

 import com.xt.jygl.gkjygl.gkjyr.jyrcg.ctl.CgCtl;

 import com.xt.jygl.gkjygl.gkjyr.jyrcg.entity.CgEntity;

@@ -83,18 +79,15 @@ import com.xt.jygl.gkjygl.gkjyr.qytz.ctl.QytzCtl;
 
 import com.xt.jygl.gkjygl.gkjyr.qytz.entity.QytzEntity;

 import com.xt.jygl.gkjygl.gkjyr.qytz.service.QytzService;

 import com.xt.jygl.gkjygl.gkjyr.qytz.vo.QytzVo;

-import com.xt.jygl.gkjygl.gkjyr.ry.ctl.RyCtl;

 import com.xt.jygl.gkjygl.gkjyr.ry.service.RyService;

 import com.xt.jygl.gkjygl.gkjyr.ry.service.RyzsService;

 import com.xt.jygl.gkjygl.gkjyr.sssb.ctl.SssbCtl;

 import com.xt.jygl.gkjygl.gkjyr.sssb.entity.SssbEntity;

 import com.xt.jygl.gkjygl.gkjyr.sssb.service.SssbService;

 import com.xt.jygl.gkjygl.gkjyr.sssb.vo.SssbVo;

-import com.xt.jygl.gkjygl.gkjyr.xkzfz.ctl.XkzfzCtl;

 import com.xt.jygl.gkjygl.gkjyr.xkzfz.entity.XkzfzEntity;

 import com.xt.jygl.gkjygl.gkjyr.xkzfz.service.XkzfzService;

 import com.xt.jygl.gkjygl.gkjyr.xkzfz.vo.XkzfzVo;

-import com.xt.jygl.gkjygl.gkjyr.xkzxx.ctl.XkzxxCtl;

 import com.xt.jygl.gkjygl.gkjyr.xkzxx.entity.XkzglbEntity;

 import com.xt.jygl.gkjygl.gkjyr.xkzxx.entity.XkzxxEntity;

 import com.xt.jygl.gkjygl.gkjyr.xkzxx.service.XkzglbService;

@@ -434,11 +427,7 @@ public class GkjyrCtl extends BaseWebCtl {
 
 		

 

 		if (page.getPage() < 1) {

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

-			if (StringUtils.isEmpty(jyrpage) || !org.apache.commons.lang.StringUtils.isNumeric(String.valueOf(jyrpage))) {

-				jyrpage = "1";

-			}

-			page.setPage(Integer.valueOf(String.valueOf(jyrpage)));

+			page.setPage(SearchCondition.jyrpage);

 		}

 		page.setSort("id");

 		page.setOrder("desc");

@@ -478,9 +467,10 @@ public class GkjyrCtl extends BaseWebCtl {
 
 		}

 

 		if (isPOST(request)) {

-			cacheSCmap.put("jyrpage", page.getPage());

+			SearchCondition.jyrpage=page.getPage();

+			//cacheSCmap.put("jyrpage", page.getPage());

 			CacheSearchCondition.putCacheSCmap(request.getParameterMap(), cacheSCmap);

-			System.out.println(JSONObject.fromObject(cacheSCmap));

+			//System.out.println(JSONObject.fromObject(cacheSCmap));

 		}

 		System.out.println(isPOST(request));

+ 16 - 49
gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/qytz/ctl/QytzCtl.java
파일 보기 

@@ -1,20 +1,22 @@
 
 package com.xt.jygl.gkjygl.gkjyr.qytz.ctl;

 

 import java.io.IOException;

-import java.text.SimpleDateFormat;

 import java.util.ArrayList;

 import java.util.List;

 import java.util.Map;

+

 import javax.persistence.criteria.CriteriaBuilder;

+import javax.persistence.criteria.CriteriaBuilder.In;

 import javax.persistence.criteria.CriteriaQuery;

 import javax.persistence.criteria.Predicate;

 import javax.persistence.criteria.Root;

-import javax.persistence.criteria.CriteriaBuilder.In;

 import javax.servlet.ServletOutputStream;

 import javax.servlet.http.HttpServletRequest;

 import javax.servlet.http.HttpServletResponse;

+

 import net.sf.json.JSONArray;

 import net.sf.json.JSONObject;

+

 import org.springframework.beans.BeanUtils;

 import org.springframework.beans.factory.annotation.Autowired;

 import org.springframework.data.domain.Page;

@@ -23,7 +25,9 @@ import org.springframework.stereotype.Controller;
 
 import org.springframework.ui.Model;

 import org.springframework.web.bind.annotation.RequestMapping;

 import org.springframework.web.bind.annotation.ResponseBody;

+

 import cache.CacheSearchCondition;

+

 import com.fasterxml.jackson.core.JsonProcessingException;

 import com.xt.jygl.common.BaseWebCtl;

 import com.xt.jygl.common.Constants;

@@ -88,7 +92,6 @@ public class QytzCtl extends BaseWebCtl {
 
 	@RequiresPermissions("qytzxx:main")

 	public String main(SimplePageRequest page, Model model, final HttpServletRequest request, final String szdid, final String tzrmc, final String menuid, final String szgkid, final String szgqid, final String jyr) throws JsonProcessingException {

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

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

 		// 查询条件

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

 

@@ -103,9 +106,6 @@ public class QytzCtl extends BaseWebCtl {
 
 						list.add(cb.like(root.get("tzrmc").as(String.class), "%" + v + "%"));

 					}

 				}

-//				else if (StringUtils.isNotEmpty(SearchCondition.tzrmc) && isGET(request)) {

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

-//				}

 				if (StringUtils.isNotEmpty(szdid)) {

 					list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + szdid + "%"));

 				}else if (isGET(request)) {

@@ -114,9 +114,6 @@ public class QytzCtl extends BaseWebCtl {
 
 						list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + v + "%"));

 					}

 				} 

-//				else if (StringUtils.isNotEmpty(SearchCondition.tzszd) && isGET(request)) {

-//					list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + SearchCondition.tzszd + "%"));

-//				}

 				if (StringUtils.isNotEmpty(szgkid)) {

 					list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + szgkid + "%"));

 				}else if (isGET(request)) {

@@ -125,9 +122,6 @@ public class QytzCtl extends BaseWebCtl {
 
 						list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + v + "%"));

 					}

 				} 

-//				else if (StringUtils.isNotEmpty(SearchCondition.tzszgk) && isGET(request)) {

-//					list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + SearchCondition.tzszgk + "%"));

-//				}

 				if (StringUtils.isNotEmpty(szgqid)) {

 					list.add(cb.like(root.get("szgq").get("id").as(String.class), "%" + szgqid + "%"));

 				}else if (isGET(request)) {

@@ -136,9 +130,6 @@ public class QytzCtl extends BaseWebCtl {
 
 						list.add(cb.like(root.get("szgq").get("id").as(String.class), "%" + v + "%"));

 					}

 				} 

-//				else if (StringUtils.isNotEmpty(SearchCondition.tzszgq) && isGET(request)) {

-//					list.add(cb.like(root.get("szgq").get("id").as(String.class), "%" + SearchCondition.tzszgq + "%"));

-//				}

 				if (StringUtils.isNotEmpty(jyr)) {

 					list.add(cb.like(root.get("ssjyr").get("gkjyr").as(String.class), "%" + jyr + "%"));

 				}else if (isGET(request)) {

@@ -147,9 +138,6 @@ public class QytzCtl extends BaseWebCtl {
 
 						list.add(cb.like(root.get("ssjyr").get("gkjyr").as(String.class), "%" + v + "%"));

 					}

 				}  

-//				else if (StringUtils.isNotEmpty(SearchCondition.tzssjyr) && isGET(request)) {

-//					list.add(cb.like(root.get("ssjyr").get("gkjyr").as(String.class), "%" + SearchCondition.tzssjyr + "%"));

-//				}

 				// 经营人只能查看自己企业下的数据，非经营人只能查看自己所在地的数据

 				if (isJyr()) {

 					list.add(cb.like(root.get("ssjyr").get("id").as(String.class), "%" + getSsjyr().getId() + "%"));

@@ -191,16 +179,16 @@ public class QytzCtl extends BaseWebCtl {
 
 		}

 		Utils.getSession().setAttribute("user", user2);

 		

-//		if (page.getPage() < 1) {

-//			page.setPage(SearchCondition.qytzpage);

-//		}

 		if (page.getPage() < 1) {

-			Object qytzpage = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "qytzpage");

-			if (StringUtils.isEmpty(qytzpage) || !org.apache.commons.lang.StringUtils.isNumeric(String.valueOf(qytzpage))) {

-				qytzpage = "1";

-			}

-			page.setPage(Integer.valueOf(String.valueOf(qytzpage)));

+			page.setPage(SearchCondition.qytzpage);

 		}

+//		if (page.getPage() < 1) {

+//			Object qytzpage = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "qytzpage");

+//			if (StringUtils.isEmpty(qytzpage) || !org.apache.commons.lang.StringUtils.isNumeric(String.valueOf(qytzpage))) {

+//				qytzpage = "1";

+//			}

+//			page.setPage(Integer.valueOf(String.valueOf(qytzpage)));

+//		}

 		

 		page.setSort("id");

 		page.setOrder("desc");

@@ -229,32 +217,11 @@ public class QytzCtl extends BaseWebCtl {
 
 			}

 		}

 

-//		if (isPOST(request)) {

-//			model.addAttribute("tzrmc", tzrmc);

-//			model.addAttribute("jyr", jyr);

-//			model.addAttribute("szd", szdid);

-//			model.addAttribute("szgk", szgkid);

-//			model.addAttribute("szgq", szgqid);

-//

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

-//			SearchCondition.tzrmc = tzrmc;

-//			SearchCondition.tzssjyr = jyr;

-//			SearchCondition.tzszd = szdid;

-//			SearchCondition.tzszgk = szgkid;

-//			SearchCondition.tzszgq = szgqid;

-//		} else {

-//			model.addAttribute("tzrmc", SearchCondition.tzrmc);

-//			model.addAttribute("jyr", SearchCondition.tzssjyr);

-//			model.addAttribute("szd", SearchCondition.tzszd);

-//			model.addAttribute("szgk", SearchCondition.tzszgk);

-//			model.addAttribute("szgq", SearchCondition.tzszgq);

-//		}

 		if (isPOST(request)) {

-			cacheSCmap.put("qytzpage", page.getPage());

+			SearchCondition.qytzpage=page.getPage();

+			//cacheSCmap.put("qytzpage", 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);

+ 12 - 79
gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/ry/ctl/RyCtl.java
파일 보기 

@@ -78,6 +78,7 @@ public class RyCtl extends BaseWebCtl {
 
 

 	/**

 	 * 一览页面

+	 * 

 	 * @param page

 	 * @param model

 	 * @param request

@@ -95,7 +96,6 @@ public class RyCtl extends BaseWebCtl {
 
 	@RequiresPermissions("ryjtzxx:main")

 	public String main(SimplePageRequest page, Model model, final HttpServletRequest request, final String xm, final String szgkid, final String szgqid, final String jyr, final String szdid, final String menuid, final String rylxid) throws JsonProcessingException {

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

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

 		// 查詢條件

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

 

@@ -110,11 +110,6 @@ public class RyCtl extends BaseWebCtl {
 
 						list.add(cb.like(root.get("xm").as(String.class), "%" + v + "%"));

 					}

 				}

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

-				// isGET(request)) {

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

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

-				// }

 				if (StringUtils.isNotEmpty(szdid)) {

 					list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + szdid + "%"));

 				} else if (isGET(request)) {

@@ -123,11 +118,6 @@ public class RyCtl extends BaseWebCtl {
 
 						list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + v + "%"));

 					}

 				}

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

-				// isGET(request)) {

-				// list.add(cb.like(root.get("szd").get("id").as(String.class),

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

-				// }

 				if (StringUtils.isNotEmpty(szgkid)) {

 					list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + szgkid + "%"));

 				} else if (isGET(request)) {

@@ -136,11 +126,6 @@ public class RyCtl extends BaseWebCtl {
 
 						list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + v + "%"));

 					}

 				}

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

-				// isGET(request)) {

-				// list.add(cb.like(root.get("szgk").get("id").as(String.class),

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

-				// }

 				if (StringUtils.isNotEmpty(szgqid)) {

 					list.add(cb.like(root.get("szgq").get("id").as(String.class), "%" + szgqid + "%"));

 				} else if (isGET(request)) {

@@ -149,11 +134,6 @@ public class RyCtl extends BaseWebCtl {
 
 						list.add(cb.like(root.get("szgq").get("id").as(String.class), "%" + v + "%"));

 					}

 				}

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

-				// isGET(request)) {

-				// list.add(cb.like(root.get("szgq").get("id").as(String.class),

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

-				// }

 				if (StringUtils.isNotEmpty(jyr)) {

 					list.add(cb.like(root.get("ssjyr").get("gkjyr").as(String.class), "%" + jyr + "%"));

 				} else if (isGET(request)) {

@@ -162,11 +142,6 @@ public class RyCtl extends BaseWebCtl {
 
 						list.add(cb.like(root.get("ssjyr").get("gkjyr").as(String.class), "%" + v + "%"));

 					}

 				}

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

-				// isGET(request)) {

-				// list.add(cb.like(root.get("ssjyr").get("gkjyr").as(String.class),

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

-				// }

 				if (StringUtils.isNotEmpty(rylxid)) {

 					list.add(cb.like(root.get("rylx").get("id").as(String.class), "%" + rylxid + "%"));

 				} else if (isGET(request)) {

@@ -175,11 +150,6 @@ public class RyCtl extends BaseWebCtl {
 
 						list.add(cb.like(root.get("rylx").get("id").as(String.class), "%" + v + "%"));

 					}

 				}

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

-				// isGET(request)) {

-				// list.add(cb.like(root.get("rylx").get("id").as(String.class),

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

-				// }

 				// 经营人只能查看自己企业下的数据，非经营人只能查看自己所在地的数据

 				if (isJyr()) {

 					list.add(cb.like(root.get("ssjyr").get("id").as(String.class), "%" + getSsjyr().getId() + "%"));

@@ -221,16 +191,16 @@ public class RyCtl extends BaseWebCtl {
 
 		}

 		Utils.getSession().setAttribute("user", user2);

 

-		// if (page.getPage() < 1) {

-		// page.setPage(SearchCondition.rypage);

-		// }

 		if (page.getPage() < 1) {

-			Object rypage = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "rypage");

-			if (StringUtils.isEmpty(rypage) || !org.apache.commons.lang.StringUtils.isNumeric(String.valueOf(rypage))) {

-				rypage = "1";

-			}

-			page.setPage(Integer.valueOf(String.valueOf(rypage)));

+			page.setPage(SearchCondition.rypage);

 		}

+//		if (page.getPage() < 1) {

+//			Object rypage = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "rypage");

+//			if (StringUtils.isEmpty(rypage) || !org.apache.commons.lang.StringUtils.isNumeric(String.valueOf(rypage))) {

+//				rypage = "1";

+//			}

+//			page.setPage(Integer.valueOf(String.valueOf(rypage)));

+//		}

 		// 排序

 		page.setSort("id");

 		page.setOrder("desc");

@@ -260,54 +230,17 @@ public class RyCtl extends BaseWebCtl {
 
 				voList.add(vo);

 			}

 		}

-		/*

-		 * List<GkEntity> gklist = gkService.findAll();

-		 * model.addAttribute("gklist",

-		 * JSONArray.fromObject(gklist).toString());

-		 */

-		/*

-		 * List<CodeEntity> szdlist =

-		 * securityMgr.codeService().findValidCodesByGroupCode("SZD");

-		 * model.addAttribute("szdlist",

-		 * JSONArray.fromObject(szdlist,config).toString());

-		 */

-

-		// if (isPOST(request)) {

-		// model.addAttribute("xm", xm);

-		// model.addAttribute("jyr", jyr);

-		// model.addAttribute("szd", szdid);

-		// model.addAttribute("szgk", szgkid);

-		// model.addAttribute("szgq", szgqid);

-		// model.addAttribute("rylxid", rylxid);

-		//

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

-		// SearchCondition.xm = xm;

-		// SearchCondition.ryssjyr = jyr;

-		// SearchCondition.ryszd = szdid;

-		// SearchCondition.ryszgk = szgkid;

-		// SearchCondition.ryszgq = szgqid;

-		// SearchCondition.rylx = rylxid;

-		//

-		// } else {

-		// model.addAttribute("xm", SearchCondition.xm);

-		// model.addAttribute("jyr", SearchCondition.ryssjyr);

-		// model.addAttribute("szd", SearchCondition.ryszd);

-		// model.addAttribute("szgk", SearchCondition.ryszgk);

-		// model.addAttribute("szgq", SearchCondition.ryszgq);

-		// model.addAttribute("rylxid", SearchCondition.rylx);

-		// }

-

+		

 		model.addAttribute("list", voList);

 		List<CodeEntity> rylxlist = securityMgr.codeService().findValidCodesByGroupCode(Constants.GROUP_CODE_RYLX);

 		model.addAttribute("rylxlist", JSONArray.fromObject(rylxlist, config).toString());

 		model.addAttribute("menuid", menuid);

 

 		if (isPOST(request)) {

-			cacheSCmap.put("rypage", page.getPage());

+			SearchCondition.rypage=page.getPage();

+			//cacheSCmap.put("rypage", page.getPage());

 			CacheSearchCondition.putCacheSCmap(request.getParameterMap(), cacheSCmap);

-			System.out.println(JSONObject.fromObject(cacheSCmap));

 		}

-		System.out.println(isPOST(request));

 

 		model.addAttribute("xm", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "xm"));

 		model.addAttribute("jyr", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "jyr"));

+ 10 - 37
gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/sssb/ctl/SssbCtl.java
파일 보기 

@@ -95,7 +95,6 @@ public class SssbCtl extends BaseWebCtl {
 
 	@RequiresPermissions("sssbxx:main")

 	public String main(SimplePageRequest page, Model model, final HttpServletRequest request, final String ssmc, final String szgkid, final String jyr, final String szgqid, final String szdid, final String menuid) throws JsonProcessingException {

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

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

 		// 查询条件

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

 

@@ -110,11 +109,6 @@ public class SssbCtl extends BaseWebCtl {
 
 						list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + v + "%"));

 					}

 				}

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

-				// isGET(request)) {

-				// list.add(cb.like(root.get("szd").get("id").as(String.class),

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

-				// }

 				if (StringUtils.isNotEmpty(szgkid)) {

 					list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + szgkid + "%"));

 				} else if (isGET(request)) {

@@ -123,11 +117,6 @@ public class SssbCtl extends BaseWebCtl {
 
 						list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + v + "%"));

 					}

 				}

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

-				// isGET(request)) {

-				// list.add(cb.like(root.get("szgk").get("id").as(String.class),

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

-				// }

 				if (StringUtils.isNotEmpty(szgqid)) {

 					list.add(cb.like(root.get("szgq").get("id").as(String.class), "%" + szgqid + "%"));

 				} else if (isGET(request)) {

@@ -136,11 +125,6 @@ public class SssbCtl extends BaseWebCtl {
 
 						list.add(cb.like(root.get("szgq").get("id").as(String.class), "%" + v + "%"));

 					}

 				}

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

-				// isGET(request)) {

-				// list.add(cb.like(root.get("szgq").get("id").as(String.class),

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

-				// }

 				if (StringUtils.isNotEmpty(jyr)) {

 					list.add(cb.like(root.get("ssjyr").get("gkjyr").as(String.class), "%" + jyr + "%"));

 				} else if (isGET(request)) {

@@ -149,11 +133,6 @@ public class SssbCtl extends BaseWebCtl {
 
 						list.add(cb.like(root.get("ssjyr").get("gkjyr").as(String.class), "%" + v + "%"));

 					}

 				}

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

-				// isGET(request)) {

-				// list.add(cb.like(root.get("ssjyr").get("gkjyr").as(String.class),

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

-				// }

 				if (StringUtils.isNotEmpty(ssmc)) {

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

 				} else if (isGET(request)) {

@@ -162,11 +141,6 @@ public class SssbCtl extends BaseWebCtl {
 
 						list.add(cb.like(root.get("ssmc").as(String.class), "%" + v + "%"));

 					}

 				}

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

-				// isGET(request)) {

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

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

-				// }

 				// 经营人只能查看自己企业下的数据，非经营人只能查看自己所在地的数据

 				if (isJyr()) {

 					list.add(cb.like(root.get("ssjyr").get("id").as(String.class), "%" + getSsjyr().getId() + "%"));

@@ -205,16 +179,16 @@ public class SssbCtl extends BaseWebCtl {
 
 		}

 		Utils.getSession().setAttribute("user", user2);

 

-		// if (page.getPage() < 1) {

-		// page.setPage(SearchCondition.sspage);

-		// }

 		if (page.getPage() < 1) {

-			Object sspage = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "sspage");

-			if (StringUtils.isEmpty(sspage) || !org.apache.commons.lang.StringUtils.isNumeric(String.valueOf(sspage))) {

-				sspage = "1";

-			}

-			page.setPage(Integer.valueOf(String.valueOf(sspage)));

+			page.setPage(SearchCondition.sspage);

 		}

+//		if (page.getPage() < 1) {

+//			Object sspage = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "sspage");

+//			if (StringUtils.isEmpty(sspage) || !org.apache.commons.lang.StringUtils.isNumeric(String.valueOf(sspage))) {

+//				sspage = "1";

+//			}

+//			page.setPage(Integer.valueOf(String.valueOf(sspage)));

+//		}

 		page.setSort("id");

 		page.setOrder("desc");

 

@@ -266,11 +240,10 @@ public class SssbCtl extends BaseWebCtl {
 
 		// }

 

 		if (isPOST(request)) {

-			cacheSCmap.put("sspage", page.getPage());

+			SearchCondition.sspage=page.getPage();

+			//cacheSCmap.put("sspage", 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);

+ 10 - 91
gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/xkzfz/ctl/XkzfzCtl.java
파일 보기 

@@ -11,15 +11,16 @@ import java.util.Calendar;
 
 import java.util.Date;

 import java.util.List;

 import java.util.Map;

+

 import javax.persistence.criteria.CriteriaBuilder;

+import javax.persistence.criteria.CriteriaBuilder.In;

 import javax.persistence.criteria.CriteriaQuery;

 import javax.persistence.criteria.Predicate;

 import javax.persistence.criteria.Root;

-import javax.persistence.criteria.CriteriaBuilder.In;

 import javax.servlet.ServletOutputStream;

 import javax.servlet.http.HttpServletRequest;

 import javax.servlet.http.HttpServletResponse;

-import net.sf.json.JSONObject;

+

 import org.springframework.beans.BeanUtils;

 import org.springframework.beans.factory.annotation.Autowired;

 import org.springframework.data.domain.Page;

@@ -29,7 +30,9 @@ import org.springframework.ui.Model;
 
 import org.springframework.web.bind.annotation.RequestMapping;

 import org.springframework.web.bind.annotation.RequestMethod;

 import org.springframework.web.bind.annotation.ResponseBody;

+

 import cache.CacheSearchCondition;

+

 import com.fasterxml.jackson.core.JsonProcessingException;

 import com.liandi.sun.qrcode.QrcodeFactory;

 import com.xt.jygl.common.BaseWebCtl;

@@ -46,7 +49,6 @@ import com.xt.jygl.gkjygl.gkjyr.xkzfz.entity.XkzfzEntity;
 
 import com.xt.jygl.gkjygl.gkjyr.xkzfz.service.XkzfzService;

 import com.xt.jygl.gkjygl.gkjyr.xkzfz.vo.XkzfzVo;

 import com.xtframe.core.anon.auth.RequiresPermissions;

-import com.xtframe.core.support.SecurityMgr;

 import com.xtframe.sec.code.entity.CodeEntity;

 import com.xtframe.sec.common.BaseEntity;

 import com.xtframe.sec.common.QueryService;

@@ -93,11 +95,6 @@ public class XkzfzCtl extends BaseWebCtl {
 
 						list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + v + "%"));

 					}

 				}

-				// else

-				// if(StringUtils.isNotEmpty(SearchCondition.fzszdid)&&isGET(request)){

-				// list.add(cb.like(root.get("szd").get("id").as(String.class),

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

-				// }

 				if (StringUtils.isNotEmpty(szgkid)) {

 					list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + szgkid + "%"));

 				} else if (isGET(request)) {

@@ -106,11 +103,6 @@ public class XkzfzCtl extends BaseWebCtl {
 
 						list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + v + "%"));

 					}

 				}

-				// else

-				// if(StringUtils.isNotEmpty(SearchCondition.fzszgkid)&&isGET(request)){

-				// list.add(cb.like(root.get("szgk").get("id").as(String.class),

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

-				// }

 				if (StringUtils.isNotEmpty(szgqid)) {

 					list.add(cb.like(root.get("szgq").get("id").as(String.class), "%" + szgqid + "%"));

 				} else if (isGET(request)) {

@@ -119,11 +111,6 @@ public class XkzfzCtl extends BaseWebCtl {
 
 						list.add(cb.like(root.get("szgq").get("id").as(String.class), "%" + v + "%"));

 					}

 				}

-				// else

-				// if(StringUtils.isNotEmpty(SearchCondition.fzszgqid)&&isGET(request)){

-				// list.add(cb.like(root.get("szgq").get("id").as(String.class),

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

-				// }

 				if (StringUtils.isNotEmpty(ssjyr)) {

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

 				} else if (isGET(request)) {

@@ -132,11 +119,6 @@ public class XkzfzCtl extends BaseWebCtl {
 
 						list.add(cb.like(root.get("ssjyr").get("gkjyr").as(String.class), "%" + v + "%"));

 					}

 				}

-				// else

-				// if(StringUtils.isNotEmpty(SearchCondition.fzssjyr)&&isGET(request)){

-				// list.add(cb.like(root.get("ssjyr").get("gkjyr").as(String.class),

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

-				// }

 				if (StringUtils.isNotEmpty(fzsqh)) {

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

 				} else if (isGET(request)) {

@@ -145,11 +127,6 @@ public class XkzfzCtl extends BaseWebCtl {
 
 						list.add(cb.like(root.get("fzsqh").as(String.class), "%" + v + "%"));

 					}

 				}

-				// else

-				// if(StringUtils.isNotEmpty(SearchCondition.fzsqh)&&isGET(request)){

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

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

-				// }

 				if (StringUtils.isNotEmpty(wxhwpm)) {

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

 				} else if (isGET(request)) {

@@ -158,11 +135,6 @@ public class XkzfzCtl extends BaseWebCtl {
 
 						list.add(cb.like(root.get("wxhwpm").as(String.class), "%" + v + "%"));

 					}

 				}

-				// else

-				// if(StringUtils.isNotEmpty(SearchCondition.fzwxhwpm)&&isGET(request)){

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

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

-				// }

 				if (StringUtils.isNotEmpty(fzsfyx)) {

 					if (("是").equals(fzsfyx)) {

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

@@ -179,16 +151,6 @@ public class XkzfzCtl extends BaseWebCtl {
 
 						}

 					}

 				}

-				// else

-				// if(StringUtils.isNotEmpty(SearchCondition.fzsfyx)&&isGET(request)){

-				// if(("是").equals(SearchCondition.fzsfyx)){

-				// list.add(cb.equal(root.get("recordStatus").as(String.class),

-				// "1"));

-				// }else{

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

-				// "1"));

-				// }

-				// }

 				Date now = new Date();

 				if (StringUtils.isNotEmpty(fzsfdq)) {

 					if ((fzsfdq).equals("6103")) {

@@ -212,20 +174,6 @@ public class XkzfzCtl extends BaseWebCtl {
 
 					}

 				}

 

-				// else

-				// if(StringUtils.isNotEmpty(SearchCondition.fzsfdq)&&isGET(request)){

-				// if((SearchCondition.fzsfdq).equals("6103")){

-				// list.add(cb.lessThanOrEqualTo(root.get("yxqjssj").as(Date.class),

-				// now));

-				// }else if((SearchCondition.fzsfdq).equals("6101")){

-				// list.add(cb.greaterThan(root.get("yxqjssj").as(Date.class),

-				// now));

-				// }else{

-				// list.add(cb.lessThanOrEqualTo(root.get("yxqjssj").as(Date.class),DateTime.addDays(now,

-				// 30)));

-				// }

-				// }

-

 				// 经营人只能查看自己企业下的数据，非经营人只能查看自己所在地的数据

 				if (isJyr()) {

 					list.add(cb.like(root.get("ssjyr").get("id").as(String.class), "%" + getSsjyr().getId() + "%"));

@@ -264,25 +212,11 @@ public class XkzfzCtl extends BaseWebCtl {
 
 		Utils.getSession().setAttribute("user", user2);

 

 		if (page.getPage() < 1) {

-			Object fzpage = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "fzpage");

-			if (StringUtils.isEmpty(fzpage) || !org.apache.commons.lang.StringUtils.isNumeric(String.valueOf(fzpage))) {

-				fzpage = "1";

-			}

-			page.setPage(Integer.valueOf(String.valueOf(fzpage)));

+			page.setPage(SearchCondition.fzpage);

 		}

 		page.setSort("yxqjssj");

 		page.setOrder("desc");

-		// if(isPOST(request)){

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

-		// SearchCondition.fzsqh=fzsqh;

-		// SearchCondition.fzszdid=szdid;

-		// SearchCondition.fzszgqid=szgqid;

-		// SearchCondition.fzszgkid=szgkid;

-		// SearchCondition.fzssjyr=ssjyr;

-		// SearchCondition.fzsfyx= fzsfyx;

-		// SearchCondition.fzwxhwpm = wxhwpm;

-		// SearchCondition.fzsfdq = fzsfdq;

-		// }

+

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

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

 		for (XkzfzEntity entity : list) {

@@ -319,27 +253,12 @@ public class XkzfzCtl extends BaseWebCtl {
 
 				voList.add(vo);

 			}

 		}

-		// model.addAttribute("list", voList);

-		// model.addAttribute("ssjyr",

-		// isPOST(request)?ssjyr:SearchCondition.fzssjyr);

-		// model.addAttribute("szd",

-		// isPOST(request)?szdid:SearchCondition.fzszdid);

-		// model.addAttribute("szgk",

-		// isPOST(request)?szgkid:SearchCondition.fzszgkid);

-		// model.addAttribute("szgq",

-		// isPOST(request)?szgqid:SearchCondition.fzszgqid);

-		// model.addAttribute("fzsqh",

-		// isPOST(request)?fzsqh:SearchCondition.fzsqh);

-		// model.addAttribute("fzsfyx",isPOST(request)?fzsfyx:SearchCondition.fzsfyx);

-		// model.addAttribute("fzwxhwpm",isPOST(request)?fzsfyx:SearchCondition.fzwxhwpm);

-		// model.addAttribute("fzsfdq",isPOST(request)?fzsfdq:SearchCondition.fzsfdq);

-		// model.addAttribute("menuid", menuid);

+

 		if (isPOST(request)) {

-			cacheSCmap.put("fzpage", page.getPage());

+			SearchCondition.fzpage = page.getPage();

+			// cacheSCmap.put("fzpage", page.getPage());

 			CacheSearchCondition.putCacheSCmap(request.getParameterMap(), cacheSCmap);

-			System.out.println(JSONObject.fromObject(cacheSCmap));

 		}

-		System.out.println(isPOST(request));

 

 		model.addAttribute("list", voList);

 		model.addAttribute("ssjyr", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "ssjyr"));

+ 5 - 43
gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/xkzxx/ctl/XkzxxCtl.java
파일 보기 

@@ -221,12 +221,6 @@ public class XkzxxCtl extends BaseWebCtl {
 
 						list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + v + "%"));

 					}

 				}

-

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

-				// isGET(request)) {

-				// list.add(cb.like(root.get("szd").get("id").as(String.class),

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

-				// }

 				if (StringUtils.isNotEmpty(szgkid)) {

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

 				} else if (isGET(request)) {

@@ -235,11 +229,6 @@ public class XkzxxCtl extends BaseWebCtl {
 
 						list.add(cb.like(root.get("szgk").as(String.class), "%" + v + "%"));

 					}

 				}

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

-				// isGET(request)) {

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

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

-				// }

 				if (StringUtils.isNotEmpty(szgqid)) {

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

 				} else if (isGET(request)) {

@@ -248,11 +237,6 @@ public class XkzxxCtl extends BaseWebCtl {
 
 						list.add(cb.like(root.get("ssgq").as(String.class), "%" + v + "%"));

 					}

 				}

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

-				// isGET(request)) {

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

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

-				// }

 				if (StringUtils.isNotEmpty(gkjyr)) {

 					Subquery<GkjyrEntity> subquery = query.subquery(GkjyrEntity.class);

 					Root<GkjyrEntity> dpRoot = subquery.from(GkjyrEntity.class);

@@ -275,12 +259,6 @@ public class XkzxxCtl extends BaseWebCtl {
 
 						list.add(cb.exists(subquery));

 					}

 				}

-

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

-				// isGET(request)) {

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

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

-				// }

 				if (StringUtils.isNotEmpty(gkjyxkzh)) {

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

 				} else if (isGET(request)) {

@@ -316,10 +294,6 @@ public class XkzxxCtl extends BaseWebCtl {
 
 						list.add(cb.greaterThanOrEqualTo(root.get("yxqz").as(Date.class), yxq1Date));

 					}

 				}

-				// else if (SearchCondition.yxq1 != null && isGET(request)) {

-				// list.add(cb.greaterThanOrEqualTo(root.get("yxqz").as(Date.class),

-				// SearchCondition.yxq1));

-				// }

 				if (yxq2 != null) {

 					list.add(cb.lessThanOrEqualTo(root.get("yxqz").as(Date.class), yxq2));

 				} else if (isGET(request)) {

@@ -335,10 +309,6 @@ public class XkzxxCtl extends BaseWebCtl {
 
 						list.add(cb.lessThanOrEqualTo(root.get("yxqz").as(Date.class), yxq2Date));

 					}

 				}

-				// else if (SearchCondition.yxq2 != null && isGET(request)) {

-				// list.add(cb.lessThanOrEqualTo(root.get("yxqz").as(Date.class),

-				// SearchCondition.yxq2));

-				// }

 

 				Date now = new Date();

 				if (StringUtils.isNotEmpty(xkzsfdq)) {

@@ -402,11 +372,7 @@ public class XkzxxCtl extends BaseWebCtl {
 
 		Utils.getSession().setAttribute("user", user2);

 

 		if (page.getPage() < 1) {

-			Object xkzpage = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "xkzpage");

-			if (StringUtils.isEmpty(xkzpage) || !org.apache.commons.lang.StringUtils.isNumeric(String.valueOf(xkzpage))) {

-				xkzpage = "1";

-			}

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

+			page.setPage(SearchCondition.xkzpage);

 		}

 

 		page.setOrder("asc");

@@ -417,11 +383,7 @@ public class XkzxxCtl extends BaseWebCtl {
 
 			if (entity != null && entity.getRecordStatus() != 9) {

 				BeanUtils.copyProperties(entity, vo);

 				Date date = new Date();

-				/*

-				 * SimpleDateFormat formatter = new

-				 * SimpleDateFormat("yyyy-MM-dd"); String

-				 * dqrq=formatter.format(date);

-				 */

+				

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

 				if (day < 30 || day == 30) {

 					vo.setSfred("1");

@@ -456,11 +418,11 @@ public class XkzxxCtl extends BaseWebCtl {
 
 		}

 

 		if (isPOST(request)) {

-			cacheSCmap.put("xkzpage", page.getPage());

+			SearchCondition.xkzpage=page.getPage();

+			//cacheSCmap.put("xkzpage", page.getPage());

 			CacheSearchCondition.putCacheSCmap(request.getParameterMap(), cacheSCmap);

-			System.out.println(JSONObject.fromObject(cacheSCmap));

+			//System.out.println(JSONObject.fromObject(cacheSCmap));

 		}

-		System.out.println(isPOST(request));

 

 		model.addAttribute("list", voList);

 		model.addAttribute("gkjyrzw", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "gkjyr"));

+ 75 - 36
gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxkbg/ctl/XkzbgCtl.java
파일 보기 

@@ -35,6 +35,7 @@ import com.xt.jygl.accessory.service.AccessoryService;
 
 import com.xt.jygl.common.BaseWebCtl;

 import com.xt.jygl.common.Constants;

 import com.xt.jygl.common.GlobalData;

+import com.xt.jygl.common.SearchCondition;

 import com.xt.jygl.common.Utils;

 import com.xt.jygl.gkjcxx.gk.entity.GkEntity;

 import com.xt.jygl.gkjcxx.gk.service.GkService;

@@ -187,22 +188,31 @@ public class XkzbgCtl extends BaseWebCtl {
 
 

 	/**

 	 * 一览信息

-	 * @param page 分页

+	 * 

+	 * @param page

+	 *            分页

 	 * @param model

-	 * @param lczt 流程状态

-	 * @param szdid 所在地ID

-	 * @param szgkid 所在港口ID

-	 * @param szgqid 所在港区ID

-	 * @param gkjyr　经营人

-	 * @param fddbr　法定代表人

-	 * @param bgdd　办公地点

+	 * @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 {

+	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 {

 		UserEntity user = securityMgr.getCurrUser();

 		GkjyrEntity jyr = new GkjyrEntity();

 		if (!StringUtils.isEmpty(user.getSsjyr())) {

@@ -261,6 +271,10 @@ public class XkzbgCtl extends BaseWebCtl {
 
 				return cb.and(list.toArray(new Predicate[] {}));

 			}

 		};

+

+		if (page.getPage() < 1) {

+			page.setPage(SearchCondition.xkzbgpage);

+		}

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

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

 		for (XkzbgEntity entity : list) {

@@ -289,6 +303,9 @@ public class XkzbgCtl extends BaseWebCtl {
 
 				}

 			}

 		}

+		if (isPOST(request)) {

+			SearchCondition.xkzbgpage = page.getPage();

+		}

 		model.addAttribute("lczt", lczt);

 		model.addAttribute("gkjyr", gkjyr);

 		model.addAttribute("fddbr", fddbr);

@@ -488,6 +505,7 @@ public class XkzbgCtl extends BaseWebCtl {
 
 

 	/**

 	 * 得到附件信息

+	 * 

 	 * @param jyrid

 	 * @return

 	 */

@@ -1753,17 +1771,17 @@ public class XkzbgCtl extends BaseWebCtl {
 
 			GkjyrEntity jyr = gkjyrService.findOne(xkzbgEntity.getJyrid());

 			jyr.setRecordStatus(BaseEntity.RECORE_STATE_BGFLAG);

 			jyr = gkjyrService.save(jyr);

-			changStatus(jyr.getId(),BaseEntity.RECORE_STATE_BGFLAG);

+			changStatus(jyr.getId(), BaseEntity.RECORE_STATE_BGFLAG);

 

 			GkjyrEntity bgjyr = gkjyrService.findOne(jyr.getBgjyrid());

 			bgjyr.setRecordStatus(BaseEntity.RECORE_STATE_BGFLAG);

 			bgjyr = gkjyrService.save(bgjyr);

-			changStatus(bgjyr.getId(),BaseEntity.RECORE_STATE_BGFLAG);

-			

+			changStatus(bgjyr.getId(), BaseEntity.RECORE_STATE_BGFLAG);

+

 			GkjyrEntity yjyr = gkjyrService.findOne(jyr.getYjyrid());

 			yjyr.setRecordStatus(BaseEntity.RECORE_STATE_BGFLAG);

 			yjyr = gkjyrService.save(yjyr);

-			changStatus(yjyr.getId(),BaseEntity.RECORE_STATE_BGFLAG);

+			changStatus(yjyr.getId(), BaseEntity.RECORE_STATE_BGFLAG);

 

 			// 码头

 			List<XkzglbEntity> xkzglbList = xkzglbService.findByCzid(xkzbgEntity.getId(), "1");

@@ -2052,13 +2070,19 @@ 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 code

+	 * @param jydyids

+	 *            经营范围ID

+	 * @param accid

+	 *            附件Id

+	 * @param mtids

+	 *            码头ID

+	 * @param bwids

+	 *            泊位ID

+	 * @param cgids

+	 *            储罐ID

 	 * @param ckids

 	 * @param dcids

 	 * @param ryids

@@ -2136,12 +2160,12 @@ public class XkzbgCtl extends BaseWebCtl {
 
 			GkjyrEntity jyr = gkjyrService.findOne(xkzbgEntity.getJyrid());

 			jyr.setRecordStatus(BaseEntity.RECORE_STATE_BGFLAG);

 			jyr = gkjyrService.save(jyr);

-			changStatus(jyr.getId(),BaseEntity.RECORE_STATE_BGFLAG);

+			changStatus(jyr.getId(), BaseEntity.RECORE_STATE_BGFLAG);

 

 			GkjyrEntity bgjyr = gkjyrService.findOne(jyr.getBgjyrid());

 			bgjyr.setRecordStatus(BaseEntity.RECORE_STATE_BGFLAG);

 			bgjyr = gkjyrService.save(bgjyr);

-			changStatus(bgjyr.getId(),BaseEntity.RECORE_STATE_BGFLAG);

+			changStatus(bgjyr.getId(), BaseEntity.RECORE_STATE_BGFLAG);

 

 			// 码头

 			List<XkzglbEntity> xkzglbList = xkzglbService.findByCzid(xkzbgEntity.getId(), "1");

@@ -2348,18 +2372,30 @@ public class XkzbgCtl extends BaseWebCtl {
 
 

 	/**

 	 * 退回再提交

+	 * 

 	 * @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

+	 * @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")

@@ -2692,9 +2728,13 @@ public class XkzbgCtl extends BaseWebCtl {
 
 

 	/**

 	 * 审核流程

-	 * @param shyj 审核意见

-	 * @param id 主键ID

-	 * @param flag 同意true 不同意 false

+	 * 

+	 * @param shyj

+	 *            审核意见

+	 * @param id

+	 *            主键ID

+	 * @param flag

+	 *            同意true 不同意 false

 	 * @return

 	 */

 	@RequestMapping(value = "/audit")

@@ -2915,7 +2955,6 @@ public class XkzbgCtl extends BaseWebCtl {
 
 			// 原经营人

 			GkjyrEntity njyr = gkjyrService.findOne(bgjyr.getYjyrid());

 

-			

 			XkzxxEntity xkz = new XkzxxEntity();

 			xkz.setGkjyr(njyr.getId());

 			xkz.setSpr(user.getName());

+ 6 - 8
gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxksq/ctl/XkzsqCtl.java
파일 보기 

@@ -17,8 +17,6 @@ import javax.persistence.criteria.Root;
 
 import javax.servlet.http.HttpServletRequest;

 import javax.servlet.http.HttpServletResponse;

 

-import net.sf.json.JSONObject;

-

 import org.activiti.engine.ActivitiException;

 import org.springframework.beans.BeanUtils;

 import org.springframework.beans.factory.annotation.Autowired;

@@ -195,7 +193,6 @@ public class XkzsqCtl extends BaseWebCtl {
 
 		}

 		model.addAttribute("user", user);

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

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

 		// 查询条件

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

 			@Override

@@ -290,14 +287,16 @@ 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))) {

 				xkzsqpage = "1";

 			}

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

-		}

+		}*/

 		page.setSort("id");

 		page.setOrder("desc");

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

@@ -330,11 +329,10 @@ public class XkzsqCtl extends BaseWebCtl {
 
 		}

 		

 		if (isPOST(request)) {

-			cacheSCmap.put("xkzsqpage", page.getPage());

+			SearchCondition.xkzsqpage = page.getPage();

+			//cacheSCmap.put("xkzsqpage", page.getPage());

 			CacheSearchCondition.putCacheSCmap(request.getParameterMap(), cacheSCmap);

-			System.out.println(JSONObject.fromObject(cacheSCmap));

 		}

-		

 

 		model.addAttribute("list", voList);

 		model.addAttribute("menuid", menuid);

+ 9 - 2
gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxkyx/ctl/XkzyxCtl.java
파일 보기 

@@ -34,6 +34,7 @@ import com.xt.jygl.accessory.service.AccessoryService;
 
 import com.xt.jygl.common.BaseWebCtl;

 import com.xt.jygl.common.Constants;

 import com.xt.jygl.common.GlobalData;

+import com.xt.jygl.common.SearchCondition;

 import com.xt.jygl.common.Utils;

 import com.xt.jygl.gkjcxx.gk.entity.GkEntity;

 import com.xt.jygl.gkjcxx.gk.service.GkService;

@@ -158,7 +159,7 @@ public class XkzyxCtl extends BaseWebCtl {
 
 	 */

 	@RequestMapping(value = "/main")

 	@RequiresPermissions("gkjyxkyx:main")

-	public String main(SimplePageRequest page, Model model, final String szdid, final String szgkid, final String szgqid, final String gkjyr, final String fddbr, final String bgdd, String menuid) throws JsonProcessingException {

+	public String main(SimplePageRequest page,final HttpServletRequest request, Model model, final String szdid, final String szgkid, final String szgqid, final String gkjyr, final String fddbr, final String bgdd, String menuid) throws JsonProcessingException {

 

 		UserEntity user = securityMgr.getCurrUser();

 		GkjyrEntity jyr = new GkjyrEntity();

@@ -207,6 +208,10 @@ public class XkzyxCtl extends BaseWebCtl {
 
 				return cb.and(list.toArray(new Predicate[] {}));

 			}

 		};

+		

+		if(page.getPage()<1){

+			page.setPage(SearchCondition.xkzyxpage);

+		}

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

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

 

@@ -238,7 +243,9 @@ public class XkzyxCtl extends BaseWebCtl {
 
 				}

 			}

 		}

-

+		if (isPOST(request)) {

+			SearchCondition.xkzyxpage = page.getPage();

+		}

 		model.addAttribute("gkjyr", gkjyr);

 		model.addAttribute("fddbr", fddbr);

 		model.addAttribute("bgdd", bgdd);

+ 33 - 17
gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxkzx/ctl/XkzzxCtl.java
파일 보기 

@@ -35,6 +35,7 @@ import com.xt.jygl.accessory.service.AccessoryService;
 
 import com.xt.jygl.common.BaseWebCtl;

 import com.xt.jygl.common.Constants;

 import com.xt.jygl.common.GlobalData;

+import com.xt.jygl.common.SearchCondition;

 import com.xt.jygl.common.Utils;

 import com.xt.jygl.gkjcxx.gk.entity.GkEntity;

 import com.xt.jygl.gkjcxx.gk.service.GkService;

@@ -189,16 +190,19 @@ 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

 	 */

 	@RequestMapping(value = "/main")

 	@RequiresPermissions("gkjyxkzx:main")

-	public String main(SimplePageRequest page, Model model, final String szdid, final String szgkid, final String szgqid, final String gkjyr, final String fddbr, final String bgdd, String menuid) throws JsonProcessingException {

+	public String main(SimplePageRequest page, final HttpServletRequest request, Model model, final String szdid, final String szgkid, final String szgqid, final String gkjyr, final String fddbr, final String bgdd, String menuid) throws JsonProcessingException {

 		UserEntity user = securityMgr.getCurrUser();

 		GkjyrEntity jyr = new GkjyrEntity();

 		if (!StringUtils.isEmpty(user.getSsjyr())) {

@@ -253,6 +257,10 @@ public class XkzzxCtl extends BaseWebCtl {
 
 				return cb.and(list.toArray(new Predicate[] {}));

 			}

 		};

+

+		if (page.getPage() < 1) {

+			page.setPage(SearchCondition.xkzzxpage);

+		}

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

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

 

@@ -278,7 +286,9 @@ public class XkzzxCtl extends BaseWebCtl {
 
 				}

 			}

 		}

-

+		if (isPOST(request)) {

+			SearchCondition.xkzzxpage = page.getPage();

+		}

 		model.addAttribute("gkjyr", gkjyr);

 		model.addAttribute("fddbr", fddbr);

 		model.addAttribute("bgdd", bgdd);

@@ -429,8 +439,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,7 +489,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>();

@@ -515,6 +525,7 @@ public class XkzzxCtl extends BaseWebCtl {
 
 

 	/**

 	 * 获取最新附件列表

+	 * 

 	 * @param jyrid

 	 * @return

 	 */

@@ -1532,13 +1543,13 @@ public class XkzzxCtl extends BaseWebCtl {
 
 				}

 				xkzzxEntity = xkzzxService.save(code);

 			}

-			//注销经营人

+			// 注销经营人

 			GkjyrEntity jyr = gkjyrService.findOne(code.getJyrid());

 			jyr.setRecordStatus(BaseEntity.RECORE_STATE_ZXFLAG);

 			jyr = gkjyrService.save(jyr);

-			changStatus(jyr.getId(),BaseEntity.RECORE_STATE_ZXFLAG);

-			

-			//原经营人

+			changStatus(jyr.getId(), BaseEntity.RECORE_STATE_ZXFLAG);

+

+			// 原经营人

 			GkjyrEntity yjyr = gkjyrService.findOne(jyr.getYjyrid());

 			yjyr.setRecordStatus(BaseEntity.RECORE_STATE_ZXFLAG);

 			yjyr = gkjyrService.save(yjyr);

@@ -1682,7 +1693,7 @@ public class XkzzxCtl extends BaseWebCtl {
 
 			GkjyrEntity yjyr = gkjyrService.findOne(jyr.getYjyrid());

 			yjyr.setRecordStatus(BaseEntity.RECORE_STATE_ZXFLAG);

 			yjyr = gkjyrService.save(yjyr);

-			changStatus(yjyr.getId(),BaseEntity.RECORE_STATE_ZXFLAG);

+			changStatus(yjyr.getId(), BaseEntity.RECORE_STATE_ZXFLAG);

 

 			if (!StringUtils.isEmpty(accid)) {

 				// 关联附件

@@ -1963,7 +1974,7 @@ public class XkzzxCtl extends BaseWebCtl {
 
 			GkjyrEntity ygkjyr = gkjyrService.findOne(gkjyr.getYjyrid());

 			ygkjyr.setRecordStatus(BaseEntity.RECORD_STATE_VALID);

 			gkjyrService.save(ygkjyr);

-			changStatus(ygkjyr.getId(),BaseEntity.RECORD_STATE_VALID);

+			changStatus(ygkjyr.getId(), BaseEntity.RECORD_STATE_VALID);

 		} catch (Exception e) {

 			wr.setSuccess(false);

 			wr.setMessage("操作失败！");

@@ -1974,9 +1985,13 @@ public class XkzzxCtl extends BaseWebCtl {
 
 

 	/**

 	 * 流程处理（同意，不同意）

-	 * @param shyj 审核意见

-	 * @param id   主键ID

-	 * @param flag 是否同意

+	 * 

+	 * @param shyj

+	 *            审核意见

+	 * @param id

+	 *            主键ID

+	 * @param flag

+	 *            是否同意

 	 * @return

 	 */

 	@RequestMapping(value = "/audit")

@@ -2054,6 +2069,7 @@ public class XkzzxCtl extends BaseWebCtl {
 
 

 	/**

 	 * 许可决定书

+	 * 

 	 * @param model

 	 * @param zxid

 	 * @return

+ 34 - 13
gkjsjy/trunk/src/com/xt/jygl/gkjygl/gklhxkgl/gkjylhbg/ctl/LhbgCtl.java
파일 보기 

@@ -31,6 +31,7 @@ import com.xt.jygl.accessory.service.AccessoryService;
 
 import com.xt.jygl.common.BaseWebCtl;

 import com.xt.jygl.common.Constants;

 import com.xt.jygl.common.GlobalData;

+import com.xt.jygl.common.SearchCondition;

 import com.xt.jygl.ftp.Ftp;

 import com.xt.jygl.ftp.FtpUtil;

 import com.xt.jygl.gkjcxx.gk.service.GkService;

@@ -93,13 +94,19 @@ public class LhbgCtl extends BaseWebCtl {
 
 

 	/**

 	 * 一览页面

-	 * @param page 分页

+	 * 

+	 * @param page

+	 *            分页

 	 * @param model

 	 * @param lczt

-	 * @param szdid 所在地ID

-	 * @param szgkid 所在港口ID

-	 * @param szgqid　所在港区ID

-	 * @param gkjyr　经营人

+	 * @param szdid

+	 *            所在地ID

+	 * @param szgkid

+	 *            所在港口ID

+	 * @param szgqid

+	 *            　所在港区ID

+	 * @param gkjyr

+	 *            　经营人

 	 * @param fddbr

 	 * @param bgdd

 	 * @param menuid

@@ -108,7 +115,7 @@ public class LhbgCtl extends BaseWebCtl {
 
 	 */

 	@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 {

+	public String main(SimplePageRequest page, final HttpServletRequest request, 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 {

 		UserEntity user = securityMgr.getCurrUser();

 		GkjyrEntity jyr = new GkjyrEntity();

 		if (!StringUtils.isEmpty(user.getSsjyr())) {

@@ -150,6 +157,9 @@ public class LhbgCtl extends BaseWebCtl {
 
 				return cb.and(list.toArray(new Predicate[] {}));

 			}

 		};

+		if (page.getPage() < 1) {

+			page.setPage(SearchCondition.lhbgpage);

+		}

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

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

 		for (LhbgEntity entity : list) {

@@ -192,6 +202,9 @@ public class LhbgCtl extends BaseWebCtl {
 
 				voList.add(vo);

 			}

 		}

+		if (isPOST(request)) {

+			SearchCondition.lhbgpage = page.getPage();

+		}

 		model.addAttribute("lczt", lczt);

 		model.addAttribute("gkjyr", gkjyr);

 		model.addAttribute("fddbr", fddbr);

@@ -234,6 +247,7 @@ public class LhbgCtl extends BaseWebCtl {
 
 

 	/**

 	 * 查看

+	 * 

 	 * @param model

 	 * @param id

 	 * @param flag

@@ -279,7 +293,7 @@ public class LhbgCtl extends BaseWebCtl {
 
 		}

 		model.addAttribute("record", lhbg);

 

-		//流程状态

+		// 流程状态

 		String roleCode = "";

 		String currName = "";

 		TaskInfoEntity taskinfo = taskInfoService.findByStep(id, LhbgEntity.PROCESS_DEFINITION_KEY);

@@ -303,7 +317,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++) {

@@ -343,6 +357,7 @@ public class LhbgCtl extends BaseWebCtl {
 
 

 	/**

 	 * 编辑

+	 * 

 	 * @param model

 	 * @param id

 	 * @param flag

@@ -467,7 +482,7 @@ public class LhbgCtl extends BaseWebCtl {
 
 		return wr;

 	}

 

-	//同步数据

+	// 同步数据

 	@RequestMapping(value = "/saveTbzt")

 	@ResponseBody

 	public WebJsonResult saveTbzt(Model model, String id) {

@@ -553,6 +568,7 @@ public class LhbgCtl extends BaseWebCtl {
 
 

 	/**

 	 * 退回提交

+	 * 

 	 * @param code

 	 * @param jydyids

 	 * @param accid

@@ -690,10 +706,15 @@ public class LhbgCtl extends BaseWebCtl {
 
 

 	/**

 	 * 审核流程

-	 * @param shyj 审批意见

-	 * @param id 主键ID

-	 * @param flag 同意True 不同意Flase

-	 * @param userids 用户

+	 * 

+	 * @param shyj

+	 *            审批意见

+	 * @param id

+	 *            主键ID

+	 * @param flag

+	 *            同意True 不同意Flase

+	 * @param userids

+	 *            用户

 	 * @return

 	 */

 	@RequestMapping(value = "/audit")

+ 8 - 1
gkjsjy/trunk/src/com/xt/jygl/gkjygl/gklhxkgl/gkjylhsq/ctl/LhsqCtl.java
파일 보기 

@@ -31,6 +31,7 @@ import com.xt.jygl.accessory.service.AccessoryService;
 
 import com.xt.jygl.common.BaseWebCtl;

 import com.xt.jygl.common.Constants;

 import com.xt.jygl.common.GlobalData;

+import com.xt.jygl.common.SearchCondition;

 import com.xt.jygl.ftp.Ftp;

 import com.xt.jygl.ftp.FtpUtil;

 import com.xt.jygl.gkjcxx.gq.service.GqService;

@@ -96,7 +97,7 @@ public class LhsqCtl extends BaseWebCtl {
 
 	 */

 	@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 {

+	public String main(SimplePageRequest page,final HttpServletRequest request, 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 {

 		UserEntity user = securityMgr.getCurrUser();

 		GkjyrEntity jyr = new GkjyrEntity();

 		if (!StringUtils.isEmpty(user.getSsjyr())) {

@@ -136,6 +137,9 @@ public class LhsqCtl extends BaseWebCtl {
 
 				return cb.and(list.toArray(new Predicate[] {}));

 			}

 		};

+		if (page.getPage() < 1) {

+			page.setPage(SearchCondition.lhsqpage);

+		}

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

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

 		for (LhsqEntity entity : list) {

@@ -179,6 +183,9 @@ public class LhsqCtl extends BaseWebCtl {
 
 				voList.add(vo);

 			}

 		}

+		if (isPOST(request)) {

+			SearchCondition.lhsqpage = page.getPage();

+		}

 		model.addAttribute("lczt", lczt);

 		model.addAttribute("gkjyr", gkjyr);

 		model.addAttribute("fddbr", fddbr);

+ 8 - 1
gkjsjy/trunk/src/com/xt/jygl/gkjygl/gklhxkgl/gkjylhyx/ctl/LhyxCtl.java
파일 보기 

@@ -31,6 +31,7 @@ import com.xt.jygl.accessory.service.AccessoryService;
 
 import com.xt.jygl.common.BaseWebCtl;

 import com.xt.jygl.common.Constants;

 import com.xt.jygl.common.GlobalData;

+import com.xt.jygl.common.SearchCondition;

 import com.xt.jygl.ftp.Ftp;

 import com.xt.jygl.ftp.FtpUtil;

 import com.xt.jygl.gkjcxx.gk.service.GkService;

@@ -106,7 +107,7 @@ public class LhyxCtl extends BaseWebCtl {
 
 	 */

 	@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 {

+	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 {

 		UserEntity user = securityMgr.getCurrUser();

 		GkjyrEntity jyr = new GkjyrEntity();

 		if (!StringUtils.isEmpty(user.getSsjyr())) {

@@ -147,6 +148,9 @@ public class LhyxCtl extends BaseWebCtl {
 
 				return cb.and(list.toArray(new Predicate[] {}));

 			}

 		};

+		if (page.getPage() < 1) {

+			page.setPage(SearchCondition.lhyxpage);

+		}

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

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

 		for (LhyxEntity entity : list) {

@@ -189,6 +193,9 @@ public class LhyxCtl extends BaseWebCtl {
 
 				voList.add(vo);

 			}

 		}

+		if (isPOST(request)) {

+			SearchCondition.lhyxpage = page.getPage();

+		}

 		model.addAttribute("lczt", lczt);

 		model.addAttribute("gkjyr", gkjyr);

 		model.addAttribute("fddbr", fddbr);

+ 10 - 5
gkjsjy/trunk/src/com/xt/jygl/set/user/ctl/UserCtl.java
파일 보기 

@@ -10,7 +10,6 @@ import javax.persistence.criteria.CriteriaBuilder;
 
 import javax.persistence.criteria.CriteriaQuery;

 import javax.persistence.criteria.Predicate;

 import javax.persistence.criteria.Root;

-import javax.persistence.criteria.CriteriaBuilder.In;

 import javax.servlet.http.HttpServletRequest;

 import javax.servlet.http.HttpServletResponse;

 

@@ -34,7 +33,7 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 
 import com.xt.jygl.common.BaseWebCtl;

 import com.xt.jygl.common.Constants;

 import com.xt.jygl.common.GlobalData;

-import com.xt.jygl.common.Utils;

+import com.xt.jygl.common.SearchCondition;

 import com.xt.jygl.ggfwxxgl.jdtx.entity.TxEntity;

 import com.xt.jygl.ggfwxxgl.jdtx.service.TxService;

 import com.xt.jygl.ggfwxxgl.tzgg.ggxx.entity.GgxxtxEntity;

@@ -118,15 +117,19 @@ public class UserCtl extends BaseWebCtl {
 
 			}

 		};

 

-		if (page.getPage() < 1) {

+		/*if (page.getPage() < 1) {

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

 			if (StringUtils.isEmpty(userpage) || !org.apache.commons.lang.StringUtils.isNumeric(String.valueOf(userpage))) {

 				userpage = "1";

 			}

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

-		}

+		}*/

 		page.setSort("sortno");

 		page.setOrder("asc");

+		if (page.getPage() < 1) {

+			page.setPage(SearchCondition.userpage);

+		}

+		

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

 		List<UserEntity> userList = new ArrayList<UserEntity>();

 		for (UserEntity userEntity : list) {

@@ -136,8 +139,10 @@ public class UserCtl extends BaseWebCtl {
 
 			userList.add(userEntity);

 		}

 

+		

 		if (isPOST(request)) {

-			cacheSCmap.put("userpage", page.getPage());

+			//cacheSCmap.put("userpage", page.getPage());

+			SearchCondition.userpage = page.getPage();

 			CacheSearchCondition.putCacheSCmap(request.getParameterMap(), cacheSCmap);

 		}

 		model.addAttribute("list", userList);