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

gkjsjy/trunk/src/com/xt/jygl/accessory/ctl/AccessoryCtl.java

@@ -64,19 +64,21 @@ public class AccessoryCtl extends BaseWebCtl {
 	public WebJsonResult handleFormDownload(String id, Model model, HttpServletRequest request, HttpServletResponse response) {
 		try {
 			AccessoryEntity entity = accessoryService.findOne(id);
-			// path是指欲下载的文件的路径。
-			String path = GlobalData.UPLOAD_FILE_PATH + entity.getFilepath() + entity.getFilename();
-			// 以流的形式下载文件。
-			InputStream fis = new BufferedInputStream(new FileInputStream(path));
-			byte[] buffer = new byte[fis.available()];
-			fis.read(buffer);
-			fis.close();
-			// 设置response的Header
-			response.setCharacterEncoding("utf-8");
-			response.setContentType("multipart/form-data");
-			String fileName = URLEncoder.encode(entity.getName(), "UTF-8");
-			response.setHeader("Content-Disposition", "attachment;fileName=" + fileName);
-			response.getOutputStream().write(buffer);
+			if(entity != null){
+				// path是指欲下载的文件的路径。
+				String path = GlobalData.UPLOAD_FILE_PATH + entity.getFilepath() + entity.getFilename();
+				// 以流的形式下载文件。
+				InputStream fis = new BufferedInputStream(new FileInputStream(path));
+				byte[] buffer = new byte[fis.available()];
+				fis.read(buffer);
+				fis.close();
+				// 设置response的Header
+				response.setCharacterEncoding("utf-8");
+				response.setContentType("multipart/form-data");
+				String fileName = URLEncoder.encode(entity.getName(), "UTF-8");
+				response.setHeader("Content-Disposition", "attachment;fileName=" + fileName);
+				response.getOutputStream().write(buffer);
+			}
 		} catch (IOException e) {
 			e.printStackTrace();
 		}

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

@@ -1345,10 +1345,13 @@ public class JgsqCtl extends BaseWebCtl {
 					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);
+					if(acc != null){
+						acc.setSsid(xmxxgl.getId());
+						// 把备注设置成标识位+备注
+						acc.setRemark(s + acc.getRemark());
+						accessoryService.save(acc);
+					}
+					
 				}
 			}
 		}
@@ -1391,9 +1394,11 @@ public class JgsqCtl extends BaseWebCtl {
 	@ResponseBody
 	public WebJsonResult delFile(String id, Model model) {
 		AccessoryEntity acc = accessoryService.findOne(id);
-		accessoryService.delete(acc);
+		if(acc != null ){
+			accessoryService.delete(acc);
+		}
+		
 		WebJsonResult wr = success();
-
 		return wr;
 	}
 

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

@@ -850,17 +850,19 @@ public class JgsqdsCtl extends BaseWebCtl {
 		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);
+				if (acc != null) {
+					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);
@@ -1000,17 +1002,19 @@ public class JgsqdsCtl extends BaseWebCtl {
 		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);
+				if (acc != null) {
+					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);
@@ -1269,10 +1273,12 @@ public class JgsqdsCtl extends BaseWebCtl {
 					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);
+					if (acc != null) {
+						acc.setSsid(xmxxgl.getId());
+						// 把备注设置成标识位+备注
+						acc.setRemark(s + acc.getRemark());
+						accessoryService.save(acc);
+					}
 				}
 			}
 		}
@@ -1285,8 +1291,10 @@ public class JgsqdsCtl extends BaseWebCtl {
 			for (String fj : qtfjidssz) {
 				if (!StringUtils.isEmpty(fj)) {
 					AccessoryEntity acc = accessoryService.findOne(fj);
-					acc.setSsid(code.getId());
-					accessoryService.save(acc);
+					if (acc != null) {
+						acc.setSsid(code.getId());
+						accessoryService.save(acc);
+					}
 				}
 			}
 		}
@@ -1378,8 +1386,10 @@ public class JgsqdsCtl extends BaseWebCtl {
 
 			jsjd.setId(fjzd.getId());
 		}
+		if(acc != null){
 		jsjd.setFjmc(acc.getName());
 		jsjd.setFjid(acc.getId());
+		}
 		return jsjd;
 	}
 
@@ -1387,10 +1397,12 @@ public class JgsqdsCtl extends BaseWebCtl {
 	@ResponseBody
 	public WebJsonResult delFile(String id, Model model) {
 		AccessoryEntity acc = accessoryService.findOne(id);
-		accessoryService.delete(acc);
-		JgsqfjEntity jgsqfj = jgsqfjService.findByFjid(id);
-		if (jgsqfj != null) {
-			jgsqfjService.delete(jgsqfj);
+		if (acc != null) {
+			accessoryService.delete(acc);
+			JgsqfjEntity jgsqfj = jgsqfjService.findByFjid(id);
+			if (jgsqfj != null) {
+				jgsqfjService.delete(jgsqfj);
+			}
 		}
 		WebJsonResult wr = success();
 

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdbg/ctl/JsjdbgCtl.java

@@ -807,17 +807,19 @@ public class JsjdbgCtl extends BaseWebCtl {
 		if (qtfjlist != null && qtfjlist.size() > 0) {
 			for (JsjdbgfjEntity qtfj : qtfjlist) {
 				AccessoryEntity acc = accessoryService.findOne(qtfj.getFjid());
-				JsjdbgfjVo fjvo = new JsjdbgfjVo();
-				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);
+				if (acc != null) {
+					JsjdbgfjVo fjvo = new JsjdbgfjVo();
+					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);
@@ -1011,17 +1013,19 @@ public class JsjdbgCtl extends BaseWebCtl {
 		if (qtfjlist != null && qtfjlist.size() > 0) {
 			for (JsjdbgfjEntity qtfj : qtfjlist) {
 				AccessoryEntity acc = accessoryService.findOne(qtfj.getFjid());
-				JsjdbgfjVo fjvo = new JsjdbgfjVo();
-				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);
+				if (acc != null) {
+					JsjdbgfjVo fjvo = new JsjdbgfjVo();
+					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);
@@ -1200,7 +1204,7 @@ public class JsjdbgCtl extends BaseWebCtl {
 
 	@RequestMapping(value = "/audit")
 	@ResponseBody
-	public WebJsonResult audit(String shyj, String id, boolean flag,  String fjzdids, String accids, String userids) {
+	public WebJsonResult audit(String shyj, String id, boolean flag, String fjzdids, String accids, String userids) {
 		WebJsonResult wr = success();
 		JsjdbgEntity entity = jsjdbgService.findOne(id);
 
@@ -1209,8 +1213,7 @@ public class JsjdbgCtl extends BaseWebCtl {
 			fjgt(accids, entity);
 			fjzdgt(fjzdids, entity);
 		}
-		
-		
+
 		try {
 			if (jsjdbgService.getCandidateTaskByUserAndBusKey(SecUtils.getCurrUser().getId().toString(), id) != null) {
 				jsjdbgService.claim(id, SecUtils.getCurrUser().getId().toString());
@@ -1280,37 +1283,39 @@ public class JsjdbgCtl extends BaseWebCtl {
 		}
 		return wr;
 	}
+
 	// 附件字段保存共通
-		public void fjzdgt(String fjzdids, JsjdbgEntity code) {
-			if (fjzdids != null && fjzdids != "") {
-				String[] fjidssz = fjzdids.split(",");
-				for (String fj : fjidssz) {
-					if (!StringUtils.isEmpty(fj)) {
-						// 获取前两个字符（标识位）
-						String s = fj.substring(0, 2);
-						// 去掉前两个标识位查询
-						JsjdbgfjEntity jsjdfj = jsjdbgfjService.findOne(fj.substring(2, fj.length()));
-						jsjdfj.setSsid(code.getId());
-						// 把附件标识设置成标识位+附件标识
-						jsjdfj.setFjbz(s + jsjdfj.getFjbz());
-						jsjdfj.setFbdw(jsjdfj.getFbdw());
-						jsjdfj.setFjlx("jsjdbg");
-						jsjdbgfjService.save(jsjdfj);
-					}
+	public void fjzdgt(String fjzdids, JsjdbgEntity code) {
+		if (fjzdids != null && fjzdids != "") {
+			String[] fjidssz = fjzdids.split(",");
+			for (String fj : fjidssz) {
+				if (!StringUtils.isEmpty(fj)) {
+					// 获取前两个字符（标识位）
+					String s = fj.substring(0, 2);
+					// 去掉前两个标识位查询
+					JsjdbgfjEntity jsjdfj = jsjdbgfjService.findOne(fj.substring(2, fj.length()));
+					jsjdfj.setSsid(code.getId());
+					// 把附件标识设置成标识位+附件标识
+					jsjdfj.setFjbz(s + jsjdfj.getFjbz());
+					jsjdfj.setFbdw(jsjdfj.getFbdw());
+					jsjdfj.setFjlx("jsjdbg");
+					jsjdbgfjService.save(jsjdfj);
 				}
 			}
 		}
+	}
 
-		// 附件保存共通
-		public void fjgt(String accids, JsjdbgEntity 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()));
+	// 附件保存共通
+	public void fjgt(String accids, JsjdbgEntity 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()));
+					if (acc != null) {
 						acc.setSsid(xmxxgl.getId());
 						// 把备注设置成标识位+备注
 						acc.setRemark(s + acc.getRemark());
@@ -1319,6 +1324,8 @@ public class JsjdbgCtl extends BaseWebCtl {
 				}
 			}
 		}
+	}
+
 	// 保存附件
 	@RequestMapping(value = "/saveFile")
 	@ResponseBody
@@ -1356,7 +1363,9 @@ public class JsjdbgCtl extends BaseWebCtl {
 	@ResponseBody
 	public WebJsonResult delFile(String id, Model model) {
 		AccessoryEntity acc = accessoryService.findOne(id);
-		accessoryService.delete(acc);
+		if (acc != null) {
+			accessoryService.delete(acc);
+		}
 		WebJsonResult wr = success();
 
 		return wr;

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdbg/ctl/JsjdbgdsCtl.java

@@ -851,17 +851,19 @@ public class JsjdbgdsCtl extends BaseWebCtl {
 		if (qtfjlist != null && qtfjlist.size() > 0) {
 			for (JsjdbgfjEntity qtfj : qtfjlist) {
 				AccessoryEntity acc = accessoryService.findOne(qtfj.getFjid());
-				JsjdbgfjVo fjvo = new JsjdbgfjVo();
-				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);
+				if (acc != null) {
+					JsjdbgfjVo fjvo = new JsjdbgfjVo();
+					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);
@@ -1028,17 +1030,19 @@ public class JsjdbgdsCtl extends BaseWebCtl {
 		if (qtfjlist != null && qtfjlist.size() > 0) {
 			for (JsjdbgfjEntity qtfj : qtfjlist) {
 				AccessoryEntity acc = accessoryService.findOne(qtfj.getFjid());
-				JsjdbgfjVo fjvo = new JsjdbgfjVo();
-				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);
+				if (acc != null) {
+					JsjdbgfjVo fjvo = new JsjdbgfjVo();
+					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);
@@ -1464,7 +1468,7 @@ public class JsjdbgdsCtl extends BaseWebCtl {
 		entity.setSftb(Constants.YES);
 		jsjdbgdsService.save(entity);
 
-		String url = "GK_OPERATION_JSJY_JSJDBG_ONE_CP?condition=ID=" + id ;
+		String url = "GK_OPERATION_JSJY_JSJDBG_ONE_CP?condition=ID=" + id;
 
 		boolean flag = getTbStatus(url, null);
 		if (flag) {
@@ -1488,8 +1492,10 @@ public class JsjdbgdsCtl extends BaseWebCtl {
 			for (String fj : qtfjidssz) {
 				if (!StringUtils.isEmpty(fj)) {
 					AccessoryEntity acc = accessoryService.findOne(fj);
-					acc.setSsid(code.getId());
-					accessoryService.save(acc);
+					if (acc != null) {
+						acc.setSsid(code.getId());
+						accessoryService.save(acc);
+					}
 				}
 			}
 		}