Home Explore Help
Register Sign In
hs
/
jsgkj
2
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

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

ld_xuhx 9 years ago
parent
6098768fca
commit
2597741533
23 changed files with 1512 additions and 298 deletions
Split View Show Diff Stats
  1. 115 5
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jgsq/jgsqedit.jsp
  2. 5 1
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jgsq/jgsqmain.jsp
  3. 210 37
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jgsq/jgsqview.jsp
  4. 9 8
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdcbsj/jsjdcbsjedit.jsp
  5. 1 5
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdcbsj/jsjdcbsjmain.jsp
  6. 31 8
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdcbsj/jsjdcbsjview.jsp
  7. 85 6
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdgl/jsjdgledit.jsp
  8. 72 0
      gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdgl/jsjdglview.jsp
  9. 271 10
      gkjsjy/trunk/WebContent/static/biz/js/gkjsgl/jgsq/jgsqdetail.js
  10. 89 3
      gkjsjy/trunk/WebContent/static/biz/js/gkjsgl/jsjdcbsj/jsjdcbsjdetail.js
  11. 23 0
      gkjsjy/trunk/WebContent/static/biz/js/gkjsgl/jsjdgl/jsjdgldetail.js
  12. 287 117
      gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jgsq/ctl/JgsqCtl.java
  13. 3 0
      gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jgsq/dao/JgsqfjDao.java
  14. 62 26
      gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jgsq/entity/JgsqfjEntity.java
  15. 1 1
      gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jgsq/service/JgsqService.java
  16. 2 0
      gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jgsq/service/JgsqfjService.java
  17. 9 5
      gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jgsq/service/impl/JgsqServiceImpl.java
  18. 7 0
      gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jgsq/service/impl/JgsqfjServiceImpl.java
  19. 97 0
      gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jgsq/vo/JgsqfjVo.java
  20. 92 59
      gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdcbsj/ctl/JsjdcbsjCtl.java
  21. 32 5
      gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdgl/ctl/JsjdglCtl.java
  22. 9 0
      gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdgl/vo/XmxxglfbVo.java
  23. 0 2
      gkjsjy/trunk/src/com/xt/jygl/gkjsgl/xmxxgl/service/XmxxglService.java

+ 115 - 5
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jgsq/jgsqedit.jsp
View File 

@@ -70,13 +70,18 @@
 
 

 <body>

 <jsp:include page="../../jyrselect.jsp"></jsp:include>

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

 	<div class="box" >

 		<div class="box-content" >

 			<div class="apply_fill">

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

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

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

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

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

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

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

+  <input type="hidden" id="userids"	name="userids"/>

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

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

 					<tr>

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

 							<td colspan="4">

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

 							</td>

 						</tr>

-						

+							<tr>

+                    <th>地市附件与专家评审附件：&nbsp;</th>

+							<td colspan="3">

+								<table style="width: 100%">

+									<tr>

+										<td style="width: 4%">序号</td>

+										<td style="width: 23%">材料名称</td>

+										<td style="width: 23%">上传附件名称</td>

+										<td style="width: 15%">批文单位</td>

+										<td style="width: 15%">文号</td>

+										<td style="width: 10%">批文时间</td>

+									</tr>

+									<tr>

+										<td>1</td>

+										<td>港口建设项目竣工验收申请文件</td>

+										<td><input type="hidden" name="delid81" id="delid81"

+											value="${fjList81.fjid }"> <input type="hidden"

+											id="fjzdid81"> <a class='main_title' href="#"

+											onclick="jsjdcbsj.detail.download('81')"><span id="fjmc81">${fjList81.fjmc }</span></a>

+										</td>

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

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

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

+										

+									</tr>

+

+									<tr>

+										<td>2</td>

+										<td>港口建设项目竣工验收材料</td>

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

+											name="delid82" id="delid82" value="${fjList82.fjid }">

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

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

+											onclick="jsjdcbsj.detail.download('82')"><span id="fjmc82">${fjList82.fjmc }</span></a>

+										</td>

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

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

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

+										

+									</tr>

+									<tr>

+										<td>3</td>

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

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

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

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

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

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

+										</td>

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

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

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

+										

+									</tr>

+									<tr>

+										<td>4</td>

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

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

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

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

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

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

+										</td>

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

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

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

+									

+									</tr>

+									<tr>

+										<td>5</td>

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

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

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

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

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

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

+										</td>

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

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

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

+										

+									</tr>

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

+										<tr>

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

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

+											<td><a class="main_title"

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

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

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

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

+											<c:if test="${ taskKey == 'zjps'  }"> 

+											<td></td>

+											</c:if>

+										</tr>

+									</c:forEach>

+								</table>

+							</td>

+						</tr>

 				

 					</table>

 					

 

 					<div  id="buttons">

+					<c:if test="${ssFlag ==0 }">

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

+							   <i class="glyphicon glyphicon-check"></i> 

+							            选择人员</a>

+					</c:if>

                     	<a class="btn btn-default btn-sm" href="#" onclick="jgsq.detail.save()">

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

 							            保存</a>

-							            

+							<c:if test="${ssFlag ==0 }">	            

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

   

 					      <a class="btn btn-default btn-sm" href="#" onclick="jgsq.detail.submit()">

@@ -222,10 +330,12 @@
 
 						<a class="btn btn-default btn-sm" href="#"  onclick="jgsq.detail.submitAudit()">

 						   <i class="glyphicon glyphicon-share"></i> 

 						            提交</a>

-						</c:if>     

+						

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

 							   <i class="glyphicon glyphicon-ban-circle"></i> 

 							            退回</a>

+							       </c:if>

+							       </c:if>     

 							             <a class="btn btn-default btn-sm" href="#"  onclick="jgsq.detail.back()">

 							   <i class="glyphicon glyphicon-arrow-left"></i> 

 							            返回</a>

+ 5 - 1
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jgsq/jgsqmain.jsp
View File 

@@ -142,20 +142,24 @@
 
 								<a class="btn btn-default btn-xs" href="#" onclick="jgsq.main.view('${jgsq.id}')" title="查看">

 							            <i class="glyphicon glyphicon-search"></i> 

 							            </a>

-							             <c:if test="${jgsq.recordStatus == 1 }">

+							             <c:if test="${jgsq.recordStatus == 1 && jsjdcbsj.tbzt == 'N' }">

 								 <a class="btn btn-default btn-xs" href="#"  onclick="jgsq.main.edit('${jgsq.id}')" title="修改">

 									   <i class="glyphicon glyphicon-wrench"></i> 

 									          </a>

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

 									          <a class="btn btn-default btn-xs" href="#" onclick="jgsq.main.del('${jgsq.id}')" title="删除">

 									   <i class="glyphicon glyphicon-trash"></i> 

 									         </a>

 									         </c:if>

+									         </c:if>

+									         <c:if test="${ssFlag == 0 }">

 									<c:if test="${ jgsq.recordStatus  > 1 }">

 									<a class="btn btn-default btn-xs" href="#"

 									onclick="hisList('${jgsq.id}','jgsq')" title="流程历史"> <i

 										class="glyphicon glyphicon-list-alt"></i>

 									</a>

 								</c:if>

+								</c:if>

 					        </td>

 							<td class="operatetd">

 							 <c:if test="${jgsq.taskState =='Y'}">

+ 210 - 37
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jgsq/jgsqview.jsp
View File 

@@ -18,6 +18,14 @@
 
 			$('.close').click(function(){

 				guanbi();

 			})

+			

+			jgsq.detail.fjid83='${fjList83.fjid }';

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

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

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

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

+			fjgt(jgsq.detail.fjid85,'scbt85','tjbt85');

+			

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

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

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

@@ -34,6 +42,16 @@
 
 			}

 		});

 		

+		function fjgt(fjid,scbtid,tjbtid){

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

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

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

+				}else{

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

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

+				}

+		}

+		

 		function tanchu(){

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

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

@@ -58,14 +76,18 @@
 
 </head>

 

 <body>

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

 	<div class="box" >

 		<div class="box-content" >

 			<div class="apply_fill">

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

+

  <input type="hidden" id="userids"	name="userids"/>

   <input type="hidden" id="yj"	name="yj"/>

-  <input type="hidden" id="accids" name="accids"/>

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

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

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

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

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

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

 					<tr>

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

 							<td colspan="4">

@@ -174,32 +196,133 @@
 
 								${fn:substring(record.jcsj,0,10)}

 							</td>

 						</tr>

-                       <tr>

-                       		<th>专家评审附件：&nbsp;</th>

-                       		<td colspan="3">

-                       		

-                       		 <c:if test="${ taskKey == 'zjps'  }"> 

-	                        	<a href="#" class="file">上传<input type="file" name="file" id="fjid" onchange="jgsq.detail.submitFile()"/></a>

-	                         </c:if> 

-		                       		 

-							<table  id="tableId" style="width: 100%">

-								<tr align="center">

-								<td style="width:40%;text-align: center;">上传附件名称</td>

-								   <c:if test="${ taskKey == 'zjps'  }"> 

-								<td style="width:15%;text-align: center;">操作</td>

-								</c:if>

-								</tr>

-								<c:forEach items="${fjlist }" var="fj" varStatus="status">

-								<tr align="center">

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

-								  <c:if test="${ taskKey == 'zjps'  }"> 

-								<td><a class="btn btn-default btn-xs" href="#" onclick="jgsq.detail.delFj('${fj.id}',this)">删除</a></td>

-								</c:if>

-								</tr>

-								</c:forEach>

-                       		</table>

-                       		</td>

-                       </tr>

+						<tr>

+                    <th>地市附件与专家评审附件：&nbsp;</th>

+							<td colspan="3">

+								<table style="width: 100%">

+									<tr>

+										<td style="width: 4%">序号</td>

+										<td style="width: 23%">材料名称</td>

+										<td style="width: 23%">上传附件名称</td>

+										<td style="width: 15%">批文单位</td>

+										<td style="width: 15%">文号</td>

+										<td style="width: 10%">批文时间</td>

+										<c:if test="${ taskKey == 'zjps'  }"> 

+										<td align="center" style="width: 10%">操作</td>

+										</c:if>

+									</tr>

+									<tr>

+										<td>1</td>

+										<td>港口建设项目竣工验收申请文件</td>

+										<td><input type="hidden" name="delid81" id="delid81"

+											value="${fjList81.fjid }"> <input type="hidden"

+											id="fjzdid81"> <a class='main_title' href="#"

+											onclick="jgsq.detail.download('81')"><span id="fjmc81">${fjList81.fjmc }</span></a>

+										</td>

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

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

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

+										 <c:if test="${ taskKey == 'zjps'  }"> 

+										<td></td>

+										</c:if>

+									</tr>

+

+									<tr>

+										<td>2</td>

+										<td>港口建设项目竣工验收材料</td>

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

+											name="delid82" id="delid82" value="${fjList82.fjid }">

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

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

+											onclick="jgsq.detail.download('82')"><span id="fjmc82">${fjList82.fjmc }</span></a>

+										</td>

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

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

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

+										 <c:if test="${ taskKey == 'zjps'  }"> 

+										<td></td>

+										</c:if>

+									</tr>

+									<tr>

+										<td>3</td>

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

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

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

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

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

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

+										</td>

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

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

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

+										 <c:if test="${ taskKey == 'zjps'  }"> 

+										<td align="center">

+											<a id="tjbt83" class="btn btn-default btn-sm"

+											href="#" onclick="jgsq.detail.tianjiafj('83')"> 添加</a>

+										<a id="scbt83" class="btn btn-default btn-sm" href="#"

+											onclick="jgsq.detail.delFile('83')"> 删除</a>

+										</td>

+										</c:if>

+									</tr>

+									<tr>

+										<td>4</td>

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

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

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

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

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

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

+										</td>

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

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

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

+										 <c:if test="${ taskKey == 'zjps'  }"> 

+										<td align="center">

+										<a id="tjbt84" class="btn btn-default btn-sm"

+											href="#" onclick="jgsq.detail.tianjiafj('84')"> 添加</a>

+										<a id="scbt84" class="btn btn-default btn-sm" href="#"

+											onclick="jgsq.detail.delFile('84')"> 删除</a>

+										</td>

+										</c:if>

+									</tr>

+									<tr>

+										<td>5</td>

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

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

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

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

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

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

+										</td>

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

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

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

+										 <c:if test="${ taskKey == 'zjps'  }"> 

+										<td align="center">

+										<a id="tjbt85" class="btn btn-default btn-sm"

+											href="#" onclick="jgsq.detail.tianjiafj('85')"> 添加</a>

+										<a id="scbt85" class="btn btn-default btn-sm" href="#"

+											onclick="jgsq.detail.delFile('85')"> 删除</a>

+										</td>

+										</c:if>

+									</tr>

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

+										<tr>

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

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

+											<td><a class="main_title"

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

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

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

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

+											<c:if test="${ taskKey == 'zjps'  }"> 

+											<td></td>

+											</c:if>

+										</tr>

+									</c:forEach>

+								</table>

+							</td>

+						</tr>

                        

                        <c:forEach items="${list}" var="list" begin="1" varStatus="status">

                        <tr>

@@ -210,17 +333,16 @@
 
                        </tr>

                        </c:forEach>

 					</table>

-</form>

+

 

 					<div  id="buttons">

-					

-					<c:if test="${opflag == 5 || opflag == 9}">

-				

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

-							   <i class="glyphicon glyphicon-check"></i> 

-							            选择科室人员</a>

-					</c:if>

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

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

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

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

+							</a>

+						</c:if>

+					

 					

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

 							   <i class="glyphicon glyphicon-check"></i> 

@@ -243,7 +365,58 @@
 
 			

 			</div>

 		</div>

+		<div class="theme-popover" id="theme-popover"

+			style="width: 900px; height: 350px;">

+			<div class="theme-poptit">

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

+				<div class="close-tc">

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

+				</div>

+			</div>

+			<div class="popContent-tc">

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

+					<tr>

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

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

+							id="wjh1"></td>

+					</tr>

+					<tr>

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

+						<td><input class="Wdate" name="fbsj" id="fbsj1" type="text"

+							onFocus="WdatePicker({lang:'zh-cn',skin:'default',dateFmt:'yyyy-MM-dd'})">

+						</td>

+					</tr>

+					<tr>

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

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

+							id="fbdw1"></td>

+					</tr>

+					<tr>

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

+						<td>

+							<div>

+								<a href="#" class="file" id="scfjbt"><input type="file"

+									name="filename" id="fileid" onchange="jgsq.detail.saveFile()">选择本地文件</a>

+							</div>

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

+						</td>

+					</tr>

+				</table>

+

+				<div id="buttons">

+					<a class="btn btn-default btn-sm" href="#"

+						onclick="jgsq.detail.xinzengfj()"> <i></i> 保存

+					</a> <a class="btn btn-default btn-sm" href="#"

+						onclick="jgsq.detail.guanbipop()"> <i></i> 关闭

+					</a>

+				</div>

+			</div>

+		</div>

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

+

+	</div>

 </div>

+</form>

 <jsp:include page="../../showRy.jsp"></jsp:include>

 <jsp:include page="../../showViewOption.jsp"></jsp:include>

 </body>

+ 9 - 8
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdcbsj/jsjdcbsjedit.jsp
View File 

@@ -75,10 +75,12 @@
 
 		<div class="box-content" >

 			<div class="apply_fill">

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

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

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

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

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

  <input type="hidden" id="userids"	name="userids"/>

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

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

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

 					<tr>

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

 							<td colspan="4">

@@ -213,8 +215,8 @@
 
 										<td style="width: 15%">材料名称</td>

 										<td style="width: 15%">上传附件名称</td>

 										<td style="width: 15%">批文单位</td>

-										<td style="width: 15%">文号</td>

-										<td style="width: 5%">批文时间</td>

+										<td style="width: 10%">文号</td>

+										<td style="width: 10%">批文时间</td>

 										

 									</tr>

 									<tr>

@@ -223,7 +225,7 @@
 
 										<td><input type="hidden" name="delid31" id="delid31"

 											value="${fjList31.fjid }"> <input type="hidden"

 											id="fjzdid31"> <a class='main_title' href="#"

-											onclick="jsjdcbsj.detail.download()"><span id="fjmc31">${fjList31.fjmc }</span></a>

+											onclick="jsjdcbsj.detail.download('31')"><span id="fjmc31">${fjList31.fjmc }</span></a>

 										</td>

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

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

@@ -238,7 +240,7 @@
 
 											name="delid32" id="delid32" value="${fjList32.fjid }">

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

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

-											onclick="jsjdcbsj.detail.download()"><span id="fjmc32">${fjList32.fjmc }</span></a>

+											onclick="jsjdcbsj.detail.download('32')"><span id="fjmc32">${fjList32.fjmc }</span></a>

 										</td>

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

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

@@ -252,12 +254,11 @@
 
 											name="delid33" id="delid33" value="${fjList33.fjid }">

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

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

-											onclick="jsjdcbsj.detail.download()"><span id="fjmc33">${fjList33.fjmc }</span></a>

+											onclick="jsjdcbsj.detail.download('33')"><span id="fjmc33">${fjList33.fjmc }</span></a>

 										</td>

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

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

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

-										

 									</tr>

 								

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

+ 1 - 5
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdcbsj/jsjdcbsjmain.jsp
View File 

@@ -144,11 +144,7 @@
 
 							            <i class="glyphicon glyphicon-search"></i> 

 							            </a>

 							             <c:if test="${jsjdcbsj.recordStatus == 1 && jsjdcbsj.tbzt == 'N'}">

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

-							     <a class="btn btn-default btn-xs" href="#"  onclick="jsjdcbsj.main.submit('${jsjdcbsj.id}')" title="同步">

-						   <i class="glyphicon glyphicon-share"></i> 

-						            </a>

-						            </c:if>

+							              

 								 <a class="btn btn-default btn-xs" href="#"  onclick="jsjdcbsj.main.edit('${jsjdcbsj.id}')" title="修改">

 									   <i class="glyphicon glyphicon-wrench"></i> 

 									          </a>

+ 31 - 8
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdcbsj/jsjdcbsjview.jsp
View File 

@@ -19,6 +19,18 @@
 
 		$('.close').click(function() {

 			guanbi();

 		})

+		

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

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

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

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

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

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

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

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

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

+		fjgt(jsjdcbsj.detail.fjid38,'scbt38','tjbt38');

+		

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

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

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

@@ -35,6 +47,15 @@
 
 		}

 	});

 

+	function fjgt(fjid,scbtid,tjbtid){

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

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

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

+			}else{

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

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

+			}

+	}

 	function tanchu() {

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

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

@@ -52,6 +73,8 @@
 
 <form id="addform" method="post" enctype="multipart/form-data">

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

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

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

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

 	<div class="box">

 		<div class="box-content">

 			<div class="apply_fill">

@@ -149,7 +172,7 @@
 
 										<td><input type="hidden" name="delid31" id="delid31"

 											value="${fjList31.fjid }"> <input type="hidden"

 											id="fjzdid31"> <a class='main_title' href="#"

-											onclick="jsjdcbsj.detail.download()"><span id="fjmc31">${fjList31.fjmc }</span></a>

+											onclick="jsjdcbsj.detail.download('31')"><span id="fjmc31">${fjList31.fjmc }</span></a>

 										</td>

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

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

@@ -166,7 +189,7 @@
 
 											name="delid32" id="delid32" value="${fjList32.fjid }">

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

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

-											onclick="jsjdcbsj.detail.download()"><span id="fjmc32">${fjList32.fjmc }</span></a>

+											onclick="jsjdcbsj.detail.download('32')"><span id="fjmc32">${fjList32.fjmc }</span></a>

 										</td>

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

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

@@ -182,7 +205,7 @@
 
 											name="delid33" id="delid33" value="${fjList33.fjid }">

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

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

-											onclick="jsjdcbsj.detail.download()"><span id="fjmc33">${fjList33.fjmc }</span></a>

+											onclick="jsjdcbsj.detail.download('33')"><span id="fjmc33">${fjList33.fjmc }</span></a>

 										</td>

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

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

@@ -198,7 +221,7 @@
 
 											name="delid34" id="delid34" value="${fjList34.fjid }">

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

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

-											onclick="jsjdcbsj.detail.download()"><span id="fjmc34">${fjList34.fjmc }</span></a>

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

 										</td>

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

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

@@ -219,7 +242,7 @@
 
 											name="delid35" id="delid35" value="${fjList35.fjid }">

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

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

-											onclick="jsjdcbsj.detail.download()"><span id="fjmc35">${fjList35.fjmc }</span></a>

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

 										</td>

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

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

@@ -240,7 +263,7 @@
 
 											name="delid36" id="delid36" value="${fjList36.fjid }">

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

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

-											onclick="jsjdcbsj.detail.download()"><span id="fjmc36">${fjList36.fjmc }</span></a>

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

 										</td>

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

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

@@ -261,7 +284,7 @@
 
 											name="delid37" id="delid37" value="${fjList37.fjid }">

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

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

-											onclick="jsjdcbsj.detail.download()"><span id="fjmc37">${fjList37.fjmc }</span></a>

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

 										</td>

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

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

@@ -282,7 +305,7 @@
 
 											name="delid38" id="delid38" value="${fjList38.fjid }">

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

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

-											onclick="jsjdcbsj.detail.download()"><span id="fjmc38">${fjList38.fjmc }</span></a>

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

 										</td>

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

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

+ 85 - 6
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdgl/jsjdgledit.jsp
View File 

@@ -60,6 +60,8 @@
 
 				fjgt(jsjdgl.detail.fjid31,'scbt31','tjbt31');

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

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

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

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

 			}else if(opflag== 4){

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

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

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

 							           删除</a>

 					</td> 

-					</c:if>	           

-					

-				</tr>

+					</c:if>	   

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

+					<tr>

+										<td>4</td>

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

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

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

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

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

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

+										</td>

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

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

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

+									

+									</tr>

+									<tr>

+										<td>5</td>

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

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

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

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

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

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

+										</td>

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

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

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

+										

+									</tr>

+									<tr>

+										<td>6</td>

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

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

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

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

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

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

+										</td>

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

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

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

+										

+									</tr>

+									<tr>

+										<td>7</td>

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

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

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

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

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

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

+										</td>

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

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

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

+										

+									</tr>

+									<tr>

+										<td>8</td>

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

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

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

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

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

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

+										</td>

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

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

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

+										

+									</tr>

+									</c:if>

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

 						<tr height="40px">

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

@@ -1281,7 +1353,7 @@
 
 								1

 					</td>

 					 <td>

-								竣工资料汇编

+								港口建设项目竣工验收申请文件

 					</td>

 					<td>

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

@@ -1314,7 +1386,7 @@
 
 								2

 					</td>

 					 <td>

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

+								港口建设项目竣工验收材料

 					</td>

 					<td>

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

@@ -1497,10 +1569,17 @@
 
                     </c:if>

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

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

+					<c:if test="${spflag !='3' && spflag != '6' || record.flowstatus == 2}">

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

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

 							            同意</a>

-					</c:if>	

+					</c:if>

+				 <c:if test="${ (spflag =='3' || spflag == '6') && record.flowstatus != 2 }">

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

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

+							    转报</a>

+					 </c:if> 

+					</c:if>

 					</c:if>

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

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

+ 72 - 0
gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdgl/jsjdglview.jsp
View File 

@@ -426,6 +426,78 @@
 
 								${recordfj32.fbsj }

 					</td>

 				</tr>

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

+					<tr>

+										<td>4</td>

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

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

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

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

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

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

+										</td>

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

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

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

+									

+									</tr>

+									<tr>

+										<td>5</td>

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

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

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

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

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

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

+										</td>

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

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

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

+										

+									</tr>

+									<tr>

+										<td>6</td>

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

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

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

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

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

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

+										</td>

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

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

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

+										

+									</tr>

+									<tr>

+										<td>7</td>

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

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

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

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

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

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

+										</td>

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

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

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

+										

+									</tr>

+									<tr>

+										<td>8</td>

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

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

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

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

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

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

+										</td>

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

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

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

+										

+									</tr>

+									</c:if>

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

 						<tr height="40px">

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

+ 271 - 10
gkjsjy/trunk/WebContent/static/biz/js/gkjsgl/jgsq/jgsqdetail.js
View File 

@@ -9,6 +9,184 @@ jgsq.detail.opflag = null;
 
 jgsq.detail.init=function(){

 }

 

+jgsq.detail.download= function(scflag){

+	var id=$("#delid"+scflag).val();

+	location.href=$.app+"/accessory/download?id="+id;	

+}	

+

+//删除附件字段文本框对应数据

+jgsq.detail.delfjzdIds = function(data){

+	var ids = $('#fjzdids').val();

+	var arr = ids.split(',');

+	ids = '';

+	for (var i = 0 ;i < arr.length-1;i++){

+		if(arr[i].substring(2,arr[i].length) != data){

+			ids = ids + arr[i]+","

+		}

+	}

+	ids = ids.substring(0, ids.length-1)+",";

+	 $('#fjzdids').val(ids);

+}

+

+// 删除附件文本框对应数据

+jgsq.detail.delIds = function(data){

+	var ids = $('#accids').val();

+	var arr = ids.split(',');

+	ids = '';

+	for (var i = 0 ;i < arr.length-1;i++){

+		if(arr[i].substring(2,arr[i].length) != data){

+			ids = ids + arr[i]+","

+		}

+	}

+	ids = ids.substring(0, ids.length-1)+",";

+	 $('#accids').val(ids);

+}

+

+jgsq.detail.delfjzd=function(data){

+	 $.post($.app + "/jgsq/delFjzd?id="+data, {}, function(data, status) {

+		 if (data.success) {

+         } 

+		

+	 }, "json");

+}

+

+jgsq.detail.delFile = function(scflag){

+	  if (true) {

+		  $.confirm({

+			    title: '确认框',

+			    content: '确认删除吗',

+			    confirm: function(){

+			    	// 确认删除

+			    	id=$("#delid"+scflag).val();

+			    	fjzdid=$("#fjzdid"+scflag).val();

+			    	//删除附件字段

+			    	jgsq.detail.delfjzd(fjzdid);

+	                $.post($.app + "/jgsq/delFile?id="+id, {}, function(data, status) {

+	                    if (data.success) {

+	                    	//删除附件字段文本框内容

+	                    	jgsq.detail.delfjzdIds(fjzdid);

+	                    	//删除附件文本框内容

+	                    	jgsq.detail.delIds(id);

+	                        $("#"+id).remove();

+	                        $("#delid"+scflag).val("");

+	                        $("#wjh1").val("");

+	                        $("#fbdw1").val("");

+	                        $("#fbsj1").val("");

+	                        $("#fbdw"+scflag).text("");

+	                        $("#fbsj"+scflag).text("");

+	                        $("#fjmc"+scflag).text("");

+	                        $("#wjh"+scflag).text("");

+	                    	$("#scbt"+scflag).hide();

+	                    	$("#tjbt"+scflag).show();

+		                 } else {

+		                	 $.alert({

+		             		    title: '提示',

+		             		    content: data.message,

+		             		    confirm: function(){

+		             		    }

+		             	 });

+		                 }

+		             }, "json");

+			    },

+			    cancel: function(){

+			    }

+			});

+	  }

+}

+

+//附件关闭

+jgsq.detail.guanbipop=function(){

+	var accid=$("#accid").val();

+	if(accid!=null){

+		$.confirm({

+		    title: '提示框',

+		    content: '您已上传附件，是否保存？',

+		    confirm: function(){

+		    jgsq.detail.xinzengfj();

+		    },

+		    cancel: function(){

+		    	var flag=$("#flag").val();

+		    	var id=$("#accid").val();

+		    	 $.post($.app + "/jgsq/delFile?id="+id, {}, function(data, status) {

+	                    if (data.success) {

+	                     $("#fjmc"+flag).html("");

+	                     $("#fjxq").empty();

+	                     $("#scfjbt").removeAttr("style");

+	 	                 $("#delid"+flag).val("");

+	 	                 jgsq.detail.delIds(id);

+		                 } else {

+		                	 $.alert({

+		             		    title: '提示',

+		             		    content: data.message,

+		             		    confirm: function(){

+		             		    }

+		             	 });

+		                 }

+		             }, "json");

+		    }

+		});

+	}

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

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

+}

+

+

+jgsq.detail.xinzengfj=function(){

+	var i=$("#flag").val();

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

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

+	$("#wjh"+i).text($("#wjh1").val());

+	$("#fbsj"+i).text($("#fbsj1").val());

+	$("#fbdw"+i).text($("#fbdw1").val());

+	 $("#tjbt"+i).toggle();

+	 if(jgsq.detail.xiugaiflag==1){

+	 $("#scbt"+i).toggle();

+	 }

+	 var strbt="";

+  	 strbt+="删除";

+  	 $("#scbt"+i).empty();

+  	 $("#scbt"+i).append(strbt);

+  	 $("#scbt"+i).attr("class","btn btn-default btn-sm");

+  	 $("#scbt"+i).attr("href","#");

+  	 $("#scbt"+i).attr("onclick","jgsq.detail.delFile('"+i+"')");

+  	 $("#scbt"+i).removeAttr("style");

+	 $.ajax({

+         url:$.app+"/jgsq/savefj",

+         data:$("#addform").serialize(),

+         type:"post",

+         dataType:"json",

+         success:function(data){//ajax返回的数据

+	           if (data.success) {

+	        	   var strVal=$("#fjzdids").val()+i+data.message+",";

+  			    	$("#fjzdids").val(strVal);

+  			    	var str = data.message;

+  			    	 $("#fjzdid"+i).val(str);

+	           }else {

+		           	$.alert({

+		       		    title: '提示',

+		       		    content: data.message,

+		       		    confirm: function(){

+		       		    }

+		           	});

+	           }

+	     }

+    }); 

+}

+

+//添加附件弹出				

+jgsq.detail.tianjiafj=function(i){

+	$("#flag").val(i);

+	$("#wjh1").val("");

+	$("#fbsj1").val("");

+	$("#fbdw1").val("");

+	$("#fjmc1").html("");

+	$("#fjxq").empty();

+	$("#scfjbt").removeAttr("style");

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

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

+}

+

+

 //构建政府投资额占比变化事件	

 function ratesub() {

 	var val = $("#tzlxid").val();

@@ -121,6 +299,16 @@ jgsq.detail.submit=function(){
 
 	 if(van($('#addform input[name=bwdj]'),"泊位吨级 ")==false){return false;}

 	 if(van($('#addform input[name=tgnl]'),"通过能力")==false){return false;}

 	 

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

+			$.alert({

+				title : '提示',

+				content : "请选择人员办理！！！",

+				confirm : function() {

+					$(".btn").attr("disabled", false);

+				}

+			});

+			return false;

+		}

 	 $(".btn").attr("disabled",true);

 	 $.ajax({

         url:$.app+"/jgsq/submit",

@@ -456,11 +644,11 @@ $('.gkselectpicker').selectpicker({
 
  

  

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

-	 if(auditpass=="Y" && (jgsq.detail.opflag == 5 || jgsq.detail.opflag == 9)){

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

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

 			 $.alert({

 	       		    title: '提示',

-	       		    content: "请选择人员会签！！！",

+	       		    content: "请选择人员！！！",

 	       		    confirm: function(){

 	       		    	$(".btn").attr("disabled",false);

 	       		    }

@@ -468,13 +656,7 @@ $('.gkselectpicker').selectpicker({
 
 			 return false;

 		 }

 	 } 

-	//附件

-	var accidName= document.getElementsByName("accid");

-    var accids = [];

-    for (i=0; i<accidName.length; i++){  

-    	accids.push(accidName[i].value)

-    }

-    $('#accids').val(accids);

+

 	$(".btn").attr("disabled",true);

 	var opflag = $('#opflag').val();

 	var shyj = $('#yj').val();

@@ -489,7 +671,11 @@ $('.gkselectpicker').selectpicker({
 
         shyj:shyj,

         flag:audit,

         userids:$('#userids').val(),

-        accid:$('#accids').val()

+        accid:$('#accids').val(),

+        delid34:$('#delid83').val(),

+		delid35:$('#delid84').val(),

+		delid36:$('#delid85').val(),

+		fjzdids:$('#fjzdids').val()

     }, function(data) {

     	if (data.success) {

            	$.alert({

@@ -512,6 +698,61 @@ $('.gkselectpicker').selectpicker({
 
     }, "json");

 };

 

+jgsq.detail.saveFile = function(){

+	 var i=$("#flag").val();

+	 if($('#fjid').val()==''){

+	        return;

+	    }

+	 $('#addform')

+		.form(

+				'submit',

+				{

+					url : $.app + '/jgsq/saveFile',

+					onSubmit : function() {

+					},

+					success : function(data, status) {

+	            var file = $('#fjid');

+	            file.after(file.clone().val(""));

+	            file.remove();

+	            if (data) {

+	            	data = data.replace("<audio controls=\"controls\" style=\"display: none;\"></audio>","");

+	                data = $.parseJSON(data);

+	            }

+	            if (data.success) {

+	            	$("#scfjbt").attr("style","display:none;");

+	            	debugger;

+	                var accContect = data.attrs.acc.name;

+	                var accid = data.attrs.acc.id;

+	                var str = "";

+	                str = "<span id='fjmc1'>" 

+	                      + "<input value='"+accid+"' id='accid' name='accid' type='hidden'>" 

+	                      + "<a class='main_title' href='/jsjy/accessory/download?id="+ accid +"'> " + accContect +"</a>"+"</span>";

+	                str+="<a class='main_title' onclick=\"jgsq.detail.delFj('"+ accid +"','"+i+"');\" >删除文件</a>"

+	                $("#fjxq").empty();

+	                $("#fjxq").append(str);

+	                //给附件id集文本框赋值

+	                var strVal=$("#accids").val()+i+accid+",";

+			    	$("#accids").val(strVal);

+	                $("#fjmc"+i).text(accContect);

+	                //给附件id文本框赋值

+	                $("#delid"+i).val(accid);

+	                accContect = "";

+	                $("#fileid").val("");

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

+	            }

+	            else {

+	            	$.alert({

+						title : '提示',

+						content : data.message,

+						confirm : function() {

+						}

+					});

+	            }

+	        }

+	    });

+}

+

+

 jgsq.detail.submitFile = function(){

 	$('#addform').form('submit',{

 		url : $.app + '/jgsq/saveFile',

@@ -573,6 +814,16 @@ jgsq.detail.delFj = function(accid, tr) {
 
 }

 

 jgsq.detail.submitAudit=function(){

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

+		$.alert({

+			title : '提示',

+			content : "请选择人员办理！！！",

+			confirm : function() {

+				$(".btn").attr("disabled", false);

+			}

+		});

+		return false;

+	}

 	 $(".btn").attr("disabled",true);

 	 $.ajax({

      url:$.app+"/jgsq/submitAudit",

@@ -599,4 +850,14 @@ jgsq.detail.submitAudit=function(){
 
 	           }

 	     }

 }); 

+}

+

+function showRy() {

+	$('#selectrydiv').fadeIn(100);

+	$('#selectry2div').slideDown(0);

+}

+

+function showYj() {

+	$('#selectyjdiv').fadeIn(100);

+	$('#selectyj2div').slideDown(0);

 }

+ 89 - 3
gkjsjy/trunk/WebContent/static/biz/js/gkjsgl/jsjdcbsj/jsjdcbsjdetail.js
View File 

@@ -9,6 +9,92 @@ jsjdcbsj.detail.opflag = null;
 
 jsjdcbsj.detail.init = function() {

 }

 

+jsjdcbsj.detail.download= function(scflag){

+	var id=$("#delid"+scflag).val();

+	location.href=$.app+"/accessory/download?id="+id;	

+	

+}	

+

+//删除附件字段文本框对应数据

+jsjdcbsj.detail.delfjzdIds = function(data){

+	var ids = $('#fjzdids').val();

+	var arr = ids.split(',');

+	ids = '';

+	for (var i = 0 ;i < arr.length-1;i++){

+		if(arr[i].substring(2,arr[i].length) != data){

+			ids = ids + arr[i]+","

+		}

+	}

+	ids = ids.substring(0, ids.length-1)+",";

+	 $('#fjzdids').val(ids);

+}

+

+// 删除附件文本框对应数据

+jsjdcbsj.detail.delIds = function(data){

+	var ids = $('#accids').val();

+	var arr = ids.split(',');

+	ids = '';

+	for (var i = 0 ;i < arr.length-1;i++){

+		if(arr[i].substring(2,arr[i].length) != data){

+			ids = ids + arr[i]+","

+		}

+	}

+	ids = ids.substring(0, ids.length-1)+",";

+	 $('#accids').val(ids);

+}

+

+jsjdcbsj.detail.delfjzd=function(data){

+	 $.post($.app + "/jsjdcbsj/delFjzd?id="+data, {}, function(data, status) {

+		 if (data.success) {

+         } 

+		

+	 }, "json");

+}

+

+jsjdcbsj.detail.delFile = function(scflag){

+	  if (true) {

+		  $.confirm({

+			    title: '确认框',

+			    content: '确认删除吗',

+			    confirm: function(){

+			    	// 确认删除

+			    	id=$("#delid"+scflag).val();

+			    	fjzdid=$("#fjzdid"+scflag).val();

+			    	//删除附件字段

+			    	jsjdcbsj.detail.delfjzd(fjzdid);

+	                $.post($.app + "/jsjdcbsj/delFile?id="+id, {}, function(data, status) {

+	                    if (data.success) {

+	                    	//删除附件字段文本框内容

+	                    	jsjdcbsj.detail.delfjzdIds(fjzdid);

+	                    	//删除附件文本框内容

+	                    	jsjdcbsj.detail.delIds(id);

+	                        $("#"+id).remove();

+	                        $("#delid"+scflag).val("");

+	                        $("#wjh1").val("");

+	                        $("#fbdw1").val("");

+	                        $("#fbsj1").val("");

+	                        $("#fbdw"+scflag).text("");

+	                        $("#fbsj"+scflag).text("");

+	                        $("#fjmc"+scflag).text("");

+	                        $("#wjh"+scflag).text("");

+	                    	$("#scbt"+scflag).hide();

+	                    	$("#tjbt"+scflag).show();

+		                 } else {

+		                	 $.alert({

+		             		    title: '提示',

+		             		    content: data.message,

+		             		    confirm: function(){

+		             		    }

+		             	 });

+		                 }

+		             }, "json");

+			    },

+			    cancel: function(){

+			    }

+			});

+	  }

+}

+

 //附件关闭

 jsjdcbsj.detail.guanbipop=function(){

 	var accid=$("#accid").val();

@@ -22,13 +108,13 @@ jsjdcbsj.detail.guanbipop=function(){
 
 		    cancel: function(){

 		    	var flag=$("#flag").val();

 		    	var id=$("#accid").val();

-		    	 $.post($.app + "/jsjdgl/delFile?id="+id, {}, function(data, status) {

+		    	 $.post($.app + "/jsjdcbsj/delFile?id="+id, {}, function(data, status) {

 	                    if (data.success) {

 	                     $("#fjmc"+flag).html("");

 	                     $("#fjxq").empty();

 	                     $("#scfjbt").removeAttr("style");

 	 	                 $("#delid"+flag).val("");

-	 	                 jsjdgl.detail.delIds(id);

+	 	                 jsjdcbsj.detail.delIds(id);

 		                 } else {

 		                	 $.alert({

 		             		    title: '提示',

@@ -767,7 +853,7 @@ jsjdcbsj.detail.saveFile = function(){
 
 	                str = "<span id='fjmc1'>" 

 	                      + "<input value='"+accid+"' id='accid' name='accid' type='hidden'>" 

 	                      + "<a class='main_title' href='/jsjy/accessory/download?id="+ accid +"'> " + accContect +"</a>"+"</span>";

-	                str+="<a class='main_title' onclick=\"jsjdgl.detail.delFj('"+ accid +"','"+i+"');\" >删除文件</a>"

+	                str+="<a class='main_title' onclick=\"jsjdcbsj.detail.delFj('"+ accid +"','"+i+"');\" >删除文件</a>"

 	                $("#fjxq").empty();

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

 	                //给附件id集文本框赋值

+ 23 - 0
gkjsjy/trunk/WebContent/static/biz/js/gkjsgl/jsjdgl/jsjdgldetail.js
View File 

@@ -1267,3 +1267,26 @@ function pageinfo4(){
 
     

 }

 

+jsjdgl.detail.saveTbzt=function(data){

+	 $.post($.app + "/jsjdgl/saveTbzt", {

+         id : data

+     }, function(data) {

+         if (data.success) {

+        	 $.alert({

+        		    title: '提示',

+        		    content: '转报成功',

+        		    confirm: function(){

+        		    	location.href=$.app+'/jsjdgl/main';

+        		    }

+        	 });

+         } else {

+        	 $.alert({

+     		    title: '提示',

+     		    content: data.message,

+     		    confirm: function(){

+     		        

+     		    }

+     	 });

+         }

+     }, "json");

+}

+ 287 - 117
gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jgsq/ctl/JgsqCtl.java
View File 

@@ -13,7 +13,6 @@ import javax.persistence.criteria.Predicate;
 
 import javax.persistence.criteria.Root;

 import javax.persistence.criteria.Subquery;

 import javax.servlet.http.HttpServletRequest;

-import javax.servlet.http.HttpServletResponse;

 

 import org.springframework.beans.BeanUtils;

 import org.springframework.beans.factory.annotation.Autowired;

@@ -22,7 +21,6 @@ import org.springframework.data.jpa.domain.Specification;
 
 import org.springframework.stereotype.Controller;

 import org.springframework.ui.Model;

 import org.springframework.web.bind.annotation.RequestMapping;

-import org.springframework.web.bind.annotation.RequestParam;

 import org.springframework.web.bind.annotation.ResponseBody;

 import org.springframework.web.multipart.MultipartFile;

 

@@ -34,6 +32,8 @@ import com.xt.jygl.accessory.service.AccessoryService;
 
 import com.xt.jygl.common.BaseWebCtl;

 import com.xt.jygl.common.Constants;

 import com.xt.jygl.common.GlobalData;

+import com.xt.jygl.ftp.Ftp;

+import com.xt.jygl.ftp.FtpUtil;

 import com.xt.jygl.gkjcxx.gk.entity.GkEntity;

 import com.xt.jygl.gkjcxx.gk.service.GkService;

 import com.xt.jygl.gkjcxx.gq.entity.GqEntity;

@@ -42,7 +42,8 @@ import com.xt.jygl.gkjsgl.jgsq.entity.JgsqfjEntity;
 
 import com.xt.jygl.gkjsgl.jgsq.service.JgsqService;

 import com.xt.jygl.gkjsgl.jgsq.service.JgsqfjService;

 import com.xt.jygl.gkjsgl.jgsq.vo.JgsqVo;

-import com.xt.jygl.gkjsgl.jsjdcbsj.entity.JsjdcbsjEntity;

+import com.xt.jygl.gkjsgl.jgsq.vo.JgsqfjVo;

+import com.xt.jygl.gkjsgl.jsjdgl.vo.JsjdfjVo;

 import com.xt.jygl.gkjsgl.tzjhgl.entity.TzjhglEntity;

 import com.xt.jygl.gkjsgl.tzjhgl.service.TzjhglService;

 import com.xt.jygl.gkjsgl.xmxxgl.vo.XmxxglVo;

@@ -192,10 +193,13 @@ public class JgsqCtl extends BaseWebCtl {
 
 							}

 						}

 					} else {

+

 						if ("1".equals(entity.getFlowstatus())) {

 							vo.setCurrentname("退回地市");

 						} else if ("2".equals(entity.getFlowstatus())) {

 							vo.setCurrentname("完成");

+						} else if ("3".equals(entity.getFlowstatus())) {

+							vo.setCurrentname("已同步");

 						}

 					}

 				} else if (entity.getRecordStatus() == BaseEntity.RECORD_STATE_COMPLETED) {

@@ -225,26 +229,13 @@ public class JgsqCtl extends BaseWebCtl {
 
 				} else {

 					vo.setShowjsjd("N");

 				}

-				/*

-				 * List<TzjhglEntity> tzjh =

-				 * tzjhglService.findByXmid(entity.getId() != null ?

-				 * entity.getId() : ""); if (tzjh.size() != 0) { String

-				 * flagForYear = "1"; vo.setFlagForYear(flagForYear); }

-				 */

+

 				List<TaskInfoEntity> listtask = taskInfoService.findByBusIdAndBusKeyAndRecordStatus(entity.getId().toString(), JgsqEntity.PROCESS_DEFINITION_KEY);

 				String flag = "";

 				if (listtask.size() != 0 || entity.getRecordStatus() == BaseEntity.RECORD_STATE_COMPLETED) {

 					flag = "1";

 					vo.setFlag(flag);

 				}

-				/*

-				 * boolean judge = false; for (TzjhglEntity tz : tzjh) { if

-				 * (("是").equals(tz.getSfyzjbz().getText())) { judge = true; }

-				 * 

-				 * } if (judge) { vo.setSfyzjbz("是"); } else {

-				 * vo.setSfyzjbz("否"); }

-				 */

-

 				voList.add(vo);

 			}

 		}

@@ -264,7 +255,11 @@ public class JgsqCtl extends BaseWebCtl {
 
 		model.addAttribute("xmhzjbid", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "xmhzjbid"));

 		model.addAttribute("sfyzjbz", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "sfyzjbzid"));

 		model.addAttribute("menuid", menuid);

-

+		if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)) {

+			model.addAttribute("ssFlag", "1");

+		} else {

+			model.addAttribute("ssFlag", "0");

+		}

 		// 翻页共通

 		putPageInfo(model, page, list);

 		return "gkjsgl/jgsq/jgsqmain";

@@ -288,7 +283,7 @@ public class JgsqCtl extends BaseWebCtl {
 
 

 	@RequestMapping(value = "/submit")

 	@ResponseBody

-	public WebJsonResult submit(Model model, JgsqEntity code, String sylxid, String ssjyrid, String fjids, String accid, String xmlxid, String tzlxid, String xmhzjbid, String axspjbid, String szdid, String szgkid, String szgqid, String zyhbwflid) {

+	public WebJsonResult submit(Model model, JgsqEntity code, String userids, String sylxid, String ssjyrid, String fjids, String accid, String xmlxid, String tzlxid, String xmhzjbid, String axspjbid, String szdid, String szgkid, String szgqid, String zyhbwflid) {

 		WebJsonResult wr = success();

 		if (StringUtils.isEmpty(code.getXmmc())) {

 			wr.setSuccess(false);

@@ -398,7 +393,7 @@ public class JgsqCtl extends BaseWebCtl {
 
 				} else {

 					jgsq.setAxspjb(null);

 				}

-				jgsqService.submit(jgsq);

+				jgsqService.submit(jgsq, userids);

 			} else {

 				if (!StringUtils.isEmpty(ssjyrid)) {

 					GkjyrEntity jyr = new GkjyrEntity();

@@ -446,11 +441,11 @@ public class JgsqCtl extends BaseWebCtl {
 
 					axspjbdx.setId(axspjbid);

 					code.setAxspjb(axspjbdx);

 				}

-				jgsqService.submit(code);

+				jgsqService.submit(code, userids);

 

 			}

 			// rtx提醒

-			rtxSend("", Constants.ROLE_LD, "你有一条建设进度竣工验收申请待办事务，请及时处理！");

+			rtxSend(userids, "", "你有一条建设进度竣工验收申请待办事务，请及时处理！");

 

 		} catch (Exception e) {

 			wr.setSuccess(false);

@@ -462,7 +457,7 @@ public class JgsqCtl extends BaseWebCtl {
 
 

 	@RequestMapping(value = "/submitAudit")

 	@ResponseBody

-	public WebJsonResult submitAudit(JgsqEntity code, String sylxid, String ssjyrid, String fjids, String accid, String xmlxid, String tzlxid, String xmhzjbid, String axspjbid, String szdid, String szgkid, String szgqid, String zyhbwflid) {

+	public WebJsonResult submitAudit(JgsqEntity code, String userids, String sylxid, String ssjyrid, String fjids, String accid, String xmlxid, String tzlxid, String xmhzjbid, String axspjbid, String szdid, String szgkid, String szgqid, String zyhbwflid) {

 		WebJsonResult wr = success();

 		JgsqEntity jgsq = new JgsqEntity();

 		try {

@@ -535,8 +530,6 @@ public class JgsqCtl extends BaseWebCtl {
 
 				}

 				jgsq = jgsqService.save(jgsq);

 			}

-			// rtx提醒

-			rtxSend("", Constants.ROLE_LD, "你有一条建设进度竣工验收申请待办事务，请及时处理！");

 		} catch (Exception e) {

 			wr.setSuccess(false);

 			wr.setMessage("操作失败！");

@@ -546,7 +539,10 @@ public class JgsqCtl extends BaseWebCtl {
 
 			if (jgsqService.getCandidateTaskByUserAndBusKey(SecUtils.getCurrUser().getId().toString(), jgsq.getId()) != null) {

 				jgsqService.claim(jgsq.getId(), SecUtils.getCurrUser().getId().toString());

 			}

-			jgsqService.changeAudit(null, jgsq, true, null);

+			jgsqService.changeAudit(null, jgsq, true, userids);

+			// rtx提醒

+			rtxSend(userids, "", "你有一条建设进度竣工验收申请待办事务，请及时处理！");

+

 		} catch (Exception e) {

 			wr.setSuccess(false);

 			wr.setMessage("操作失败！");

@@ -731,10 +727,6 @@ public class JgsqCtl extends BaseWebCtl {
 
 	@RequiresPermissions("jgsq:edit")

 	public String edit(Model model, String id, String flag) {

 		model.addAttribute("flag", flag);

-		// 附件

-		List<AccessoryEntity> accessoryList = accessoryService.queryBySsidAndSstype(id, "1");

-		model.addAttribute("fjList", accessoryList);

-

 		JgsqEntity entity = jgsqService.findOne(id);

 		XmxxglVo vo = new XmxxglVo();

 		BeanUtils.copyProperties(entity, vo);

@@ -754,8 +746,79 @@ public class JgsqCtl extends BaseWebCtl {
 
 		vo.setSzgk(entity.getSzgk() != null ? entity.getSzgk().getId() : "");

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

 		vo.setZyhbwfl(entity.getZyhbwfl() != null ? entity.getZyhbwfl().getId() : "");

+

+		// 附件

+		List<AccessoryEntity> accessoryList = accessoryService.queryBySsidAndSstype(id, "jsjd");

+		for (int i = 0; i < accessoryList.size(); i++) {

+			if (StringUtils.isNotEmpty(accessoryList.get(i).getRemark())) {

+				AccessoryEntity acc = accessoryList.get(i);

+				String s = accessoryList.get(i).getRemark().substring(0, 2);

+				String accid = accessoryList.get(i).getId();

+				JgsqfjVo fjnamevo = new JgsqfjVo();

+				fjnamevo.setXhbz(accessoryList.get(i).getRemark().substring(2, accessoryList.get(i).getRemark().length()));

+				fjnamevo.setFjid(accid);

+				fjnamevo.setFjmc(accessoryList.get(i).getName());

+				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)) {

+					try {

+						Ftp f = getftp();

+						// 本地目录

+						String localBaseDir = GlobalData.UPLOAD_FILE_PATH + acc.getFilepath();

+						File newfile = new File(localBaseDir);

+						// 如果文件夹不存在则创建

+						if (!newfile.exists() && !newfile.isDirectory()) {

+							newfile.mkdirs();

+						}

+						// 远程目录

+						String remoteBaseDir = acc.getFilepath();

+						// 下载ftp文件

+						boolean downflag = FtpUtil.startDown(f, localBaseDir, remoteBaseDir, acc.getFilename());

+						if (downflag) {

+							System.out.println("ok");

+							acc.setFjbz("1");

+							accessoryService.save(acc);

+						}

+

+					} catch (Exception e) {

+						e.printStackTrace();

+					}

+				}

+				model.addAttribute("fjList" + s, fjnamevo);

+				model.addAttribute("xiazaibz", s);

+			}

+		}

+

+		// 附件字段

+		List<JgsqfjEntity> fjlist = jgsqfjService.findBySsidandfjlx(id, "ptfj");

+		SimpleDateFormat dateFormater = new SimpleDateFormat("yyyy-MM-dd");

+

+		for (int i = 0; i < fjlist.size(); i++) {

+			// 从发布单位中获取标识位

+			if (StringUtils.isNotEmpty(fjlist.get(i).getFjbz())) {

+				String s = fjlist.get(i).getFjbz().substring(0, 2);

+				Date date = fjlist.get(i).getFbsj();

+

+				JgsqfjVo fjvo = new JgsqfjVo();

+				fjvo.setFjbz(fjlist.get(i).getFjbz().substring(2, fjlist.get(i).getFjbz().length()));

+				if (date != null) {

+					String date2 = dateFormater.format(date);

+					fjvo.setFbsj(date2);

+				}

+				fjvo.setFbdw(fjlist.get(i).getFbdw());

+				fjvo.setWjh(fjlist.get(i).getWjh());

+				fjvo.setId(fjlist.get(i).getId());

+				model.addAttribute("recordfj" + s, fjvo);

+			}

+		}

+

 		model.addAttribute("record", vo);

 		model.addAttribute("jyr", entity.getJyrid());

+		model.addAttribute("roleCode", Constants.ROLE_LD);

+		model.addAttribute("currName", "领导办理");

+		if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)) {

+			model.addAttribute("ssFlag", "1");

+		} else {

+			model.addAttribute("ssFlag", "0");

+		}

 		return "gkjsgl/jgsq/jgsqedit";

 	}

 

@@ -800,14 +863,99 @@ public class JgsqCtl extends BaseWebCtl {
 
 		vo.setSzgq(entity.getSzgq() != null ? entity.getSzgq().getId() : "");

 		vo.setZyhbwfl(entity.getZyhbwfl() != null ? entity.getZyhbwfl().getId() : "");

 

+		// 附件

+		List<AccessoryEntity> accessoryList = accessoryService.queryBySsidAndSstype(id, "jsjd");

+		for (int i = 0; i < accessoryList.size(); i++) {

+			if (StringUtils.isNotEmpty(accessoryList.get(i).getRemark())) {

+				AccessoryEntity acc = accessoryList.get(i);

+				String s = accessoryList.get(i).getRemark().substring(0, 2);

+				String accid = accessoryList.get(i).getId();

+				JsjdfjVo fjnamevo = new JsjdfjVo();

+				fjnamevo.setXhbz(accessoryList.get(i).getRemark().substring(2, accessoryList.get(i).getRemark().length()));

+				fjnamevo.setFjid(accid);

+				fjnamevo.setFjmc(accessoryList.get(i).getName());

+				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)) {

+					try {

+						Ftp f = getftp();

+						// 本地目录

+						String localBaseDir = GlobalData.UPLOAD_FILE_PATH + acc.getFilepath();

+						File newfile = new File(localBaseDir);

+						// 如果文件夹不存在则创建

+						if (!newfile.exists() && !newfile.isDirectory()) {

+							newfile.mkdirs();

+						}

+						// 远程目录

+						String remoteBaseDir = acc.getFilepath();

+						// 下载ftp文件

+						boolean downflag = FtpUtil.startDown(f, localBaseDir, remoteBaseDir, acc.getFilename());

+						if (downflag) {

+							System.out.println("ok");

+							acc.setFjbz("1");

+							accessoryService.save(acc);

+						}

+

+					} catch (Exception e) {

+						e.printStackTrace();

+					}

+				}

+				model.addAttribute("fjList" + s, fjnamevo);

+				model.addAttribute("xiazaibz", s);

+			}

+		}

+

+		// 附件字段

+		List<JgsqfjEntity> fjlist = jgsqfjService.findBySsidandfjlx(id, "ptfj");

+		SimpleDateFormat dateFormater = new SimpleDateFormat("yyyy-MM-dd");

+

+		for (int i = 0; i < fjlist.size(); i++) {

+			// 从发布单位中获取标识位

+			if (StringUtils.isNotEmpty(fjlist.get(i).getFjbz())) {

+				String s = fjlist.get(i).getFjbz().substring(0, 2);

+				Date date = fjlist.get(i).getFbsj();

+

+				JgsqfjVo fjvo = new JgsqfjVo();

+				fjvo.setFjbz(fjlist.get(i).getFjbz().substring(2, fjlist.get(i).getFjbz().length()));

+				if (date != null) {

+					String date2 = dateFormater.format(date);

+					fjvo.setFbsj(date2);

+				}

+				fjvo.setFbdw(fjlist.get(i).getFbdw());

+				fjvo.setWjh(fjlist.get(i).getWjh());

+				fjvo.setId(fjlist.get(i).getId());

+				model.addAttribute("recordfj" + s, fjvo);

+			}

+		}

+

 		List<TaskInfoEntity> lists = taskInfoService.findByBusIdAndBusKeyAndRecordStatus(id, JgsqEntity.PROCESS_DEFINITION_KEY);

 		if (lists != null & lists.size() > 0) {

+			String roleCode = "";

 			TaskInfoEntity taskinfo = lists.get(0);

-			if ("jbrbl".equals(taskinfo.getTaskKey())) {

-				opflag = "5";

+			String currName = taskinfo.getCurrName();

+			model.addAttribute("currName", currName);

+			if ("ldbl".equals(taskinfo.getTaskKey())) {

+				roleCode = Constants.ROLE_LD;

+			} else if ("fgldbl".equals(taskinfo.getTaskKey())) {

+				roleCode = Constants.ROLE_FGLD;

+			} else if ("ksbl".equals(taskinfo.getTaskKey())) {

+				roleCode = Constants.ROLE_KS;

+			} else if ("jbrbl".equals(taskinfo.getTaskKey())) {

+				roleCode = Constants.ROLE_JBR;

+			} else if ("kscs".equals(taskinfo.getTaskKey())) {

+

+			} else if ("fgldcs".equals(taskinfo.getTaskKey())) {

+				roleCode = Constants.ROLE_FGLD;

+			} else if ("ldcs".equals(taskinfo.getTaskKey())) {

+				roleCode = Constants.ROLE_LD;

 			} else if ("zjps".equals(taskinfo.getTaskKey())) {

-				opflag = "9";

+				roleCode = Constants.ROLE_ZJPS;

+			} else if ("cnxk".equals(taskinfo.getTaskKey())) {

+

+			} else if ("fgldsh".equals(taskinfo.getTaskKey())) {

+				roleCode = Constants.ROLE_FGLD;

+			} else if ("ldpz".equals(taskinfo.getTaskKey())) {

+				roleCode = Constants.YES;

 			}

+			model.addAttribute("roleCode", roleCode);

 			model.addAttribute("taskKey", taskinfo.getTaskKey());

 			model.addAttribute("opflag", opflag);

 		}

@@ -848,11 +996,6 @@ public class JgsqCtl extends BaseWebCtl {
 
 		}

 		model.addAttribute("list", volist);

 

-		List<JgsqfjEntity> fjlist = jgsqfjService.findBySsid(id);

-		if (fjlist != null && fjlist.size() > 0) {

-			model.addAttribute("fjlist", fjlist);

-		}

-

 		model.addAttribute("record", vo);

 		model.addAttribute("jyr", entity.getJyrid());

 		return "gkjsgl/jgsq/jgsqview";

@@ -880,6 +1023,12 @@ public class JgsqCtl extends BaseWebCtl {
 
 				model.addAttribute("gk", gklist.size() == 1 ? gklist.get(0).getId() : "");

 			}

 		}

+		if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)) {

+			model.addAttribute("ssFlag", "1");

+		} else {

+			model.addAttribute("ssFlag", "0");

+		}

+		model.addAttribute("roleCode", Constants.ROLE_LD);

 		return "gkjsgl/jgsq/jgsqadd";

 	}

 

@@ -913,58 +1062,30 @@ public class JgsqCtl extends BaseWebCtl {
 
 

 	@RequestMapping(value = "/audit")

 	@ResponseBody

-	public WebJsonResult audit(String shyj, String id, boolean flag, String accid, String userids) {

+	public WebJsonResult audit(String shyj, String id, boolean flag, String accid, String userids, String delid33, String delid34, String delid35, String fjzdids) {

 		WebJsonResult wr = success();

 		JgsqEntity entity = jgsqService.findOne(id);

-		String role = "";

-		try {

-			List<TaskInfoEntity> list = taskInfoService.findByBusIdAndBusKeyAndRecordStatus(id, JsjdcbsjEntity.PROCESS_DEFINITION_KEY);

-			if (list != null & list.size() > 0) {

-				TaskInfoEntity taskinfo = list.get(0);

-				if ("ldbl".equals(taskinfo.getTaskKey())) {

-					role = Constants.ROLE_FGLD;

-				} else if ("fgldbl".equals(taskinfo.getTaskKey())) {

-					role = Constants.ROLE_KS;

-				} else if ("ksbl".equals(taskinfo.getTaskKey())) {

-					role = Constants.ROLE_JBR;

-				} else if ("jbrbl".equals(taskinfo.getTaskKey())) {

-

-				} else if ("kscs".equals(taskinfo.getTaskKey())) {

-					role = Constants.ROLE_FGLD;

-				} else if ("fgldcs".equals(taskinfo.getTaskKey())) {

-					role = Constants.ROLE_LD;

-				} else if ("ldcs".equals(taskinfo.getTaskKey())) {

-					role = Constants.ROLE_ZJPS;

-				} else if ("zjps".equals(taskinfo.getTaskKey())) {

-

-				} else if ("cnxk".equals(taskinfo.getTaskKey())) {

-					role = Constants.ROLE_FGLD;

-				} else if ("fgldsh".equals(taskinfo.getTaskKey())) {

-					role = Constants.ROLE_LD;

-				}

-			}

-

-		} catch (Exception e) {

-			wr.setSuccess(false);

-			wr.setMessage("操作失败！");

-			e.printStackTrace();

-		}

 		if (!StringUtils.isEmpty(accid)) {

 			// 关联附件

-			String[] ssids = accid.split(",");

-			for (String ssid : ssids) {

-				JgsqfjEntity fj = jgsqfjService.findOne(ssid);

-				if (fj != null) {

-					fj.setSsid(entity.getId());

-					jgsqfjService.save(fj);

-				}

-			}

+			fjgt(accid, entity);

+			fjzdgt(fjzdids, entity);

 		}

+

 		try {

 			if (jgsqService.getCandidateTaskByUserAndBusKey(SecUtils.getCurrUser().getId().toString(), id) != null) {

 				jgsqService.claim(id, SecUtils.getCurrUser().getId().toString());

 			}

 

+			if (!flag) {

+				List<TaskInfoEntity> slist = taskInfoService.findByBusIdAndBusKeyOrderByIdAsc(id, JgsqEntity.PROCESS_DEFINITION_KEY);

+				for (int i = 0; i < slist.size(); i++) {

+					TaskInfoEntity taskentity = slist.get(i);

+					if ("zjps".equals(taskentity.getTaskKey())) {

+						userids = taskentity.getAuditUser() + ",";

+					}

+				}

+			}

+

 			boolean flowflag = jgsqService.changeAudit(shyj, entity, flag, userids);

 			if (flowflag) {

 				if (flag) {

@@ -972,13 +1093,25 @@ public class JgsqCtl extends BaseWebCtl {
 
 				} else {

 					entity.setFlowstatus("1");

 				}

-				jgsqService.save(entity);

+				entity.setSftb(Constants.YES);

+				entity = jgsqService.save(entity);

+				// 如果是省级审核通过或不通过后同步到市级

+				try {

+					String url = "/GK_OPERATION_JSJY_JSJDCBSJ_ONE_PC?condition=ID=" + entity.getId();

+					boolean tbflag = getTbStatus(url);

+					if (tbflag) {

+						entity.setTbzt("Y");

+						jgsqService.save(entity);

+					}

+

+				} catch (Exception e) {

+					e.printStackTrace();

+				}

+

 			} else {

 				// rtx提醒

 				if (!StringUtils.isEmpty(userids)) {

 					rtxSend(userids, "", "你有一条建设进度竣工验收申请待办事务，请及时处理！");

-				} else {

-					rtxSend("", role, "你有一条建设进度竣工验收申请待办事务，请及时处理！");

 				}

 			}

 		} catch (Exception e) {

@@ -989,27 +1122,54 @@ public class JgsqCtl extends BaseWebCtl {
 
 		return wr;

 	}

 

+	// 附件字段保存共通

+	public void fjzdgt(String fjzdids, JgsqEntity code) {

+		if (fjzdids != null && fjzdids != "") {

+			String[] fjidssz = fjzdids.split(",");

+			for (String fj : fjidssz) {

+				if (!StringUtils.isEmpty(fj)) {

+					// 获取前两个字符（标识位）

+					String s = fj.substring(0, 2);

+					// 去掉前两个标识位查询

+					JgsqfjEntity jsjdfj = jgsqfjService.findOne(fj.substring(2, fj.length()));

+					jsjdfj.setSsid(code.getId());

+					// 把附件标识设置成标识位+附件标识

+					jsjdfj.setFjbz(s + jsjdfj.getFjbz());

+					jsjdfj.setFbdw(jsjdfj.getFbdw());

+					jsjdfj.setFjlx("ptfj");

+					jgsqfjService.save(jsjdfj);

+				}

+			}

+		}

+	}

+

+	// 附件保存共通

+	public void fjgt(String accids, JgsqEntity xmxxgl) {

+		if (null != accids && "" != accids) {

+			String[] ssids = accids.split(",");

+			for (String ssid : ssids) {

+				// 获取前两个字符（标识位）

+				if (!StringUtils.isEmpty(ssid)) {

+					String s = ssid.substring(0, 2);

+					// 去掉标志位查询

+					AccessoryEntity acc = accessoryService.findOne(ssid.substring(2, ssid.length()));

+					acc.setSsid(xmxxgl.getId());

+					// 把备注设置成标识位+备注

+					acc.setRemark(s + acc.getRemark());

+					accessoryService.save(acc);

+				}

+			}

+		}

+	}

+

 	// 保存附件

 	@RequestMapping(value = "/saveFile")

 	@ResponseBody

-	public WebJsonResult saveFile(@RequestParam("file") List<MultipartFile> file, String fjFlag, Model model, HttpServletRequest request, HttpServletResponse response) {

+	public WebJsonResult saveFile(MultipartFile filename, Model model) {

 		WebJsonResult wr = success();

-		if (file != null && file.size() > 0) {

-			JgsqfjEntity fjEntity = new JgsqfjEntity();

-			for (int i = 0; i < file.size(); i++) {

-				MultipartFile f = file.get(i);

-				if (f.getSize() > 0) {

-					AccessoryEntity acc = accessoryService.saveFile(f, "jgsq");

-					if (acc != null) {

-						fjEntity.setFjid(acc.getId());

-						fjEntity.setFjmc(acc.getName());

-						fjEntity.setType(fjFlag);

-						fjEntity = jgsqfjService.save(fjEntity);

-						break;

-					}

-				}

-			}

-			wr.setAttr("acc", fjEntity);

+		if (filename != null) {

+			AccessoryEntity acc = accessoryService.saveFile(filename, "jsjd");

+			wr.setAttr("acc", acc);

 		} else {

 			wr.setSuccess(false);

 			wr.setMessage("请上传附件!");

@@ -1017,29 +1177,39 @@ public class JgsqCtl extends BaseWebCtl {
 
 		return wr;

 	}

 

-	@RequestMapping(value = "/delFile")

+	@RequestMapping(value = "/savefj")

 	@ResponseBody

-	public WebJsonResult delFile(String accid, Model model) {

+	public WebJsonResult savefj(Model model, JgsqfjEntity fjzd) {

 		WebJsonResult wr = success();

 		try {

-			JgsqfjEntity entity = jgsqfjService.findOne(accid);

-			if (entity != null) {

-				AccessoryEntity acc = accessoryService.findOne(entity.getFjid());

-				if (acc != null) {

-					accessoryService.delete(acc);

-					if (entity != null) {

-						String path = acc.getFilepath() + acc.getFilename();

-						File file = new File(path);

-						if (file.isFile() && file.exists()) {

-							file.delete();

-						}

-					}

-				}

-				jgsqfjService.delete(entity);

-			}

+			// 新增

+			JgsqfjEntity entity = jgsqfjService.save(fjzd);

+			String fjid = entity.getId();

+			wr.setMessage(fjid);

+

 		} catch (Exception e) {

 			wr.setSuccess(false);

+			wr.setMessage("操作失败！");

+			e.printStackTrace();

 		}

 		return wr;

 	}

+

+	@RequestMapping(value = "/delFile")

+	@ResponseBody

+	public WebJsonResult delFile(String id, Model model) {

+		AccessoryEntity acc = accessoryService.findOne(id);

+		accessoryService.delete(acc);

+		WebJsonResult wr = success();

+

+		return wr;

+	}

+

+	@RequestMapping(value = "/delFjzd")

+	@ResponseBody

+	public WebJsonResult delFjzd(String id, Model model) {

+		jgsqfjService.logicDelete(id);

+		WebJsonResult wr = success();

+		return wr;

+	}

 }

+ 3 - 0
gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jgsq/dao/JgsqfjDao.java
View File 

@@ -11,4 +11,7 @@ public interface JgsqfjDao extends SecRepository<JgsqfjEntity, String> {
 
 

 	@Query("SELECT m  FROM JgsqfjEntity m WHERE  m.ssid =?1  and m.recordStatus <> 9 ")

 	public List<JgsqfjEntity> findBySsid(String ssid);

+	

+	@Query("SELECT m from JgsqfjEntity m  where m.ssid =?1 and m.fjlx=?2 and m.recordStatus<>9")

+	public List<JgsqfjEntity> findBySsidandfjlx(String ssid,String fjlx);

 }

+ 62 - 26
gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jgsq/entity/JgsqfjEntity.java
View File 

@@ -1,5 +1,7 @@
 
 package com.xt.jygl.gkjsgl.jgsq.entity;

 

+import java.util.Date;

+

 import javax.persistence.Entity;

 import javax.persistence.GeneratedValue;

 import javax.persistence.Id;

@@ -17,13 +19,31 @@ public class JgsqfjEntity extends BaseEntity<String> implements Cloneable {
 
 	 * 

 	 */

 	private static final long serialVersionUID = 1L;

-	private String id = null;

-	private String ssid = null;

-	private String fjid = null;

-	private String fjmc = null;

-	private String type = null;

+	private String id;/* 唯一标识 */

+	private String ssid;/* 项目id */

+	private String wjh;/* 文件号 */

+	private Date fbsj;/* 发布时间 */

+	private String fbdw;/* 发布单位 */

+	private String fjid;/* 附件id */

+	private String wjlb;/* 文件类别 */

+	private String fjbz;/* 附件标识 */

+	private String fjlx;/* 附件类型 */

+

+	/**

+	 * ID主键

+	 * 

+	 * @return

+	 */

+	@Id

+	@GenericGenerator(name = "systemUUID", strategy = "uuid")

+	@GeneratedValue(generator = "systemUUID")

+	public String getId() {

+		return id;

+	}

 

-	

+	public void setId(String id) {

+		this.id = id;

+	}

 

 	public String getSsid() {

 		return ssid;

@@ -33,28 +53,28 @@ public class JgsqfjEntity extends BaseEntity<String> implements Cloneable {
 
 		this.ssid = ssid;

 	}

 

-	public String getType() {

-		return type;

+	public String getWjh() {

+		return wjh;

 	}

 

-	public void setType(String type) {

-		this.type = type;

+	public void setWjh(String wjh) {

+		this.wjh = wjh;

 	}

 

-	/**

-	 * ID主键

-	 * 

-	 * @return

-	 */

-	@Id

-	@GenericGenerator(name = "systemUUID", strategy = "uuid")

-	@GeneratedValue(generator = "systemUUID")

-	public String getId() {

-		return id;

+	public Date getFbsj() {

+		return fbsj;

 	}

 

-	public void setId(String id) {

-		this.id = id;

+	public void setFbsj(Date fbsj) {

+		this.fbsj = fbsj;

+	}

+

+	public String getFbdw() {

+		return fbdw;

+	}

+

+	public void setFbdw(String fbdw) {

+		this.fbdw = fbdw;

 	}

 

 	public String getFjid() {

@@ -65,12 +85,28 @@ public class JgsqfjEntity extends BaseEntity<String> implements Cloneable {
 
 		this.fjid = fjid;

 	}

 

-	public String getFjmc() {

-		return fjmc;

+	public String getWjlb() {

+		return wjlb;

+	}

+

+	public void setWjlb(String wjlb) {

+		this.wjlb = wjlb;

+	}

+

+	public String getFjbz() {

+		return fjbz;

+	}

+

+	public void setFjbz(String fjbz) {

+		this.fjbz = fjbz;

+	}

+

+	public String getFjlx() {

+		return fjlx;

 	}

 

-	public void setFjmc(String fjmc) {

-		this.fjmc = fjmc;

+	public void setFjlx(String fjlx) {

+		this.fjlx = fjlx;

 	}

 

 }

+ 1 - 1
gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jgsq/service/JgsqService.java
View File 

@@ -9,7 +9,7 @@ public interface JgsqService extends BaseWorkFlowService {
 
 

 	public <S extends JgsqEntity> S save(S entity);

 

-	public <S extends JgsqEntity> S submit(S gg);

+	public <S extends JgsqEntity> S submit(S gg,String userids);

 

 	JgsqEntity findOne(String id);

+ 2 - 0
gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jgsq/service/JgsqfjService.java
View File 

@@ -14,4 +14,6 @@ public interface JgsqfjService {
 
 	JgsqfjEntity findOne(String id);

 

 	List<JgsqfjEntity> findBySsid(String ssid);

+	

+	List<JgsqfjEntity> findBySsidandfjlx(String ssid,String fjlx);

 }

+ 9 - 5
gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jgsq/service/impl/JgsqServiceImpl.java
View File 

@@ -40,7 +40,7 @@ public class JgsqServiceImpl extends BaseWorkFlowServiceImpl<JgsqEntity, String>
 
 	}

 

 	@Override

-	public <S extends JgsqEntity> S submit(S entity) {

+	public <S extends JgsqEntity> S submit(S entity,String userids) {

 		if (entity.getRecordStatus() == BaseEntity.RECORD_STATE_REJECT) {

 			entity.setRecordStatus(BaseEntity.RECORD_STATE_SUBMIT);

 			entity = this.save(entity);

@@ -54,10 +54,14 @@ public class JgsqServiceImpl extends BaseWorkFlowServiceImpl<JgsqEntity, String>
 
 			entity.setRecordStatus(BaseEntity.RECORD_STATE_SUBMIT);

 			entity = this.save(entity);

 			Map<String, Object> variables = new HashMap<String, Object>();

-			variables.put("role_ld", Constants.ROLE_LD);

-			variables.put("role_fgld", Constants.ROLE_LD);

-			variables.put("role_ks", Constants.ROLE_LD);

-			variables.put("role_jbr", Constants.ROLE_LD);

+			List<String> lists = new ArrayList<String>();

+			if (!StringUtils.isEmpty(userids)) {

+				String[] users = userids.split(",");

+				for (String userid : users) {

+					lists.add(userid);

+				}

+			}

+			variables.put("assigneeList", lists);

 			WorkFlowParam param = new WorkFlowParam();

 			param.put(WorkFlowParam.DESCRIPTION, entity.getXmmc() + "的竣工验收申请");

+ 7 - 0
gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jgsq/service/impl/JgsqfjServiceImpl.java
View File 

@@ -28,6 +28,13 @@ public class JgsqfjServiceImpl extends JyglBaseService<JgsqfjEntity, String> imp
 
 		return dao.findBySsid(ssid);

 	}

 

+

+	@Override

+	public List<JgsqfjEntity> findBySsidandfjlx(String ssid, String fjlx) {

+		

+		return dao.findBySsidandfjlx(ssid, fjlx);

+	}

+

 	

 

 }

+ 97 - 0
gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jgsq/vo/JgsqfjVo.java
View File 

@@ -0,0 +1,97 @@
 
+package com.xt.jygl.gkjsgl.jgsq.vo;

+

+

+import com.xtframe.sec.common.BaseVo;

+

+public class JgsqfjVo extends BaseVo {

+	private String id;/* 唯一标识 */

+	private String ssid;/* 项目id */

+	private String wjh;/* 唯一标识 */

+	private String fbsj;/* 唯一标识 */

+	private String fbdw;/* 唯一标识 */

+	private String fjid;/* 唯一标识 */

+	private String wjlb;/* 唯一标识 */

+	private String fjmc;

+	private String xhbz;

+	private String fjbz;

+

+	public String getId() {

+		return id;

+	}

+

+	public void setId(String id) {

+		this.id = id;

+	}

+

+	public String getSsid() {

+		return ssid;

+	}

+

+	public void setSsid(String ssid) {

+		this.ssid = ssid;

+	}

+

+	public String getWjh() {

+		return wjh;

+	}

+

+	public void setWjh(String wjh) {

+		this.wjh = wjh;

+	}

+

+	public String getFbsj() {

+		return fbsj;

+	}

+

+	public void setFbsj(String fbsj) {

+		this.fbsj = fbsj;

+	}

+

+	public String getFbdw() {

+		return fbdw;

+	}

+

+	public void setFbdw(String fbdw) {

+		this.fbdw = fbdw;

+	}

+

+	public String getFjid() {

+		return fjid;

+	}

+

+	public void setFjid(String fjid) {

+		this.fjid = fjid;

+	}

+

+	public String getWjlb() {

+		return wjlb;

+	}

+

+	public String getFjmc() {

+		return fjmc;

+	}

+

+	public void setFjmc(String fjmc) {

+		this.fjmc = fjmc;

+	}

+

+	public String getXhbz() {

+		return xhbz;

+	}

+

+	public void setXhbz(String xhbz) {

+		this.xhbz = xhbz;

+	}

+

+	public String getFjbz() {

+		return fjbz;

+	}

+

+	public void setFjbz(String fjbz) {

+		this.fjbz = fjbz;

+	}

+

+	public void setWjlb(String wjlb) {

+		this.wjlb = wjlb;

+	}

+}

+ 92 - 59
gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdcbsj/ctl/JsjdcbsjCtl.java
View File 

@@ -442,7 +442,7 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 
 				jsjdcbsjService.submit(code, userids);

 			}

 			// rtx提醒

-			rtxSend("", Constants.ROLE_LD, "你有一条建设进度初步设计申请待办事务，请及时处理！");

+			rtxSend(userids, "", "你有一条建设进度初步设计申请待办事务，请及时处理！");

 		} catch (Exception e) {

 			wr.setSuccess(false);

 			wr.setMessage("操作失败！");

@@ -453,7 +453,7 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 
 

 	@RequestMapping(value = "/submitAudit")

 	@ResponseBody

-	public WebJsonResult submitAudit(JsjdcbsjEntity code, String sylxid, String ssjyrid, String fjids, String accid, String xmlxid, String tzlxid, String xmhzjbid, String axspjbid, String szdid, String szgkid, String szgqid, String zyhbwflid) {

+	public WebJsonResult submitAudit(JsjdcbsjEntity code, String userids, String sylxid, String ssjyrid, String fjids, String accid, String xmlxid, String tzlxid, String xmhzjbid, String axspjbid, String szdid, String szgkid, String szgqid, String zyhbwflid) {

 		WebJsonResult wr = success();

 		JsjdcbsjEntity jsjdcbsj = new JsjdcbsjEntity();

 		try {

@@ -535,9 +535,9 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 
 			if (jsjdcbsjService.getCandidateTaskByUserAndBusKey(SecUtils.getCurrUser().getId().toString(), jsjdcbsj.getId()) != null) {

 				jsjdcbsjService.claim(jsjdcbsj.getId(), SecUtils.getCurrUser().getId().toString());

 			}

-			jsjdcbsjService.changeAudit(null, jsjdcbsj, true, null);

+			jsjdcbsjService.changeAudit(null, jsjdcbsj, true, userids);

 			// rtx提醒

-			rtxSend("", Constants.ROLE_LD, "你有一条建设进度初步设计申请待办事务，请及时处理！");

+			rtxSend(userids, "", "你有一条建设进度初步设计申请待办事务，请及时处理！");

 		} catch (Exception e) {

 			wr.setSuccess(false);

 			wr.setMessage("操作失败！");

@@ -719,34 +719,23 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 
 		return wr;

 	}

 

-	@RequestMapping(value = "/saveTbzt")

-	@ResponseBody

-	public WebJsonResult saveTbzt(Model model, String id) {

-		WebJsonResult wr = success();

-		JsjdcbsjEntity entity = jsjdcbsjService.findOne(id);

-		entity.setSftb(Constants.YES);

-		entity.setFlowstatus("3");

-		jsjdcbsjService.save(entity);

-		String url = "/GK_OPERATION_JSJY_JSJDCBSJ_ONE_CP?condition=ID=" + id;

-		boolean flag = getTbStatus(url);

-		if (flag) {

-			entity.setTbzt(Constants.YES);

-			jsjdcbsjService.save(entity);

-		} else {

-			wr.setSuccess(false);

-			wr.setMessage("同步失败");

-		}

-		return wr;

-	}

+	/*

+	 * @RequestMapping(value = "/saveTbzt")

+	 * 

+	 * @ResponseBody public WebJsonResult saveTbzt(Model model, String id) {

+	 * WebJsonResult wr = success(); JsjdcbsjEntity entity =

+	 * jsjdcbsjService.findOne(id); entity.setSftb(Constants.YES);

+	 * jsjdcbsjService.save(entity); String url =

+	 * "/GK_OPERATION_JSJY_JSJDCBSJ_ONE_CP?condition=ID=" + id; boolean flag =

+	 * getTbStatus(url); if (flag) { entity.setTbzt(Constants.YES);

+	 * jsjdcbsjService.save(entity); } else { wr.setSuccess(false);

+	 * wr.setMessage("同步失败"); } return wr; }

+	 */

 

 	@RequestMapping(value = "/edit")

 	@RequiresPermissions("jsjdcbsj:edit")

 	public String edit(Model model, String id, String flag) {

 		model.addAttribute("flag", flag);

-		// 附件

-		List<AccessoryEntity> accessoryList = accessoryService.queryBySsidAndSstype(id, "jsjd");

-		model.addAttribute("fjList", accessoryList);

-

 		JsjdcbsjEntity entity = jsjdcbsjService.findOne(id);

 		JsjdcbsjVo vo = new JsjdcbsjVo();

 		BeanUtils.copyProperties(entity, vo);

@@ -766,6 +755,69 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 
 		vo.setSzgq(entity.getSzgq() != null ? entity.getSzgq().getId() : "");

 		vo.setZyhbwfl(entity.getZyhbwfl() != null ? entity.getZyhbwfl().getId() : "");

 

+		// 附件

+		List<AccessoryEntity> accessoryList = accessoryService.queryBySsidAndSstype(id, "jsjd");

+		for (int i = 0; i < accessoryList.size(); i++) {

+			if (StringUtils.isNotEmpty(accessoryList.get(i).getRemark())) {

+				AccessoryEntity acc = accessoryList.get(i);

+				String s = accessoryList.get(i).getRemark().substring(0, 2);

+				String accid = accessoryList.get(i).getId();

+				JsjdcbsjfjVo fjnamevo = new JsjdcbsjfjVo();

+				fjnamevo.setXhbz(accessoryList.get(i).getRemark().substring(2, accessoryList.get(i).getRemark().length()));

+				fjnamevo.setFjid(accid);

+				fjnamevo.setFjmc(accessoryList.get(i).getName());

+				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)) {

+					try {

+						Ftp f = getftp();

+						// 本地目录

+						String localBaseDir = GlobalData.UPLOAD_FILE_PATH + acc.getFilepath();

+						File newfile = new File(localBaseDir);

+						// 如果文件夹不存在则创建

+						if (!newfile.exists() && !newfile.isDirectory()) {

+							newfile.mkdirs();

+						}

+						// 远程目录

+						String remoteBaseDir = acc.getFilepath();

+						// 下载ftp文件

+						boolean downflag = FtpUtil.startDown(f, localBaseDir, remoteBaseDir, acc.getFilename());

+						if (downflag) {

+							System.out.println("ok");

+							acc.setFjbz("1");

+							accessoryService.save(acc);

+						}

+

+					} catch (Exception e) {

+						e.printStackTrace();

+					}

+				}

+				model.addAttribute("fjList" + s, fjnamevo);

+				model.addAttribute("xiazaibz", s);

+			}

+		}

+

+		// 附件字段

+		List<JsjdcbsjfjEntity> fjlist = jsjdcbsjfjService.findBySsidandfjlx(id, "ptfj");

+		SimpleDateFormat dateFormater = new SimpleDateFormat("yyyy-MM-dd");

+

+		for (int i = 0; i < fjlist.size(); i++) {

+			// 从发布单位中获取标识位

+			if (StringUtils.isNotEmpty(fjlist.get(i).getFjbz())) {

+				String s = fjlist.get(i).getFjbz().substring(0, 2);

+				Date date = fjlist.get(i).getFbsj();

+

+				JsjdcbsjfjVo fjvo = new JsjdcbsjfjVo();

+				fjvo.setFjbz(fjlist.get(i).getFjbz().substring(2, fjlist.get(i).getFjbz().length()));

+				if (date != null) {

+					String date2 = dateFormater.format(date);

+					fjvo.setFbsj(date2);

+				}

+				fjvo.setFbdw(fjlist.get(i).getFbdw());

+				fjvo.setWjh(fjlist.get(i).getWjh());

+				fjvo.setId(fjlist.get(i).getId());

+				model.addAttribute("recordfj" + s, fjvo);

+			}

+		}

+

 		model.addAttribute("record", vo);

 		model.addAttribute("jyr", entity.getJyrid());

 		model.addAttribute("roleCode", Constants.ROLE_LD);

@@ -1053,18 +1105,7 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 
 				entity = jsjdcbsjService.save(entity);

 				// 如果是省级审核通过或不通过后同步到市级

 				try {

-					List<JsjdcbsjfjEntity> fjlist = jsjdcbsjfjService.findBySsid(id);

-					String fjids = "";

-					if (fjlist != null && fjlist.size() > 0) {

-						for (JsjdcbsjfjEntity fj : fjlist) {

-							AccessoryEntity acc = accessoryService.findOne(fj.getFjid());

-							if (acc != null) {

-								fjids = acc.getId() + ",";

-							}

-						}

-						fjids = fjids.substring(0, fjids.length() - 1);

-					}

-					String url = "/GK_OPERATION_JSJY_JSJDCBSJ_ONE_PC?condition=ID=" + entity.getId() + ";FJID_IN=" + fjids;

+					String url = "/GK_OPERATION_JSJY_JSJDCBSJ_ONE_PC?condition=ID=" + entity.getId();

 					boolean tbflag = getTbStatus(url);

 					if (tbflag) {

 						entity.setTbzt("Y");

@@ -1165,27 +1206,19 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 
 

 	@RequestMapping(value = "/delFile")

 	@ResponseBody

-	public WebJsonResult delFile(String accid, Model model) {

+	public WebJsonResult delFile(String id, Model model) {

+		AccessoryEntity acc = accessoryService.findOne(id);

+		accessoryService.delete(acc);

+		WebJsonResult wr = success();

+

+		return wr;

+	}

+

+	@RequestMapping(value = "/delFjzd")

+	@ResponseBody

+	public WebJsonResult delFjzd(String id, Model model) {

+		jsjdcbsjfjService.logicDelete(id);

 		WebJsonResult wr = success();

-		try {

-			JsjdcbsjfjEntity entity = jsjdcbsjfjService.findOne(accid);

-			if (entity != null) {

-				AccessoryEntity acc = accessoryService.findOne(entity.getFjid());

-				if (acc != null) {

-					accessoryService.delete(acc);

-					if (entity != null) {

-						String path = acc.getFilepath() + acc.getFilename();

-						File file = new File(path);

-						if (file.isFile() && file.exists()) {

-							file.delete();

-						}

-					}

-				}

-				jsjdcbsjfjService.delete(entity);

-			}

-		} catch (Exception e) {

-			wr.setSuccess(false);

-		}

 		return wr;

 	}

 }

+ 32 - 5
gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdgl/ctl/JsjdglCtl.java
View File 

@@ -332,6 +332,26 @@ public class JsjdglCtl extends BaseWebCtl {
 
 		return wr;

 	}

 

+	@RequestMapping(value = "/saveTbzt")

+	@ResponseBody

+	public WebJsonResult saveTbzt(Model model, String id) {

+		WebJsonResult wr = success();

+		XmxxglEntity entity = xmxxglService.findOne(id);

+		entity.setSftb(Constants.YES);

+		xmxxglService.save(entity);

+		String url = "/GK_OPERATION_JSJY_JSJDCBSJ_ONE_CP?condition=ID=" + id;

+		boolean flag = getTbStatus(url);

+		if (flag) {

+			entity.setFlowstatus("0");

+			entity.setTbzt(Constants.YES);

+			xmxxglService.save(entity);

+		} else {

+			wr.setSuccess(false);

+			wr.setMessage("转报失败");

+		}

+		return wr;

+	}

+	

 	@RequestMapping(value = "/save")

 	@RequiresPermissions("jsjdgl:add")

 	@ResponseBody

@@ -379,6 +399,7 @@ public class JsjdglCtl extends BaseWebCtl {
 
 					xmxxgl.setAxcd(code.getAxcd());

 					xmxxgl.setBwdj(code.getBwdj());

 					xmxxgl.setRecordStatus(8);

+					xmxxgl.setSftb(Constants.NO);

 					if (!StringUtils.isEmpty(szgkid)) {

 						GkEntity szgk = new GkEntity();

 						szgk.setId(szgkid);

@@ -465,6 +486,7 @@ public class JsjdglCtl extends BaseWebCtl {
 
 				// 其他附件

 				qtfjgt(qtfjids, code);

 				qtfjzdgt(qtfjzdids, code);

+				code.setSftb(Constants.NO);

 				xmxxglService.save(code);

 			}

 		} catch (Exception e) {

@@ -1132,7 +1154,7 @@ public class JsjdglCtl extends BaseWebCtl {
 
 

 	@RequestMapping(value = "/audit")

 	@ResponseBody

-	public WebJsonResult audit(XmxxglEntity code, String fjzdids, String accids, String xmlxid, String tzlxid, String xmhzjbid, String axspjbid, String szgkid, String szgqid, boolean flag, String shyj, String qtfjzdids, String qtfjids, String delid11, String delid21, String delid31, String delid32, String delid41, String delid42, 

+	public WebJsonResult audit(XmxxglEntity code, String fjzdids, String accids, String xmlxid, String tzlxid, String xmhzjbid, String axspjbid, String szgkid, String szgqid, boolean flag, String shyj, String qtfjzdids, String qtfjids, String delid11, String delid21, String delid31, String delid32,String delid33, String delid41, String delid42, 

 			String delid51, String delid52, String delid53, String delid54, String delid55, String delid56, String delid61, String delid62, String delid71, String delid72, String delid81, String delid82, String opflag, String sfjyr,String zyhbwflid) {

 		try {

 			shyj = URLDecoder.decode(shyj, "UTF-8");

@@ -1159,12 +1181,17 @@ public class JsjdglCtl extends BaseWebCtl {
 
 			if ("3".equals(opflag)) {

 				if (StringUtils.isEmpty(delid31)) {

 					wr.setSuccess(false);

-					wr.setMessage("请上传初步设计文件!");

+					wr.setMessage("港口建设项目初步设计审批申请文件!");

 					return wr;

 				}

 				if (StringUtils.isEmpty(delid32)) {

 					wr.setSuccess(false);

-					wr.setMessage("请上传初步设计批复文件!");

+					wr.setMessage("请上传港口建设项目初步设计文件!");

+					return wr;

+				}

+				if(StringUtils.isEmpty(delid33)){

+					wr.setSuccess(false);

+					wr.setMessage("请上传港口建设项目批准或者核准、备案文件!");

 					return wr;

 				}

 			}

@@ -1229,12 +1256,12 @@ public class JsjdglCtl extends BaseWebCtl {
 
 			if ("8".equals(opflag)) {

 				if (StringUtils.isEmpty(delid81)) {

 					wr.setSuccess(false);

-					wr.setMessage("请上传竣工资料汇编!");

+					wr.setMessage("请上传港口建设项目竣工验收申请文件!");

 					return wr;

 				}

 				if (StringUtils.isEmpty(delid82)) {

 					wr.setSuccess(false);

-					wr.setMessage("请上传竣工验收证书(多个，新码头，老码头改造)!");

+					wr.setMessage("请上传港口建设项目竣工验收材料!");

 					return wr;

 				}

 			}

+ 9 - 0
gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdgl/vo/XmxxglfbVo.java
View File 

@@ -57,7 +57,16 @@ public class XmxxglfbVo extends BaseVo {
 
 	private String sylx;/* 水域类型 */

 	private String sylxzw;/* 水域类型中文 */

 	private Date jcsj; /* 建成时间 */

+	private String flowstatus;

 	

+	public String getFlowstatus() {

+		return flowstatus;

+	}

+

+	public void setFlowstatus(String flowstatus) {

+		this.flowstatus = flowstatus;

+	}

+

 	public String getXmbm() {

 		return xmbm;

 	}

+ 0 - 2
gkjsjy/trunk/src/com/xt/jygl/gkjsgl/xmxxgl/service/XmxxglService.java
View File 

@@ -1,7 +1,5 @@
 
 package com.xt.jygl.gkjsgl.xmxxgl.service;

 

-import java.net.URL;

-

 import com.xt.jygl.gkjsgl.xmxxgl.entity.XmxxglEntity;

 import com.xt.jygl.workflow.service.BaseWorkFlowService;