Przeglądaj źródła

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

ld_liqk 8 lat temu
rodzic
commit
1d577003d5
35 zmienionych plików z 98 dodań i 49 usunięć
  1. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/jyrjbxx/gkjyrdetails.jsp
  2. 2 2
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkbg/xkzbgaddmain.jsp
  3. 2 2
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkbg/xkzbgeditmain.jsp
  4. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkbg/xkzbgviewmain.jsp
  5. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxksq/xkzsqaddmain.jsp
  6. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxksq/xkzsqeditmain.jsp
  7. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxksq/xkzsqviewmain.jsp
  8. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkyx/xkzyxaddmain.jsp
  9. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkyx/xkzyxeditmain.jsp
  10. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkyx/xkzyxviewmain.jsp
  11. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkzx/xkzzxaddmain.jsp
  12. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkzx/xkzzxeditmain.jsp
  13. 1 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkzx/xkzzxviewmain.jsp
  14. 1 1
      gkjsjy/trunk/WebContent/static/sql/oracle/changzhou/sys/5.1.sysdata.sql
  15. 1 1
      gkjsjy/trunk/WebContent/static/sql/oracle/huaian/sys/5.1.sysdata.sql
  16. 1 1
      gkjsjy/trunk/WebContent/static/sql/oracle/lianyungang/sys/5.1.sysdata.sql
  17. 1 1
      gkjsjy/trunk/WebContent/static/sql/oracle/nanjing/sys/5.1.sysdata.sql
  18. 1 1
      gkjsjy/trunk/WebContent/static/sql/oracle/nantong/sys/5.1.sysdata.sql
  19. 1 1
      gkjsjy/trunk/WebContent/static/sql/oracle/nantongneihe/sys/5.1.sysdata.sql
  20. 1 1
      gkjsjy/trunk/WebContent/static/sql/oracle/province/sys/5.1.sysdata.sql
  21. 1 1
      gkjsjy/trunk/WebContent/static/sql/oracle/suzhou/sys/5.1.sysdata.sql
  22. 1 1
      gkjsjy/trunk/WebContent/static/sql/oracle/wuxi/sys/5.1.sysdata.sql
  23. 1 1
      gkjsjy/trunk/WebContent/static/sql/oracle/xuzhou/sys/5.1.sysdata.sql
  24. 1 1
      gkjsjy/trunk/WebContent/static/sql/oracle/yanchengneihe/sys/5.1.sysdata.sql
  25. 1 1
      gkjsjy/trunk/src/com/cxfws/jyrxxgl/service/IXkzfzWebService.java
  26. 1 1
      gkjsjy/trunk/src/com/xt/jygl/common/SearchCondition.java
  27. 5 5
      gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/jyrjbxx/ctl/GkjyrCtl.java
  28. 1 1
      gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/jyrjbxx/service/impl/GkjyrServiceImpl.java
  29. 1 1
      gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/xkzfz/ctl/XkzfzCtl.java
  30. 2 2
      gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/xkzfz/service/impl/XkzfzServiceImpl.java
  31. 3 3
      gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxkbg/ctl/XkzbgCtl.java
  32. 3 3
      gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxksq/ctl/XkzsqCtl.java
  33. 3 3
      gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxkyx/ctl/XkzyxCtl.java
  34. 3 3
      gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxkzx/ctl/XkzzxCtl.java
  35. 49 0
      gkjsjy/trunk/src/com/xt/jygl/gkyxtjyfx/hxhbtj/service/impl/HxhbtjServiceImpl.java

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

@@ -143,7 +143,7 @@
 						<ul>
 							<li class="new_hover">基本信息</li>
 							<li >许可证</li>
-							<li style="width:90px">许可证附证</li>
+							<li style="width:90px">危货作业附证</li>
 							<li>码头信息</li>
 							<li>泊位信息</li>
 							<li>储罐信息</li>

+ 2 - 2
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkbg/xkzbgaddmain.jsp

@@ -558,7 +558,7 @@
 							<ul>
 								<li class="new_hover">基本信息</li>
 								<li>许可证</li>
-								<li style="width: 90px">许可证附证</li>
+								<li style="width: 90px">危货作业附证</li>
 								<li>码头信息</li>
 								<li>泊位信息</li>
 								<li>储罐信息</li>
@@ -1000,7 +1000,7 @@
 											<td>${xkzfz.yxqjssjfmt }</td>
 											<td><c:if test="${xkzfz.recordStatus==1}">有效</c:if></td>
 											<td><a class="btn btn-default btn-xs" href="#"
-												onclick="parent.main.menuClick('xkzfz','许可证附证','/xkzfz/view?id=${xkzfz.id}')">
+												onclick="parent.main.menuClick('xkzfz','危货作业附证','/xkzfz/view?id=${xkzfz.id}')">
 													<i class="glyphicon glyphicon-search"></i>查看
 											</a></td>
 										</tr>

+ 2 - 2
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkbg/xkzbgeditmain.jsp

@@ -477,7 +477,7 @@
 							<ul id="cheUl">
 								<li class="new_hover">基本信息</li>
 								<li>许可证</li>
-								<li style="width: 90px">许可证附证</li>
+								<li style="width: 90px">危货作业附证</li>
 								<li>码头信息</li>
 								<li>泊位信息</li>
 								<li>储罐信息</li>
@@ -876,7 +876,7 @@
 											<td>${xkzfz.yxqjssjfmt }</td>
 											<td><c:if test="${xkzfz.recordStatus==1}">有效</c:if></td>
 											<td><a class="btn btn-default btn-xs" href="#"
-												onclick="parent.main.menuClick('xkzfz','许可证附证','/xkzfz/view?id=${xkzfz.id}')">
+												onclick="parent.main.menuClick('xkzfz','危货作业附证','/xkzfz/view?id=${xkzfz.id}')">
 													<i class="glyphicon glyphicon-search"></i>查看
 											</a></td>
 										</tr>

+ 1 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkbg/xkzbgviewmain.jsp

@@ -480,7 +480,7 @@
 						<ul>
 							<li class="new_hover">基本信息</li>
 							<li >许可证</li>
-							<li style="width:90px">许可证附证</li>
+							<li style="width:90px">危货作业附证</li>
 							<li>码头信息</li>
 							<li>泊位信息</li>
 							<li>储罐信息</li>

+ 1 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxksq/xkzsqaddmain.jsp

@@ -465,7 +465,7 @@
 							<ul>
 								<li class="new_hover">基本信息</li>
 								<li>许可证</li>
-								<li style="width: 90px">许可证附证</li>
+								<li style="width: 90px">危货作业附证</li>
 								<li>码头信息</li>
 								<li>泊位信息</li>
 								<li>储罐信息</li>

+ 1 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxksq/xkzsqeditmain.jsp

@@ -399,7 +399,7 @@
 							<ul id="cheUl">
 								<li class="new_hover">基本信息</li>
 								<li>许可证</li>
-								<li style="width: 90px">许可证附证</li>
+								<li style="width: 90px">危货作业附证</li>
 								<li>码头信息</li>
 								<li>泊位信息</li>
 								<li>储罐信息</li>

+ 1 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxksq/xkzsqviewmain.jsp

@@ -430,7 +430,7 @@
 						<ul>
 							<li class="new_hover">基本信息</li>
 							<li >许可证</li>
-							<li style="width:90px">许可证附证</li>
+							<li style="width:90px">危货作业附证</li>
 							<li>码头信息</li>
 							<li>泊位信息</li>
 							<li>储罐信息</li>

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

@@ -426,7 +426,7 @@
 							<ul>
 								<li class="new_hover">基本信息</li>
 								<li>许可证</li>
-								<li style="width: 90px">许可证附证</li>
+								<li style="width: 90px">危货作业附证</li>
 								<li>码头信息</li>
 								<li>泊位信息</li>
 								<li>储罐信息</li>

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

@@ -342,7 +342,7 @@
 							<ul id="cheUl">
 								<li class="new_hover">基本信息</li>
 								<li>许可证</li>
-								<li style="width: 90px">许可证附证</li>
+								<li style="width: 90px">危货作业附证</li>
 								<li>码头信息</li>
 								<li>泊位信息</li>
 								<li>储罐信息</li>

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

@@ -466,7 +466,7 @@
 						<ul>
 							<li class="new_hover">基本信息</li>
 							<li >许可证</li>
-							<li style="width:90px">许可证附证</li>
+							<li style="width:90px">危货作业附证</li>
 							<li>码头信息</li>
 							<li>泊位信息</li>
 							<li>储罐信息</li>

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

@@ -416,7 +416,7 @@
 							<ul>
 								<li class="new_hover">基本信息</li>
 								<li>许可证</li>
-								<li style="width: 90px">许可证附证</li>
+								<li style="width: 90px">危货作业附证</li>
 								<li>码头信息</li>
 								<li>泊位信息</li>
 								<li>储罐信息</li>

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

@@ -316,7 +316,7 @@
 							<ul id="cheUl">
 								<li class="new_hover">基本信息</li>
 								<li>许可证</li>
-								<li style="width: 90px">许可证附证</li>
+								<li style="width: 90px">危货作业附证</li>
 								<li>码头信息</li>
 								<li>泊位信息</li>
 								<li>储罐信息</li>

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

@@ -456,7 +456,7 @@
 						<ul>
 							<li class="new_hover">基本信息</li>
 							<li >许可证</li>
-							<li style="width:90px">许可证附证</li>
+							<li style="width:90px">危货作业附证</li>
 							<li>码头信息</li>
 							<li>泊位信息</li>
 							<li>储罐信息</li>

+ 1 - 1
gkjsjy/trunk/WebContent/static/sql/oracle/changzhou/sys/5.1.sysdata.sql

@@ -3185,7 +3185,7 @@ values ('402881ec50da5a350150da816a590020', '402881ec50da5a350150da689aa60003',
 insert into GK_OPERATION_JSJY_MENU (id, pid, name, code, url, sortno, create_date_time, update_date_time, record_status, create_user, update_user, szd, iconcls, leaf)
 values ('402881ec50da5a350150da8276690022', '402881ec50da5a350150da689aa60003', '船港货信息管理', 'cghzyxxgl', null, 4, to_timestamp('06-11-2015 09:56:35.', 'dd-mm-yyyy hh24:mi:ss.ff'), to_timestamp('06-11-2015 09:56:35.', 'dd-mm-yyyy hh24:mi:ss.ff'), 1, '1', '1', null, null, 'N');
 insert into GK_OPERATION_JSJY_MENU (id, pid, name, code, url, sortno, create_date_time, update_date_time, record_status, create_user, update_user, szd, iconcls, leaf)
-values ('402881ec50da5a350150da840da20025', '402881ec50da5a350150da80ffca001f', '许可证附证', 'xkzfz', '/xkzfz/main', 3, to_timestamp('06-11-2015 09:58:19.', 'dd-mm-yyyy hh24:mi:ss.ff'), to_timestamp('30-11-2015 16:14:18.', 'dd-mm-yyyy hh24:mi:ss.ff'), 1, '1', '1', null, null, 'Y');
+values ('402881ec50da5a350150da840da20025', '402881ec50da5a350150da80ffca001f', '危货作业附证', 'xkzfz', '/xkzfz/main', 3, to_timestamp('06-11-2015 09:58:19.', 'dd-mm-yyyy hh24:mi:ss.ff'), to_timestamp('30-11-2015 16:14:18.', 'dd-mm-yyyy hh24:mi:ss.ff'), 1, '1', '1', null, null, 'Y');
 insert into GK_OPERATION_JSJY_MENU (id, pid, name, code, url, sortno, create_date_time, update_date_time, record_status, create_user, update_user, szd, iconcls, leaf)
 values ('402881ec50da5a350150da84c3600027', '402881ec50da5a350150da80ffca001f', '泊位信息', 'bwxx', '/bw/main', 5, to_timestamp('06-11-2015 09:59:05.', 'dd-mm-yyyy hh24:mi:ss.ff'), to_timestamp('17-11-2015 20:30:25.', 'dd-mm-yyyy hh24:mi:ss.ff'), 1, '1', '1', null, null, 'Y');
 insert into GK_OPERATION_JSJY_MENU (id, pid, name, code, url, sortno, create_date_time, update_date_time, record_status, create_user, update_user, szd, iconcls, leaf)

+ 1 - 1
gkjsjy/trunk/WebContent/static/sql/oracle/huaian/sys/5.1.sysdata.sql

@@ -1878,7 +1878,7 @@ values ('402881ec50da5a350150da816a590020', '402881ec50da5a350150da689aa60003',
 insert into GK_OPERATION_JSJY_MENU (id, pid, name, code, url, sortno, create_date_time, update_date_time, record_status, create_user, update_user, szd, iconcls, leaf)
 values ('402881ec50da5a350150da8276690022', '402881ec50da5a350150da689aa60003', '船港货信息管理', 'cghzyxxgl', null, 4, to_timestamp('06-11-2015 09:56:35.', 'dd-mm-yyyy hh24:mi:ss.ff'), to_timestamp('06-11-2015 09:56:35.', 'dd-mm-yyyy hh24:mi:ss.ff'), 1, '1', '1', null, null, 'N');
 insert into GK_OPERATION_JSJY_MENU (id, pid, name, code, url, sortno, create_date_time, update_date_time, record_status, create_user, update_user, szd, iconcls, leaf)
-values ('402881ec50da5a350150da840da20025', '402881ec50da5a350150da80ffca001f', '许可证附证', 'xkzfz', '/xkzfz/main', 3, to_timestamp('06-11-2015 09:58:19.', 'dd-mm-yyyy hh24:mi:ss.ff'), to_timestamp('30-11-2015 16:14:18.', 'dd-mm-yyyy hh24:mi:ss.ff'), 1, '1', '1', null, null, 'Y');
+values ('402881ec50da5a350150da840da20025', '402881ec50da5a350150da80ffca001f', '危货作业附证', 'xkzfz', '/xkzfz/main', 3, to_timestamp('06-11-2015 09:58:19.', 'dd-mm-yyyy hh24:mi:ss.ff'), to_timestamp('30-11-2015 16:14:18.', 'dd-mm-yyyy hh24:mi:ss.ff'), 1, '1', '1', null, null, 'Y');
 insert into GK_OPERATION_JSJY_MENU (id, pid, name, code, url, sortno, create_date_time, update_date_time, record_status, create_user, update_user, szd, iconcls, leaf)
 values ('402881ec50da5a350150da84c3600027', '402881ec50da5a350150da80ffca001f', '泊位信息', 'bwxx', '/bw/main', 5, to_timestamp('06-11-2015 09:59:05.', 'dd-mm-yyyy hh24:mi:ss.ff'), to_timestamp('17-11-2015 20:30:25.', 'dd-mm-yyyy hh24:mi:ss.ff'), 1, '1', '1', null, null, 'Y');
 insert into GK_OPERATION_JSJY_MENU (id, pid, name, code, url, sortno, create_date_time, update_date_time, record_status, create_user, update_user, szd, iconcls, leaf)

+ 1 - 1
gkjsjy/trunk/WebContent/static/sql/oracle/lianyungang/sys/5.1.sysdata.sql

@@ -1870,7 +1870,7 @@ values ('402881ec50da5a350150da816a590020', '402881ec50da5a350150da689aa60003',
 insert into GK_OPERATION_JSJY_MENU (id, pid, name, code, url, sortno, create_date_time, update_date_time, record_status, create_user, update_user, szd, iconcls, leaf)
 values ('402881ec50da5a350150da8276690022', '402881ec50da5a350150da689aa60003', '船港货信息管理', 'cghzyxxgl', null, 4, to_timestamp('06-11-2015 09:56:35.', 'dd-mm-yyyy hh24:mi:ss.ff'), to_timestamp('06-11-2015 09:56:35.', 'dd-mm-yyyy hh24:mi:ss.ff'), 1, '1', '1', null, null, 'N');
 insert into GK_OPERATION_JSJY_MENU (id, pid, name, code, url, sortno, create_date_time, update_date_time, record_status, create_user, update_user, szd, iconcls, leaf)
-values ('402881ec50da5a350150da840da20025', '402881ec50da5a350150da80ffca001f', '许可证附证', 'xkzfz', '/xkzfz/main', 3, to_timestamp('06-11-2015 09:58:19.', 'dd-mm-yyyy hh24:mi:ss.ff'), to_timestamp('30-11-2015 16:14:18.', 'dd-mm-yyyy hh24:mi:ss.ff'), 1, '1', '1', null, null, 'Y');
+values ('402881ec50da5a350150da840da20025', '402881ec50da5a350150da80ffca001f', '危货作业附证', 'xkzfz', '/xkzfz/main', 3, to_timestamp('06-11-2015 09:58:19.', 'dd-mm-yyyy hh24:mi:ss.ff'), to_timestamp('30-11-2015 16:14:18.', 'dd-mm-yyyy hh24:mi:ss.ff'), 1, '1', '1', null, null, 'Y');
 insert into GK_OPERATION_JSJY_MENU (id, pid, name, code, url, sortno, create_date_time, update_date_time, record_status, create_user, update_user, szd, iconcls, leaf)
 values ('402881ec50da5a350150da84c3600027', '402881ec50da5a350150da80ffca001f', '泊位信息', 'bwxx', '/bw/main', 5, to_timestamp('06-11-2015 09:59:05.', 'dd-mm-yyyy hh24:mi:ss.ff'), to_timestamp('17-11-2015 20:30:25.', 'dd-mm-yyyy hh24:mi:ss.ff'), 1, '1', '1', null, null, 'Y');
 insert into GK_OPERATION_JSJY_MENU (id, pid, name, code, url, sortno, create_date_time, update_date_time, record_status, create_user, update_user, szd, iconcls, leaf)

+ 1 - 1
gkjsjy/trunk/WebContent/static/sql/oracle/nanjing/sys/5.1.sysdata.sql

@@ -2830,7 +2830,7 @@ insert into GK_OPERATION_JSJY_MENU (ID, PID, NAME, CODE, URL, SORTNO, CREATE_DAT
 values ('402881ec50da5a350150da8276690022', '402881ec50da5a350150da689aa60003', '船港货信息管理', 'cghzyxxgl', null, 4, '06-11月-15 09.56.35 上午', '06-11月-15 09.56.35 上午', 1, '1', '1', null, null, 'N', 'Y', 'N');
 
 insert into GK_OPERATION_JSJY_MENU (ID, PID, NAME, CODE, URL, SORTNO, CREATE_DATE_TIME, UPDATE_DATE_TIME, RECORD_STATUS, CREATE_USER, UPDATE_USER, SZD, ICONCLS, LEAF, SFTB, TBZT)
-values ('402881ec50da5a350150da840da20025', '402881ec50da5a350150da80ffca001f', '许可证附证', 'xkzfz', '/xkzfz/main', 3, '06-11月-15 09.58.19 上午', '30-11月-15 04.14.18 下午', 1, '1', '1', null, null, 'Y', 'Y', 'N');
+values ('402881ec50da5a350150da840da20025', '402881ec50da5a350150da80ffca001f', '危货作业附证', 'xkzfz', '/xkzfz/main', 3, '06-11月-15 09.58.19 上午', '30-11月-15 04.14.18 下午', 1, '1', '1', null, null, 'Y', 'Y', 'N');
 
 insert into GK_OPERATION_JSJY_MENU (ID, PID, NAME, CODE, URL, SORTNO, CREATE_DATE_TIME, UPDATE_DATE_TIME, RECORD_STATUS, CREATE_USER, UPDATE_USER, SZD, ICONCLS, LEAF, SFTB, TBZT)
 values ('402881ec50da5a350150da84c3600027', '402881ec50da5a350150da80ffca001f', '泊位信息', 'bwxx', '/bw/main', 5, '06-11月-15 09.59.05 上午', '17-11月-15 08.30.25 下午', 1, '1', '1', null, null, 'Y', 'Y', 'N');

+ 1 - 1
gkjsjy/trunk/WebContent/static/sql/oracle/nantong/sys/5.1.sysdata.sql

@@ -2830,7 +2830,7 @@ insert into GK_OPERATION_JSJY_MENU (ID, PID, NAME, CODE, URL, SORTNO, CREATE_DAT
 values ('402881ec50da5a350150da8276690022', '402881ec50da5a350150da689aa60003', '船港货信息管理', 'cghzyxxgl', null, 4, '06-11月-15 09.56.35 上午', '06-11月-15 09.56.35 上午', 1, '1', '1', null, null, 'N', 'Y', 'N');
 
 insert into GK_OPERATION_JSJY_MENU (ID, PID, NAME, CODE, URL, SORTNO, CREATE_DATE_TIME, UPDATE_DATE_TIME, RECORD_STATUS, CREATE_USER, UPDATE_USER, SZD, ICONCLS, LEAF, SFTB, TBZT)
-values ('402881ec50da5a350150da840da20025', '402881ec50da5a350150da80ffca001f', '许可证附证', 'xkzfz', '/xkzfz/main', 3, '06-11月-15 09.58.19 上午', '30-11月-15 04.14.18 下午', 1, '1', '1', null, null, 'Y', 'Y', 'N');
+values ('402881ec50da5a350150da840da20025', '402881ec50da5a350150da80ffca001f', '危货作业附证', 'xkzfz', '/xkzfz/main', 3, '06-11月-15 09.58.19 上午', '30-11月-15 04.14.18 下午', 1, '1', '1', null, null, 'Y', 'Y', 'N');
 
 insert into GK_OPERATION_JSJY_MENU (ID, PID, NAME, CODE, URL, SORTNO, CREATE_DATE_TIME, UPDATE_DATE_TIME, RECORD_STATUS, CREATE_USER, UPDATE_USER, SZD, ICONCLS, LEAF, SFTB, TBZT)
 values ('402881ec50da5a350150da84c3600027', '402881ec50da5a350150da80ffca001f', '泊位信息', 'bwxx', '/bw/main', 5, '06-11月-15 09.59.05 上午', '17-11月-15 08.30.25 下午', 1, '1', '1', null, null, 'Y', 'Y', 'N');

+ 1 - 1
gkjsjy/trunk/WebContent/static/sql/oracle/nantongneihe/sys/5.1.sysdata.sql

@@ -3185,7 +3185,7 @@ values ('402881ec50da5a350150da816a590020', '402881ec50da5a350150da689aa60003',
 insert into GK_OPERATION_JSJY_MENU (id, pid, name, code, url, sortno, create_date_time, update_date_time, record_status, create_user, update_user, szd, iconcls, leaf)
 values ('402881ec50da5a350150da8276690022', '402881ec50da5a350150da689aa60003', '船港货信息管理', 'cghzyxxgl', null, 4, to_timestamp('06-11-2015 09:56:35.', 'dd-mm-yyyy hh24:mi:ss.ff'), to_timestamp('06-11-2015 09:56:35.', 'dd-mm-yyyy hh24:mi:ss.ff'), 1, '1', '1', null, null, 'N');
 insert into GK_OPERATION_JSJY_MENU (id, pid, name, code, url, sortno, create_date_time, update_date_time, record_status, create_user, update_user, szd, iconcls, leaf)
-values ('402881ec50da5a350150da840da20025', '402881ec50da5a350150da80ffca001f', '许可证附证', 'xkzfz', '/xkzfz/main', 3, to_timestamp('06-11-2015 09:58:19.', 'dd-mm-yyyy hh24:mi:ss.ff'), to_timestamp('30-11-2015 16:14:18.', 'dd-mm-yyyy hh24:mi:ss.ff'), 1, '1', '1', null, null, 'Y');
+values ('402881ec50da5a350150da840da20025', '402881ec50da5a350150da80ffca001f', '危货作业附证', 'xkzfz', '/xkzfz/main', 3, to_timestamp('06-11-2015 09:58:19.', 'dd-mm-yyyy hh24:mi:ss.ff'), to_timestamp('30-11-2015 16:14:18.', 'dd-mm-yyyy hh24:mi:ss.ff'), 1, '1', '1', null, null, 'Y');
 insert into GK_OPERATION_JSJY_MENU (id, pid, name, code, url, sortno, create_date_time, update_date_time, record_status, create_user, update_user, szd, iconcls, leaf)
 values ('402881ec50da5a350150da84c3600027', '402881ec50da5a350150da80ffca001f', '泊位信息', 'bwxx', '/bw/main', 5, to_timestamp('06-11-2015 09:59:05.', 'dd-mm-yyyy hh24:mi:ss.ff'), to_timestamp('17-11-2015 20:30:25.', 'dd-mm-yyyy hh24:mi:ss.ff'), 1, '1', '1', null, null, 'Y');
 insert into GK_OPERATION_JSJY_MENU (id, pid, name, code, url, sortno, create_date_time, update_date_time, record_status, create_user, update_user, szd, iconcls, leaf)

+ 1 - 1
gkjsjy/trunk/WebContent/static/sql/oracle/province/sys/5.1.sysdata.sql

@@ -1752,7 +1752,7 @@ values ('402881ec50da5a350150da816a590020', '402881ec50da5a350150da689aa60003',
 insert into GK_OPERATION_JSJY_MENU (id, pid, name, code, url, sortno, create_date_time, update_date_time, record_status, create_user, update_user, szd, iconcls, leaf)
 values ('402881ec50da5a350150da8276690022', '402881ec50da5a350150da689aa60003', '船港货信息管理', 'cghzyxxgl', null, 4, to_timestamp('06-11-2015 09:56:35.', 'dd-mm-yyyy hh24:mi:ss.ff'), to_timestamp('06-11-2015 09:56:35.', 'dd-mm-yyyy hh24:mi:ss.ff'), 1, '1', '1', null, null, 'N');
 insert into GK_OPERATION_JSJY_MENU (id, pid, name, code, url, sortno, create_date_time, update_date_time, record_status, create_user, update_user, szd, iconcls, leaf)
-values ('402881ec50da5a350150da840da20025', '402881ec50da5a350150da80ffca001f', '许可证附证', 'xkzfz', '/xkzfz/main', 3, to_timestamp('06-11-2015 09:58:19.', 'dd-mm-yyyy hh24:mi:ss.ff'), to_timestamp('30-11-2015 16:14:18.', 'dd-mm-yyyy hh24:mi:ss.ff'), 1, '1', '1', null, null, 'Y');
+values ('402881ec50da5a350150da840da20025', '402881ec50da5a350150da80ffca001f', '危货作业附证', 'xkzfz', '/xkzfz/main', 3, to_timestamp('06-11-2015 09:58:19.', 'dd-mm-yyyy hh24:mi:ss.ff'), to_timestamp('30-11-2015 16:14:18.', 'dd-mm-yyyy hh24:mi:ss.ff'), 1, '1', '1', null, null, 'Y');
 insert into GK_OPERATION_JSJY_MENU (id, pid, name, code, url, sortno, create_date_time, update_date_time, record_status, create_user, update_user, szd, iconcls, leaf)
 values ('402881ec50da5a350150da84c3600027', '402881ec50da5a350150da80ffca001f', '泊位信息', 'bwxx', '/bw/main', 5, to_timestamp('06-11-2015 09:59:05.', 'dd-mm-yyyy hh24:mi:ss.ff'), to_timestamp('17-11-2015 20:30:25.', 'dd-mm-yyyy hh24:mi:ss.ff'), 1, '1', '1', null, null, 'Y');
 insert into GK_OPERATION_JSJY_MENU (id, pid, name, code, url, sortno, create_date_time, update_date_time, record_status, create_user, update_user, szd, iconcls, leaf)

+ 1 - 1
gkjsjy/trunk/WebContent/static/sql/oracle/suzhou/sys/5.1.sysdata.sql

@@ -1870,7 +1870,7 @@ values ('402881ec50da5a350150da816a590020', '402881ec50da5a350150da689aa60003',
 insert into GK_OPERATION_JSJY_MENU (id, pid, name, code, url, sortno, create_date_time, update_date_time, record_status, create_user, update_user, szd, iconcls, leaf)
 values ('402881ec50da5a350150da8276690022', '402881ec50da5a350150da689aa60003', '船港货信息管理', 'cghzyxxgl', null, 4, to_timestamp('06-11-2015 09:56:35.', 'dd-mm-yyyy hh24:mi:ss.ff'), to_timestamp('06-11-2015 09:56:35.', 'dd-mm-yyyy hh24:mi:ss.ff'), 1, '1', '1', null, null, 'N');
 insert into GK_OPERATION_JSJY_MENU (id, pid, name, code, url, sortno, create_date_time, update_date_time, record_status, create_user, update_user, szd, iconcls, leaf)
-values ('402881ec50da5a350150da840da20025', '402881ec50da5a350150da80ffca001f', '许可证附证', 'xkzfz', '/xkzfz/main', 3, to_timestamp('06-11-2015 09:58:19.', 'dd-mm-yyyy hh24:mi:ss.ff'), to_timestamp('30-11-2015 16:14:18.', 'dd-mm-yyyy hh24:mi:ss.ff'), 1, '1', '1', null, null, 'Y');
+values ('402881ec50da5a350150da840da20025', '402881ec50da5a350150da80ffca001f', '危货作业附证', 'xkzfz', '/xkzfz/main', 3, to_timestamp('06-11-2015 09:58:19.', 'dd-mm-yyyy hh24:mi:ss.ff'), to_timestamp('30-11-2015 16:14:18.', 'dd-mm-yyyy hh24:mi:ss.ff'), 1, '1', '1', null, null, 'Y');
 insert into GK_OPERATION_JSJY_MENU (id, pid, name, code, url, sortno, create_date_time, update_date_time, record_status, create_user, update_user, szd, iconcls, leaf)
 values ('402881ec50da5a350150da84c3600027', '402881ec50da5a350150da80ffca001f', '泊位信息', 'bwxx', '/bw/main', 5, to_timestamp('06-11-2015 09:59:05.', 'dd-mm-yyyy hh24:mi:ss.ff'), to_timestamp('17-11-2015 20:30:25.', 'dd-mm-yyyy hh24:mi:ss.ff'), 1, '1', '1', null, null, 'Y');
 insert into GK_OPERATION_JSJY_MENU (id, pid, name, code, url, sortno, create_date_time, update_date_time, record_status, create_user, update_user, szd, iconcls, leaf)

+ 1 - 1
gkjsjy/trunk/WebContent/static/sql/oracle/wuxi/sys/5.1.sysdata.sql

@@ -3185,7 +3185,7 @@ values ('402881ec50da5a350150da816a590020', '402881ec50da5a350150da689aa60003',
 insert into GK_OPERATION_JSJY_MENU (id, pid, name, code, url, sortno, create_date_time, update_date_time, record_status, create_user, update_user, szd, iconcls, leaf)
 values ('402881ec50da5a350150da8276690022', '402881ec50da5a350150da689aa60003', '船港货信息管理', 'cghzyxxgl', null, 4, to_timestamp('06-11-2015 09:56:35.', 'dd-mm-yyyy hh24:mi:ss.ff'), to_timestamp('06-11-2015 09:56:35.', 'dd-mm-yyyy hh24:mi:ss.ff'), 1, '1', '1', null, null, 'N');
 insert into GK_OPERATION_JSJY_MENU (id, pid, name, code, url, sortno, create_date_time, update_date_time, record_status, create_user, update_user, szd, iconcls, leaf)
-values ('402881ec50da5a350150da840da20025', '402881ec50da5a350150da80ffca001f', '许可证附证', 'xkzfz', '/xkzfz/main', 3, to_timestamp('06-11-2015 09:58:19.', 'dd-mm-yyyy hh24:mi:ss.ff'), to_timestamp('30-11-2015 16:14:18.', 'dd-mm-yyyy hh24:mi:ss.ff'), 1, '1', '1', null, null, 'Y');
+values ('402881ec50da5a350150da840da20025', '402881ec50da5a350150da80ffca001f', '危货作业附证', 'xkzfz', '/xkzfz/main', 3, to_timestamp('06-11-2015 09:58:19.', 'dd-mm-yyyy hh24:mi:ss.ff'), to_timestamp('30-11-2015 16:14:18.', 'dd-mm-yyyy hh24:mi:ss.ff'), 1, '1', '1', null, null, 'Y');
 insert into GK_OPERATION_JSJY_MENU (id, pid, name, code, url, sortno, create_date_time, update_date_time, record_status, create_user, update_user, szd, iconcls, leaf)
 values ('402881ec50da5a350150da84c3600027', '402881ec50da5a350150da80ffca001f', '泊位信息', 'bwxx', '/bw/main', 5, to_timestamp('06-11-2015 09:59:05.', 'dd-mm-yyyy hh24:mi:ss.ff'), to_timestamp('17-11-2015 20:30:25.', 'dd-mm-yyyy hh24:mi:ss.ff'), 1, '1', '1', null, null, 'Y');
 insert into GK_OPERATION_JSJY_MENU (id, pid, name, code, url, sortno, create_date_time, update_date_time, record_status, create_user, update_user, szd, iconcls, leaf)

+ 1 - 1
gkjsjy/trunk/WebContent/static/sql/oracle/xuzhou/sys/5.1.sysdata.sql

@@ -2830,7 +2830,7 @@ insert into GK_OPERATION_JSJY_MENU (ID, PID, NAME, CODE, URL, SORTNO, CREATE_DAT
 values ('402881ec50da5a350150da8276690022', '402881ec50da5a350150da689aa60003', '船港货信息管理', 'cghzyxxgl', null, 4, '06-11月-15 09.56.35 上午', '06-11月-15 09.56.35 上午', 1, '1', '1', null, null, 'N', 'Y', 'N');
 
 insert into GK_OPERATION_JSJY_MENU (ID, PID, NAME, CODE, URL, SORTNO, CREATE_DATE_TIME, UPDATE_DATE_TIME, RECORD_STATUS, CREATE_USER, UPDATE_USER, SZD, ICONCLS, LEAF, SFTB, TBZT)
-values ('402881ec50da5a350150da840da20025', '402881ec50da5a350150da80ffca001f', '许可证附证', 'xkzfz', '/xkzfz/main', 3, '06-11月-15 09.58.19 上午', '30-11月-15 04.14.18 下午', 1, '1', '1', null, null, 'Y', 'Y', 'N');
+values ('402881ec50da5a350150da840da20025', '402881ec50da5a350150da80ffca001f', '危货作业附证', 'xkzfz', '/xkzfz/main', 3, '06-11月-15 09.58.19 上午', '30-11月-15 04.14.18 下午', 1, '1', '1', null, null, 'Y', 'Y', 'N');
 
 insert into GK_OPERATION_JSJY_MENU (ID, PID, NAME, CODE, URL, SORTNO, CREATE_DATE_TIME, UPDATE_DATE_TIME, RECORD_STATUS, CREATE_USER, UPDATE_USER, SZD, ICONCLS, LEAF, SFTB, TBZT)
 values ('402881ec50da5a350150da84c3600027', '402881ec50da5a350150da80ffca001f', '泊位信息', 'bwxx', '/bw/main', 5, '06-11月-15 09.59.05 上午', '17-11月-15 08.30.25 下午', 1, '1', '1', null, null, 'Y', 'Y', 'N');

+ 1 - 1
gkjsjy/trunk/WebContent/static/sql/oracle/yanchengneihe/sys/5.1.sysdata.sql

@@ -3185,7 +3185,7 @@ values ('402881ec50da5a350150da816a590020', '402881ec50da5a350150da689aa60003',
 insert into GK_OPERATION_JSJY_MENU (id, pid, name, code, url, sortno, create_date_time, update_date_time, record_status, create_user, update_user, szd, iconcls, leaf)
 values ('402881ec50da5a350150da8276690022', '402881ec50da5a350150da689aa60003', '船港货信息管理', 'cghzyxxgl', null, 4, to_timestamp('06-11-2015 09:56:35.', 'dd-mm-yyyy hh24:mi:ss.ff'), to_timestamp('06-11-2015 09:56:35.', 'dd-mm-yyyy hh24:mi:ss.ff'), 1, '1', '1', null, null, 'N');
 insert into GK_OPERATION_JSJY_MENU (id, pid, name, code, url, sortno, create_date_time, update_date_time, record_status, create_user, update_user, szd, iconcls, leaf)
-values ('402881ec50da5a350150da840da20025', '402881ec50da5a350150da80ffca001f', '许可证附证', 'xkzfz', '/xkzfz/main', 3, to_timestamp('06-11-2015 09:58:19.', 'dd-mm-yyyy hh24:mi:ss.ff'), to_timestamp('30-11-2015 16:14:18.', 'dd-mm-yyyy hh24:mi:ss.ff'), 1, '1', '1', null, null, 'Y');
+values ('402881ec50da5a350150da840da20025', '402881ec50da5a350150da80ffca001f', '危货作业附证', 'xkzfz', '/xkzfz/main', 3, to_timestamp('06-11-2015 09:58:19.', 'dd-mm-yyyy hh24:mi:ss.ff'), to_timestamp('30-11-2015 16:14:18.', 'dd-mm-yyyy hh24:mi:ss.ff'), 1, '1', '1', null, null, 'Y');
 insert into GK_OPERATION_JSJY_MENU (id, pid, name, code, url, sortno, create_date_time, update_date_time, record_status, create_user, update_user, szd, iconcls, leaf)
 values ('402881ec50da5a350150da84c3600027', '402881ec50da5a350150da80ffca001f', '泊位信息', 'bwxx', '/bw/main', 5, to_timestamp('06-11-2015 09:59:05.', 'dd-mm-yyyy hh24:mi:ss.ff'), to_timestamp('17-11-2015 20:30:25.', 'dd-mm-yyyy hh24:mi:ss.ff'), 1, '1', '1', null, null, 'Y');
 insert into GK_OPERATION_JSJY_MENU (id, pid, name, code, url, sortno, create_date_time, update_date_time, record_status, create_user, update_user, szd, iconcls, leaf)

+ 1 - 1
gkjsjy/trunk/src/com/cxfws/jyrxxgl/service/IXkzfzWebService.java

@@ -5,7 +5,7 @@ import javax.jws.WebService;
 @WebService(targetNamespace = "http://service.web.jsjty.com/", portName = "xkzfzWebServicePort", serviceName = "xkzfzWebService")
 public interface IXkzfzWebService {
 	
-	//许可证附证列表
+	//危货作业附证列表
 	public String findXkzfz(int pages, int rows,final String ssjyr, final String szdid, final String szgkid, final String szgqid, final String fzsqh, final String fzsfyx, final String wxhwpm, final String fzsfdq);
 	
 	//许可证详情

+ 1 - 1
gkjsjy/trunk/src/com/xt/jygl/common/SearchCondition.java

@@ -62,7 +62,7 @@ public class SearchCondition {
 	public static Date yxq1 = null;
 	public static Date yxq2 = null;
 	public static String xkzsfdq = "";
-	// ==============许可证附证信息=================
+	// ==============危货作业附证信息=================
 	public static int fzpage = 1;
 	public static String fzsqh = "";
 	public static String fzszdid = "";

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

@@ -1360,7 +1360,7 @@ public class GkjyrCtl extends BaseWebCtl {
 		}
 		model.addAttribute("xkzxx", voList4);
 
-		// 许可证附证
+		// 危货作业附证
 		Specification<XkzfzEntity> spec5 = new Specification<XkzfzEntity>() {
 
 			@Override
@@ -2054,7 +2054,7 @@ public class GkjyrCtl extends BaseWebCtl {
 	}
 
 	/**
-	 * 许可证附证查询
+	 * 危货作业附证查询
 	 * 
 	 * @param model
 	 * @param id
@@ -2107,7 +2107,7 @@ public class GkjyrCtl extends BaseWebCtl {
 	}
 
 	/**
-	 * 许可证附证查询
+	 * 危货作业附证查询
 	 * 
 	 * @param model
 	 * @param id
@@ -2640,7 +2640,7 @@ public class GkjyrCtl extends BaseWebCtl {
 		List<GkjyrVo> voList = entityToVo(list);
 		// 许可证信息
 		List<XkzxxVo> xkzxxVos = exportXkzxx(id);
-		// 许可证附证
+		// 危货作业附证
 		List<CodeEntity> listZycs = securityMgr.codeService().findValidCodesByGroupCode("ZYCS");
 		List<GqEntity> listgq = gqService.findGq();
 		List<GkEntity> listgk = gkService.findGk();
@@ -2717,7 +2717,7 @@ public class GkjyrCtl extends BaseWebCtl {
 	}
 
 	/**
-	 * 许可证附证
+	 * 危货作业附证
 	 * 
 	 * @param id
 	 * @return

+ 1 - 1
gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/jyrjbxx/service/impl/GkjyrServiceImpl.java

@@ -1759,7 +1759,7 @@ public class GkjyrServiceImpl extends JyglBaseService<GkjyrEntity, String> imple
 		setSheet1(voList.get(0), outputStream, workBook);
 		//许可证信息
 		xkzxxService.setXkzxxSheet(xkzxxVos, outputStream, workBook);
-		//许可证附证信息
+		//危货作业附证信息
 		xkzfzService.setSheet(xkzfzVos, outputStream, listZycs, listgq, listgk, workBook);
 		//码头
 		mtService.setSheet(mtVos, outputStream, workBook);

+ 1 - 1
gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/xkzfz/ctl/XkzfzCtl.java

@@ -599,7 +599,7 @@ public class XkzfzCtl extends BaseWebCtl {
 			List<GqEntity> listgq = gqService.findGq();
 			List<GkEntity> listgk = gkService.findGk();
 			ServletOutputStream outputStream = response.getOutputStream();
-			String fileName = new String(("许可证附证信息全部").getBytes(), "iso-8859-1");
+			String fileName = new String(("危货作业附证信息全部").getBytes(), "iso-8859-1");
 			response.setHeader("Content-disposition", "attachment; filename=" + fileName + ".xlsx");// 组装附件名称和格式
 			xkzfzService.exportExcelAll(voList, outputStream, listZycs, listgq, listgk);
 		} catch (IOException e) {

+ 2 - 2
gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/xkzfz/service/impl/XkzfzServiceImpl.java

@@ -80,7 +80,7 @@ public class XkzfzServiceImpl extends JyglBaseService<XkzfzEntity, String> imple
 	public void setSheet(List<XkzfzVo> voList, ServletOutputStream outputStream, List<CodeEntity> listZycs, List<GqEntity> listgq, List<GkEntity> listgk, XSSFWorkbook workBook){
 		String[] titles = { "序号", "港口经营人", "主证编号", "证书编号", "作业危险货物名称", "作业方式", "作业区域范围", "发证日期", "有效日期", "发证机关", "证书状态" };
 		// 在workbook中添加一个sheet,对应Excel文件中的sheet
-		XSSFSheet xkzfzSheet = workBook.createSheet("许可证附证信息");
+		XSSFSheet xkzfzSheet = workBook.createSheet("危货作业附证信息");
 		ExportUtil exportUtil = new ExportUtil(workBook, xkzfzSheet);
 		XSSFCellStyle headStyle = exportUtil.getHeadStyle();
 		XSSFCellStyle bodyStyle = exportUtil.getBodyStyle();
@@ -169,7 +169,7 @@ public class XkzfzServiceImpl extends JyglBaseService<XkzfzEntity, String> imple
 //		// 创建一个workbook 对应一个excel应用文件
 //		XSSFWorkbook workBook = new XSSFWorkbook();
 //		// 在workbook中添加一个sheet,对应Excel文件中的sheet
-//		XSSFSheet sheet = workBook.createSheet("许可证附证信息全部");
+//		XSSFSheet sheet = workBook.createSheet("危货作业附证信息全部");
 //		ExportUtil exportUtil = new ExportUtil(workBook, sheet);
 //		XSSFCellStyle headStyle = exportUtil.getHeadStyle();
 //		XSSFCellStyle bodyStyle = exportUtil.getBodyStyle();

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

@@ -365,7 +365,7 @@ public class XkzbgCtl extends BaseWebCtl {
 			}
 			model.addAttribute("xkzxx", voList4);
 
-			// 许可证附证
+			// 危货作业附证
 			Specification<XkzfzEntity> spec5 = new Specification<XkzfzEntity>() {
 
 				@Override
@@ -1083,7 +1083,7 @@ public class XkzbgCtl extends BaseWebCtl {
 			}
 			model.addAttribute("xkzxx", voList4);
 
-			// 许可证附证
+			// 危货作业附证
 			Specification<XkzfzEntity> spec5 = new Specification<XkzfzEntity>() {
 
 				@Override
@@ -1341,7 +1341,7 @@ public class XkzbgCtl extends BaseWebCtl {
 			}
 			model.addAttribute("xkzxx", voList4);
 
-			// 许可证附证
+			// 危货作业附证
 			Specification<XkzfzEntity> spec5 = new Specification<XkzfzEntity>() {
 
 				@Override

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

@@ -449,7 +449,7 @@ public class XkzsqCtl extends BaseWebCtl {
 			}
 			model.addAttribute("xkzxx", voList4);
 
-			// 许可证附证
+			// 危货作业附证
 			Specification<XkzfzEntity> spec5 = new Specification<XkzfzEntity>() {
 				@Override
 				public Predicate toPredicate(Root<XkzfzEntity> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
@@ -693,7 +693,7 @@ public class XkzsqCtl extends BaseWebCtl {
 			}
 			model.addAttribute("xkzxx", voList4);
 
-			// 许可证附证
+			// 危货作业附证
 			Specification<XkzfzEntity> spec5 = new Specification<XkzfzEntity>() {
 
 				@Override
@@ -907,7 +907,7 @@ public class XkzsqCtl extends BaseWebCtl {
 			}
 			model.addAttribute("xkzxx", voList4);
 
-			// 许可证附证
+			// 危货作业附证
 			Specification<XkzfzEntity> spec5 = new Specification<XkzfzEntity>() {
 
 				@Override

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

@@ -301,7 +301,7 @@ public class XkzyxCtl extends BaseWebCtl {
 			}
 			model.addAttribute("xkzxx", voList4);
 
-			// 许可证附证
+			// 危货作业附证
 			Specification<XkzfzEntity> spec5 = new Specification<XkzfzEntity>() {
 
 				@Override
@@ -785,7 +785,7 @@ public class XkzyxCtl extends BaseWebCtl {
 			}
 			model.addAttribute("xkzxx", voList4);
 
-			// 许可证附证
+			// 危货作业附证
 			Specification<XkzfzEntity> spec5 = new Specification<XkzfzEntity>() {
 
 				@Override
@@ -1053,7 +1053,7 @@ public class XkzyxCtl extends BaseWebCtl {
 			}
 			model.addAttribute("xkzxx", voList4);
 
-			// 许可证附证
+			// 危货作业附证
 			Specification<XkzfzEntity> spec5 = new Specification<XkzfzEntity>() {
 
 				@Override

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

@@ -350,7 +350,7 @@ public class XkzzxCtl extends BaseWebCtl {
 			}
 			model.addAttribute("xkzxx", voList4);
 
-			// 许可证附证
+			// 危货作业附证
 			Specification<XkzfzEntity> spec5 = new Specification<XkzfzEntity>() {
 
 				@Override
@@ -1043,7 +1043,7 @@ public class XkzzxCtl extends BaseWebCtl {
 			}
 			model.addAttribute("xkzxx", voList4);
 
-			// 许可证附证
+			// 危货作业附证
 			Specification<XkzfzEntity> spec5 = new Specification<XkzfzEntity>() {
 
 				@Override
@@ -1246,7 +1246,7 @@ public class XkzzxCtl extends BaseWebCtl {
 			}
 			model.addAttribute("xkzxx", voList4);
 
-			// 许可证附证
+			// 危货作业附证
 			Specification<XkzfzEntity> spec5 = new Specification<XkzfzEntity>() {
 
 				@Override

+ 49 - 0
gkjsjy/trunk/src/com/xt/jygl/gkyxtjyfx/hxhbtj/service/impl/HxhbtjServiceImpl.java

@@ -0,0 +1,49 @@
+package com.xt.jygl.gkyxtjyfx.hxhbtj.service.impl;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.xt.jygl.common.service.JyglBaseService;
+import com.xt.jygl.gkyxtjyfx.hxhbtj.dao.HxhbtjDao;
+import com.xt.jygl.gkyxtjyfx.hxhbtj.entity.HxhbtjEntity;
+import com.xt.jygl.gkyxtjyfx.hxhbtj.service.HxhbtjService;
+import com.xtframe.sec.common.SecRepository;
+
+@Service
+public class HxhbtjServiceImpl extends JyglBaseService<HxhbtjEntity, String> implements HxhbtjService {
+
+	@Autowired
+	private HxhbtjDao dao;
+
+	@Override
+	protected SecRepository<HxhbtjEntity, String> getDao() {
+		return this.dao;
+	}
+
+	@Override
+	public Object bnljltj(String year, String szgk) {
+		return dao.bnljltj(year, szgk);
+	}
+
+	@Override
+	public Object tbzzs(String rq, String lastyear, String szgk) {
+		return dao.tbzzs(rq, lastyear, szgk);
+	}
+
+	@Override
+	public List<Object[]> kbxk(String bn, String by, String sn, String sy, String szgk) {
+		return dao.kbxk(bn, by, sn, sy, szgk);
+	}
+
+	@Override
+	public Object bywcltj(String rq, String szgk) {
+		return dao.bywcltj(rq, szgk);
+	}
+
+	@Override
+	public List<Object> cf(String rq, String szgk) {
+		return dao.cf(rq, szgk);
+	}
+
+}