From fda4f5d85c3c3bf27d2d2498bc12fa6ac5c59744 Mon Sep 17 00:00:00 2001 From: "shunyi.kuang" <846002312@qq.com> Date: Wed, 18 Mar 2026 16:43:53 +0800 Subject: [PATCH] update --- .../module/dayPlan/vo/LngPngMeasurePurVo.java | 27 +++++++++---------- .../dayPlan/vo/LngPngMeasureSalesPurVo.java | 2 +- .../PngMeasureSalesPurController.java | 2 +- .../mapper/LngPngMeasurePurMapper.java | 2 +- .../mapper/LngPngMeasureSalesPurMapper.java | 2 +- .../impl/PngMeasurePurServiceImpl.java | 9 ++----- .../impl/PngMeasureSalesPurServiceImpl.java | 7 +++-- 7 files changed, 21 insertions(+), 30 deletions(-) diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngMeasurePurVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngMeasurePurVo.java index 24c3733..9c66075 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngMeasurePurVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngMeasurePurVo.java @@ -1,19 +1,14 @@ package com.xjrsoft.module.dayPlan.vo; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.Getter; -import lombok.Setter; -import lombok.ToString; -import lombok.experimental.Accessors; - -import java.time.LocalTime; -import java.time.LocalDateTime; import java.math.BigDecimal; +import java.time.LocalDateTime; import java.util.List; import com.xjrsoft.module.system.vo.LngFileUploadVo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + /** * @title: 表单出参 * @Author 管理员 @@ -64,21 +59,21 @@ public class LngPngMeasurePurVo extends com.xjrsoft.common.model.base.BaseModel{ @ApiModelProperty("客户编码") private String cuCode; - + private String cuName; /** * 交易主体编码(天然气公司/惠贸) */ @ApiModelProperty("交易主体编码(天然气公司/惠贸)") private Long comId; - + private String comName; /** * 合同-主信息主键（销售）(lng_contract) */ @ApiModelProperty("合同-主信息主键（销售）(lng_contract)") private Long ksId; - + private String ksName; /** * 合同-国内销售-管道气-交割点主键(lng_contract_sales_png_sta) */ @@ -99,6 +94,7 @@ public class LngPngMeasurePurVo extends com.xjrsoft.common.model.base.BaseModel{ @ApiModelProperty("供应商") private String suCode; + private String suName; /** * 采购合同-主信息主键 @@ -106,7 +102,7 @@ public class LngPngMeasurePurVo extends com.xjrsoft.common.model.base.BaseModel{ @ApiModelProperty("采购合同-主信息主键") private Long kpId; - + private String kpName; /** * 合同-国内采购-管道气-上载点主键 */ @@ -120,7 +116,7 @@ public class LngPngMeasurePurVo extends com.xjrsoft.common.model.base.BaseModel{ @ApiModelProperty("上载点") private String pointUpCode; - + private String pointUpName; /** * 自主托运(Y-是，N-否) */ @@ -169,6 +165,7 @@ public class LngPngMeasurePurVo extends com.xjrsoft.common.model.base.BaseModel{ @ApiModelProperty("客户确认人") private Long cfmCuUserId; + private String cfmCuUserName; /** * 客户确认时间 @@ -183,7 +180,7 @@ public class LngPngMeasurePurVo extends com.xjrsoft.common.model.base.BaseModel{ @ApiModelProperty("内部确认人") private Long cfmEmpId; - + private String cfmEmpName; /** * 内部确认时间 */ diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngMeasureSalesPurVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngMeasureSalesPurVo.java index 3091c02..dfb8078 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngMeasureSalesPurVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngMeasureSalesPurVo.java @@ -246,7 +246,7 @@ public class LngPngMeasureSalesPurVo extends com.xjrsoft.common.model.base.BaseM * lngFileUpload */ @ApiModelProperty("lngFileUpload子表") - private List fileList; + private List lngFileUploadList; /** * 拒绝原因 diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/PngMeasureSalesPurController.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/PngMeasureSalesPurController.java index 65c91ce..78d0c8d 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/PngMeasureSalesPurController.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/PngMeasureSalesPurController.java @@ -127,7 +127,7 @@ public class PngMeasureSalesPurController { if(temp != null && "JLZ".equals(temp.getStatusCode()) && temp.getCfmCuUserId() == null && temp.getDataSource() == null ) { }else { - throw new BusinessException(BusinessCode.of(10500, "只有状态为计量中、且客户未确认且来源不为空的数据才能进行确认！")); + throw new BusinessException(BusinessCode.of(10500, "只有状态为计量中、且客户未确认且来源不为空的数据才能进行保存！")); } } return R.ok(dataService.insertBatch(dtoList,new DataOperationListener() { diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngMeasurePurMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngMeasurePurMapper.java index 555af1f..22517f9 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngMeasurePurMapper.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngMeasurePurMapper.java @@ -29,7 +29,7 @@ public interface LngPngMeasurePurMapper extends BaseMapper { " ORDER BY date_plan, status_code, cu_code, su_code ") //LngPngMeasurePur> queryLngPngMeasurePurById(@Param("id")Long id); - List queryLngPngMeasurePurListByIds(List ids,@Param("ew") QueryWrapper queryWrapper); + List queryLngPngMeasurePurListByIds(List ids,@Param("ew") QueryWrapper queryWrapper); diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngMeasureSalesPurMapper.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngMeasureSalesPurMapper.java index 3b9551f..ddb663f 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngMeasureSalesPurMapper.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngMeasureSalesPurMapper.java @@ -28,6 +28,6 @@ public interface LngPngMeasureSalesPurMapper extends BaseMapper queryLngPngMeasureSalesPurListByIds(List ids, - @Param("ew") QueryWrapper queryWrapper); + @Param("ew") QueryWrapper queryWrapper); } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/PngMeasurePurServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/PngMeasurePurServiceImpl.java index 66cc312..e280228 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/PngMeasurePurServiceImpl.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/PngMeasurePurServiceImpl.java @@ -2,17 +2,12 @@ package com.xjrsoft.module.dayPlan.service.impl; import java.util.List; -import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.pictc.enums.BusinessCode; import com.xjrsoft.common.exception.BusinessException; -import com.xjrsoft.common.page.ConventPage; -import com.xjrsoft.module.contract.entity.LngContract; -import com.xjrsoft.module.contract.vo.LngContractPageVo; import com.xjrsoft.module.dayPlan.entity.LngPngMeasurePur; import com.xjrsoft.module.dayPlan.mapper.LngPngMeasurePurMapper; import com.xjrsoft.module.dayPlan.service.IPngMeasurePurService; @@ -33,7 +28,7 @@ import lombok.AllArgsConstructor; @AllArgsConstructor public class PngMeasurePurServiceImpl extends ServiceImpl implements IPngMeasurePurService { -private final IFileClient fileClient; + private final IFileClient fileClient; @Override public LngPngMeasurePurVo getInfoById(Long id) { @@ -49,7 +44,7 @@ private final IFileClient fileClient; @Override public List getListByIds(List ids) { - QueryWrapper queryWrapper = new QueryWrapper<>(); + QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.in("msp.id", ids); return this.baseMapper.queryLngPngMeasurePurListByIds(ids, queryWrapper); diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/PngMeasureSalesPurServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/PngMeasureSalesPurServiceImpl.java index 662cff3..0592774 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/PngMeasureSalesPurServiceImpl.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/PngMeasureSalesPurServiceImpl.java @@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.pictc.enums.BusinessCode; import com.xjrsoft.common.exception.BusinessException; -import com.xjrsoft.module.contract.entity.LngContract; import com.xjrsoft.module.dayPlan.entity.LngPngMeasureSalesPur; import com.xjrsoft.module.dayPlan.mapper.LngPngMeasureSalesPurMapper; import com.xjrsoft.module.dayPlan.service.IPngMeasureSalesPurService; @@ -39,15 +38,15 @@ public class PngMeasureSalesPurServiceImpl extends ServiceImpl fileList = fileClient.getTableFiles("lng_png_measure_sales_pur", "fileList", vo.getId()); - vo.setFileList(fileList); + List fileList = fileClient.getTableFiles("lng_png_measure_sales_pur", "lngFileUploadList", vo.getId()); + vo.setLngFileUploadList(fileList); return vo; } @Override public List getListByIds(List ids) { - QueryWrapper queryWrapper = new QueryWrapper<>(); + QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.in("msp.id", ids); return this.baseMapper.queryLngPngMeasureSalesPurListByIds(ids, queryWrapper); }