From 0329f40727fd6996c83db094fcd12e8f1b2155b2 Mon Sep 17 00:00:00 2001 From: "shunyi.kuang" <846002312@qq.com> Date: Tue, 6 Jan 2026 18:18:34 +0800 Subject: [PATCH] update --- .../contract/dto/LngContractPageDto.java | 13 +++ .../contract/vo/LngContractPurPageVo.java | 82 ------------------- .../contract/mapper/LngContractPurMapper.java | 4 +- .../impl/ContractPurPngServiceImpl.java | 6 +- 4 files changed, 16 insertions(+), 89 deletions(-) delete mode 100644 itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPurPageVo.java diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/LngContractPageDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/LngContractPageDto.java index 9848fe0..b469593 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/LngContractPageDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/LngContractPageDto.java @@ -76,5 +76,18 @@ public class LngContractPageDto extends PageInput { */ @ApiModelProperty("备注") private String note; + + /** + * 备注 + */ + @ApiModelProperty("上载点名称") + private String pointUpName; + + /** + * 备注 + */ + @ApiModelProperty("自主托运") + private String transName; + } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPurPageVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPurPageVo.java deleted file mode 100644 index 3959b14..0000000 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractPurPageVo.java +++ /dev/null @@ -1,82 +0,0 @@ -package com.xjrsoft.module.contract.vo; - -import java.time.LocalDateTime; - -import com.xjrsoft.common.annotation.Trans; -import com.xjrsoft.common.enums.TransType; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -/** -* @title: 分页列表出参 -* @Author 管理员 -* @Date: 2025-12-30 -* @Version 1.0 -*/ -@Data -public class LngContractPurPageVo { - - /** - * 主键 - */ - @ApiModelProperty("主键") - private String id; - /** - * 合同主体ID(天然气公司/惠贸) - */ - @ApiModelProperty("合同主体ID(天然气公司/惠贸)") - private Long comId; - /** - * 合同号 - */ - @ApiModelProperty("合同号") - private String kNo; - /** - * 合同名称 - */ - @ApiModelProperty("合同名称") - private String kName; - /** - * 是否线上(竞拍)合同(Y-是，N-否；线上合同不需要审批) - */ - @ApiModelProperty("是否线上(竞拍)合同(Y-是，N-否；线上合同不需要审批)") - @Trans(type = TransType.DIC, id = "1978057078528327681") - private String onlineSign; - /** - * 交易对手类型(lng_supplier-供应商，lng_customer-客户；不显示) - */ - @ApiModelProperty("交易对手类型(lng_supplier-供应商，lng_customer-客户；不显示)") - private String cpTableName; - /** - * 主交易对手名称 - */ - @ApiModelProperty("主交易对手名称") - private String cpName; - /** - * 有效期开始 - */ - @ApiModelProperty("有效期开始") - private LocalDateTime dateFrom; - /** - * 有效期结束 - */ - @ApiModelProperty("有效期结束") - private LocalDateTime dateTo; - - /** - * 状态(未提交/审批中/已审批/已驳回) - */ - @ApiModelProperty("状态(未提交/审批中/已审批/已驳回)") - @Trans(type = TransType.DIC, id = "1990669393069129729", transToFieldName = "approName") - private String approCode; - - @ApiModelProperty("状态(未提交/审批中/已审批/已驳回)") - private String approName; - /** - * 备注 - */ - @ApiModelProperty("备注") - private String note; - -} diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractPurMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractPurMapper.java index 149a29f..369fcec 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractPurMapper.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractPurMapper.java @@ -11,7 +11,7 @@ import com.baomidou.mybatisplus.core.toolkit.Constants; import com.github.yulichang.base.MPJBaseMapper; import com.xjrsoft.module.contract.dto.LngContractPageDto; import com.xjrsoft.module.contract.entity.LngContractPur; -import com.xjrsoft.module.contract.vo.LngContractPurPageVo; +import com.xjrsoft.module.contract.vo.LngContractPageVo; /** * @title: mapper @@ -39,6 +39,6 @@ public interface LngContractPurMapper extends MPJBaseMapper, Bas " ${ew.customSqlSegment}" + " GROUP BY k.id, k.k_no, k.k_name, su.su_sname, k.date_from, k.date_to,com.name, dd_a.name" + " ORDER BY k.date_from DESC, k.k_no DESC") - IPage queryPage(IPage page,@Param(Constants.WRAPPER) QueryWrapper queryWrapper); + IPage queryPage(IPage page,@Param(Constants.WRAPPER) QueryWrapper queryWrapper); } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/service/impl/ContractPurPngServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/service/impl/ContractPurPngServiceImpl.java index aa319dc..eceeb01 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/service/impl/ContractPurPngServiceImpl.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/service/impl/ContractPurPngServiceImpl.java @@ -12,7 +12,6 @@ import com.github.yulichang.base.MPJBaseServiceImpl; import com.xjrsoft.common.page.ConventPage; import com.xjrsoft.common.page.PageOutput; import com.xjrsoft.module.contract.dto.LngContractPageDto; -import com.xjrsoft.module.contract.entity.LngContract; import com.xjrsoft.module.contract.entity.LngContractPur; import com.xjrsoft.module.contract.entity.LngContractPurPngPoint; import com.xjrsoft.module.contract.entity.LngContractPurPngPointSales; @@ -20,10 +19,7 @@ import com.xjrsoft.module.contract.mapper.LngContractPurMapper; import com.xjrsoft.module.contract.mapper.LngContractPurPngPointSalesMapper; import com.xjrsoft.module.contract.service.IContractPurPngService; import com.xjrsoft.module.contract.vo.LngContractPageVo; -import com.xjrsoft.module.contract.vo.LngContractPurPageVo; -import com.xjrsoft.module.contract.vo.LngContractPurPngPointVo; import com.xjrsoft.module.contract.vo.LngContractPurVo; -import com.xjrsoft.module.sales.entity.LngCustomer; import com.xjrsoft.module.system.client.IFileClient; import com.xjrsoft.module.system.vo.LngFileUploadVo; @@ -54,7 +50,7 @@ public class ContractPurPngServiceImpl extends MPJBaseServiceImpl page = this.baseMapper.queryPage(ConventPage.getPage(dto), queryWrapper); + IPage page = this.baseMapper.queryPage(ConventPage.getPage(dto), queryWrapper); PageOutput pageOutput = ConventPage.getPageOutput(page, LngContractPageVo.class); return pageOutput; }