合同类型添加其他

mhd_bms/src/main/java/com/mhd/bms/application/server/reportForm/ReportFormApplicationService.java

@@ -279,7 +279,17 @@ public class ReportFormApplicationService {
                     k.put("project_code",projectCode == null ? value : projectCode);
                     break;
                 case "contractType":
-                    k.put("contract_type",ObjectUtil.equals(value,1) ? "仓储" : "运输");
+                    String contractTypeName;
+                    if (ObjectUtil.equals(value, 1)) {
+                        contractTypeName = "仓储";
+                    } else if (ObjectUtil.equals(value, 2)) {
+                        contractTypeName = "运输";
+                    } else if (ObjectUtil.equals(value, 3)) {
+                        contractTypeName = "其他";
+                    } else {
+                        contractTypeName = String.valueOf(value);
+                    }
+                    k.put("contract_type", contractTypeName);
                     break;
                 case "organizationId":
                     String organizationId = v.stream().filter(item -> item.getOrganizationId()==Long.parseLong(value.toString())).findAny().map(BillingStatement::getOrganizationName).orElse(null);

mhd_bms/src/main/java/com/mhd/bms/infrastructure/feign/vo/ContractManagePO.java

@@ -54,8 +54,8 @@ public class ContractManagePO extends BaseVOEntity{
     @Excel(name = "是否通用合同", readConverterExp = "1=-是，2-否")
     private Integer commonContractFlag;
 
-    @ApiModelProperty("合同类型（1-仓储，2-运输）")
-    @Excel(name = "合同类型", readConverterExp = "1=-仓储，2-运输")
+    @ApiModelProperty("合同类型（1-仓储，2-运输，3-其他）")
+    @Excel(name = "合同类型", readConverterExp = "1=-仓储，2-运输，3=-其他")
     private Integer contractType;
 
     @ApiModelProperty("合同状态（1-未生效，2-使用中，3-已过期，4-已作废）")