海运出口列表等

blade-service-api/blade-los-api/src/main/java/org/springblade/los/business/sea/entity/Bills.java

@@ -241,6 +241,11 @@ public class Bills implements Serializable {
 	@ApiModelProperty(value = "客户简称")
 	private String shortName;
 	/**
+	 * 简称
+	 */
+	@ApiModelProperty(value = "客户简称,使用 shortName")
+	private String corpShortName;
+	/**
 	 * Co-Loader id
 	 */
 	@ApiModelProperty(value = "Co-Loader id")
@@ -298,6 +303,11 @@ public class Bills implements Serializable {
 	/**
 	 * 船公司中文名称
 	 */
+	@ApiModelProperty(value = "船公司简称")
+	private String carrierShortName;
+	/**
+	 * 船公司中文名称
+	 */
 	@ApiModelProperty(value = "船公司中文名称")
 	private String carrierCnName;
 	/**
@@ -1075,6 +1085,11 @@ public class Bills implements Serializable {
 	/**
 	 * 场站中文名称
 	 */
+	@ApiModelProperty(value = "场站简称")
+	private String cyShortName;
+	/**
+	 * 场站中文名称
+	 */
 	@ApiModelProperty(value = "场站中文名称")
 	private String cyCnName;
 	/**

blade-service/blade-los/src/main/java/org/springblade/los/business/sea/controller/BillsController.java

@@ -109,7 +109,7 @@ public class BillsController extends BladeController {
 			Bills::getCreateUser, Bills::getTeu, Bills::getIssueType, Bills::getBookingNo, Bills::getQuantityCntrDescr,
 			Bills::getCreateDeptName, Bills::getLineCnName, Bills::getCarrierCnName, Bills::getCyCnName, Bills::getSrcType,
 			Bills::getSrcCnName, Bills::getBookingAgentCnName, Bills::getPodCnName, Bills::getPolCnName,Bills::getCorpSource,
-			Bills::getVesselEnName,Bills::getCarrierEnName,Bills::getCyEnName,Bills::getMpaymode,Bills::getHpaymode,
+			Bills::getVesselEnName,Bills::getCarrierShortName,Bills::getCarrierEnName,Bills::getCyShortName,Bills::getCyEnName,Bills::getMpaymode,Bills::getHpaymode,
 			Bills::getShortName,Bills::getPlaceDeliveryName,Bills::getDestinationName);
 		lambdaQueryWrapper.eq(Bills::getIsDeleted, 0)
 			.eq(Bills::getTenantId, AuthUtil.getTenantId())

blade-service/blade-los/src/main/java/org/springblade/los/business/sea/mapper/BillsMapper.xml

@@ -29,6 +29,8 @@
         <result column="src_cn_name" property="srcCnName"/>
         <result column="src_en_name" property="srcEnName"/>
         <result column="corp_id" property="corpId"/>
+        <result column="short_name" property="shortName"/>
+        <result column="corp_short_name" property="corpShortName"/>
         <result column="corp_cn_name" property="corpCnName"/>
         <result column="corp_en_name" property="corpEnName"/>
         <result column="corp_argreement_no" property="corpArgreementNo"/>
@@ -43,6 +45,7 @@
         <result column="line_cn_name" property="lineCnName"/>
         <result column="line_en_name" property="lineEnName"/>
         <result column="carrier_id" property="carrierId"/>
+        <result column="carrier_short_name" property="carrierShortName"/>
         <result column="carrier_cn_name" property="carrierCnName"/>
         <result column="carrier_en_name" property="carrierEnName"/>
         <result column="carrier_argreement_no" property="carrierArgreementNo"/>
@@ -178,6 +181,7 @@
         <result column="dg_is_marine_pollutant" property="dgIsMarinePollutant"/>
         <result column="cy_id" property="cyId"/>
         <result column="cy_code" property="cyCode"/>
+        <result column="cy_short_name" property="cyShortName"/>
         <result column="cy_cn_name" property="cyCnName"/>
         <result column="cy_en_name" property="cyEnName"/>
         <result column="cy_address" property="cyAddress"/>