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

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/jyrbw/ctl/BwCtl.java

@@ -498,7 +498,7 @@ public class BwCtl extends BaseWebCtl {
 	@RequestMapping(value = "/save")
 	@ResponseBody
 	@RequiresPermissions("bwxx:add")
-	public WebJsonResult save(Model model, String path, BwEntity code, String bwszhdid, String szdid, String szgkid, String szgqid, String ssjyrid, String ssmtid, String bwsxid, String fwlxid, String wxpbwid, String zyhbwflid, String sffzid, String sfdwkfid, String bwszsxid, String sclxid, String jgxsid, String sszyqid, String zlsid, String xpid, String kbcblxid) {
+	public WebJsonResult save(Model model, String path, BwEntity code, String bwszhdid, String szdid, String szgkid, String szgqid, String ssjyrid, String ssmtid, String bwsxid, String fwlxid, String wxpbwid, String zyhbwflid, String sffzid, String sfdwkfid, String bwszsxid, String sclxid, String jgxsid, String sszyqid, String zlsid, String xpid, String kbcblxid,String sfwygkghaxnid,String abid) {
 		WebJsonResult wr = success();
 		if (StringUtils.isEmpty(szdid)) {
 			wr.setSuccess(false);
@@ -578,6 +578,23 @@ public class BwCtl extends BaseWebCtl {
 			entity.setBwgs(code.getBwgs());
 			entity.setBz(code.getBz());
 			entity.setZyid(code.getZyid());
+			entity.setBwbh(code.getBwbh());
+			entity.setBwdm(code.getBwdm());
+
+			entity.setGkaxsyzh(code.getGkaxsyzh());
+			
+			if(!StringUtils.isEmpty(sfwygkghaxnid)){
+				CodeEntity sfwygkghaxn = new CodeEntity();
+				sfwygkghaxn.setId(sfwygkghaxnid);
+				entity.setSfwygkghaxn(sfwygkghaxn);
+			}
+			
+			if(!StringUtils.isEmpty(abid)){
+				CodeEntity ab = new CodeEntity();
+				ab.setId(abid);
+				entity.setAb(ab);
+			}
+			
 			CodeEntity szd = new CodeEntity(szdid);
 			entity.setSzd(szd);
 
@@ -738,6 +755,11 @@ public class BwCtl extends BaseWebCtl {
 		vo.setXpzw(entity.getXp() != null ? entity.getXp().getText() : "");
 		vo.setBwszhd(entity.getBwszhd() != null ? entity.getBwszhd().getId() : "");
 		vo.setKbcblx(entity.getKbcblx() != null ? entity.getKbcblx().getId() : "");
+		vo.setBwbh(entity.getBwbh() != null ? entity.getBwbh() : "");
+		vo.setBwdm(entity.getBwdm() != null ? entity.getBwdm() : "");
+		vo.setAb(entity.getAb() != null ? entity.getAb().getId() : "");
+		vo.setSfwygkghaxn(entity.getSfwygkghaxn() != null ? entity.getSfwygkghaxn().getId() : "");
+		vo.setGkaxsyzh(entity.getGkaxsyzh() != null ? entity.getGkaxsyzh() : "");
 		if (entity.getBwyt() != null) {
 			String bwytzw = "";
 			String[] s = entity.getBwyt().split(",");
@@ -816,7 +838,11 @@ public class BwCtl extends BaseWebCtl {
 			vo.setXp(entity.getXp() != null ? entity.getXp().getId() : "");
 			vo.setXpzw(entity.getXp() != null ? entity.getXp().getText() : "");
 			vo.setBwszhd(entity.getBwszhd() != null ? entity.getBwszhd().getText() : "");
-
+			vo.setBwbh(entity.getBwbh() != null ? entity.getBwbh() : "");
+			vo.setBwdm(entity.getBwdm() != null ? entity.getBwdm() : "");
+			vo.setAb(entity.getAb() != null ? entity.getAb().getText() : "");
+			vo.setSfwygkghaxn(entity.getSfwygkghaxn() != null ? entity.getSfwygkghaxn().getText() : "");
+			vo.setGkaxsyzh(entity.getGkaxsyzh() != null ? entity.getGkaxsyzh() : "");
 			if (entity.getBwyt() != null) {
 				String bwytzw = "";
 				String[] s = entity.getBwyt().split(",");
@@ -1275,4 +1301,18 @@ public class BwCtl extends BaseWebCtl {
 
 		return slist;
 	}
+
+	@RequestMapping(value = "selectAb")
+	@ResponseBody
+	public List<CodeEntity> selectAb(){
+		List<CodeEntity> list = securityMgr.codeService().findValidCodesByGroupCode("AB");
+		return list;
+	}
+	
+	@RequestMapping(value = "selectSfwygkghaxn")
+	@ResponseBody
+	public List<CodeEntity> selectSfwyghaxn(){
+		List<CodeEntity> list = securityMgr.codeService().findValidCodesByGroupCode("SF");
+		return list;
+	}
 }