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

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

@@ -82,6 +82,7 @@ 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.xkzfz.entity.XkzfzEntity;
 import com.xt.jygl.gkjygl.gkjyr.xkzfz.service.XkzfzService;
 import com.xt.jygl.gkjygl.gkjyr.xkzxx.entity.XkzglbEntity;
 import com.xt.jygl.gkjygl.gkjyr.xkzxx.entity.XkzxxEntity;
@@ -680,9 +681,11 @@ public class XkzxxCtl extends BaseWebCtl {
 							}
 						}
 
-						wr.setSuccess(false);
-						wr.setMessage("请经营人填写许可证信息后再操作");
-						return wr;
+						if (!"1".equals(flag)) {
+							wr.setSuccess(false);
+							wr.setMessage("请经营人填写许可证信息后再操作");
+							return wr;
+						}
 					}
 					if (StringUtils.isEmpty(xkzxx.getStype())) {
 
@@ -1647,6 +1650,15 @@ public class XkzxxCtl extends BaseWebCtl {
 					xkzxx.setSfyx("1");
 					xkzxx = xkzxxService.save(xkzxx);
 
+					// 许可附证
+					List<XkzfzEntity> xkzfzlist = xkzfzService.findByJyrid(njyr.getId());
+					if (xkzfzlist != null && xkzfzlist.size() > 0) {
+						for (XkzfzEntity xkzfz : xkzfzlist) {
+							xkzfz.setRecordStatus(BaseEntity.RECORD_STATE_VALID);
+							xkzfzService.save(xkzfz);
+						}
+					}
+
 					// 经营范围 业务种类
 					List<XkzjyfwEntity> list = xkzjyfwService.findByJyrid(xkzbg.getJyrid());
 

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

@@ -28,6 +28,9 @@ 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.xkzfz.entity.XkzfzEntity;
+import com.xt.jygl.gkjygl.gkjyr.xkzfz.service.XkzfzService;
+import com.xt.jygl.gkjygl.gkjyr.xkzxx.entity.XkzxxEntity;
 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;
@@ -60,6 +63,8 @@ public class XkzbgServiceImpl extends BaseWorkFlowServiceImpl<XkzbgEntity, Strin
 	@Autowired
 	private CkService ckService;
 	@Autowired
+	private XkzfzService xkzfzService;
+	@Autowired
 	private DcService dcService;
 	@Autowired
 	private RyService ryService;
@@ -102,13 +107,13 @@ public class XkzbgServiceImpl extends BaseWorkFlowServiceImpl<XkzbgEntity, Strin
 			entity.setRecordStatus(BaseEntity.RECORD_STATE_SUBMIT);
 			entity = this.save(entity);
 			String gqid = "";
-			if(securityMgr.getCurrUser()!=null){
+			if (securityMgr.getCurrUser() != null) {
 				if (securityMgr.getCurrUser().getSfjyr().getText().equals("是")) {
 					gqid = entity.getSzgq().getId();
-				}else{
+				} else {
 					gqid = entity.getSzgq().getId();
 				}
-			}else{
+			} else {
 				gqid = entity.getSzgq().getId();
 			}
 			Map<String, Object> variables = new HashMap<String, Object>();
@@ -154,6 +159,22 @@ public class XkzbgServiceImpl extends BaseWorkFlowServiceImpl<XkzbgEntity, Strin
 				xkzjyfwService.save(entity);
 			}
 		}
+		// 许可证
+		List<XkzxxEntity> xkzlist = xkzxxService.findByJyrid(jyrid);
+		if (xkzlist != null && xkzlist.size() > 0) {
+			for (XkzxxEntity xkz : xkzlist) {
+				xkz.setRecordStatus(state);
+				xkzxxService.save(xkz);
+			}
+		}
+		// 许可附证
+		List<XkzfzEntity> xkzfzlist = xkzfzService.findByJyrid(jyrid);
+		if (xkzfzlist != null && xkzfzlist.size() > 0) {
+			for (XkzfzEntity xkzfz : xkzfzlist) {
+				xkzfz.setRecordStatus(state);
+				xkzfzService.save(xkzfz);
+			}
+		}
 		// 码头
 		List<MtEntity> mtlist = mtService.findByJyrid(jyrid);
 		if (mtlist.size() > 0 && mtlist != null) {

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

@@ -28,6 +28,9 @@ 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.xkzfz.entity.XkzfzEntity;
+import com.xt.jygl.gkjygl.gkjyr.xkzfz.service.XkzfzService;
+import com.xt.jygl.gkjygl.gkjyr.xkzxx.entity.XkzxxEntity;
 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;
@@ -77,7 +80,8 @@ public class XkzzxServiceImpl extends BaseWorkFlowServiceImpl<XkzzxEntity, Strin
 	private ZxjxService zxjxService;
 	@Autowired
 	private XkzjyfwService xkzjyfwService;
-
+	@Autowired
+	private XkzfzService xkzfzService;
 	@Override
 	protected SecRepository<XkzzxEntity, String> getDao() {
 
@@ -102,13 +106,13 @@ public class XkzzxServiceImpl extends BaseWorkFlowServiceImpl<XkzzxEntity, Strin
 			entity.setRecordStatus(BaseEntity.RECORD_STATE_SUBMIT);
 			entity = this.save(entity);
 			String gqid = "";
-			if(securityMgr.getCurrUser()!=null){
+			if (securityMgr.getCurrUser() != null) {
 				if (securityMgr.getCurrUser().getSfjyr().getText().equals("是")) {
 					gqid = entity.getSzgq().getId();
-				}else{
+				} else {
 					gqid = entity.getSzgq().getId();
 				}
-			}else{
+			} else {
 				gqid = entity.getSzgq().getId();
 			}
 			Map<String, Object> variables = new HashMap<String, Object>();
@@ -152,6 +156,24 @@ public class XkzzxServiceImpl extends BaseWorkFlowServiceImpl<XkzzxEntity, Strin
 				xkzjyfwService.save(entity);
 			}
 		}
+
+		// 许可证
+		List<XkzxxEntity> xkzlist = xkzxxService.findByJyrid(jyrid);
+		if (xkzlist != null && xkzlist.size() > 0) {
+			for (XkzxxEntity xkz : xkzlist) {
+				xkz.setRecordStatus(state);
+				xkzxxService.save(xkz);
+			}
+		}
+		// 许可附证
+		List<XkzfzEntity> xkzfzlist = xkzfzService.findByJyrid(jyrid);
+		if (xkzfzlist != null && xkzfzlist.size() > 0) {
+			for (XkzfzEntity xkzfz : xkzfzlist) {
+				xkzfz.setRecordStatus(state);
+				xkzfzService.save(xkzfz);
+			}
+		}
+
 		// 码头
 		List<MtEntity> mtlist = mtService.findByJyrid(jyrid);
 		if (mtlist.size() > 0 && mtlist != null) {