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

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdcbsj/ctl/JsjdcbsjCtl.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.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;
@@ -50,6 +51,7 @@ import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.service.GkjyrService;
 import com.xt.jygl.workflow.entity.TaskInfoEntity;
 import com.xt.jygl.workflow.service.TaskInfoService;
 import com.xt.jygl.workflow.vo.TaskInfoVo;
+import com.xtframe.core.anon.auth.RequiresPermissions;
 import com.xtframe.core.base.ctl.WebJsonResult;
 import com.xtframe.core.support.SecurityMgr;
 import com.xtframe.sec.code.entity.CodeEntity;
@@ -83,6 +85,7 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 	private JsjdcbsjfjService jsjdcbsjfjService;
 
 	@RequestMapping(value = "/main")
+	@RequiresPermissions("jsjdcbsj:main")
 	public String main(SimplePageRequest page, Model model, final HttpServletRequest request, final String xmmc, final String szgkid, final String szgqid, String menuid, final String xmhzjbid, final String xmfr, final String szdid, final String sfyzjbzid) throws JsonProcessingException {
 
 		final Map<String, Object> cacheSCmap = CacheSearchCondition.cacheSCmap(request, "xmxxgl");
@@ -257,14 +260,9 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 
 	@RequestMapping(value = "/delete")
 	@ResponseBody
+	@RequiresPermissions("jsjdcbsj:delete")
 	public WebJsonResult logicdelete(Model model, String id) {
 		WebJsonResult wr = success();
-		JsjdcbsjEntity entity = jsjdcbsjService.findOne(id);
-		if (entity.getRecordStatus() != 1 && entity.getRecordStatus() != 8 && entity.getRecordStatus() != 9) {
-			wr.setSuccess(false);
-			wr.setMessage("该项目在流程中，无法删除！");
-			return wr;
-		}
 		try {
 			// 逻辑删除
 			jsjdcbsjService.logicDelete(id);
@@ -278,7 +276,7 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 
 	@RequestMapping(value = "/submit")
 	@ResponseBody
-	public WebJsonResult submit(Model model, JsjdcbsjEntity code, String ssjyrid, String fjids, String accid, String xmlxid, String tzlxid, String xmhzjbid, String axspjbid, String szdid, String szgkid, String szgqid, String zyhbwflid) {
+	public WebJsonResult submit(Model model, JsjdcbsjEntity code, String userids, String ssjyrid, String fjids, String accid, String xmlxid, String tzlxid, String xmhzjbid, String axspjbid, String szdid, String szgkid, String szgqid, String zyhbwflid) {
 		WebJsonResult wr = success();
 		if (StringUtils.isEmpty(code.getXmmc())) {
 			wr.setSuccess(false);
@@ -381,7 +379,7 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 				} else {
 					jsjdcbsj.setAxspjb(null);
 				}
-				jsjdcbsjService.submit(jsjdcbsj);
+				jsjdcbsjService.submit(jsjdcbsj, userids);
 			} else {
 				if (!StringUtils.isEmpty(ssjyrid)) {
 					GkjyrEntity jyr = new GkjyrEntity();
@@ -425,7 +423,7 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 					axspjbdx.setId(axspjbid);
 					code.setAxspjb(axspjbdx);
 				}
-				jsjdcbsjService.submit(code);
+				jsjdcbsjService.submit(code, userids);
 			}
 			// rtx提醒
 			rtxSend("", Constants.ROLE_LD, "你有一条建设进度初步设计申请待办事务，请及时处理！");
@@ -632,6 +630,7 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 				} else {
 					jsjdcbsj.setAxspjb(null);
 				}
+				jsjdcbsj.setTbzt(Constants.NO);
 				jsjdcbsj = jsjdcbsjService.save(jsjdcbsj);
 			} else {
 				// String id = UUID.randomUUID().toString().replaceAll("-", "");
@@ -678,19 +677,9 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 					axspjbdx.setId(axspjbid);
 					code.setAxspjb(axspjbdx);
 				}
+				code.setTbzt(Constants.NO);
 				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(); }
-			 */
 		} catch (Exception e) {
 			wr.setSuccess(false);
 			wr.setMessage("操作失败！");
@@ -699,7 +688,32 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 		return wr;
 	}
 
+	@RequestMapping(value = "/saveTbzt")
+	@ResponseBody
+	public WebJsonResult saveTbzt(Model model) {
+		WebJsonResult wr = success();
+		List<JsjdcbsjEntity> lists = jsjdcbsjService.findByTbzt();
+		if (lists != null && lists.size() > 0) {
+			for (JsjdcbsjEntity entity : lists) {
+				try {
+					JsjdcbsjWebService webService = jsjdcbsjService.getWebService(GlobalData.CITY_CODE);
+					JsjdcbsjEntity jsjdcbsj = webService.saveJsjdcbsj(entity, null, null);
+					if (entity != null) {
+						jsjdcbsj.setTbzt(Constants.YES);
+						jsjdcbsj.setSftb(Constants.YES);
+						jsjdcbsjService.save(jsjdcbsj);
+					}
+				} catch (Exception e) {
+					e.printStackTrace();
+				}
+
+			}
+		}
+		return wr;
+	}
+
 	@RequestMapping(value = "/edit")
+	@RequiresPermissions("jsjdcbsj:edit")
 	public String edit(Model model, String id, String flag) {
 		model.addAttribute("flag", flag);
 		// 附件
@@ -725,6 +739,7 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 		vo.setZyhbwfl(entity.getZyhbwfl() != null ? entity.getZyhbwfl().getId() : "");
 		model.addAttribute("record", vo);
 		model.addAttribute("jyr", entity.getJyrid());
+		model.addAttribute("roleCode", Constants.ROLE_LD);
 		return "gkjsgl/jsjdcbsj/jsjdcbsjedit";
 	}
 
@@ -769,12 +784,30 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 
 		List<TaskInfoEntity> lists = taskInfoService.findByBusIdAndBusKeyAndRecordStatus(id, JsjdcbsjEntity.PROCESS_DEFINITION_KEY);
 		if (lists != null & lists.size() > 0) {
+			String roleCode = "";
 			TaskInfoEntity taskinfo = lists.get(0);
-			if ("jbrbl".equals(taskinfo.getTaskKey())) {
-				opflag = "5";
+			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())) {
+				roleCode = Constants.ROLE_KS;
+			} else if ("jbrbl".equals(taskinfo.getTaskKey())) {
+				roleCode = Constants.ROLE_JBR;
+			} else if ("kscs".equals(taskinfo.getTaskKey())) {
+
+			} else if ("fgldcs".equals(taskinfo.getTaskKey())) {
+				roleCode = Constants.ROLE_FGLD;
+			} else if ("ldcs".equals(taskinfo.getTaskKey())) {
+				roleCode = Constants.ROLE_LD;
 			} else if ("zjps".equals(taskinfo.getTaskKey())) {
-				opflag = "9";
+				roleCode = Constants.ROLE_ZJPS;
+			} else if ("cnxk".equals(taskinfo.getTaskKey())) {
+
+			} else if ("fgldsh".equals(taskinfo.getTaskKey())) {
+				roleCode = Constants.ROLE_FGLD;
 			}
+			model.addAttribute("roleCode", roleCode);
 			model.addAttribute("taskKey", taskinfo.getTaskKey());
 			model.addAttribute("opflag", opflag);
 		}
@@ -826,6 +859,7 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 	}
 
 	@RequestMapping(value = "/add")
+	@RequiresPermissions("jsjdcbsj:add")
 	public String add(Model model) {
 		UserEntity user = securityMgr.getCurrUser();
 		GkjyrEntity jyr = new GkjyrEntity();
@@ -843,6 +877,7 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 				model.addAttribute("gk", gklist.size() == 1 ? gklist.get(0).getId() : "");
 			}
 		}
+		model.addAttribute("roleCode", Constants.ROLE_LD);
 		return "gkjsgl/jsjdcbsj/jsjdcbsjadd";
 	}
 
@@ -939,19 +974,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)) {

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdcbsj/dao/JsjdcbsjDao.java

@@ -1,8 +1,13 @@
 package com.xt.jygl.gkjsgl.jsjdcbsj.dao;
 
+import java.util.List;
+
+import org.springframework.data.jpa.repository.Query;
+
 import com.xt.jygl.gkjsgl.jsjdcbsj.entity.JsjdcbsjEntity;
 import com.xtframe.sec.common.SecRepository;
 
 public interface JsjdcbsjDao extends SecRepository<JsjdcbsjEntity, String> {
-
+	@Query("SELECT m from JsjdcbsjEntity m where  m.tbzt = N and m.recordStatus<>9")
+	List<JsjdcbsjEntity> findByTbzt();
 }