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

gkjsjy/trunk/src/com/xt/jygl/common/BaseWebCtl.java

@@ -115,10 +115,12 @@ public class BaseWebCtl extends BaseCtl {
 			vo.setSzdzw(null != jyr.getSzd() ? jyr.getSzd().getText() : "");
 			vo.setSzgkzw(null != jyr.getSzgk() ? jyr.getSzgk().getGkmc() : "");
 			vo.setSzgqzw(null != jyr.getSzgq() ? jyr.getSzgq().getGqmc() : "");
-
+			vo.setSsgkglbmzw(null!= jyr.getSsgkglbm()?jyr.getSsgkglbm().getGkglbmqc():"");
 			vo.setSzd(null != jyr.getSzd() ? jyr.getSzd().getId() : "");
 			vo.setSzgk(null != jyr.getSzgk() ? jyr.getSzgk().getId() : "");
 			vo.setSzgq(null != jyr.getSzgq() ? jyr.getSzgq().getId() : "");
+			vo.setSsgkglbm(null!=jyr.getSsgkglbm()? jyr.getSsgkglbm().getId():"");
+			
 		}
 		return vo;
 	}
@@ -411,25 +413,17 @@ public class BaseWebCtl extends BaseCtl {
 		try {
 			UserEntity u = (UserEntity) securityMgr.userService().findById(userid);
 			if (u != null) {
-				RTXThread thread = new RTXThread(u.getUname(),msg);
+				RTXThread thread = new RTXThread(u.getUname(), msg);
 				thread.start();
-				/*try {
-					String type = "0";
-					String delayTime = "0";
-					int iRet = -1;
-					RTXSvrApi RtxsvrapiObj = new RTXSvrApi();
-					if (RtxsvrapiObj.Init()) {
-						iRet = RtxsvrapiObj.sendNotify(u.getUname(), "", msg, type, delayTime);
-						if (iRet == 0) {
-							System.out.println("发送成功");
-						} else {
-							System.out.println("发送失败");
-						}
-					}
-					RtxsvrapiObj.UnInit();
-				} catch (Throwable e) {
-					e.printStackTrace();
-				}*/
+				/*
+				 * try { String type = "0"; String delayTime = "0"; int iRet =
+				 * -1; RTXSvrApi RtxsvrapiObj = new RTXSvrApi(); if
+				 * (RtxsvrapiObj.Init()) { iRet =
+				 * RtxsvrapiObj.sendNotify(u.getUname(), "", msg, type,
+				 * delayTime); if (iRet == 0) { System.out.println("发送成功"); }
+				 * else { System.out.println("发送失败"); } } RtxsvrapiObj.UnInit();
+				 * } catch (Throwable e) { e.printStackTrace(); }
+				 */
 
 			}
 		} catch (Throwable e) {
@@ -493,7 +487,7 @@ public class BaseWebCtl extends BaseCtl {
 		String userName = CxfwsUtils.userNameFromHeaderInfo(wscontexts);
 		String pwd = CxfwsUtils.passWordFromHeaderInfo(wscontexts);
 		if (StringUtils.isNotEmpty(userName) && StringUtils.isNotEmpty(pwd)) {
-			UserEntity user = securityMgr.userService().findByUnameszd(userName,GlobalData.CITY_CODE);
+			UserEntity user = securityMgr.userService().findByUnameszd(userName, GlobalData.CITY_CODE);
 			if (user != null) {
 				if (pwd.equals(user.getPassword())) {
 					AuthHandler.setCurrentUser(user);

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/xkzxx/ctl/XkzxxCtl.java

@@ -1409,6 +1409,7 @@ public class XkzxxCtl extends BaseWebCtl {
 					// 经营人许可证更新
 					jyr.setRecordStatus(BaseEntity.RECORD_STATE_VALID);
 					jyr.setFddbr(xkzxx.getFddbr());
+					jyr.setBgdz(xkzxx.getDz());
 					jyr.setLxdh(xkzxx.getLxdh());
 					jyr.setCz(xkzsq.getCz());
 					jyr.setGkjyxkzh(xkzxx.getGkjyxkzh());

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxkbg/ctl/XkzbgCtl.java

@@ -3072,7 +3072,6 @@ public class XkzbgCtl extends BaseWebCtl {
 			XkzxxEntity xkz = new XkzxxEntity();
 			xkz.setGkjyr(njyr.getId());
 			xkz.setSpr(user.getName());
-			xkz.setFddbr(njyr.getFddbr());
 			if (StringUtils.isEmpty(xkzbg.getXbgdz())) {
 				xkz.setDz(xkzbg.getYbgdz());
 			} else {

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxksq/ctl/XkzsqCtl.java

@@ -2838,13 +2838,13 @@ public class XkzsqCtl extends BaseWebCtl {
 			xkz.setZyqyfw(jyfwstr2);
 			xkz.setSpr(user.getName());
 			xkz.setDz(xkzsq.getBgdd());
-			xkz.setFddbr(jyr.getFddbr());
+			xkz.setFddbr(xkzsq.getFddbr());
 			if (!StringUtils.isEmpty(jyr.getSzgq())) {
 				xkz.setSsgq(jyr.getSzgq().getId());
 			}
 
-			xkz.setDz(jyr.getBgdz());
-			xkz.setLxdh(jyr.getLxdh());
+			xkz.setDz(xkzsq.getBgdd());
+			xkz.setLxdh(xkzsq.getLxdh());
 			xkz.setZyqyfw(jyfwstr2);
 			xkz.setCq(jylzstr);
 			if (!StringUtils.isEmpty(user.getSsglbm())) {