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

gkjsjy/trunk/src/com/xt/jygl/gkjygl/cghzyxxgl/dcsb/ctl/DcsbCtl.java

@@ -30,9 +30,13 @@ import com.xt.jygl.common.BaseWebCtl;
 import com.xt.jygl.common.Constants;
 import com.xt.jygl.common.SearchCondition;
 import com.xt.jygl.common.Utils;
+import com.xt.jygl.gkjcxx.mt.entity.MtEntity;
+import com.xt.jygl.gkjcxx.mt.service.MtService;
 import com.xt.jygl.gkjygl.cghzyxxgl.dcsb.entity.DcsbEntity;
 import com.xt.jygl.gkjygl.cghzyxxgl.dcsb.service.DcsbService;
 import com.xt.jygl.gkjygl.cghzyxxgl.dcsb.vo.DcsbVo;
+import com.xt.jygl.gkjygl.gkjyr.jyrbw.service.BwService;
+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.service.GkjyrService;
 import com.xt.jygl.gkjygl.gkjyxkgl.gkjyxksq.entity.XkzsqEntity;
@@ -61,6 +65,10 @@ public class DcsbCtl extends BaseWebCtl {
 	private DcsbService dcsbService;
 	@Autowired
 	private TaskInfoService taskInfoService;
+	@Autowired
+	private MtService mtService;
+	@Autowired
+	private BwService bwService;
 
 	/**
 	 * 一览
@@ -352,6 +360,32 @@ public class DcsbCtl extends BaseWebCtl {
 			model.addAttribute("shsj", dateTimeFormat.format(today));
 			entity.setShr(user.getName());
 		}
+		if ( StringUtils.isNotEmpty(entity.getMt())){
+			MtEntity mt = mtService.findOne(entity.getMt());
+			vo.setMtmc(mt.getMtmc());
+		}
+		if ( StringUtils.isNotEmpty(entity.getBw())){
+			BwEntity bw = bwService.findOne(entity.getBw());
+			vo.setBwmc(bw.getBwmc());
+		}
+		if ( StringUtils.isNotEmpty(entity.getJcg())){
+			List<CodeEntity> list = securityMgr.codeService().findValidCodesByGroupCode(Constants.GROUP_CODE_JCG);
+			for (CodeEntity code: list){
+				if ( entity.getJcg().equals(code.getId())){
+					vo.setJcgText(code.getText());
+					break;
+				}
+			}
+		}
+		if ( StringUtils.isNotEmpty(entity.getNwm())){
+			List<CodeEntity> list = securityMgr.codeService().findValidCodesByGroupCode(Constants.GROUP_CODE_NWM);
+			for (CodeEntity code: list){
+				if ( entity.getNwm().equals(code.getId())){
+					vo.setNwmText(code.getText());
+					break;
+				}
+			}
+		}
 		model.addAttribute("record", entity);
 		model.addAttribute("recordvo", vo);
 

gkjsjy/trunk/src/com/xt/jygl/gkjygl/cghzyxxgl/dcsb/vo/DcsbVo.java

@@ -2,6 +2,8 @@ package com.xt.jygl.gkjygl.cghzyxxgl.dcsb.vo;
 
 import java.util.Date;
 
+import javax.persistence.Transient;
+
 import com.xtframe.sec.common.BaseVo;
 
 public class DcsbVo extends BaseVo {
@@ -59,6 +61,45 @@ public class DcsbVo extends BaseVo {
 	//货物种类第二大类
 	private String hwzldedl = null;
 	private String hwzldedlzw = null;
+	/**
+	 * 另加属性做页面显示用
+	 */
+	//码头名称
+	private String mtmc;
+	private String bwmc;
+	private String nwmText;
+	private String jcgText;
+	public String getMtmc() {
+		return mtmc;
+	}
+
+	public void setMtmc(String mtmc) {
+		this.mtmc = mtmc;
+	}
+
+	public String getBwmc() {
+		return bwmc;
+	}
+
+	public void setBwmc(String bwmc) {
+		this.bwmc = bwmc;
+	}
+
+	public String getNwmText() {
+		return nwmText;
+	}
+
+	public void setNwmText(String nwmText) {
+		this.nwmText = nwmText;
+	}
+
+	public String getJcgText() {
+		return jcgText;
+	}
+
+	public void setJcgText(String jcgText) {
+		this.jcgText = jcgText;
+	}
 	public String getSfg() {
 		return sfg;
 	}