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

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

@@ -198,20 +198,22 @@ public class XkzxxCtl extends BaseWebCtl {
 				// SearchCondition.xkzgkjyxkzh + "%"));
 				// }
 				if (StringUtils.isNotEmpty(sfyx)) {
-					//if ("1".equals(sfyx)) {
-						list.add(cb.equal(root.get("sfyx").as(String.class), sfyx));
-					//} else {
-					//	list.add(cb.notEqual(root.get("sfyx").as(String.class), "2"));
-					//}
+					// if ("1".equals(sfyx)) {
+					list.add(cb.equal(root.get("sfyx").as(String.class), sfyx));
+					// } else {
+					// list.add(cb.notEqual(root.get("sfyx").as(String.class),
+					// "2"));
+					// }
 				} else if (isGET(request)) {
 					String v = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "sfyx");
 
 					if (StringUtils.isNotEmpty(v)) {
-						//if ("1".equals(sfyx)) {
-							list.add(cb.equal(root.get("sfyx").as(String.class), v));
-						//} else {
-						//	list.add(cb.notEqual(root.get("sfyx").as(String.class), v));
-						//}
+						// if ("1".equals(sfyx)) {
+						list.add(cb.equal(root.get("sfyx").as(String.class), v));
+						// } else {
+						// list.add(cb.notEqual(root.get("sfyx").as(String.class),
+						// v));
+						// }
 					}
 				}
 				// else if (StringUtils.isNotEmpty(SearchCondition.sfyx) &&
@@ -500,7 +502,16 @@ public class XkzxxCtl extends BaseWebCtl {
 
 	@RequestMapping(value = "/viewxkzList")
 	public String viewWhfzList(Model model, String id) {
-		model.addAttribute("record", xkzxxService.findOne(id));
+		XkzxxEntity xkzxxEntity = xkzxxService.findOne(id);
+		if (xkzxxEntity != null) {
+			if (xkzxxEntity.getGkjyr() != null) {
+				xkzxxEntity.setGkjyrName(gkjyrService.findOne(xkzxxEntity.getGkjyr()).getGkjyr());
+			}
+			if (xkzxxEntity.getSsgq() != null) {
+				xkzxxEntity.setSsgqName(gqService.findOne(xkzxxEntity.getSsgq()).getGqmc());
+			}
+		}
+		model.addAttribute("record", xkzxxEntity);
 		return "gkjygl/gkjyr/xkzxx/xkzxx";
 	}
 
@@ -535,9 +546,9 @@ public class XkzxxCtl extends BaseWebCtl {
 					wr.setMessage("该经营人正在许可注销中，不可操作！！！");
 				} else if (gkjyr.getRecordStatus() == 8) {
 					wr.setMessage("该经营人正在许可变更中，不可操作！！！");
-				} else if (gkjyr.getRecordStatus() == 9){
+				} else if (gkjyr.getRecordStatus() == 9) {
 					wr.setMessage("该经营人已删除，不可操作！！！");
-				}else {
+				} else {
 					wr.setMessage("操作失败！！！");
 				}
 			} else {

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/xkzxx/entity/XkzxxEntity.java

@@ -6,6 +6,7 @@ import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 import org.hibernate.annotations.GenericGenerator;
 
@@ -22,7 +23,9 @@ public class XkzxxEntity extends BaseEntity<String> implements Cloneable {
 
 	private String id = null;
 	private String gkjyr = null;
+	private String gkjyrName = null;
 	private String ssgq = null;
+	private String ssgqName = null;
 	private String dz = null;
 	private String fddbr = null;
 	private String lxdh = null;
@@ -227,4 +230,22 @@ public class XkzxxEntity extends BaseEntity<String> implements Cloneable {
 		this.isflag = isflag;
 	}
 
+	@Transient
+	public String getGkjyrName() {
+		return gkjyrName;
+	}
+
+	public void setGkjyrName(String gkjyrName) {
+		this.gkjyrName = gkjyrName;
+	}
+
+	@Transient
+	public String getSsgqName() {
+		return ssgqName;
+	}
+
+	public void setSsgqName(String ssgqName) {
+		this.ssgqName = ssgqName;
+	}
+
 }