国内LNG销售

This commit is contained in:
2026-01-29 17:24:40 +08:00
parent 55ab32736f
commit 6566adc731
9 changed files with 108 additions and 98 deletions

View File

@ -1,12 +1,14 @@
package com.xjrsoft.module.contract.entity;
import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.List;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.Version;
import com.baomidou.mybatisplus.annotation.TableName;
import com.github.yulichang.annotation.EntityMapping;
import com.pictc.annotations.datalog.JoinCaseType;
import com.pictc.annotations.datalog.JoinType;
@ -17,11 +19,6 @@ import com.pictc.annotations.datalog.ValueDirectionType;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.time.LocalTime;
import java.time.LocalDateTime;
import java.math.BigDecimal;
import java.util.List;
/**
@ -32,7 +29,7 @@ import java.util.List;
*/
@Data
@TableName("lng_contract")
@ApiModel(value = "国内管道气采购对象", description = "国内管道气采购")
@ApiModel(value = "国内LNG销售对象", description = "国内LNG销售")
public class LngContractSales implements Serializable {
private static final long serialVersionUID = 1L;
@ -246,7 +243,7 @@ public class LngContractSales implements Serializable {
@LogJoinColumn(field = "id",relatedField = "kId", valueDirection = ValueDirectionType.RIGHT)
}, caseType = JoinCaseType.FULL, target = LngContractSalesLngSta.class, type = JoinType.MANY)
private List<LngContractSalesLngSta> LngContractSalesLngStaList;
private List<LngContractSalesLngSta> lngContractSalesLngStaList;
/**
* lngContractSalesLngDisc
@ -259,7 +256,7 @@ public class LngContractSales implements Serializable {
@LogJoinColumn(field = "id",relatedField = "kId", valueDirection = ValueDirectionType.RIGHT)
}, caseType = JoinCaseType.FULL, target = LngContractSalesLngDisc.class, type = JoinType.MANY)
private List<LngContractSalesLngDisc> LngContractSalesLngDiscList;
private List<LngContractSalesLngDisc> lngContractSalesLngDiscList;
/**
* LngContractSalesLngQty
*/

View File

@ -46,8 +46,7 @@ public class ContractSalesLngServiceImpl extends MPJBaseServiceImpl<LngContractS
if(lngContractSales == null) {
return null;
}
LngContractSalesVo vo = BeanUtil.toBean(lngContractSales, LngContractSalesVo.class);
List<LngContractFactRelVo> lngContractFactRelList = vo.getLngContractFactRelList();
if (CollectionUtils.isNotEmpty(lngContractFactRelList)) {