From b5c8061f2961513f43a20c721f5ecfe2ff23da47 Mon Sep 17 00:00:00 2001 From: "shunyi.kuang" <846002312@qq.com> Date: Fri, 3 Apr 2026 15:54:15 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=BF=90=E9=94=80=E5=85=B3=E8=81=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../contract/dto/UpdateLngContractSalesPngPointDto.java | 2 +- .../dto/UpdateLngContractSalesPngPointPurDto.java | 2 +- .../contract/vo/LngContractSalesPngPointTransVo.java | 2 +- .../mapper/LngContractSalesPngPointPurMapper.java | 4 +++- .../mapper/LngContractSalesPngPointTransMapper.java | 8 +++++++- 5 files changed, 13 insertions(+), 5 deletions(-) diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesPngPointDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesPngPointDto.java index ebb4a4c..bf5b4ea 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesPngPointDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesPngPointDto.java @@ -80,7 +80,7 @@ public class UpdateLngContractSalesPngPointDto extends BaseModel implements Seri @ApiModelProperty("lngContractSalesPngPointPur子表") @LogJoin(name = "lngContractSalesPngPointPur子表", columns = { - @LogJoinColumn(field = "ksppId",relatedField = "id", valueDirection = ValueDirectionType.RIGHT) + @LogJoinColumn(field = "id",relatedField = "ksppId", valueDirection = ValueDirectionType.RIGHT) }, caseType = JoinCaseType.FULL, target = UpdateLngContractSalesPngPointPurDto.class, type = JoinType.MANY) private List lngContractSalesPngPointPurList; diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesPngPointPurDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesPngPointPurDto.java index bb05457..d358429 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesPngPointPurDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesPngPointPurDto.java @@ -135,7 +135,7 @@ public class UpdateLngContractSalesPngPointPurDto implements Serializable { @LogJoin(name = "lngContractSalesPngPointTrans子表", columns = { @LogJoinColumn(field = "ksppId",relatedField = "ksppId", valueDirection = ValueDirectionType.RIGHT), - @LogJoinColumn(field = "kspppId",relatedField = "id", valueDirection = ValueDirectionType.RIGHT) + @LogJoinColumn(field = "id",relatedField = "kspppId", valueDirection = ValueDirectionType.RIGHT) }, caseType = JoinCaseType.FULL, target = UpdateLngContractSalesPngPointTransDto.class, type = JoinType.MANY) private List lngContractSalesPngPointTransList; diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractSalesPngPointTransVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractSalesPngPointTransVo.java index b50f8b3..331e058 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractSalesPngPointTransVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractSalesPngPointTransVo.java @@ -56,7 +56,7 @@ public class LngContractSalesPngPointTransVo extends com.xjrsoft.common.model.ba @ApiModelProperty("资源上载点编码(lng_contract_sales_png_point_pur.point_up_code)") private String pointUpCode; - + private String pointUpName; /** * 自主托运(Y-是，N-否；缺省Y；隐藏；lng_contract_sales_png_point_pur.trans_sign) */ diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractSalesPngPointPurMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractSalesPngPointPurMapper.java index fcda5ab..3034a1f 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractSalesPngPointPurMapper.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractSalesPngPointPurMapper.java @@ -20,9 +20,11 @@ import com.xjrsoft.module.contract.vo.LngContractSalesPngPointPurVo; @Mapper public interface LngContractSalesPngPointPurMapper extends MPJBaseMapper , BaseMapper { - @Select("SELECT ksppp.*, bspu.full_name AS point_up_name, kp.k_name AS kp_name " + + @Select("SELECT ksppp.*, bspu.full_name AS point_up_name, kp.k_name AS kp_name, " + + " su.su_sname AS su_name"+ " FROM lng_contract_sales_png_point_pur ksppp" + " LEFT JOIN lng_contract kp ON kp.id=ksppp.kp_id" + + " LEFT JOIN lng_supplier su ON su.su_code=ksppp.su_code"+ " LEFT JOIN lng_b_station_png bspu ON bspu.code=ksppp.point_up_code" + " WHERE ksppp.kspp_id = #{ksppId}") List queryLngContractSalesPngPointPurList(@Param("ksppId") Long ksppId); diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractSalesPngPointTransMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractSalesPngPointTransMapper.java index cd361e3..f35e474 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractSalesPngPointTransMapper.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractSalesPngPointTransMapper.java @@ -21,9 +21,15 @@ import com.xjrsoft.module.contract.vo.LngContractSalesPngPointTransVo; @Mapper public interface LngContractSalesPngPointTransMapper extends MPJBaseMapper , BaseMapper { - @Select("SELECT ksppt.*, su_ys.su_sname AS su_ys_name, kt.k_name AS kt_name " + + @Select("SELECT ksppt.*, su_ys.su_sname AS su_ys_name, kt.k_name AS kt_name, " + + " bspd.full_name AS point_dely_name,bspu.full_name AS point_up_name, " + + " bput.full_name AS point_up_trans_name,bpdt.full_name AS point_dely_trans_name " + " FROM lng_contract_sales_png_point_trans ksppt" + " LEFT JOIN lng_contract kt ON kt.id=ksppt.kt_id" + + " LEFT JOIN lng_b_station_png bspd ON bspd.code=ksppt.point_dely_code"+ + " LEFT JOIN lng_b_station_png bspu ON bspu.code=ksppt.point_up_code"+ + " LEFT JOIN lng_b_station_png bput ON bput.code=ksppt.point_up_trans_code"+ + " LEFT JOIN lng_b_station_png bpdt ON bpdt.code=ksppt.point_dely_trans_code"+ " LEFT JOIN lng_supplier su_ys ON su_ys.su_code=ksppt.su_code" + " WHERE ksppt.ksppp_id = #{kspppId}") List queryLngContractSalesPngPointTransList(@Param("kspppId") Long kspppId);