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

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/controller/check/DcController.java

@@ -119,6 +119,8 @@ public class DcController extends BaseController {
 				BaseEntity.RECORD_STATE_DELETE, Operator.NEQ);
 		Specification<DcEntity> spec = SpecificationCreater
 				.searchByPredicateModels(filterList);
+		pageRequest = new SinglePageRequest(pageRequest.getPageNumber(),pageRequest.getPageSize(), 
+				"desc", "sj");
 		Page<DcEntity> page = dcService.findAll(spec, pageRequest);
 		for (DcEntity ba : page) {
 			if (dcService.getTaskByUserAndBusKey(Utils.getCurrentUser().getId()

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/entity/gkgq/GqEntity.java

@@ -98,7 +98,7 @@ public class GqEntity extends BaseEntity<Long> implements Cloneable {
 		return entity;
 	}
 
-	@ManyToOne(fetch = FetchType.EAGER, targetEntity = CodeEntity.class)
+	@ManyToOne(fetch = FetchType.LAZY, targetEntity = CodeEntity.class)
 	@JoinColumn(name = "gqszsylx")
 	@RemotingExclude
 	public CodeEntity getGqszsylx() {
@@ -221,7 +221,7 @@ public class GqEntity extends BaseEntity<Long> implements Cloneable {
 		this.bz = bz;
 	}
 
-	@ManyToOne(fetch = FetchType.EAGER, targetEntity = CodeEntity.class)
+	@ManyToOne(fetch = FetchType.LAZY, targetEntity = CodeEntity.class)
 	@JoinColumn(name = "szsx")
 	@RemotingExclude
 	public CodeEntity getSzsx() {

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/entity/jyr/BwEntity.java

@@ -474,7 +474,7 @@ public class BwEntity extends BaseEntity<Long> implements Cloneable {
 	}
 
 	@ManyToOne(fetch = FetchType.EAGER, targetEntity = CodeEntity.class)
-	@JoinColumn(name = "fwlx2")
+	@JoinColumn(name = "jgxs2")
 	@RemotingExclude
 	public CodeEntity getJgxs2() {
 		return jgxs2;