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

修改

Browse Source
This commit is contained in:
张秉卓
2026-01-07 17:44:42 +08:00
parent 0329f40727
commit c8d4f26279
6 changed files with 32 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesPngPointDto.java
View File

@ -71,5 +71,5 @@ public class UpdateLngContractSalesPngPointDto implements Serializable {
@ApiModelProperty("租户id")
private Long tenantId;
private Boolean hasDel;
private Boolean hasDel = false;
}

6
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractSalesPngPointVo.java
View File

@ -39,14 +39,16 @@ public class LngContractSalesPngPointVo {
*/
@ApiModelProperty("计量交割点编码(通常为下载点，客户托运时为上载点)")
private String pointDelyCode;
private String pointDelyName;
/**
* 交气点编码(送达点，例如先到达计量交割点，仍要再送到交气点)
*/
@ApiModelProperty("交气点编码(送达点，例如先到达计量交割点，仍要再送到交气点)")
private String pointTransCode;
private String pointTransName;
/**
* 自主托运(Y-是，N-否)

11
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractVo.java
View File

@ -1,5 +1,7 @@
package com.xjrsoft.module.contract.vo;
import com.xjrsoft.common.annotation.Trans;
import com.xjrsoft.common.enums.TransType;
import com.xjrsoft.module.sales.vo.LngApproVo;
import com.xjrsoft.module.system.vo.LngFileUploadVo;
import io.swagger.annotations.ApiModelProperty;
@ -34,7 +36,10 @@ public class LngContractVo {
* 合同主体ID(天然气公司/惠贸)
*/
@ApiModelProperty("合同主体ID(天然气公司/惠贸)")
@Trans(type = TransType.DEPT, transToFieldName = "comName")
private Long comId;
private String comName;
/**
@ -146,14 +151,18 @@ public class LngContractVo {
* 我方联系人
*/
@ApiModelProperty("我方联系人")
@Trans(type = TransType.USER, transToFieldName = "empName")
private Long empId;
private String empName;
/**
* 业务部门ID
*/
@ApiModelProperty("业务部门ID")
@Trans(type = TransType.DEPT, transToFieldName = "bDeptName")
private Long bDeptId;
private String bDeptName;
/**