Răsfoiți Sursa

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

ld_xuhx 8 ani în urmă
părinte
comite
6c2acf4624
61 a modificat fișierele cu 346 adăugiri și 190 ștergeri
  1. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/jyrjbxx/gkjyrmain.jsp
  2. 3 5
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkyx/bwxxadd.jsp
  3. 3 4
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkyx/bwxxedit.jsp
  4. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkyx/bwxxview.jsp
  5. 3 5
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkyx/cgxxadd.jsp
  6. 3 4
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkyx/cgxxedit.jsp
  7. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkyx/cgxxview.jsp
  8. 3 4
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkyx/ckxxadd.jsp
  9. 3 4
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkyx/ckxxedit.jsp
  10. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkyx/ckxxview.jsp
  11. 3 4
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkyx/dcxxadd.jsp
  12. 3 4
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkyx/dcxxedit.jsp
  13. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkyx/dcxxview.jsp
  14. 2 4
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkyx/mtxxadd.jsp
  15. 2 4
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkyx/mtxxedit.jsp
  16. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkyx/mtxxview.jsp
  17. 3 4
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkyx/qytzxxadd.jsp
  18. 2 4
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkyx/qytzxxedit.jsp
  19. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkyx/qytzxxview.jsp
  20. 2 4
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkyx/ryxxadd.jsp
  21. 2 4
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkyx/ryxxedit.jsp
  22. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkyx/ryxxview.jsp
  23. 2 4
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkyx/sssbxxadd.jsp
  24. 2 4
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkyx/sssbxxedit.jsp
  25. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkyx/sssbxxview.jsp
  26. 2 4
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkyx/zxjxxxadd.jsp
  27. 2 4
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkyx/zxjxxxedit.jsp
  28. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkyx/zxjxxxview.jsp
  29. 3 4
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkzx/bwxxadd.jsp
  30. 3 4
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkzx/bwxxedit.jsp
  31. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkzx/bwxxview.jsp
  32. 2 4
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkzx/cgxxadd.jsp
  33. 3 4
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkzx/cgxxedit.jsp
  34. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkzx/cgxxview.jsp
  35. 2 4
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkzx/ckxxadd.jsp
  36. 2 4
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkzx/ckxxedit.jsp
  37. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkzx/ckxxview.jsp
  38. 2 4
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkzx/dcxxadd.jsp
  39. 2 4
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkzx/dcxxedit.jsp
  40. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkzx/dcxxview.jsp
  41. 2 4
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkzx/mtxxadd.jsp
  42. 3 4
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkzx/mtxxedit.jsp
  43. 4 2
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkzx/mtxxview.jsp
  44. 3 4
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkzx/qytzxxadd.jsp
  45. 3 4
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkzx/qytzxxedit.jsp
  46. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkzx/qytzxxview.jsp
  47. 3 4
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkzx/ryxxadd.jsp
  48. 3 4
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkzx/ryxxedit.jsp
  49. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkzx/ryxxview.jsp
  50. 2 4
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkzx/sssbxxadd.jsp
  51. 2 4
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkzx/sssbxxedit.jsp
  52. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkzx/sssbxxview.jsp
  53. 1 2
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkzx/xkzzxjds.jsp
  54. 2 4
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkzx/zxjxxxadd.jsp
  55. 2 4
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkzx/zxjxxxedit.jsp
  56. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkzx/zxjxxxview.jsp
  57. 85 0
      gkjsjy/trunk/WebContent/static/biz/js/gkjygl/gkjyxkgl/gkjyzkzx/xkzzxdetail.js
  58. 109 0
      gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/xkzxx/ctl/XkzxxCtl.java
  59. 7 0
      gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxkyx/ctl/XkzyxCtl.java
  60. 6 22
      gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxkzx/ctl/XkzzxCtl.java
  61. 27 0
      gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxkzx/service/impl/XkzzxServiceImpl.java

+ 1 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/jyrjbxx/gkjyrmain.jsp

@@ -229,7 +229,7 @@ var expandFlg=false;
 										class="glyphicon glyphicon-search"></i> 
 								</a>								
 								
-								<c:if test="${gkjyr.recordStatus == 1 }">
+								<c:if test="${gkjyr.recordStatus == 1 && gkjyr.sfred == null }">
 								<authz:hasPermission name="${appName}:jyrjbxx:edit">
 								 <a class="btn btn-default btn-xs" href="#"
 									onclick="gkjyr.main.edit('${gkjyr.id}')" title="编辑"> <i

+ 3 - 5
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkyx/bwxxadd.jsp

@@ -16,11 +16,8 @@
 				for(var i=0;i<data.length;i++){
 					var bw = data[i];
 					str+="<tr class='tr_bg'>";
-					if(bw.isTrue){
-						str+="<td><input type='checkbox' checked name='bwid'  value='"+bw.id+"'/></td>";
-					}else{
-						str+="<td><input type='checkbox' name='bwid'  value='"+bw.id+"'/></td>";
-					}
+					if( !isEmpty(bw.xkzid)){
+					str+="<td><input type='checkbox' checked name='bwid'  value='"+bw.id+"'/></td>";
 					str+="<td>"+bw.bwmc+"</td>";
 					str+="<td>"+(bw.ssjyrzw==null?"":bw.ssjyrzw)+"</td>";
 					str+="<td>"+bw.ssmtzw+"</td>";
@@ -31,6 +28,7 @@
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"bwxxview('"+bw.id+"')\" title='查看'> <i class='glyphicon glyphicon-search'></i> </a>";
 					str+="</td>";
 					str+="</tr>";
+					}
 				}
 				$('#bwxxdiv').empty();
 				$('#bwxxdiv').append(str);

+ 3 - 4
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkyx/bwxxedit.jsp

@@ -16,11 +16,9 @@
 				for(var i=0;i<data.length;i++){
 					var bw = data[i];
 					str+="<tr class='tr_bg'>";
-					if(bw.isTrue){
+					if( !isEmpty(bw.xkzid)){
 						str+="<td><input type='checkbox' checked name='bwid'  value='"+bw.id+"'/></td>";
-					}else{
-						str+="<td><input type='checkbox' name='bwid'  value='"+bw.id+"'/></td>";
-					}
+					
 					str+="<td>"+bw.bwmc+"</td>";
 					str+="<td>"+(bw.ssjyrzw==null?"":bw.ssjyrzw)+"</td>";
 					str+="<td>"+bw.ssmtzw+"</td>";
@@ -31,6 +29,7 @@
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"bwxxview('"+bw.id+"')\" title='查看'> <i class='glyphicon glyphicon-search'></i> </a>";
 					str+="</td>";
 					str+="</tr>";
+					}
 				}
 				$('#bwxxdiv').empty();
 				$('#bwxxdiv').append(str);

+ 1 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkyx/bwxxview.jsp

@@ -16,7 +16,7 @@
 				var num=1;
 				for(var i=0;i<data.length;i++){
 					var bw = data[i];
-					if(bw.isTrue){
+					if( !isEmpty(bw.xkzid)){
 					str+="<tr class='tr_bg'>";
 					str+="<td>"+num+"</td>";
 					str+="<td>"+bw.bwmc+"</td>";

+ 3 - 5
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkyx/cgxxadd.jsp

@@ -17,11 +17,8 @@
 				for(var i=0;i<data.length;i++){
 					var cg = data[i];
 					str+="<tr class='tr_bg'>";
-					if(cg.isTrue){
-						str+="<td><input type='checkbox' checked name='cgid'  value='"+cg.id+"'/></td>";
-					}else{
-						str+="<td><input type='checkbox' name='cgid'  value='"+cg.id+"'/></td>";
-					}
+					if( !isEmpty(cg.xkzid)){
+					str+="<td><input type='checkbox' checked name='cgid'  value='"+cg.id+"'/></td>";
 					str+="<td>"+cg.cgmc+"</td>";
 					str+="<td>"+cg.hxpmc+"</td>";
 					str+="<td>"+cg.ssjyrzw+"</td>";
@@ -31,6 +28,7 @@
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"cgxxview('"+cg.id+"')\" title='查看'> <i class='glyphicon glyphicon-search'></i> </a>";
 					str+="</td>";
 					str+="</tr>";
+					}
 				}
 				$('#cgxxdiv').empty();
 				$('#cgxxdiv').append(str);

+ 3 - 4
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkyx/cgxxedit.jsp

@@ -17,11 +17,9 @@
 				for(var i=0;i<data.length;i++){
 					var cg = data[i];
 					str+="<tr class='tr_bg'>";
-					if(cg.isTrue){
+					if( !isEmpty(cg.xkzid)){
 						str+="<td><input type='checkbox' checked name='cgid'  value='"+cg.id+"'/></td>";
-					}else{
-						str+="<td><input type='checkbox' name='cgid'  value='"+cg.id+"'/></td>";
-					}
+					
 					str+="<td>"+cg.cgmc+"</td>";
 					str+="<td>"+cg.hxpmc+"</td>";
 					str+="<td>"+cg.ssjyrzw+"</td>";
@@ -31,6 +29,7 @@
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"cgxxview('"+cg.id+"')\" title='查看'> <i class='glyphicon glyphicon-search'></i> </a>";
 					str+="</td>";
 					str+="</tr>";
+					}
 				}
 				$('#cgxxdiv').empty();
 				$('#cgxxdiv').append(str);

+ 1 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkyx/cgxxview.jsp

@@ -17,7 +17,7 @@
 				var num=1;
 				for(var i=0;i<data.length;i++){
 					var cg = data[i];
-					if(cg.isTrue){
+					if( !isEmpty(cg.xkzid)){
 					str+="<tr class='tr_bg'>";
 					str+="<td>"+num+"</td>";
 					str+="<td>"+cg.cgmc+"</td>";

+ 3 - 4
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkyx/ckxxadd.jsp

@@ -16,11 +16,9 @@
 				for(var i=0;i<data.length;i++){
 					var ck = data[i];
 					str+="<tr class='tr_bg'>";
-					if(ck.isTrue){
+					if( !isEmpty(ck.xkzid)){
 						str+="<td><input type='checkbox' checked name='ckid'  value='"+ck.id+"'/></td>";
-					}else{
-						str+="<td><input type='checkbox' name='ckid'  value='"+ck.id+"'/></td>";
-					}
+					
 					str+="<td>"+ck.ckmc+"</td>";
 					str+="<td>"+ck.ssjyrzw+"</td>";
 					str+="<td>"+ck.ssmtzw+"</td>";
@@ -30,6 +28,7 @@
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"ckxxview('"+ck.id+"')\" title='查看'> <i class='glyphicon glyphicon-search'></i> </a>";
 					str+="</td>";
 					str+="</tr>";
+					}
 				}
 				$('#ckxxdiv').empty();
 				$('#ckxxdiv').append(str);

+ 3 - 4
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkyx/ckxxedit.jsp

@@ -16,11 +16,9 @@
 				for(var i=0;i<data.length;i++){
 					var ck = data[i];
 					str+="<tr class='tr_bg'>";
-					if(ck.isTrue){
+					if( !isEmpty(cg.xkzid)){
 						str+="<td><input type='checkbox' checked name='ckid'  value='"+ck.id+"'/></td>";
-					}else{
-						str+="<td><input type='checkbox' name='ckid'  value='"+ck.id+"'/></td>";
-					}
+					
 					str+="<td>"+ck.ckmc+"</td>";
 					str+="<td>"+ck.ssjyrzw+"</td>";
 					str+="<td>"+ck.ssmtzw+"</td>";
@@ -30,6 +28,7 @@
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"ckxxview('"+ck.id+"')\" title='查看'> <i class='glyphicon glyphicon-search'></i> </a>";
 					str+="</td>";
 					str+="</tr>";
+					}
 				}
 				$('#ckxxdiv').empty();
 				$('#ckxxdiv').append(str);

+ 1 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkyx/ckxxview.jsp

@@ -16,7 +16,7 @@
 				var num=1;
 				for(var i=0;i<data.length;i++){
 					var ck = data[i];
-					if(ck.isTrue){
+					if( !isEmpty(ck.xkzid)){
 					str+="<tr class='tr_bg'>";
 					str+="<td>"+num+"</td>";
 					str+="<td>"+ck.ckmc+"</td>";

+ 3 - 4
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkyx/dcxxadd.jsp

@@ -18,11 +18,9 @@
 				for(var i=0;i<data.length;i++){
 					var dc = data[i];
 					str+="<tr class='tr_bg'>";
-					if(dc.isTrue){
+					if( !isEmpty(dc.xkzid)){
 						str+="<td><input type='checkbox' checked name='dcid' onclick='clickdc()'  value='"+dc.id+"'/></td>";
-					}else{
-						str+="<td><input type='checkbox' name='dcid' onclick='clickdc()'   value='"+dc.id+"'/></td>";
-					}
+				
 					str+="<td>"+dc.dcmc+"</td>";
 					str+="<td>"+dc.ssjyrzw+"</td>";
 					str+="<td>"+dc.szgkzw+"</td>";
@@ -34,6 +32,7 @@
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"dcxxview('"+dc.id+"')\" title='查看'> <i class='glyphicon glyphicon-search'></i> </a>";
 					str+="</td>";
 					str+="</tr>";
+					}
 				}
 				$('#dcxxdiv').empty();
 				$('#dcxxdiv').append(str);

+ 3 - 4
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkyx/dcxxedit.jsp

@@ -18,11 +18,9 @@
 				for(var i=0;i<data.length;i++){
 					var dc = data[i];
 					str+="<tr class='tr_bg'>";
-					if(dc.isTrue){
+					if( !isEmpty(dc.xkzid)){
 						str+="<td><input type='checkbox' checked name='dcid' onclick='clickdc()'  value='"+dc.id+"'/></td>";
-					}else{
-						str+="<td><input type='checkbox' name='dcid' onclick='clickdc()'   value='"+dc.id+"'/></td>";
-					}
+					
 					str+="<td>"+dc.dcmc+"</td>";
 					str+="<td>"+dc.ssjyrzw+"</td>";
 					str+="<td>"+dc.szgkzw+"</td>";
@@ -34,6 +32,7 @@
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"dcxxview('"+dc.id+"')\" title='查看'> <i class='glyphicon glyphicon-search'></i> </a>";
 					str+="</td>";
 					str+="</tr>";
+					}
 				}
 				$('#dcxxdiv').empty();
 				$('#dcxxdiv').append(str);

+ 1 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkyx/dcxxview.jsp

@@ -18,7 +18,7 @@
 				var num=1;
 				for(var i=0;i<data.length;i++){
 					var dc = data[i];
-					if(dc.isTrue){
+					if(!isEmpty(dc.xkzid)){
 					str+="<tr class='tr_bg'>";
 					str+="<td>"+num+"</td>";
 					str+="<td>"+dc.dcmc+"</td>";

+ 2 - 4
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkyx/mtxxadd.jsp

@@ -17,11 +17,8 @@ function mtxxview(mtid){
 				for(var i=0;i<data.length;i++){
 					var mt = data[i];
 					str+="<tr class='tr_bg'>";
-					if(mt.isTrue){
+					if( !isEmpty(mt.xkzid)){
 						str+="<td><input type='checkbox' checked name='mtid'  value='"+mt.id+"'/></td>";
-					}else{
-						str+="<td><input type='checkbox' name='mtid'  value='"+mt.id+"'/></td>";
-					}
 					str+="<td>"+mt.mtmc+"</td>";
 					str+="<td>"+mt.ssjyrzw+"</td>";
 					str+="<td>"+mt.szgkzw+"</td>";
@@ -33,6 +30,7 @@ function mtxxview(mtid){
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"mtxxview('"+mt.id+"')\" title='查看'> <i class='glyphicon glyphicon-search'></i> </a>";
 					str+="</td>";
 					str+="</tr>";
+					}
 				}
 				$('#mtxxdiv').empty();
 				$('#mtxxdiv').append(str);

+ 2 - 4
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkyx/mtxxedit.jsp

@@ -17,11 +17,8 @@ function mtxxview(mtid){
 				for(var i=0;i<data.length;i++){
 					var mt = data[i];
 					str+="<tr class='tr_bg'>";
-					if(mt.isTrue){
+					if( !isEmpty(mt.xkzid)){
 						str+="<td><input type='checkbox' checked name='mtid'  value='"+mt.id+"'/></td>";
-					}else{
-						str+="<td><input type='checkbox' name='mtid'  value='"+mt.id+"'/></td>";
-					}
 					str+="<td>"+mt.mtmc+"</td>";
 					str+="<td>"+mt.ssjyrzw+"</td>";
 					str+="<td>"+mt.szgkzw+"</td>";
@@ -33,6 +30,7 @@ function mtxxview(mtid){
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"mtxxview('"+mt.id+"')\" title='查看'> <i class='glyphicon glyphicon-search'></i> </a>";
 					str+="</td>";
 					str+="</tr>";
+					}
 				}
 				$('#mtxxdiv').empty();
 				$('#mtxxdiv').append(str);

+ 1 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkyx/mtxxview.jsp

@@ -17,7 +17,7 @@ function mtxxview(mtid){
 				var num=1;
 				for(var i=0;i<data.length;i++){
 					var mt = data[i];
-					if(mt.isTrue){
+					if(!isEmpty(mt.xkzid)){
 					str+="<tr class='tr_bg'>";
 					str+="<td>"+num+"</td>";
 					str+="<td>"+mt.mtmc+"</td>";

+ 3 - 4
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkyx/qytzxxadd.jsp

@@ -18,11 +18,9 @@
 				for(var i=0;i<data.length;i++){
 					var qytz = data[i];
 					str+="<tr class='tr_bg'>";
-					if(qytz.isTrue){
+					if( !isEmpty(qytz.xkzid)){
 						str+="<td><input type='checkbox' checked name='qytzid' onclick='clickqytz()'  value='"+qytz.id+"'/></td>";
-					}else{
-						str+="<td><input type='checkbox' name='qytzid' onclick='clickqytz()'   value='"+qytz.id+"'/></td>";
-					}
+					
 					str+="<td>"+qytz.tzrmc+"</td>";
 					str+="<td>"+(qytz.je==null?"":qytz.je)+"</td>";
 					str+="<td>"+(qytz.jedw==null?"":qytz.jedw)+"</td>";
@@ -34,6 +32,7 @@
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"qytzxxview('"+qytz.id+"')\" title='查看'> <i class='glyphicon glyphicon-search'></i> </a>";
 					str+="</td>";
 					str+="</tr>";
+					}
 				}
 				$('#qytzxxdiv').empty();
 				$('#qytzxxdiv').append(str);

+ 2 - 4
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkyx/qytzxxedit.jsp

@@ -18,11 +18,8 @@
 				for(var i=0;i<data.length;i++){
 					var qytz = data[i];
 					str+="<tr class='tr_bg'>";
-					if(qytz.isTrue){
+					if( !isEmpty(qytz.xkzid)){
 						str+="<td><input type='checkbox' checked name='qytzid' onclick='clickqytz()'  value='"+qytz.id+"'/></td>";
-					}else{
-						str+="<td><input type='checkbox' name='qytzid' onclick='clickqytz()'   value='"+qytz.id+"'/></td>";
-					}
 					str+="<td>"+qytz.tzrmc+"</td>";
 					str+="<td>"+(qytz.je==null?"":qytz.je)+"</td>";
 					str+="<td>"+(qytz.jedw==null?"":qytz.jedw)+"</td>";
@@ -34,6 +31,7 @@
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"qytzxxview('"+qytz.id+"')\" title='查看'> <i class='glyphicon glyphicon-search'></i> </a>";
 					str+="</td>";
 					str+="</tr>";
+					}
 				}
 				$('#qytzxxdiv').empty();
 				$('#qytzxxdiv').append(str);

+ 1 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkyx/qytzxxview.jsp

@@ -18,7 +18,7 @@
 				var num=1;
 				for(var i=0;i<data.length;i++){
 					var qytz = data[i];
-					if(qytz.isTrue){
+					if( !isEmpty(qytz.xkzid)){
 					str+="<td>"+num+"</td>";
 					str+="<td>"+qytz.tzrmc+"</td>";
 					str+="<td>"+(qytz.je==null?"":qytz.je)+"</td>";

+ 2 - 4
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkyx/ryxxadd.jsp

@@ -49,17 +49,15 @@
 				for(var i=0;i<data.length;i++){
 					var ry = data[i];
 					str+="<tr class='tr_bg'>";
-					if(ry.isTrue){
+					if( !isEmpty(ry.xkzid)){
 						str+="<td><input type='checkbox' checked name='ryid' onclick='clickry()'  value='"+ry.id+"'/></td>";
-					}else{
-						str+="<td><input type='checkbox' name='ryid' onclick='clickry()'   value='"+ry.id+"'/></td>";
-					}
 					str+="<td>"+(ry.ssjyrzw==null? "":ry.ssjyrzw)+"</td>";
 					str+="<td>"+ry.xm+"</td>";
 					str+="<td>"+ry.rylxzw+"</td>";
 					str+="<td>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"ryxxview('"+ry.id+"')\" title='查看'> <i class='glyphicon glyphicon-search'></i> </a>";
 					str+="</tr>";
+					}
 				}
 				$('#ryxxdiv').empty();
 				$('#ryxxdiv').append(str);

+ 2 - 4
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkyx/ryxxedit.jsp

@@ -49,17 +49,15 @@
 				for(var i=0;i<data.length;i++){
 					var ry = data[i];
 					str+="<tr class='tr_bg'>";
-					if(ry.isTrue){
+					if( !isEmpty(ry.xkzid)){
 						str+="<td><input type='checkbox' checked name='ryid' onclick='clickry()'  value='"+ry.id+"'/></td>";
-					}else{
-						str+="<td><input type='checkbox' name='ryid' onclick='clickry()'   value='"+ry.id+"'/></td>";
-					}
 					str+="<td>"+(ry.ssjyrzw==null? "":ry.ssjyrzw)+"</td>";
 					str+="<td>"+ry.xm+"</td>";
 					str+="<td>"+ry.rylxzw+"</td>";
 					str+="<td>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"ryxxview('"+ry.id+"')\" title='查看'> <i class='glyphicon glyphicon-search'></i> </a>";
 					str+="</tr>";
+					}
 				}
 				$('#ryxxdiv').empty();
 				$('#ryxxdiv').append(str);

+ 1 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkyx/ryxxview.jsp

@@ -49,7 +49,7 @@
 				var num=1;
 				for(var i=0;i<data.length;i++){
 					var ry = data[i];
-					if(ry.isTrue){
+					if( !isEmpty(ry.xkzid)){
 					str+="<tr class='tr_bg'>";
 					str+="<td>"+num+"</td>";
 					str+="<td>"+(ry.ssjyrzw==null? "":ry.ssjyrzw)+"</td>";

+ 2 - 4
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkyx/sssbxxadd.jsp

@@ -18,11 +18,8 @@
 				for(var i=0;i<data.length;i++){
 					var sssb = data[i];
 					str+="<tr class='tr_bg'>";
-					if(sssb.isTrue){
+					if( !isEmpty(sssb.xkzid)){
 						str+="<td><input type='checkbox' checked name='sssbid' onclick='clicksssb()'  value='"+sssb.id+"'/></td>";
-					}else{
-						str+="<td><input type='checkbox' name='sssbid' onclick='clicksssb()'   value='"+sssb.id+"'/></td>";
-					}
 					str+="<td>"+sssb.ssjyrzw+"</td>";
 					str+="<td>"+sssb.ssmc+"</td>";
 					str+="<td>"+sssb.yjfl+"</td>";
@@ -33,6 +30,7 @@
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"sssbxxview('"+sssb.id+"')\" title='查看'> <i class='glyphicon glyphicon-search'></i> </a>";
 					str+="</td>";
 					str+="</tr>";
+					}
 				}
 				$('#sssbxxdiv').empty();
 				$('#sssbxxdiv').append(str);

+ 2 - 4
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkyx/sssbxxedit.jsp

@@ -18,11 +18,8 @@
 				for(var i=0;i<data.length;i++){
 					var sssb = data[i];
 					str+="<tr class='tr_bg'>";
-					if(sssb.isTrue){
+					if( !isEmpty(sssb.xkzid)){
 						str+="<td><input type='checkbox' checked name='sssbid' onclick='clicksssb()'  value='"+sssb.id+"'/></td>";
-					}else{
-						str+="<td><input type='checkbox' name='sssbid' onclick='clicksssb()'   value='"+sssb.id+"'/></td>";
-					}
 					str+="<td>"+sssb.ssjyrzw+"</td>";
 					str+="<td>"+sssb.ssmc+"</td>";
 					str+="<td>"+sssb.yjfl+"</td>";
@@ -33,6 +30,7 @@
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"sssbxxview('"+sssb.id+"')\" title='查看'> <i class='glyphicon glyphicon-search'></i></a>";
 					str+="</td>";
 					str+="</tr>";
+					}
 				}
 				$('#sssbxxdiv').empty();
 				$('#sssbxxdiv').append(str);

+ 1 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkyx/sssbxxview.jsp

@@ -18,7 +18,7 @@
 				var num=1;
 				for(var i=0;i<data.length;i++){
 					var sssb = data[i];
-					if(sssb.isTrue){
+					if( !isEmpty(sssb.xkzid)){
 					str+="<tr class='tr_bg'>";
 					str+="<td>"+num+"</td>";
 					str+="<td>"+sssb.ssjyrzw+"</td>";

+ 2 - 4
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkyx/zxjxxxadd.jsp

@@ -16,11 +16,8 @@
 				for(var i=0;i<data.length;i++){
 					var zxjx = data[i];
 					str+="<tr class='tr_bg'>";
-					if(zxjx.isTrue){
+					if(!isEmpty(zxjx.xkzid)){
 						str+="<td><input type='checkbox' checked name='zxjxid'  value='"+zxjx.id+"'/></td>";
-					}else{
-						str+="<td><input type='checkbox' name='zxjxid'  value='"+zxjx.id+"'/></td>";
-					}
 					str+="<td>"+zxjx.jxlbmczw+"</td>";
 					str+="<td>"+zxjx.ssjyrzw+"</td>";
 					str+="<td>"+zxjx.xhhgg+"</td>";
@@ -30,6 +27,7 @@
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"zxjxxxview('"+zxjx.id+"')\" title='查看'> <i class='glyphicon glyphicon-search'></i> </a>";
 					str+="</td>";
 					str+="</tr>";
+					}
 				}
 				$('#zxjxxxdiv').empty();
 				$('#zxjxxxdiv').append(str);

+ 2 - 4
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkyx/zxjxxxedit.jsp

@@ -16,11 +16,8 @@
 				for(var i=0;i<data.length;i++){
 					var zxjx = data[i];
 					str+="<tr class='tr_bg'>";
-					if(zxjx.isTrue){
+					if(!isEmpty(zxjx.xkzid)){
 						str+="<td><input type='checkbox' checked name='zxjxid'  value='"+zxjx.id+"'/></td>";
-					}else{
-						str+="<td><input type='checkbox' name='zxjxid'  value='"+zxjx.id+"'/></td>";
-					}
 					str+="<td>"+zxjx.jxlbmczw+"</td>";
 					str+="<td>"+zxjx.ssjyrzw+"</td>";
 					str+="<td>"+zxjx.xhhgg+"</td>";
@@ -30,6 +27,7 @@
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"zxjxxxview('"+zxjx.id+"')\" title='查看'> <i class='glyphicon glyphicon-search'></i> </a>";
 					str+="</td>";
 					str+="</tr>";
+					}
 				}
 				$('#zxjxxxdiv').empty();
 				$('#zxjxxxdiv').append(str);

+ 1 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkyx/zxjxxxview.jsp

@@ -16,7 +16,7 @@
 				var num=1;
 				for(var i=0;i<data.length;i++){
 					var zxjx = data[i];
-					if(zxjx.isTrue){
+					if(!isEmpty(zxjx.xkzid)){
 					str+="<tr class='tr_bg'>";
 					str+="<td>"+num+"</td>";
 					str+="<td>"+zxjx.jxlbmczw+"</td>";

+ 3 - 4
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkzx/bwxxadd.jsp

@@ -17,11 +17,9 @@
 				for(var i=0;i<data.length;i++){
 					var bw = data[i];
 					str+="<tr class='tr_bg'>";
-					if(bw.isTrue){
+					if( !isEmpty(bw.xkzid)){
 						str+="<td><input type='checkbox' checked name='bwid'  value='"+bw.id+"'/></td>";
-					}else{
-						str+="<td><input type='checkbox' name='bwid'  value='"+bw.id+"'/></td>";
-					}
+					
 					str+="<td>"+bw.bwmc+"</td>";
 					str+="<td>"+(bw.ssjyrzw==null?"":bw.ssjyrzw)+"</td>";
 					str+="<td>"+bw.ssmtzw+"</td>";
@@ -32,6 +30,7 @@
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"bwxxview('"+bw.id+"')\" title='查看'> <i class='glyphicon glyphicon-search'></i> </a>";
 					str+="</td>";
 					str+="</tr>";
+					}
 				}
 				$('#bwxxdiv').empty();
 				$('#bwxxdiv').append(str);

+ 3 - 4
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkzx/bwxxedit.jsp

@@ -17,11 +17,9 @@
 				for(var i=0;i<data.length;i++){
 					var bw = data[i];
 					str+="<tr class='tr_bg'>";
-					if(bw.isTrue){
+					if( !isEmpty(bw.xkzid)){
 						str+="<td><input type='checkbox' checked name='bwid'  value='"+bw.id+"'/></td>";
-					}else{
-						str+="<td><input type='checkbox' name='bwid'  value='"+bw.id+"'/></td>";
-					}
+					
 					str+="<td>"+bw.bwmc+"</td>";
 					str+="<td>"+(bw.ssjyrzw==null?"":bw.ssjyrzw)+"</td>";
 					str+="<td>"+bw.ssmtzw+"</td>";
@@ -32,6 +30,7 @@
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"bwxxview('"+bw.id+"')\" title='查看'> <i class='glyphicon glyphicon-search'></i> </a>";
 					str+="</td>";
 					str+="</tr>";
+					}
 				}
 				$('#bwxxdiv').empty();
 				$('#bwxxdiv').append(str);

+ 1 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkzx/bwxxview.jsp

@@ -17,7 +17,7 @@
 				var num=1;
 				for(var i=0;i<data.length;i++){
 					var bw = data[i];
-					if(bw.isTrue){
+					if( !isEmpty(bw.xkzid)){
 					str+="<tr class='tr_bg'>";
 					str+="<td>"+num+"</td>";
 					str+="<td>"+bw.bwmc+"</td>";

+ 2 - 4
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkzx/cgxxadd.jsp

@@ -18,11 +18,8 @@
 				for(var i=0;i<data.length;i++){
 					var cg = data[i];
 					str+="<tr class='tr_bg'>";
-					if(cg.isTrue){
+					if( !isEmpty(cg.xkzid)){
 						str+="<td><input type='checkbox' checked name='cgid'  value='"+cg.id+"'/></td>";
-					}else{
-						str+="<td><input type='checkbox' name='cgid'  value='"+cg.id+"'/></td>";
-					}
 					str+="<td>"+cg.cgmc+"</td>";
 					str+="<td>"+cg.hxpmc+"</td>";
 					str+="<td>"+cg.ssjyrzw+"</td>";
@@ -32,6 +29,7 @@
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"cgxxview('"+cg.id+"')\" title='查看'> <i class='glyphicon glyphicon-search'></i> </a>";
 					str+="</td>";
 					str+="</tr>";
+					}
 				}
 				$('#cgxxdiv').empty();
 				$('#cgxxdiv').append(str);

+ 3 - 4
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkzx/cgxxedit.jsp

@@ -18,11 +18,9 @@
 				for(var i=0;i<data.length;i++){
 					var cg = data[i];
 					str+="<tr class='tr_bg'>";
-					if(cg.isTrue){
+					if( !isEmpty(cg.xkzid)){
 						str+="<td><input type='checkbox' checked name='cgid'  value='"+cg.id+"'/></td>";
-					}else{
-						str+="<td><input type='checkbox' name='cgid'  value='"+cg.id+"'/></td>";
-					}
+					
 					str+="<td>"+cg.cgmc+"</td>";
 					str+="<td>"+cg.hxpmc+"</td>";
 					str+="<td>"+cg.ssjyrzw+"</td>";
@@ -32,6 +30,7 @@
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"cgxxview('"+cg.id+"')\" title='查看'> <i class='glyphicon glyphicon-search'></i> </a>";
 					str+="</td>";
 					str+="</tr>";
+					}
 				}
 				$('#cgxxdiv').empty();
 				$('#cgxxdiv').append(str);

+ 1 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkzx/cgxxview.jsp

@@ -18,7 +18,7 @@
 				var num=1;
 				for(var i=0;i<data.length;i++){
 					var cg = data[i];
-					if(cg.isTrue){
+					if( !isEmpty(cg.xkzid)){
 					str+="<tr class='tr_bg'>";
 					str+="<td>"+num+"</td>";
 					str+="<td>"+cg.cgmc+"</td>";

+ 2 - 4
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkzx/ckxxadd.jsp

@@ -17,11 +17,8 @@
 				for(var i=0;i<data.length;i++){
 					var ck = data[i];
 					str+="<tr class='tr_bg'>";
-					if(ck.isTrue){
+					if( !isEmpty(ck.xkzid)){
 						str+="<td><input type='checkbox' checked name='ckid'  value='"+ck.id+"'/></td>";
-					}else{
-						str+="<td><input type='checkbox' name='ckid'  value='"+ck.id+"'/></td>";
-					}
 					str+="<td>"+ck.ckmc+"</td>";
 					str+="<td>"+ck.ssjyrzw+"</td>";
 					str+="<td>"+ck.ssmtzw+"</td>";
@@ -31,6 +28,7 @@
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"ckxxview('"+ck.id+"')\" title='查看'> <i class='glyphicon glyphicon-search'></i> </a>";
 					str+="</td>";
 					str+="</tr>";
+					}
 				}
 				$('#ckxxdiv').empty();
 				$('#ckxxdiv').append(str);

+ 2 - 4
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkzx/ckxxedit.jsp

@@ -17,11 +17,8 @@
 				for(var i=0;i<data.length;i++){
 					var ck = data[i];
 					str+="<tr class='tr_bg'>";
-					if(ck.isTrue){
+					if( !isEmpty(cg.xkzid)){
 						str+="<td><input type='checkbox' checked name='ckid'  value='"+ck.id+"'/></td>";
-					}else{
-						str+="<td><input type='checkbox' name='ckid'  value='"+ck.id+"'/></td>";
-					}
 					str+="<td>"+ck.ckmc+"</td>";
 					str+="<td>"+ck.ssjyrzw+"</td>";
 					str+="<td>"+ck.ssmtzw+"</td>";
@@ -31,6 +28,7 @@
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"ckxxview('"+ck.id+"')\" title='查看'> <i class='glyphicon glyphicon-search'></i> </a>";
 					str+="</td>";
 					str+="</tr>";
+					}
 				}
 				$('#ckxxdiv').empty();
 				$('#ckxxdiv').append(str);

+ 1 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkzx/ckxxview.jsp

@@ -17,7 +17,7 @@
 				var num=1;
 				for(var i=0;i<data.length;i++){
 					var ck = data[i];
-					if(ck.isTrue){
+					if( !isEmpty(cg.xkzid)){
 					str+="<tr class='tr_bg'>";
 					str+="<td>"+num+"</td>";
 					str+="<td>"+ck.ckmc+"</td>";

+ 2 - 4
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkzx/dcxxadd.jsp

@@ -19,11 +19,8 @@
 				for(var i=0;i<data.length;i++){
 					var dc = data[i];
 					str+="<tr class='tr_bg'>";
-					if(dc.isTrue){
+					if( !isEmpty(dc.xkzid)){
 						str+="<td><input type='checkbox' checked name='dcid' onclick='clickdc()'  value='"+dc.id+"'/></td>";
-					}else{
-						str+="<td><input type='checkbox' name='dcid' onclick='clickdc()'   value='"+dc.id+"'/></td>";
-					}
 					str+="<td>"+dc.dcmc+"</td>";
 					str+="<td>"+dc.ssjyrzw+"</td>";
 					str+="<td>"+dc.szgkzw+"</td>";
@@ -35,6 +32,7 @@
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"dcxxview('"+dc.id+"')\" title='查看'> <i class='glyphicon glyphicon-search'></i> </a>";
 					str+="</td>";
 					str+="</tr>";
+					}
 				}
 				$('#dcxxdiv').empty();
 				$('#dcxxdiv').append(str);

+ 2 - 4
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkzx/dcxxedit.jsp

@@ -19,11 +19,8 @@
 				for(var i=0;i<data.length;i++){
 					var dc = data[i];
 					str+="<tr class='tr_bg'>";
-					if(dc.isTrue){
+					if( !isEmpty(dc.xkzid)){
 						str+="<td><input type='checkbox' checked name='dcid' onclick='clickdc()'  value='"+dc.id+"'/></td>";
-					}else{
-						str+="<td><input type='checkbox' name='dcid' onclick='clickdc()'   value='"+dc.id+"'/></td>";
-					}
 					str+="<td>"+dc.dcmc+"</td>";
 					str+="<td>"+dc.ssjyrzw+"</td>";
 					str+="<td>"+dc.szgkzw+"</td>";
@@ -35,6 +32,7 @@
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"dcxxview('"+dc.id+"')\" title='查看'> <i class='glyphicon glyphicon-search'></i> </a>";
 					str+="</td>";
 					str+="</tr>";
+					}
 				}
 				$('#dcxxdiv').empty();
 				$('#dcxxdiv').append(str);

+ 1 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkzx/dcxxview.jsp

@@ -19,7 +19,7 @@
 				var num=1;
 				for(var i=0;i<data.length;i++){
 					var dc = data[i];
-					if(dc.isTrue){
+					if( !isEmpty(dc.xkzid)){
 					str+="<tr class='tr_bg'>";
 					str+="<td>"+num+"</td>";
 					str+="<td>"+dc.dcmc+"</td>";

+ 2 - 4
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkzx/mtxxadd.jsp

@@ -18,11 +18,8 @@ function mtxxview(mtid){
 				for(var i=0;i<data.length;i++){
 					var mt = data[i];
 					str+="<tr class='tr_bg'>";
-					if(mt.isTrue){
+					if( !isEmpty(mt.xkzid)){
 						str+="<td><input type='checkbox' checked name='mtid'  value='"+mt.id+"'/></td>";
-					}else{
-						str+="<td><input type='checkbox' name='mtid'  value='"+mt.id+"'/></td>";
-					}
 					str+="<td>"+mt.mtmc+"</td>";
 					str+="<td>"+mt.ssjyrzw+"</td>";
 					str+="<td>"+mt.szgkzw+"</td>";
@@ -34,6 +31,7 @@ function mtxxview(mtid){
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"mtxxview('"+mt.id+"')\" title='查看'> <i class='glyphicon glyphicon-search'></i> </a>";
 					str+="</td>";
 					str+="</tr>";
+					}
 				}
 				$('#mtxxdiv').empty();
 				$('#mtxxdiv').append(str);

+ 3 - 4
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkzx/mtxxedit.jsp

@@ -18,11 +18,9 @@ function mtxxview(mtid){
 				for(var i=0;i<data.length;i++){
 					var mt = data[i];
 					str+="<tr class='tr_bg'>";
-					if(mt.isTrue){
+					if( !isEmpty(mt.xkzid)){
 						str+="<td><input type='checkbox' checked name='mtid'  value='"+mt.id+"'/></td>";
-					}else{
-						str+="<td><input type='checkbox' name='mtid'  value='"+mt.id+"'/></td>";
-					}
+					
 					str+="<td>"+mt.mtmc+"</td>";
 					str+="<td>"+mt.ssjyrzw+"</td>";
 					str+="<td>"+mt.szgkzw+"</td>";
@@ -34,6 +32,7 @@ function mtxxview(mtid){
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"mtxxview('"+mt.id+"')\" title='查看'> <i class='glyphicon glyphicon-search'></i> </a>";
 					str+="</td>";
 					str+="</tr>";
+					}
 				}
 				$('#mtxxdiv').empty();
 				$('#mtxxdiv').append(str);

+ 4 - 2
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkzx/mtxxview.jsp

@@ -14,10 +14,12 @@ function mtxxview(mtid){
 			recordStatus:11
 		}, function(data) {
 			if (data) {
-				var str =""
+				var str ="";
+				var num=1;
 				for(var i=0;i<data.length;i++){
 					var mt = data[i];
-					if(mt.isTrue){
+					
+					if( !isEmpty(mt.xkzid)){
 					str+="<tr class='tr_bg'>";
 					str+="<td>"+num+"</td>";
 					str+="<td>"+mt.mtmc+"</td>";

+ 3 - 4
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkzx/qytzxxadd.jsp

@@ -19,11 +19,9 @@
 				for(var i=0;i<data.length;i++){
 					var qytz = data[i];
 					str+="<tr class='tr_bg'>";
-					if(qytz.isTrue){
+					if( !isEmpty(qytz.xkzid)){
 						str+="<td><input type='checkbox' checked name='qytzid' onclick='clickqytz()'  value='"+qytz.id+"'/></td>";
-					}else{
-						str+="<td><input type='checkbox' name='qytzid' onclick='clickqytz()'   value='"+qytz.id+"'/></td>";
-					}
+					
 					str+="<td>"+qytz.tzrmc+"</td>";
 					str+="<td>"+(qytz.je==null?"":qytz.je)+"</td>";
 					str+="<td>"+(qytz.jedw==null?"":qytz.jedw)+"</td>";
@@ -35,6 +33,7 @@
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"qytzxxview('"+qytz.id+"')\" title='查看'> <i class='glyphicon glyphicon-search'></i> </a>";
 					str+="</td>";
 					str+="</tr>";
+					}
 				}
 				$('#qytzxxdiv').empty();
 				$('#qytzxxdiv').append(str);

+ 3 - 4
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkzx/qytzxxedit.jsp

@@ -19,11 +19,9 @@
 				for(var i=0;i<data.length;i++){
 					var qytz = data[i];
 					str+="<tr class='tr_bg'>";
-					if(qytz.isTrue){
+					if( !isEmpty(qytz.xkzid)){
 						str+="<td><input type='checkbox' checked name='qytzid' onclick='clickqytz()'  value='"+qytz.id+"'/></td>";
-					}else{
-						str+="<td><input type='checkbox' name='qytzid' onclick='clickqytz()'   value='"+qytz.id+"'/></td>";
-					}
+					
 					str+="<td>"+qytz.tzrmc+"</td>";
 					str+="<td>"+(qytz.je==null?"":qytz.je)+"</td>";
 					str+="<td>"+(qytz.jedw==null?"":qytz.jedw)+"</td>";
@@ -35,6 +33,7 @@
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"qytzxxview('"+qytz.id+"')\" title='查看'> <i class='glyphicon glyphicon-search'></i> </a>";
 					str+="</td>";
 					str+="</tr>";
+					}
 				}
 				$('#qytzxxdiv').empty();
 				$('#qytzxxdiv').append(str);

+ 1 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkzx/qytzxxview.jsp

@@ -19,7 +19,7 @@
 				var num=1;
 				for(var i=0;i<data.length;i++){
 					var qytz = data[i];
-					if(qytz.isTrue){
+					if( !isEmpty(qytz.xkzid)){
 					str+="<tr class='tr_bg'>";
 					str+="<td>"+num+"</td>";
 					str+="<td>"+qytz.tzrmc+"</td>";

+ 3 - 4
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkzx/ryxxadd.jsp

@@ -50,17 +50,16 @@
 				for(var i=0;i<data.length;i++){
 					var ry = data[i];
 					str+="<tr class='tr_bg'>";
-					if(ry.isTrue){
+					if( !isEmpty(ry.xkzid)){
 						str+="<td><input type='checkbox' checked name='ryid' onclick='clickry()'  value='"+ry.id+"'/></td>";
-					}else{
-						str+="<td><input type='checkbox' name='ryid' onclick='clickry()'   value='"+ry.id+"'/></td>";
-					}
+					
 					str+="<td>"+(ry.ssjyrzw==null? "":ry.ssjyrzw)+"</td>";
 					str+="<td>"+ry.xm+"</td>";
 					str+="<td>"+ry.rylxzw+"</td>";
 					str+="<td>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"ryxxview('"+ry.id+"')\" title='查看'> <i class='glyphicon glyphicon-search'></i></a>";
 					str+="</tr>";
+					}
 				}
 				$('#ryxxdiv').empty();
 				$('#ryxxdiv').append(str);

+ 3 - 4
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkzx/ryxxedit.jsp

@@ -50,17 +50,16 @@
 				for(var i=0;i<data.length;i++){
 					var ry = data[i];
 					str+="<tr class='tr_bg'>";
-					if(ry.isTrue){
+					if( !isEmpty(ry.xkzid)){
 						str+="<td><input type='checkbox' checked name='ryid' onclick='clickry()'  value='"+ry.id+"'/></td>";
-					}else{
-						str+="<td><input type='checkbox' name='ryid' onclick='clickry()'   value='"+ry.id+"'/></td>";
-					}
+					
 					str+="<td>"+(ry.ssjyrzw==null? "":ry.ssjyrzw)+"</td>";
 					str+="<td>"+ry.xm+"</td>";
 					str+="<td>"+ry.rylxzw+"</td>";
 					str+="<td>";
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"ryxxview('"+ry.id+"')\" title='查看'> <i class='glyphicon glyphicon-search'></i></a>";
 					str+="</tr>";
+					}
 				}
 				$('#ryxxdiv').empty();
 				$('#ryxxdiv').append(str);

+ 1 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkzx/ryxxview.jsp

@@ -50,7 +50,7 @@
 				var num=1;
 				for(var i=0;i<data.length;i++){
 					var ry = data[i];
-					if(ry.isTrue){
+					if( !isEmpty(ry.xkzid)){
 					str+="<tr class='tr_bg'>";
 					str+="<td>"+num+"</td>";
 					str+="<td>"+(ry.ssjyrzw==null? "":ry.ssjyrzw)+"</td>";

+ 2 - 4
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkzx/sssbxxadd.jsp

@@ -19,11 +19,8 @@
 				for(var i=0;i<data.length;i++){
 					var sssb = data[i];
 					str+="<tr class='tr_bg'>";
-					if(sssb.isTrue){
+					if( !isEmpty(sssb.xkzid)){
 						str+="<td><input type='checkbox' checked name='sssbid' onclick='clicksssb()'  value='"+sssb.id+"'/></td>";
-					}else{
-						str+="<td><input type='checkbox' name='sssbid' onclick='clicksssb()'   value='"+sssb.id+"'/></td>";
-					}
 					str+="<td>"+sssb.ssjyrzw+"</td>";
 					str+="<td>"+sssb.ssmc+"</td>";
 					str+="<td>"+sssb.yjfl+"</td>";
@@ -34,6 +31,7 @@
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"sssbxxview('"+sssb.id+"')\" title='查看'> <i class='glyphicon glyphicon-search'></i> </a>";
 					str+="</td>";
 					str+="</tr>";
+					}
 				}
 				$('#sssbxxdiv').empty();
 				$('#sssbxxdiv').append(str);

+ 2 - 4
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkzx/sssbxxedit.jsp

@@ -19,11 +19,8 @@
 				for(var i=0;i<data.length;i++){
 					var sssb = data[i];
 					str+="<tr class='tr_bg'>";
-					if(sssb.isTrue){
+					if( !isEmpty(sssb.xkzid)){
 						str+="<td><input type='checkbox' checked name='sssbid' onclick='clicksssb()'  value='"+sssb.id+"'/></td>";
-					}else{
-						str+="<td><input type='checkbox' name='sssbid' onclick='clicksssb()'   value='"+sssb.id+"'/></td>";
-					}
 					str+="<td>"+sssb.ssjyrzw+"</td>";
 					str+="<td>"+sssb.ssmc+"</td>";
 					str+="<td>"+sssb.yjfl+"</td>";
@@ -34,6 +31,7 @@
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"sssbxxview('"+sssb.id+"')\" title='查看'> <i class='glyphicon glyphicon-search'></i></a>";
 					str+="</td>";
 					str+="</tr>";
+					}
 				}
 				$('#sssbxxdiv').empty();
 				$('#sssbxxdiv').append(str);

+ 1 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkzx/sssbxxview.jsp

@@ -19,7 +19,7 @@
 				var num=1;
 				for(var i=0;i<data.length;i++){
 					var sssb = data[i];
-					if(sssb.isTrue){
+					if( !isEmpty(sssb.xkzid)){
 					str+="<tr class='tr_bg'>";
 					str+="<td>"+num+"</td>";
 					str+="<td>"+sssb.ssjyrzw+"</td>";

+ 1 - 2
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkzx/xkzzxjds.jsp

@@ -38,8 +38,7 @@
 		<td align="center" colspan="4"><h1>准予行政许可决定书</h1></td>
 	</tr>
 		<tr>
-			<td align="right" colspan="3" width="60%">案号:</td>
-			<td width="40%">${jds.ah }</td>
+			<td align="right" colspan="4" >案号:${jds.ah }</td>
 		</tr>
 		<tr>
 				<%-- <td colspan="2"><input  type="text"  class="form-control" id="jyrmc" name="jyrmc" value="${jds.jyrmc }"></td> --%>

+ 2 - 4
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkzx/zxjxxxadd.jsp

@@ -17,11 +17,8 @@
 				for(var i=0;i<data.length;i++){
 					var zxjx = data[i];
 					str+="<tr class='tr_bg'>";
-					if(zxjx.isTrue){
+					if( !isEmpty(zxjx.xkzid)){
 						str+="<td><input type='checkbox' checked name='zxjxid'  value='"+zxjx.id+"'/></td>";
-					}else{
-						str+="<td><input type='checkbox' name='zxjxid'  value='"+zxjx.id+"'/></td>";
-					}
 					str+="<td>"+zxjx.jxlbmczw+"</td>";
 					str+="<td>"+zxjx.ssjyrzw+"</td>";
 					str+="<td>"+zxjx.xhhgg+"</td>";
@@ -31,6 +28,7 @@
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"zxjxxxview('"+zxjx.id+"')\" title='查看'> <i class='glyphicon glyphicon-search'></i> </a>";
 					str+="</td>";
 					str+="</tr>";
+					}
 				}
 				$('#zxjxxxdiv').empty();
 				$('#zxjxxxdiv').append(str);

+ 2 - 4
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkzx/zxjxxxedit.jsp

@@ -17,11 +17,8 @@
 				for(var i=0;i<data.length;i++){
 					var zxjx = data[i];
 					str+="<tr class='tr_bg'>";
-					if(zxjx.isTrue){
+					if( !isEmpty(zxjx.xkzid)){
 						str+="<td><input type='checkbox' checked name='zxjxid'  value='"+zxjx.id+"'/></td>";
-					}else{
-						str+="<td><input type='checkbox' name='zxjxid'  value='"+zxjx.id+"'/></td>";
-					}
 					str+="<td>"+zxjx.jxlbmczw+"</td>";
 					str+="<td>"+zxjx.ssjyrzw+"</td>";
 					str+="<td>"+zxjx.xhhgg+"</td>";
@@ -31,6 +28,7 @@
 					str+="<a class='btn btn-default btn-xs' href='#' onclick=\"zxjxxxview('"+zxjx.id+"')\" title='查看'> <i class='glyphicon glyphicon-search'></i> </a>";
 					str+="</td>";
 					str+="</tr>";
+					}
 				}
 				$('#zxjxxxdiv').empty();
 				$('#zxjxxxdiv').append(str);

+ 1 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkzx/zxjxxxview.jsp

@@ -17,7 +17,7 @@
 				var num=1;
 				for(var i=0;i<data.length;i++){
 					var zxjx = data[i];
-					if(zxjx.isTrue){
+					if( !isEmpty(zxjx.xkzid)){
 					str+="<tr class='tr_bg'>";
 					str+="<td>"+num+"</td>";
 					str+="<td>"+zxjx.jxlbmczw+"</td>";

+ 85 - 0
gkjsjy/trunk/WebContent/static/biz/js/gkjygl/gkjyxkgl/gkjyzkzx/xkzzxdetail.js

@@ -193,6 +193,91 @@ xkzzx.detail.delFj = function(accid,id){
 	});
 }
 
+xkzzx.detail.initValue=function(){
+	//码头
+	var mtName= document.getElementsByName("mtid");
+    var mtids = [];
+    for (i=0; i<mtName.length; i++){  
+        if (mtName[i].type=="checkbox" && mtName[i].checked){      
+        mtids.push(mtName[i].value)
+        }  
+    }
+    $('#mtids').val(mtids);
+  //泊位
+	var bwName= document.getElementsByName("bwid");
+    var bwids = [];
+    for (i=0; i<bwName.length; i++){  
+        if (bwName[i].type=="checkbox" && bwName[i].checked){      
+        bwids.push(bwName[i].value)
+        }  
+    }
+    $('#bwids').val(bwids);
+  //储罐
+	var cgName= document.getElementsByName("cgid");
+    var cgids = [];
+    for (i=0; i<cgName.length; i++){  
+        if (cgName[i].type=="checkbox" && cgName[i].checked){      
+        cgids.push(cgName[i].value)
+        }  
+    }
+    $('#cgids').val(cgids);
+    
+  //仓库
+	var ckName= document.getElementsByName("ckid");
+    var ckids = [];
+    for (i=0; i<ckName.length; i++){  
+        if (ckName[i].type=="checkbox" && ckName[i].checked){      
+        ckids.push(ckName[i].value)
+        }  
+    }
+    $('#ckids').val(ckids);
+  //堆场
+	var dcName= document.getElementsByName("dcid");
+    var dcids = [];
+    for (i=0; i<dcName.length; i++){  
+        if (dcName[i].type=="checkbox" && dcName[i].checked){      
+        dcids.push(dcName[i].value)
+        }  
+    }
+    $('#dcids').val(dcids);
+  //人员
+	var ryName= document.getElementsByName("ryid");
+    var ryids = [];
+    for (i=0; i<ryName.length; i++){  
+        if (ryName[i].type=="checkbox" && ryName[i].checked){      
+        ryids.push(ryName[i].value)
+        }  
+    }
+    $('#ryids').val(ryids);
+  //设施设备
+	var sssbName= document.getElementsByName("sssbid");
+    var sssbids = [];
+    for (i=0; i<sssbName.length; i++){  
+        if (sssbName[i].type=="checkbox" && sssbName[i].checked){      
+        sssbids.push(sssbName[i].value)
+        }  
+    }
+    $('#sssbids').val(sssbids);
+  //企业投资
+	var qytzName= document.getElementsByName("qytzid");
+    var qytzids = [];
+    for (i=0; i<qytzName.length; i++){  
+        if (qytzName[i].type=="checkbox" && qytzName[i].checked){      
+        	qytzids.push(qytzName[i].value)
+        }  
+    }
+    $('#qytzids').val(qytzids);
+    
+  //企业投资
+	var zxjxName= document.getElementsByName("zxjxid");
+    var zxjxids = [];
+    for (i=0; i<zxjxName.length; i++){  
+        if (zxjxName[i].type=="checkbox" && zxjxName[i].checked){      
+        	zxjxids.push(zxjxName[i].value)
+        }  
+    }
+    $('#zxjxids').val(zxjxids);
+}
 
 //保存
 xkzzx.detail.save = function(){

+ 109 - 0
gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/xkzxx/ctl/XkzxxCtl.java

@@ -2093,6 +2093,115 @@ public class XkzxxCtl extends BaseWebCtl {
 					if (jyr != null) {
 						jyr.setRecordStatus(BaseEntity.RECORD_STATE_VALID);
 						gkjyrService.save(jyr);
+
+						// 码头
+						List<MtEntity> mtlist = mtService.findByJyrid(jyr.getId());
+						if (mtlist.size() > 0 && mtlist != null) {
+							for (MtEntity mt : mtlist) {
+								if (mt != null) {
+									if (!StringUtils.isEmpty(mt.getXkzid())) {
+										mt.setXkzid(xkzxx.getId());
+										mtService.save(mt);
+									}
+								}
+							}
+						}
+						// 泊位
+						List<BwEntity> bwlist = bwService.findByJyrid(jyr.getId());
+						if (bwlist != null && bwlist.size() > 0) {
+							for (BwEntity bw : bwlist) {
+								if (bw != null) {
+									if (!StringUtils.isEmpty(bw.getXkzid())) {
+										bw.setXkzid(xkzxx.getId());
+										bwService.save(bw);
+									}
+								}
+							}
+						}
+						// 储罐
+						List<CgEntity> cglist = cgService.findByJyrid(jyr.getId());
+						if (cglist != null && cglist.size() > 0) {
+							for (CgEntity cg : cglist) {
+								if (cg != null) {
+									if (!StringUtils.isEmpty(cg.getXkzid())) {
+										cg.setXkzid(xkzxx.getId());
+										cgService.save(cg);
+									}
+								}
+							}
+						}
+						// 仓库
+						List<CkEntity> cklist = ckService.findByJyrid(jyr.getId());
+						if (cklist != null && cklist.size() > 0) {
+							for (CkEntity ck : cklist) {
+								if (ck != null) {
+									if (!StringUtils.isEmpty(ck.getXkzid())) {
+										ck.setXkzid(xkzxx.getId());
+										ckService.save(ck);
+									}
+								}
+							}
+						}
+						// 堆场
+						List<DcEntity> dclist = dcService.findByJyrid(jyr.getId());
+						if (dclist != null && dclist.size() > 0) {
+							for (DcEntity dc : dclist) {
+								if (dc != null) {
+									if (!StringUtils.isEmpty(dc.getXkzid())) {
+										dc.setXkzid(xkzxx.getId());
+										dcService.save(dc);
+									}
+								}
+							}
+						}
+						// 人员
+						List<RyEntity> rylist = ryService.findByJyrid(jyr.getId());
+						if (rylist != null && rylist.size() > 0) {
+							for (RyEntity ry : rylist) {
+								if (ry != null) {
+									if (!StringUtils.isEmpty(ry.getXkzid())) {
+										ry.setXkzid(xkzxx.getId());
+										ryService.save(ry);
+									}
+								}
+							}
+						}
+						// 设备信息
+						List<SssbEntity> sssblist = sssbService.findByJyrid(jyr.getId());
+						if (sssblist != null && sssblist.size() > 0) {
+							for (SssbEntity sssb : sssblist) {
+								if (sssb != null) {
+									if (!StringUtils.isEmpty(sssb.getXkzid())) {
+										sssb.setXkzid(xkzxx.getId());
+										sssbService.save(sssb);
+									}
+								}
+							}
+						}
+						// 企业投资
+						List<QytzEntity> qytzlist = qytzService.findByJyrid(jyr.getId());
+						if (qytzlist != null && qytzlist.size() > 0) {
+							for (QytzEntity qytz : qytzlist) {
+								if (qytz != null) {
+									if (!StringUtils.isEmpty(qytz.getXkzid())) {
+										qytz.setXkzid(xkzxx.getId());
+										qytzService.save(qytz);
+									}
+								}
+							}
+						}
+						// 装卸机械
+						List<ZxjxEntity> zxjxlist = zxjxService.findByJyrid(jyr.getId());
+						if (zxjxlist != null && zxjxlist.size() > 0) {
+							for (ZxjxEntity zxjx : zxjxlist) {
+								if (zxjx != null) {
+									if (!StringUtils.isEmpty(zxjx.getXkzid())) {
+										zxjx.setXkzid(xkzxx.getId());
+										zxjxService.save(zxjx);
+									}
+								}
+							}
+						}
 					}
 				}
 			}

+ 7 - 0
gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxkyx/ctl/XkzyxCtl.java

@@ -1467,6 +1467,13 @@ public class XkzyxCtl extends BaseWebCtl {
 				xkzyxEntity = xkzyxService.save(code);
 			}
 
+			// 修改经营人状态
+			GkjyrEntity jyr = gkjyrService.findOne(xkzyxEntity.getJyrid());
+			if (jyr != null) {
+				jyr.setRecordStatus(BaseEntity.RECORD_STATE_YX);
+				gkjyrService.save(jyr);
+			}
+
 			if (!StringUtils.isEmpty(accid)) {
 				// 关联附件
 				String[] ssids = accid.split(",");

+ 6 - 22
gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxkzx/ctl/XkzzxCtl.java

@@ -381,7 +381,8 @@ public class XkzzxCtl extends BaseWebCtl {
 					// list.add(cb.notEqual(root.get("recordStatus").as(Integer.class),
 					// BaseEntity.RECORD_STATE_DELETE));
 					list.add(cb.equal(root.get("recordStatus").as(Integer.class), BaseEntity.RECORE_STATE_COPY));
-					list.add(cb.equal(root.get("sfyx").as(Integer.class),BaseEntity.RECORD_STATE_VALID));
+					// list.add(cb.equal(root.get("sfyx").as(Integer.class),
+					// BaseEntity.RECORD_STATE_VALID));
 					Date date = new Date();
 					list.add(cb.greaterThanOrEqualTo(root.get("yxqz").as(Date.class), date));
 					list.add(cb.lessThanOrEqualTo(root.get("yxqq").as(Date.class), date));
@@ -422,11 +423,8 @@ public class XkzzxCtl extends BaseWebCtl {
 				public Predicate toPredicate(Root<XkzfzEntity> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
 					List<Predicate> list = new ArrayList<Predicate>();
 					list.add(cb.like(root.get("ssjyr").get("id").as(String.class), "%" + jyrid + "%"));
-					//list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_DELETE));
-					list.add(cb.equal(root.get("recordStatus").as(Integer.class), BaseEntity.RECORE_STATE_COPY));
-					Date date = new Date();
-					list.add(cb.greaterThanOrEqualTo(root.get("yxqjssj").as(Date.class), date));
-					list.add(cb.lessThanOrEqualTo(root.get("yxqkssj").as(Date.class), date));
+					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_COPY));
 					return cb.and(list.toArray(new Predicate[] {}));
 				}
 			};
@@ -1115,11 +1113,7 @@ public class XkzzxCtl extends BaseWebCtl {
 					List<Predicate> list = new ArrayList<Predicate>();
 					list.add(cb.like(root.get("gkjyr").as(String.class), "%" + jyrid + "%"));
 					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_COPY));
-					list.add(cb.equal(root.get("sfyx").as(Integer.class),BaseEntity.RECORD_STATE_VALID));
-					Date date = new Date();
-					list.add(cb.greaterThanOrEqualTo(root.get("yxqz").as(Date.class), date));
-					list.add(cb.lessThanOrEqualTo(root.get("yxqq").as(Date.class), date));
+					list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORE_STATE_COPY));
 					return cb.and(list.toArray(new Predicate[] {}));
 				}
 			};
@@ -1159,9 +1153,6 @@ public class XkzzxCtl extends BaseWebCtl {
 					list.add(cb.like(root.get("ssjyr").get("id").as(String.class), "%" + jyrid + "%"));
 					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_COPY));
-					Date date = new Date();
-					list.add(cb.greaterThanOrEqualTo(root.get("yxqjssj").as(Date.class), date));
-					list.add(cb.lessThanOrEqualTo(root.get("yxqkssj").as(Date.class), date));
 					return cb.and(list.toArray(new Predicate[] {}));
 				}
 			};
@@ -1330,11 +1321,7 @@ public class XkzzxCtl extends BaseWebCtl {
 					List<Predicate> list = new ArrayList<Predicate>();
 					list.add(cb.like(root.get("gkjyr").as(String.class), "%" + jyrid + "%"));
 					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_COPY));
-					list.add(cb.equal(root.get("sfyx").as(Integer.class),BaseEntity.RECORD_STATE_VALID));
-					Date date = new Date();
-					list.add(cb.greaterThanOrEqualTo(root.get("yxqz").as(Date.class), date));
-					list.add(cb.lessThanOrEqualTo(root.get("yxqq").as(Date.class), date));
+					list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORE_STATE_COPY));
 					return cb.and(list.toArray(new Predicate[] {}));
 				}
 			};
@@ -1374,9 +1361,6 @@ public class XkzzxCtl extends BaseWebCtl {
 					list.add(cb.like(root.get("ssjyr").get("id").as(String.class), "%" + jyrid + "%"));
 					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_COPY));
-					Date date = new Date();
-					list.add(cb.greaterThanOrEqualTo(root.get("yxqjssj").as(Date.class), date));
-					list.add(cb.lessThanOrEqualTo(root.get("yxqkssj").as(Date.class), date));
 					return cb.and(list.toArray(new Predicate[] {}));
 				}
 			};

+ 27 - 0
gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxkzx/service/impl/XkzzxServiceImpl.java

@@ -178,6 +178,9 @@ public class XkzzxServiceImpl extends BaseWorkFlowServiceImpl<XkzzxEntity, Strin
 		List<MtEntity> mtlist = mtService.findByJyrid(jyrid);
 		if (mtlist.size() > 0 && mtlist != null) {
 			for (MtEntity mt : mtlist) {
+				if(BaseEntity.RECORD_STATE_VALID == state){
+					mt.setXkzid("");
+				}
 				mt.setRecordStatus(state);
 				mtService.save(mt);
 			}
@@ -186,6 +189,9 @@ public class XkzzxServiceImpl extends BaseWorkFlowServiceImpl<XkzzxEntity, Strin
 		List<BwEntity> bwlist = bwService.findByJyrid(jyrid);
 		if (bwlist != null && bwlist.size() > 0) {
 			for (BwEntity bw : bwlist) {
+				if(BaseEntity.RECORD_STATE_VALID == state){
+					bw.setXkzid("");
+				}
 				bw.setRecordStatus(state);
 				bwService.save(bw);
 			}
@@ -194,6 +200,9 @@ public class XkzzxServiceImpl extends BaseWorkFlowServiceImpl<XkzzxEntity, Strin
 		List<CgEntity> cglist = cgService.findByJyrid(jyrid);
 		if (cglist != null && cglist.size() > 0) {
 			for (CgEntity cg : cglist) {
+				if(BaseEntity.RECORD_STATE_VALID == state){
+					cg.setXkzid("");
+				}
 				cg.setRecordStatus(state);
 				cgService.save(cg);
 			}
@@ -202,6 +211,9 @@ public class XkzzxServiceImpl extends BaseWorkFlowServiceImpl<XkzzxEntity, Strin
 		List<CkEntity> cklist = ckService.findByJyrid(jyrid);
 		if (cklist != null && cklist.size() > 0) {
 			for (CkEntity ck : cklist) {
+				if(BaseEntity.RECORD_STATE_VALID == state){
+					ck.setXkzid("");
+				}
 				ck.setRecordStatus(state);
 				ckService.save(ck);
 			}
@@ -210,6 +222,9 @@ public class XkzzxServiceImpl extends BaseWorkFlowServiceImpl<XkzzxEntity, Strin
 		List<DcEntity> dclist = dcService.findByJyrid(jyrid);
 		if (dclist != null && dclist.size() > 0) {
 			for (DcEntity dc : dclist) {
+				if(BaseEntity.RECORD_STATE_VALID == state){
+					dc.setXkzid("");
+				}
 				dc.setRecordStatus(state);
 				dcService.save(dc);
 			}
@@ -218,6 +233,9 @@ public class XkzzxServiceImpl extends BaseWorkFlowServiceImpl<XkzzxEntity, Strin
 		List<RyEntity> rylist = ryService.findByJyrid(jyrid);
 		if (rylist != null && rylist.size() > 0) {
 			for (RyEntity ry : rylist) {
+				if(BaseEntity.RECORD_STATE_VALID == state){
+					ry.setXkzid("");
+				}
 				ry.setRecordStatus(state);
 				ryService.save(ry);
 			}
@@ -226,6 +244,9 @@ public class XkzzxServiceImpl extends BaseWorkFlowServiceImpl<XkzzxEntity, Strin
 		List<SssbEntity> sssblist = sssbService.findByJyrid(jyrid);
 		if (sssblist != null && sssblist.size() > 0) {
 			for (SssbEntity sssb : sssblist) {
+				if(BaseEntity.RECORD_STATE_VALID == state){
+					sssb.setXkzid("");
+				}
 				sssb.setRecordStatus(state);
 				sssbService.save(sssb);
 			}
@@ -234,6 +255,9 @@ public class XkzzxServiceImpl extends BaseWorkFlowServiceImpl<XkzzxEntity, Strin
 		List<QytzEntity> qytzlist = qytzService.findByJyrid(jyrid);
 		if (qytzlist != null && qytzlist.size() > 0) {
 			for (QytzEntity qytz : qytzlist) {
+				if(BaseEntity.RECORD_STATE_VALID == state){
+					qytz.setXkzid("");
+				}
 				qytz.setRecordStatus(state);
 				qytzService.save(qytz);
 			}
@@ -242,6 +266,9 @@ public class XkzzxServiceImpl extends BaseWorkFlowServiceImpl<XkzzxEntity, Strin
 		List<ZxjxEntity> zxjxlist = zxjxService.findByJyrid(jyrid);
 		if (zxjxlist != null && zxjxlist.size() > 0) {
 			for (ZxjxEntity zxjx : zxjxlist) {
+				if(BaseEntity.RECORD_STATE_VALID == state){
+					zxjx.setXkzid("");
+				}
 				zxjx.setRecordStatus(state);
 				zxjxService.save(zxjx);
 			}