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

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

@@ -180,10 +180,15 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 			if (null != entity) {
 				BeanUtils.copyProperties(entity, vo);
 				if (entity.getRecordStatus() != 9) {
+					List<TaskInfoEntity> slists = taskInfoService.findByBusIdAndBusKeyOrderByIdAsc(entity.getId(), JsjdcbsjEntity.PROCESS_DEFINITION_KEY);
+					if (slists != null && slists.size() > 0) {
+						TaskInfoEntity info = slists.get(slists.size() - 1);
+						vo.setCurrentname(info.getCurrName());
+					}
 					List<TaskInfoEntity> lists = taskInfoService.findByBusIdAndBusKeyAndRecordStatus(entity.getId(), JsjdcbsjEntity.PROCESS_DEFINITION_KEY);
 					if (lists != null & lists.size() > 0) {
 						TaskInfoEntity taskinfo = lists.get(0);
-						vo.setCurrentname(taskinfo.getCurrName());
+						// vo.setCurrentname(taskinfo.getCurrName());
 						if ((jsjdcbsjService.getTaskByUserAndBusKey(SecUtils.getCurrUser().getId().toString(), entity.getId().toString()) != null) || jsjdcbsjService.getCandidateTaskByUserAndBusKey(SecUtils.getCurrUser().getId().toString(), entity.getId().toString()) != null) {
 							if ("受理经办人".equals(taskinfo.getCurrName())) {
 								vo.setTaskState("TH");
@@ -933,38 +938,63 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 			}
 		}
 
-		List<TaskInfoEntity> lists = taskInfoService.findByBusIdAndBusKeyAndRecordStatus(id, JsjdcbsjEntity.PROCESS_DEFINITION_KEY);
+		List<TaskInfoEntity> lists = taskInfoService.findByBusIdAndBusKeyOrderByIdAsc(entity.getId(), JsjdcbsjEntity.PROCESS_DEFINITION_KEY);
 		if (lists != null & lists.size() > 0) {
 			String roleCode = "";
-			TaskInfoEntity taskinfo = lists.get(0);
-			String currName = taskinfo.getCurrName();
-			model.addAttribute("currName", currName);
+			TaskInfoEntity taskinfo = lists.get(lists.size() - 1);
+			String 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())) {
+				currName = "分管领导办理";
+			} else if ("fgldbl".equals(taskinfo.getTaskKey())) {
 				roleCode = Constants.ROLE_KS;
-			} else if ("jbrbl".equals(taskinfo.getTaskKey())) {
+				currName = "科室办理";
+			} else if ("ksbl".equals(taskinfo.getTaskKey())) {
 				roleCode = Constants.ROLE_JBR;
+				currName = "经办人办理";
+			} else if ("jbrbl".equals(taskinfo.getTaskKey())) {
+				currName = "科室初审";
 			} else if ("kscs".equals(taskinfo.getTaskKey())) {
-
-			} else if ("fgldcs".equals(taskinfo.getTaskKey())) {
 				roleCode = Constants.ROLE_FGLD;
-			} else if ("ldcs".equals(taskinfo.getTaskKey())) {
+				currName = "分管领导初审";
+			} else if ("fgldcs".equals(taskinfo.getTaskKey())) {
 				roleCode = Constants.ROLE_LD;
-			} else if ("zjps".equals(taskinfo.getTaskKey())) {
+				currName = "领导初审";
+			} else if ("ldcs".equals(taskinfo.getTaskKey())) {
 				roleCode = Constants.ROLE_ZJPS;
+				currName = "专家评审";
+			} else if ("zjps".equals(taskinfo.getTaskKey())) {
+				currName = "草拟许可";
 			} else if ("cnxk".equals(taskinfo.getTaskKey())) {
-
-			} else if ("fgldsh".equals(taskinfo.getTaskKey())) {
 				roleCode = Constants.ROLE_FGLD;
+				currName = "分管领导审核";
+			} else if ("fgldsh".equals(taskinfo.getTaskKey())) {
+				roleCode = Constants.ROLE_LD;
+				currName = "领导批准";
 			} else if ("ldpz".equals(taskinfo.getTaskKey())) {
 				roleCode = Constants.YES;
 			}
+			model.addAttribute("currName", currName);
 			model.addAttribute("roleCode", roleCode);
 			model.addAttribute("taskKey", taskinfo.getTaskKey());
 			model.addAttribute("opflag", opflag);
+			boolean hqflag = true;
+
+			if ("kscs".equals(taskinfo.getTaskKey()) || "cnxk".equals(taskinfo.getTaskKey())) {
+				List<TaskInfoEntity> tasklist = taskInfoService.findByBusIdAndBusKeyOrderByIdAsc(entity.getId(), JsjdcbsjEntity.PROCESS_DEFINITION_KEY);
+				if (tasklist != null && tasklist.size() > 1) {
+					int len = tasklist.size()-1;
+					for (int i= len; i > 0; i--) {
+						TaskInfoEntity task = tasklist.get(i);
+						if (taskinfo.getTaskKey().equals(task.getTaskKey()) && (StringUtils.isEmpty(task.getAuditResult()) || "false".equals(task.getAuditResult()))) {
+							hqflag = false;
+							break;
+						}
+					}
+
+				}
+			}
+			model.addAttribute("hqflag", hqflag);
 		}
 
 		List<TaskInfoEntity> slist = taskInfoService.findByBusIdAndBusKeyOrderByIdAsc(id, JsjdcbsjEntity.PROCESS_DEFINITION_KEY);