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

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkyx/ryxxadd.jsp

@@ -50,7 +50,7 @@
 					var ry = data[i];
 					str+="<tr class='tr_bg'>";
 					if( !isEmpty(ry.xkzid)){
-						str+="<td><input type='checkbox' checked name='ryid' onclick='clickry()'  value='"+ry.id+"'/></td>";
+					str+="<td><input type='checkbox' checked name='ryid' onclick='clickry()'  value='"+ry.id+"'/></td>";
 					str+="<td>"+(ry.ssjyrzw==null? "":ry.ssjyrzw)+"</td>";
 					str+="<td>"+ry.xm+"</td>";
 					str+="<td>"+ry.rylxzw+"</td>";

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkyx/xkzyxjds.jsp

@@ -42,9 +42,7 @@
 			<td align="right" colspan="4" >案号：${jds.ah }</td>
 		</tr>
 		<tr>
-			<td colspan="2">${jds.jyrmc }</td>
-<%-- 			<td colspan="2"><input type="text" class="form-control" id="jyrmc" name="jyrmc" value="${jds.jyrmc }"></td> --%>
-			<td colspan="2">:</td>
+			<td colspan="4">${jds.jyrmc }:</td>
 		</tr>
 		
 		<tr>

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkzx/xkzzxjds.jsp

@@ -42,12 +42,10 @@
 		</tr>
 		<tr>
 				<%-- <td colspan="2"><input  type="text"  class="form-control" id="jyrmc" name="jyrmc" value="${jds.jyrmc }"></td> --%>
-				<td colspan="2">${jds.jyrmc }</td>
-				<td colspan="2">:</td>
+				<td colspan="4">${jds.jyrmc }:</td>
 		</tr>
 		<tr>
-			<td style="text-indent:2em;" nowrap="true">你（单位）于${jds.sqrq }向本机关提出的关于</td>
-			<td colspan="3">${jds.xkzbh }</td>
+			<td colspan="4" style="text-indent:2em;" nowrap="true">你（单位）于${jds.sqrq }向本机关提出的关于 ${jds.xkzbh }</td>
 		</tr>
 		<tr>
 			<td colspan="4">的港口行政许可注销申请。经审查，该行政许可申请符合准予注销的条件。本机关决定准予注销。</td>

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

@@ -1478,54 +1478,63 @@ public class XkzxxCtl extends BaseWebCtl {
 							if (xkzglb.getType().equals("1")) {
 								MtEntity mt = mtService.findOne(xkzglb.getYwid());
 								if (mt != null) {
+									mt.setRecordStatus(BaseEntity.RECORD_STATE_VALID);
 									mt.setXkzid(xkzxx.getId());
 									mtService.save(mt);
 								}
 							} else if (xkzglb.getType().equals("2")) {
 								BwEntity bw = bwService.findOne(xkzglb.getYwid());
 								if (bw != null) {
+									bw.setRecordStatus(BaseEntity.RECORD_STATE_VALID);
 									bw.setXkzid(xkzxx.getId());
 									bwService.save(bw);
 								}
 							} else if (xkzglb.getType().equals("3")) {
 								CgEntity cg = cgService.findOne(xkzglb.getYwid());
 								if (cg != null) {
+									cg.setRecordStatus(BaseEntity.RECORD_STATE_VALID);
 									cg.setXkzid(xkzxx.getId());
 									cgService.save(cg);
 								}
 							} else if (xkzglb.getType().equals("4")) {
 								CkEntity ck = ckService.findOne(xkzglb.getYwid());
 								if (ck != null) {
+									ck.setRecordStatus(BaseEntity.RECORD_STATE_VALID);
 									ck.setXkzid(xkzxx.getId());
 									ckService.save(ck);
 								}
 							} else if (xkzglb.getType().equals("5")) {
 								DcEntity dc = dcService.findOne(xkzglb.getYwid());
 								if (dc != null) {
+									dc.setRecordStatus(BaseEntity.RECORD_STATE_VALID);
 									dc.setXkzid(xkzxx.getId());
 									dcService.save(dc);
 								}
 							} else if (xkzglb.getType().equals("6")) {
 								RyEntity ry = ryService.findOne(xkzglb.getYwid());
 								if (ry != null) {
+									ry.setRecordStatus(BaseEntity.RECORD_STATE_VALID);
 									ry.setXkzid(xkzxx.getId());
 									ryService.save(ry);
 								}
 							} else if (xkzglb.getType().equals("7")) {
 								SssbEntity sssb = sssbService.findOne(xkzglb.getId());
 								if (sssb != null) {
+									sssb.setRecordStatus(BaseEntity.RECORD_STATE_VALID);
 									sssb.setXkzid(xkzxx.getId());
 									sssbService.save(sssb);
 								}
 							} else if (xkzglb.getType().equals("8")) {
 								QytzEntity qytz = qytzService.findOne(xkzglb.getId());
 								if (qytz != null) {
+									qytz.setRecordStatus(BaseEntity.RECORD_STATE_VALID);
 									qytz.setXkzid(xkzxx.getId());
 									qytzService.save(qytz);
 								}
 							} else if (xkzglb.getType().equals("9")) {
 								ZxjxEntity zxjx = zxjxService.findOne(xkzglb.getId());
 								if (zxjx != null) {
+									zxjx.setRecordStatus(BaseEntity.RECORD_STATE_VALID);
 									zxjx.setXkzid(xkzxx.getId());
 									zxjxService.save(zxjx);
 								}

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxkyx/ctl/XkzyxCtl.java

@@ -2082,6 +2082,7 @@ public class XkzyxCtl extends BaseWebCtl {
 			if (xkzlist.size() > 0) {
 				for (XkzxxEntity xkz : xkzlist) {
 					if (xkz != null) {
+						jds.setXkzbh(xkz.getGkjyxkzh());
 						SimpleDateFormat dataTime = new SimpleDateFormat("yyyy-MM-dd");
 						String date = dataTime.format(getLastDate(xkz.getYxqz()));
 						// xkzxx.setYxqq(dateTimeFormat.parse(date));
@@ -2096,7 +2097,7 @@ public class XkzyxCtl extends BaseWebCtl {
 					}
 				}
 			}
-			jds.setXkzbh(jyr.getGkjyxkzh());
+			
 			jds = xkzyxjdsService.save(jds);
 
 		} catch (Exception e) {

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxkzx/ctl/XkzzxCtl.java

@@ -1821,10 +1821,10 @@ public class XkzzxCtl extends BaseWebCtl {
 			}
 
 			GkjyrEntity jyr = gkjyrService.findOne(code.getJyrid());
-			GkjyrEntity yjyr = gkjyrService.findOne(jyr.getYjyrid());
-			yjyr.setRecordStatus(BaseEntity.RECORE_STATE_ZXFLAG);
-			yjyr = gkjyrService.save(yjyr);
-			changStatus(yjyr.getId(), BaseEntity.RECORE_STATE_ZXFLAG);
+			jyr.setRecordStatus(BaseEntity.RECORE_STATE_ZXFLAG);
+			jyr = gkjyrService.save(jyr);
+			changStatus(jyr.getId(), BaseEntity.RECORE_STATE_ZXFLAG);
+
 
 			if (!StringUtils.isEmpty(accid)) {
 				// 关联附件