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

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

@@ -721,7 +721,7 @@ public class XkzxxCtl extends BaseWebCtl {
 								wr.setMessage("该经营人已经延续过许可证，请勿再申请");
 								return wr;
 							}
-						}else if(flag == null){
+						} else if (flag == null) {
 							List<LhbgEntity> lhbglist = lhbgService.findByJyrid(gkjyr.getId());
 							if (lhbglist != null && lhbglist.size() > 0) {
 								for (LhbgEntity lhbg : lhbglist) {
@@ -1342,6 +1342,24 @@ public class XkzxxCtl extends BaseWebCtl {
 					xkzxx = xkzxxService.save(xkzxx);
 
 					LhsqEntity entity = lhsqService.findOne(opId);
+
+					GkjyrEntity jyr = gkjyrService.findOne(xkzxx.getGkjyr());
+					// 经营人许可证更新
+					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());
+					jyr.setJyfw(xkzxx.getZyqyfw());
+					jyr.setJyqy(xkzxx.getCq());
+					jyr.setFzrq(xkzxx.getFzrq());
+					jyr.setFzjg(xkzxx.getFzjg());
+					jyr.setZczb(entity.getZczb());
+					jyr.setGsyyzzbh(entity.getGsyyzzbh());
+					jyr.setLxdh(entity.getLxdh());
+					jyr = gkjyrService.save(jyr);
+
 					entity.setSftb(Constants.YES);
 					lhsqService.save(entity);
 					try {
@@ -1354,7 +1372,7 @@ public class XkzxxCtl extends BaseWebCtl {
 							fjid = fjid.substring(0, fjid.length() - 1);
 						}
 
-						String url = "GK_OPERATION_JSJY_LHSQ_ONE_PC?condition=ID=" + entity.getId() + ";FJID=" + fjid;
+						String url = "GK_OPERATION_JSJY_LHSQ_ONE_PC?condition=ID=" + entity.getId() + ";FJID=" + fjid + ";JYRID=" + jyr.getId();
 						System.out.println(url);
 						boolean tbflag = getTbStatus(url, entity.getSzd().getId());
 						if (tbflag) {
@@ -1382,6 +1400,11 @@ public class XkzxxCtl extends BaseWebCtl {
 					xkzxx.setSfyx("1");
 					xkzxx = xkzxxService.save(xkzxx);
 
+					GkjyrEntity jyr = gkjyrService.findOne(entity.getJyrid());
+					jyr.setFddbr(xkzxx.getFddbr());
+					jyr.setBgdz(xkzxx.getDz());
+					jyr = gkjyrService.save(jyr);
+
 					entity.setSftb(Constants.YES);
 					entity = lhbgService.save(entity);
 					// 如果是省级审核通过或不通过后同步到市级
@@ -1717,6 +1740,11 @@ public class XkzxxCtl extends BaseWebCtl {
 					njyr.setZyjsrysl(bgjyr.getZyjspxrysl());
 					njyr.setZywxhwpm(bgjyr.getZywxhwpm());
 					njyr.setZzagrysl(bgjyr.getZzagrysl());
+					njyr.setGkjyxkzh(xkzxx.getGkjyxkzh());
+					njyr.setFzrq(xkzxx.getFzrq());
+					njyr.setFzjg(xkzxx.getFzjg());
+					njyr.setJyfw(xkzxx.getCq());
+					njyr.setJyqy(xkzxx.getZyqyfw());
 					njyr.setRecordStatus(BaseEntity.RECORD_STATE_VALID);
 					njyr = gkjyrService.save(njyr);