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

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyr/xkzxx/editxkz.jsp

@@ -178,9 +178,9 @@
 				</table>
 				</form>
 				<div  id="buttons">
-				<a class="btn btn-default btn-sm" href="#" onclick="xkzxx.detail.save()">
+			<!-- 	<a class="btn btn-default btn-sm" href="#" onclick="xkzxx.detail.save()">
 			   		<i class="glyphicon glyphicon-floppy-disk"></i>保存
-			   	</a>
+			   	</a> -->
 			   	<c:if test="${opId != null  }">
 			   	<a class="btn btn-default btn-sm" href="#" onclick="xkzxx.detail.saveFzxkz()">
 			   		<i class="glyphicon glyphicon-floppy-disk"></i>发证

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxkbg/xkzbgmain.jsp

@@ -177,7 +177,12 @@
 									         </a>
 							 </c:if>
 							  <c:if test="${xkz.taskState =='TH'}">
-							 <a class="btn btn-default btn-xs" href="#"  onclick="xkzbg.main.back('${xkz.id}')" title="">
+							    <authz:hasPermission name="${appName}:gkjyxkbg:delete">	        
+									          <a class="btn btn-default btn-xs" href="#" onclick="xkzbg.main.del('${xkz.id}')" title="删除">
+									   <i class="glyphicon glyphicon-trash"></i> 
+									         </a>
+									         </authz:hasPermission>
+							 <a class="btn btn-default btn-xs" href="#"  onclick="xkzbg.main.back('${xkz.id}')" title="办理">
 									   <i class="glyphicon glyphicon-check"></i> 
 									         </a>
 							 </c:if>

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

@@ -160,6 +160,11 @@
 									          </a>
 							 </c:if>
 							  <c:if test="${xkz.taskState =='TH'}">
+							    <authz:hasPermission name="${appName}:gkjyxkyx:delete">
+									          <a class="btn btn-default btn-xs" href="#" onclick="xkzyx.main.del('${xkz.id}')" title="删除">
+									   <i class="glyphicon glyphicon-trash"></i> 
+									         </a>
+									         </authz:hasPermission>
 							 <a class="btn btn-default btn-xs" href="#"  onclick="xkzyx.main.back('${xkz.id}')" title="办理">
 									   <i class="glyphicon glyphicon-check"></i> 
 									          </a>

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

@@ -154,6 +154,11 @@
 									          </a>
 							 </c:if>
 							 <c:if test="${xkz.taskState =='TH'}">
+							   <authz:hasPermission name="${appName}:gkjyxkzx:delete">
+									          <a class="btn btn-default btn-xs" href="#" onclick="xkzzx.main.del('${xkz.id}')" title="删除">
+									   <i class="glyphicon glyphicon-trash"></i> 
+									         </a>
+									         </authz:hasPermission>
 							 <a class="btn btn-default btn-xs" href="#"  onclick="xkzzx.main.back('${xkz.id}')" title="办理">
 									   <i class="glyphicon glyphicon-check"></i> 
 									          </a>

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

@@ -584,11 +584,11 @@ public class XkzxxCtl extends BaseWebCtl {
 					wr.setSuccess(false);
 					if (gkjyr.getRecordStatus() == 5) {
 						wr.setMessage("该经营人正在许可申请中，不可操作！！！");
-					} else if (gkjyr.getRecordStatus() == 6) {
+					} else if (gkjyr.getRecordStatus() == 6 ) {
 						wr.setMessage("该经营人正在许可延续中，不可操作！！！");
-					} else if (gkjyr.getRecordStatus() == 7) {
+					} else if (gkjyr.getRecordStatus() == 7 || gkjyr.getRecordStatus() == 11) {
 						wr.setMessage("该经营人正在许可注销中，不可操作！！！");
-					} else if (gkjyr.getRecordStatus() == 8) {
+					} else if (gkjyr.getRecordStatus() == 8 || gkjyr.getRecordStatus() == 10) {
 						wr.setMessage("该经营人正在许可变更中，不可操作！！！");
 					} else if (gkjyr.getRecordStatus() == 9) {
 						wr.setMessage("该经营人已删除，不可操作！！！");

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

@@ -538,14 +538,16 @@ public class XkzbgCtl extends BaseWebCtl {
 				for (XkzyxfjEntity fj : list) {
 					if (fj != null) {
 						XkzbgfjEntity xkzbgfj = new XkzbgfjEntity();
-						AccessoryEntity acc = accessoryService.findOne(fj.getFjid());
-						if (!StringUtils.isEmpty(acc)) {
-							acc = accessoryService.copyFile(fj.getFjid(), "xkzyx", "xkzyx");
-							xkzbgfj.setFjid(acc.getId());
-							xkzbgfj.setSortno(fj.getSortno());
-							xkzbgfj.setFjmc(fj.getFjmc());
-							xkzbgfj = xkzbgfjService.save(xkzbgfj);
-							xkzfjList.add(xkzbgfj);
+						if (!StringUtils.isEmpty(fj.getFjid())) {
+							AccessoryEntity acc = accessoryService.findOne(fj.getFjid());
+							if (!StringUtils.isEmpty(acc)) {
+								acc = accessoryService.copyFile(fj.getFjid(), "xkzyx", "xkzyx");
+								xkzbgfj.setFjid(acc.getId());
+								xkzbgfj.setSortno(fj.getSortno());
+								xkzbgfj.setFjmc(fj.getFjmc());
+								xkzbgfj = xkzbgfjService.save(xkzbgfj);
+								xkzfjList.add(xkzbgfj);
+							}
 						}
 					}
 
@@ -1701,12 +1703,17 @@ public class XkzbgCtl extends BaseWebCtl {
 			GkjyrEntity jyr = gkjyrService.findOne(xkzbgEntity.getJyrid());
 			jyr.setRecordStatus(BaseEntity.RECORE_STATE_BGFLAG);
 			jyr = gkjyrService.save(jyr);
-			changStatus(jyr.getId());
+			changStatus(jyr.getId(),BaseEntity.RECORE_STATE_BGFLAG);
 
 			GkjyrEntity bgjyr = gkjyrService.findOne(jyr.getBgjyrid());
 			bgjyr.setRecordStatus(BaseEntity.RECORE_STATE_BGFLAG);
 			bgjyr = gkjyrService.save(bgjyr);
-			changStatus(bgjyr.getId());
+			changStatus(bgjyr.getId(),BaseEntity.RECORE_STATE_BGFLAG);
+			
+			GkjyrEntity yjyr = gkjyrService.findOne(jyr.getYjyrid());
+			yjyr.setRecordStatus(BaseEntity.RECORE_STATE_BGFLAG);
+			yjyr = gkjyrService.save(yjyr);
+			changStatus(yjyr.getId(),BaseEntity.RECORE_STATE_BGFLAG);
 
 			// 码头
 			List<XkzglbEntity> xkzglbList = xkzglbService.findByCzid(xkzbgEntity.getId(), "1");
@@ -1909,40 +1916,21 @@ public class XkzbgCtl extends BaseWebCtl {
 	}
 
 	// 改变状态
-	public void changStatus(String jyrid) {
+	public void changStatus(String jyrid, int state) {
 		// 经营范围 业务种类
 		List<XkzjyfwEntity> list = xkzjyfwService.findByJyrid(jyrid);
 		if (list != null && list.size() > 0) {
 			for (int i = 0; i < list.size(); i++) {
 				XkzjyfwEntity entity = list.get(i);
-
-				entity.setRecordStatus(BaseEntity.RECORE_STATE_BGFLAG);
+				entity.setRecordStatus(state);
 				xkzjyfwService.save(entity);
 			}
 		}
-
-		// 许可证
-		List<XkzxxEntity> xkzlist = xkzxxService.findByJyrid(jyrid);
-		if (xkzlist != null && xkzlist.size() > 0) {
-			for (XkzxxEntity xkz : xkzlist) {
-				xkz.setRecordStatus(BaseEntity.RECORE_STATE_BGFLAG);
-				xkzxxService.save(xkz);
-			}
-		}
-		// 许可附证
-		List<XkzfzEntity> xkzfzlist = xkzfzService.findByJyrid(jyrid);
-		if (xkzfzlist != null && xkzfzlist.size() > 0) {
-			for (XkzfzEntity xkzfz : xkzfzlist) {
-				xkzfz.setRecordStatus(BaseEntity.RECORE_STATE_BGFLAG);
-				xkzfzService.save(xkzfz);
-			}
-		}
-
 		// 码头
 		List<MtEntity> mtlist = mtService.findByJyrid(jyrid);
 		if (mtlist.size() > 0 && mtlist != null) {
 			for (MtEntity mt : mtlist) {
-				mt.setRecordStatus(BaseEntity.RECORE_STATE_BGFLAG);
+				mt.setRecordStatus(state);
 				mtService.save(mt);
 			}
 		}
@@ -1950,7 +1938,7 @@ public class XkzbgCtl extends BaseWebCtl {
 		List<BwEntity> bwlist = bwService.findByJyrid(jyrid);
 		if (bwlist != null && bwlist.size() > 0) {
 			for (BwEntity bw : bwlist) {
-				bw.setRecordStatus(BaseEntity.RECORE_STATE_BGFLAG);
+				bw.setRecordStatus(state);
 				bwService.save(bw);
 			}
 		}
@@ -1958,7 +1946,7 @@ public class XkzbgCtl extends BaseWebCtl {
 		List<CgEntity> cglist = cgService.findByJyrid(jyrid);
 		if (cglist != null && cglist.size() > 0) {
 			for (CgEntity cg : cglist) {
-				cg.setRecordStatus(BaseEntity.RECORE_STATE_BGFLAG);
+				cg.setRecordStatus(state);
 				cgService.save(cg);
 			}
 		}
@@ -1966,7 +1954,7 @@ public class XkzbgCtl extends BaseWebCtl {
 		List<CkEntity> cklist = ckService.findByJyrid(jyrid);
 		if (cklist != null && cklist.size() > 0) {
 			for (CkEntity ck : cklist) {
-				ck.setRecordStatus(BaseEntity.RECORE_STATE_BGFLAG);
+				ck.setRecordStatus(state);
 				ckService.save(ck);
 			}
 		}
@@ -1974,7 +1962,7 @@ public class XkzbgCtl extends BaseWebCtl {
 		List<DcEntity> dclist = dcService.findByJyrid(jyrid);
 		if (dclist != null && dclist.size() > 0) {
 			for (DcEntity dc : dclist) {
-				dc.setRecordStatus(BaseEntity.RECORE_STATE_BGFLAG);
+				dc.setRecordStatus(state);
 				dcService.save(dc);
 			}
 		}
@@ -1982,7 +1970,7 @@ public class XkzbgCtl extends BaseWebCtl {
 		List<RyEntity> rylist = ryService.findByJyrid(jyrid);
 		if (rylist != null && rylist.size() > 0) {
 			for (RyEntity ry : rylist) {
-				ry.setRecordStatus(BaseEntity.RECORE_STATE_BGFLAG);
+				ry.setRecordStatus(state);
 				ryService.save(ry);
 			}
 		}
@@ -1990,7 +1978,7 @@ public class XkzbgCtl extends BaseWebCtl {
 		List<SssbEntity> sssblist = sssbService.findByJyrid(jyrid);
 		if (sssblist != null && sssblist.size() > 0) {
 			for (SssbEntity sssb : sssblist) {
-				sssb.setRecordStatus(BaseEntity.RECORE_STATE_BGFLAG);
+				sssb.setRecordStatus(state);
 				sssbService.save(sssb);
 			}
 		}
@@ -1998,7 +1986,7 @@ public class XkzbgCtl extends BaseWebCtl {
 		List<QytzEntity> qytzlist = qytzService.findByJyrid(jyrid);
 		if (qytzlist != null && qytzlist.size() > 0) {
 			for (QytzEntity qytz : qytzlist) {
-				qytz.setRecordStatus(BaseEntity.RECORE_STATE_BGFLAG);
+				qytz.setRecordStatus(state);
 				qytzService.save(qytz);
 			}
 		}
@@ -2006,7 +1994,7 @@ public class XkzbgCtl extends BaseWebCtl {
 		List<ZxjxEntity> zxjxlist = zxjxService.findByJyrid(jyrid);
 		if (zxjxlist != null && zxjxlist.size() > 0) {
 			for (ZxjxEntity zxjx : zxjxlist) {
-				zxjx.setRecordStatus(BaseEntity.RECORE_STATE_BGFLAG);
+				zxjx.setRecordStatus(state);
 				zxjxService.save(zxjx);
 			}
 		}
@@ -2082,12 +2070,12 @@ public class XkzbgCtl extends BaseWebCtl {
 			GkjyrEntity jyr = gkjyrService.findOne(xkzbgEntity.getJyrid());
 			jyr.setRecordStatus(BaseEntity.RECORE_STATE_BGFLAG);
 			jyr = gkjyrService.save(jyr);
-			changStatus(jyr.getId());
+			changStatus(jyr.getId(),BaseEntity.RECORE_STATE_BGFLAG);
 
 			GkjyrEntity bgjyr = gkjyrService.findOne(jyr.getBgjyrid());
 			bgjyr.setRecordStatus(BaseEntity.RECORE_STATE_BGFLAG);
 			bgjyr = gkjyrService.save(bgjyr);
-			changStatus(bgjyr.getId());
+			changStatus(bgjyr.getId(),BaseEntity.RECORE_STATE_BGFLAG);
 
 			// 码头
 			List<XkzglbEntity> xkzglbList = xkzglbService.findByCzid(xkzbgEntity.getId(), "1");
@@ -2545,8 +2533,10 @@ public class XkzbgCtl extends BaseWebCtl {
 			xkzbgService.logicDelete(id);
 			XkzbgEntity entity = xkzbgService.findOne(id);
 			GkjyrEntity gkjyr = gkjyrService.findOne(entity.getJyrid());
-			gkjyr.setRecordStatus(BaseEntity.RECORD_STATE_VALID);
-			gkjyrService.save(gkjyr);
+			GkjyrEntity ygkjyr = gkjyrService.findOne(gkjyr.getYjyrid());
+			ygkjyr.setRecordStatus(BaseEntity.RECORD_STATE_VALID);
+			gkjyrService.save(ygkjyr);
+			changStatus(ygkjyr.getId(), BaseEntity.RECORD_STATE_VALID);
 		} catch (Exception e) {
 			wr.setSuccess(false);
 			wr.setMessage("操作失败！");

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxkbg/service/impl/XkzbgServiceImpl.java

@@ -34,6 +34,8 @@ import com.xt.jygl.gkjygl.gkjyr.zxjx.service.ZxjxService;
 import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxkbg.dao.XkzbgDao;
 import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxkbg.entity.XkzbgEntity;
 import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxkbg.service.XkzbgService;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxksq.entity.XkzjyfwEntity;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxksq.service.XkzjyfwService;
 import com.xt.jygl.workflow.entity.TaskInfoEntity;
 import com.xt.jygl.workflow.param.WorkFlowParam;
 import com.xt.jygl.workflow.service.impl.BaseWorkFlowServiceImpl;
@@ -73,6 +75,8 @@ public class XkzbgServiceImpl extends BaseWorkFlowServiceImpl<XkzbgEntity, Strin
 	private ZxjxService zxjxService;
 	@Autowired
 	protected SecurityMgr securityMgr;
+	@Autowired
+	private XkzjyfwService xkzjyfwService;
 
 	@Override
 	protected SecRepository<XkzbgEntity, String> getDao() {
@@ -133,6 +137,17 @@ public class XkzbgServiceImpl extends BaseWorkFlowServiceImpl<XkzbgEntity, Strin
 
 	// 改变状态
 	public void changStatus(String jyrid, int state) {
+
+		// 经营范围 业务种类
+		List<XkzjyfwEntity> list = xkzjyfwService.findByJyrid(jyrid);
+		if (list != null && list.size() > 0) {
+			for (int i = 0; i < list.size(); i++) {
+				XkzjyfwEntity entity = list.get(i);
+
+				entity.setRecordStatus(state);
+				xkzjyfwService.save(entity);
+			}
+		}
 		// 码头
 		List<MtEntity> mtlist = mtService.findByJyrid(jyrid);
 		if (mtlist.size() > 0 && mtlist != null) {
@@ -234,10 +249,10 @@ public class XkzbgServiceImpl extends BaseWorkFlowServiceImpl<XkzbgEntity, Strin
 			if (jyr != null) {
 				GkjyrEntity njyr = gkjyrService.findOne(jyr.getYjyrid());
 				if (njyr != null) {
-					//njyr.setRecordStatus(BaseEntity.RECORD_STATE_VALID);
+					// njyr.setRecordStatus(BaseEntity.RECORD_STATE_VALID);
 					gkjyrService.save(njyr);
 					// 改变状态
-					//changStatus(njyr.getId(), BaseEntity.RECORD_STATE_VALID);
+					// changStatus(njyr.getId(), BaseEntity.RECORD_STATE_VALID);
 				}
 			}
 			return true;

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

@@ -1493,10 +1493,17 @@ public class XkzzxCtl extends BaseWebCtl {
 				}
 				xkzzxEntity = xkzzxService.save(code);
 			}
+			//注销经营人
 			GkjyrEntity jyr = gkjyrService.findOne(code.getJyrid());
 			jyr.setRecordStatus(BaseEntity.RECORE_STATE_ZXFLAG);
 			jyr = gkjyrService.save(jyr);
-			changStatus(jyr.getId());
+			changStatus(jyr.getId(),BaseEntity.RECORE_STATE_ZXFLAG);
+			
+			//原经营人
+			GkjyrEntity yjyr = gkjyrService.findOne(jyr.getYjyrid());
+			yjyr.setRecordStatus(BaseEntity.RECORE_STATE_ZXFLAG);
+			yjyr = gkjyrService.save(yjyr);
+			changStatus(yjyr.getId(), BaseEntity.RECORE_STATE_ZXFLAG);
 
 			if (!StringUtils.isEmpty(accid)) {
 				// 关联附件
@@ -1518,39 +1525,21 @@ public class XkzzxCtl extends BaseWebCtl {
 	}
 
 	// 改变状态
-	public void changStatus(String jyrid) {
+	public void changStatus(String jyrid, int state) {
 		// 经营范围 业务种类
 		List<XkzjyfwEntity> list = xkzjyfwService.findByJyrid(jyrid);
 		if (list != null && list.size() > 0) {
 			for (int i = 0; i < list.size(); i++) {
 				XkzjyfwEntity entity = list.get(i);
-				entity.setRecordStatus(BaseEntity.RECORE_STATE_ZXFLAG);
+				entity.setRecordStatus(state);
 				xkzjyfwService.save(entity);
 			}
 		}
-
-		// 许可证
-		List<XkzxxEntity> xkzlist = xkzxxService.findByJyrid(jyrid);
-		if (xkzlist != null && xkzlist.size() > 0) {
-			for (XkzxxEntity xkz : xkzlist) {
-				xkz.setRecordStatus(BaseEntity.RECORE_STATE_ZXFLAG);
-				xkzxxService.save(xkz);
-			}
-		}
-		// 许可附证
-		List<XkzfzEntity> xkzfzlist = xkzfzService.findByJyrid(jyrid);
-		if (xkzfzlist != null && xkzfzlist.size() > 0) {
-			for (XkzfzEntity xkzfz : xkzfzlist) {
-				xkzfz.setRecordStatus(BaseEntity.RECORE_STATE_ZXFLAG);
-				xkzfzService.save(xkzfz);
-			}
-		}
-
 		// 码头
 		List<MtEntity> mtlist = mtService.findByJyrid(jyrid);
 		if (mtlist.size() > 0 && mtlist != null) {
 			for (MtEntity mt : mtlist) {
-				mt.setRecordStatus(BaseEntity.RECORE_STATE_ZXFLAG);
+				mt.setRecordStatus(state);
 				mtService.save(mt);
 			}
 		}
@@ -1558,7 +1547,7 @@ public class XkzzxCtl extends BaseWebCtl {
 		List<BwEntity> bwlist = bwService.findByJyrid(jyrid);
 		if (bwlist != null && bwlist.size() > 0) {
 			for (BwEntity bw : bwlist) {
-				bw.setRecordStatus(BaseEntity.RECORE_STATE_ZXFLAG);
+				bw.setRecordStatus(state);
 				bwService.save(bw);
 			}
 		}
@@ -1566,7 +1555,7 @@ public class XkzzxCtl extends BaseWebCtl {
 		List<CgEntity> cglist = cgService.findByJyrid(jyrid);
 		if (cglist != null && cglist.size() > 0) {
 			for (CgEntity cg : cglist) {
-				cg.setRecordStatus(BaseEntity.RECORE_STATE_ZXFLAG);
+				cg.setRecordStatus(state);
 				cgService.save(cg);
 			}
 		}
@@ -1574,7 +1563,7 @@ public class XkzzxCtl extends BaseWebCtl {
 		List<CkEntity> cklist = ckService.findByJyrid(jyrid);
 		if (cklist != null && cklist.size() > 0) {
 			for (CkEntity ck : cklist) {
-				ck.setRecordStatus(BaseEntity.RECORE_STATE_ZXFLAG);
+				ck.setRecordStatus(state);
 				ckService.save(ck);
 			}
 		}
@@ -1582,7 +1571,7 @@ public class XkzzxCtl extends BaseWebCtl {
 		List<DcEntity> dclist = dcService.findByJyrid(jyrid);
 		if (dclist != null && dclist.size() > 0) {
 			for (DcEntity dc : dclist) {
-				dc.setRecordStatus(BaseEntity.RECORE_STATE_ZXFLAG);
+				dc.setRecordStatus(state);
 				dcService.save(dc);
 			}
 		}
@@ -1590,7 +1579,7 @@ public class XkzzxCtl extends BaseWebCtl {
 		List<RyEntity> rylist = ryService.findByJyrid(jyrid);
 		if (rylist != null && rylist.size() > 0) {
 			for (RyEntity ry : rylist) {
-				ry.setRecordStatus(BaseEntity.RECORE_STATE_ZXFLAG);
+				ry.setRecordStatus(state);
 				ryService.save(ry);
 			}
 		}
@@ -1598,7 +1587,7 @@ public class XkzzxCtl extends BaseWebCtl {
 		List<SssbEntity> sssblist = sssbService.findByJyrid(jyrid);
 		if (sssblist != null && sssblist.size() > 0) {
 			for (SssbEntity sssb : sssblist) {
-				sssb.setRecordStatus(BaseEntity.RECORE_STATE_ZXFLAG);
+				sssb.setRecordStatus(state);
 				sssbService.save(sssb);
 			}
 		}
@@ -1606,7 +1595,7 @@ public class XkzzxCtl extends BaseWebCtl {
 		List<QytzEntity> qytzlist = qytzService.findByJyrid(jyrid);
 		if (qytzlist != null && qytzlist.size() > 0) {
 			for (QytzEntity qytz : qytzlist) {
-				qytz.setRecordStatus(BaseEntity.RECORE_STATE_ZXFLAG);
+				qytz.setRecordStatus(state);
 				qytzService.save(qytz);
 			}
 		}
@@ -1614,7 +1603,7 @@ public class XkzzxCtl extends BaseWebCtl {
 		List<ZxjxEntity> zxjxlist = zxjxService.findByJyrid(jyrid);
 		if (zxjxlist != null && zxjxlist.size() > 0) {
 			for (ZxjxEntity zxjx : zxjxlist) {
-				zxjx.setRecordStatus(BaseEntity.RECORE_STATE_ZXFLAG);
+				zxjx.setRecordStatus(state);
 				zxjxService.save(zxjx);
 			}
 		}
@@ -1651,9 +1640,10 @@ public class XkzzxCtl extends BaseWebCtl {
 			}
 
 			GkjyrEntity jyr = gkjyrService.findOne(code.getJyrid());
-			jyr.setRecordStatus(BaseEntity.RECORE_STATE_ZXFLAG);
-			jyr = gkjyrService.save(jyr);
-			changStatus(jyr.getId());
+			GkjyrEntity yjyr = gkjyrService.findOne(jyr.getYjyrid());
+			yjyr.setRecordStatus(BaseEntity.RECORE_STATE_ZXFLAG);
+			yjyr = gkjyrService.save(yjyr);
+			changStatus(yjyr.getId(),BaseEntity.RECORE_STATE_ZXFLAG);
 
 			if (!StringUtils.isEmpty(accid)) {
 				// 关联附件
@@ -1931,8 +1921,10 @@ public class XkzzxCtl extends BaseWebCtl {
 			xkzzxService.logicDelete(id);
 			XkzzxEntity entity = xkzzxService.findOne(id);
 			GkjyrEntity gkjyr = gkjyrService.findOne(entity.getJyrid());
-			gkjyr.setRecordStatus(BaseEntity.RECORD_STATE_VALID);
-			gkjyrService.save(gkjyr);
+			GkjyrEntity ygkjyr = gkjyrService.findOne(gkjyr.getYjyrid());
+			ygkjyr.setRecordStatus(BaseEntity.RECORD_STATE_VALID);
+			gkjyrService.save(ygkjyr);
+			changStatus(ygkjyr.getId(),BaseEntity.RECORD_STATE_VALID);
 		} catch (Exception e) {
 			wr.setSuccess(false);
 			wr.setMessage("操作失败！");
@@ -2062,6 +2054,7 @@ public class XkzzxCtl extends BaseWebCtl {
 			List<XkzxxEntity> xkzxxs = xkzxxService.findByJyrid(xkzzx.getJyrid());
 			for (XkzxxEntity xkzxx : xkzxxs) {
 				xkzxx.setUpdateDateTime(new Timestamp(new Date().getTime()));
+				// xkzxx.setSfyx(Constants.XKZ_ZX);
 				xkzxxService.save(xkzxx);
 			}
 			// 原数据操作

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxkzx/service/impl/XkzzxServiceImpl.java

@@ -9,8 +9,30 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.xt.jygl.common.Constants;
+import com.xt.jygl.gkjcxx.mt.entity.MtEntity;
+import com.xt.jygl.gkjcxx.mt.service.MtService;
+import com.xt.jygl.gkjygl.gkjyr.jyrbw.service.BwService;
+import com.xt.jygl.gkjygl.gkjyr.jyrcg.entity.CgEntity;
+import com.xt.jygl.gkjygl.gkjyr.jyrcg.service.CgService;
+import com.xt.jygl.gkjygl.gkjyr.jyrck.entity.CkEntity;
+import com.xt.jygl.gkjygl.gkjyr.jyrck.service.CkService;
+import com.xt.jygl.gkjygl.gkjyr.jyrdc.entity.DcEntity;
+import com.xt.jygl.gkjygl.gkjyr.jyrdc.service.DcService;
+import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.entity.BwEntity;
 import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.entity.GkjyrEntity;
+import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.entity.RyEntity;
 import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.service.GkjyrService;
+import com.xt.jygl.gkjygl.gkjyr.qytz.entity.QytzEntity;
+import com.xt.jygl.gkjygl.gkjyr.qytz.service.QytzService;
+import com.xt.jygl.gkjygl.gkjyr.ry.service.RyService;
+import com.xt.jygl.gkjygl.gkjyr.ry.service.RyzsService;
+import com.xt.jygl.gkjygl.gkjyr.sssb.entity.SssbEntity;
+import com.xt.jygl.gkjygl.gkjyr.sssb.service.SssbService;
+import com.xt.jygl.gkjygl.gkjyr.xkzxx.service.XkzxxService;
+import com.xt.jygl.gkjygl.gkjyr.zxjx.entity.ZxjxEntity;
+import com.xt.jygl.gkjygl.gkjyr.zxjx.service.ZxjxService;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxksq.entity.XkzjyfwEntity;
+import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxksq.service.XkzjyfwService;
 import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxkzx.dao.XkzzxDao;
 import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxkzx.entity.XkzzxEntity;
 import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxkzx.service.XkzzxService;
@@ -31,6 +53,30 @@ public class XkzzxServiceImpl extends BaseWorkFlowServiceImpl<XkzzxEntity, Strin
 	private GkjyrService gkjyrService;
 	@Autowired
 	protected SecurityMgr securityMgr;
+	@Autowired
+	private MtService mtService;
+	@Autowired
+	private BwService bwService;
+	@Autowired
+	private CgService cgService;
+	@Autowired
+	private CkService ckService;
+	@Autowired
+	private DcService dcService;
+	@Autowired
+	private RyService ryService;
+	@Autowired
+	private SssbService sssbService;
+	@Autowired
+	private QytzService qytzService;
+	@Autowired
+	private XkzxxService xkzxxService;
+	@Autowired
+	private RyzsService ryzsService;
+	@Autowired
+	private ZxjxService zxjxService;
+	@Autowired
+	private XkzjyfwService xkzjyfwService;
 
 	@Override
 	protected SecRepository<XkzzxEntity, String> getDao() {
@@ -77,13 +123,103 @@ public class XkzzxServiceImpl extends BaseWorkFlowServiceImpl<XkzzxEntity, Strin
 			// 修改经营人状态
 			GkjyrEntity jyr = gkjyrService.findOne(entity.getJyrid());
 			if (jyr != null) {
-				jyr.setRecordStatus(BaseEntity.RECORD_STATE_ZX);
-				gkjyrService.save(jyr);
+				GkjyrEntity njyr = gkjyrService.findOne(jyr.getYjyrid());
+				if (njyr != null) {
+					njyr.setRecordStatus(BaseEntity.RECORD_STATE_ZX);
+					gkjyrService.save(njyr);
+					// 改变状态
+					changStatus(njyr.getId(), BaseEntity.RECORD_STATE_ZX);
+				}
 			}
 		}
 		return entity;
 	}
 
+	// 改变状态
+	public void changStatus(String jyrid, int state) {
+		// 经营范围 业务种类
+		List<XkzjyfwEntity> list = xkzjyfwService.findByJyrid(jyrid);
+		if (list != null && list.size() > 0) {
+			for (int i = 0; i < list.size(); i++) {
+				XkzjyfwEntity entity = list.get(i);
+				entity.setRecordStatus(state);
+				xkzjyfwService.save(entity);
+			}
+		}
+		// 码头
+		List<MtEntity> mtlist = mtService.findByJyrid(jyrid);
+		if (mtlist.size() > 0 && mtlist != null) {
+			for (MtEntity mt : mtlist) {
+				mt.setRecordStatus(state);
+				mtService.save(mt);
+			}
+		}
+		// 泊位
+		List<BwEntity> bwlist = bwService.findByJyrid(jyrid);
+		if (bwlist != null && bwlist.size() > 0) {
+			for (BwEntity bw : bwlist) {
+				bw.setRecordStatus(state);
+				bwService.save(bw);
+			}
+		}
+		// 储罐
+		List<CgEntity> cglist = cgService.findByJyrid(jyrid);
+		if (cglist != null && cglist.size() > 0) {
+			for (CgEntity cg : cglist) {
+				cg.setRecordStatus(state);
+				cgService.save(cg);
+			}
+		}
+		// 仓库
+		List<CkEntity> cklist = ckService.findByJyrid(jyrid);
+		if (cklist != null && cklist.size() > 0) {
+			for (CkEntity ck : cklist) {
+				ck.setRecordStatus(state);
+				ckService.save(ck);
+			}
+		}
+		// 堆场
+		List<DcEntity> dclist = dcService.findByJyrid(jyrid);
+		if (dclist != null && dclist.size() > 0) {
+			for (DcEntity dc : dclist) {
+				dc.setRecordStatus(state);
+				dcService.save(dc);
+			}
+		}
+		// 人员
+		List<RyEntity> rylist = ryService.findByJyrid(jyrid);
+		if (rylist != null && rylist.size() > 0) {
+			for (RyEntity ry : rylist) {
+				ry.setRecordStatus(state);
+				ryService.save(ry);
+			}
+		}
+		// 设备信息
+		List<SssbEntity> sssblist = sssbService.findByJyrid(jyrid);
+		if (sssblist != null && sssblist.size() > 0) {
+			for (SssbEntity sssb : sssblist) {
+				sssb.setRecordStatus(state);
+				sssbService.save(sssb);
+			}
+		}
+		// 企业投资
+		List<QytzEntity> qytzlist = qytzService.findByJyrid(jyrid);
+		if (qytzlist != null && qytzlist.size() > 0) {
+			for (QytzEntity qytz : qytzlist) {
+				qytz.setRecordStatus(state);
+				qytzService.save(qytz);
+			}
+		}
+		// 装卸机械
+		List<ZxjxEntity> zxjxlist = zxjxService.findByJyrid(jyrid);
+		if (zxjxlist != null && zxjxlist.size() > 0) {
+			for (ZxjxEntity zxjx : zxjxlist) {
+				zxjx.setRecordStatus(state);
+				zxjxService.save(zxjx);
+			}
+		}
+	}
+
 	@Override
 	public boolean changeAudit(String shyj, XkzzxEntity entity, boolean flag) {
 		Map<String, Object> variables = new HashMap<String, Object>();
@@ -104,8 +240,13 @@ public class XkzzxServiceImpl extends BaseWorkFlowServiceImpl<XkzzxEntity, Strin
 			// 修改经营人状态
 			GkjyrEntity jyr = gkjyrService.findOne(entity.getJyrid());
 			if (jyr != null) {
-				jyr.setRecordStatus(BaseEntity.RECORD_STATE_VALID);
-				gkjyrService.save(jyr);
+				GkjyrEntity njyr = gkjyrService.findOne(jyr.getYjyrid());
+				if (njyr != null) {
+					njyr.setRecordStatus(BaseEntity.RECORD_STATE_VALID);
+					gkjyrService.save(njyr);
+					// 改变状态
+					changStatus(njyr.getId(), BaseEntity.RECORD_STATE_VALID);
+				}
 			}
 			return true;
 		}

gkjsjy/trunk/src/com/xt/jygl/sys/ctl/MainCtl.java

@@ -308,7 +308,7 @@ public class MainCtl extends BaseWebCtl {
 		ws.setAttr("warn", "");
 		ws.setAttr("jdtxwarn", "");
 		ws.setAttr("tzggwarn", "");
-		
+
 		int messageNum = 0;
 		if (getSsjyr() != null) {
 			List<XkzxxEntity> list = xkzxxService.queryNeedWarn(ca.getTime(), getSsjyr().getId());
@@ -983,18 +983,21 @@ public class MainCtl extends BaseWebCtl {
 							if (lists != null & lists.size() > 0) {
 								TaskInfoEntity taskinfo = lists.get(0);
 								if ("申请".equals(taskinfo.getCurrName())) {
+									item.setStatus("1");
 								} else {
-									item.setProcessName("许可证注销");
-									item.setProcessKey("xkzzx");
-									item.setDescription(entity.getJyrmc());
-									item.setCreateTime(entity.getCreateDateTime() != null ? entity.getCreateDateTime().toString() : "");
-									if (!StringUtils.isEmpty(entity.getCreateUser())) {
-										UserEntity user = securityMgr.userService().findById(entity.getCreateUser());
-										item.setSenderName(user.getName());
-									}
-									item.setBusinessKey(entity.getId());
-									volist.add(item);
+									item.setStatus("0");
+								}
+								item.setProcessName("许可证注销");
+								item.setProcessKey("xkzzx");
+								item.setDescription(entity.getJyrmc());
+								item.setCreateTime(entity.getCreateDateTime() != null ? entity.getCreateDateTime().toString() : "");
+								if (!StringUtils.isEmpty(entity.getCreateUser())) {
+									UserEntity user = securityMgr.userService().findById(entity.getCreateUser());
+									item.setSenderName(user.getName());
 								}
+								item.setBusinessKey(entity.getId());
+								volist.add(item);
+
 							}
 
 						}