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

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jgbg/ctl/JgbgCtl.java

@@ -42,6 +42,7 @@ import com.xt.jygl.gkjsgl.jgbg.entity.JgbgfjEntity;
 import com.xt.jygl.gkjsgl.jgbg.service.JgbgService;
 import com.xt.jygl.gkjsgl.jgbg.service.JgbgfjService;
 import com.xt.jygl.gkjsgl.jgbg.vo.JgbgVo;
+import com.xt.jygl.gkjsgl.jsjdcbsj.entity.JsjdcbsjEntity;
 import com.xt.jygl.gkjsgl.tzjhgl.entity.TzjhglEntity;
 import com.xt.jygl.gkjsgl.tzjhgl.service.TzjhglService;
 import com.xt.jygl.gkjsgl.xmxxgl.vo.XmxxglVo;
@@ -440,7 +441,8 @@ public class JgbgCtl extends BaseWebCtl {
 				jgbgService.submit(code);
 
 			}
-
+			// rtx提醒
+			rtxSend("", Constants.ROLE_LD, "你有一条建设进度竣工验收变更待办事务，请及时处理！");
 		} catch (Exception e) {
 			wr.setSuccess(false);
 			wr.setMessage("操作失败！");
@@ -517,7 +519,8 @@ public class JgbgCtl extends BaseWebCtl {
 				}
 				jgbg = jgbgService.save(jgbg);
 			}
-
+			// rtx提醒
+			rtxSend("", Constants.ROLE_LD, "你有一条建设进度竣工验收变更待办事务，请及时处理！");
 		} catch (Exception e) {
 			wr.setSuccess(false);
 			wr.setMessage("操作失败！");
@@ -877,6 +880,39 @@ public class JgbgCtl extends BaseWebCtl {
 	public WebJsonResult audit(String shyj, String id, boolean flag, String accid, String userids) {
 		WebJsonResult wr = success();
 		JgbgEntity entity = jgbgService.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(",");
@@ -901,6 +937,13 @@ public class JgbgCtl extends BaseWebCtl {
 					entity.setFlowstatus("1");
 				}
 				jgbgService.save(entity);
+			}else{
+				// rtx提醒
+				if (!StringUtils.isEmpty(userids)) {
+					rtxSend(userids, "", "你有一条建设进度竣工验收变更待办事务，请及时处理！");
+				} else {
+					rtxSend("", role, "你有一条建设进度竣工验收变更待办事务，请及时处理！");
+				}
 			}
 		} catch (Exception e) {
 			wr.setSuccess(false);

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

@@ -42,6 +42,7 @@ import com.xt.jygl.gkjsgl.jgsq.entity.JgsqfjEntity;
 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.jsjdcbsj.entity.JsjdcbsjEntity;
 import com.xt.jygl.gkjsgl.tzjhgl.entity.TzjhglEntity;
 import com.xt.jygl.gkjsgl.tzjhgl.service.TzjhglService;
 import com.xt.jygl.gkjsgl.xmxxgl.vo.XmxxglVo;
@@ -188,14 +189,14 @@ public class JgsqCtl extends BaseWebCtl {
 								vo.setTaskState(Constants.IS_MY_TASK);
 							}
 						}
-					}else{
-						if("1".equals(entity.getFlowstatus())){
+					} else {
+						if ("1".equals(entity.getFlowstatus())) {
 							vo.setCurrentname("退回地市");
-						}else if("2".equals(entity.getFlowstatus())){
+						} else if ("2".equals(entity.getFlowstatus())) {
 							vo.setCurrentname("完成");
 						}
 					}
-				}else if(entity.getRecordStatus() == BaseEntity.RECORD_STATE_COMPLETED){
+				} else if (entity.getRecordStatus() == BaseEntity.RECORD_STATE_COMPLETED) {
 					vo.setCurrentname("完成");
 				}
 				vo.setTzlxzw(entity.getTzlx() != null ? entity.getTzlx().getText() : "");
@@ -440,6 +441,8 @@ public class JgsqCtl extends BaseWebCtl {
 				jgsqService.submit(code);
 
 			}
+			// rtx提醒
+			rtxSend("", Constants.ROLE_LD, "你有一条建设进度竣工验收申请待办事务，请及时处理！");
 
 		} catch (Exception e) {
 			wr.setSuccess(false);
@@ -517,7 +520,8 @@ public class JgsqCtl extends BaseWebCtl {
 				}
 				jgsq = jgsqService.save(jgsq);
 			}
-
+			// rtx提醒
+			rtxSend("", Constants.ROLE_LD, "你有一条建设进度竣工验收申请待办事务，请及时处理！");
 		} catch (Exception e) {
 			wr.setSuccess(false);
 			wr.setMessage("操作失败！");
@@ -877,6 +881,39 @@ public class JgsqCtl extends BaseWebCtl {
 	public WebJsonResult audit(String shyj, String id, boolean flag, String accid, String userids) {
 		WebJsonResult wr = success();
 		JgsqEntity entity = jgsqService.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(",");
@@ -894,13 +931,20 @@ public class JgsqCtl extends BaseWebCtl {
 			}
 
 			boolean flowflag = jgsqService.changeAudit(shyj, entity, flag, userids);
-			if(flowflag){
-				if(flag){
+			if (flowflag) {
+				if (flag) {
 					entity.setFlowstatus("2");
-				}else{
+				} else {
 					entity.setFlowstatus("1");
 				}
 				jgsqService.save(entity);
+			} else {
+				// rtx提醒
+				if (!StringUtils.isEmpty(userids)) {
+					rtxSend(userids, "", "你有一条建设进度竣工验收申请待办事务，请及时处理！");
+				} else {
+					rtxSend("", role, "你有一条建设进度竣工验收申请待办事务，请及时处理！");
+				}
 			}
 		} catch (Exception e) {
 			wr.setSuccess(false);

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jgzx/ctl/JgzxCtl.java

@@ -42,6 +42,7 @@ import com.xt.jygl.gkjsgl.jgzx.entity.JgzxfjEntity;
 import com.xt.jygl.gkjsgl.jgzx.service.JgzxService;
 import com.xt.jygl.gkjsgl.jgzx.service.JgzxfjService;
 import com.xt.jygl.gkjsgl.jgzx.vo.JgzxVo;
+import com.xt.jygl.gkjsgl.jsjdcbsj.entity.JsjdcbsjEntity;
 import com.xt.jygl.gkjsgl.tzjhgl.entity.TzjhglEntity;
 import com.xt.jygl.gkjsgl.tzjhgl.service.TzjhglService;
 import com.xt.jygl.gkjsgl.xmxxgl.vo.XmxxglVo;
@@ -188,14 +189,14 @@ public class JgzxCtl extends BaseWebCtl {
 								vo.setTaskState(Constants.IS_MY_TASK);
 							}
 						}
-					}else{
-						if("1".equals(entity.getFlowstatus())){
+					} else {
+						if ("1".equals(entity.getFlowstatus())) {
 							vo.setCurrentname("退回地市");
-						}else if("2".equals(entity.getFlowstatus())){
+						} else if ("2".equals(entity.getFlowstatus())) {
 							vo.setCurrentname("完成");
 						}
 					}
-				}else if(entity.getRecordStatus() == BaseEntity.RECORD_STATE_COMPLETED){
+				} else if (entity.getRecordStatus() == BaseEntity.RECORD_STATE_COMPLETED) {
 					vo.setCurrentname("完成");
 				}
 				vo.setTzlxzw(entity.getTzlx() != null ? entity.getTzlx().getText() : "");
@@ -440,7 +441,8 @@ public class JgzxCtl extends BaseWebCtl {
 				jgzxService.submit(code);
 
 			}
-
+			// rtx提醒
+			rtxSend("", Constants.ROLE_LD, "你有一条建设进度竣工验收注销待办事务，请及时处理！");
 		} catch (Exception e) {
 			wr.setSuccess(false);
 			wr.setMessage("操作失败！");
@@ -517,7 +519,8 @@ public class JgzxCtl extends BaseWebCtl {
 				}
 				jgzx = jgzxService.save(jgzx);
 			}
-
+			// rtx提醒
+			rtxSend("", Constants.ROLE_LD, "你有一条建设进度竣工验收注销待办事务，请及时处理！");
 		} catch (Exception e) {
 			wr.setSuccess(false);
 			wr.setMessage("操作失败！");
@@ -877,6 +880,40 @@ public class JgzxCtl extends BaseWebCtl {
 	public WebJsonResult audit(String shyj, String id, boolean flag, String accid, String userids) {
 		WebJsonResult wr = success();
 		JgzxEntity entity = jgzxService.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(",");
@@ -894,13 +931,20 @@ public class JgzxCtl extends BaseWebCtl {
 			}
 
 			boolean flowflag = jgzxService.changeAudit(shyj, entity, flag, userids);
-			if(flowflag){
-				if(flag){
+			if (flowflag) {
+				if (flag) {
 					entity.setFlowstatus("2");
-				}else{
+				} else {
 					entity.setFlowstatus("1");
 				}
 				jgzxService.save(entity);
+			} else {
+				// rtx提醒
+				if (!StringUtils.isEmpty(userids)) {
+					rtxSend(userids, "", "你有一条建设进度竣工验收注销待办事务，请及时处理！");
+				} else {
+					rtxSend("", role, "你有一条建设进度竣工验收注销待办事务，请及时处理！");
+				}
 			}
 		} catch (Exception e) {
 			wr.setSuccess(false);

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

@@ -42,6 +42,7 @@ import com.xt.jygl.gkjsgl.jsjdbg.entity.JsjdbgfjEntity;
 import com.xt.jygl.gkjsgl.jsjdbg.service.JsjdbgService;
 import com.xt.jygl.gkjsgl.jsjdbg.service.JsjdbgfjService;
 import com.xt.jygl.gkjsgl.jsjdbg.vo.JsjdbgVo;
+import com.xt.jygl.gkjsgl.jsjdcbsj.entity.JsjdcbsjEntity;
 import com.xt.jygl.gkjsgl.tzjhgl.entity.TzjhglEntity;
 import com.xt.jygl.gkjsgl.tzjhgl.service.TzjhglService;
 import com.xt.jygl.gkjsgl.xmxxgl.vo.XmxxglVo;
@@ -188,14 +189,14 @@ public class JsjdbgCtl extends BaseWebCtl {
 								vo.setTaskState(Constants.IS_MY_TASK);
 							}
 						}
-					}else{
-						if("1".equals(entity.getFlowstatus())){
+					} else {
+						if ("1".equals(entity.getFlowstatus())) {
 							vo.setCurrentname("退回地市");
-						}else if("2".equals(entity.getFlowstatus())){
+						} else if ("2".equals(entity.getFlowstatus())) {
 							vo.setCurrentname("完成");
 						}
 					}
-				}else if(entity.getRecordStatus() == BaseEntity.RECORD_STATE_COMPLETED){
+				} else if (entity.getRecordStatus() == BaseEntity.RECORD_STATE_COMPLETED) {
 					vo.setCurrentname("完成");
 				}
 				vo.setTzlxzw(entity.getTzlx() != null ? entity.getTzlx().getText() : "");
@@ -438,9 +439,9 @@ public class JsjdbgCtl extends BaseWebCtl {
 					code.setAxspjb(axspjbdx);
 				}
 				jsjdbgService.submit(code);
-
 			}
-
+			// rtx提醒
+			rtxSend("", Constants.ROLE_LD, "你有一条建设进度初步设计变更待办事务，请及时处理！");
 		} catch (Exception e) {
 			wr.setSuccess(false);
 			wr.setMessage("操作失败！");
@@ -517,7 +518,7 @@ public class JsjdbgCtl extends BaseWebCtl {
 				}
 				jsjdbg = jsjdbgService.save(jsjdbg);
 			}
-
+		
 		} catch (Exception e) {
 			wr.setSuccess(false);
 			wr.setMessage("操作失败！");
@@ -528,6 +529,8 @@ public class JsjdbgCtl extends BaseWebCtl {
 				jsjdbgService.claim(jsjdbg.getId(), SecUtils.getCurrUser().getId().toString());
 			}
 			jsjdbgService.changeAudit(null, jsjdbg, true, null);
+			// rtx提醒
+			rtxSend("", Constants.ROLE_LD, "你有一条建设进度初步设计变更待办事务，请及时处理！");
 		} catch (Exception e) {
 			wr.setSuccess(false);
 			wr.setMessage("操作失败！");
@@ -877,6 +880,39 @@ public class JsjdbgCtl extends BaseWebCtl {
 	public WebJsonResult audit(String shyj, String id, boolean flag, String accid, String userids) {
 		WebJsonResult wr = success();
 		JsjdbgEntity entity = jsjdbgService.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(",");
@@ -894,13 +930,20 @@ public class JsjdbgCtl extends BaseWebCtl {
 			}
 
 			boolean flowflag = jsjdbgService.changeAudit(shyj, entity, flag, userids);
-			if(flowflag){
-				if(flag){
+			if (flowflag) {
+				if (flag) {
 					entity.setFlowstatus("2");
-				}else{
+				} else {
 					entity.setFlowstatus("1");
 				}
 				jsjdbgService.save(entity);
+			}else{
+				// rtx提醒
+				if (!StringUtils.isEmpty(userids)) {
+					rtxSend(userids, "", "你有一条建设进度初步设计变更待办事务，请及时处理！");
+				} else {
+					rtxSend("", role, "你有一条建设进度初步设计变更待办事务，请及时处理！");
+				}
 			}
 		} catch (Exception e) {
 			wr.setSuccess(false);

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

@@ -6,7 +6,6 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
-import java.util.UUID;
 
 import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
@@ -38,7 +37,6 @@ import com.xt.jygl.common.GlobalData;
 import com.xt.jygl.gkjcxx.gk.entity.GkEntity;
 import com.xt.jygl.gkjcxx.gk.service.GkService;
 import com.xt.jygl.gkjcxx.gq.entity.GqEntity;
-import com.xt.jygl.gkjsgl.jsjdcbsj.client.JsjdcbsjWebService;
 import com.xt.jygl.gkjsgl.jsjdcbsj.entity.JsjdcbsjEntity;
 import com.xt.jygl.gkjsgl.jsjdcbsj.entity.JsjdcbsjfjEntity;
 import com.xt.jygl.gkjsgl.jsjdcbsj.service.JsjdcbsjService;
@@ -428,9 +426,9 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 					code.setAxspjb(axspjbdx);
 				}
 				jsjdcbsjService.submit(code);
-
 			}
-
+			// rtx提醒
+			rtxSend("", Constants.ROLE_LD, "你有一条建设进度初步设计申请待办事务，请及时处理！");
 		} catch (Exception e) {
 			wr.setSuccess(false);
 			wr.setMessage("操作失败！");
@@ -518,6 +516,8 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 				jsjdcbsjService.claim(jsjdcbsj.getId(), SecUtils.getCurrUser().getId().toString());
 			}
 			jsjdcbsjService.changeAudit(null, jsjdcbsj, true, null);
+			// rtx提醒
+			rtxSend("", Constants.ROLE_LD, "你有一条建设进度初步设计申请待办事务，请及时处理！");
 		} catch (Exception e) {
 			wr.setSuccess(false);
 			wr.setMessage("操作失败！");
@@ -634,8 +634,8 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 				}
 				jsjdcbsj = jsjdcbsjService.save(jsjdcbsj);
 			} else {
-				//String id = UUID.randomUUID().toString().replaceAll("-", "");
-				//code.setId(id);
+				// String id = UUID.randomUUID().toString().replaceAll("-", "");
+				// code.setId(id);
 				if (!StringUtils.isEmpty(ssjyrid)) {
 					GkjyrEntity jyr = new GkjyrEntity();
 					jyr.setId(ssjyrid);
@@ -681,20 +681,16 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 				jsjdcbsj = jsjdcbsjService.save(code);
 			}
 			// 如果是市级新增或者修改，保存后同步到省级
-			try {
-
-				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)) {
-
-					JsjdcbsjWebService webService = jsjdcbsjService.getWebService(null);
-
-					
-					webService.saveJsjdcbsj(jsjdcbsj, null, null);
-					jsjdcbsj.setTbzt("Y");
-					jsjdcbsjService.save(jsjdcbsj);
-				}
-			} catch (Exception e) {
-				e.printStackTrace();
-			}
+			/*
+			 * try {
+			 * 
+			 * if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)) {
+			 * JsjdcbsjWebService webService =
+			 * jsjdcbsjService.getWebService(null);
+			 * webService.saveJsjdcbsj(jsjdcbsj, null, null);
+			 * jsjdcbsj.setTbzt("Y"); jsjdcbsjService.save(jsjdcbsj); } } catch
+			 * (Exception e) { e.printStackTrace(); }
+			 */
 		} catch (Exception e) {
 			wr.setSuccess(false);
 			wr.setMessage("操作失败！");
@@ -883,6 +879,41 @@ 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(",");
@@ -908,23 +939,25 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 				}
 				entity = jsjdcbsjService.save(entity);
 				// 如果是省级审核通过或不通过后同步到市级
-				try {
-					JsjdcbsjWebService webService = jsjdcbsjService.getWebService(null);
-					List<JsjdcbsjfjEntity> fjlist = jsjdcbsjfjService.findBySsid(id);
-					List<AccessoryEntity> lists= new ArrayList<AccessoryEntity>();
-					if (fjlist != null && fjlist.size() > 0) {
-						for(JsjdcbsjfjEntity fj:fjlist){
-							AccessoryEntity acc = accessoryService.findOne(fj.getFjid());
-							if(acc != null){
-								lists.add(acc);
-							}
-						}
-					}
-					webService.saveJsjdcbsj(entity,fjlist,lists);
-					entity.setTbzt("Y");
-					jsjdcbsjService.save(entity);
-				} catch (Exception e) {
-					e.printStackTrace();
+				/*
+				 * try { JsjdcbsjWebService webService =
+				 * jsjdcbsjService.getWebService(null); List<JsjdcbsjfjEntity>
+				 * fjlist = jsjdcbsjfjService.findBySsid(id);
+				 * List<AccessoryEntity> lists = new
+				 * ArrayList<AccessoryEntity>(); if (fjlist != null &&
+				 * fjlist.size() > 0) { for (JsjdcbsjfjEntity fj : fjlist) {
+				 * AccessoryEntity acc = accessoryService.findOne(fj.getFjid());
+				 * if (acc != null) { lists.add(acc); } } }
+				 * webService.saveJsjdcbsj(entity, fjlist, lists);
+				 * entity.setTbzt("Y"); jsjdcbsjService.save(entity); } catch
+				 * (Exception e) { e.printStackTrace(); }
+				 */
+			} else {
+				// rtx提醒
+				if (!StringUtils.isEmpty(userids)) {
+					rtxSend(userids, "", "你有一条建设进度初步设计申请待办事务，请及时处理！");
+				} else {
+					rtxSend("", role, "你有一条建设进度初步设计申请待办事务，请及时处理！");
 				}
 			}
 		} catch (Exception e) {

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdcbsj/service/impl/JsjdcbsjServiceImpl.java

@@ -59,9 +59,9 @@ public class JsjdcbsjServiceImpl extends BaseWorkFlowServiceImpl<JsjdcbsjEntity,
 			entity = this.save(entity);
 			Map<String, Object> variables = new HashMap<String, Object>();
 			variables.put("role_ld", Constants.ROLE_LD);
-			variables.put("role_fgld", Constants.ROLE_LD);
-			variables.put("role_ks", Constants.ROLE_LD);
-			variables.put("role_jbr", Constants.ROLE_LD);
+			variables.put("role_fgld", Constants.ROLE_FGLD);
+			variables.put("role_ks", Constants.ROLE_KS);
+			variables.put("role_jbr", Constants.ROLE_JBR);
 			WorkFlowParam param = new WorkFlowParam();
 			param.put(WorkFlowParam.DESCRIPTION, entity.getXmmc() + "的项目建设初步设计");
 

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdzx/ctl/JsjdzxCtl.java

@@ -37,6 +37,7 @@ import com.xt.jygl.common.GlobalData;
 import com.xt.jygl.gkjcxx.gk.entity.GkEntity;
 import com.xt.jygl.gkjcxx.gk.service.GkService;
 import com.xt.jygl.gkjcxx.gq.entity.GqEntity;
+import com.xt.jygl.gkjsgl.jsjdcbsj.entity.JsjdcbsjEntity;
 import com.xt.jygl.gkjsgl.jsjdzx.entity.JsjdzxEntity;
 import com.xt.jygl.gkjsgl.jsjdzx.entity.JsjdzxfjEntity;
 import com.xt.jygl.gkjsgl.jsjdzx.service.JsjdzxService;
@@ -188,14 +189,14 @@ public class JsjdzxCtl extends BaseWebCtl {
 								vo.setTaskState(Constants.IS_MY_TASK);
 							}
 						}
-					}else{
-						if("1".equals(entity.getFlowstatus())){
+					} else {
+						if ("1".equals(entity.getFlowstatus())) {
 							vo.setCurrentname("退回地市");
-						}else if("2".equals(entity.getFlowstatus())){
+						} else if ("2".equals(entity.getFlowstatus())) {
 							vo.setCurrentname("完成");
 						}
 					}
-				}else if(entity.getRecordStatus() == BaseEntity.RECORD_STATE_COMPLETED){
+				} else if (entity.getRecordStatus() == BaseEntity.RECORD_STATE_COMPLETED) {
 					vo.setCurrentname("完成");
 				}
 				vo.setTzlxzw(entity.getTzlx() != null ? entity.getTzlx().getText() : "");
@@ -438,9 +439,9 @@ public class JsjdzxCtl extends BaseWebCtl {
 					code.setAxspjb(axspjbdx);
 				}
 				jsjdzxService.submit(code);
-
 			}
-
+			// rtx提醒
+			rtxSend("", Constants.ROLE_LD, "你有一条建设进度初步设计注销待办事务，请及时处理！");
 		} catch (Exception e) {
 			wr.setSuccess(false);
 			wr.setMessage("操作失败！");
@@ -517,7 +518,8 @@ public class JsjdzxCtl extends BaseWebCtl {
 				}
 				jsjdzx = jsjdzxService.save(jsjdzx);
 			}
-
+			// rtx提醒
+			rtxSend("", Constants.ROLE_LD, "你有一条建设进度初步设计注销待办事务，请及时处理！");
 		} catch (Exception e) {
 			wr.setSuccess(false);
 			wr.setMessage("操作失败！");
@@ -877,6 +879,40 @@ public class JsjdzxCtl extends BaseWebCtl {
 	public WebJsonResult audit(String shyj, String id, boolean flag, String accid, String userids) {
 		WebJsonResult wr = success();
 		JsjdzxEntity entity = jsjdzxService.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(",");
@@ -894,13 +930,20 @@ public class JsjdzxCtl extends BaseWebCtl {
 			}
 
 			boolean flowflag = jsjdzxService.changeAudit(shyj, entity, flag, userids);
-			if(flowflag){
-				if(flag){
+			if (flowflag) {
+				if (flag) {
 					entity.setFlowstatus("2");
-				}else{
+				} else {
 					entity.setFlowstatus("1");
 				}
 				jsjdzxService.save(entity);
+			} else {
+				// rtx提醒
+				if (!StringUtils.isEmpty(userids)) {
+					rtxSend(userids, "", "你有一条建设进度初步设计注销待办事务，请及时处理！");
+				} else {
+					rtxSend("", role, "你有一条建设进度初步设计注销待办事务，请及时处理！");
+				}
 			}
 		} catch (Exception e) {
 			wr.setSuccess(false);