日计划管道气采购结算

itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngSettlePurVo.java

@@ -152,6 +152,7 @@ public class LngPngSettlePurVo extends com.xjrsoft.common.model.base.BaseModel{
     @ApiModelProperty("交割点编码(从lng_png_sales带)")
     private String pointDelyCode;
     
+    private String pointDelyName;
     
     /**
     * 比值(方/吉焦)

itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngSettlePurMapper.java

@@ -21,12 +21,12 @@ import com.xjrsoft.module.dayPlan.vo.LngPngSettlePurVo;
 public interface LngPngSettlePurMapper extends MPJBaseMapper<LngPngSettlePur> ,BaseMapper<LngPngSettlePur>{
 
 	
-	 @Select("SELECT a.*, cu.cu_sname, sp.full_name AS point_up_name,k.k_name as kp_name" +
+	 @Select("SELECT a.*, cu.cu_sname, sp.full_name AS point_up_name,su.full_name AS point_dely_name,k.k_name as kp_name" +
 	            "  FROM lng_png_settle_pur a" +
 	            "  LEFT JOIN lng_contract k ON k.id=a.kp_id" +
 	            "  LEFT JOIN lng_customer cu ON cu.cu_code=a.cu_code" +
 	            "  LEFT JOIN lng_b_station_png sp ON sp.code=a.point_up_code" +
-	            " WHERE a.settle_hdr_id = #{id}" +
-	            " ORDER BY a.sort")
+	            "  LEFT JOIN lng_b_station_png su ON su.code=a.point_dely_code" +
+	            " WHERE a.settle_hdr_id = #{id}")
 	 List<LngPngSettlePurVo> queryLngPngSettlePurList(@Param("id")Long id);
 }