Prechádzať zdrojové kódy

修改国任财险车船税信息

wks 2 rokov pred
rodič
commit
40f0c9bdaf

+ 1 - 1
src/main/java/com/ydtech/modules/ins/model/guoren/PremiumReq.java

@@ -874,7 +874,7 @@ public class PremiumReq {
                 this.taxRelifFlag = flag.getCode();
 
                 //返回空
-                if (!"".equals(vehicleAndVesselTax.getRelifReason())) {
+                if (StringUtils.isNotEmpty(vehicleAndVesselTax.getRelifReason())) {
                     RelifReason reason = Enum.valueOf(RelifReason.class, RelifReason.TITLE + vehicleAndVesselTax.getRelifReason());
                     this.relifReason = reason.getCode();
 

+ 4 - 1
src/main/java/com/ydtech/modules/order/entity/vo/InsOrdersEditingVo.java

@@ -10,8 +10,10 @@ import com.ydtech.modules.order.entity.TaxArrears;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.apache.commons.lang3.ObjectUtils;
 
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.List;
 
 @EqualsAndHashCode(callSuper = true)
@@ -135,7 +137,8 @@ public class InsOrdersEditingVo extends InsOrders implements Serializable {
             this.orderstatus = insAreaCompany.getOrderstatus();
             this.companyId = insAreaCompany.getId();
             this.inscompany = insAreaCompany.getInscompany();
-            this.kindList = insAreaCompany.getKindinfo().toJavaList(QuoteKindRespVo.class);
+            this.kindList = ObjectUtils.isEmpty(insAreaCompany.getKindinfo()) ? new ArrayList<>() :
+                    insAreaCompany.getKindinfo().toJavaList(QuoteKindRespVo.class);
             this.jqPremium = insAreaCompany.getJqpremium().doubleValue();
             this.syPremium = insAreaCompany.getSypremium().doubleValue();
             this.jyPremium = insAreaCompany.getJypremium().doubleValue();