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

Merge branch 'dev' of http://47.94.165.164:13000/geg-gas/geg-gas-pcitc into dev

Browse Source
This commit is contained in:
张福财
2025-12-02 10:21:51 +08:00
parent a5b65b4f38 9bfda21a15
commit c066c601ee
9 changed files with 146 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngCustomerDocDto.java
View File

@ -96,6 +96,14 @@ public class UpdateLngCustomerDocDto implements Serializable {
@ApiModelProperty("租户id")
private Long tenantId;
private String filePath;
/**
* lngFileUpload
*/
@ApiModelProperty("lngFileUpload子表")
@LogJoin(name = "lngFileUpload子表",
columns = {
@LogJoinColumn(field = "tableId",relatedField = "id", valueDirection = ValueDirectionType.RIGHT)
},
caseType = JoinCaseType.FULL, target = UpdateLngFileUploadDto.class, type = JoinType.MANY)
private List<UpdateLngFileUploadDto> fileList;
}

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

@ -122,7 +122,11 @@ public class LngCustomerDocVo {
private Long ruleUserId;
/**
* lngFileUpload
*/
@ApiModelProperty("lngFileUpload子表")
private List<LngFileUploadVo> fileList;
}

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

@ -1,5 +1,8 @@
package com.xjrsoft.module.sales.vo;
import com.xjrsoft.common.annotation.Trans;
import com.xjrsoft.common.enums.TransType;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -41,26 +44,34 @@ public class LngCustomerPageVo {
* 企业性质(国有企业/非国有企业)
*/
@ApiModelProperty("企业性质(国有企业/非国有企业)")
@Trans(type = TransType.DIC, id = "1990667133987635201")
private String natureCode;
/**
* 客户分类(一类/二类)
*/
@ApiModelProperty("客户分类(一类/二类)")
@Trans(type = TransType.DIC, id = "1990668094164484097")
private String classCode;
/**
* 客户类别(电厂/工业用户/城燃/贸易商)
*/
@ApiModelProperty("客户类别(电厂/工业用户/城燃/贸易商)")
@Trans(type = TransType.DIC, id = "1990668471983194113")
private String typeCode;
/**
* 有效标志（不在黑名单）(Y-有效，N-无效)
*/
@ApiModelProperty("有效标志（不在黑名单）(Y-有效，N-无效)")
@Trans(type = TransType.DIC, id = "1978057078528327681")
private String valid;
/**
* 状态(未提交/审批中/已审批/已驳回)
*/
@ApiModelProperty("状态(未提交/审批中/已审批/已驳回)")
@Trans(type = TransType.DIC, id = "1990669393069129729", transToFieldName = "approName")
private String approCode;
@ApiModelProperty("状态(未提交/审批中/已审批/已驳回)")
private String approName;
}

5
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngFileUploadVo.java
View File

@ -8,6 +8,8 @@ import java.time.LocalDateTime;
import java.math.BigDecimal;
import java.util.List;
import com.baomidou.mybatisplus.annotation.TableField;
/**
* @title: 表单出参
* @Author 管理员
@ -129,7 +131,8 @@ public class LngFileUploadVo {
private Long ruleUserId;
@ApiModelProperty("")
private String presignedUrl;
}