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:
shunyi.kuang
2026-01-08 16:43:08 +08:00
parent 3dee417d2f
commit a08c3d1273
10 changed files with 251 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/UpdateLngContractPurPngPointDto.java
View File

@ -75,7 +75,7 @@ public class UpdateLngContractPurPngPointDto implements Serializable {
@ApiModelProperty("租户id")
private Long tenantId;
private Boolean hasDel;
private Boolean hasDel = false;
/**
* lngContractPurPngPoint

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

@ -4,6 +4,11 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.time.LocalDateTime;
import java.util.List;
import com.xjrsoft.common.annotation.Trans;
import com.xjrsoft.common.enums.TransType;
import com.xjrsoft.module.system.vo.LngFileUploadVo;
/**
* @title: 表单出参
@ -98,6 +103,74 @@ public class LngContractApproRelVo {
private Long ruleUserId;
/**
* lngFileUpload
*/
@ApiModelProperty("lngFileUpload子表")
private List<LngFileUploadVo> lngFileUploadList;
/**
* 签报类型(DJ-定价方案/XB-询比价销售方案/XS-双边协商谈判销售方案/YY-应邀报价销售方案/JP-竞拍销售方案/SJ-商机)
*/
@ApiModelProperty("签报类型(DJ-定价方案/XB-询比价销售方案/XS-双边协商谈判销售方案/YY-应邀报价销售方案/JP-竞拍销售方案/SJ-商机)")
@Trans(type = TransType.DIC, id = "2001500486723887105", transToFieldName = "typeName")
private String typeCode;
/**
* 签报类型描述
*/
@ApiModelProperty("签报类型描述")
private String typeName;
/**
* 编号(自动生成)
*/
@ApiModelProperty("编号(自动生成)")
private String code;
/**
* 标题
*/
@ApiModelProperty("标题")
private String title;
/**
* 拟稿日期
*/
@ApiModelProperty("拟稿日期")
private LocalDateTime dateAppro;
/**
* 拟稿人(xjr_user.id)
*/
@ApiModelProperty("拟稿人(xjr_user.id)")
@Trans(type = TransType.USER, transToFieldName = "empName")
private Long empId;
/**
* 拟稿人名称
*/
@ApiModelProperty("拟稿人名称")
private String empName;
/**
* 业务部门(xjr_department.id)
*/
@ApiModelProperty("业务部门(xjr_department.id)")
@Trans(type = TransType.DEPT, transToFieldName = "bDeptName")
private Long bDeptId;
/**
* 业务部门名称
*/
@ApiModelProperty("业务部门名称")
private String bDeptName;

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

@ -4,6 +4,12 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.time.LocalDateTime;
import java.util.List;
import com.pictc.annotations.datalog.LogAttrField;
import com.xjrsoft.common.annotation.Trans;
import com.xjrsoft.common.enums.TransType;
import com.xjrsoft.module.system.vo.LngFileUploadVo;
/**
* @title: 表单出参
@ -89,9 +95,63 @@ public class LngContractFactRelVo extends com.xjrsoft.common.model.base.BaseMode
*/
@ApiModelProperty("数据权限id")
private Long ruleUserId;
/**
* 合同号
*/
@ApiModelProperty("合同号")
private String kNo;
/**
* 合同名称
*/
@ApiModelProperty("合同名称")
private String kName;
/**
* 我方联系人ID
*/
@ApiModelProperty("我方联系人ID")
@Trans(type = TransType.USER, transToFieldName = "empName")
private Long empId;
private String empName;
private String cpName;
/**
* 合同主体
*/
@ApiModelProperty("合同主体")
@Trans(type = TransType.DEPT, transToFieldName = "comName")
private Long comId;
private String comName;
/**
* 业务部门
*/
/**
* 关联类别(M-主合同/U-合同变更/C-确认函/A-补充协议/F-框架协议/R-续签合同/I-同一事项关联合同；以下不要：无/原合同补充协议/原合同续签合同/同一事项关联合同)
*/
@Trans(type = TransType.DIC, id = "2003815292742479874", transToFieldName = "relTypeName")
private String relTypeCode;
private String relTypeName;
/**
* 业务类型
*/
@ApiModelProperty("合同类别(日常采购/工程建设/人力资源/投资管理/金融保险/租赁/信息管理/咨询服务/综合服务/生产运营/天然气公司业务合同)")
@Trans(type = TransType.DIC, id = "2003815931950215169", transToFieldName = "kTypeName1")
private String kTypeCode1;
private String kTypeName1;
/**
* 联系电话
*/
@ApiModelProperty("联系电话")
private String tel;
/**
* lngFileUpload
*/
@ApiModelProperty("lngFileUpload子表")
@LogAttrField
private List<LngFileUploadVo> lngFileUploadList;
}

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

@ -42,6 +42,7 @@ public class LngContractPurPngPointSalesVo implements Serializable {
*/
@ApiModelProperty("上载点编码")
private String pointUpCode;
private String pointUpName;
/**
* 自主托运(Y-是，N-否)
@ -55,6 +56,7 @@ public class LngContractPurPngPointSalesVo implements Serializable {
*/
@ApiModelProperty("交割点编码")
private String pointDelyCode;
private String pointDelyName;
/**
* 备注

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

@ -3,6 +3,8 @@ package com.xjrsoft.module.contract.vo;
import java.time.LocalDateTime;
import java.util.List;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -34,6 +36,7 @@ public class LngContractPurPngPointVo extends com.xjrsoft.common.model.base.Base
*/
@ApiModelProperty("上载点编码")
private String pointUpCode;
private String pointUpName;
/**
@ -99,6 +102,9 @@ public class LngContractPurPngPointVo extends com.xjrsoft.common.model.base.Base
private Long ruleUserId;
private String pointDelyName;
/**
* lngContractPurPngPointSales
*/

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

@ -4,6 +4,8 @@ import java.time.LocalDateTime;
import java.util.List;
import com.pictc.annotations.datalog.LogAttrField;
import com.xjrsoft.common.annotation.Trans;
import com.xjrsoft.common.enums.TransType;
import com.xjrsoft.module.system.vo.LngFileUploadVo;
import io.swagger.annotations.ApiModelProperty;
@ -29,8 +31,11 @@ public class LngContractPurVo extends com.xjrsoft.common.model.base.BaseModel{
* 合同主体ID(天然气公司/惠贸)
*/
@ApiModelProperty("合同主体ID(天然气公司/惠贸)")
@Trans(type = TransType.DEPT, transToFieldName = "comName")
private Long comId;
private String comName;
/**
* 合同号
@ -141,14 +146,18 @@ public class LngContractPurVo extends com.xjrsoft.common.model.base.BaseModel{
* 我方联系人
*/
@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;
/**
@ -213,7 +222,7 @@ public class LngContractPurVo extends com.xjrsoft.common.model.base.BaseModel{
@ApiModelProperty("数据权限id")
private Long ruleUserId;
private String transName;
/**