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

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gklhxkgl/gkjylhbg/ctl/LhbgCtl.java

@@ -250,10 +250,6 @@ public class LhbgCtl extends BaseWebCtl {
 			} else {
 				code.setId(null);
 				code.setSqrq(new Date());
-				lhbgEntity.setYbgdz(code.getYbgdz());
-				lhbgEntity.setYfddbr(code.getYfddbr());
-				lhbgEntity.setXbgdz(code.getXbgdz());
-				lhbgEntity.setXfddbr(code.getXfddbr());
 				GkjyrEntity jyr = gkjyrService.findOne(code.getJyrid());
 				if (jyr != null) {
 					code.setSzgk(jyr.getSzgk());
@@ -371,10 +367,7 @@ public class LhbgCtl extends BaseWebCtl {
 		try {
 			// 逻辑删除
 			lhbgService.logicDelete(id);
-			LhbgEntity entity = lhbgService.findOne(id);
-			GkjyrEntity gkjyr = gkjyrService.findOne(entity.getJyrid());
-			gkjyr.setRecordStatus(BaseEntity.RECORD_STATE_VALID);
-			gkjyrService.save(gkjyr);
+			
 		} catch (Exception e) {
 			wr.setSuccess(false);
 			wr.setMessage("操作失败！");

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gklhxkgl/gkjylhsq/ctl/LhsqCtl.java

@@ -1,20 +1,17 @@
 package com.xt.jygl.gkjygl.gklhxkgl.gkjylhsq.ctl;
 
-import java.text.ParseException;
+import java.io.File;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.Map;
 
 import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaBuilder.In;
 import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
 import javax.servlet.http.HttpServletRequest;
-
-import net.sf.json.JSONObject;
+import javax.servlet.http.HttpServletResponse;
 
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,25 +20,34 @@ import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestMapping;
-
-import cache.CacheSearchCondition;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.multipart.MultipartFile;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
+import com.xt.jygl.accessory.entity.AccessoryEntity;
+import com.xt.jygl.accessory.service.AccessoryService;
 import com.xt.jygl.common.BaseWebCtl;
-import com.xt.jygl.common.SearchCondition;
-import com.xt.jygl.common.Utils;
+import com.xt.jygl.common.Constants;
 import com.xt.jygl.gkjcxx.gq.service.GqService;
 import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.entity.GkjyrEntity;
 import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.service.GkjyrService;
+import com.xt.jygl.gkjygl.gkjyr.xkzxx.entity.XkzxxEntity;
+import com.xt.jygl.gkjygl.gkjyr.xkzxx.service.XkzxxService;
 import com.xt.jygl.gkjygl.gklhxkgl.gkjylhsq.entity.LhsqEntity;
+import com.xt.jygl.gkjygl.gklhxkgl.gkjylhsq.entity.LhsqfjEntity;
 import com.xt.jygl.gkjygl.gklhxkgl.gkjylhsq.service.LhsqService;
+import com.xt.jygl.gkjygl.gklhxkgl.gkjylhsq.service.LhsqfjService;
 import com.xt.jygl.gkjygl.gklhxkgl.gkjylhsq.vo.LhsqVo;
+import com.xt.jygl.gkjygl.gklhxkgl.gkjylhyx.entity.LhyxEntity;
+import com.xt.jygl.workflow.entity.TaskInfoEntity;
 import com.xt.jygl.workflow.service.TaskInfoService;
 import com.xtframe.core.base.ctl.WebJsonResult;
 import com.xtframe.sec.common.BaseEntity;
 import com.xtframe.sec.common.SimplePageRequest;
 import com.xtframe.sec.user.entity.UserEntity;
 import com.xtframe.sec.utils.SecUtils;
+import com.xtframe.util.DateTime;
 import com.xtframe.util.StringUtils;
 
 @Controller
@@ -50,15 +56,20 @@ public class LhsqCtl extends BaseWebCtl {
 	@Autowired
 	private LhsqService lhsqService;
 	@Autowired
+	private LhsqfjService lhsqfjService;
+	@Autowired
 	private TaskInfoService taskInfoService;
 	@Autowired
 	private GkjyrService gkjyrService;
 	@Autowired
 	private GqService gqService;
+	@Autowired
+	private XkzxxService xkzxxService;
+	@Autowired
+	private AccessoryService accessoryService;
 
 	@RequestMapping(value = "/main")
-	// @RequiresPermissions("gklhxkgl:main")
-	public String main(SimplePageRequest page, Model model, final HttpServletRequest request, final String szdid, final String szgkid, final String szgqid, final String gkjyr, final String fddbr, final String sqrdz, String menuid) throws JsonProcessingException {
+	public String main(SimplePageRequest page, Model model, final String lczt, final String szdid, final String szgkid, final String szgqid, final String gkjyr, final String fddbr, final String bgdd, String menuid) throws JsonProcessingException {
 		UserEntity user = securityMgr.getCurrUser();
 		GkjyrEntity jyr = new GkjyrEntity();
 		if (!StringUtils.isEmpty(user.getSsjyr())) {
@@ -66,143 +77,36 @@ public class LhsqCtl extends BaseWebCtl {
 			model.addAttribute("jyr", jyr);
 		}
 		model.addAttribute("user", user);
-		final Map<String, Object> cacheSCmap = CacheSearchCondition.cacheSCmap(request, "lhxkgl");
 
-		final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 		// 查询条件
 		Specification<LhsqEntity> spec = new Specification<LhsqEntity>() {
-
 			@Override
 			public Predicate toPredicate(Root<LhsqEntity> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
 				List<Predicate> list = new ArrayList<Predicate>();
 				if (StringUtils.isNotEmpty(szdid)) {
 					list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + szdid + "%"));
-				} else if (isGET(request)) {
-					String v = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "szdid");
-					if (StringUtils.isNotEmpty(v)) {
-						list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + v + "%"));
-					}
 				}
-				// else if (StringUtils.isNotEmpty(SearchCondition.xkzsqszdid)
-				// && isGET(request)) {
-				// list.add(cb.like(root.get("szd").get("id").as(String.class),
-				// "%" + SearchCondition.xkzsqszdid + "%"));
-				// }
 				if (StringUtils.isNotEmpty(szgkid)) {
 					list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + szgkid + "%"));
-				} else if (isGET(request)) {
-					String v = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "szgkid");
-					if (StringUtils.isNotEmpty(v)) {
-						list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + v + "%"));
-					}
 				}
-				// else if (StringUtils.isNotEmpty(SearchCondition.xkzsqszgkid)
-				// && isGET(request)) {
-				// list.add(cb.like(root.get("szgk").get("id").as(String.class),
-				// "%" + SearchCondition.xkzsqszgkid + "%"));
-				// }
 				if (StringUtils.isNotEmpty(szgqid)) {
 					list.add(cb.like(root.get("szgq").get("id").as(String.class), "%" + szgqid + "%"));
-				} else if (isGET(request)) {
-					String v = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "szgqid");
-					if (StringUtils.isNotEmpty(v)) {
-						list.add(cb.like(root.get("szgq").get("id").as(String.class), "%" + v + "%"));
-					}
 				}
-				// else if (StringUtils.isNotEmpty(SearchCondition.xkzsqszgqid)
-				// && isGET(request)) {
-				// list.add(cb.like(root.get("szgq").get("id").as(String.class),
-				// "%" + SearchCondition.xkzsqszgqid + "%"));
-				// }
 				if (StringUtils.isNotEmpty(gkjyr)) {
 					list.add(cb.like(root.get("jyrmc").as(String.class), "%" + gkjyr + "%"));
-				} else if (isGET(request)) {
-					String v = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "gkjyr");
-					if (StringUtils.isNotEmpty(v)) {
-						list.add(cb.like(root.get("jyrmc").as(String.class), "%" + v + "%"));
-					}
 				}
-				// else if (StringUtils.isNotEmpty(SearchCondition.xkzsqgkjyr)
-				// && isGET(request)) {
-				// list.add(cb.like(root.get("jyrmc").as(String.class), "%" +
-				// SearchCondition.xkzsqgkjyr + "%"));
-				// }
 				if (StringUtils.isNotEmpty(fddbr)) {
 					list.add(cb.like(root.get("fddbr").as(String.class), "%" + fddbr + "%"));
-				} else if (isGET(request)) {
-					String v = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "fddbr");
-					if (StringUtils.isNotEmpty(v)) {
-						list.add(cb.like(root.get("fddbr").as(String.class), "%" + v + "%"));
-					}
-				}
-				// else if (StringUtils.isNotEmpty(SearchCondition.xkzsqfddbr)
-				// && isGET(request)) {
-				// list.add(cb.like(root.get("fddbr").as(String.class), "%" +
-				// SearchCondition.xkzsqfddbr + "%"));
-				// }
-				if (StringUtils.isNotEmpty(sqrdz)) {
-					list.add(cb.like(root.get("sqrdz").as(String.class), "%" + sqrdz + "%"));
-				} else if (isGET(request)) {
-					String v = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "sqrdz");
-					if (StringUtils.isNotEmpty(v)) {
-						list.add(cb.like(root.get("sqrdz").as(String.class), "%" + v + "%"));
-					}
 				}
-				// else if (StringUtils.isNotEmpty(SearchCondition.xkzsqbgdd) &&
-				// isGET(request)) {
-				// list.add(cb.like(root.get("bgdd").as(String.class), "%" +
-				// SearchCondition.xkzsqbgdd + "%"));
-				// }
-				// 经营人只能查看自己企业下的数据，非经营人只能查看自己所在地的数据
-				if (isJyr()) {
-					list.add(cb.like(root.get("jyrid").as(String.class), "%" + getSsjyr().getId() + "%"));
-				} else {
-					In<String> in = cb.in(root.get("szgq").get("id").as(String.class));
-					@SuppressWarnings("unchecked")
-					List<String> gqlist = (List<String>) Utils.getSession().getAttribute("gqList");
-					if (gqlist != null && gqlist.size() > 0) {
-						for (int i = 0; i < gqlist.size(); i++) {
-							in.value(gqlist.get(i));
-						}
-						list.add(in);
-					}
-					// list.add(cb.like(root.get("szd").get("id").as(String.class),
-					// "%" + SecUtils.getCurrUser().getSzd().getId() + "%"));
+				if (StringUtils.isNotEmpty(bgdd)) {
+					list.add(cb.like(root.get("bgdd").as(String.class), "%" + bgdd + "%"));
 				}
+
 				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_DELETE));
 
 				return cb.and(list.toArray(new Predicate[] {}));
 			}
 		};
-		// 判断登录用户是否和上次登录用户相同，若不同则清空查询条件
-		String user1 = (String) Utils.getSession().getAttribute("userpre");
-		String user2 = SecUtils.getCurrUser().getId();
-		if (user2 != null) {
-			if (!user2.equals(user1)) {
-				SearchCondition.lhxkglpage = 1;
-				SearchCondition.lhxkglsqrdz = "";
-				SearchCondition.lhxkglfddbr = "";
-				SearchCondition.lhxkglgkjyr = "";
-				SearchCondition.lhxkglszdid = "";
-				SearchCondition.lhxkglszgkid = "";
-				SearchCondition.lhxkglszgqid = "";
-			}
-
-		}
-		Utils.getSession().setAttribute("userpre", user2);
-
-		// if (page.getPage() < 1) {
-		// page.setPage(SearchCondition.xkzsqpage);
-		// }
-		if (page.getPage() < 1) {
-			Object lhxkglpage = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "lhxkglpage");
-			if (StringUtils.isEmpty(lhxkglpage) || !org.apache.commons.lang.StringUtils.isNumeric(String.valueOf(lhxkglpage))) {
-				lhxkglpage = "1";
-			}
-			page.setPage(Integer.valueOf(String.valueOf(lhxkglpage)));
-		}
-		page.setSort("createDateTime");
-		page.setOrder("desc");
 		Page<LhsqEntity> list = query.findAll(spec, toPageRequest(page), LhsqEntity.class);
 		List<LhsqVo> voList = new ArrayList<LhsqVo>();
 		for (LhsqEntity entity : list) {
@@ -210,44 +114,135 @@ public class LhsqCtl extends BaseWebCtl {
 			if (entity != null) {
 				BeanUtils.copyProperties(entity, vo);
 				if (entity.getRecordStatus() != 9) {
+					if ((lhsqService.getTaskByUserAndBusKey(SecUtils.getCurrUser().getId().toString(), entity.getId().toString()) != null) || lhsqService.getCandidateTaskByUserAndBusKey(SecUtils.getCurrUser().getId().toString(), entity.getId().toString()) != null) {
+						List<TaskInfoEntity> lists = taskInfoService.findByBusIdAndBusKeyAndRecordStatus(entity.getId(), LhsqEntity.PROCESS_DEFINITION_KEY);
+						if (lists != null & lists.size() > 0) {
+							TaskInfoEntity taskinfo = lists.get(0);
+							if ("申请".equals(taskinfo.getCurrName())) {
+								vo.setTaskState("TH");
+							} else {
+								vo.setTaskState(Constants.IS_MY_TASK);
+							}
+						}
+					}
 					voList.add(vo);
 				}
 			}
 		}
-		if (isPOST(request)) {
-			cacheSCmap.put("xkzsqpage", page.getPage());
-			CacheSearchCondition.putCacheSCmap(request.getParameterMap(), cacheSCmap);
-			System.out.println(JSONObject.fromObject(cacheSCmap));
-		}
-		System.out.println(isPOST(request));
+		model.addAttribute("lczt", lczt);
+		model.addAttribute("gkjyr", gkjyr);
+		model.addAttribute("fddbr", fddbr);
+		model.addAttribute("bgdd", bgdd);
 		model.addAttribute("list", voList);
 		model.addAttribute("menuid", menuid);
-		model.addAttribute("gkjyr", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "gkjyr"));
-		model.addAttribute("szgq", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "szgqid"));
-		model.addAttribute("szd", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "szdid"));
-		model.addAttribute("szgk", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "szgkid"));
-		model.addAttribute("fddbr", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "fddbr"));
-		model.addAttribute("sqrdz", CacheSearchCondition.cacheSCmapVal(cacheSCmap, "sqrdz"));
-
 		// 翻页共通
 		putPageInfo(model, page, list);
 		return "gkjygl/gklhxkgl/gkjylhsq/lhsqmain";
+	}
 
+	// 新增
+	@RequestMapping(value = "/add")
+	public String add(Model model) {
+		UserEntity user = securityMgr.getCurrUser();
+		GkjyrEntity jyr = new GkjyrEntity();
+		if (user.getSsjyr() != null) {
+			jyr = gkjyrService.findOne(user.getSsjyr().getId());
+			List<XkzxxEntity> xkzs = xkzxxService.findByJyrid(jyr.getId());
+			for (XkzxxEntity xkz : xkzs) {
+				if (BaseEntity.RECORD_STATE_VALID == xkz.getRecordStatus() && Constants.XKZ_SX.equals(xkz.getSfyx())) {
+					model.addAttribute("yxrq", DateTime.toString(xkz.getYxqz()));
+				}
+			}
+		}
+		model.addAttribute("gkjyr", jyr);
+		// 时间
+		SimpleDateFormat data = new SimpleDateFormat("yyyy");
+		String nfstr = data.format(new Date());
+		int nf = Integer.parseInt(nfstr);
+		nf = nf - 1;
+		model.addAttribute("oneyear", nf);
+		nf = nf - 1;
+		model.addAttribute("twoyear", nf);
+
+		return "gkjygl/gklhxkgl/gkjylhsq/lhsqadd";
 	}
 
-	// 删除
-	@RequestMapping(value = "/delete")
-	// @ResponseBody
-	// @RequiresPermissions("gklhxkgl:delete")
-	public WebJsonResult logicdelete(Model model, String id) {
+	// 新增
+	@RequestMapping(value = "/edit")
+	public String edit(Model model, String id, String flag) {
+		model.addAttribute("flag", flag);
+		LhsqEntity lhsq = lhsqService.findOne(id);
+		model.addAttribute("record", lhsq);
+
+		List<LhsqfjEntity> list = lhsqfjService.findBySqid(lhsq.getId());
+		if (list != null && list.size() > 0) {
+			model.addAttribute("fjlist", list);
+		}
+		return "gkjygl/gklhxkgl/gkjylhsq/lhsqedit";
+	}
+
+	// 新增
+	@RequestMapping(value = "/view")
+	public String view(Model model, String id, String flag) {
+		model.addAttribute("flag", flag);
+		LhsqEntity lhsq = lhsqService.findOne(id);
+		model.addAttribute("record", lhsq);
+
+		List<LhsqfjEntity> list = lhsqfjService.findBySqid(lhsq.getId());
+		if (list != null && list.size() > 0) {
+			model.addAttribute("fjlist", list);
+		}
+		return "gkjygl/gklhxkgl/gkjylhsq/lhsqview";
+	}
+
+	// 保存
+	@RequestMapping(value = "/save")
+	@ResponseBody
+	public WebJsonResult save(Model model, LhsqEntity code, String accid) {
 		WebJsonResult wr = success();
+		LhsqEntity lhsqEntity = new LhsqEntity();
 		try {
-			// 逻辑删除
-			lhsqService.logicDelete(id);
-			LhsqEntity entity = lhsqService.findById(id);
-			GkjyrEntity gkjyr = gkjyrService.findOne(entity.getJyrid());
-			gkjyr.setRecordStatus(BaseEntity.RECORD_STATE_VALID);
-			gkjyrService.save(gkjyr);
+			if (!StringUtils.isEmpty(code.getId())) {
+				lhsqEntity = lhsqService.findOne(code.getId());
+				lhsqEntity.setSqr(code.getSqr());
+				lhsqEntity.setSqrdz(code.getSqrdz());
+				lhsqEntity.setSqrlxfs(code.getSqrlxfs());
+				lhsqEntity.setSqryzbm(code.getSqryzbm());
+				lhsqEntity.setWtdlrlxfs(code.getWtdlrlxfs());
+				lhsqEntity.setWtdlrxm(code.getWtdlrxm());
+				lhsqEntity.setLxr(code.getLxr());
+				lhsqEntity.setLxdh(code.getLxdh());
+				lhsqEntity.setYgzs(code.getYgzs());
+				lhsqEntity.setLhys(code.getLhys());
+				lhsqEntity.setYysr(code.getYysr());
+				lhsqEntity.setYysrr(code.getYysrr());
+				lhsqEntity.setLhl(code.getLhl());
+				lhsqEntity.setLhll(code.getLhll());
+				lhsqEntity.setLxl(code.getLxl());
+				lhsqEntity.setLxll(code.getLxll());
+				lhsqEntity = lhsqService.save(lhsqEntity);
+			} else {
+				code.setId(null);
+				code.setSqrq(new Date());
+				GkjyrEntity jyr = gkjyrService.findOne(code.getJyrid());
+				if (jyr != null) {
+					code.setSzgk(jyr.getSzgk());
+					code.setSzgq(jyr.getSzgq());
+					code.setSzd(jyr.getSzd());
+				}
+				lhsqEntity = lhsqService.save(code);
+			}
+			if (!StringUtils.isEmpty(accid)) {
+				// 关联附件
+				String[] ssids = accid.split(",");
+				for (String ssid : ssids) {
+					LhsqfjEntity fj = lhsqfjService.findOne(ssid);
+					if (fj != null) {
+						fj.setSqid(lhsqEntity.getId());
+						lhsqfjService.save(fj);
+					}
+				}
+			}
 		} catch (Exception e) {
 			wr.setSuccess(false);
 			wr.setMessage("操作失败！");
@@ -256,67 +251,81 @@ public class LhsqCtl extends BaseWebCtl {
 		return wr;
 	}
 
-	// 时间格式化
-	private String transFormatDate(Date d) {
-		if (d == null) {
-			return "";
+	// 保存附件
+	@RequestMapping(value = "/saveFile")
+	@ResponseBody
+	public WebJsonResult saveFile(@RequestParam("file") List<MultipartFile> file, String sfbx, Model model, HttpServletRequest request, HttpServletResponse response) {
+		WebJsonResult wr = success();
+		if (file != null && file.size() > 0) {
+			LhsqfjEntity fjEntity = new LhsqfjEntity();
+			for (int i = 0; i < file.size(); i++) {
+				MultipartFile f = file.get(i);
+				if (f.getSize() > 0) {
+					AccessoryEntity acc = accessoryService.saveFile(f, "lhsq");
+					if (acc != null) {
+						fjEntity.setFjid(acc.getId());
+						fjEntity.setFjmc(acc.getName());
+						fjEntity = lhsqfjService.save(fjEntity);
+						break;
+					}
+				}
+			}
+			wr.setAttr("acc", fjEntity);
+		} else {
+			wr.setSuccess(false);
+			wr.setMessage("请上传附件!");
 		}
-		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-		return sdf.format(d);
+		return wr;
 	}
 
-	// 新增
-	@RequestMapping(value = "/add")
-	public String add(Model model, String flag, String path, String id) {
-		UserEntity user = securityMgr.getCurrUser();
-		GkjyrEntity gkjyr = new GkjyrEntity();
-		if (user.getSsjyr() != null) {
-
-			gkjyr = gkjyrService.findOne(user.getSsjyr().getId());
-
+	/**
+	 * 删除附件
+	 * 
+	 * @param model
+	 * @param id
+	 * @return
+	 */
+	@RequestMapping(value = "/delFj")
+	@ResponseBody
+	public WebJsonResult delFj(String[] ids) {
+		WebJsonResult wr = success();
+		try {
+			for (String id : ids) {
+				LhsqfjEntity entity = lhsqfjService.findOne(id);
+				if (entity != null) {
+					AccessoryEntity acc = accessoryService.findOne(entity.getFjid());
+					if (acc != null) {
+						accessoryService.delete(acc);
+						if (entity != null) {
+							String path = acc.getFilepath() + acc.getFilename();
+							File file = new File(path);
+							if (file.isFile() && file.exists()) {
+								file.delete();
+							}
+						}
+					}
+					lhsqfjService.delete(entity);
+				}
+			}
+		} catch (Exception e) {
+			wr.setSuccess(false);
 		}
-		model.addAttribute("gkjyr", gkjyr);
-		return "gkjygl/gklhxkgl/gkjylhsq/lhsqadd";
+		return wr;
 	}
 
-	// 查看
-	@RequestMapping(value = "/view")
-	public String view(Model model, String id, String flag, String path, String menuid) {
-		model.addAttribute("path", path);
-		model.addAttribute("flag", flag);
-		UserEntity user = securityMgr.getCurrUser();
-		model.addAttribute("ry", user.getName());
-		SimpleDateFormat dateTimeFormat = new SimpleDateFormat("yyyy-MM-dd");
-		Date today = new Date();
-		model.addAttribute("sj", dateTimeFormat.format(today));
-		LhsqEntity entity = lhsqService.findById(id);
-		LhsqVo vo = new LhsqVo();
-		if (entity != null) {
-			BeanUtils.copyProperties(entity, vo);
-			try {
-				vo.setLxr(entity.getSqr() != null ? entity.getSqr() : "");
-				vo.setFddbr(entity.getFddbr() != null ? entity.getFddbr() : "");
-				vo.setSqrlxdh(entity.getSqrlxdh() != null ? entity.getSqrlxdh() : "");
-				vo.setSqryzbm(entity.getSqryzbm() != null ? entity.getSqryzbm() : "");
-				vo.setSqrdz(entity.getSqrdz() != null ? entity.getSqrdz() : "");
-				vo.setWtdlrxm(entity.getWtdlrxm() != null ? entity.getWtdlrxm() : "");
-				vo.setWtdlrlxfs(entity.getWtdlrlxfs() != null ? entity.getWtdlrlxfs() : "");
-				vo.setSqrq(entity.getSqrq() != null ? dateTimeFormat.parse(entity.getSqrq().toString()) : null);
-				vo.setGsmc(entity.getGsmc() != null ? entity.getGsmc() : "");
-				vo.setZcdz(entity.getZcdz() != null ? entity.getZcdz() : "");
-				vo.setFddbr(entity.getFddbr() != null ? entity.getFddbr() : "");
-				vo.setGsyyzzbh(entity.getGsyyzzbh() != null ? entity.getGsyyzzbh() : "");
-				vo.setLxr(entity.getLxr() != null ? entity.getLxr() : "");
-				vo.setZczb(entity.getZczb() != null ? entity.getZczb() : "");
-				vo.setLxrdh(entity.getLxrdh() != null ? entity.getLxrdh() : "");
-				vo.setJydy(entity.getJydy() != null ? entity.getJydy() : "");
-			} catch (ParseException e) {
-				e.printStackTrace();
-			}
+	// 删除
+	@RequestMapping(value = "/delete")
+	@ResponseBody
+	public WebJsonResult logicdelete(Model model, String id) {
+		WebJsonResult wr = success();
+		try {
+			// 逻辑删除
+			lhsqService.logicDelete(id);
+		} catch (Exception e) {
+			wr.setSuccess(false);
+			wr.setMessage("操作失败！");
+			e.printStackTrace();
 		}
-		model.addAttribute("menuid", menuid);
-		model.addAttribute("record", vo);
-		return "gkjygl/gklhxkgl/gkjylhsq/lhsqview";
+		return wr;
 	}
-
 }

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gklhxkgl/gkjylhsq/dao/LhsqfjDao.java

@@ -0,0 +1,14 @@
+package com.xt.jygl.gkjygl.gklhxkgl.gkjylhsq.dao;
+
+import java.util.List;
+
+import org.springframework.data.jpa.repository.Query;
+
+import com.xt.jygl.gkjygl.gklhxkgl.gkjylhsq.entity.LhsqfjEntity;
+import com.xtframe.sec.common.SecRepository;
+
+public interface LhsqfjDao extends SecRepository<LhsqfjEntity, String> {
+
+	@Query("SELECT m  FROM LhsqfjEntity m WHERE  m.sqid =?1 and m.recordStatus <> 9 ")
+	public List<LhsqfjEntity> findBySqid(String sqid);
+}

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gklhxkgl/gkjylhsq/entity/LhsqEntity.java

@@ -17,7 +17,7 @@ import com.xt.jygl.gkjcxx.gq.entity.GqEntity;
 import com.xtframe.sec.common.BaseEntity;
 
 @Entity
-@Table(name = "GK_OPERATION_JSJY_LHSQXX")
+@Table(name = "GK_OPERATION_JSJY_LHSQ")
 public class LhsqEntity extends BaseEntity<String> implements Cloneable {
 
 	/**
@@ -38,7 +38,7 @@ public class LhsqEntity extends BaseEntity<String> implements Cloneable {
 	// 申请人
 	private String sqr = null;
 	// 申请人联系方式
-	private String sqrlxdh = null;
+	private String sqrlxfs = null;
 	// 申请人地址
 	private String sqrdz = null;
 	// 申请人邮政编码
@@ -49,26 +49,145 @@ public class LhsqEntity extends BaseEntity<String> implements Cloneable {
 	private String wtdlrlxfs = null;
 	// 申请时间
 	private Date sqrq = null;
-	//公司名称
-	private String  gsmc=null;
-	//注册地址
-	private String  zcdz=null;
-	//法定代表人
-	private String  fddbr=null;
-	//联系人
-	private String  lxr=null;
-	//联系人电话
-	private String  lxrdh=null;
-	//注册资本
-	private String zczb=null;
-	//工商营业执照编号
-	private String  gsyyzzbh=null;
-	//经营地域
-	private String  jydy=null;
-	//员工总数
-	private int     ygzs=0;
-	//理货员数
-	private int     lhys=0;
+	// 公司名称
+	private String gsmc = null;
+	// 注册地址
+	private String zcdz = null;
+	// 法定代表人
+	private String fddbr = null;
+	// 联系人
+	private String lxr = null;
+	// 联系人电话
+	private String lxdh = null;
+	// 注册资本
+	private String zczb = null;
+	// 工商营业执照编号
+	private String gsyyzzbh = null;
+	// 经营地域
+	private String jydy = null;
+	// 员工总数
+	private String ygzs = null;
+	// 理货员数
+	private String lhys = null;
+
+	private String gdmc = null;
+	private String zcd=null;
+	private String tzbl = null;
+	private String sqnr = null;
+	private String yysr = null;
+	private String lhl = null;
+	private String lxl = null;
+	private String yysrr = null;
+	private String lhll = null;
+	private String lxll = null;
+	private String oneyear = null;
+	private String twoyear = null;
+
+	
+	public String getGdmc() {
+		return gdmc;
+	}
+
+	public void setGdmc(String gdmc) {
+		this.gdmc = gdmc;
+	}
+
+	public String getZcd() {
+		return zcd;
+	}
+
+	public void setZcd(String zcd) {
+		this.zcd = zcd;
+	}
+
+	public String getTzbl() {
+		return tzbl;
+	}
+
+	public void setTzbl(String tzbl) {
+		this.tzbl = tzbl;
+	}
+
+	public String getLxdh() {
+		return lxdh;
+	}
+
+	public void setLxdh(String lxdh) {
+		this.lxdh = lxdh;
+	}
+
+	public String getYysr() {
+		return yysr;
+	}
+
+	public void setYysr(String yysr) {
+		this.yysr = yysr;
+	}
+
+	public String getLhl() {
+		return lhl;
+	}
+
+	public void setLhl(String lhl) {
+		this.lhl = lhl;
+	}
+
+	public String getLxl() {
+		return lxl;
+	}
+
+	public void setLxl(String lxl) {
+		this.lxl = lxl;
+	}
+
+	public String getYysrr() {
+		return yysrr;
+	}
+
+	public void setYysrr(String yysrr) {
+		this.yysrr = yysrr;
+	}
+
+	public String getLhll() {
+		return lhll;
+	}
+
+	public void setLhll(String lhll) {
+		this.lhll = lhll;
+	}
+
+	public String getLxll() {
+		return lxll;
+	}
+
+	public void setLxll(String lxll) {
+		this.lxll = lxll;
+	}
+
+	public String getOneyear() {
+		return oneyear;
+	}
+
+	public void setOneyear(String oneyear) {
+		this.oneyear = oneyear;
+	}
+
+	public String getTwoyear() {
+		return twoyear;
+	}
+
+	public void setTwoyear(String twoyear) {
+		this.twoyear = twoyear;
+	}
+
+	public void setYgzs(String ygzs) {
+		this.ygzs = ygzs;
+	}
+
+	public void setLhys(String lhys) {
+		this.lhys = lhys;
+	}
+
 	@Id
 	@GenericGenerator(name = "systemUUID", strategy = "uuid")
 	@GeneratedValue(generator = "systemUUID")
@@ -88,12 +207,20 @@ public class LhsqEntity extends BaseEntity<String> implements Cloneable {
 		this.sqr = sqr;
 	}
 
-	public String getSqrlxdh() {
-		return sqrlxdh;
+	public String getSqrlxfs() {
+		return sqrlxfs;
 	}
 
-	public void setSqrlxdh(String sqrlxdh) {
-		this.sqrlxdh = sqrlxdh;
+	public void setSqrlxfs(String sqrlxfs) {
+		this.sqrlxfs = sqrlxfs;
+	}
+
+	public String getSqnr() {
+		return sqnr;
+	}
+
+	public void setSqnr(String sqnr) {
+		this.sqnr = sqnr;
 	}
 
 	public String getSqrdz() {
@@ -136,8 +263,6 @@ public class LhsqEntity extends BaseEntity<String> implements Cloneable {
 		this.sqrq = sqrq;
 	}
 
-	
-
 	@ManyToOne(fetch = FetchType.EAGER, targetEntity = GkEntity.class)
 	@JoinColumn(name = "szgk")
 	public GkEntity getSzgk() {
@@ -174,8 +299,6 @@ public class LhsqEntity extends BaseEntity<String> implements Cloneable {
 		this.szgq = szgq;
 	}
 
-
-
 	public String getLxr() {
 		return lxr;
 	}
@@ -184,14 +307,6 @@ public class LhsqEntity extends BaseEntity<String> implements Cloneable {
 		this.lxr = lxr;
 	}
 
-	public String getLxrdh() {
-		return lxrdh;
-	}
-
-	public void setLxrdh(String lxrdh) {
-		this.lxrdh = lxrdh;
-	}
-
 	public String getGsyyzzbh() {
 		return gsyyzzbh;
 	}
@@ -208,22 +323,14 @@ public class LhsqEntity extends BaseEntity<String> implements Cloneable {
 		this.jydy = jydy;
 	}
 
-	public int getYgzs() {
+	public String getYgzs() {
 		return ygzs;
 	}
 
-	public void setYgzs(int ygzs) {
-		this.ygzs = ygzs;
-	}
-
-	public int getLhys() {
+	public String getLhys() {
 		return lhys;
 	}
 
-	public void setLhys(int lhys) {
-		this.lhys = lhys;
-	}
-
 	public String getZczb() {
 		return zczb;
 	}

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gklhxkgl/gkjylhsq/entity/LhsqfjEntity.java

@@ -0,0 +1,60 @@
+package com.xt.jygl.gkjygl.gklhxkgl.gkjylhsq.entity;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+import org.hibernate.annotations.GenericGenerator;
+
+import com.xtframe.sec.common.BaseEntity;
+
+@Entity
+@Table(name = "GK_OPERATION_JSJY_LHSQFJ")
+public class LhsqfjEntity extends BaseEntity<String> implements Cloneable {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+	private String id = null;
+	private String sqid = null;
+	private String fjid = null;
+	private String fjmc = null;
+
+	@Id
+	@GenericGenerator(name = "systemUUID", strategy = "uuid")
+	@GeneratedValue(generator = "systemUUID")
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public String getSqid() {
+		return sqid;
+	}
+
+	public void setSqid(String sqid) {
+		this.sqid = sqid;
+	}
+
+	public String getFjid() {
+		return fjid;
+	}
+
+	public void setFjid(String fjid) {
+		this.fjid = fjid;
+	}
+
+	public String getFjmc() {
+		return fjmc;
+	}
+
+	public void setFjmc(String fjmc) {
+		this.fjmc = fjmc;
+	}
+
+}

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gklhxkgl/gkjylhsq/service/LhsqService.java

@@ -5,15 +5,17 @@ import java.util.List;
 import com.xt.jygl.gkjygl.gklhxkgl.gkjylhsq.entity.LhsqEntity;
 import com.xt.jygl.workflow.service.BaseWorkFlowService;
 
-public interface LhsqService extends BaseWorkFlowService {
+public interface LhsqService extends BaseWorkFlowService{
 	void logicDelete(String id);
 
 	public <S extends LhsqEntity> S save(S entity);
-
+	
 	public <S extends LhsqEntity> S submit(S entity);
 
-	LhsqEntity findById(String id);
-
+	LhsqEntity findOne(String id);
+	
+	public boolean changeAudit(String shyj,  LhsqEntity entity,
+			boolean flag);
 	List<LhsqEntity> findByJyrid(String jyrid);
-
 }
+

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gklhxkgl/gkjylhsq/service/LhsqfjService.java

@@ -0,0 +1,17 @@
+package com.xt.jygl.gkjygl.gklhxkgl.gkjylhsq.service;
+
+import java.util.List;
+
+import com.xt.jygl.gkjygl.gklhxkgl.gkjylhsq.entity.LhsqfjEntity;
+
+public interface LhsqfjService {
+	void logicDelete(String id);
+
+	public <S extends LhsqfjEntity> S save(S entity);
+
+	public void delete(LhsqfjEntity ent);
+
+	LhsqfjEntity findOne(String id);
+
+	List<LhsqfjEntity> findBySqid(String sqid);
+}

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gklhxkgl/gkjylhsq/service/impl/LhsqServiceImpl.java

@@ -1,50 +1,108 @@
 package com.xt.jygl.gkjygl.gklhxkgl.gkjylhsq.service.impl;
 
+import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.xt.jygl.common.Constants;
 import com.xt.jygl.gkjygl.gklhxkgl.gkjylhsq.dao.LhsqDao;
 import com.xt.jygl.gkjygl.gklhxkgl.gkjylhsq.entity.LhsqEntity;
 import com.xt.jygl.gkjygl.gklhxkgl.gkjylhsq.service.LhsqService;
+import com.xt.jygl.workflow.entity.TaskInfoEntity;
+import com.xt.jygl.workflow.param.WorkFlowParam;
 import com.xt.jygl.workflow.service.impl.BaseWorkFlowServiceImpl;
+import com.xtframe.core.support.SecurityMgr;
+import com.xtframe.sec.common.BaseEntity;
 import com.xtframe.sec.common.SecRepository;
+import com.xtframe.sec.utils.SecUtils;
+import com.xtframe.util.StringUtils;
 
 @Service
 public class LhsqServiceImpl extends BaseWorkFlowServiceImpl<LhsqEntity, String> implements LhsqService {
 	@Autowired
 	private LhsqDao dao;
+	@Autowired
+	protected SecurityMgr securityMgr;
 
 	@Override
-	public <S extends LhsqEntity> S submit(S entity) {
-		return null;
+	protected SecRepository<LhsqEntity, String> getDao() {
+
+		return this.dao;
 	}
 
 	@Override
-	public List<LhsqEntity> findByJyrid(String jyrid) {
-		return dao.findByJyrid(jyrid);
+	public <S extends LhsqEntity> S submit(S entity) {
+		if (entity.getRecordStatus() == BaseEntity.RECORD_STATE_REJECT) {
+			entity.setRecordStatus(BaseEntity.RECORD_STATE_SUBMIT);
+			entity = this.save(entity);
+			Map<String, Object> variables = new HashMap<String, Object>();
+			WorkFlowParam param = new WorkFlowParam();
+			param.put(WorkFlowParam.BUSINESS_KEY, entity.getId());
+			param.put(WorkFlowParam.IS_AUDIT, "false");
+			param.put(WorkFlowParam.DESCRIPTION, entity.getJyrmc() + "的理货申请");
+			complete(param, variables);
+		} else {
+			entity.setRecordStatus(BaseEntity.RECORD_STATE_SUBMIT);
+			entity = this.save(entity);
+			String gqid = "";
+			if (securityMgr.getCurrUser().getSfjyr().getText().equals("是")) {
+				gqid = entity.getSzgq().getId();
+			}
+			Map<String, Object> variables = new HashMap<String, Object>();
+			variables.put("role_clsc", Constants.ROLE_CLSC + ":" + gqid);
+			variables.put("role_hc", Constants.ROLE_HC + ":" + gqid);
+			variables.put("role_fh", Constants.ROLE_FH + ":" + gqid);
+			variables.put("role_sp", Constants.ROLE_SP + ":" + gqid);
+			WorkFlowParam param = new WorkFlowParam();
+			param.put(WorkFlowParam.DESCRIPTION, entity.getJyrmc() + "的理货申请");
+
+			// 设置流程发起人
+			if (StringUtils.isEmpty(param.getString(WorkFlowParam.AUDIT_USER))) {
+				param.put(WorkFlowParam.AUDIT_USER, SecUtils.getCurrUser().getId().toString());
+			}
+			param.put(WorkFlowParam.BUSINESS_KEY, entity.getId());
+			// 提交流程
+			create(param, variables);
+		}
+		return entity;
 	}
 
+	
 	@Override
 	public String getProcessDefinitionKey() {
-		// TODO Auto-generated method stub
-		return null;
+		return LhsqEntity.PROCESS_DEFINITION_KEY;
 	}
 
 	@Override
-	protected SecRepository<LhsqEntity, String> getDao() {
-		// TODO Auto-generated method stub
-		return null;
+	public boolean changeAudit(String shyj, LhsqEntity entity, boolean flag) {
+		Map<String, Object> variables = new HashMap<String, Object>();
+		variables.put(WorkFlowParam.AUDIT_PASS, flag);
+		WorkFlowParam param = new WorkFlowParam();
+		param.put(WorkFlowParam.AUDIT_DATE, new Date());
+		param.put(WorkFlowParam.AUDIT_TEXT, shyj == null ? "" : shyj);
+		param.put(WorkFlowParam.AUDIT_RESULT, flag);
+		param.put(WorkFlowParam.BUSINESS_KEY, entity.getId());
+		
+		complete(param, variables);
+		List<TaskInfoEntity> list = findByBusIdAndBusKeyAndRecordStatus(entity.getId().toString());
+		if (list == null || list.size() == 0) {
+			entity.setRecordStatus(BaseEntity.RECORD_STATE_COMPLETED);
+			entity = this.save(entity);
+			return true;
+		}
+		if (flag == false) {
+			entity.setRecordStatus(BaseEntity.RECORD_STATE_REJECT);
+			this.save(entity);
+		}
+		return false;
 	}
 
 	@Override
-	public LhsqEntity findById(String id) {
-		// TODO Auto-generated method stub
-		return dao.findById(id);
-	}
-
-
+	public List<LhsqEntity> findByJyrid(String jyrid) {
+		return dao.findByJyrid(jyrid);
 	}
-
-
+}

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gklhxkgl/gkjylhsq/service/impl/LhsqfjServiceImpl.java

@@ -0,0 +1,30 @@
+package com.xt.jygl.gkjygl.gklhxkgl.gkjylhsq.service.impl;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.xt.jygl.common.service.JyglBaseService;
+import com.xt.jygl.gkjygl.gklhxkgl.gkjylhsq.dao.LhsqfjDao;
+import com.xt.jygl.gkjygl.gklhxkgl.gkjylhsq.entity.LhsqfjEntity;
+import com.xt.jygl.gkjygl.gklhxkgl.gkjylhsq.service.LhsqfjService;
+import com.xtframe.sec.common.SecRepository;
+
+@Service
+public class LhsqfjServiceImpl extends JyglBaseService<LhsqfjEntity, String> implements LhsqfjService {
+	@Autowired
+	private LhsqfjDao dao;
+
+	@Override
+	protected SecRepository<LhsqfjEntity, String> getDao() {
+
+		return this.dao;
+	}
+
+	@Override
+	public List<LhsqfjEntity> findBySqid(String sqid) {
+		return dao.findBySqid(sqid);
+	}
+
+}

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gklhxkgl/gkjylhsq/vo/LhsqVo.java

@@ -6,186 +6,317 @@ import com.xt.jygl.gkjcxx.gk.entity.GkEntity;
 import com.xt.jygl.gkjcxx.gq.entity.GqEntity;
 import com.xtframe.sec.common.BaseVo;
 
-public class LhsqVo extends BaseVo{
-	
+public class LhsqVo extends BaseVo {
+
 	private String id = null;
 
 	// 经营人ID
 	private String jyrid = null;
 	// 经营人名称
 	private String jyrmc = null;
-    //所在港口
+	// 所在港口
 	private GkEntity szgk = null;
-    //所在港区
+	// 所在港区
 	private GqEntity szgq = null;
-    //申请人
+	// 申请人
 	private String sqr = null;
-    //申请人联系方式
+	// 申请人联系方式
 	private String sqrlxdh = null;
-    //申请人地址
+	// 申请人地址
 	private String sqrdz = null;
-    //申请人邮政编码
+	// 申请人邮政编码
 	private String sqryzbm = null;
-    //委托代理人姓名
+	// 委托代理人姓名
 	private String wtdlrxm = null;
-    //委托代理人联系方式
+	// 委托代理人联系方式
 	private String wtdlrlxfs = null;
-    //申请时间
+	// 申请时间
 	private Date sqrq = null;
-	//公司名称
-		private String  gsmc=null;
-		//注册地址
-		private String  zcdz=null;
-		//法定代表人
-		private String  fddbr=null;
-		//联系人
-		private String  lxr=null;
-		//联系人电话
-		private String  lxrdh=null;
-		//注册资本
-		private String zczb=null;
-		//工商营业执照编号
-		private String  gsyyzzbh=null;
-		//经营地域
-		private String  jydy=null;
-		//员工总数
-		private int     ygzs=0;
-		//理货员数
-		private int     lhys=0;
+	// 公司名称
+	private String gsmc = null;
+	// 注册地址
+	private String zcdz = null;
+	// 法定代表人
+	private String fddbr = null;
+	// 联系人
+	private String lxr = null;
+	// 联系人电话
+	private String lxdh = null;
+	// 注册资本
+	private String zczb = null;
+	// 工商营业执照编号
+	private String gsyyzzbh = null;
+	// 经营地域
+	private String jydy = null;
+	// 员工总数
+	private String ygzs = null;
+	// 理货员数
+	private String lhys = null;
+	private String sqnr = null;
+	private String yysr = null;
+	private String lhl = null;
+	private String lxl = null;
+	private String yysrr = null;
+	private String lhll = null;
+	private String lxll = null;
+	private String oneyear = null;
+	private String twoyear = null;
+	private String taskState = null;
+
 	public String getId() {
 		return id;
 	}
+
 	public void setId(String id) {
 		this.id = id;
 	}
-	
+
 	public GkEntity getSzgk() {
 		return szgk;
 	}
+
 	public void setSzgk(GkEntity szgk) {
 		this.szgk = szgk;
 	}
+
 	public GqEntity getSzgq() {
 		return szgq;
 	}
+
 	public void setSzgq(GqEntity szgq) {
 		this.szgq = szgq;
 	}
+
 	public String getSqr() {
 		return sqr;
 	}
+
 	public void setSqr(String sqr) {
 		this.sqr = sqr;
 	}
+
 	public String getSqrlxdh() {
 		return sqrlxdh;
 	}
+
 	public void setSqrlxdh(String sqrlxdh) {
 		this.sqrlxdh = sqrlxdh;
 	}
+
 	public String getSqrdz() {
 		return sqrdz;
 	}
+
 	public void setSqrdz(String sqrdz) {
 		this.sqrdz = sqrdz;
 	}
+
 	public String getSqryzbm() {
 		return sqryzbm;
 	}
+
 	public void setSqryzbm(String sqryzbm) {
 		this.sqryzbm = sqryzbm;
 	}
+
 	public String getWtdlrxm() {
 		return wtdlrxm;
 	}
+
 	public void setWtdlrxm(String wtdlrxm) {
 		this.wtdlrxm = wtdlrxm;
 	}
+
 	public String getWtdlrlxfs() {
 		return wtdlrlxfs;
 	}
+
 	public void setWtdlrlxfs(String wtdlrlxfs) {
 		this.wtdlrlxfs = wtdlrlxfs;
 	}
+
 	public Date getSqrq() {
 		return sqrq;
 	}
+
 	public void setSqrq(Date sqrq) {
 		this.sqrq = sqrq;
 	}
+
 	public String getGsmc() {
 		return gsmc;
 	}
+
 	public void setGsmc(String gsmc) {
 		this.gsmc = gsmc;
 	}
+
 	public String getZcdz() {
 		return zcdz;
 	}
+
 	public void setZcdz(String zcdz) {
 		this.zcdz = zcdz;
 	}
+
 	public String getLxr() {
 		return lxr;
 	}
+
 	public void setLxr(String lxr) {
 		this.lxr = lxr;
 	}
-	public String getLxrdh() {
-		return lxrdh;
+
+	public String getLxdh() {
+		return lxdh;
 	}
-	public void setLxrdh(String lxrdh) {
-		this.lxrdh = lxrdh;
+
+	public void setLxdh(String lxdh) {
+		this.lxdh = lxdh;
 	}
+
 	public String getZczb() {
 		return zczb;
 	}
+
 	public void setZczb(String zczb) {
 		this.zczb = zczb;
 	}
+
 	public String getGsyyzzbh() {
 		return gsyyzzbh;
 	}
+
 	public void setGsyyzzbh(String gsyyzzbh) {
 		this.gsyyzzbh = gsyyzzbh;
 	}
+
 	public String getJydy() {
 		return jydy;
 	}
+
 	public void setJydy(String jydy) {
 		this.jydy = jydy;
 	}
-	public int getYgzs() {
-		return ygzs;
+
+	public String getJyrid() {
+		return jyrid;
 	}
-	public void setYgzs(int ygzs) {
-		this.ygzs = ygzs;
+
+	public void setJyrid(String jyrid) {
+		this.jyrid = jyrid;
 	}
-	public int getLhys() {
-		return lhys;
+
+	public String getJyrmc() {
+		return jyrmc;
 	}
-	public void setLhys(int lhys) {
-		this.lhys = lhys;
+
+	public void setJyrmc(String jyrmc) {
+		this.jyrmc = jyrmc;
 	}
+
 	public String getFddbr() {
 		return fddbr;
 	}
+
 	public void setFddbr(String fddbr) {
 		this.fddbr = fddbr;
 	}
-	public String getJyrid() {
-		return jyrid;
+
+	public String getYgzs() {
+		return ygzs;
 	}
-	public void setJyrid(String jyrid) {
-		this.jyrid = jyrid;
+
+	public void setYgzs(String ygzs) {
+		this.ygzs = ygzs;
 	}
-	public String getJyrmc() {
-		return jyrmc;
+
+	public String getLhys() {
+		return lhys;
 	}
-	public void setJyrmc(String jyrmc) {
-		this.jyrmc = jyrmc;
+
+	public void setLhys(String lhys) {
+		this.lhys = lhys;
+	}
+
+	public String getSqnr() {
+		return sqnr;
+	}
+
+	public void setSqnr(String sqnr) {
+		this.sqnr = sqnr;
+	}
+
+	public String getYysr() {
+		return yysr;
+	}
+
+	public void setYysr(String yysr) {
+		this.yysr = yysr;
+	}
+
+	public String getLhl() {
+		return lhl;
+	}
+
+	public void setLhl(String lhl) {
+		this.lhl = lhl;
 	}
-	
 
+	public String getLxl() {
+		return lxl;
+	}
+
+	public void setLxl(String lxl) {
+		this.lxl = lxl;
+	}
+
+	public String getYysrr() {
+		return yysrr;
+	}
+
+	public void setYysrr(String yysrr) {
+		this.yysrr = yysrr;
+	}
+
+	public String getLhll() {
+		return lhll;
+	}
+
+	public void setLhll(String lhll) {
+		this.lhll = lhll;
+	}
+
+	public String getLxll() {
+		return lxll;
+	}
+
+	public void setLxll(String lxll) {
+		this.lxll = lxll;
+	}
+
+	public String getOneyear() {
+		return oneyear;
+	}
+
+	public void setOneyear(String oneyear) {
+		this.oneyear = oneyear;
+	}
+
+	public String getTwoyear() {
+		return twoyear;
+	}
+
+	public void setTwoyear(String twoyear) {
+		this.twoyear = twoyear;
+	}
+
+	public String getTaskState() {
+		return taskState;
+	}
+
+	public void setTaskState(String taskState) {
+		this.taskState = taskState;
+	}
 
 }

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gklhxkgl/gkjylhyx/ctl/LhyxCtl.java

@@ -83,6 +83,7 @@ public class LhyxCtl extends BaseWebCtl {
 	private AccessoryService accessoryService;
 	@Autowired
 	private XkzxxService xkzxxService;
+
 	@RequestMapping(value = "/main")
 	public String main(SimplePageRequest page, Model model, final String lczt, final String szdid, final String szgkid, final String szgqid, final String gkjyr, final String fddbr, final String bgdd, String menuid) throws JsonProcessingException {
 		UserEntity user = securityMgr.getCurrUser();
@@ -118,7 +119,6 @@ public class LhyxCtl extends BaseWebCtl {
 				}
 
 				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_DELETE));
-			
 
 				return cb.and(list.toArray(new Predicate[] {}));
 			}
@@ -156,14 +156,7 @@ public class LhyxCtl extends BaseWebCtl {
 		return "gkjygl/gklhxkgl/gkjylhyx/lhyxmain";
 	}
 
-	// 时间格式化
-	private String transFormatDate(Date d) {
-		if (d == null) {
-			return "";
-		}
-		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-		return sdf.format(d);
-	}
+	
 
 	// 新增
 	@RequestMapping(value = "/add")
@@ -180,15 +173,15 @@ public class LhyxCtl extends BaseWebCtl {
 			}
 		}
 		model.addAttribute("gkjyr", jyr);
-		//时间
+		// 时间
 		SimpleDateFormat data = new SimpleDateFormat("yyyy");
 		String nfstr = data.format(new Date());
 		int nf = Integer.parseInt(nfstr);
 		nf = nf - 1;
 		model.addAttribute("oneyear", nf);
-		nf=nf-1;
+		nf = nf - 1;
 		model.addAttribute("twoyear", nf);
-		
+
 		return "gkjygl/gklhxkgl/gkjylhyx/lhyxadd";
 	}
 
@@ -212,7 +205,7 @@ public class LhyxCtl extends BaseWebCtl {
 		model.addAttribute("flag", flag);
 		LhyxEntity lhyx = lhyxService.findOne(id);
 		model.addAttribute("record", lhyx);
-		
+
 		List<LhyxfjEntity> list = lhyxfjService.findByYxid(lhyx.getId());
 		if (list != null && list.size() > 0) {
 			model.addAttribute("fjlist", list);
@@ -242,7 +235,7 @@ public class LhyxCtl extends BaseWebCtl {
 				lhyxEntity = lhyxService.save(lhyxEntity);
 			} else {
 				code.setId(null);
-				
+
 				GkjyrEntity jyr = gkjyrService.findOne(code.getJyrid());
 				if (jyr != null) {
 					code.setSzgk(jyr.getSzgk());
@@ -281,7 +274,6 @@ public class LhyxCtl extends BaseWebCtl {
 		try {
 			if (!StringUtils.isEmpty(code.getId())) {
 				lhyxEntity = lhyxService.findOne(code.getId());
-				
 
 				lhyxEntity = lhyxService.submit(lhyxEntity);
 			} else {
@@ -325,7 +317,7 @@ public class LhyxCtl extends BaseWebCtl {
 		try {
 			if (!StringUtils.isEmpty(code.getId())) {
 				lhyxEntity = lhyxService.findOne(code.getId());
-			
+
 				lhyxEntity = lhyxService.save(lhyxEntity);
 			}
 		} catch (Exception e) {
@@ -352,16 +344,11 @@ public class LhyxCtl extends BaseWebCtl {
 	// 删除
 	@RequestMapping(value = "/delete")
 	@ResponseBody
-	@RequiresPermissions("gkjyxkbg:delete")
 	public WebJsonResult logicdelete(Model model, String id) {
 		WebJsonResult wr = success();
 		try {
 			// 逻辑删除
 			lhyxService.logicDelete(id);
-			LhyxEntity entity = lhyxService.findOne(id);
-			GkjyrEntity gkjyr = gkjyrService.findOne(entity.getJyrid());
-			gkjyr.setRecordStatus(BaseEntity.RECORD_STATE_VALID);
-			gkjyrService.save(gkjyr);
 		} catch (Exception e) {
 			wr.setSuccess(false);
 			wr.setMessage("操作失败！");