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

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

@@ -39,6 +39,7 @@ 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.GdmcVo;
 import com.xt.jygl.gkjygl.gklhxkgl.gkjylhsq.vo.LhsqVo;
 import com.xt.jygl.workflow.entity.TaskInfoEntity;
 import com.xt.jygl.workflow.service.TaskInfoService;
@@ -101,7 +102,9 @@ public class LhsqCtl extends BaseWebCtl {
 				if (StringUtils.isNotEmpty(bgdd)) {
 					list.add(cb.like(root.get("bgdd").as(String.class), "%" + bgdd + "%"));
 				}
-
+				if (isJyr()) {
+					list.add(cb.like(root.get("jyrid").as(String.class), "%" + securityMgr.getCurrUser().getSsjyr().getId() + "%"));
+				}
 				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_DELETE));
 
 				return cb.and(list.toArray(new Predicate[] {}));
@@ -164,6 +167,9 @@ public class LhsqCtl extends BaseWebCtl {
 		nf = nf - 1;
 		model.addAttribute("twoyear", nf);
 
+		SimpleDateFormat dateTimeFormat = new SimpleDateFormat("yyyy-MM-dd");
+		Date today = new Date();
+		model.addAttribute("sqsj", dateTimeFormat.format(today));
 		return "gkjygl/gklhxkgl/gkjylhsq/lhsqadd";
 	}
 
@@ -178,6 +184,21 @@ public class LhsqCtl extends BaseWebCtl {
 		if (list != null && list.size() > 0) {
 			model.addAttribute("fjlist", list);
 		}
+		List<GdmcVo> gdmclist = new ArrayList<GdmcVo>();
+
+		if (!StringUtils.isEmpty(lhsq.getGdmc())) {
+			String[] gdmcs = lhsq.getGdmc().split(",");
+			String[] zcds = lhsq.getZcd().split(",");
+			String[] tzgbs = lhsq.getTzgb().split(",");
+			for (int i = 0; i < gdmcs.length; i++) {
+				GdmcVo vo = new GdmcVo();
+				vo.setGdmc(gdmcs[i]);
+				vo.setZcd(zcds[i]);
+				vo.setTzgb(tzgbs[i]);
+				gdmclist.add(vo);
+			}
+		}
+		model.addAttribute("gdmclist", gdmclist);
 		return "gkjygl/gklhxkgl/gkjylhsq/lhsqedit";
 	}
 
@@ -192,6 +213,21 @@ public class LhsqCtl extends BaseWebCtl {
 		if (list != null && list.size() > 0) {
 			model.addAttribute("fjlist", list);
 		}
+		List<GdmcVo> gdmclist = new ArrayList<GdmcVo>();
+
+		if (!StringUtils.isEmpty(lhsq.getGdmc())) {
+			String[] gdmcs = lhsq.getGdmc().split(",");
+			String[] zcds = lhsq.getZcd().split(",");
+			String[] tzgbs = lhsq.getTzgb().split(",");
+			for (int i = 0; i < gdmcs.length; i++) {
+				GdmcVo vo = new GdmcVo();
+				vo.setGdmc(gdmcs[i]);
+				vo.setZcd(zcds[i]);
+				vo.setTzgb(tzgbs[i]);
+				gdmclist.add(vo);
+			}
+		}
+		model.addAttribute("gdmclist", gdmclist);
 		return "gkjygl/gklhxkgl/gkjylhsq/lhsqview";
 	}
 
@@ -205,11 +241,16 @@ public class LhsqCtl extends BaseWebCtl {
 			if (!StringUtils.isEmpty(code.getId())) {
 				lhsqEntity = lhsqService.findOne(code.getId());
 				lhsqEntity.setSqr(code.getSqr());
+				lhsqEntity.setSqnr(code.getSqnr());
 				lhsqEntity.setSqrdz(code.getSqrdz());
+				lhsqEntity.setSqrqz(code.getSqrqz());
 				lhsqEntity.setSqrlxfs(code.getSqrlxfs());
 				lhsqEntity.setSqryzbm(code.getSqryzbm());
 				lhsqEntity.setWtdlrlxfs(code.getWtdlrlxfs());
 				lhsqEntity.setWtdlrxm(code.getWtdlrxm());
+				lhsqEntity.setGdmc(code.getGdmc());
+				lhsqEntity.setZcd(code.getZcd());
+				lhsqEntity.setTzgb(code.getTzgb());
 				lhsqEntity.setLxr(code.getLxr());
 				lhsqEntity.setLxdh(code.getLxdh());
 				lhsqEntity.setYgzs(code.getYgzs());
@@ -338,8 +379,17 @@ public class LhsqCtl extends BaseWebCtl {
 		LhsqEntity lhsqEntity = new LhsqEntity();
 		try {
 			if (!StringUtils.isEmpty(code.getId())) {
-				lhsqEntity = lhsqService.findOne(code.getId());
-				lhsqEntity = lhsqService.findOne(code.getId());
+				lhsqEntity.setSqr(code.getSqr());
+				lhsqEntity.setSqnr(code.getSqnr());
+				lhsqEntity.setSqrdz(code.getSqrdz());
+				lhsqEntity.setSqrlxfs(code.getSqrlxfs());
+				lhsqEntity.setSqrqz(code.getSqrqz());
+				lhsqEntity.setSqryzbm(code.getSqryzbm());
+				lhsqEntity.setWtdlrlxfs(code.getWtdlrlxfs());
+				lhsqEntity.setWtdlrxm(code.getWtdlrxm());
+				lhsqEntity.setGdmc(code.getGdmc());
+				lhsqEntity.setZcd(code.getZcd());
+				lhsqEntity.setTzgb(code.getTzgb());
 				lhsqEntity.setLxr(code.getLxr());
 				lhsqEntity.setLxdh(code.getLxdh());
 				lhsqEntity.setYgzs(code.getYgzs());
@@ -390,6 +440,17 @@ public class LhsqCtl extends BaseWebCtl {
 		try {
 			if (!StringUtils.isEmpty(code.getId())) {
 				lhsqEntity = lhsqService.findOne(code.getId());
+				lhsqEntity.setSqr(code.getSqr());
+				lhsqEntity.setSqnr(code.getSqnr());
+				lhsqEntity.setSqrdz(code.getSqrdz());
+				lhsqEntity.setSqrlxfs(code.getSqrlxfs());
+				lhsqEntity.setSqrqz(code.getSqrqz());
+				lhsqEntity.setSqryzbm(code.getSqryzbm());
+				lhsqEntity.setWtdlrlxfs(code.getWtdlrlxfs());
+				lhsqEntity.setWtdlrxm(code.getWtdlrxm());
+				lhsqEntity.setGdmc(code.getGdmc());
+				lhsqEntity.setZcd(code.getZcd());
+				lhsqEntity.setTzgb(code.getTzgb());
 				lhsqEntity.setLxr(code.getLxr());
 				lhsqEntity.setLxdh(code.getLxdh());
 				lhsqEntity.setYgzs(code.getYgzs());

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

@@ -71,8 +71,8 @@ public class LhsqEntity extends BaseEntity<String> implements Cloneable {
 	private String lhys = null;
 
 	private String gdmc = null;
-	private String zcd=null;
-	private String tzbl = null;
+	private String zcd = null;
+	private String tzgb = null;
 	private String sqnr = null;
 	private String yysr = null;
 	private String lhl = null;
@@ -82,8 +82,16 @@ public class LhsqEntity extends BaseEntity<String> implements Cloneable {
 	private String lxll = null;
 	private String oneyear = null;
 	private String twoyear = null;
-
+	private String sqrqz=null;
 	
+	public String getSqrqz() {
+		return sqrqz;
+	}
+
+	public void setSqrqz(String sqrqz) {
+		this.sqrqz = sqrqz;
+	}
+
 	public String getGdmc() {
 		return gdmc;
 	}
@@ -100,12 +108,12 @@ public class LhsqEntity extends BaseEntity<String> implements Cloneable {
 		this.zcd = zcd;
 	}
 
-	public String getTzbl() {
-		return tzbl;
+	public String getTzgb() {
+		return tzgb;
 	}
 
-	public void setTzbl(String tzbl) {
-		this.tzbl = tzbl;
+	public void setTzgb(String tzgb) {
+		this.tzgb = tzgb;
 	}
 
 	public String getLxdh() {

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

@@ -0,0 +1,29 @@
+package com.xt.jygl.gkjygl.gklhxkgl.gkjylhsq.vo;
+
+
+public class GdmcVo  {
+
+	private String gdmc;
+	private String zcd;
+	private String tzgb;
+	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 getTzgb() {
+		return tzgb;
+	}
+	public void setTzgb(String tzgb) {
+		this.tzgb = tzgb;
+	}
+	
+
+}

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

@@ -62,6 +62,15 @@ public class LhsqVo extends BaseVo {
 	private String oneyear = null;
 	private String twoyear = null;
 	private String taskState = null;
+	private String sqrqz = null;
+
+	public String getSqrqz() {
+		return sqrqz;
+	}
+
+	public void setSqrqz(String sqrqz) {
+		this.sqrqz = sqrqz;
+	}
 
 	public String getId() {
 		return id;