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

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

@@ -184,7 +184,9 @@ public class JgsqCtl extends BaseWebCtl {
 				if (entity.getRecordStatus() != 9) {
 					// 获取流程最新步骤
 					TaskInfoEntity info = taskInfoService.findByStep(entity.getId(), JsjdcbsjEntity.PROCESS_DEFINITION_KEY);
-					vo.setCurrentname(info.getCurrName());
+					if (info != null) {
+						vo.setCurrentname(info.getCurrName());
+					}
 					List<TaskInfoEntity> lists = taskInfoService.findByBusIdAndBusKeyAndRecordStatus(entity.getId(), JgsqEntity.PROCESS_DEFINITION_KEY);
 					if (lists != null & lists.size() > 0) {
 						TaskInfoEntity taskinfo = lists.get(0);
@@ -810,6 +812,25 @@ public class JgsqCtl extends BaseWebCtl {
 			}
 		}
 
+		List<JgsqfjEntity> qtfjlist = jgsqfjService.findBySsidandfjlx(id, "jsjdqtfj");
+		List<JgsqfjVo> qtfjlists = new ArrayList<JgsqfjVo>();
+		if (qtfjlist != null && qtfjlist.size() > 0) {
+			for (JgsqfjEntity qtfj : qtfjlist) {
+				AccessoryEntity acc = accessoryService.findOne(qtfj.getFjid());
+				JgsqfjVo fjvo = new JgsqfjVo();
+				fjvo.setFbdw(qtfj.getFbdw());
+				String fbsj = "";
+				if (qtfj.getFbsj() != null) {
+					fbsj = dateFormater.format(qtfj.getFbsj());
+				}
+				fjvo.setFbsj(fbsj);
+				fjvo.setWjh(fjvo.getWjh());
+				fjvo.setFjid(qtfj.getFjid());
+				fjvo.setFjmc(acc.getName());
+				qtfjlists.add(fjvo);
+			}
+		}
+		model.addAttribute("qtfjlist", qtfjlists);
 		model.addAttribute("record", vo);
 		model.addAttribute("jyr", entity.getJyrid());
 		model.addAttribute("roleCode", Constants.ROLE_LD);
@@ -926,56 +947,82 @@ public class JgsqCtl extends BaseWebCtl {
 			}
 		}
 
+		List<JgsqfjEntity> qtfjlist = jgsqfjService.findBySsidandfjlx(id, "jsjdqtfj");
+		List<JgsqfjVo> qtfjlists = new ArrayList<JgsqfjVo>();
+		if (qtfjlist != null && qtfjlist.size() > 0) {
+			for (JgsqfjEntity qtfj : qtfjlist) {
+				AccessoryEntity acc = accessoryService.findOne(qtfj.getFjid());
+				JgsqfjVo fjvo = new JgsqfjVo();
+				fjvo.setFbdw(qtfj.getFbdw());
+				String fbsj = "";
+				if (qtfj.getFbsj() != null) {
+					fbsj = dateFormater.format(qtfj.getFbsj());
+				}
+				fjvo.setFbsj(fbsj);
+				fjvo.setWjh(fjvo.getWjh());
+				fjvo.setFjid(qtfj.getFjid());
+				fjvo.setFjmc(acc.getName());
+				qtfjlists.add(fjvo);
+			}
+		}
+		model.addAttribute("qtfjlist", qtfjlists);
+
 		String roleCode = "";
-		TaskInfoEntity taskinfo = taskInfoService.findByStep(id, JsjdcbsjEntity.PROCESS_DEFINITION_KEY);
 		String currName = "";
-		if ("sljbr".equals(taskinfo.getTaskKey())) {
-			roleCode = Constants.ROLE_LD;
-			currName = "领导办理";
-		} else if ("ldbl".equals(taskinfo.getTaskKey())) {
-			roleCode = Constants.ROLE_FGLD;
-			currName = "分管领导办理";
-		} else if ("fgldbl".equals(taskinfo.getTaskKey())) {
-			roleCode = Constants.ROLE_KS;
-			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())) {
-			roleCode = Constants.ROLE_FGLD;
-			currName = "分管领导初审";
-		} else if ("fgldcs".equals(taskinfo.getTaskKey())) {
-			roleCode = Constants.ROLE_LD;
-			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())) {
-			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;
+		TaskInfoEntity taskinfo = taskInfoService.findByStep(id, JsjdcbsjEntity.PROCESS_DEFINITION_KEY);
+		if (taskinfo != null) {
+			if ("sljbr".equals(taskinfo.getTaskKey())) {
+				roleCode = Constants.ROLE_LD;
+				currName = "领导办理";
+			} else if ("ldbl".equals(taskinfo.getTaskKey())) {
+				roleCode = Constants.ROLE_FGLD;
+				currName = "分管领导办理";
+			} else if ("fgldbl".equals(taskinfo.getTaskKey())) {
+				roleCode = Constants.ROLE_KS;
+				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())) {
+				roleCode = Constants.ROLE_FGLD;
+				currName = "分管领导初审";
+			} else if ("fgldcs".equals(taskinfo.getTaskKey())) {
+				roleCode = Constants.ROLE_LD;
+				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())) {
+				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;
+			}
+			
+			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;
+				}
+			}
+			model.addAttribute("hqflag", hqflag);
+			model.addAttribute("taskKey", taskinfo.getTaskKey());
 		}
+
 		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.findByBusIdAndTaskKey(entity.getId(), taskinfo.getTaskKey());
-			if (tasklist != null && tasklist.size() > 1) {
-				hqflag = false;
-			}
-		}
-		model.addAttribute("hqflag", hqflag);
+		
 
 		List<TaskInfoEntity> slist = taskInfoService.findByBusIdAndBusKeyOrderByIdAsc(id, JgsqEntity.PROCESS_DEFINITION_KEY);
 		List<TaskInfoVo> volist = new ArrayList<TaskInfoVo>();

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

@@ -821,6 +821,25 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 			}
 		}
 
+		List<JsjdcbsjfjEntity> qtfjlist = jsjdcbsjfjService.findBySsidandfjlx(id, "jsjdqtfj");
+		List<JsjdcbsjfjVo> qtfjlists= new ArrayList<JsjdcbsjfjVo>();
+		if(qtfjlist!=null && qtfjlist.size()>0){
+			for(JsjdcbsjfjEntity qtfj:qtfjlist){
+				AccessoryEntity acc = accessoryService.findOne(qtfj.getFjid());
+				JsjdcbsjfjVo fjvo = new JsjdcbsjfjVo();
+				fjvo.setFbdw(qtfj.getFbdw());
+				String fbsj="";
+				if(qtfj.getFbsj()!=null){
+					fbsj = dateFormater.format(qtfj.getFbsj());
+				}
+				fjvo.setFbsj(fbsj);
+				fjvo.setWjh(fjvo.getWjh());
+				fjvo.setFjid(qtfj.getFjid());
+				fjvo.setFjmc(acc.getName());
+				qtfjlists.add(fjvo);
+			}
+		}
+		model.addAttribute("qtfjlist", qtfjlists);
 		model.addAttribute("record", vo);
 		model.addAttribute("jyr", entity.getJyrid());
 		model.addAttribute("roleCode", Constants.ROLE_LD);
@@ -923,14 +942,14 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 			// 从发布单位中获取标识位
 			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);
+				String fbsj="";
+				if(fjlist.get(i).getFbsj()!=null){
+					fbsj = dateFormater.format(fjlist.get(i).getFbsj());
 				}
+				fjvo.setFbsj(fbsj);
 				fjvo.setFbdw(fjlist.get(i).getFbdw());
 				fjvo.setWjh(fjlist.get(i).getWjh());
 				fjvo.setId(fjlist.get(i).getId());
@@ -938,57 +957,78 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 			}
 		}
 
+		List<JsjdcbsjfjEntity> qtfjlist = jsjdcbsjfjService.findBySsidandfjlx(id, "jsjdqtfj");
+		List<JsjdcbsjfjVo> qtfjlists= new ArrayList<JsjdcbsjfjVo>();
+		if(qtfjlist!=null && qtfjlist.size()>0){
+			for(JsjdcbsjfjEntity qtfj:qtfjlist){
+				AccessoryEntity acc = accessoryService.findOne(qtfj.getFjid());
+				JsjdcbsjfjVo fjvo = new JsjdcbsjfjVo();
+				fjvo.setFbdw(qtfj.getFbdw());
+				String fbsj="";
+				if(qtfj.getFbsj()!=null){
+					fbsj = dateFormater.format(qtfj.getFbsj());
+				}
+				fjvo.setFbsj(fbsj);
+				fjvo.setWjh(fjvo.getWjh());
+				fjvo.setFjid(qtfj.getFjid());
+				fjvo.setFjmc(acc.getName());
+				qtfjlists.add(fjvo);
+			}
+		}
+		model.addAttribute("qtfjlist", qtfjlists);
 		String roleCode = "";
-		TaskInfoEntity taskinfo = taskInfoService.findByStep(id, JsjdcbsjEntity.PROCESS_DEFINITION_KEY);
 		String currName = "";
-		if("sljbr".equals(taskinfo.getTaskKey())) {
-			roleCode = Constants.ROLE_LD;
-			currName = "领导办理";
-		}else if ("ldbl".equals(taskinfo.getTaskKey())) {
-			roleCode = Constants.ROLE_FGLD;
-			currName = "分管领导办理";
-		} else if ("fgldbl".equals(taskinfo.getTaskKey())) {
-			roleCode = Constants.ROLE_KS;
-			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())) {
-			roleCode = Constants.ROLE_FGLD;
-			currName = "分管领导初审";
-		} else if ("fgldcs".equals(taskinfo.getTaskKey())) {
-			roleCode = Constants.ROLE_LD;
-			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())) {
-			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;
+		TaskInfoEntity taskinfo = taskInfoService.findByStep(id, JsjdcbsjEntity.PROCESS_DEFINITION_KEY);
+		if(taskinfo != null){
+			if("sljbr".equals(taskinfo.getTaskKey())) {
+				roleCode = Constants.ROLE_LD;
+				currName = "领导办理";
+			}else if ("ldbl".equals(taskinfo.getTaskKey())) {
+				roleCode = Constants.ROLE_FGLD;
+				currName = "分管领导办理";
+			} else if ("fgldbl".equals(taskinfo.getTaskKey())) {
+				roleCode = Constants.ROLE_KS;
+				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())) {
+				roleCode = Constants.ROLE_FGLD;
+				currName = "分管领导初审";
+			} else if ("fgldcs".equals(taskinfo.getTaskKey())) {
+				roleCode = Constants.ROLE_LD;
+				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())) {
+				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;
+			}
+			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;
+				}
+			}
+			model.addAttribute("hqflag", hqflag);
+			model.addAttribute("taskKey", taskinfo.getTaskKey());
 		}
+
 		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.findByBusIdAndTaskKey(entity.getId(), taskinfo.getTaskKey());
-			if (tasklist != null && tasklist.size() > 1) {
-				hqflag = false;
-			}
-		}
-		model.addAttribute("hqflag", hqflag);
-
+		
 		List<TaskInfoEntity> slist = taskInfoService.findByBusIdAndBusKeyOrderByIdAsc(id, JsjdcbsjEntity.PROCESS_DEFINITION_KEY);
 		List<TaskInfoVo> volist = new ArrayList<TaskInfoVo>();
 		for (int i = 0; i < slist.size(); i++) {