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

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/controller/cgInfo/cgInfoController.java

@@ -0,0 +1,48 @@
+package com.jtgh.yjpt.controller.cgInfo;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.flex.remoting.RemotingDestination;
+import org.springframework.stereotype.Controller;
+
+import com.jtgh.yjpt.anon.Log;
+import com.jtgh.yjpt.anon.Log.Type;
+import com.jtgh.yjpt.common.BusinessContext;
+import com.jtgh.yjpt.common.PredicateModel;
+import com.jtgh.yjpt.common.PredicateModel.Operator;
+import com.jtgh.yjpt.common.SpecificationCreater;
+import com.jtgh.yjpt.controller.BaseController;
+import com.jtgh.yjpt.entity.BaseEntity;
+import com.jtgh.yjpt.entity.cginfo.CgInfoEntity;
+import com.jtgh.yjpt.service.cginfo.CgInfoService;
+
+/**
+ * 储罐基本信息Controller
+ * 
+ */ 
+
+@Controller
+@RemotingDestination
+@Log(menuCode = "003008", menuCodeJyr = "003008_c")
+public class cgInfoController extends BaseController {
+	@Autowired
+	CgInfoService cgInfoService;
+	
+	@Log(Type.QUERY)
+	public BusinessContext list(Pageable pageable,Long functionId) {
+		List<PredicateModel> filterList = new ArrayList<PredicateModel>(); 
+		// 只检索非删除状态记录
+		addNotEmptyModel(filterList, "recordStatus", BaseEntity.RECORD_STATE_DELETE, Operator.NEQ);
+		Specification<CgInfoEntity> spec = SpecificationCreater.searchByPredicateModels(filterList);
+		Page<CgInfoEntity> pageList = cgInfoService.findAll(spec, pageable);
+		BusinessContext bc = createBusinessContext(pageList);
+		return bc;
+	}
+	
+	
+}

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/entity/cginfo/CgInfoEntity.java

@@ -23,7 +23,7 @@ public class CgInfoEntity  extends BaseEntity<Long> implements Cloneable {
 	 
 	private static final long serialVersionUID = 622928578418850812L;
 	
-	private long id;
+	private Long id;
 	private Date buildDate;
 	private GqEntity szgq;
 	private String bh;
@@ -32,7 +32,7 @@ public class CgInfoEntity  extends BaseEntity<Long> implements Cloneable {
 	private String contactPhone;
 	private String contactEmail;
 	private String cgForm;
-	private double zgVolume;
+	private double cgVolume;
 	private String cgMaterial;
 	private String haveDesignInfo;
 	private String designOrgName;
@@ -60,21 +60,20 @@ public class CgInfoEntity  extends BaseEntity<Long> implements Cloneable {
 		return Constants.SEQ_CG_INFO;
 	}
 	
-	@Id
-	public long getID() {
-		return ID;
+	@Id 
+	public Long getId() {
+		return id;
 	}
-	public void setID(long iD) {
-		ID = iD;
+
+	public void setId(Long id) {
+		this.id = id;
 	}
 
+	
 	public Date getBuildDate() {
 		return buildDate;
 	}
 
-
-
-
 	public void setBuildDate(Date buildDate) {
 		this.buildDate = buildDate;
 	}
@@ -177,15 +176,13 @@ public class CgInfoEntity  extends BaseEntity<Long> implements Cloneable {
 
 
 
-	public double getZgVolume() {
-		return zgVolume;
+	public double getCgVolume() {
+		return cgVolume;
 	}
 
 
-
-
-	public void setZgVolume(double zgVolume) {
-		this.zgVolume = zgVolume;
+	public void setCgVolume(double cgVolume) {
+		this.cgVolume = cgVolume;
 	}
 
 

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/entity/cginfo/CgStorageEntity.java

@@ -19,7 +19,7 @@ public class CgStorageEntity extends BaseEntity<Long> implements Cloneable{
  
 	private static final long serialVersionUID = -7561911003716600379L;
 	
-	private long id;
+	private Long id;
 	private CgInfoEntity cgInfoId;
 	private String commodityName;
 	private String cas;
@@ -35,10 +35,10 @@ public class CgStorageEntity extends BaseEntity<Long> implements Cloneable{
 	}
 	
 	@Id
-	public long getId() {
+	public Long getId() {
 		return id;
 	}
-	public void setId(long id) {
+	public void setId(Long id) {
 		this.id = id;
 	}
 	

gkaq/yjpt-java/trunk/locale/zh_CN/module.properties

@@ -55,8 +55,6 @@ m002002_c=\u5e94\u6025\u57f9\u8bad\u3001\u6f14\u7ec3\u548c\u6f14\u4e60\u586b\u62
 m002005=\u4e8b\u6545\u6848\u4f8b\u7ba1\u7406
 m002005_c=\u4e8b\u6545\u6848\u4f8b\u586b\u62a5
 m002007=\u91cd\u5927\u5371\u9669\u6e90\u5f55\u5165
-m002010=\u50a8\u7f50\u57fa\u672c\u4fe1\u606f
-m002010_c=\u50a8\u7f50\u57fa\u672c\u4fe1\u606f
 m002007001=\u4fe1\u606f\u5f55\u5165
 m002007001_c=\u4fe1\u606f\u5f55\u5165
 m002007_c=\u50a8\u7f50\u4fe1\u606f\u586b\u62a5
@@ -82,6 +80,8 @@ m003006=\u5efa\u8bbe\u5355\u4f4d\u4fe1\u606f\u7ba1\u7406
 m003006_c=\u5efa\u8bbe\u5355\u4f4d\u4fe1\u606f
 m003007=\u7ecf\u8425\u4eba\u4fe1\u606f\u7ba1\u7406
 m003007_c=\u7ecf\u8425\u4eba\u4fe1\u606f
+m003008=\u50a8\u7f50\u57fa\u672c\u4fe1\u606f
+m003008_c=\u50a8\u7f50\u57fa\u672c\u4fe1\u606f
 m004=\u5b89\u5168\u5ba1\u6279\u7ba1\u7406
 m004001=\u5371\u8d27\u4f5c\u4e1a\u7533\u62a5\u5ba1\u6279
 m004001_c=\u5371\u8d27\u4f5c\u4e1a\u7533\u62a5