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-02-04 17:25:41 +08:00
parent 466342fec5
commit 6b799fe8ce
10 changed files with 17 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -186,10 +186,5 @@ public class AddLngContractPurIntDto extends com.xjrsoft.common.model.base.BaseM
*/
@ApiModelProperty("备注")
private String note;
/**
* 租户id
*/
@ApiModelProperty("租户id")
private Long tenantId;
}

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

@ -5,13 +5,8 @@ import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
import lombok.experimental.Accessors;
import java.io.Serializable;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.time.LocalTime;
import java.time.LocalDateTime;
import java.math.BigDecimal;
import java.util.List;
@ -191,10 +186,5 @@ public class AddLngContractSalesIntDto extends com.xjrsoft.common.model.base.Bas
*/
@ApiModelProperty("备注")
private String note;
/**
* 租户id
*/
@ApiModelProperty("租户id")
private Long tenantId;
}

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

@ -1,6 +1,7 @@
package com.xjrsoft.module.contract.dto;
import com.pictc.annotations.datalog.*;
import com.xjrsoft.common.model.base.BaseModel;
import com.xjrsoft.module.system.dto.UpdateLngFileUploadDto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -19,7 +20,7 @@ import java.util.List;
*/
@Data
@LogTable(source="lng_contract",name="国际采购合同")
public class UpdateLngContractPIDto implements Serializable {
public class UpdateLngContractPIDto extends BaseModel implements Serializable {
private static final long serialVersionUID = 1L;
@ -169,14 +170,6 @@ public class UpdateLngContractPIDto implements Serializable {
@LogField(name="备注",index=20)
@ApiModelProperty("备注")
private String note;
/**
* 租户id
*/
@LogField(name="租户id",index=21)
@ApiModelProperty("租户id")
private Long tenantId;
/**
* lngContractPurInt

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

@ -1,6 +1,7 @@
package com.xjrsoft.module.contract.dto;
import com.pictc.annotations.datalog.*;
import com.xjrsoft.common.model.base.BaseModel;
import com.xjrsoft.module.system.dto.UpdateLngFileUploadDto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -19,7 +20,7 @@ import java.util.List;
*/
@Data
@LogTable(source="lng_contract",name="国际销售合同")
public class UpdateLngContractSIDto implements Serializable {
public class UpdateLngContractSIDto extends BaseModel implements Serializable {
private static final long serialVersionUID = 1L;
@ -169,14 +170,6 @@ public class UpdateLngContractSIDto implements Serializable {
@LogField(name="备注",index=20)
@ApiModelProperty("备注")
private String note;
/**
* 租户id
*/
@LogField(name="租户id",index=21)
@ApiModelProperty("租户id")
private Long tenantId;
/**
* lngContractSalesInt

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

@ -60,14 +60,18 @@ public class LngContractFactVo {
* 关联类别(M-主合同/U-合同变更/C-确认函/A-补充协议/F-框架协议/R-续签合同/I-同一事项关联合同；以下不要：无/原合同补充协议/原合同续签合同/同一事项关联合同)
*/
@ApiModelProperty("关联类别(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;
/**

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

@ -7,7 +7,6 @@ import lombok.ToString;
import lombok.experimental.Accessors;
import java.math.BigDecimal;
import java.time.LocalDateTime;
/**
* @title: 表单出参
@ -250,55 +249,7 @@ public class LngContractPurIntVo extends com.xjrsoft.common.model.base.BaseModel
*/
@ApiModelProperty("备注")
private String note;
/**
* 创建人id
*/
@ApiModelProperty("创建人id")
private Long createUserId;
/**
* 创建时间
*/
@ApiModelProperty("创建时间")
private LocalDateTime createDate;
/**
* 修改人id
*/
@ApiModelProperty("修改人id")
private Long modifyUserId;
/**
* 修改时间
*/
@ApiModelProperty("修改时间")
private LocalDateTime modifyDate;
/**
* 租户id
*/
@ApiModelProperty("租户id")
private Long tenantId;
/**
* 部门id
*/
@ApiModelProperty("部门id")
private Long deptId;
/**
* 数据权限id
*/
@ApiModelProperty("数据权限id")
private Long ruleUserId;

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

@ -9,7 +9,6 @@ import lombok.ToString;
import lombok.experimental.Accessors;
import java.math.BigDecimal;
import java.time.LocalDateTime;
/**
* @title: 表单出参
@ -256,58 +255,4 @@ public class LngContractSalesIntVo extends com.xjrsoft.common.model.base.BaseMod
*/
@ApiModelProperty("备注")
private String note;
/**
* 创建人id
*/
@ApiModelProperty("创建人id")
private Long createUserId;
/**
* 创建时间
*/
@ApiModelProperty("创建时间")
private LocalDateTime createDate;
/**
* 修改人id
*/
@ApiModelProperty("修改人id")
private Long modifyUserId;
/**
* 修改时间
*/
@ApiModelProperty("修改时间")
private LocalDateTime modifyDate;
/**
* 租户id
*/
@ApiModelProperty("租户id")
private Long tenantId;
/**
* 部门id
*/
@ApiModelProperty("部门id")
private Long deptId;
/**
* 数据权限id
*/
@ApiModelProperty("数据权限id")
private Long ruleUserId;
}

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

@ -42,6 +42,13 @@ public class ContractPurIntServiceImpl extends MPJBaseServiceImpl<LngContractMap
throw new BusinessException(BusinessCode.of(10500,"找不到此数据"));
}
LngContractPIVo vo = BeanUtil.toBean(lngContract, LngContractPIVo.class);
List<LngContractPurInt> lngContractPurIntList = lngContractPurIntMapper.selectList(
new LambdaQueryWrapper<LngContractPurInt>()
.eq(LngContractPurInt::getKId, lngContract.getId()));
if (CollectionUtils.isNotEmpty(lngContractPurIntList)) {
vo.setLngContractPurIntList(BeanUtil.copyToList(lngContractPurIntList,
LngContractPurIntVo.class));
}
List<LngContractFactRel> lngContractFactRelList = lngContractFactRelMapper.selectList(
new LambdaQueryWrapper<LngContractFactRel>()
.eq(LngContractFactRel::getKId, lngContract.getId()));

1
itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/service/impl/ContractSalesIntServiceImpl.java
View File

@ -49,7 +49,6 @@ public class ContractSalesIntServiceImpl extends MPJBaseServiceImpl<LngContractM
vo.setLngContractSalesIntList(BeanUtil.copyToList(lngContractSalesIntList,
LngContractSalesIntVo.class));
}
List<LngContractFactRel> lngContractFactRelList = lngContractFactRelMapper.selectList(
new LambdaQueryWrapper<LngContractFactRel>()
.eq(LngContractFactRel::getKId, lngContract.getId()));

2
itc-pcitc-mdm/itc-pcitc-mdm-start/src/main/resources/bootstrap-dev.yml
View File

@ -45,7 +45,7 @@ spring:
group: DNE
discovery:
ip: 10.0.0.2
ip: 10.0.0.3
#network-interface: net7
xjrsoft: