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-29 16:36:17 +08:00
parent dc8644f6be c6e915a867
commit c09d2d5590
18 changed files with 256 additions and 213 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/LngApproPageDto.java
View File

@ -71,4 +71,16 @@ public class LngApproPageDto extends PageInput {
@ApiModelProperty("内容摘要")
private String content;
/**
* 拟稿日期开始时间
*/
@ApiModelProperty("拟稿日期开始时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime startDate;
/**
* 拟稿日期结束时间
*/
@ApiModelProperty("拟稿日期结束时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime endDate;
}

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

@ -5,8 +5,6 @@ import com.pictc.annotations.datalog.LogTable;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
@ -18,7 +16,7 @@ import java.io.Serializable;
*/
@Data
@LogTable(source="lng_customer_group_customer",name="客户组-客户")
public class UpdateLngCustomerGroupCustomerDto extends com.xjrsoft.common.model.base.BaseModel {
public class UpdateLngCustomerGroupCustomerDto {
private static final long serialVersionUID = 1L;

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

@ -2,7 +2,6 @@ package com.xjrsoft.module.sales.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.pictc.annotations.datalog.*;
import com.xjrsoft.common.model.base.BaseModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -19,7 +18,7 @@ import java.util.List;
*/
@Data
@LogTable(source="lng_customer_group",name="客户组")
public class UpdateLngCustomerGroupDto extends BaseModel {
public class UpdateLngCustomerGroupDto {
private static final long serialVersionUID = 1L;

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

@ -6,7 +6,6 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.time.LocalDateTime;
/**
@ -70,48 +69,12 @@ public class UpdateLngGradeSystemItemDto implements Serializable {
@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
*/
@LogField(name="租户id",index=7)
@ApiModelProperty("租户id")
private Long tenantId;
/**
* 部门id
*/
@ApiModelProperty("部门id")
private Long deptId;
/**
* 数据权限id
*/
@ApiModelProperty("数据权限id")
private Long ruleUserId;
}

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

@ -2,9 +2,12 @@ package com.xjrsoft.module.sales.vo;
import com.xjrsoft.common.annotation.Trans;
import com.xjrsoft.common.enums.TransType;
import com.xjrsoft.module.system.vo.LngFileUploadVo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* @title: 分页列表出参
* @Author 管理员
@ -18,13 +21,14 @@ public class LngApproPageVo {
* 主键
*/
@ApiModelProperty("主键")
private String id;
private Long id;
/**
* 签报类型(DJ-定价方案/XB-询比价销售方案/XS-双边协商谈判销售方案/YY-应邀报价销售方案/JP-竞拍销售方案/SJ-商机)
*/
@ApiModelProperty("签报类型(DJ-定价方案/XB-询比价销售方案/XS-双边协商谈判销售方案/YY-应邀报价销售方案/JP-竞拍销售方案/SJ-商机)")
@Trans(type = TransType.DIC, id = "2001500486723887105")
@Trans(type = TransType.DIC, id = "2001500486723887105", transToFieldName = "typeName")
private String typeCode;
private String typeName;
/**
* 编号(自动生成)
*/
@ -39,14 +43,16 @@ public class LngApproPageVo {
* 密级(1-加密/9-普通)
*/
@ApiModelProperty("密级(1-加密/9-普通)")
@Trans(type = TransType.DIC, id = "2001501242533273602")
@Trans(type = TransType.DIC, id = "2001501242533273602", transToFieldName = "securityName")
private String securityCode;
private String securityName;
/**
* 缓急(1-特急/2-紧急/9-普通)
*/
@ApiModelProperty("缓急(1-特急/2-紧急/9-普通)")
@Trans(type = TransType.DIC, id = "2001501562994876418")
@Trans(type = TransType.DIC, id = "2001501562994876418", transToFieldName = "urgencyName")
private String urgencyCode;
private String urgencyName;
/**
* 内容摘要
*/
@ -56,23 +62,40 @@ public class LngApproPageVo {
* 拟稿日期
*/
@ApiModelProperty("拟稿日期")
@Trans(type = TransType.API, id = "93d735dcb7364a0f8102188ec4d77ac7")
private String 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;
/**
* 审批状态(未提交/审批中/已审批/已驳回)
*/
@ApiModelProperty("审批状态(未提交/审批中/已审批/已驳回)")
@Trans(type = TransType.DIC, id = "1990669393069129729")
@Trans(type = TransType.DIC, id = "1990669393069129729", transToFieldName = "approName")
private String approCode;
private String approName;
/**
* lngFileUpload
*/
@ApiModelProperty("lngFileUpload子表")
private List<LngFileUploadVo> lngFileUploadList;
}

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

@ -30,6 +30,12 @@ public class LngApproVo {
*/
@ApiModelProperty("签报类型(DJ-定价方案/XB-询比价销售方案/XS-双边协商谈判销售方案/YY-应邀报价销售方案/JP-竞拍销售方案/SJ-商机)")
private String typeCode;
/**
* 签报类型描述
*/
@ApiModelProperty("签报类型描述")
private String typeName;
/**