git-svn-id: https://192.168.57.71/svn/hbghj@82 201dd7a2-ec1b-f84b-8b06-88221118ff88

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/controller/jyr/JyrController.java

@@ -119,7 +119,7 @@ public class JyrController extends BaseController {
 			SinglePageRequest pageRequest, final String gkjyr,
 			final CodeEntity szd, final String szqy, final GqEntity szgq,
 			final String fddbr, final String sfwhqy, final String mtlb,
-			final String cclb) {
+			final String cclb,final CodeEntity zs) {
 		try {
 			//查询条件
 			Specification<JyrEntity> spec = new Specification<JyrEntity>() {
@@ -214,6 +214,14 @@ public class JyrController extends BaseController {
 					}
 					//流程状态
 				//	list = Utils.setWorkflowSpec(list, cb, query, root, null);
+					
+					//站所
+					if (zs != null) {
+						list.add(cb.like(
+								root.get("zs").get("id").as(String.class), "%"
+										+ zs.getId() + "%"));
+					}
+					
 					return cb.and(list.toArray(new Predicate[] {}));
 				}
 			};
@@ -1201,8 +1209,15 @@ public class JyrController extends BaseController {
 							list.add(cb.or(list3.toArray(new Predicate[] {})));
 						}
 					}
+					
+					if (null != param.get(9)
+							&& !"null".equals(param.get(9).toString())) {
+						list.add(cb.like(
+								root.get("zs").get("id").as(String.class), "%"
+										+ param.get(9).toString() + "%"));
+					}
 
-					list = Utils.setWorkflowSpec(list, cb, query, root, null);
+					//list = Utils.setWorkflowSpec(list, cb, query, root, null);
 					return cb.and(list.toArray(new Predicate[] {}));
 				}
 			};

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/controller/zyfzndjy/GkwxhwzyfzblhhzController.java

@@ -118,6 +118,7 @@ public class GkwxhwzyfzblhhzController extends BaseController {
 	private YjwzFlxxService wzService;
 	@Autowired
 	private AccessoryService accessoryService;
+	 
 
 
 	/**
@@ -666,7 +667,7 @@ public class GkwxhwzyfzblhhzController extends BaseController {
 	}
 
 	/**
-	 * 作业场所、产权、危货等级公共代码加载
+	 * 作业场所、产权、危货等级公共代码加载  加上作业方式
 	 * 
 	 * @return
 	 */
@@ -682,6 +683,8 @@ public class GkwxhwzyfzblhhzController extends BaseController {
 				InitServlet.groupcodeMap.get(Constants.GROUP_CODE_HWZL));
 		bc.setAttribute("fileType", InitServlet.groupcodeMap
 				.get(Constants.GROUP_CODE_GKWXHWZYFZBLHHZ));
+		bc.setAttribute("zyfs",
+				InitServlet.groupcodeMap.get("FZ.ZYFS"));
 		return bc;
 	}
 
@@ -1086,7 +1089,14 @@ public class GkwxhwzyfzblhhzController extends BaseController {
 					int zyfsLen = 240;
 					String zyfs ="";
 					if(fzsq.getZyfs()!=null){
-						zyfs=fzsq.getZyfs().getBz();
+						//zyfs=fzsq.getZyfs().getBz();						
+						String[] arrZyfs = fzsq.getZyfs().split(",");
+						for(String zyfsId : arrZyfs){
+							CodeEntity zyfsEntity = codeService.findOne(Long.parseLong(zyfsId));
+							zyfs += zyfsEntity.getBz();
+						}
+						
+						
 						if (g.getFontMetrics().charsWidth(zyfs.toCharArray(), 0,
 								zyfs.length()) <= zyfsLen) {
 							g.drawString(zyfs,
@@ -1635,7 +1645,14 @@ public class GkwxhwzyfzblhhzController extends BaseController {
 				int zyfsLen = 240;
 				String zyfs = "";
 				if(fzsq.getZyfs()!=null){
-					zyfs= fzsq.getZyfs().getBz();
+					//zyfs=fzsq.getZyfs().getBz();						
+					String[] arrZyfs = fzsq.getZyfs().split(",");
+					for(String zyfsId : arrZyfs){
+						CodeEntity zyfsEntity = codeService.findOne(Long.parseLong(zyfsId));
+						zyfs += zyfsEntity.getBz();
+					}
+					
+					
 					if (g.getFontMetrics().charsWidth(zyfs.toCharArray(), 0,
 							zyfs.length()) <= zyfsLen) {
 						g.drawString(zyfs,

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/entity/zyfzndjy/GkwxhwzyfzblhhzEntity.java

@@ -146,7 +146,7 @@ public class GkwxhwzyfzblhhzEntity extends BaseEntity<Long> {
 	/** 产权 */
 	private CodeEntity cq;
 	/** 作业方式 */
-	private CodeEntity zyfs;
+	private String zyfs;
 	/** 危货等级 */
 	private CodeEntity whdj;
 	/** 作业危险货物品名 */
@@ -325,14 +325,14 @@ public class GkwxhwzyfzblhhzEntity extends BaseEntity<Long> {
 		this.cq = cq;
 	}
 
-	@ManyToOne(fetch = FetchType.EAGER, targetEntity = CodeEntity.class)
-	@JoinColumn(name = "zyfs")
-	@RemotingExclude
-	public CodeEntity getZyfs() {
+//	@ManyToOne(fetch = FetchType.EAGER, targetEntity = CodeEntity.class)
+//	@JoinColumn(name = "zyfs")
+//	@RemotingExclude
+	public String getZyfs() {
 		return zyfs;
 	}
 
-	public void setZyfs(CodeEntity zyfs) {
+	public void setZyfs(String zyfs) {
 		this.zyfs = zyfs;
 	}