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

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdcbsj/jsjdcbsjadd.jsp

@@ -210,18 +210,19 @@
 					</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="jsjdcbsj.detail.save()">
 							   <i class="glyphicon glyphicon-floppy-disk"></i> 
 							            保存</a>
-							            
+					<c:if test="${ssFlag ==0 }">		            
 							            <a class="btn btn-default btn-sm" href="#" onclick="jsjdcbsj.detail.submit()">
 							   <i class="glyphicon glyphicon-share"></i> 
 							            提交</a>
-							            
+					</c:if>  		            
 							             <a class="btn btn-default btn-sm" href="#"  onclick="jsjdcbsj.detail.back()">
 							   <i class="glyphicon glyphicon-arrow-left"></i> 
 							           返回</a>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdcbsj/jsjdcbsjedit.jsp

@@ -209,30 +209,32 @@
 					
 
 					<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="jsjdcbsj.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="jsjdcbsj.detail.submit()">
 							   <i class="glyphicon glyphicon-share"></i> 
 							            提交</a>
 						</c:if>
+					
 						<c:if test="${flag=='th'}">
 						<a class="btn btn-default btn-sm" href="#"  onclick="jsjdcbsj.detail.submitAudit()">
 						   <i class="glyphicon glyphicon-share"></i> 
 						            提交</a>
 						</c:if>     
-						
+					
 						<a class="btn btn-default btn-sm" href="#"  onclick="jsjdcbsj.detail.audit('N','${record.id}')">
 							   <i class="glyphicon glyphicon-ban-circle"></i> 
 							            退回</a>
-							       
+							</c:if>		       
 							             <a class="btn btn-default btn-sm" href="#"  onclick="jsjdcbsj.detail.back()">
 							   <i class="glyphicon glyphicon-arrow-left"></i> 
 							            返回</a>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdcbsj/jsjdcbsjmain.jsp

@@ -144,22 +144,28 @@
 							            <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>
+									          <c:if test="${ssFlag == 1 }"> 
 									          <a class="btn btn-default btn-xs" href="#" onclick="jsjdcbsj.main.del('${jsjdcbsj.id}')" title="删除">
 									   <i class="glyphicon glyphicon-trash"></i> 
 									         </a>
 									         </c:if>
+									         </c:if>
+									 <c:if test="${ssFlag == 0 }">        
 									<c:if test="${ jsjdcbsj.recordStatus  > 1 }">
 									<a class="btn btn-default btn-xs" href="#"
 									onclick="hisList('${jsjdcbsj.id}','jsjdcbsj')" title="流程历史"> <i
 										class="glyphicon glyphicon-search"></i>
 									</a>
 								</c:if>
+								</c:if>
 					        </td>
 							<td class="operatetd">
 							 <c:if test="${jsjdcbsj.taskState =='Y'}">

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdcbsj/jsjdcbsjview.jsp

@@ -207,10 +207,12 @@
 
 					<div  id="buttons">
 					 
-					<c:if test="${flag=='audit' }">
+					<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> 
 							            意见</a>

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdcbsj/ctl/JsjdcbsjCtl.java

@@ -252,7 +252,11 @@ public class JsjdcbsjCtl 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/jsjdcbsj/jsjdcbsjmain";
@@ -720,12 +724,12 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 		JsjdcbsjEntity entity = jsjdcbsjService.findOne(id);
 		entity.setSftb(Constants.YES);
 		jsjdcbsjService.save(entity);
-		String url = "/GK_OPERATION_JSJY_JSJDCBSJ_ONE_CP?condition=ID="+id;
+		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{
+		} else {
 			wr.setSuccess(false);
 			wr.setMessage("同步失败");
 		}
@@ -762,6 +766,11 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 		model.addAttribute("record", vo);
 		model.addAttribute("jyr", entity.getJyrid());
 		model.addAttribute("roleCode", Constants.ROLE_LD);
+		if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)) {
+			model.addAttribute("ssFlag", "1");
+		}else{
+			model.addAttribute("ssFlag", "0");
+		}
 		return "gkjsgl/jsjdcbsj/jsjdcbsjedit";
 	}
 
@@ -830,6 +839,8 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 
 			} else if ("fgldsh".equals(taskinfo.getTaskKey())) {
 				roleCode = Constants.ROLE_FGLD;
+			}else if ("ldsh".equals(taskinfo.getTaskKey())){
+				roleCode = Constants.YES;
 			}
 			model.addAttribute("roleCode", roleCode);
 			model.addAttribute("taskKey", taskinfo.getTaskKey());
@@ -932,6 +943,11 @@ public class JsjdcbsjCtl 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/jsjdcbsj/jsjdcbsjadd";
 	}
@@ -1012,12 +1028,12 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 						for (JsjdcbsjfjEntity fj : fjlist) {
 							AccessoryEntity acc = accessoryService.findOne(fj.getFjid());
 							if (acc != null) {
-								fjids=acc.getId()+",";
+								fjids = acc.getId() + ",";
 							}
 						}
-						fjids= fjids.substring(0,fjids.lastIndexOf(",")-1);
+						fjids = fjids.substring(0, fjids.lastIndexOf(",") - 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() + ";FJID_IN=" + fjids;
 					boolean tbflag = getTbStatus(url);
 					if (tbflag) {
 						entity.setTbzt("Y");
@@ -1025,7 +1041,6 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 
 					}
 
-					
 				} catch (Exception e) {
 					e.printStackTrace();
 				}