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:
shunyi.kuang
2025-12-18 15:57:11 +08:00
parent 1b82112b61 63963a1a33
commit aff9056f60
17 changed files with 254 additions and 312 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,23 +1,12 @@
package com.xjrsoft.module.sales.dto;
import com.pictc.annotations.datalog.LogField;
import com.pictc.annotations.datalog.LogTable;
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;
@ -38,7 +27,7 @@ public class UpdateLngCustomerGroupCustomerDto implements Serializable {
*/
@LogField(name="主键",index=0)
@ApiModelProperty("主键")
private String id;
private Long id;
/**
* 组编码
*/

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

@ -6,8 +6,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.time.LocalDateTime;
/**
@ -70,13 +69,49 @@ public class UpdateLngGradeSystemItemDto implements Serializable {
@LogField(name="备注",index=6)
@ApiModelProperty("备注")
private String note;
/**
* 租户id
*/
* 创建人id
*/
@ApiModelProperty("创建人id")
private Long createUserId;
/**
* 创建时间
*/
@ApiModelProperty("创建时间")
private LocalDateTime createDate;
/**
* 修改人id
*/
@ApiModelProperty("修改人id")
private Long modifyUserId;
/**
* 修改时间
*/
@ApiModelProperty("修改时间")
private LocalDateTime modifyDate;
/**
* 租户id
*/
@LogField(name="租户id",index=7)
@ApiModelProperty("租户id")
private Long tenantId;
/**
* 部门id
*/
@ApiModelProperty("部门id")
private Long deptId;
/**
* 数据权限id
*/
@ApiModelProperty("数据权限id")
private Long ruleUserId;
}

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

@ -3,10 +3,7 @@ package com.xjrsoft.module.sales.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: 表单出参
@ -21,7 +18,7 @@ public class LngCustomerGroupCustomerVo {
* 主键
*/
@ApiModelProperty("主键")
private String id;
private Long id;
/**
* 组编码
*/
@ -73,6 +70,27 @@ public class LngCustomerGroupCustomerVo {
@ApiModelProperty("数据权限id")
private Long ruleUserId;
/**
* 客户名称
*/
@ApiModelProperty("客户名称")
private String cuName;
/**
* 国内/国际
*/
@ApiModelProperty("国内/国际")
private String diName;
/**
* 客户类别
*/
@ApiModelProperty("客户类别")
private String typeName;
/**
* 客户分类
*/
@ApiModelProperty("客户分类")
private String className;
}

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

@ -1,14 +1,12 @@
package com.xjrsoft.module.sales.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.xjrsoft.common.annotation.Trans;
import com.xjrsoft.common.enums.TransType;
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: 分页列表出参
@ -23,7 +21,7 @@ public class LngCustomerGroupPageVo {
* 主键
*/
@ApiModelProperty("主键")
private String id;
private Long id;
/**
* 组编码(按类型自动编码)
*/

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

@ -48,15 +48,9 @@ public class LngGradeSystemItemVo {
* 评价部门编码
*/
@ApiModelProperty("评价部门编码")
@Trans(type = TransType.DEPT, labelField = "eDeptName")
@Trans(type = TransType.DEPT, transToFieldName = "eDeptName")
private String eDeptCode;
/**
* 评价部门编码
*/
@ApiModelProperty("评价部门名称")
private String eDeptName;
/**
* 显示顺序