From 729eda76cf6d365d65c692d9e6fc2db8614eca4a Mon Sep 17 00:00:00 2001 From: "shunyi.kuang" <846002312@qq.com> Date: Thu, 5 Mar 2026 15:40:26 +0800 Subject: [PATCH] =?UTF-8?q?=E8=88=B9=E6=9C=9F=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/ship/vo/LngMeaPurIntVo.java | 4 +-- .../module/ship/vo/LngOpsPurIntVo.java | 29 +++++++++++++------ .../module/ship/vo/LngOpsSalesIntVo.java | 29 +++++++++++++------ .../module/ship/entity/LngOpsPurInt.java | 1 + .../ship/mapper/LngOpsPurIntMapper.java | 20 +++++++++++++ .../ship/mapper/LngOpsSalesIntMapper.java | 21 ++++++++++++++ .../service/impl/OpsPurIntServiceImpl.java | 7 ++--- .../service/impl/OpsSalesIntServiceImpl.java | 8 ++--- 8 files changed, 90 insertions(+), 29 deletions(-) diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/ship/vo/LngMeaPurIntVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/ship/vo/LngMeaPurIntVo.java index 4237797..945bb35 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/ship/vo/LngMeaPurIntVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/ship/vo/LngMeaPurIntVo.java @@ -38,7 +38,7 @@ public class LngMeaPurIntVo extends com.xjrsoft.common.model.base.BaseModel{ @ApiModelProperty("计量类型(L-装载计量/U-卸载计量)") private String typeCode; - + private String typeName; /** * 计量时间 */ @@ -171,7 +171,7 @@ public class LngMeaPurIntVo extends com.xjrsoft.common.model.base.BaseModel{ @ApiModelProperty("部门id") private Long deptId; - + private Long deptName; /** * 数据权限id */ diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/ship/vo/LngOpsPurIntVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/ship/vo/LngOpsPurIntVo.java index 3681381..eb847e8 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/ship/vo/LngOpsPurIntVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/ship/vo/LngOpsPurIntVo.java @@ -12,6 +12,8 @@ import java.time.LocalDateTime; import java.math.BigDecimal; import java.util.List; +import com.xjrsoft.common.annotation.Trans; +import com.xjrsoft.common.enums.TransType; import com.xjrsoft.module.ship.dto.AddLngMeaPurIntDto; import com.xjrsoft.module.system.vo.LngFileUploadVo; @@ -51,21 +53,21 @@ public class LngOpsPurIntVo extends com.xjrsoft.common.model.base.BaseModel{ @ApiModelProperty("交易主体编码(根据船期计划带出来)") private Long comId; - + private String comName; /** * 合同-主信息主键 */ @ApiModelProperty("合同-主信息主键") private Long kId; - + private String kName; /** * 长协/现货(长协/现货……；未关联合同时用，关联合同后以合同为准) */ @ApiModelProperty("长协/现货(长协/现货……；未关联合同时用，关联合同后以合同为准)") private String longSpotCode; - + private String longSpotName; /** * 供应商(国际采购合同的供应商) */ @@ -93,14 +95,15 @@ public class LngOpsPurIntVo extends com.xjrsoft.common.model.base.BaseModel{ @ApiModelProperty("业务类型编码(进口船货、纯转口船货、窗口转让船货、到岸交付船货)") private String ssTypeCode; - + private String ssTypeName; /** * 接收站 */ @ApiModelProperty("接收站") + //@Trans(type = TransType.LNG_STATION, transToFieldName = "staName") private String staCode; - + private String staName; /** * 国际气源地 */ @@ -112,16 +115,20 @@ public class LngOpsPurIntVo extends com.xjrsoft.common.model.base.BaseModel{ * 销售区域 */ @ApiModelProperty("销售区域") + @Trans(type = TransType.REGION, transToFieldName = "salesAreaName") private String salesAreaCode; + private String salesAreaName; + /** * 我方联系人(缺省登录人编码) */ @ApiModelProperty("我方联系人(缺省登录人编码)") + @Trans(type = TransType.USER, transToFieldName = "empName") private Long empId; - + private String empName; /** * 我方联系人电话(根据联系人获取) */ @@ -133,9 +140,10 @@ public class LngOpsPurIntVo extends com.xjrsoft.common.model.base.BaseModel{ * 我方联系人所在部门(缺省登录人所在部门) */ @ApiModelProperty("我方联系人所在部门(缺省登录人所在部门)") + @Trans(type = TransType.DEPT, transToFieldName = "empDeptName") private Long empDeptId; - + private String empDeptName; /** * 执行日期 */ @@ -217,9 +225,10 @@ public class LngOpsPurIntVo extends com.xjrsoft.common.model.base.BaseModel{ * 币种 */ @ApiModelProperty("币种") + @Trans(type = TransType.CURRENCY, transToFieldName = "curName") private String curCode; - + private String curName; /** * 汇率 */ @@ -310,6 +319,8 @@ public class LngOpsPurIntVo extends com.xjrsoft.common.model.base.BaseModel{ @ApiModelProperty("装港") private String portLoading1Code; + private String portLoading1Name; + /** * 替代装港 @@ -324,7 +335,7 @@ public class LngOpsPurIntVo extends com.xjrsoft.common.model.base.BaseModel{ @ApiModelProperty("卸港") private String portUnloading1Code; - + private String portUnloading1Name; /** * 替代卸港 */ diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/ship/vo/LngOpsSalesIntVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/ship/vo/LngOpsSalesIntVo.java index 13fa1ca..7f59751 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/ship/vo/LngOpsSalesIntVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/ship/vo/LngOpsSalesIntVo.java @@ -4,6 +4,8 @@ import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.List; +import com.xjrsoft.common.annotation.Trans; +import com.xjrsoft.common.enums.TransType; import com.xjrsoft.module.system.vo.LngFileUploadVo; import io.swagger.annotations.ApiModelProperty; @@ -45,6 +47,7 @@ public class LngOpsSalesIntVo extends com.xjrsoft.common.model.base.BaseModel{ @ApiModelProperty("交易主体编码(根据船期计划带出来)") private Long comId; + private String comName; /** * 合同-主信息主键 @@ -52,6 +55,8 @@ public class LngOpsSalesIntVo extends com.xjrsoft.common.model.base.BaseModel{ @ApiModelProperty("合同-主信息主键") private Long kId; + private String kName; + /** * 长协/现货(长协/现货……；未关联合同时用，关联合同后以合同为准) @@ -59,7 +64,7 @@ public class LngOpsSalesIntVo extends com.xjrsoft.common.model.base.BaseModel{ @ApiModelProperty("长协/现货(长协/现货……；未关联合同时用，关联合同后以合同为准)") private String longSpotCode; - + private String longSpotName; /** * 客户(国际销售合同的客户) */ @@ -87,14 +92,14 @@ public class LngOpsSalesIntVo extends com.xjrsoft.common.model.base.BaseModel{ @ApiModelProperty("业务类型编码(进口船货、纯转口船货、窗口转让船货、到岸交付船货)") private String ssTypeCode; - + private String ssTypeName; /** * 接收站(财务报表需要) */ @ApiModelProperty("接收站(财务报表需要)") private String staCode; - + private String staName; /** * 国际气源地 */ @@ -106,16 +111,18 @@ public class LngOpsSalesIntVo extends com.xjrsoft.common.model.base.BaseModel{ * 销售区域 */ @ApiModelProperty("销售区域") + @Trans(type = TransType.REGION, transToFieldName = "salesAreaName") private String salesAreaCode; - + private String salesAreaName; /** * 我方联系人(缺省登录人编码) */ @ApiModelProperty("我方联系人(缺省登录人编码)") + @Trans(type = TransType.USER, transToFieldName = "empName") private Long empId; - + private String empName; /** * 我方联系人电话(根据联系人获取) */ @@ -127,9 +134,10 @@ public class LngOpsSalesIntVo extends com.xjrsoft.common.model.base.BaseModel{ * 我方联系人所在部门(缺省登录人所在部门) */ @ApiModelProperty("我方联系人所在部门(缺省登录人所在部门)") + @Trans(type = TransType.DEPT, transToFieldName = "empDeptName") private Long empDeptId; - + private String empDeptName; /** * 执行日期(录入执行时必须) */ @@ -211,8 +219,11 @@ public class LngOpsSalesIntVo extends com.xjrsoft.common.model.base.BaseModel{ * 币种 */ @ApiModelProperty("币种") + @Trans(type = TransType.CURRENCY, transToFieldName = "curName") private String curCode; + private String curName; + /** * 汇率 @@ -304,7 +315,7 @@ public class LngOpsSalesIntVo extends com.xjrsoft.common.model.base.BaseModel{ @ApiModelProperty("装港") private String portLoading1Code; - + private String portLoading1Name; /** * 替代装港 */ @@ -318,7 +329,7 @@ public class LngOpsSalesIntVo extends com.xjrsoft.common.model.base.BaseModel{ @ApiModelProperty("卸港") private String portUnloading1Code; - + private String portUnloading1Name; /** * 替代卸港 */ @@ -451,7 +462,7 @@ public class LngOpsSalesIntVo extends com.xjrsoft.common.model.base.BaseModel{ @ApiModelProperty("审批状态(待提交/审批中/已审批/已驳回；审批之后发送接收站)") private String approCode; - + private String approName; /** * 备注 */ diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/entity/LngOpsPurInt.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/entity/LngOpsPurInt.java index 0227325..d5d0ef1 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/entity/LngOpsPurInt.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/entity/LngOpsPurInt.java @@ -114,6 +114,7 @@ public class LngOpsPurInt implements Serializable { @ApiModelProperty("销售区域") private String salesAreaCode; + /** * 我方联系人(缺省登录人编码) */ diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/mapper/LngOpsPurIntMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/mapper/LngOpsPurIntMapper.java index acac14d..f49b6ad 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/mapper/LngOpsPurIntMapper.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/mapper/LngOpsPurIntMapper.java @@ -3,7 +3,12 @@ package com.xjrsoft.module.ship.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.github.yulichang.base.MPJBaseMapper; import com.xjrsoft.module.ship.entity.LngOpsPurInt; +import com.xjrsoft.module.ship.vo.LngOpsPurIntVo; +import com.xjrsoft.module.ship.vo.LngOpsSalesIntVo; + import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; /** * @title: mapper @@ -14,4 +19,19 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface LngOpsPurIntMapper extends BaseMapper { + @Select("SELECT ss.*,k.k_name,NVL(com.short_name,com.name) AS comName ,"+ + " dd_l.name AS long_spot_name, sl.full_name AS sta_name, dd_st.name AS ss_type_name, " + + " port.full_name AS port_unloading1_name,lport.full_name AS port_loading1_name" + + " FROM lng_ops_pur_int ss " + + " LEFT JOIN lng_contract k ON k.id=ss.k_id " + + " LEFT JOIN lng_b_port port ON port.code=ss.port_unloading1_code "+ + " LEFT JOIN lng_b_port lport ON lport.code=ss.port_loading1_code "+ + " LEFT JOIN xjr_dictionary_item di_l on di_l.code='LNG_LONG' " + + " LEFT JOIN xjr_dictionary_detail dd_l on dd_l.item_id=di_l.id AND dd_l.code=ss.long_spot_code " + + " LEFT JOIN lng_b_station_lng sl ON sl.code=ss.sta_code " + + " LEFT JOIN xjr_dictionary_item di_st on di_st.code='LNG_SHP_S' " + + " LEFT JOIN xjr_dictionary_detail dd_st on dd_st.item_id=di_st.id AND dd_st.code=ss.ss_type_code " + + " LEFT JOIN xjr_department com on com.id=ss.com_id "+ + " WHERE ss.id = #{id}") + LngOpsPurIntVo getInfoBygId(@Param("id") Long id); } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/mapper/LngOpsSalesIntMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/mapper/LngOpsSalesIntMapper.java index c416773..3bffc45 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/mapper/LngOpsSalesIntMapper.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/mapper/LngOpsSalesIntMapper.java @@ -3,7 +3,12 @@ package com.xjrsoft.module.ship.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.github.yulichang.base.MPJBaseMapper; import com.xjrsoft.module.ship.entity.LngOpsSalesInt; +import com.xjrsoft.module.ship.vo.LngOpsSalesIntVo; +import com.xjrsoft.module.ship.vo.LngShipScheduleVo; + import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; /** * @title: mapper @@ -13,5 +18,21 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface LngOpsSalesIntMapper extends BaseMapper { + + @Select("SELECT ss.*,k.k_name,NVL(com.short_name,com.name) AS comName ,"+ + " dd_l.name AS long_spot_name, sl.full_name AS sta_name, dd_st.name AS ss_type_name, " + + " port.full_name AS port_unloading1_name,lport.full_name AS port_loading1_name" + + " FROM lng_ops_sales_int ss " + + " LEFT JOIN lng_contract k ON k.id=ss.k_id " + + " LEFT JOIN lng_b_port port ON port.code=ss.port_unloading1_code "+ + " LEFT JOIN lng_b_port lport ON lport.code=ss.port_loading1_code "+ + " LEFT JOIN xjr_dictionary_item di_l on di_l.code='LNG_LONG' " + + " LEFT JOIN xjr_dictionary_detail dd_l on dd_l.item_id=di_l.id AND dd_l.code=ss.long_spot_code " + + " LEFT JOIN lng_b_station_lng sl ON sl.code=ss.sta_code " + + " LEFT JOIN xjr_dictionary_item di_st on di_st.code='LNG_SHP_S' " + + " LEFT JOIN xjr_dictionary_detail dd_st on dd_st.item_id=di_st.id AND dd_st.code=ss.ss_type_code " + + " LEFT JOIN xjr_department com on com.id=ss.com_id "+ + " WHERE ss.id = #{id}") + LngOpsSalesIntVo getInfoBygId(@Param("id") Long id); } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/service/impl/OpsPurIntServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/service/impl/OpsPurIntServiceImpl.java index ba57776..f7fe797 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/service/impl/OpsPurIntServiceImpl.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/service/impl/OpsPurIntServiceImpl.java @@ -14,7 +14,6 @@ import com.xjrsoft.module.ship.vo.LngOpsPurIntVo; import com.xjrsoft.module.system.client.IFileClient; import com.xjrsoft.module.system.vo.LngFileUploadVo; -import cn.hutool.core.bean.BeanUtil; import lombok.AllArgsConstructor; /** @@ -31,11 +30,11 @@ public class OpsPurIntServiceImpl extends ServiceImpl fileList = fileClient.getTableFiles("lng_ops_pur_int", "lngFileUploadList", vo.getId()); vo.setLngFileUploadList(fileList); return vo; diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/service/impl/OpsSalesIntServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/service/impl/OpsSalesIntServiceImpl.java index 9397c24..0c3301c 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/service/impl/OpsSalesIntServiceImpl.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/ship/service/impl/OpsSalesIntServiceImpl.java @@ -8,11 +8,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.pictc.enums.BusinessCode; import com.xjrsoft.common.exception.BusinessException; import com.xjrsoft.module.ship.entity.LngOpsSalesInt; -import com.xjrsoft.module.ship.entity.LngShipSchedule; import com.xjrsoft.module.ship.mapper.LngOpsSalesIntMapper; import com.xjrsoft.module.ship.service.IOpsSalesIntService; import com.xjrsoft.module.ship.vo.LngOpsSalesIntVo; -import com.xjrsoft.module.ship.vo.LngShipScheduleVo; import com.xjrsoft.module.system.client.IFileClient; import com.xjrsoft.module.system.vo.LngFileUploadVo; @@ -33,11 +31,11 @@ public class OpsSalesIntServiceImpl extends ServiceImpl fileList = fileClient.getTableFiles("lng_ops_sales_int", "lngFileUploadList", vo.getId()); vo.setLngFileUploadList(fileList); return vo;