geg-gas/geg-gas-pcitc
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
shunyi.kuang
2026-03-18 16:43:53 +08:00
parent 20435d8885
commit fda4f5d85c
7 changed files with 21 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngMeasurePurVo.java
View File

@ -1,19 +1,14 @@
package com.xjrsoft.module.dayPlan.vo; 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.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.List; import java.util.List;
import com.xjrsoft.module.system.vo.LngFileUploadVo; import com.xjrsoft.module.system.vo.LngFileUploadVo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/** /**
* @title: 表单出参 * @title: 表单出参
* @Author 管理员 * @Author 管理员
@ -64,21 +59,21 @@ public class LngPngMeasurePurVo extends com.xjrsoft.common.model.base.BaseModel{
@ApiModelProperty("客户编码") @ApiModelProperty("客户编码")
private String cuCode; private String cuCode;
private String cuName;
/** /**
* 交易主体编码(天然气公司/惠贸) * 交易主体编码(天然气公司/惠贸)
*/ */
@ApiModelProperty("交易主体编码(天然气公司/惠贸)") @ApiModelProperty("交易主体编码(天然气公司/惠贸)")
private Long comId; private Long comId;
private String comName;
/** /**
* 合同-主信息主键（销售）(lng_contract) * 合同-主信息主键（销售）(lng_contract)
*/ */
@ApiModelProperty("合同-主信息主键（销售）(lng_contract)") @ApiModelProperty("合同-主信息主键（销售）(lng_contract)")
private Long ksId; private Long ksId;
private String ksName;
/** /**
* 合同-国内销售-管道气-交割点主键(lng_contract_sales_png_sta) * 合同-国内销售-管道气-交割点主键(lng_contract_sales_png_sta)
*/ */
@ -99,6 +94,7 @@ public class LngPngMeasurePurVo extends com.xjrsoft.common.model.base.BaseModel{
@ApiModelProperty("供应商") @ApiModelProperty("供应商")
private String suCode; private String suCode;
private String suName;
/** /**
* 采购合同-主信息主键 * 采购合同-主信息主键
@ -106,7 +102,7 @@ public class LngPngMeasurePurVo extends com.xjrsoft.common.model.base.BaseModel{
@ApiModelProperty("采购合同-主信息主键") @ApiModelProperty("采购合同-主信息主键")
private Long kpId; private Long kpId;
private String kpName;
/** /**
* 合同-国内采购-管道气-上载点主键 * 合同-国内采购-管道气-上载点主键
*/ */
@ -120,7 +116,7 @@ public class LngPngMeasurePurVo extends com.xjrsoft.common.model.base.BaseModel{
@ApiModelProperty("上载点") @ApiModelProperty("上载点")
private String pointUpCode; private String pointUpCode;
private String pointUpName;
/** /**
* 自主托运(Y-是，N-否) * 自主托运(Y-是，N-否)
*/ */
@ -169,6 +165,7 @@ public class LngPngMeasurePurVo extends com.xjrsoft.common.model.base.BaseModel{
@ApiModelProperty("客户确认人") @ApiModelProperty("客户确认人")
private Long cfmCuUserId; private Long cfmCuUserId;
private String cfmCuUserName;
/** /**
* 客户确认时间 * 客户确认时间
@ -183,7 +180,7 @@ public class LngPngMeasurePurVo extends com.xjrsoft.common.model.base.BaseModel{
@ApiModelProperty("内部确认人") @ApiModelProperty("内部确认人")
private Long cfmEmpId; private Long cfmEmpId;
private String cfmEmpName;
/** /**
* 内部确认时间 * 内部确认时间
*/ */

2
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngMeasureSalesPurVo.java
View File

@ -246,7 +246,7 @@ public class LngPngMeasureSalesPurVo extends com.xjrsoft.common.model.base.BaseM
* lngFileUpload * lngFileUpload
*/ */
@ApiModelProperty("lngFileUpload子表") @ApiModelProperty("lngFileUpload子表")
private List<LngFileUploadVo> fileList; private List<LngFileUploadVo> lngFileUploadList;
/** /**
* 拒绝原因 * 拒绝原因

2
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/controller/PngMeasureSalesPurController.java
View File

@ -127,7 +127,7 @@ public class PngMeasureSalesPurController {
if(temp != null && "JLZ".equals(temp.getStatusCode()) && temp.getCfmCuUserId() == null && temp.getDataSource() == null ) { if(temp != null && "JLZ".equals(temp.getStatusCode()) && temp.getCfmCuUserId() == null && temp.getDataSource() == null ) {
}else { }else {
throw new BusinessException(BusinessCode.of(10500, "只有状态为计量中、且客户未确认且来源不为空的数据才能进行确认！")); throw new BusinessException(BusinessCode.of(10500, "只有状态为计量中、且客户未确认且来源不为空的数据才能进行保存！"));
} }
} }
return R.ok(dataService.insertBatch(dtoList,new DataOperationListener<UpdateLngPngMeasureSalesPurDto>() { return R.ok(dataService.insertBatch(dtoList,new DataOperationListener<UpdateLngPngMeasureSalesPurDto>() {

2
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngMeasurePurMapper.java
View File

@ -29,7 +29,7 @@ public interface LngPngMeasurePurMapper extends BaseMapper<LngPngMeasurePur> {
" ORDER BY date_plan, status_code, cu_code, su_code ") " ORDER BY date_plan, status_code, cu_code, su_code ")
//LngPngMeasurePur> queryLngPngMeasurePurById(@Param("id")Long id); //LngPngMeasurePur> queryLngPngMeasurePurById(@Param("id")Long id);
List<LngPngMeasurePur> queryLngPngMeasurePurListByIds(List<Long> ids,@Param("ew") QueryWrapper<LngContract> queryWrapper); List<LngPngMeasurePur> queryLngPngMeasurePurListByIds(List<Long> ids,@Param("ew") QueryWrapper<LngPngMeasurePur> queryWrapper);

2
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/mapper/LngPngMeasureSalesPurMapper.java
View File

@ -28,6 +28,6 @@ public interface LngPngMeasureSalesPurMapper extends BaseMapper<LngPngMeasureSal
" ${ew.customSqlSegment} " + " ${ew.customSqlSegment} " +
" ORDER BY date_plan, status_code, cu_code, su_code ") " ORDER BY date_plan, status_code, cu_code, su_code ")
List<LngPngMeasureSalesPur> queryLngPngMeasureSalesPurListByIds(List<Long> ids, List<LngPngMeasureSalesPur> queryLngPngMeasureSalesPurListByIds(List<Long> ids,
@Param("ew") QueryWrapper<LngContract> queryWrapper); @Param("ew") QueryWrapper<LngPngMeasureSalesPur> queryWrapper);
} }

9
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/PngMeasurePurServiceImpl.java
View File

@ -2,17 +2,12 @@ package com.xjrsoft.module.dayPlan.service.impl;
import java.util.List; import java.util.List;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.pictc.enums.BusinessCode; import com.pictc.enums.BusinessCode;
import com.xjrsoft.common.exception.BusinessException; 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.entity.LngPngMeasurePur;
import com.xjrsoft.module.dayPlan.mapper.LngPngMeasurePurMapper; import com.xjrsoft.module.dayPlan.mapper.LngPngMeasurePurMapper;
import com.xjrsoft.module.dayPlan.service.IPngMeasurePurService; import com.xjrsoft.module.dayPlan.service.IPngMeasurePurService;
@ -33,7 +28,7 @@ import lombok.AllArgsConstructor;
@AllArgsConstructor @AllArgsConstructor
public class PngMeasurePurServiceImpl extends ServiceImpl<LngPngMeasurePurMapper, LngPngMeasurePur> implements IPngMeasurePurService { public class PngMeasurePurServiceImpl extends ServiceImpl<LngPngMeasurePurMapper, LngPngMeasurePur> implements IPngMeasurePurService {
private final IFileClient fileClient; private final IFileClient fileClient;
@Override @Override
public LngPngMeasurePurVo getInfoById(Long id) { public LngPngMeasurePurVo getInfoById(Long id) {
@ -49,7 +44,7 @@ private final IFileClient fileClient;
@Override @Override
public List<LngPngMeasurePur> getListByIds(List<Long> ids) { public List<LngPngMeasurePur> getListByIds(List<Long> ids) {
QueryWrapper<LngContract> queryWrapper = new QueryWrapper<>(); QueryWrapper<LngPngMeasurePur> queryWrapper = new QueryWrapper<>();
queryWrapper.in("msp.id", ids); queryWrapper.in("msp.id", ids);
return this.baseMapper.queryLngPngMeasurePurListByIds(ids, queryWrapper); return this.baseMapper.queryLngPngMeasurePurListByIds(ids, queryWrapper);

7
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/dayPlan/service/impl/PngMeasureSalesPurServiceImpl.java
View File

@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.pictc.enums.BusinessCode; import com.pictc.enums.BusinessCode;
import com.xjrsoft.common.exception.BusinessException; 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.entity.LngPngMeasureSalesPur;
import com.xjrsoft.module.dayPlan.mapper.LngPngMeasureSalesPurMapper; import com.xjrsoft.module.dayPlan.mapper.LngPngMeasureSalesPurMapper;
import com.xjrsoft.module.dayPlan.service.IPngMeasureSalesPurService; import com.xjrsoft.module.dayPlan.service.IPngMeasureSalesPurService;
@ -39,15 +38,15 @@ public class PngMeasureSalesPurServiceImpl extends ServiceImpl<LngPngMeasureSale
throw new BusinessException(BusinessCode.of(10500, "找不到此数据！")); throw new BusinessException(BusinessCode.of(10500, "找不到此数据！"));
} }
LngPngMeasureSalesPurVo vo = BeanUtil.toBean(lngPngMeasureSalesPur, LngPngMeasureSalesPurVo.class); LngPngMeasureSalesPurVo vo = BeanUtil.toBean(lngPngMeasureSalesPur, LngPngMeasureSalesPurVo.class);
List<LngFileUploadVo> fileList = fileClient.getTableFiles("lng_png_measure_sales_pur", "fileList", vo.getId()); List<LngFileUploadVo> fileList = fileClient.getTableFiles("lng_png_measure_sales_pur", "lngFileUploadList", vo.getId());
vo.setFileList(fileList); vo.setLngFileUploadList(fileList);
return vo; return vo;
} }
@Override @Override
public List<LngPngMeasureSalesPur> getListByIds(List<Long> ids) { public List<LngPngMeasureSalesPur> getListByIds(List<Long> ids) {
QueryWrapper<LngContract> queryWrapper = new QueryWrapper<>(); QueryWrapper<LngPngMeasureSalesPur> queryWrapper = new QueryWrapper<>();
queryWrapper.in("msp.id", ids); queryWrapper.in("msp.id", ids);
return this.baseMapper.queryLngPngMeasureSalesPurListByIds(ids, queryWrapper); return this.baseMapper.queryLngPngMeasureSalesPurListByIds(ids, queryWrapper);
} }