国际采购计量

itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/ship/vo/LngMeaPurIntVo.java

@@ -56,6 +56,9 @@ public class LngMeaPurIntVo extends com.xjrsoft.common.model.base.BaseModel{
     private Object dateMea;
     
     
+    @ApiModelProperty("卸港eta")
+    private Object dateEta;
+    
     /**
     * 热值（MMBtu）
     */
@@ -182,6 +185,12 @@ public class LngMeaPurIntVo extends com.xjrsoft.common.model.base.BaseModel{
     private Long deptId;
     
     private Long deptName;
+    
+    private String comName;
+    
+    private String staName;
+    
+    
     /**
     * 数据权限id
     */

itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/mapper/LngMeaPurIntMapper.java

@@ -19,7 +19,7 @@ import com.xjrsoft.module.ship.vo.LngShipScheduleVo;
 public interface LngMeaPurIntMapper extends BaseMapper<LngMeaPurInt> {
 	
 	@Select("SELECT mpi.*,k.k_name,k.K_no,NVL(com.short_name,com.name) AS com_name  ,"
-			+ "     opi.ss_no,opi.su_code,opi.su_name,"
+			+ "     opi.ss_no,opi.su_code,opi.su_name,opi.date_eta as dateEta,"
 			+ "     sl.full_name AS sta_name, dd_m.name AS ss_type_name"
 			+ "     FROM  lng_mea_pur_int mpi "
 			+ "     LEFT JOIN lng_ops_pur_int opi ON opi.id=mpi.ops_id  "