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

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

@@ -2276,6 +2276,8 @@ public class XkzbgCtl extends BaseWebCtl {
 					code.setSzgq(jyr.getSzgq());
 					code.setSsgkglbm(jyr.getSsgkglbm());
 					code.setSzd(jyr.getSzd());
+					code.setCreateDateTime(new Timestamp(new Date().getTime()));
+					code.setCreateUser(user.getId());
 				}
 				xkzbgEntity = xkzbgService.submit(code);
 			}

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gklhxkgl/gkjylhbg/ctl/LhbgCtl.java

@@ -231,7 +231,7 @@ public class LhbgCtl extends BaseWebCtl {
 							} else {
 								vo.setCurrentname("经办人受理");
 							}
-						}else if (StringUtils.isEmpty(entity.getFlowstatus()) && entity.getRecordStatus() == BaseEntity.RECORD_STATE_VALID) {
+						} else if (StringUtils.isEmpty(entity.getFlowstatus()) && entity.getRecordStatus() == BaseEntity.RECORD_STATE_VALID) {
 							if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)) {
 								vo.setCurrentname("未提交");
 							} else {
@@ -836,7 +836,15 @@ public class LhbgCtl extends BaseWebCtl {
 								xkz.setFzjg(pglbm.getGkglbmqc());
 							}
 						}
-						xkz.setGkjyxkzh("");
+						List<XkzxxEntity> list = xkzxxService.findByJyrid(jyr.getId());
+						if (list != null && list.size() > 0) {
+							for (XkzxxEntity xkzxx : list) {
+								if ("1".equals(xkzxx.getSfyx())) {
+									xkz.setGkjyxkzh(xkzxx.getGkjyxkzh());
+								}
+							}
+						}
+						
 						xkz.setFzrq(new Date());
 						xkz.setYxqq(new Date());
 						SimpleDateFormat dateTimeFormat = new SimpleDateFormat("yyyy-MM-dd");
@@ -911,9 +919,10 @@ public class LhbgCtl extends BaseWebCtl {
 			e.printStackTrace();
 		}
 	}
-	
+
 	/**
 	 * 退回
+	 * 
 	 * @param id
 	 * @return
 	 */

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gklhxkgl/gkjylhyx/ctl/LhyxCtl.java

@@ -767,6 +767,7 @@ public class LhyxCtl extends BaseWebCtl {
 								xkz.setIsflag("0");
 								xkz = xkzxxService.save(xkz);
 								XkzxxEntity xkzxx = new XkzxxEntity();
+								xkzxx.setGkjyxkzh(xkz.getGkjyxkzh());
 								xkzxx.setCq(xkz.getCq());
 								xkzxx.setDz(xkz.getDz());
 								xkzxx.setFddbr(xkz.getFddbr());
@@ -786,9 +787,9 @@ public class LhyxCtl extends BaseWebCtl {
 								xkzxx.setZyqyfw(xkz.getZyqyfw());
 								xkzxx.setSzgk(xkz.getSzgk());
 								// xkzxx.setZmpicid(xkz.getZmpicid());
-								if (xkz.getYxqz() != null) {
+								if (xkz.getYxqq() != null) {
 									SimpleDateFormat dateTimeFormat = new SimpleDateFormat("yyyy-MM-dd");
-									String date = dateTimeFormat.format(getLastDate(xkz.getYxqq()));
+									String date = dateTimeFormat.format(getLastDate(xkz.getYxqz()));
 									xkzxx.setYxqq(dateTimeFormat.parse(date));
 									String t = (Integer.parseInt(date.substring(0, 4)) + 3) + date.substring(4);
 									xkzxx.setYxqz(dateTimeFormat.parse(t));