用箱计划导出增加 备注

blade-service-api/blade-los-api/src/main/java/org/springblade/los/box/excel/UseBoxPlanItemExcel.java

@@ -52,6 +52,16 @@ public class UseBoxPlanItemExcel implements Serializable {
 	 */
 	@ExcelProperty(value = "等级")
 	private String level;
+	/**
+	 * 箱明细备注
+	 */
+	@ExcelProperty(value = "箱明细备注")
+	private String cntrRemarks;
+	/**
+	 * 计划备注
+	 */
+	@ExcelProperty(value = "计划备注")
+	private String remarks;
 
 	/**
 	 * 目的港

blade-service/blade-los/src/main/java/org/springblade/los/box/mapper/UseBoxPlanItemMapper.xml

@@ -33,6 +33,7 @@
         plan.year AS year,
         plan.start_date AS startDate,
         plan.end_date AS endDate,
+        plan.remarks  AS remarks,
         item.pod_cname AS podCname,
         item.price20gp AS price20gp,
         item.price40gp AS price40gp,
@@ -41,7 +42,8 @@
         item.create_user_name AS createUserName,
         item.create_time AS createTime,
         item.update_user_name AS updateUserName,
-        item.update_time AS updateTime
+        item.update_time AS updateTime,
+        item.remarks  AS cntrRemarks
         FROM
         container_use_box_plan_item item
         LEFT JOIN container_use_box_plan plan ON item.pid = plan.id
@@ -74,6 +76,7 @@
         plan.year AS year,
         plan.start_date AS startDate,
         plan.end_date AS endDate,
+        plan.remarks  AS remarks,
         item.pod_cname AS podCname,
         item.price20gp AS price20gp,
         item.price40gp AS price40gp,
@@ -82,7 +85,8 @@
         item.create_user_name AS createUserName,
         item.create_time AS createTime,
         item.update_user_name AS updateUserName,
-        item.update_time AS updateTime
+        item.update_time AS updateTime,
+        item.remarks  AS cntrRemarks
         FROM
         container_use_box_plan_item item
         LEFT JOIN container_use_box_plan plan ON item.pid = plan.id