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

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jgsq/jgsqedit.jsp

@@ -81,22 +81,22 @@
  <input type="hidden" name="fjids" id="fjids">	
   <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">
+					<table class="apply3" cellpadding="0" cellspacing="0" style="table-layout: fixed;">
 					<tr>
 							<th><span class="needwrite">*</span>项目编码：&nbsp;</th>
-							<td colspan="4">
+							<td colspan="3">
 								<input type="text" style="width: 92.5%;" class="form-control" name="xmbm" value="${record.xmbm }">
 							</td>
 						</tr>
 						<tr>
 							<th><span class="needwrite">*</span>项目名称：&nbsp;</th>
-							<td colspan="4" >
+							<td colspan="3" >
 								<input type="text" style="width: 92.5%;" class="form-control" name="xmmc" value="${record.xmmc }">
 							</td>
 						</tr>
 						<tr>
 							<th><span class="needwrite">*</span>所属单位：&nbsp;</th>
-							<td colspan="4" style="position:relative;">
+							<td colspan="3" style="position:relative;">
 								<input type="text" style="width: 92.5%;" readonly="readonly" class="form-control"  id ="jyrmc" value ="${jyr.gkjyr }">
 								<input type="hidden" class="form-control" name="ssjyrid" id ="jyrid" value ="${jyr.id }">
 								<c:if test="${jyr.id == null }">
@@ -289,9 +289,9 @@
 										<td><span id="fbsj85">${recordfj85.fbsj }</span></td>
 										
 									</tr>
-									<c:forEach items="${fjvolist3}" var="qtfj" varStatus="status">
+									<c:forEach items="${qtfjlist}" var="qtfj" varStatus="status">
 										<tr>
-											<td>${status.index+3}</td>
+											<td>${status.index+6}</td>
 											<td>其他附件</td>
 											<td><a class="main_title"
 												href='/jsjy/accessory/download?id=${qtfj.fjid }'>${qtfj.fjmc }</a></td>
@@ -316,9 +316,9 @@
 							   <i class="glyphicon glyphicon-check"></i> 
 							            选择人员</a>
 					</c:if>
-                    	<a class="btn btn-default btn-sm" href="#" onclick="jgsq.detail.save()">
+                    <!-- 	<a class="btn btn-default btn-sm" href="#" onclick="jgsq.detail.save()">
 							   <i class="glyphicon glyphicon-floppy-disk"></i> 
-							            保存</a>
+							            保存</a> -->
 							<c:if test="${ssFlag ==0 }">	            
 							<c:if test="${flag == '' || flag == null}">
   

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jgsq/jgsqview.jsp

@@ -88,22 +88,22 @@
  <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">
+					<table class="apply3" cellpadding="0" cellspacing="0" style="table-layout: fixed;">
 					<tr>
 							<th>项目编码：&nbsp;</th>
-							<td colspan="4">
+							<td colspan="3">
 								${record.xmbm }
 							</td>
 						</tr>
 						<tr>
 							<th>项目名称：&nbsp;</th>
-							<td colspan="4" >
+							<td colspan="3" >
 								${record.xmmc }
 							</td>
 						</tr>
 						<tr>
 							<th>所属单位：&nbsp;</th>
-							<td colspan="4" >
+							<td colspan="3" >
 								${jyr.gkjyr }
 							</td>
 						</tr>
@@ -307,9 +307,9 @@
 										</td>
 										</c:if>
 									</tr>
-									<c:forEach items="${fjvolist3}" var="qtfj" varStatus="status">
+									<c:forEach items="${qtfjlist}" var="qtfj" varStatus="status">
 										<tr>
-											<td>${status.index+3}</td>
+											<td>${status.index+6}</td>
 											<td>其他附件</td>
 											<td><a class="main_title"
 												href='/jsjy/accessory/download?id=${qtfj.fjid }'>${qtfj.fjmc }</a></td>
@@ -339,6 +339,7 @@
 					<div  id="buttons">
 					<c:if test="${flag=='audit' }">
 					<c:if test="${roleCode != 'Y' && hqflag == true }">
+					
 							<a class="btn btn-default btn-sm" href="#" onclick="showRy()">
 								<i class="glyphicon glyphicon-check"></i> 选择人员
 							</a>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdgl/jsjdgledit.jsp

@@ -1418,8 +1418,7 @@
 					 </c:if>	           
 					
 				</tr>
-				<tr>
-				 <c:if test="${ record.flowstatus > 0  }">
+				 <c:if test="${ record.flowstatus > 2  }">
 				<tr>
 					<td>3</td>
 					<td>竣工验收鉴定书</td>
@@ -1615,16 +1614,29 @@
                     </c:if>
                     <c:if test="${sfjyr=='' }">
 					<c:if test="${flag=='audit' }">
-					<c:if test="${spflag !='3' && spflag != '8' || record.flowstatus == 2 || record.flowstatus == 4}">
+					<c:if test="${spflag !='3' && spflag != '8'}">
+					<a id="auditbt" class="btn btn-default btn-sm" href="#"  onclick="jsjdgl.detail.audit('Y','${record.id}')">
+							   <i class="glyphicon glyphicon-ok-sign"></i> 
+							            同意</a>
+					</c:if>
+					<c:if test="${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 test="${ (spflag =='3' || spflag == '8') && (record.flowstatus != 2 && record.flowstatus != 4)}">
+					<c:if test="${record.flowstatus == 4}">
+					<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 test="${ (spflag =='3' || spflag == '8') }">
+				 	<c:if test="${record.flowstatus != 2 && record.flowstatus != 4  }">
 					<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>
 					<c:if test="${sfjyr==1 }">

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jgsq/ctl/JgsqCtl.java

@@ -43,7 +43,6 @@ 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.jgsq.vo.JgsqfjVo;
-import com.xt.jygl.gkjsgl.jsjdcbsj.entity.JsjdcbsjEntity;
 import com.xt.jygl.gkjsgl.jsjdgl.vo.JsjdfjVo;
 import com.xt.jygl.gkjsgl.tzjhgl.entity.TzjhglEntity;
 import com.xt.jygl.gkjsgl.tzjhgl.service.TzjhglService;
@@ -183,7 +182,7 @@ public class JgsqCtl extends BaseWebCtl {
 				BeanUtils.copyProperties(entity, vo);
 				if (entity.getRecordStatus() != 9) {
 					// 获取流程最新步骤
-					TaskInfoEntity info = taskInfoService.findByStep(entity.getId(), JsjdcbsjEntity.PROCESS_DEFINITION_KEY);
+					TaskInfoEntity info = taskInfoService.findByStep(entity.getId(), JgsqEntity.PROCESS_DEFINITION_KEY);
 					if (info != null) {
 						vo.setCurrentname(info.getCurrName());
 					}
@@ -969,7 +968,8 @@ public class JgsqCtl extends BaseWebCtl {
 
 		String roleCode = "";
 		String currName = "";
-		TaskInfoEntity taskinfo = taskInfoService.findByStep(id, JsjdcbsjEntity.PROCESS_DEFINITION_KEY);
+		boolean hqflag = true;
+		TaskInfoEntity taskinfo = taskInfoService.findByStep(id, JgsqEntity.PROCESS_DEFINITION_KEY);
 		if (taskinfo != null) {
 			if ("sljbr".equals(taskinfo.getTaskKey())) {
 				roleCode = Constants.ROLE_LD;
@@ -1006,17 +1006,26 @@ public class JgsqCtl extends BaseWebCtl {
 				roleCode = Constants.YES;
 			}
 			
-			boolean hqflag = true;
+			
 			if ("kscs".equals(taskinfo.getTaskKey()) || "cnxk".equals(taskinfo.getTaskKey())) {
 				List<TaskInfoEntity> tasklist = taskInfoService.findByBusIdAndTaskKey(entity.getId(), taskinfo.getTaskKey());
 				if (tasklist != null && tasklist.size() > 1) {
-					hqflag = false;
+					for(TaskInfoEntity task:tasklist){
+						if(!task.getRunner().getId().equals(securityMgr.getCurrUser().getId())){
+							if("true".equals(task.getAuditResult())){
+								
+							}else{
+								hqflag = false;
+							}
+						}
+					}
+					
 				}
 			}
-			model.addAttribute("hqflag", hqflag);
+			
 			model.addAttribute("taskKey", taskinfo.getTaskKey());
 		}
-
+		model.addAttribute("hqflag", hqflag);
 		model.addAttribute("currName", currName);
 		model.addAttribute("roleCode", roleCode);
 		
@@ -1141,10 +1150,10 @@ public class JgsqCtl extends BaseWebCtl {
 			}
 
 			// 获取流程最新步骤
-			TaskInfoEntity info = taskInfoService.findByStep(entity.getId(), JsjdcbsjEntity.PROCESS_DEFINITION_KEY);
+			TaskInfoEntity info = taskInfoService.findByStep(entity.getId(), JgsqEntity.PROCESS_DEFINITION_KEY);
 			// 退回用户处理
 			if (!flag) {
-				List<TaskInfoEntity> slist = taskInfoService.findByBusIdAndBusKeyOrderByIdAsc(id, JsjdcbsjEntity.PROCESS_DEFINITION_KEY);
+				List<TaskInfoEntity> slist = taskInfoService.findByBusIdAndBusKeyOrderByIdAsc(id, JgsqEntity.PROCESS_DEFINITION_KEY);
 				for (int i = slist.size() - 1; i > 0; i--) {
 					TaskInfoEntity taskentity = slist.get(i);
 					if ("zjps".equals(taskentity.getTaskKey()) && taskentity.getState() == "2") {

gkjsjy/trunk/src/com/xt/jygl/workflow/dao/TaskInfoDao.java

@@ -40,7 +40,7 @@ public interface TaskInfoDao extends SecRepository<TaskInfoEntity, String> {
 	@Query("from TaskInfoEntity where busId = ?1 and busKey = ?2 and state = 3")
 	public List<TaskInfoEntity> findByBusIdAndBusKeyAndRecordStatus(String busId, String busKey);
 
-	@Query(value = "select t.*  from GK_OPERATION_JSJY_TASK t where t.bus_id = ?1 and t.bus_key = ?2 and t.step = (select max(to_number(step)) from GK_OPERATION_JSJY_TASK where bus_id = ?1 and bus_key = ?2)", nativeQuery = true)
+	@Query(value = "select t.*  from GK_OPERATION_JSJY_TASK t where t.bus_id = ?1 and t.bus_key = ?2 and t.state=3 and t.step = (select max(to_number(step)) from GK_OPERATION_JSJY_TASK where bus_id = ?1 and bus_key = ?2)", nativeQuery = true)
 	public TaskInfoEntity findByStep(String busId, String busKey);
 
 	@Query("from TaskInfoEntity where busId = ?1 and taskKey = ?2 and sfth is null")