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

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdgl/ctl/JsjdglCtl.java

@@ -421,7 +421,7 @@ public class JsjdglCtl extends BaseWebCtl {
 	@RequestMapping(value = "/save")
 	@RequiresPermissions("jsjdgl:add")
 	@ResponseBody
-	public WebJsonResult save(Model model, XmxxglEntity code, String fjzdids, String accids, String xmlxid, String tzlxid, String xmhzjbid, String axspjbid, String szgkid, String szgqid, String qtfjids, String qtfjzdids, String zyhbwflid) {
+	public WebJsonResult save(Model model, XmxxglEntity code, String fjzdids, String accids,String sylxid,String xmlxid, String tzlxid, String xmhzjbid, String axspjbid, String szgkid, String szgqid, String qtfjids, String qtfjzdids, String zyhbwflid) {
 		WebJsonResult wr = success();
 		if (StringUtils.isEmpty(code.getXmmc())) {
 			wr.setSuccess(false);
@@ -453,7 +453,9 @@ public class JsjdglCtl extends BaseWebCtl {
 				} else {
 					xmxxgl.setXmmc(code.getXmmc());
 					xmxxgl.setXmfr(code.getXmfr());
+					xmxxgl.setXmgk(code.getXmgk());
 					xmxxgl.setJsdd(code.getJsdd());
+					xmxxgl.setJcsj(code.getJcsj());
 					xmxxgl.setJsgm(code.getJsgm());
 					xmxxgl.setZtz(code.getZtz());
 					xmxxgl.setBwhz(code.getBwhz());
@@ -466,6 +468,11 @@ public class JsjdglCtl extends BaseWebCtl {
 					xmxxgl.setBwdj(code.getBwdj());
 					xmxxgl.setRecordStatus(8);
 					xmxxgl.setSftb(Constants.NO);
+					if (!StringUtils.isEmpty(sylxid)){
+						CodeEntity sylxdx=new CodeEntity();
+						sylxdx.setId(sylxid);
+						xmxxgl.setSylx(sylxdx);
+					}
 					if (!StringUtils.isEmpty(szgkid)) {
 						GkEntity szgk = new GkEntity();
 						szgk.setId(szgkid);
@@ -512,6 +519,11 @@ public class JsjdglCtl extends BaseWebCtl {
 			} else {
 				// 新增直接保存
 				code.setRecordStatus(8);
+				if (!StringUtils.isEmpty(sylxid)){
+					CodeEntity sylxdx=new CodeEntity();
+					sylxdx.setId(sylxid);
+					code.setSylx(sylxdx);
+				}
 				if (!StringUtils.isEmpty(szgkid)) {
 					GkEntity szgk = new GkEntity();
 					szgk.setId(szgkid);