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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
t-shunyi.kuang
2025-12-02 15:41:02 +08:00
parent 27ff645a3b c066c601ee
commit c3fcb176e1
56 changed files with 2626 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/AddTestflow001Dto.java Normal file
View File

@ -0,0 +1,62 @@
package com.xjrsoft.module.mdm.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
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;
import com.pictc.annotations.datalog.LogField;
import com.pictc.annotations.datalog.LogTable;
/**
* @title: 测试流程1
* @Author 管理员
* @Date: 2025-11-26
* @Version 1.0
*/
@Data
@LogTable(source="testflow_001",name="测试流程1")
public class AddTestflow001Dto implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 客户
*/
@ApiModelProperty("客户")
@LogField(name="客户",index=0)
private String customer;
/**
* 客户编码
*/
@ApiModelProperty("客户编码")
@LogField(name="客户编码",index=0)
private String customerCode;
/**
* 名称
*/
@ApiModelProperty("名称")
@LogField(name="名称",index=0)
private String name;
/**
* 备注
*/
@ApiModelProperty("备注")
@LogField(name="备注",index=0)
private String note;
/**
*
*/
@ApiModelProperty("")
@LogField(name="",index=0)
private Long tenantId;
}

56
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/AddTestflow003Dto.java Normal file
View File

@ -0,0 +1,56 @@
package com.xjrsoft.module.mdm.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
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;
import com.pictc.annotations.datalog.LogField;
import com.pictc.annotations.datalog.LogTable;
/**
* @title: 测试流程3
* @Author 管理员
* @Date: 2025-11-26
* @Version 1.0
*/
@Data
@LogTable(source="testflow_003",name="测试流程3")
public class AddTestflow003Dto implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 名称
*/
@ApiModelProperty("名称")
@LogField(name="名称",index=0)
private String name;
/**
* 编码
*/
@ApiModelProperty("编码")
@LogField(name="编码",index=0)
private String code;
/**
* 备注
*/
@ApiModelProperty("备注")
@LogField(name="备注",index=0)
private String note;
/**
*
*/
@ApiModelProperty("")
@LogField(name="",index=0)
private Long tenantId;
}

45
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/Testflow001PageDto.java Normal file
View File

@ -0,0 +1,45 @@
package com.xjrsoft.module.mdm.dto;
import com.xjrsoft.common.page.PageInput;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalTime;
import java.time.LocalDateTime;
import java.math.BigDecimal;
/**
* @title: 分页查询入参
* @Author 管理员
* @Date: 2025-11-26
* @Version 1.0
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class Testflow001PageDto extends PageInput {
/**
* 客户
*/
@ApiModelProperty("客户")
private String customer;
/**
* 客户编码
*/
@ApiModelProperty("客户编码")
private String customerCode;
/**
* 名称
*/
@ApiModelProperty("名称")
private String name;
/**
* 备注
*/
@ApiModelProperty("备注")
private String note;
}

40
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/Testflow003PageDto.java Normal file
View File

@ -0,0 +1,40 @@
package com.xjrsoft.module.mdm.dto;
import com.xjrsoft.common.page.PageInput;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalTime;
import java.time.LocalDateTime;
import java.math.BigDecimal;
/**
* @title: 分页查询入参
* @Author 管理员
* @Date: 2025-11-26
* @Version 1.0
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class Testflow003PageDto extends PageInput {
/**
* 名称
*/
@ApiModelProperty("名称")
private String name;
/**
* 编码
*/
@ApiModelProperty("编码")
private String code;
/**
* 备注
*/
@ApiModelProperty("备注")
private String note;
}

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

@ -43,21 +43,21 @@ public class UpdateLngBPortDto implements Serializable {
/**
* 助记码(自动生成，4位，0001……)
*/
@LogField(name="助记码(自动生成，4位，0001……)",index=1)
@LogField(name="助记码",index=1)
@ApiModelProperty("助记码(自动生成，4位，0001……)")
private String code;
/**
* 名称(名称和简称都不能重复)
*/
@LogField(name="名称(名称和简称都不能重复)",index=2)
@LogField(name="名称",index=2)
@ApiModelProperty("名称(名称和简称都不能重复)")
private String fullName;
/**
* 简称(名称和简称都不能重复)
*/
@LogField(name="简称(名称和简称都不能重复)",index=3)
@LogField(name="简称",index=3)
@ApiModelProperty("简称(名称和简称都不能重复)")
private String shortName;
@ -127,7 +127,7 @@ public class UpdateLngBPortDto implements Serializable {
/**
* 有效标志(Y-有效，N-无效)
*/
@LogField(name="有效标志(Y-有效，N-无效)",index=13)
@LogField(name="有效标志",index=13)
@ApiModelProperty("有效标志(Y-有效，N-无效)")
private String valid;
@ -141,7 +141,7 @@ public class UpdateLngBPortDto implements Serializable {
/**
* 租户id
*/
@LogField(name="租户id",index=15)
@LogField(name="租户",index=15)
@ApiModelProperty("租户id")
private Long tenantId;

79
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/UpdateTestflow001Dto.java Normal file
View File

@ -0,0 +1,79 @@
package com.xjrsoft.module.mdm.dto;
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 com.fasterxml.jackson.annotation.JsonFormat;
import java.util.List;
import com.pictc.annotations.datalog.LogTable;
import com.pictc.annotations.datalog.LogField;
import com.pictc.annotations.datalog.LogJoin;
import com.pictc.annotations.datalog.LogJoinColumn;
import com.pictc.annotations.datalog.JoinCaseType;
import com.pictc.annotations.datalog.JoinType;
import com.pictc.annotations.datalog.ValueDirectionType;
/**
* @title: 测试流程1
* @Author 管理员
* @Date: 2025-11-26
* @Version 1.0
*/
@Data
@LogTable(source="testflow_001",name="测试流程1")
public class UpdateTestflow001Dto implements Serializable {
private static final long serialVersionUID = 1L;
/**
*
*/
@LogField(name="",index=0)
@ApiModelProperty("")
private Long id;
/**
* 客户
*/
@LogField(name="客户",index=1)
@ApiModelProperty("客户")
private String customer;
/**
* 客户编码
*/
@LogField(name="客户编码",index=2)
@ApiModelProperty("客户编码")
private String customerCode;
/**
* 名称
*/
@LogField(name="名称",index=3)
@ApiModelProperty("名称")
private String name;
/**
* 备注
*/
@LogField(name="备注",index=4)
@ApiModelProperty("备注")
private String note;
/**
*
*/
@LogField(name="",index=5)
@ApiModelProperty("")
private Long tenantId;
}

72
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/dto/UpdateTestflow003Dto.java Normal file
View File

@ -0,0 +1,72 @@
package com.xjrsoft.module.mdm.dto;
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 com.fasterxml.jackson.annotation.JsonFormat;
import java.util.List;
import com.pictc.annotations.datalog.LogTable;
import com.pictc.annotations.datalog.LogField;
import com.pictc.annotations.datalog.LogJoin;
import com.pictc.annotations.datalog.LogJoinColumn;
import com.pictc.annotations.datalog.JoinCaseType;
import com.pictc.annotations.datalog.JoinType;
import com.pictc.annotations.datalog.ValueDirectionType;
/**
* @title: 测试流程3
* @Author 管理员
* @Date: 2025-11-26
* @Version 1.0
*/
@Data
@LogTable(source="testflow_003",name="测试流程3")
public class UpdateTestflow003Dto implements Serializable {
private static final long serialVersionUID = 1L;
/**
*
*/
@LogField(name="",index=0)
@ApiModelProperty("")
private Long id;
/**
* 名称
*/
@LogField(name="名称",index=1)
@ApiModelProperty("名称")
private String name;
/**
* 编码
*/
@LogField(name="编码",index=2)
@ApiModelProperty("编码")
private String code;
/**
* 备注
*/
@LogField(name="备注",index=3)
@ApiModelProperty("备注")
private String note;
/**
*
*/
@LogField(name="",index=4)
@ApiModelProperty("")
private Long tenantId;
}

48
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/Testflow001PageVo.java Normal file
View File

@ -0,0 +1,48 @@
package com.xjrsoft.module.mdm.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.xjrsoft.common.annotation.Trans;
import com.xjrsoft.common.enums.TransType;
import java.time.LocalTime;
import java.time.LocalDateTime;
import java.math.BigDecimal;
/**
* @title: 分页列表出参
* @Author 管理员
* @Date: 2025-11-26
* @Version 1.0
*/
@Data
public class Testflow001PageVo {
/**
*
*/
@ApiModelProperty("")
private String id;
/**
* 客户
*/
@ApiModelProperty("客户")
private String customer;
/**
* 客户编码
*/
@ApiModelProperty("客户编码")
private String customerCode;
/**
* 名称
*/
@ApiModelProperty("名称")
private String name;
/**
* 备注
*/
@ApiModelProperty("备注")
private String note;
}

100
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/Testflow001Vo.java Normal file
View File

@ -0,0 +1,100 @@
package com.xjrsoft.module.mdm.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.time.LocalTime;
import java.time.LocalDateTime;
import java.math.BigDecimal;
import java.util.List;
/**
* @title: 表单出参
* @Author 管理员
* @Date: 2025-11-26
* @Version 1.0
*/
@Data
public class Testflow001Vo {
/**
*
*/
@ApiModelProperty("")
private Long id;
/**
* 客户
*/
@ApiModelProperty("客户")
private String customer;
/**
* 客户编码
*/
@ApiModelProperty("客户编码")
private String customerCode;
/**
* 名称
*/
@ApiModelProperty("名称")
private String name;
/**
* 备注
*/
@ApiModelProperty("备注")
private String note;
/**
*
*/
@ApiModelProperty("")
private Long createUserId;
/**
*
*/
@ApiModelProperty("")
private LocalDateTime createDate;
/**
*
*/
@ApiModelProperty("")
private Long modifyUserId;
/**
*
*/
@ApiModelProperty("")
private LocalDateTime modifyDate;
/**
*
*/
@ApiModelProperty("")
private Integer enabledMark;
/**
*
*/
@ApiModelProperty("")
private Long tenantId;
}

43
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/Testflow003PageVo.java Normal file
View File

@ -0,0 +1,43 @@
package com.xjrsoft.module.mdm.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.xjrsoft.common.annotation.Trans;
import com.xjrsoft.common.enums.TransType;
import java.time.LocalTime;
import java.time.LocalDateTime;
import java.math.BigDecimal;
/**
* @title: 分页列表出参
* @Author 管理员
* @Date: 2025-11-26
* @Version 1.0
*/
@Data
public class Testflow003PageVo {
/**
*
*/
@ApiModelProperty("")
private String id;
/**
* 名称
*/
@ApiModelProperty("名称")
private String name;
/**
* 编码
*/
@ApiModelProperty("编码")
private String code;
/**
* 备注
*/
@ApiModelProperty("备注")
private String note;
}

93
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/mdm/vo/Testflow003Vo.java Normal file
View File

@ -0,0 +1,93 @@
package com.xjrsoft.module.mdm.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.time.LocalTime;
import java.time.LocalDateTime;
import java.math.BigDecimal;
import java.util.List;
/**
* @title: 表单出参
* @Author 管理员
* @Date: 2025-11-26
* @Version 1.0
*/
@Data
public class Testflow003Vo {
/**
*
*/
@ApiModelProperty("")
private Long id;
/**
* 名称
*/
@ApiModelProperty("名称")
private String name;
/**
* 编码
*/
@ApiModelProperty("编码")
private String code;
/**
* 备注
*/
@ApiModelProperty("备注")
private String note;
/**
*
*/
@ApiModelProperty("")
private Long createUserId;
/**
*
*/
@ApiModelProperty("")
private LocalDateTime createDate;
/**
*
*/
@ApiModelProperty("")
private Long modifyUserId;
/**
*
*/
@ApiModelProperty("")
private LocalDateTime modifyDate;
/**
*
*/
@ApiModelProperty("")
private Integer enabledMark;
/**
*
*/
@ApiModelProperty("")
private Long tenantId;
}

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

@ -28,7 +28,7 @@ import com.pictc.annotations.datalog.ValueDirectionType;
* @Version 1.0
*/
@Data
@LogTable(source="lng_customer_attr_power",name="客户")
@LogTable(source="lng_customer_attr_power",name="客户业务信息")
public class UpdateLngCustomerAttrPowerDto implements Serializable {
private static final long serialVersionUID = 1L;

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

@ -28,7 +28,7 @@ import com.pictc.annotations.datalog.ValueDirectionType;
* @Version 1.0
*/
@Data
@LogTable(source="lng_customer_bank",name="客户")
@LogTable(source="lng_customer_bank",name="客户银行信息")
public class UpdateLngCustomerBankDto implements Serializable {
private static final long serialVersionUID = 1L;

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

@ -28,7 +28,7 @@ import com.pictc.annotations.datalog.ValueDirectionType;
* @Version 1.0
*/
@Data
@LogTable(source="lng_customer_contact",name="客户")
@LogTable(source="lng_customer_contact",name="客户联系人信息")
public class UpdateLngCustomerContactDto implements Serializable {
private static final long serialVersionUID = 1L;

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

@ -28,7 +28,7 @@ import com.pictc.annotations.datalog.ValueDirectionType;
* @Version 1.0
*/
@Data
@LogTable(source="lng_customer_doc",name="客户")
@LogTable(source="lng_customer_doc",name="客户证书信息")
public class UpdateLngCustomerDocDto implements Serializable {
private static final long serialVersionUID = 1L;

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

@ -252,7 +252,7 @@ public class UpdateLngCustomerDto implements Serializable {
* lngCustomerAttrPower
*/
@ApiModelProperty("lngCustomerAttrPower子表")
@LogJoin(name = "lngCustomerAttrPower子表",
@LogJoin(name = "客户业务信息",
columns = {
@LogJoinColumn(field = "cuCode",relatedField = "cuCode", valueDirection = ValueDirectionType.RIGHT)
},
@ -262,7 +262,7 @@ public class UpdateLngCustomerDto implements Serializable {
* lngCustomerBank
*/
@ApiModelProperty("lngCustomerBank子表")
@LogJoin(name = "lngCustomerBank子表",
@LogJoin(name = "客户银行信息",
columns = {
@LogJoinColumn(field = "cuCode",relatedField = "cuCode", valueDirection = ValueDirectionType.RIGHT)
},
@ -272,7 +272,7 @@ public class UpdateLngCustomerDto implements Serializable {
* lngCustomerDoc
*/
@ApiModelProperty("lngCustomerDoc子表")
@LogJoin(name = "lngCustomerDoc子表",
@LogJoin(name = "客户证书信息",
columns = {
@LogJoinColumn(field = "cuCode",relatedField = "cuCode", valueDirection = ValueDirectionType.RIGHT)
},
@ -282,8 +282,7 @@ public class UpdateLngCustomerDto implements Serializable {
* lngCustomerContact
*/
@ApiModelProperty("lngCustomerContact子表")
@LogJoin(name = "lngCustomerContact子表",
columns = {
@LogJoin(name = "客户联系人信息",columns = {
@LogJoinColumn(field = "cuCode",relatedField = "cuCode", valueDirection = ValueDirectionType.RIGHT)
},
caseType = JoinCaseType.FULL, target = UpdateLngCustomerContactDto.class, type = JoinType.MANY)