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

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

@@ -695,13 +695,14 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 		List<JsjdcbsjEntity> lists = jsjdcbsjService.findByTbzt();
 		if (lists != null && lists.size() > 0) {
 			for (JsjdcbsjEntity entity : lists) {
+				entity.setTbzt(Constants.YES);
+				jsjdcbsjService.save(entity);
 				try {
-					JsjdcbsjWebService webService = jsjdcbsjService.getWebService(GlobalData.CITY_CODE);
+					JsjdcbsjWebService webService = jsjdcbsjService.getWebService(null);
 					JsjdcbsjEntity jsjdcbsj = webService.saveJsjdcbsj(entity, null, null);
-					if (entity != null) {
-						jsjdcbsj.setTbzt(Constants.YES);
-						jsjdcbsj.setSftb(Constants.YES);
-						jsjdcbsjService.save(jsjdcbsj);
+					if (jsjdcbsj != null) {
+						entity.setSftb(Constants.YES);
+						jsjdcbsjService.save(entity);
 					}
 				} catch (Exception e) {
 					e.printStackTrace();
@@ -914,41 +915,6 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 	public WebJsonResult audit(String shyj, String id, boolean flag, String accid, String userids) {
 		WebJsonResult wr = success();
 		JsjdcbsjEntity entity = jsjdcbsjService.findOne(id);
-		String role = "";
-		try {
-
-			List<TaskInfoEntity> list = taskInfoService.findByBusIdAndBusKeyAndRecordStatus(id, JsjdcbsjEntity.PROCESS_DEFINITION_KEY);
-			if (list != null & list.size() > 0) {
-				TaskInfoEntity taskinfo = list.get(0);
-				if ("ldbl".equals(taskinfo.getTaskKey())) {
-					role = Constants.ROLE_FGLD;
-				} else if ("fgldbl".equals(taskinfo.getTaskKey())) {
-					role = Constants.ROLE_KS;
-				} else if ("ksbl".equals(taskinfo.getTaskKey())) {
-					role = Constants.ROLE_JBR;
-				} else if ("jbrbl".equals(taskinfo.getTaskKey())) {
-
-				} else if ("kscs".equals(taskinfo.getTaskKey())) {
-					role = Constants.ROLE_FGLD;
-				} else if ("fgldcs".equals(taskinfo.getTaskKey())) {
-					role = Constants.ROLE_LD;
-				} else if ("ldcs".equals(taskinfo.getTaskKey())) {
-					role = Constants.ROLE_ZJPS;
-				} else if ("zjps".equals(taskinfo.getTaskKey())) {
-
-				} else if ("cnxk".equals(taskinfo.getTaskKey())) {
-					role = Constants.ROLE_FGLD;
-				} else if ("fgldsh".equals(taskinfo.getTaskKey())) {
-					role = Constants.ROLE_LD;
-				}
-			}
-
-		} catch (Exception e) {
-			wr.setSuccess(false);
-			wr.setMessage("操作失败！");
-			e.printStackTrace();
-		}
-
 		if (!StringUtils.isEmpty(accid)) {
 			// 关联附件
 			String[] ssids = accid.split(",");
@@ -965,6 +931,16 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 				jsjdcbsjService.claim(id, SecUtils.getCurrUser().getId().toString());
 			}
 
+			if (!flag) {
+				List<TaskInfoEntity> slist = taskInfoService.findByBusIdAndBusKeyOrderByIdAsc(id, JsjdcbsjEntity.PROCESS_DEFINITION_KEY);
+				for (int i = 0; i < slist.size(); i++) {
+					TaskInfoEntity taskentity = slist.get(i);
+					if ("zjps".equals(taskentity.getTaskKey())) {
+						userids = taskentity.getAuditUser()+",";
+					}
+				}
+			}
+
 			boolean flowflag = jsjdcbsjService.changeAudit(shyj, entity, flag, userids);
 			if (flowflag) {
 				if (flag) {// 流程完成状态 2.审核通过1.退回地市
@@ -986,9 +962,11 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 							}
 						}
 					}
-					webService.saveJsjdcbsj(entity, fjlist, lists);
-					entity.setTbzt("Y");
-					jsjdcbsjService.save(entity);
+					JsjdcbsjEntity newEntity = webService.saveJsjdcbsj(entity, fjlist, lists);
+					if (newEntity != null) {
+						entity.setTbzt("Y");
+						jsjdcbsjService.save(entity);
+					}
 				} catch (Exception e) {
 					e.printStackTrace();
 				}
@@ -997,8 +975,6 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 				// rtx提醒
 				if (!StringUtils.isEmpty(userids)) {
 					rtxSend(userids, "", "你有一条建设进度初步设计申请待办事务，请及时处理！");
-				} else {
-					rtxSend("", role, "你有一条建设进度初步设计申请待办事务，请及时处理！");
 				}
 			}
 		} catch (Exception e) {