Merge remote-tracking branch 'origin/dev' into dev

railway-business/src/main/java/com/railway/business/catenary/controller/BusJcbJcxcController.java

@@ -115,12 +115,12 @@ public class BusJcbJcxcController extends BaseController {
     params.put("${qj}", info.getStationName());
     params.put("${wendu}", info.getTemperature() == null ? "" : info.getTemperature());
     params.put("${jcrq}", DateUtils.parseCheckDate(info.getCheckDate()));
-    params.put("${gz1lcz}", info.getGz1lcz().toString());
-    params.put("${gz2lcz}", info.getGz2lcz().toString());
-    params.put("${zglcz}", info.getZglcz().toString());
-    params.put("${qglcz}", info.getQglcz().toString());
-    params.put("${ngj}", info.getNgj().toString());
-    params.put("${plz}", info.getPlz().toString());
+    params.put("${gz1lcz}", StringUtils.bigDecimalToString(info.getGz1lcz()));
+    params.put("${gz2lcz}", StringUtils.bigDecimalToString(info.getGz2lcz()));
+    params.put("${zglcz}", StringUtils.bigDecimalToString(info.getZglcz()));
+    params.put("${qglcz}", StringUtils.bigDecimalToString(info.getQglcz()));
+    params.put("${ngj}", StringUtils.bigDecimalToString(info.getNgj()));
+    params.put("${plz}", StringUtils.bigDecimalToString(info.getPlz()));
     params.put("${xcxzgazlg}", StringUtils.yesOrNo(info.getXcxzgazlg()));
     params.put("${hdjx}", StringUtils.yesOrNo(info.getHdjx()));
     params.put("${fhzzsq}", StringUtils.yesOrNo(info.getFhzzsq()));
@@ -128,9 +128,9 @@ public class BusJcbJcxcController extends BaseController {
     params.put("${lswst}", StringUtils.yesOrNo(info.getLswst()));
     params.put("${xzgldydx}", StringUtils.yesOrNo(info.getXzgldydx()));
     params.put("${dxztlh}", StringUtils.yesOrNo(info.getDxztlh()));
-    params.put("${czjj}", info.getCzjj().toString());
-    params.put("${lgzzgc}", info.getLgzzgc().toString());
-    params.put("${gzyfzgc}", info.getGzyfzgc().toString());
+    params.put("${czjj}", StringUtils.bigDecimalToString(info.getCzjj()));
+    params.put("${lgzzgc}", StringUtils.bigDecimalToString(info.getLgzzgc()));
+    params.put("${gzyfzgc}", StringUtils.bigDecimalToString(info.getGzyfzgc()));
     params.put("${wxj}", StringUtils.yesOrNo(info.getWxj()));
     params.put("${hddxxjzt}", StringUtils.yesOrNo(info.getHddxxjzt()));
     params.put("${jcdxzt}", StringUtils.yesOrNo(info.getJcdxzt()));

railway-business/src/main/java/com/railway/business/catenary/controller/BusJcbWjcxcController.java

@@ -118,23 +118,23 @@ public class BusJcbWjcxcController extends BaseController {
         params.put("hdxjzt", StringUtils.yesOrNo(info.getHdxjzt()));
         params.put("wxjqzt", StringUtils.yesOrNo(info.getWxjqzt()));
         params.put("dljzt", StringUtils.yesOrNo(info.getDljzt()));
-        params.put("azzxlcz", info.getAzzxlcz().toString());
-        params.put("azzxdg", info.getAzzxdg().toString());
-        params.put("azcxlcz", info.getAzcxlcz().toString());
-        params.put("azcxdg", info.getAzcxdg().toString());
-        params.put("bzzxlcz", info.getBzzxlcz().toString());
-        params.put("bzzxdg", info.getBzzxdg().toString());
-        params.put("bzcxlcz", info.getBzcxlcz().toString());
-        params.put("bzcxdg", info.getBzcxdg().toString());
-        params.put("czzxlcz", info.getCzzxlcz().toString());
-        params.put("czzxdg", info.getCzzxdg().toString());
-        params.put("czcxlcz", info.getCzcxlcz().toString());
-        params.put("czcxdg", info.getCzcxdg().toString());
-        params.put("zxlcz", info.getZxlcz().toString());
-        params.put("zxdg", info.getZxdg().toString());
-        params.put("cxlcz", info.getCxlcz().toString());
-        params.put("ljcdxjj", info.getLjcdxjj().toString());
-        params.put("cxdg", info.getCxdg().toString());
+        params.put("azzxlcz", StringUtils.bigDecimalToString(info.getAzzxlcz()));
+        params.put("azzxdg", StringUtils.bigDecimalToString(info.getAzzxdg()));
+        params.put("azcxlcz", StringUtils.bigDecimalToString(info.getAzcxlcz()));
+        params.put("azcxdg", StringUtils.bigDecimalToString(info.getAzcxdg()));
+        params.put("bzzxlcz", StringUtils.bigDecimalToString(info.getBzzxlcz()));
+        params.put("bzzxdg", StringUtils.bigDecimalToString(info.getBzzxdg()));
+        params.put("bzcxlcz", StringUtils.bigDecimalToString(info.getBzcxlcz()));
+        params.put("bzcxdg", StringUtils.bigDecimalToString(info.getBzcxdg()));
+        params.put("czzxlcz", StringUtils.bigDecimalToString(info.getCzzxlcz()));
+        params.put("czzxdg", StringUtils.bigDecimalToString(info.getCzzxdg()));
+        params.put("czcxlcz", StringUtils.bigDecimalToString(info.getCzcxlcz()));
+        params.put("czcxdg", StringUtils.bigDecimalToString(info.getCzcxdg()));
+        params.put("zxlcz", StringUtils.bigDecimalToString(info.getZxlcz()));
+        params.put("zxdg", StringUtils.bigDecimalToString(info.getZxdg()));
+        params.put("cxlcz", StringUtils.bigDecimalToString(info.getCxlcz()));
+        params.put("ljcdxjj", StringUtils.bigDecimalToString(info.getLjcdxjj()));
+        params.put("cxdg", StringUtils.bigDecimalToString(info.getCxdg()));
         params.put("sbzt", StringUtils.YES_VALUE.equals(info.getSbzt()) ? "合格" : "不合格");
         params.put("jcr", info.getCheckUser());
         params.put("qrr", info.getConfirmUser());

railway-business/src/main/java/com/railway/business/catenary/domain/BusJcbJcxc.java

@@ -2,6 +2,7 @@ package com.railway.business.catenary.domain;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.validator.constraints.Length;
@@ -27,25 +28,25 @@ public class BusJcbJcxc extends BusJcab {
   private String xch;
 
   @ApiModelProperty(value = "工支1拉出值")
-  private Integer gz1lcz;
+  private BigDecimal gz1lcz;
 
   @ApiModelProperty(value = "工支2拉出值")
-  private Integer gz2lcz;
+  private BigDecimal gz2lcz;
 
   @ApiModelProperty(value = "非支拉出值")
-  private Integer fzlcz;
+  private BigDecimal fzlcz;
 
   @ApiModelProperty(value = "直股拉出值")
-  private Integer zglcz;
+  private BigDecimal zglcz;
 
   @ApiModelProperty(value = "曲股拉出值")
-  private Integer qglcz;
+  private BigDecimal qglcz;
 
   @ApiModelProperty(value = "内轨距")
-  private Integer ngj;
+  private BigDecimal ngj;
 
   @ApiModelProperty(value = "偏离值")
-  private Integer plz;
+  private BigDecimal plz;
 
   @ApiModelProperty(value = "线岔限制管安装牢固 1是 0否")
   @Length(max = 1, message = "【线岔限制管安装牢固 1是 0否】长度必须介于 {min} 和 {max} 之间")
@@ -104,13 +105,13 @@ public class BusJcbJcxc extends BusJcab {
   private String dxztlhGzms;
 
   @ApiModelProperty(value = "垂直间距")
-  private Integer czjj;
+  private BigDecimal czjj;
 
   @ApiModelProperty(value = "两工作支高差")
-  private Integer lgzzgc;
+  private BigDecimal lgzzgc;
 
   @ApiModelProperty(value = "工支与非支高差")
-  private Integer gzyfzgc;
+  private BigDecimal gzyfzgc;
 
   @ApiModelProperty(value = "无线夹")
   @Length(max = 1, message = "【无线夹】长度必须介于 {min} 和 {max} 之间")
@@ -154,11 +155,11 @@ public class BusJcbJcxc extends BusJcab {
   /**
    * 上行方向
    */
-  private Integer sxfx;
+  private BigDecimal sxfx;
   /**
    * 下行方向
    */
-  private Integer xxfx;
+  private BigDecimal xxfx;
   /**
    * 各零部件状态
    */

railway-business/src/main/java/com/railway/business/catenary/domain/BusJcbWjcxc.java

@@ -2,6 +2,7 @@ package com.railway.business.catenary.domain;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.validator.constraints.Length;
@@ -57,19 +58,19 @@ public class BusJcbWjcxc extends BusJcab{
     private String dljztGzms;
 
     @ApiModelProperty(value = "正线线夹对侧线拉出值")
-    private Integer zxlcz;
+    private BigDecimal zxlcz;
 
     @ApiModelProperty(value = "正线线夹对侧线导高")
-    private Integer zxdg;
+    private BigDecimal zxdg;
 
     @ApiModelProperty(value = "侧线线夹对正线拉出值")
-    private Integer cxlcz;
+    private BigDecimal cxlcz;
 
     @ApiModelProperty(value = "侧线线夹对正线导高")
-    private Integer cxdg;
+    private BigDecimal cxdg;
 
     @ApiModelProperty(value = "两交叉吊弦间距")
-    private Integer ljcdxjj;
+    private BigDecimal ljcdxjj;
 
     @ApiModelProperty(value = "正线上的无线夹区有无")
     private String zxwxjqzt;
@@ -78,46 +79,46 @@ public class BusJcbWjcxc extends BusJcab{
     private String cxwxjqzt;
 
     @ApiModelProperty(value = "正线上的无线夹区")
-    private Integer zxwxjq;
+    private BigDecimal zxwxjq;
 
     @ApiModelProperty(value = "侧线上的无线夹区")
-    private Integer cxwxjq;
+    private BigDecimal cxwxjq;
 
     @ApiModelProperty(value = "a柱正线拉出值")
-    private Integer azzxlcz;
+    private BigDecimal azzxlcz;
 
     @ApiModelProperty(value = "a柱正线导高")
-    private Integer azzxdg;
+    private BigDecimal azzxdg;
 
     @ApiModelProperty(value = "a柱侧线拉出值")
-    private Integer azcxlcz;
+    private BigDecimal azcxlcz;
 
     @ApiModelProperty(value = "a柱侧线导高")
-    private Integer azcxdg;
+    private BigDecimal azcxdg;
 
     @ApiModelProperty(value = "b柱正线拉出值")
-    private Integer bzzxlcz;
+    private BigDecimal bzzxlcz;
 
     @ApiModelProperty(value = "b柱正线导高")
-    private Integer bzzxdg;
+    private BigDecimal bzzxdg;
 
     @ApiModelProperty(value = "b柱侧线拉出值")
-    private Integer bzcxlcz;
+    private BigDecimal bzcxlcz;
 
     @ApiModelProperty(value = "b柱侧线导高")
-    private Integer bzcxdg;
+    private BigDecimal bzcxdg;
 
     @ApiModelProperty(value = "c柱正线拉出值")
-    private Integer czzxlcz;
+    private BigDecimal czzxlcz;
 
     @ApiModelProperty(value = "c柱正线导高")
-    private Integer czzxdg;
+    private BigDecimal czzxdg;
 
     @ApiModelProperty(value = "c柱侧线拉出值")
-    private Integer czcxlcz;
+    private BigDecimal czcxlcz;
 
     @ApiModelProperty(value = "c柱侧线导高")
-    private Integer czcxdg;
+    private BigDecimal czcxdg;
 
     @ApiModelProperty(value = "用户id")
     private Long userId;