|
|
@@ -8,6 +8,7 @@ import com.ydtech.utils.StringUtils;
|
|
|
import lombok.Data;
|
|
|
import org.apache.http.client.utils.DateUtils;
|
|
|
|
|
|
+import java.math.BigDecimal;
|
|
|
import java.time.LocalDate;
|
|
|
import java.util.Date;
|
|
|
|
|
|
@@ -122,11 +123,12 @@ public class Vhl {
|
|
|
*/
|
|
|
@JacksonXmlProperty(localName = "CRegVhlTyp")
|
|
|
private String CRegVhlTyp;
|
|
|
-// /**
|
|
|
-// * 吨位
|
|
|
-// */
|
|
|
-// @JacksonXmlProperty(localName = "NTonage")
|
|
|
-// private String NTonage;
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 吨位
|
|
|
+ */
|
|
|
+ @JacksonXmlProperty(localName = "NTonage")
|
|
|
+ private String NTonage;
|
|
|
/**
|
|
|
* 功率
|
|
|
*/
|
|
|
@@ -427,6 +429,10 @@ public class Vhl {
|
|
|
|
|
|
//车辆用于是否是 营业 非营业货运
|
|
|
if(carInfo.getVehicleUse().equals("04") || carInfo.getVehicleUse().equals("08")){
|
|
|
+ //货车 吨位
|
|
|
+ BigDecimal limitLoad = new BigDecimal(carInfo.getLimitLoad());
|
|
|
+ vhl.setNTonage(limitLoad.divide(BigDecimal.valueOf(1000), 4, BigDecimal.ROUND_HALF_UP).toString());
|
|
|
+
|
|
|
//货车
|
|
|
//2吨以下
|
|
|
if(Integer.parseInt(carInfo.getLimitLoad()) < 2000){
|
|
|
@@ -456,6 +462,9 @@ public class Vhl {
|
|
|
|
|
|
vhl.setCQryCdeJQ(cQryCdeJQ);
|
|
|
vhl.setCQryCdeSY(cQryCdeSY);
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
return vhl;
|
|
|
}
|
|
|
|