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

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

@@ -637,6 +637,9 @@ public class DcController extends BaseController {
 	public BusinessContext getDcxxById(Long dcId) {
 		BusinessContext bc = new BusinessContext();
 		DcEntity dcEntity = dcService.findOne(dcId);
+		if (dcEntity.getTaskList() != null && dcEntity.getTaskList().size() > 0) {
+			dcEntity.getTaskList().get(0);
+		}
 		List<AccessoryEntity> acc;
 		List<byte[]> list;
 		if (BaseEntity.RECORD_STATE_DELETE == dcEntity.getRecordStatus()) {

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

@@ -70,9 +70,9 @@ public class JyrEntity extends BaseEntity<Long> implements Cloneable {
 	/** 工商营业执照编号 */
 	private String gsyyzzbh = null;
 	/** 投资总额 */
-	private Integer tzze;
+	private Double tzze;
 	/** 注册资本 */
-	private Integer zczb;
+	private Double zczb;
 	/** 港口危险货物作业附证编号 */
 	private String gkwxhwzyfzbh = null;
 	/** 港口设施保安符合证书编号 */
@@ -304,19 +304,19 @@ public class JyrEntity extends BaseEntity<Long> implements Cloneable {
 		this.gsyyzzbh = gsyyzzbh;
 	}
 
-	public Integer getTzze() {
+	public Double getTzze() {
 		return tzze;
 	}
 
-	public void setTzze(Integer tzze) {
+	public void setTzze(Double tzze) {
 		this.tzze = tzze;
 	}
 
-	public Integer getZczb() {
+	public Double getZczb() {
 		return zczb;
 	}
 
-	public void setZczb(Integer zczb) {
+	public void setZczb(Double zczb) {
 		this.zczb = zczb;
 	}
 

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/entity/yjgl/zdwxyfb/CgEntity.java

@@ -240,7 +240,7 @@ public class CgEntity extends BaseEntity<Long> implements Cloneable {
 	 */
 	private Double zdwxycgrl;
 	/** 安全高度 */
-	private Integer aqgd;
+	private Double aqgd;
 	/** 直径 */
 	private Integer zj;
 
@@ -262,11 +262,11 @@ public class CgEntity extends BaseEntity<Long> implements Cloneable {
 		return Constants.SEQ_T_YJPT_CG;
 	}
 
-	public Integer getAqgd() {
+	public Double getAqgd() {
 		return aqgd;
 	}
 
-	public void setAqgd(Integer aqgd) {
+	public void setAqgd(Double aqgd) {
 		this.aqgd = aqgd;
 	}
 

gkaq/yjpt-java/trunk/java_src/com/jtgh/yjpt/service/impl/check/DcServiceImpl.java

@@ -157,14 +157,6 @@ public class DcServiceImpl extends BaseWorkFlowServiceImpl<DcEntity, Long>
 		}
 	}
 
-	@Override
-	public DcEntity findOne(Long id) {
-		DcEntity dc = dcDao.findOne(id);
-		if (dc.getTaskList() != null && dc.getTaskList().size() > 0) {
-			dc.getTaskList().get(0);
-		}
-		return dc;
-	}
 
 	/**
 	 * 发送工作提醒