动液面相关接口调整

src/main/java/com/hb/proj/data/service/LiquidService.java

@@ -50,7 +50,7 @@ public class LiquidService {
 				modify_time=now()
 				,modify_by=?
 				,liquid_suface_pos=?
-				,well_head_poss=?
+				,well_head_pos=?
 				,liquid_depth=?
 				,compute_mode=?
 				""";
@@ -58,8 +58,8 @@ public class LiquidService {
 		args.addAll(Arrays.asList(liquid.getModifyBy(),liquid.getLiquidSufacePos(),liquid.getWellHeadPos(),liquid.getLiquidDepth(),liquid.getComputeMode()));
 		
 		if(liquid.getComputeMode().equals(LiquidPO.MODE_HOOP)) {
-			sql+=",start_hoop_pos=?,end_hoop_pos=?,avg_length_pipe=?,hoop_count=? ";
-			args.addAll(Arrays.asList(liquid.getStartHoopPos(),liquid.getEndHoopPos(),liquid.getAvgLengthPipe(),liquid.getHoopCount()));
+			sql+=",hoop_start_pos=?,hoop_end_pos=?,avg_length_pipe=?,hoop_count=? ";
+			args.addAll(Arrays.asList(liquid.getHoopStartPos(),liquid.getHoopEndPos(),liquid.getAvgLengthPipe(),liquid.getHoopCount()));
 		}
 		else if(liquid.getComputeMode().equals(LiquidPO.MODE_SOUND_SPEED)) {
 			sql+=",sound_speed=?";

src/main/java/com/hb/proj/model/LiquidPO.java

@@ -29,9 +29,9 @@ public class LiquidPO {
 	
 	private Integer wellHeadPos;
 	
-	private Integer startHoopPos;
+	private Integer hoopStartPos;
 	
-	private Integer endHoopPos;
+	private Integer hoopEndPos;
 	
 	private Double liquidDepth;
 	

src/main/java/com/hb/proj/model/LiquidVO.java

@@ -8,4 +8,20 @@ import lombok.EqualsAndHashCode;
 public class LiquidVO extends LiquidPO {
 
 	private String wellName;
+	
+	private String computeModeName;
+	
+	public void setComputeMode(String computeMode) {
+		super.setComputeMode(computeMode);
+		if("hoop".equals(computeMode)) {
+			this.computeModeName="接箍法";
+		}
+		else if("sound_speed".equals(computeMode)) {
+			this.computeModeName="音速法";
+		}
+		else if("sound_mark".equals(computeMode)) {
+			this.computeModeName="音标法";
+		}
+		
+	}
 }