git-svn-id: https://192.168.57.71/svn/lyggkj@118 1a6f6e3a-4066-fe46-b609-79c204482ece

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

@@ -520,10 +520,9 @@ public class GkwxhwzyfzblhhzController extends BaseController {
 				.searchByPredicateModels(filterList);
 		List<GkwxhwzyfzblFzEntity> list = gkwxhwzyfzService.findAll(spec);
 		vo = gkwxhwzyfzblhhzService.saveAllFz(vo, saveList, list);
-		//根据附证更新场所
+		// 根据附证更新场所
 		gkwxhwzyfzblhhzService.changeCs(vo);
-		
-		
+
 		// final GkwxhwzyfzblhhzEntity vo_f = vo;
 		final Long tempid = vo.getId();
 		final List<GkwxhwzyfzblFzEntity> list_f = getFzs(vo);
@@ -1186,7 +1185,7 @@ public class GkwxhwzyfzblhhzController extends BaseController {
 					}
 					// 作业方式
 					int zyfsLen = 240;
-					String zyfs = fzsq.getZyfs()==null?"":fzsq.getZyfs();
+					String zyfs = fzsq.getZyfs() == null ? "" : fzsq.getZyfs();
 					if (g.getFontMetrics().charsWidth(zyfs.toCharArray(), 0,
 							zyfs.length()) <= zyfsLen) {
 						g.drawString(zyfs,
@@ -2098,7 +2097,7 @@ public class GkwxhwzyfzblhhzController extends BaseController {
 				}
 				// 作业方式
 				int zyfsLen = 240;
-				String zyfs = fzsq.getZyfs()==null?"":fzsq.getZyfs();
+				String zyfs = fzsq.getZyfs() == null ? "" : fzsq.getZyfs();
 				if (g.getFontMetrics().charsWidth(zyfs.toCharArray(), 0,
 						zyfs.length()) <= zyfsLen) {
 					g.drawString(zyfs,
@@ -2830,9 +2829,9 @@ public class GkwxhwzyfzblhhzController extends BaseController {
 						list.add(cb.like(root.get("fzsq").get("szd").get("id")
 								.as(String.class), szd.getId() + "%"));
 					if (null != gq)
-						list.add(cb.equal(
-								root.get("fzsq").get("ssgq").as(GqEntity.class),
-								gq));
+						list.add(cb
+								.equal(root.get("fzsq").get("ssgq")
+										.as(GqEntity.class), gq));
 					if (null != jyr)
 						list.add(cb.equal(root.get("jyr").as(JyrEntity.class),
 								jyr));
@@ -3004,26 +3003,29 @@ public class GkwxhwzyfzblhhzController extends BaseController {
 					}
 					if (null != param.get(0) && !"".equals(param.get(0)))
 						list.add(cb.like(root.get("fzsq").get("szd").get("id")
-								.as(String.class),param.get(0) + "%"));
+								.as(String.class), param.get(0) + "%"));
 					if (null != param.get(1) && !"".equals(param.get(1)))
-						list.add(cb.equal(
-								root.get("fzsq").get("ssgq").get("id").as(Long.class),
-								Long.parseLong( param.get(1))));
+						list.add(cb.equal(root.get("fzsq").get("ssgq")
+								.get("id").as(Long.class),
+								Long.parseLong(param.get(1))));
 					if (null != param.get(2) && !"".equals(param.get(2)))
-						list.add(cb.equal(root.get("jyr").get("id").as(Long.class),
-								Long.parseLong( param.get(2))));
+						list.add(cb.equal(
+								root.get("jyr").get("id").as(Long.class),
+								Long.parseLong(param.get(2))));
 					if (null != param.get(3) && !"".equals(param.get(3))) {
 						try {
-							list.add(cb.greaterThanOrEqualTo(	root.get("fzsq").get("yxqjssj").as(Date.class), sdf.parse(param.get(3))));
+							list.add(cb.greaterThanOrEqualTo(root.get("fzsq")
+									.get("yxqjssj").as(Date.class),
+									sdf.parse(param.get(3))));
 						} catch (ParseException e) {
 							e.printStackTrace();
 						}
 					}
 					if (null != param.get(4) && !"".equals(param.get(4))) {
 						try {
-							list.add(cb.lessThan(root.get("fzsq").get("yxqjssj")
-									.as(Date.class), DateUtil.addDate(
-									sdf.parse(param.get(4)), 1)));
+							list.add(cb.lessThan(root.get("fzsq")
+									.get("yxqjssj").as(Date.class), DateUtil
+									.addDate(sdf.parse(param.get(4)), 1)));
 						} catch (ParseException e) {
 							e.printStackTrace();
 						}
@@ -3033,10 +3035,13 @@ public class GkwxhwzyfzblhhzController extends BaseController {
 								"%" + param.get(5) + "%"));
 					if (null != param.get(6) && !"".equals(param.get(6)))
 						list.add(cb.equal(
-								root.get("fzsq").get("ssgq").get("gqszsylx").get("id").as(Long.class),Long.parseLong(param.get(6))));
+								root.get("fzsq").get("ssgq").get("gqszsylx")
+										.get("id").as(Long.class),
+								Long.parseLong(param.get(6))));
 					if (null != param.get(7) && !"".equals(param.get(7)))
 						list.add(cb.equal(
-								root.get("zycs").get("id").as(Long.class),Long.parseLong(param.get(7))));
+								root.get("zycs").get("id").as(Long.class),
+								Long.parseLong(param.get(7))));
 					return cb.and(list.toArray(new Predicate[] {}));
 				}
 			};
@@ -3049,23 +3054,31 @@ public class GkwxhwzyfzblhhzController extends BaseController {
 		if (dataset != null)
 			for (GkwxhwzyfzblFzEntity entity : dataset) {
 				String[] ss = new String[] {
-							i + "",
-							null==entity.getFzsq()?"":entity.getFzsq().getByzd1(),
-							null == entity.getJyr() ? "" : entity.getJyr().getGkjyr(),
-							entity.getQynbmc(),
-							entity.getFzcsbh(),
-							entity.getByzd5(),
-							null==entity.getFzsq()?"":entity.getFzsq().getFzjg(),
-							(null==entity.getFzsq()||null==entity.getFzsq().getFzsj())?"":sdf.format(entity.getFzsq().getFzsj()),
-							(null==entity.getFzsq()||null==entity.getFzsq().getYxqjssj())?"":sdf.format(entity.getFzsq().getYxqjssj()),
-							(null==entity.getFzsq()||null==entity.getFzsq().getSsgq()) ? "" : entity.getFzsq().getSsgq()
-									.getGqmc(),
-							(null==entity.getFzsq()||null==entity.getFzsq().getSzd()) ? "" : resource
-									.getString(entity.getFzsq().getSzd().getName()) 
-					};
+						i + "",
+						null == entity.getFzsq() ? "" : entity.getFzsq()
+								.getByzd1(),
+						null == entity.getJyr() ? "" : entity.getJyr()
+								.getGkjyr(),
+						entity.getQynbmc(),
+						entity.getFzcsbh(),
+						entity.getByzd5(),
+						null == entity.getFzsq() ? "" : entity.getFzsq()
+								.getFzjg(),
+						(null == entity.getFzsq() || null == entity.getFzsq()
+								.getFzsj()) ? "" : sdf.format(entity.getFzsq()
+								.getFzsj()),
+						(null == entity.getFzsq() || null == entity.getFzsq()
+								.getYxqjssj()) ? "" : sdf.format(entity
+								.getFzsq().getYxqjssj()),
+						(null == entity.getFzsq() || null == entity.getFzsq()
+								.getSsgq()) ? "" : entity.getFzsq().getSsgq()
+								.getGqmc(),
+						(null == entity.getFzsq() || null == entity.getFzsq()
+								.getSzd()) ? "" : resource.getString(entity
+								.getFzsq().getSzd().getName()) };
 				strings.add(ss);
 				i++;
-				} 
+			}
 		return strings;
 	}
 }