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

gkjsjy/trunk/src/com/cxfws/jyrxxgl/service/impl/XkzfzWebService.java

@@ -47,7 +47,7 @@ import net.sf.json.JSONArray;
 @Service
 @WebService(targetNamespace = "http://service.web.jsjty.com/", portName = "xkzfzWebServicePort", serviceName = "xkzfzWebService")
 public class XkzfzWebService extends BaseWebCtl implements IXkzfzWebService {
-	
+
 	@Autowired
 	private QueryService query;
 	@Autowired
@@ -62,11 +62,12 @@ public class XkzfzWebService extends BaseWebCtl implements IXkzfzWebService {
 	private AccessoryService accessoryService;
 	@Autowired
 	private XkzfzService xkzfzService;
-	//列表
+
+	// 列表
 	@Override
-	public String findXkzfz(int pages, int rows,final String ssjyr, final String szdid, final String szgkid, final String szgqid, final String fzsqh, final String fzsfyx, final String wxhwpm, final String fzsfdq){
-		
-		if (!this.checkUser()){
+	public String findXkzfz(int pages, int rows, final String ssjyr, final String szdid, final String szgkid, final String szgqid, final String fzsqh, final String fzsfyx, final String wxhwpm, final String fzsfdq) {
+
+		if (!this.checkUser()) {
 			return BaseWebCtl.NOLOGIN;
 		}
 		SimplePageRequest page = new SimplePageRequest(pages, rows);
@@ -74,13 +75,13 @@ public class XkzfzWebService extends BaseWebCtl implements IXkzfzWebService {
 
 		// 查询条件
 		Specification<XkzfzEntity> spec = new Specification<XkzfzEntity>() {
-			
+
 			@Override
 			public Predicate toPredicate(Root<XkzfzEntity> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
 				List<Predicate> list = new ArrayList<Predicate>();
 				if (StringUtils.isNotEmpty(szdid)) {
 					list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + szdid + "%"));
-				} 
+				}
 				// else if (StringUtils.isNotEmpty(SearchCondition.xkzszdid) &&
 				// isGET(request)) {
 				// list.add(cb.like(root.get("szd").get("id").as(String.class),
@@ -88,7 +89,7 @@ public class XkzfzWebService extends BaseWebCtl implements IXkzfzWebService {
 				// }
 				if (StringUtils.isNotEmpty(szgkid)) {
 					list.add(cb.like(root.get("szgk").as(String.class), "%" + szgkid + "%"));
-				} 
+				}
 				// else if (StringUtils.isNotEmpty(SearchCondition.xkzszgkid) &&
 				// isGET(request)) {
 				// list.add(cb.like(root.get("szgk").as(String.class), "%" +
@@ -96,7 +97,7 @@ public class XkzfzWebService extends BaseWebCtl implements IXkzfzWebService {
 				// }
 				if (StringUtils.isNotEmpty(szgqid)) {
 					list.add(cb.like(root.get("ssgq").as(String.class), "%" + szgqid + "%"));
-				} 
+				}
 				// else if (StringUtils.isNotEmpty(SearchCondition.xkzszgqid) &&
 				// isGET(request)) {
 				// list.add(cb.like(root.get("ssgq").as(String.class), "%" +
@@ -112,7 +113,7 @@ public class XkzfzWebService extends BaseWebCtl implements IXkzfzWebService {
 				// }
 				if (StringUtils.isNotEmpty(fzsqh)) {
 					list.add(cb.like(root.get("fzsqh").as(String.class), "%" + fzsqh + "%"));
-				} 
+				}
 				if (StringUtils.isNotEmpty(wxhwpm)) {
 					list.add(cb.like(root.get("wxhwpm").as(String.class), wxhwpm));
 				}
@@ -123,7 +124,7 @@ public class XkzfzWebService extends BaseWebCtl implements IXkzfzWebService {
 						list.add(cb.notEqual(root.get("recordStatus").as(String.class), "1"));
 					}
 				}
-				
+
 				Date now = new Date();
 				if (StringUtils.isNotEmpty(fzsfdq)) {
 					if ((fzsfdq).equals("6103")) {
@@ -149,34 +150,37 @@ public class XkzfzWebService extends BaseWebCtl implements IXkzfzWebService {
 						list.add(in);
 					}
 				}
-					list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_DELETE));
-					list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORE_STATE_COPY));
-					return cb.and(list.toArray(new Predicate[] {}));
+				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_DELETE));
+				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORE_STATE_COPY));
+				return cb.and(list.toArray(new Predicate[] {}));
 			}
 		};
 		if (page.getPage() < 1) {
-//			Object xmxxpage = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "xmxxpage");
-//			if (StringUtils.isEmpty(xmxxpage) || !org.apache.commons.lang.StringUtils.isNumeric(String.valueOf(xmxxpage))) {
-//				xmxxpage = "1";
-//			}
+			// Object xmxxpage = CacheSearchCondition.cacheSCmapVal(cacheSCmap,
+			// "xmxxpage");
+			// if (StringUtils.isEmpty(xmxxpage) ||
+			// !org.apache.commons.lang.StringUtils.isNumeric(String.valueOf(xmxxpage)))
+			// {
+			// xmxxpage = "1";
+			// }
 			page.setPage(1);
 		}
 		page.setSort("yxqjssj");
 		page.setOrder("desc");
-		Page<XkzfzEntity> list = query.findAll(spec, toPageRequest(page),XkzfzEntity.class);
+		Page<XkzfzEntity> list = query.findAll(spec, toPageRequest(page), XkzfzEntity.class);
 		List<XkzfzVo> voList = new ArrayList<XkzfzVo>();
 		for (XkzfzEntity entity : list) {
 			XkzfzVo vo = new XkzfzVo();
 			if (entity != null) {
 				BeanUtils.copyProperties(entity, vo);
 				if (null != entity.getFzsj()) {
-					vo.setFzsjfmt(DateTime.toString(DateTime.toDate(entity.getFzsj())));
+					vo.setFzsjfmt(DateTime.toString(entity.getFzsj()));
 				}
 				if (null != entity.getYxqkssj()) {
-					vo.setYxqkssjfmt(DateTime.toString(DateTime.toDate(entity.getYxqkssj())));
+					vo.setYxqkssjfmt(DateTime.toString(entity.getYxqkssj()));
 				}
 				if (null != entity.getYxqjssj()) {
-					vo.setYxqjssjfmt(DateTime.toString(DateTime.toDate(entity.getYxqjssj())));
+					vo.setYxqjssjfmt(DateTime.toString(entity.getYxqjssj()));
 				}
 				vo.setSzdzw(entity.getSzd() != null ? entity.getSzd().getText() : "");
 				vo.setSzgkzw(entity.getSzgk() != null ? entity.getSzgk().getGkmc() : "");
@@ -191,7 +195,7 @@ public class XkzfzWebService extends BaseWebCtl implements IXkzfzWebService {
 				time.set(Calendar.HOUR_OF_DAY, 0);
 				time.set(Calendar.MINUTE, 0);
 				time.set(Calendar.SECOND, 0);
-				if (vo.getYxqjssjfmt() != null && DateTime.toDate(entity.getYxqjssj()).getTime() > time.getTimeInMillis()) {
+				if (vo.getYxqjssjfmt() != null && entity.getYxqjssj().getTime() > time.getTimeInMillis()) {
 					vo.setRecordStatus(1);
 				} else {
 					vo.setRecordStatus(9);
@@ -201,13 +205,13 @@ public class XkzfzWebService extends BaseWebCtl implements IXkzfzWebService {
 		}
 		return JSONArray.fromObject(voList).toString();
 	}
-	
-	//详情查询
+
+	// 详情查询
 	public String findOne(String id) {
-		if (!this.checkUser()){
+		if (!this.checkUser()) {
 			return BaseWebCtl.NOLOGIN;
 		}
-		
+
 		XkzfzEntity entity = xkzfzService.findOne(id);
 		XkzfzVo vo = new XkzfzVo();
 		BeanUtils.copyProperties(entity, vo);
@@ -221,13 +225,13 @@ public class XkzfzWebService extends BaseWebCtl implements IXkzfzWebService {
 		vo.setSzgq(entity.getSzgq() != null ? entity.getSzgq().getId() : "");
 		vo.setSsjyr(entity.getSsjyr() != null ? entity.getSsjyr().getId() : "");
 		if (null != entity.getFzsj()) {
-			vo.setFzsjfmt(DateTime.toString(DateTime.toDate(entity.getFzsj())));
+			vo.setFzsjfmt(DateTime.toString(entity.getFzsj()));
 		}
 		if (null != entity.getYxqkssj()) {
-			vo.setYxqkssjfmt(DateTime.toString(DateTime.toDate(entity.getYxqkssj())));
+			vo.setYxqkssjfmt(DateTime.toString(entity.getYxqkssj()));
 		}
 		if (null != entity.getYxqjssj()) {
-			vo.setYxqjssjfmt(DateTime.toString(DateTime.toDate(entity.getYxqjssj())));
+			vo.setYxqjssjfmt(DateTime.toString(entity.getYxqjssj()));
 		}
 
 		// zycs cq whdj
@@ -254,5 +258,5 @@ public class XkzfzWebService extends BaseWebCtl implements IXkzfzWebService {
 		List<GqEntity> listgq = gqService.findGq();
 		List<GkEntity> listgk = gkService.findGk();
 		return JSONArray.fromObject(vo).toString();
-    }
+	}
 }

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/jyrjbxx/ctl/GkjyrCtl.java

@@ -197,12 +197,14 @@ public class GkjyrCtl extends BaseWebCtl {
 				} else if (isGET(request)) {
 					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, "id", "szgq", "szgqid");
 				}
-				/*if (StringUtils.isNotEmpty(gkjyxkzh)) {
-					list.add(cb.like(root.get("gkjyxkzh").as(String.class), "%" + gkjyxkzh + "%"));
-				} else if (isGET(request)) {
-					CacheSearchCondition.predicateList(list, cacheSCmap, root, cb, null, "gkjyxkzh");
-				}*/
-				
+				/*
+				 * if (StringUtils.isNotEmpty(gkjyxkzh)) {
+				 * list.add(cb.like(root.get("gkjyxkzh").as(String.class), "%" +
+				 * gkjyxkzh + "%")); } else if (isGET(request)) {
+				 * CacheSearchCondition.predicateList(list, cacheSCmap, root,
+				 * cb, null, "gkjyxkzh"); }
+				 */
+
 				if (StringUtils.isNotEmpty(fddbr)) {
 					list.add(cb.like(root.get("fddbr").as(String.class), "%" + fddbr + "%"));
 				} else if (isGET(request)) {
@@ -349,17 +351,17 @@ public class GkjyrCtl extends BaseWebCtl {
 				Date now = new Date();
 				subQueryPredicates.add(cb.equal(dpRoot.get("gkjyr").as(String.class), root.get("id").as(String.class)));
 				subQueryPredicates.add(cb.equal(dpRoot.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_VALID));
-				if (StringUtils.isNotEmpty(gkjyxkzh)){
-					subQueryPredicates.add(cb.like(dpRoot.get("gkjyxkzh").as(String.class), "%"+gkjyxkzh+"%"));
+				if (StringUtils.isNotEmpty(gkjyxkzh)) {
+					subQueryPredicates.add(cb.like(dpRoot.get("gkjyxkzh").as(String.class), "%" + gkjyxkzh + "%"));
 					xkzflag = true;
 				} else {
 					String gkjyxkzhTemp = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "gkjyxkzh");
-					if ( StringUtils.isNotEmpty(gkjyxkzhTemp)){
-						subQueryPredicates.add(cb.like(dpRoot.get("gkjyxkzh").as(String.class), "%"+gkjyxkzhTemp+"%"));
+					if (StringUtils.isNotEmpty(gkjyxkzhTemp)) {
+						subQueryPredicates.add(cb.like(dpRoot.get("gkjyxkzh").as(String.class), "%" + gkjyxkzhTemp + "%"));
 						xkzflag = true;
 					}
 				}
-				
+
 				// 许可证有效期
 				if (xkzstartDate != null) {
 					subQueryPredicates.add(cb.greaterThanOrEqualTo(dpRoot.get("yxqz").as(Date.class), xkzstartDate));
@@ -459,7 +461,7 @@ public class GkjyrCtl extends BaseWebCtl {
 				return cb.and(list.toArray(new Predicate[] {}));
 			}
 		};
-		
+
 		if (page.getPage() < 1) {
 			page.setPage(SearchCondition.jyrpage);
 		}
@@ -529,7 +531,7 @@ public class GkjyrCtl extends BaseWebCtl {
 		putPageInfo(model, page, list);
 		return "gkjygl/gkjyr/jyrjbxx/gkjyrmain";
 	}
-	
+
 	/**
 	 * 新增页面的跳转
 	 * 
@@ -672,7 +674,7 @@ public class GkjyrCtl extends BaseWebCtl {
 			}
 			gkjyrEntity.setYjyrid(yjyr.getYjyrid());
 			gkjyrEntity.setBgjyrid(yjyr.getBgjyrid());
-			if(!StringUtils.isEmpty(gkjyrEntity.getId())){
+			if (!StringUtils.isEmpty(gkjyrEntity.getId())) {
 				gkjyrEntity.setTbzt(Constants.NO);
 			}
 			gkjyrService.save(gkjyrEntity);
@@ -1058,8 +1060,8 @@ public class GkjyrCtl extends BaseWebCtl {
 			vo.setSzdzw(null != jyr.getSzd() ? jyr.getSzd().getText() : "");
 			vo.setSzgkzw(null != jyr.getSzgk() ? jyr.getSzgk().getGkmc() : "");
 			vo.setSzgqzw(null != jyr.getSzgq() ? jyr.getSzgq().getGqmc() : "");
-			vo.setSsgkglbmzw(null!= jyr.getSsgkglbm()?jyr.getSsgkglbm().getGkglbmqc():"");
-			vo.setSsgkglbm(null!=jyr.getSsgkglbm()? jyr.getSsgkglbm().getId():"");
+			vo.setSsgkglbmzw(null != jyr.getSsgkglbm() ? jyr.getSsgkglbm().getGkglbmqc() : "");
+			vo.setSsgkglbm(null != jyr.getSsgkglbm() ? jyr.getSsgkglbm().getId() : "");
 			vo.setSzd(null != jyr.getSzd() ? jyr.getSzd().getId() : "");
 			vo.setSzgk(null != jyr.getSzgk() ? jyr.getSzgk().getId() : "");
 			vo.setSzgq(null != jyr.getSzgq() ? jyr.getSzgq().getId() : "");
@@ -1467,13 +1469,13 @@ public class GkjyrCtl extends BaseWebCtl {
 			if (entity != null) {
 				BeanUtils.copyProperties(entity, vo);
 				if (null != entity.getFzsj()) {
-					vo.setFzsjfmt(DateTime.toString(DateTime.toDate(entity.getFzsj())));
+					vo.setFzsjfmt(DateTime.toString(entity.getFzsj()));
 				}
 				if (null != entity.getYxqkssj()) {
-					vo.setYxqkssjfmt(DateTime.toString(DateTime.toDate(entity.getYxqkssj())));
+					vo.setYxqkssjfmt(DateTime.toString(entity.getYxqkssj()));
 				}
 				if (null != entity.getYxqjssj()) {
-					vo.setYxqjssjfmt(DateTime.toString(DateTime.toDate(entity.getYxqjssj())));
+					vo.setYxqjssjfmt(DateTime.toString(entity.getYxqjssj()));
 				}
 				vo.setSzdzw(entity.getSzd() != null ? entity.getSzd().getText() : "");
 				vo.setSzgkzw(entity.getSzgk() != null ? entity.getSzgk().getGkmc() : "");
@@ -2170,13 +2172,13 @@ public class GkjyrCtl extends BaseWebCtl {
 			if (entity != null) {
 				BeanUtils.copyProperties(entity, vo);
 				if (null != entity.getFzsj()) {
-					vo.setFzsjfmt(DateTime.toString(DateTime.toDate(entity.getFzsj())));
+					vo.setFzsjfmt(DateTime.toString(entity.getFzsj()));
 				}
 				if (null != entity.getYxqkssj()) {
-					vo.setYxqkssjfmt(DateTime.toString(DateTime.toDate(entity.getYxqkssj())));
+					vo.setYxqkssjfmt(DateTime.toString(entity.getYxqkssj()));
 				}
 				if (null != entity.getYxqjssj()) {
-					vo.setYxqjssjfmt(DateTime.toString(DateTime.toDate(entity.getYxqjssj())));
+					vo.setYxqjssjfmt(DateTime.toString(entity.getYxqjssj()));
 				}
 				vo.setSzdzw(entity.getSzd() != null ? entity.getSzd().getText() : "");
 				vo.setSzgkzw(entity.getSzgk() != null ? entity.getSzgk().getGkmc() : "");
@@ -2708,7 +2710,7 @@ public class GkjyrCtl extends BaseWebCtl {
 			GkjyrVo gkjyrVo = new GkjyrVo();
 			if (null != entity) {
 				BeanUtils.copyProperties(entity, gkjyrVo);
-				
+
 				gkjyrVo.setSzdzw(null != entity.getSzd() ? entity.getSzd().getText() : "");
 				gkjyrVo.setSzgkzw(null != entity.getSzgk() ? entity.getSzgk().getGkmc() : "");
 				gkjyrVo.setSzgqzw(null != entity.getSzgq() ? entity.getSzgq().getGqmc() : "");
@@ -2748,7 +2750,7 @@ public class GkjyrCtl extends BaseWebCtl {
 				}
 				double axcd = 0;
 				for (AxEntity axEntity : axEntities) {
-					axcd += axEntity == null ? 0 : axEntity.getAxcd()==null?0:axEntity.getAxcd();
+					axcd += axEntity == null ? 0 : axEntity.getAxcd() == null ? 0 : axEntity.getAxcd();
 				}
 				// 岸线长度
 				gkjyrVo.setAxcd(axcd + "");
@@ -2961,13 +2963,13 @@ public class GkjyrCtl extends BaseWebCtl {
 				vo.setSzgq(entity.getSzgq() != null ? entity.getSzgq().getId() : "");
 				vo.setSsjyr(entity.getSsjyr() != null ? entity.getSsjyr().getId() : "");
 				if (null != entity.getFzsj()) {
-					vo.setFzsjfmt(DateTime.toString(DateTime.toDate(entity.getFzsj())));
+					vo.setFzsjfmt(DateTime.toString(entity.getFzsj()));
 				}
 				if (null != entity.getYxqkssj()) {
-					vo.setYxqkssjfmt(DateTime.toString(DateTime.toDate(entity.getYxqkssj())));
+					vo.setYxqkssjfmt(DateTime.toString(entity.getYxqkssj()));
 				}
 				if (null != entity.getYxqjssj()) {
-					vo.setYxqjssjfmt(DateTime.toString(DateTime.toDate(entity.getYxqjssj())));
+					vo.setYxqjssjfmt(DateTime.toString(entity.getYxqjssj()));
 				}
 
 				// zycs cq whdj

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/xkzfz/ctl/XkzfzCtl.java

@@ -135,15 +135,15 @@ public class XkzfzCtl extends BaseWebCtl {
 						list.add(cb.like(root.get("wxhwpm").as(String.class), "%" + v + "%"));
 					}
 				}
-				Date now =new Date();
+				Date now = new Date();
 				if (StringUtils.isNotEmpty(fzsfyx)) {
 					if (("是").equals(fzsfyx)) {
 						list.add(cb.greaterThan(root.get("yxqjssj").as(Date.class), now));
 						list.add(cb.equal(root.get("recordStatus").as(String.class), "1"));
 					} else {
-						Predicate p1 =cb.lessThan(root.get("yxqjssj").as(Date.class), now);
-						Predicate p2 = cb.notEqual(root.get("recordStatus").as(String.class), BaseEntity.RECORD_STATE_VALID); 
-						list.add(cb.and(cb.or(p1,p2)));
+						Predicate p1 = cb.lessThan(root.get("yxqjssj").as(Date.class), now);
+						Predicate p2 = cb.notEqual(root.get("recordStatus").as(String.class), BaseEntity.RECORD_STATE_VALID);
+						list.add(cb.and(cb.or(p1, p2)));
 					}
 				} else if (isGET(request)) {
 					String v = (String) CacheSearchCondition.cacheSCmapVal(cacheSCmap, "fzsfyx");
@@ -229,13 +229,13 @@ public class XkzfzCtl extends BaseWebCtl {
 			if (entity != null) {
 				BeanUtils.copyProperties(entity, vo);
 				if (null != entity.getFzsj()) {
-					vo.setFzsjfmt(DateTime.toString(DateTime.toDate(entity.getFzsj())));
+					vo.setFzsjfmt(DateTime.toString(entity.getFzsj()));
 				}
 				if (null != entity.getYxqkssj()) {
-					vo.setYxqkssjfmt(DateTime.toString(DateTime.toDate(entity.getYxqkssj())));
+					vo.setYxqkssjfmt(DateTime.toString(entity.getYxqkssj()));
 				}
 				if (null != entity.getYxqjssj()) {
-					vo.setYxqjssjfmt(DateTime.toString(DateTime.toDate(entity.getYxqjssj())));
+					vo.setYxqjssjfmt(DateTime.toString(entity.getYxqjssj()));
 				}
 				vo.setSzdzw(entity.getSzd() != null ? entity.getSzd().getText() : "");
 				vo.setSzgkzw(entity.getSzgk() != null ? entity.getSzgk().getGkmc() : "");
@@ -250,7 +250,7 @@ public class XkzfzCtl extends BaseWebCtl {
 				time.set(Calendar.HOUR_OF_DAY, 0);
 				time.set(Calendar.MINUTE, 0);
 				time.set(Calendar.SECOND, 0);
-				if (vo.getYxqjssjfmt() != null && DateTime.toDate(entity.getYxqjssj()).getTime() > time.getTimeInMillis()) {
+				if (vo.getYxqjssjfmt() != null && entity.getYxqjssj().getTime() > time.getTimeInMillis()) {
 					vo.setRecordStatus(1);
 				} else {
 					vo.setRecordStatus(9);
@@ -301,13 +301,13 @@ public class XkzfzCtl extends BaseWebCtl {
 		vo.setSzgq(entity.getSzgq() != null ? entity.getSzgq().getId() : "");
 		vo.setSsjyr(entity.getSsjyr() != null ? entity.getSsjyr().getId() : "");
 		if (null != entity.getFzsj()) {
-			vo.setFzsjfmt(DateTime.toString(DateTime.toDate(entity.getFzsj())));
+			vo.setFzsjfmt(DateTime.toString(entity.getFzsj()));
 		}
 		if (null != entity.getYxqkssj()) {
-			vo.setYxqkssjfmt(DateTime.toString(DateTime.toDate(entity.getYxqkssj())));
+			vo.setYxqkssjfmt(DateTime.toString(entity.getYxqkssj()));
 		}
 		if (null != entity.getYxqjssj()) {
-			vo.setYxqjssjfmt(DateTime.toString(DateTime.toDate(entity.getYxqjssj())));
+			vo.setYxqjssjfmt(DateTime.toString(entity.getYxqjssj()));
 		}
 
 		// zycs cq whdj
@@ -334,7 +334,7 @@ public class XkzfzCtl extends BaseWebCtl {
 		time.set(Calendar.HOUR_OF_DAY, 0);
 		time.set(Calendar.MINUTE, 0);
 		time.set(Calendar.SECOND, 0);
-		if (vo.getYxqjssjfmt() != null && DateTime.toDate(entity.getYxqjssj()).getTime() > time.getTimeInMillis()) {
+		if (vo.getYxqjssjfmt() != null && entity.getYxqjssj().getTime() > time.getTimeInMillis()) {
 			vo.setRecordStatus(1);
 		} else {
 			vo.setRecordStatus(9);
@@ -442,13 +442,13 @@ public class XkzfzCtl extends BaseWebCtl {
 		vo.setSzgq(entity.getSzgq() != null ? entity.getSzgq().getId() : "");
 		vo.setSsjyr(entity.getSsjyr() != null ? entity.getSsjyr().getId() : "");
 		if (null != entity.getFzsj()) {
-			vo.setFzsjfmt(DateTime.toString(DateTime.toDate(entity.getFzsj())));
+			vo.setFzsjfmt(DateTime.toString(entity.getFzsj()));
 		}
 		if (null != entity.getYxqkssj()) {
-			vo.setYxqkssjfmt(DateTime.toString(DateTime.toDate(entity.getYxqkssj())));
+			vo.setYxqkssjfmt(DateTime.toString(entity.getYxqkssj()));
 		}
 		if (null != entity.getYxqjssj()) {
-			vo.setYxqjssjfmt(DateTime.toString(DateTime.toDate(entity.getYxqjssj())));
+			vo.setYxqjssjfmt(DateTime.toString(entity.getYxqjssj()));
 		}
 		model.addAttribute("record", vo);
 		return "gkjygl/gkjyr/jyrxkzfz/wxhwzyfz";
@@ -487,15 +487,15 @@ public class XkzfzCtl extends BaseWebCtl {
 				if (StringUtils.isNotEmpty(wxhwpm)) {
 					list.add(cb.like(root.get("wxhwpm").as(String.class), "%" + wxhwpm + "%"));
 				}
-				Date now =new Date();
+				Date now = new Date();
 				if (StringUtils.isNotEmpty(fzsfyx)) {
 					if (("201").equals(fzsfyx)) {
 						list.add(cb.greaterThan(root.get("yxqjssj").as(Date.class), now));
 						list.add(cb.equal(root.get("recordStatus").as(String.class), "1"));
 					} else {
-						Predicate p1 =cb.lessThan(root.get("yxqjssj").as(Date.class), now);
-						Predicate p2 = cb.notEqual(root.get("recordStatus").as(String.class), BaseEntity.RECORD_STATE_VALID); 
-						list.add(cb.and(cb.or(p1,p2)));
+						Predicate p1 = cb.lessThan(root.get("yxqjssj").as(Date.class), now);
+						Predicate p2 = cb.notEqual(root.get("recordStatus").as(String.class), BaseEntity.RECORD_STATE_VALID);
+						list.add(cb.and(cb.or(p1, p2)));
 					}
 				}
 				if (StringUtils.isNotEmpty(fzsfdq)) {
@@ -563,13 +563,13 @@ public class XkzfzCtl extends BaseWebCtl {
 				vo.setSzgq(entity.getSzgq() != null ? entity.getSzgq().getId() : "");
 				vo.setSsjyr(entity.getSsjyr() != null ? entity.getSsjyr().getId() : "");
 				if (null != entity.getFzsj()) {
-					vo.setFzsjfmt(DateTime.toString(DateTime.toDate(entity.getFzsj())));
+					vo.setFzsjfmt(DateTime.toString(entity.getFzsj()));
 				}
 				if (null != entity.getYxqkssj()) {
-					vo.setYxqkssjfmt(DateTime.toString(DateTime.toDate(entity.getYxqkssj())));
+					vo.setYxqkssjfmt(DateTime.toString(entity.getYxqkssj()));
 				}
 				if (null != entity.getYxqjssj()) {
-					vo.setYxqjssjfmt(DateTime.toString(DateTime.toDate(entity.getYxqjssj())));
+					vo.setYxqjssjfmt(DateTime.toString(entity.getYxqjssj()));
 				}
 
 				// zycs cq whdj
@@ -596,7 +596,7 @@ public class XkzfzCtl extends BaseWebCtl {
 				time.set(Calendar.HOUR_OF_DAY, 0);
 				time.set(Calendar.MINUTE, 0);
 				time.set(Calendar.SECOND, 0);
-				if (vo.getYxqjssjfmt() != null && DateTime.toDate(entity.getYxqjssj()).getTime() > time.getTimeInMillis()) {
+				if (vo.getYxqjssjfmt() != null && entity.getYxqjssj().getTime() > time.getTimeInMillis()) {
 					vo.setRecordStatus(1);
 				} else {
 					vo.setRecordStatus(9);

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/xkzfz/entity/XkzfzEntity.java

@@ -1,5 +1,7 @@
 package com.xt.jygl.gkjygl.gkjyr.xkzfz.entity;
 
+import java.sql.Timestamp;
+
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;
@@ -38,13 +40,13 @@ public class XkzfzEntity extends BaseEntity<String> implements Cloneable {
 	private String whdj;
 	private String wxhwpm;
 	private String bh;
-	private String sqtbrq;
-	private String fzsj;
+	private Timestamp sqtbrq;
+	private Timestamp fzsj;
 	private String fzsqh;
 	private String fzcsbh;
 	private String fzjg;
-	private String yxqkssj;
-	private String yxqjssj;
+	private Timestamp yxqkssj;
+	private Timestamp yxqjssj;
 	private String qynbbh;
 	private String gkjyxkz;
 	private String qynbmc;
@@ -157,19 +159,19 @@ public class XkzfzEntity extends BaseEntity<String> implements Cloneable {
 		this.bh = bh;
 	}
 
-	public String getSqtbrq() {
+	public Timestamp getSqtbrq() {
 		return sqtbrq;
 	}
 
-	public void setSqtbrq(String sqtbrq) {
+	public void setSqtbrq(Timestamp sqtbrq) {
 		this.sqtbrq = sqtbrq;
 	}
 
-	public String getFzsj() {
+	public Timestamp getFzsj() {
 		return fzsj;
 	}
 
-	public void setFzsj(String fzsj) {
+	public void setFzsj(Timestamp fzsj) {
 		this.fzsj = fzsj;
 	}
 
@@ -197,19 +199,19 @@ public class XkzfzEntity extends BaseEntity<String> implements Cloneable {
 		this.fzjg = fzjg;
 	}
 
-	public String getYxqkssj() {
+	public Timestamp getYxqkssj() {
 		return yxqkssj;
 	}
 
-	public void setYxqkssj(String yxqkssj) {
+	public void setYxqkssj(Timestamp yxqkssj) {
 		this.yxqkssj = yxqkssj;
 	}
 
-	public String getYxqjssj() {
+	public Timestamp getYxqjssj() {
 		return yxqjssj;
 	}
 
-	public void setYxqjssj(String yxqjssj) {
+	public void setYxqjssj(Timestamp yxqjssj) {
 		this.yxqjssj = yxqjssj;
 	}
 

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

@@ -1406,7 +1406,7 @@ public class XkzxxCtl extends BaseWebCtl {
 				xkzxx.setYxqz(code.getYxqz());
 				xkzxx.setYxqq(code.getYxqq());
 				xkzxx.setFzrq(code.getFzrq());
-				xkzxx.setIsflag("1");
+				xkzxx.setIsflag("0");
 				xkzxx.setZmpicid(zmpicid);
 				xkzxx.setFmpicid(fmpicid);
 				if ("11".equals(xkzxx.getSfyx())) {

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxkbg/ctl/XkzbgCtl.java

@@ -399,9 +399,11 @@ public class XkzbgCtl extends BaseWebCtl {
 				public Predicate toPredicate(Root<XkzxxEntity> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
 					List<Predicate> list = new ArrayList<Predicate>();
 					list.add(cb.like(root.get("gkjyr").as(String.class), "%" + jyrid + "%"));
-					//list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_DELETE));
+					// list.add(cb.notEqual(root.get("recordStatus").as(Integer.class),
+					// BaseEntity.RECORD_STATE_DELETE));
 					list.add(cb.equal(root.get("recordStatus").as(Integer.class), BaseEntity.RECORE_STATE_COPY));
-					//list.add(cb.equal(root.get("sfyx").as(Integer.class), BaseEntity.RECORD_STATE_VALID));
+					// list.add(cb.equal(root.get("sfyx").as(Integer.class),
+					// BaseEntity.RECORD_STATE_VALID));
 					return cb.and(list.toArray(new Predicate[] {}));
 				}
 			};
@@ -439,7 +441,8 @@ public class XkzbgCtl extends BaseWebCtl {
 				public Predicate toPredicate(Root<XkzfzEntity> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
 					List<Predicate> list = new ArrayList<Predicate>();
 					list.add(cb.like(root.get("ssjyr").get("id").as(String.class), "%" + jyrid + "%"));
-					//list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_DELETE));
+					// list.add(cb.notEqual(root.get("recordStatus").as(Integer.class),
+					// BaseEntity.RECORD_STATE_DELETE));
 					list.add(cb.equal(root.get("recordStatus").as(Integer.class), BaseEntity.RECORE_STATE_COPY));
 					return cb.and(list.toArray(new Predicate[] {}));
 				}
@@ -451,13 +454,13 @@ public class XkzbgCtl extends BaseWebCtl {
 				if (entity != null) {
 					BeanUtils.copyProperties(entity, vo);
 					if (null != entity.getFzsj()) {
-						vo.setFzsjfmt(DateTime.toString(DateTime.toDate(entity.getFzsj())));
+						vo.setFzsjfmt(DateTime.toString(entity.getFzsj()));
 					}
 					if (null != entity.getYxqkssj()) {
-						vo.setYxqkssjfmt(DateTime.toString(DateTime.toDate(entity.getYxqkssj())));
+						vo.setYxqkssjfmt(DateTime.toString(entity.getYxqkssj()));
 					}
 					if (null != entity.getYxqjssj()) {
-						vo.setYxqjssjfmt(DateTime.toString(DateTime.toDate(entity.getYxqjssj())));
+						vo.setYxqjssjfmt(DateTime.toString(entity.getYxqjssj()));
 					}
 					vo.setSzdzw(entity.getSzd() != null ? entity.getSzd().getText() : "");
 					vo.setSzgkzw(entity.getSzgk() != null ? entity.getSzgk().getGkmc() : "");
@@ -1206,13 +1209,13 @@ public class XkzbgCtl extends BaseWebCtl {
 				if (entity != null) {
 					BeanUtils.copyProperties(entity, vo);
 					if (null != entity.getFzsj()) {
-						vo.setFzsjfmt(DateTime.toString(DateTime.toDate(entity.getFzsj())));
+						vo.setFzsjfmt(DateTime.toString(entity.getFzsj()));
 					}
 					if (null != entity.getYxqkssj()) {
-						vo.setYxqkssjfmt(DateTime.toString(DateTime.toDate(entity.getYxqkssj())));
+						vo.setYxqkssjfmt(DateTime.toString(entity.getYxqkssj()));
 					}
 					if (null != entity.getYxqjssj()) {
-						vo.setYxqjssjfmt(DateTime.toString(DateTime.toDate(entity.getYxqjssj())));
+						vo.setYxqjssjfmt(DateTime.toString(entity.getYxqjssj()));
 					}
 					vo.setSzdzw(entity.getSzd() != null ? entity.getSzd().getText() : "");
 					vo.setSzgkzw(entity.getSzgk() != null ? entity.getSzgk().getGkmc() : "");
@@ -1469,13 +1472,13 @@ public class XkzbgCtl extends BaseWebCtl {
 				if (entity != null) {
 					BeanUtils.copyProperties(entity, vo);
 					if (null != entity.getFzsj()) {
-						vo.setFzsjfmt(DateTime.toString(DateTime.toDate(entity.getFzsj())));
+						vo.setFzsjfmt(DateTime.toString(entity.getFzsj()));
 					}
 					if (null != entity.getYxqkssj()) {
-						vo.setYxqkssjfmt(DateTime.toString(DateTime.toDate(entity.getYxqkssj())));
+						vo.setYxqkssjfmt(DateTime.toString(entity.getYxqkssj()));
 					}
 					if (null != entity.getYxqjssj()) {
-						vo.setYxqjssjfmt(DateTime.toString(DateTime.toDate(entity.getYxqjssj())));
+						vo.setYxqjssjfmt(DateTime.toString(entity.getYxqjssj()));
 					}
 					vo.setSzdzw(entity.getSzd() != null ? entity.getSzd().getText() : "");
 					vo.setSzgkzw(entity.getSzgk() != null ? entity.getSzgk().getGkmc() : "");

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxksq/ctl/XkzsqCtl.java

@@ -491,13 +491,13 @@ public class XkzsqCtl extends BaseWebCtl {
 				if (entity != null) {
 					BeanUtils.copyProperties(entity, vo);
 					if (null != entity.getFzsj()) {
-						vo.setFzsjfmt(DateTime.toString(DateTime.toDate(entity.getFzsj())));
+						vo.setFzsjfmt(DateTime.toString(entity.getFzsj()));
 					}
 					if (null != entity.getYxqkssj()) {
-						vo.setYxqkssjfmt(DateTime.toString(DateTime.toDate(entity.getYxqkssj())));
+						vo.setYxqkssjfmt(DateTime.toString(entity.getYxqkssj()));
 					}
 					if (null != entity.getYxqjssj()) {
-						vo.setYxqjssjfmt(DateTime.toString(DateTime.toDate(entity.getYxqjssj())));
+						vo.setYxqjssjfmt(DateTime.toString(entity.getYxqjssj()));
 					}
 					vo.setSzdzw(entity.getSzd() != null ? entity.getSzd().getText() : "");
 					vo.setSzgkzw(entity.getSzgk() != null ? entity.getSzgk().getGkmc() : "");
@@ -867,13 +867,13 @@ public class XkzsqCtl extends BaseWebCtl {
 				if (entity != null) {
 					BeanUtils.copyProperties(entity, vo);
 					if (null != entity.getFzsj()) {
-						vo.setFzsjfmt(DateTime.toString(DateTime.toDate(entity.getFzsj())));
+						vo.setFzsjfmt(DateTime.toString(entity.getFzsj()));
 					}
 					if (null != entity.getYxqkssj()) {
-						vo.setYxqkssjfmt(DateTime.toString(DateTime.toDate(entity.getYxqkssj())));
+						vo.setYxqkssjfmt(DateTime.toString(entity.getYxqkssj()));
 					}
 					if (null != entity.getYxqjssj()) {
-						vo.setYxqjssjfmt(DateTime.toString(DateTime.toDate(entity.getYxqjssj())));
+						vo.setYxqjssjfmt(DateTime.toString(entity.getYxqjssj()));
 					}
 					vo.setSzdzw(entity.getSzd() != null ? entity.getSzd().getText() : "");
 					vo.setSzgkzw(entity.getSzgk() != null ? entity.getSzgk().getGkmc() : "");
@@ -1086,13 +1086,13 @@ public class XkzsqCtl extends BaseWebCtl {
 				if (entity != null) {
 					BeanUtils.copyProperties(entity, vo);
 					if (null != entity.getFzsj()) {
-						vo.setFzsjfmt(DateTime.toString(DateTime.toDate(entity.getFzsj())));
+						vo.setFzsjfmt(DateTime.toString(entity.getFzsj()));
 					}
 					if (null != entity.getYxqkssj()) {
-						vo.setYxqkssjfmt(DateTime.toString(DateTime.toDate(entity.getYxqkssj())));
+						vo.setYxqkssjfmt(DateTime.toString(entity.getYxqkssj()));
 					}
 					if (null != entity.getYxqjssj()) {
-						vo.setYxqjssjfmt(DateTime.toString(DateTime.toDate(entity.getYxqjssj())));
+						vo.setYxqjssjfmt(DateTime.toString(entity.getYxqjssj()));
 					}
 					vo.setSzdzw(entity.getSzd() != null ? entity.getSzd().getText() : "");
 					vo.setSzgkzw(entity.getSzgk() != null ? entity.getSzgk().getGkmc() : "");

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxkyx/ctl/XkzyxCtl.java

@@ -383,13 +383,13 @@ public class XkzyxCtl extends BaseWebCtl {
 				if (entity != null) {
 					BeanUtils.copyProperties(entity, vo);
 					if (null != entity.getFzsj()) {
-						vo.setFzsjfmt(DateTime.toString(DateTime.toDate(entity.getFzsj())));
+						vo.setFzsjfmt(DateTime.toString(entity.getFzsj()));
 					}
 					if (null != entity.getYxqkssj()) {
-						vo.setYxqkssjfmt(DateTime.toString(DateTime.toDate(entity.getYxqkssj())));
+						vo.setYxqkssjfmt(DateTime.toString(entity.getYxqkssj()));
 					}
 					if (null != entity.getYxqjssj()) {
-						vo.setYxqjssjfmt(DateTime.toString(DateTime.toDate(entity.getYxqjssj())));
+						vo.setYxqjssjfmt(DateTime.toString(entity.getYxqjssj()));
 					}
 					vo.setSzdzw(entity.getSzd() != null ? entity.getSzd().getText() : "");
 					vo.setSzgkzw(entity.getSzgk() != null ? entity.getSzgk().getGkmc() : "");
@@ -901,13 +901,13 @@ public class XkzyxCtl extends BaseWebCtl {
 				if (entity != null) {
 					BeanUtils.copyProperties(entity, vo);
 					if (null != entity.getFzsj()) {
-						vo.setFzsjfmt(DateTime.toString(DateTime.toDate(entity.getFzsj())));
+						vo.setFzsjfmt(DateTime.toString(entity.getFzsj()));
 					}
 					if (null != entity.getYxqkssj()) {
-						vo.setYxqkssjfmt(DateTime.toString(DateTime.toDate(entity.getYxqkssj())));
+						vo.setYxqkssjfmt(DateTime.toString(entity.getYxqkssj()));
 					}
 					if (null != entity.getYxqjssj()) {
-						vo.setYxqjssjfmt(DateTime.toString(DateTime.toDate(entity.getYxqjssj())));
+						vo.setYxqjssjfmt(DateTime.toString(entity.getYxqjssj()));
 					}
 					vo.setSzdzw(entity.getSzd() != null ? entity.getSzd().getText() : "");
 					vo.setSzgkzw(entity.getSzgk() != null ? entity.getSzgk().getGkmc() : "");
@@ -1174,13 +1174,13 @@ public class XkzyxCtl extends BaseWebCtl {
 				if (entity != null) {
 					BeanUtils.copyProperties(entity, vo);
 					if (null != entity.getFzsj()) {
-						vo.setFzsjfmt(DateTime.toString(DateTime.toDate(entity.getFzsj())));
+						vo.setFzsjfmt(DateTime.toString(entity.getFzsj()));
 					}
 					if (null != entity.getYxqkssj()) {
-						vo.setYxqkssjfmt(DateTime.toString(DateTime.toDate(entity.getYxqkssj())));
+						vo.setYxqkssjfmt(DateTime.toString(entity.getYxqkssj()));
 					}
 					if (null != entity.getYxqjssj()) {
-						vo.setYxqjssjfmt(DateTime.toString(DateTime.toDate(entity.getYxqjssj())));
+						vo.setYxqjssjfmt(DateTime.toString(entity.getYxqjssj()));
 					}
 					vo.setSzdzw(entity.getSzd() != null ? entity.getSzd().getText() : "");
 					vo.setSzgkzw(entity.getSzgk() != null ? entity.getSzgk().getGkmc() : "");
@@ -1912,7 +1912,7 @@ public class XkzyxCtl extends BaseWebCtl {
 							// xkzxx.setZmpicid(xkz.getZmpicid());
 							if (xkz.getYxqq() != null) {
 								SimpleDateFormat dateTimeFormat = new SimpleDateFormat("yyyy-MM-dd");
-								String date = dateTimeFormat.format(getLastDate(xkz.getYxqq()));
+								String date = dateTimeFormat.format(getLastDate(xkz.getYxqz()));
 								xkzxx.setYxqq(dateTimeFormat.parse(date));
 								String t = (Integer.parseInt(date.substring(0, 4)) + 3) + date.substring(4);
 								xkzxx.setYxqz(dateTimeFormat.parse(t));
@@ -2056,10 +2056,10 @@ public class XkzyxCtl extends BaseWebCtl {
 				for (XkzxxEntity xkz : xkzlist) {
 					if (xkz != null) {
 						SimpleDateFormat dataTime = new SimpleDateFormat("yyyy-MM-dd");
-						String date = dataTime.format(getLastDate(xkz.getYxqq()));
-						//xkzxx.setYxqq(dateTimeFormat.parse(date));
+						String date = dataTime.format(getLastDate(xkz.getYxqz()));
+						// xkzxx.setYxqq(dateTimeFormat.parse(date));
 						String t = (Integer.parseInt(date.substring(0, 4)) + 3) + date.substring(4);
-						//xkzxx.setYxqz(dateTimeFormat.parse(t));
+						// xkzxx.setYxqz(dateTimeFormat.parse(t));
 						jds.setYxrq(t);
 					} else {
 						SimpleDateFormat dataTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxkzx/ctl/XkzzxCtl.java

@@ -378,9 +378,11 @@ public class XkzzxCtl extends BaseWebCtl {
 				public Predicate toPredicate(Root<XkzxxEntity> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
 					List<Predicate> list = new ArrayList<Predicate>();
 					list.add(cb.like(root.get("gkjyr").as(String.class), "%" + jyrid + "%"));
-					//list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_DELETE));
+					// list.add(cb.notEqual(root.get("recordStatus").as(Integer.class),
+					// BaseEntity.RECORD_STATE_DELETE));
 					list.add(cb.equal(root.get("recordStatus").as(Integer.class), BaseEntity.RECORE_STATE_COPY));
-					//list.add(cb.equal(root.get("sfyx").as(Integer.class), BaseEntity.RECORD_STATE_VALID));
+					// list.add(cb.equal(root.get("sfyx").as(Integer.class),
+					// BaseEntity.RECORD_STATE_VALID));
 					Date date = new Date();
 					list.add(cb.greaterThanOrEqualTo(root.get("yxqz").as(Date.class), date));
 					list.add(cb.lessThanOrEqualTo(root.get("yxqq").as(Date.class), date));
@@ -433,13 +435,13 @@ public class XkzzxCtl extends BaseWebCtl {
 				if (entity != null) {
 					BeanUtils.copyProperties(entity, vo);
 					if (null != entity.getFzsj()) {
-						vo.setFzsjfmt(DateTime.toString(DateTime.toDate(entity.getFzsj())));
+						vo.setFzsjfmt(DateTime.toString(entity.getFzsj()));
 					}
 					if (null != entity.getYxqkssj()) {
-						vo.setYxqkssjfmt(DateTime.toString(DateTime.toDate(entity.getYxqkssj())));
+						vo.setYxqkssjfmt(DateTime.toString(entity.getYxqkssj()));
 					}
 					if (null != entity.getYxqjssj()) {
-						vo.setYxqjssjfmt(DateTime.toString(DateTime.toDate(entity.getYxqjssj())));
+						vo.setYxqjssjfmt(DateTime.toString(entity.getYxqjssj()));
 					}
 					vo.setSzdzw(entity.getSzd() != null ? entity.getSzd().getText() : "");
 					vo.setSzgkzw(entity.getSzgk() != null ? entity.getSzgk().getGkmc() : "");
@@ -1161,13 +1163,13 @@ public class XkzzxCtl extends BaseWebCtl {
 				if (entity != null) {
 					BeanUtils.copyProperties(entity, vo);
 					if (null != entity.getFzsj()) {
-						vo.setFzsjfmt(DateTime.toString(DateTime.toDate(entity.getFzsj())));
+						vo.setFzsjfmt(DateTime.toString(entity.getFzsj()));
 					}
 					if (null != entity.getYxqkssj()) {
-						vo.setYxqkssjfmt(DateTime.toString(DateTime.toDate(entity.getYxqkssj())));
+						vo.setYxqkssjfmt(DateTime.toString(entity.getYxqkssj()));
 					}
 					if (null != entity.getYxqjssj()) {
-						vo.setYxqjssjfmt(DateTime.toString(DateTime.toDate(entity.getYxqjssj())));
+						vo.setYxqjssjfmt(DateTime.toString(entity.getYxqjssj()));
 					}
 					vo.setSzdzw(entity.getSzd() != null ? entity.getSzd().getText() : "");
 					vo.setSzgkzw(entity.getSzgk() != null ? entity.getSzgk().getGkmc() : "");
@@ -1369,13 +1371,13 @@ public class XkzzxCtl extends BaseWebCtl {
 				if (entity != null) {
 					BeanUtils.copyProperties(entity, vo);
 					if (null != entity.getFzsj()) {
-						vo.setFzsjfmt(DateTime.toString(DateTime.toDate(entity.getFzsj())));
+						vo.setFzsjfmt(DateTime.toString(entity.getFzsj()));
 					}
 					if (null != entity.getYxqkssj()) {
-						vo.setYxqkssjfmt(DateTime.toString(DateTime.toDate(entity.getYxqkssj())));
+						vo.setYxqkssjfmt(DateTime.toString(entity.getYxqkssj()));
 					}
 					if (null != entity.getYxqjssj()) {
-						vo.setYxqjssjfmt(DateTime.toString(DateTime.toDate(entity.getYxqjssj())));
+						vo.setYxqjssjfmt(DateTime.toString(entity.getYxqjssj()));
 					}
 					vo.setSzdzw(entity.getSzd() != null ? entity.getSzd().getText() : "");
 					vo.setSzgkzw(entity.getSzgk() != null ? entity.getSzgk().getGkmc() : "");

gkjsjy/trunk/src/com/xtframe/util/DateTime.java

@@ -34,7 +34,7 @@ public class DateTime {
 	/**
 	 * 要用到的缺省的Date time 格式定义 年/月/日 时:分:秒 YYYY/MM/DD HH:MM:SS
 	 **/
-	public static String DATE_FORMAT_DATETIME = "yyyy-MM-dd HH:mm:ss";
+	public static String DATE_FORMAT_DATETIME = "yyyy-MM-dd";
 
 	/**
 	 * 闰年的每个月的天数数组