Merge branch 'dev' of http://47.94.165.164:13000/geg-gas/geg-gas-pcitc into dev
This commit is contained in:
@ -0,0 +1,50 @@
|
||||
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;
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* @title: 客户组
|
||||
* @Author 管理员
|
||||
* @Date: 2025-12-16
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Data
|
||||
@LogTable(source="lng_customer_group_customer",name="客户组")
|
||||
public class AddLngCustomerGroupCustomerDto implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 组编码
|
||||
*/
|
||||
@ApiModelProperty("组编码")
|
||||
@LogField(name="组编码",index=0)
|
||||
private String grpCode;
|
||||
/**
|
||||
* 客户编码
|
||||
*/
|
||||
@ApiModelProperty("客户编码")
|
||||
@LogField(name="客户编码",index=0)
|
||||
private String cuCode;
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@ApiModelProperty("备注")
|
||||
@LogField(name="备注",index=0)
|
||||
private String note;
|
||||
/**
|
||||
* 租户id
|
||||
*/
|
||||
@ApiModelProperty("租户id")
|
||||
@LogField(name="租户id",index=0)
|
||||
private Long tenantId;
|
||||
|
||||
}
|
||||
@ -0,0 +1,77 @@
|
||||
package com.xjrsoft.module.sales.dto;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
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.LocalDateTime;
|
||||
import java.util.List;
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* @title: 客户组
|
||||
* @Author 管理员
|
||||
* @Date: 2025-12-16
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Data
|
||||
@LogTable(source="lng_customer_group",name="客户组")
|
||||
public class AddLngCustomerGroupDto implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 组编码(按类型自动编码)
|
||||
*/
|
||||
@ApiModelProperty("组编码(按类型自动编码)")
|
||||
@LogField(name="组编码(按类型自动编码)",index=0)
|
||||
private String grpCode;
|
||||
/**
|
||||
* 组说明
|
||||
*/
|
||||
@ApiModelProperty("组说明")
|
||||
@LogField(name="组说明",index=0)
|
||||
private String grpName;
|
||||
/**
|
||||
* 类型(GD-挂单销售,JP-竞拍销售,JS-批量结算,YX-营销优惠活动,DX-客户定向销售)
|
||||
*/
|
||||
@ApiModelProperty("类型(GD-挂单销售,JP-竞拍销售,JS-批量结算,YX-营销优惠活动,DX-客户定向销售)")
|
||||
@LogField(name="类型(GD-挂单销售,JP-竞拍销售,JS-批量结算,YX-营销优惠活动,DX-客户定向销售)",index=0)
|
||||
private String typeCode;
|
||||
/**
|
||||
* 起始日期
|
||||
*/
|
||||
@ApiModelProperty("起始日期")
|
||||
@LogField(name="起始日期",index=0)
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private LocalDateTime dateFrom;
|
||||
/**
|
||||
* 结束日期
|
||||
*/
|
||||
@ApiModelProperty("结束日期")
|
||||
@LogField(name="结束日期",index=0)
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private LocalDateTime dateTo;
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@ApiModelProperty("备注")
|
||||
@LogField(name="备注",index=0)
|
||||
private String note;
|
||||
/**
|
||||
* 租户id
|
||||
*/
|
||||
@ApiModelProperty("租户id")
|
||||
@LogField(name="租户id",index=0)
|
||||
private Long tenantId;
|
||||
|
||||
/**
|
||||
* lngCustomerGroupCustomer
|
||||
*/
|
||||
@ApiModelProperty("lngCustomerGroupCustomer子表")
|
||||
private List<AddLngCustomerGroupCustomerDto> lngCustomerGroupCustomerList;
|
||||
}
|
||||
@ -0,0 +1,69 @@
|
||||
package com.xjrsoft.module.sales.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-12-16
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
public class LngCustomerGroupPageDto extends PageInput {
|
||||
|
||||
/**
|
||||
* 组编码(按类型自动编码)
|
||||
*/
|
||||
@ApiModelProperty("组编码(按类型自动编码)")
|
||||
private String grpCode;
|
||||
/**
|
||||
* 类型(GD-挂单销售,JP-竞拍销售,JS-批量结算,YX-营销优惠活动,DX-客户定向销售)
|
||||
*/
|
||||
@ApiModelProperty("类型(GD-挂单销售,JP-竞拍销售,JS-批量结算,YX-营销优惠活动,DX-客户定向销售)")
|
||||
private String typeCode;
|
||||
/**
|
||||
* 起始日期字段开始时间
|
||||
*/
|
||||
@ApiModelProperty("起始日期字段开始时间")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private LocalDateTime dateFromStart;
|
||||
/**
|
||||
* 起始日期字段结束时间
|
||||
*/
|
||||
@ApiModelProperty("起始日期字段结束时间")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private LocalDateTime dateFromEnd;
|
||||
/**
|
||||
* 结束日期字段开始时间
|
||||
*/
|
||||
@ApiModelProperty("结束日期字段开始时间")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private LocalDateTime dateToStart;
|
||||
/**
|
||||
* 结束日期字段结束时间
|
||||
*/
|
||||
@ApiModelProperty("结束日期字段结束时间")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private LocalDateTime dateToEnd;
|
||||
/**
|
||||
* 组说明
|
||||
*/
|
||||
@ApiModelProperty("组说明")
|
||||
private String grpName;
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@ApiModelProperty("备注")
|
||||
private String note;
|
||||
|
||||
}
|
||||
@ -0,0 +1,67 @@
|
||||
package com.xjrsoft.module.sales.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: 客户组
|
||||
* @Author 管理员
|
||||
* @Date: 2025-12-16
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Data
|
||||
@LogTable(source="lng_customer_group_customer",name="客户组")
|
||||
public class UpdateLngCustomerGroupCustomerDto implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
@LogField(name="主键",index=0)
|
||||
@ApiModelProperty("主键")
|
||||
private String id;
|
||||
/**
|
||||
* 组编码
|
||||
*/
|
||||
@LogField(name="组编码",index=1)
|
||||
@ApiModelProperty("组编码")
|
||||
private String grpCode;
|
||||
/**
|
||||
* 客户编码
|
||||
*/
|
||||
@LogField(name="客户编码",index=2)
|
||||
@ApiModelProperty("客户编码")
|
||||
private String cuCode;
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@LogField(name="备注",index=3)
|
||||
@ApiModelProperty("备注")
|
||||
private String note;
|
||||
/**
|
||||
* 租户id
|
||||
*/
|
||||
@LogField(name="租户id",index=4)
|
||||
@ApiModelProperty("租户id")
|
||||
private Long tenantId;
|
||||
|
||||
}
|
||||
@ -0,0 +1,87 @@
|
||||
package com.xjrsoft.module.sales.dto;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.pictc.annotations.datalog.*;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* @title: 客户组
|
||||
* @Author 管理员
|
||||
* @Date: 2025-12-16
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Data
|
||||
@LogTable(source="lng_customer_group",name="客户组")
|
||||
public class UpdateLngCustomerGroupDto implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
@LogField(name="主键",index=0)
|
||||
@ApiModelProperty("主键")
|
||||
private Long id;
|
||||
/**
|
||||
* 组编码(按类型自动编码)
|
||||
*/
|
||||
@LogField(name="组编码(按类型自动编码)",index=1)
|
||||
@ApiModelProperty("组编码(按类型自动编码)")
|
||||
private String grpCode;
|
||||
/**
|
||||
* 组说明
|
||||
*/
|
||||
@LogField(name="组说明",index=2)
|
||||
@ApiModelProperty("组说明")
|
||||
private String grpName;
|
||||
/**
|
||||
* 类型(GD-挂单销售,JP-竞拍销售,JS-批量结算,YX-营销优惠活动,DX-客户定向销售)
|
||||
*/
|
||||
@LogField(name="类型(GD-挂单销售,JP-竞拍销售,JS-批量结算,YX-营销优惠活动,DX-客户定向销售)",index=3)
|
||||
@ApiModelProperty("类型(GD-挂单销售,JP-竞拍销售,JS-批量结算,YX-营销优惠活动,DX-客户定向销售)")
|
||||
private String typeCode;
|
||||
/**
|
||||
* 起始日期
|
||||
*/
|
||||
@LogField(name="起始日期",index=4)
|
||||
@ApiModelProperty("起始日期")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private LocalDateTime dateFrom;
|
||||
/**
|
||||
* 结束日期
|
||||
*/
|
||||
@LogField(name="结束日期",index=5)
|
||||
@ApiModelProperty("结束日期")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private LocalDateTime dateTo;
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@LogField(name="备注",index=6)
|
||||
@ApiModelProperty("备注")
|
||||
private String note;
|
||||
/**
|
||||
* 租户id
|
||||
*/
|
||||
@LogField(name="租户id",index=7)
|
||||
@ApiModelProperty("租户id")
|
||||
private Long tenantId;
|
||||
|
||||
/**
|
||||
* lngCustomerGroupCustomer
|
||||
*/
|
||||
@ApiModelProperty("lngCustomerGroupCustomer子表")
|
||||
@LogJoin(name = "lngCustomerGroupCustomer子表",
|
||||
columns = {
|
||||
@LogJoinColumn(field = "grpCode",relatedField = "grpCode", valueDirection = ValueDirectionType.RIGHT)
|
||||
},
|
||||
caseType = JoinCaseType.FULL, target = UpdateLngCustomerGroupCustomerDto.class, type = JoinType.MANY)
|
||||
private List<UpdateLngCustomerGroupCustomerDto> lngCustomerGroupCustomerList;
|
||||
}
|
||||
@ -0,0 +1,78 @@
|
||||
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: 表单出参
|
||||
* @Author 管理员
|
||||
* @Date: 2025-12-16
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Data
|
||||
public class LngCustomerGroupCustomerVo {
|
||||
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
@ApiModelProperty("主键")
|
||||
private String id;
|
||||
/**
|
||||
* 组编码
|
||||
*/
|
||||
@ApiModelProperty("组编码")
|
||||
private String grpCode;
|
||||
/**
|
||||
* 客户编码
|
||||
*/
|
||||
@ApiModelProperty("客户编码")
|
||||
private String cuCode;
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@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;
|
||||
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,61 @@
|
||||
package com.xjrsoft.module.sales.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-12-16
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Data
|
||||
public class LngCustomerGroupPageVo {
|
||||
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
@ApiModelProperty("主键")
|
||||
private String id;
|
||||
/**
|
||||
* 组编码(按类型自动编码)
|
||||
*/
|
||||
@ApiModelProperty("组编码(按类型自动编码)")
|
||||
private String grpCode;
|
||||
/**
|
||||
* 组说明
|
||||
*/
|
||||
@ApiModelProperty("组说明")
|
||||
private String grpName;
|
||||
/**
|
||||
* 类型(GD-挂单销售,JP-竞拍销售,JS-批量结算,YX-营销优惠活动,DX-客户定向销售)
|
||||
*/
|
||||
@ApiModelProperty("类型(GD-挂单销售,JP-竞拍销售,JS-批量结算,YX-营销优惠活动,DX-客户定向销售)")
|
||||
@Trans(type = TransType.DIC, id = "1990241330091048961")
|
||||
private String typeCode;
|
||||
/**
|
||||
* 起始日期
|
||||
*/
|
||||
@ApiModelProperty("起始日期")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private LocalDateTime dateFrom;
|
||||
/**
|
||||
* 结束日期
|
||||
*/
|
||||
@ApiModelProperty("结束日期")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private LocalDateTime dateTo;
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@ApiModelProperty("备注")
|
||||
private String note;
|
||||
|
||||
}
|
||||
@ -0,0 +1,96 @@
|
||||
package com.xjrsoft.module.sales.vo;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @title: 表单出参
|
||||
* @Author 管理员
|
||||
* @Date: 2025-12-16
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Data
|
||||
public class LngCustomerGroupVo {
|
||||
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
@ApiModelProperty("主键")
|
||||
private Long id;
|
||||
/**
|
||||
* 组编码(按类型自动编码)
|
||||
*/
|
||||
@ApiModelProperty("组编码(按类型自动编码)")
|
||||
private String grpCode;
|
||||
/**
|
||||
* 组说明
|
||||
*/
|
||||
@ApiModelProperty("组说明")
|
||||
private String grpName;
|
||||
/**
|
||||
* 类型(GD-挂单销售,JP-竞拍销售,JS-批量结算,YX-营销优惠活动,DX-客户定向销售)
|
||||
*/
|
||||
@ApiModelProperty("类型(GD-挂单销售,JP-竞拍销售,JS-批量结算,YX-营销优惠活动,DX-客户定向销售)")
|
||||
private String typeCode;
|
||||
/**
|
||||
* 起始日期
|
||||
*/
|
||||
@ApiModelProperty("起始日期")
|
||||
private LocalDateTime dateFrom;
|
||||
/**
|
||||
* 结束日期
|
||||
*/
|
||||
@ApiModelProperty("结束日期")
|
||||
private LocalDateTime dateTo;
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@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;
|
||||
|
||||
|
||||
/**
|
||||
* lngCustomerGroupCustomer
|
||||
*/
|
||||
@ApiModelProperty("lngCustomerGroupCustomer子表")
|
||||
private List<LngCustomerGroupCustomerVo> lngCustomerGroupCustomerList;
|
||||
|
||||
}
|
||||
@ -1,5 +1,7 @@
|
||||
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;
|
||||
|
||||
@ -46,8 +48,15 @@ public class LngGradeSystemItemVo {
|
||||
* 评价部门编码
|
||||
*/
|
||||
@ApiModelProperty("评价部门编码")
|
||||
@Trans(type = TransType.DEPT, labelField = "eDeptName")
|
||||
private String eDeptCode;
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 评价部门编码
|
||||
*/
|
||||
@ApiModelProperty("评价部门名称")
|
||||
private String eDeptName;
|
||||
|
||||
/**
|
||||
* 显示顺序
|
||||
|
||||
@ -0,0 +1,64 @@
|
||||
package com.xjrsoft.module.supplier.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;
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* @title: 供应商
|
||||
* @Author 管理员
|
||||
* @Date: 2025-12-15
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Data
|
||||
public class AddLngSupplierBankDto implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 供应商编码
|
||||
*/
|
||||
@ApiModelProperty("供应商编码")
|
||||
private String suCode;
|
||||
/**
|
||||
* 银行
|
||||
*/
|
||||
@ApiModelProperty("银行")
|
||||
private String bankCode;
|
||||
/**
|
||||
* 账号名称
|
||||
*/
|
||||
@ApiModelProperty("账号名称")
|
||||
private String accountName;
|
||||
/**
|
||||
* 账号
|
||||
*/
|
||||
@ApiModelProperty("账号")
|
||||
private String account;
|
||||
/**
|
||||
* 默认账号(Y-是,N-否;只能有一个Y的有效记录)
|
||||
*/
|
||||
@ApiModelProperty("默认账号(Y-是,N-否;只能有一个Y的有效记录)")
|
||||
private String defaultSign;
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@ApiModelProperty("备注")
|
||||
private String note;
|
||||
/**
|
||||
* 租户id
|
||||
*/
|
||||
@ApiModelProperty("租户id")
|
||||
private Long tenantId;
|
||||
|
||||
}
|
||||
@ -0,0 +1,74 @@
|
||||
package com.xjrsoft.module.supplier.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;
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* @title: 供应商
|
||||
* @Author 管理员
|
||||
* @Date: 2025-12-15
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Data
|
||||
public class AddLngSupplierContactDto implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 供应商编码
|
||||
*/
|
||||
@ApiModelProperty("供应商编码")
|
||||
private String suCode;
|
||||
/**
|
||||
* 姓名
|
||||
*/
|
||||
@ApiModelProperty("姓名")
|
||||
private String contactName;
|
||||
/**
|
||||
* 联系电话
|
||||
*/
|
||||
@ApiModelProperty("联系电话")
|
||||
private String tel;
|
||||
/**
|
||||
* 通讯地址
|
||||
*/
|
||||
@ApiModelProperty("通讯地址")
|
||||
private String addrMail;
|
||||
/**
|
||||
* 电子邮箱
|
||||
*/
|
||||
@ApiModelProperty("电子邮箱")
|
||||
private String email;
|
||||
/**
|
||||
* 职位
|
||||
*/
|
||||
@ApiModelProperty("职位")
|
||||
private String position;
|
||||
/**
|
||||
* 有效标志(Y-有效,N-无效)
|
||||
*/
|
||||
@ApiModelProperty("有效标志(Y-有效,N-无效)")
|
||||
private String valid;
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@ApiModelProperty("备注")
|
||||
private String note;
|
||||
/**
|
||||
* 租户id
|
||||
*/
|
||||
@ApiModelProperty("租户id")
|
||||
private Long tenantId;
|
||||
|
||||
}
|
||||
@ -0,0 +1,74 @@
|
||||
package com.xjrsoft.module.supplier.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;
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* @title: 供应商
|
||||
* @Author 管理员
|
||||
* @Date: 2025-12-15
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Data
|
||||
public class AddLngSupplierDocDto implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 供应商编码
|
||||
*/
|
||||
@ApiModelProperty("供应商编码")
|
||||
private String suCode;
|
||||
/**
|
||||
* 资质证书类型
|
||||
*/
|
||||
@ApiModelProperty("资质证书类型")
|
||||
private String docTypeCode;
|
||||
/**
|
||||
* 资质证书编号
|
||||
*/
|
||||
@ApiModelProperty("资质证书编号")
|
||||
private String docNo;
|
||||
/**
|
||||
* 有效期开始
|
||||
*/
|
||||
@ApiModelProperty("有效期开始")
|
||||
private LocalDateTime dateFrom;
|
||||
/**
|
||||
* 有效期结束
|
||||
*/
|
||||
@ApiModelProperty("有效期结束")
|
||||
private LocalDateTime dateTo;
|
||||
/**
|
||||
* 显示顺序
|
||||
*/
|
||||
@ApiModelProperty("显示顺序")
|
||||
private Short sort;
|
||||
/**
|
||||
* 有效标志(Y-有效,N-无效)
|
||||
*/
|
||||
@ApiModelProperty("有效标志(Y-有效,N-无效)")
|
||||
private String valid;
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@ApiModelProperty("备注")
|
||||
private String note;
|
||||
/**
|
||||
* 租户id
|
||||
*/
|
||||
@ApiModelProperty("租户id")
|
||||
private Long tenantId;
|
||||
|
||||
}
|
||||
@ -0,0 +1,149 @@
|
||||
package com.xjrsoft.module.supplier.dto;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* @title: 供应商
|
||||
* @Author 管理员
|
||||
* @Date: 2025-12-15
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Data
|
||||
public class AddLngSupplierDto implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 集团编码
|
||||
*/
|
||||
@ApiModelProperty("集团编码")
|
||||
private String suMcode;
|
||||
/**
|
||||
* 供应商编码(不能重复,以S开头)
|
||||
*/
|
||||
@ApiModelProperty("供应商编码(不能重复,以S开头)")
|
||||
private String suCode;
|
||||
/**
|
||||
* 供应商名称(不能与名称、简称重复)
|
||||
*/
|
||||
@ApiModelProperty("供应商名称(不能与名称、简称重复)")
|
||||
private String suName;
|
||||
/**
|
||||
* 简称(不能与名称、简称重复)
|
||||
*/
|
||||
@ApiModelProperty("简称(不能与名称、简称重复)")
|
||||
private String suSname;
|
||||
/**
|
||||
* 国际/国内(I-国际,D-国内)
|
||||
*/
|
||||
@ApiModelProperty("国际/国内(I-国际,D-国内)")
|
||||
private String dI;
|
||||
/**
|
||||
* 企业性质(国有企业/非国有企业)
|
||||
*/
|
||||
@ApiModelProperty("企业性质(国有企业/非国有企业)")
|
||||
private String natureCode;
|
||||
/**
|
||||
* 母公司名称
|
||||
*/
|
||||
@ApiModelProperty("母公司名称")
|
||||
private String parentName;
|
||||
/**
|
||||
* 统一社会信用代码(非空时不可重复)
|
||||
*/
|
||||
@ApiModelProperty("统一社会信用代码(非空时不可重复)")
|
||||
private String creditNo;
|
||||
/**
|
||||
* 纳税人识别号(非空时不可重复)
|
||||
*/
|
||||
@ApiModelProperty("纳税人识别号(非空时不可重复)")
|
||||
private String tiNo;
|
||||
/**
|
||||
* 法定代表人
|
||||
*/
|
||||
@ApiModelProperty("法定代表人")
|
||||
private String representative;
|
||||
/**
|
||||
* 注册资本(万元)
|
||||
*/
|
||||
@ApiModelProperty("注册资本(万元)")
|
||||
private String amtReg;
|
||||
/**
|
||||
* 注册地址
|
||||
*/
|
||||
@ApiModelProperty("注册地址")
|
||||
private String addrReg;
|
||||
/**
|
||||
* 通讯地址
|
||||
*/
|
||||
@ApiModelProperty("通讯地址")
|
||||
private String addrMail;
|
||||
/**
|
||||
* 成立日期
|
||||
*/
|
||||
@ApiModelProperty("成立日期")
|
||||
private LocalDateTime dateEstab;
|
||||
/**
|
||||
* 准入时间
|
||||
*/
|
||||
@ApiModelProperty("准入时间")
|
||||
private LocalDateTime dateEntry;
|
||||
/**
|
||||
* 供应商分类(一类/二类)
|
||||
*/
|
||||
@ApiModelProperty("供应商分类(一类/二类)")
|
||||
private String classCode;
|
||||
/**
|
||||
* 供应商类别(资源方/贸易商/托运商/接收站/多领域)
|
||||
*/
|
||||
@ApiModelProperty("供应商类别(资源方/贸易商/托运商/接收站/多领域)")
|
||||
private String typeCode;
|
||||
/**
|
||||
* 组织架构编码
|
||||
*/
|
||||
@ApiModelProperty("组织架构编码")
|
||||
private String orgCode;
|
||||
/**
|
||||
* 有效标志(Y-有效,N-无效)
|
||||
*/
|
||||
@ApiModelProperty("有效标志(Y-有效,N-无效)")
|
||||
private String valid;
|
||||
/**
|
||||
* 状态(未提交/审批中/已审批/已驳回)
|
||||
*/
|
||||
@ApiModelProperty("状态(未提交/审批中/已审批/已驳回)")
|
||||
private String approCode;
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@ApiModelProperty("备注")
|
||||
private String note;
|
||||
/**
|
||||
* 租户id
|
||||
*/
|
||||
@ApiModelProperty("租户id")
|
||||
private Long tenantId;
|
||||
|
||||
/**
|
||||
* lngSupplierBank
|
||||
*/
|
||||
@ApiModelProperty("lngSupplierBank子表")
|
||||
private List<AddLngSupplierBankDto> lngSupplierBankList;
|
||||
/**
|
||||
* lngSupplierContact
|
||||
*/
|
||||
@ApiModelProperty("lngSupplierContact子表")
|
||||
private List<AddLngSupplierContactDto> lngSupplierContactList;
|
||||
/**
|
||||
* lngSupplierDoc
|
||||
*/
|
||||
@ApiModelProperty("lngSupplierDoc子表")
|
||||
private List<AddLngSupplierDocDto> lngSupplierDocList;
|
||||
}
|
||||
@ -0,0 +1,65 @@
|
||||
package com.xjrsoft.module.supplier.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-12-15
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
public class LngSupplierPageDto extends PageInput {
|
||||
|
||||
/**
|
||||
* 供应商名称(不能与名称、简称重复)
|
||||
*/
|
||||
@ApiModelProperty("供应商名称(不能与名称、简称重复)")
|
||||
private String suName;
|
||||
/**
|
||||
* 简称(不能与名称、简称重复)
|
||||
*/
|
||||
@ApiModelProperty("简称(不能与名称、简称重复)")
|
||||
private String suSname;
|
||||
/**
|
||||
* 企业性质(国有企业/非国有企业)
|
||||
*/
|
||||
@ApiModelProperty("企业性质(国有企业/非国有企业)")
|
||||
private String natureCode;
|
||||
/**
|
||||
* 供应商类别(资源方/贸易商/托运商/接收站/多领域)
|
||||
*/
|
||||
@ApiModelProperty("供应商类别(资源方/贸易商/托运商/接收站/多领域)")
|
||||
private String typeCode;
|
||||
/**
|
||||
* 供应商分类(一类/二类)
|
||||
*/
|
||||
@ApiModelProperty("供应商分类(一类/二类)")
|
||||
private String classCode;
|
||||
/**
|
||||
* 国际/国内(I-国际,D-国内)
|
||||
*/
|
||||
@ApiModelProperty("国际/国内(I-国际,D-国内)")
|
||||
private String dI;
|
||||
/**
|
||||
* 有效标志(Y-有效,N-无效)
|
||||
*/
|
||||
@ApiModelProperty("有效标志(Y-有效,N-无效)")
|
||||
private String valid;
|
||||
/**
|
||||
* 状态(未提交/审批中/已审批/已驳回)
|
||||
*/
|
||||
@ApiModelProperty("状态(未提交/审批中/已审批/已驳回)")
|
||||
private String approCode;
|
||||
|
||||
}
|
||||
@ -0,0 +1,93 @@
|
||||
package com.xjrsoft.module.supplier.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: 供应商
|
||||
* @Author 管理员
|
||||
* @Date: 2025-12-15
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Data
|
||||
@LogTable(source="lng_supplier_bank",name="供应商")
|
||||
public class UpdateLngSupplierBankDto implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
@LogField(name="主键",index=0)
|
||||
@ApiModelProperty("主键")
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 供应商编码
|
||||
*/
|
||||
@LogField(name="供应商编码",index=1)
|
||||
@ApiModelProperty("供应商编码")
|
||||
private String suCode;
|
||||
|
||||
/**
|
||||
* 银行
|
||||
*/
|
||||
@LogField(name="银行",index=2)
|
||||
@ApiModelProperty("银行")
|
||||
private String bankCode;
|
||||
|
||||
/**
|
||||
* 账号名称
|
||||
*/
|
||||
@LogField(name="账号名称",index=3)
|
||||
@ApiModelProperty("账号名称")
|
||||
private String accountName;
|
||||
|
||||
/**
|
||||
* 账号
|
||||
*/
|
||||
@LogField(name="账号",index=4)
|
||||
@ApiModelProperty("账号")
|
||||
private String account;
|
||||
|
||||
/**
|
||||
* 默认账号(Y-是,N-否;只能有一个Y的有效记录)
|
||||
*/
|
||||
@LogField(name="默认账号(Y-是,N-否;只能有一个Y的有效记录)",index=5)
|
||||
@ApiModelProperty("默认账号(Y-是,N-否;只能有一个Y的有效记录)")
|
||||
private String defaultSign;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@LogField(name="备注",index=6)
|
||||
@ApiModelProperty("备注")
|
||||
private String note;
|
||||
|
||||
/**
|
||||
* 租户id
|
||||
*/
|
||||
@LogField(name="租户id",index=7)
|
||||
@ApiModelProperty("租户id")
|
||||
private Long tenantId;
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,107 @@
|
||||
package com.xjrsoft.module.supplier.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: 供应商
|
||||
* @Author 管理员
|
||||
* @Date: 2025-12-15
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Data
|
||||
@LogTable(source="lng_supplier_contact",name="供应商")
|
||||
public class UpdateLngSupplierContactDto implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
@LogField(name="主键",index=0)
|
||||
@ApiModelProperty("主键")
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 供应商编码
|
||||
*/
|
||||
@LogField(name="供应商编码",index=1)
|
||||
@ApiModelProperty("供应商编码")
|
||||
private String suCode;
|
||||
|
||||
/**
|
||||
* 姓名
|
||||
*/
|
||||
@LogField(name="姓名",index=2)
|
||||
@ApiModelProperty("姓名")
|
||||
private String contactName;
|
||||
|
||||
/**
|
||||
* 联系电话
|
||||
*/
|
||||
@LogField(name="联系电话",index=3)
|
||||
@ApiModelProperty("联系电话")
|
||||
private String tel;
|
||||
|
||||
/**
|
||||
* 通讯地址
|
||||
*/
|
||||
@LogField(name="通讯地址",index=4)
|
||||
@ApiModelProperty("通讯地址")
|
||||
private String addrMail;
|
||||
|
||||
/**
|
||||
* 电子邮箱
|
||||
*/
|
||||
@LogField(name="电子邮箱",index=5)
|
||||
@ApiModelProperty("电子邮箱")
|
||||
private String email;
|
||||
|
||||
/**
|
||||
* 职位
|
||||
*/
|
||||
@LogField(name="职位",index=6)
|
||||
@ApiModelProperty("职位")
|
||||
private String position;
|
||||
|
||||
/**
|
||||
* 有效标志(Y-有效,N-无效)
|
||||
*/
|
||||
@LogField(name="有效标志(Y-有效,N-无效)",index=7)
|
||||
@ApiModelProperty("有效标志(Y-有效,N-无效)")
|
||||
private String valid;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@LogField(name="备注",index=8)
|
||||
@ApiModelProperty("备注")
|
||||
private String note;
|
||||
|
||||
/**
|
||||
* 租户id
|
||||
*/
|
||||
@LogField(name="租户id",index=9)
|
||||
@ApiModelProperty("租户id")
|
||||
private Long tenantId;
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,107 @@
|
||||
package com.xjrsoft.module.supplier.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: 供应商
|
||||
* @Author 管理员
|
||||
* @Date: 2025-12-15
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Data
|
||||
@LogTable(source="lng_supplier_doc",name="供应商")
|
||||
public class UpdateLngSupplierDocDto implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
@LogField(name="主键",index=0)
|
||||
@ApiModelProperty("主键")
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 供应商编码
|
||||
*/
|
||||
@LogField(name="供应商编码",index=1)
|
||||
@ApiModelProperty("供应商编码")
|
||||
private String suCode;
|
||||
|
||||
/**
|
||||
* 资质证书类型
|
||||
*/
|
||||
@LogField(name="资质证书类型",index=2)
|
||||
@ApiModelProperty("资质证书类型")
|
||||
private String docTypeCode;
|
||||
|
||||
/**
|
||||
* 资质证书编号
|
||||
*/
|
||||
@LogField(name="资质证书编号",index=3)
|
||||
@ApiModelProperty("资质证书编号")
|
||||
private String docNo;
|
||||
|
||||
/**
|
||||
* 有效期开始
|
||||
*/
|
||||
@LogField(name="有效期开始",index=4)
|
||||
@ApiModelProperty("有效期开始")
|
||||
private LocalDateTime dateFrom;
|
||||
|
||||
/**
|
||||
* 有效期结束
|
||||
*/
|
||||
@LogField(name="有效期结束",index=5)
|
||||
@ApiModelProperty("有效期结束")
|
||||
private LocalDateTime dateTo;
|
||||
|
||||
/**
|
||||
* 显示顺序
|
||||
*/
|
||||
@LogField(name="显示顺序",index=6)
|
||||
@ApiModelProperty("显示顺序")
|
||||
private Short sort;
|
||||
|
||||
/**
|
||||
* 有效标志(Y-有效,N-无效)
|
||||
*/
|
||||
@LogField(name="有效标志(Y-有效,N-无效)",index=7)
|
||||
@ApiModelProperty("有效标志(Y-有效,N-无效)")
|
||||
private String valid;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@LogField(name="备注",index=8)
|
||||
@ApiModelProperty("备注")
|
||||
private String note;
|
||||
|
||||
/**
|
||||
* 租户id
|
||||
*/
|
||||
@LogField(name="租户id",index=9)
|
||||
@ApiModelProperty("租户id")
|
||||
private Long tenantId;
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,224 @@
|
||||
package com.xjrsoft.module.supplier.dto;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
|
||||
import com.pictc.annotations.datalog.JoinCaseType;
|
||||
import com.pictc.annotations.datalog.JoinType;
|
||||
import com.pictc.annotations.datalog.LogField;
|
||||
import com.pictc.annotations.datalog.LogJoin;
|
||||
import com.pictc.annotations.datalog.LogJoinColumn;
|
||||
import com.pictc.annotations.datalog.LogTable;
|
||||
import com.pictc.annotations.datalog.ValueDirectionType;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* @title: 供应商
|
||||
* @Author 管理员
|
||||
* @Date: 2025-12-15
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Data
|
||||
@LogTable(source="lng_supplier",name="供应商")
|
||||
public class UpdateLngSupplierDto implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
@LogField(name="主键",index=0)
|
||||
@ApiModelProperty("主键")
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 集团编码
|
||||
*/
|
||||
@LogField(name="集团编码",index=1)
|
||||
@ApiModelProperty("集团编码")
|
||||
private String suMcode;
|
||||
|
||||
/**
|
||||
* 供应商编码(不能重复,以S开头)
|
||||
*/
|
||||
@LogField(name="供应商编码(不能重复,以S开头)",index=2)
|
||||
@ApiModelProperty("供应商编码(不能重复,以S开头)")
|
||||
private String suCode;
|
||||
|
||||
/**
|
||||
* 供应商名称(不能与名称、简称重复)
|
||||
*/
|
||||
@LogField(name="供应商名称(不能与名称、简称重复)",index=3)
|
||||
@ApiModelProperty("供应商名称(不能与名称、简称重复)")
|
||||
private String suName;
|
||||
|
||||
/**
|
||||
* 简称(不能与名称、简称重复)
|
||||
*/
|
||||
@LogField(name="简称(不能与名称、简称重复)",index=4)
|
||||
@ApiModelProperty("简称(不能与名称、简称重复)")
|
||||
private String suSname;
|
||||
|
||||
/**
|
||||
* 国际/国内(I-国际,D-国内)
|
||||
*/
|
||||
@LogField(name="国际/国内(I-国际,D-国内)",index=5)
|
||||
@ApiModelProperty("国际/国内(I-国际,D-国内)")
|
||||
private String dI;
|
||||
|
||||
/**
|
||||
* 企业性质(国有企业/非国有企业)
|
||||
*/
|
||||
@LogField(name="企业性质(国有企业/非国有企业)",index=6)
|
||||
@ApiModelProperty("企业性质(国有企业/非国有企业)")
|
||||
private String natureCode;
|
||||
|
||||
/**
|
||||
* 母公司名称
|
||||
*/
|
||||
@LogField(name="母公司名称",index=7)
|
||||
@ApiModelProperty("母公司名称")
|
||||
private String parentName;
|
||||
|
||||
/**
|
||||
* 统一社会信用代码(非空时不可重复)
|
||||
*/
|
||||
@LogField(name="统一社会信用代码(非空时不可重复)",index=8)
|
||||
@ApiModelProperty("统一社会信用代码(非空时不可重复)")
|
||||
private String creditNo;
|
||||
|
||||
/**
|
||||
* 纳税人识别号(非空时不可重复)
|
||||
*/
|
||||
@LogField(name="纳税人识别号(非空时不可重复)",index=9)
|
||||
@ApiModelProperty("纳税人识别号(非空时不可重复)")
|
||||
private String tiNo;
|
||||
|
||||
/**
|
||||
* 法定代表人
|
||||
*/
|
||||
@LogField(name="法定代表人",index=10)
|
||||
@ApiModelProperty("法定代表人")
|
||||
private String representative;
|
||||
|
||||
/**
|
||||
* 注册资本(万元)
|
||||
*/
|
||||
@LogField(name="注册资本(万元)",index=11)
|
||||
@ApiModelProperty("注册资本(万元)")
|
||||
private String amtReg;
|
||||
|
||||
/**
|
||||
* 注册地址
|
||||
*/
|
||||
@LogField(name="注册地址",index=12)
|
||||
@ApiModelProperty("注册地址")
|
||||
private String addrReg;
|
||||
|
||||
/**
|
||||
* 通讯地址
|
||||
*/
|
||||
@LogField(name="通讯地址",index=13)
|
||||
@ApiModelProperty("通讯地址")
|
||||
private String addrMail;
|
||||
|
||||
/**
|
||||
* 成立日期
|
||||
*/
|
||||
@LogField(name="成立日期",index=14)
|
||||
@ApiModelProperty("成立日期")
|
||||
private LocalDateTime dateEstab;
|
||||
|
||||
/**
|
||||
* 准入时间
|
||||
*/
|
||||
@LogField(name="准入时间",index=15)
|
||||
@ApiModelProperty("准入时间")
|
||||
private LocalDateTime dateEntry;
|
||||
|
||||
/**
|
||||
* 供应商分类(一类/二类)
|
||||
*/
|
||||
@LogField(name="供应商分类(一类/二类)",index=16)
|
||||
@ApiModelProperty("供应商分类(一类/二类)")
|
||||
private String classCode;
|
||||
|
||||
/**
|
||||
* 供应商类别(资源方/贸易商/托运商/接收站/多领域)
|
||||
*/
|
||||
@LogField(name="供应商类别(资源方/贸易商/托运商/接收站/多领域)",index=17)
|
||||
@ApiModelProperty("供应商类别(资源方/贸易商/托运商/接收站/多领域)")
|
||||
private String typeCode;
|
||||
|
||||
/**
|
||||
* 组织架构编码
|
||||
*/
|
||||
@LogField(name="组织架构编码",index=18)
|
||||
@ApiModelProperty("组织架构编码")
|
||||
private String orgCode;
|
||||
|
||||
/**
|
||||
* 有效标志(Y-有效,N-无效)
|
||||
*/
|
||||
@LogField(name="有效标志(Y-有效,N-无效)",index=19)
|
||||
@ApiModelProperty("有效标志(Y-有效,N-无效)")
|
||||
private String valid;
|
||||
|
||||
/**
|
||||
* 状态(未提交/审批中/已审批/已驳回)
|
||||
*/
|
||||
@LogField(name="状态(未提交/审批中/已审批/已驳回)",index=20)
|
||||
@ApiModelProperty("状态(未提交/审批中/已审批/已驳回)")
|
||||
private String approCode;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@LogField(name="备注",index=21)
|
||||
@ApiModelProperty("备注")
|
||||
private String note;
|
||||
|
||||
/**
|
||||
* 租户id
|
||||
*/
|
||||
@LogField(name="租户id",index=22)
|
||||
@ApiModelProperty("租户id")
|
||||
private Long tenantId;
|
||||
|
||||
|
||||
/**
|
||||
* lngSupplierBank
|
||||
*/
|
||||
@ApiModelProperty("lngSupplierBank子表")
|
||||
@LogJoin(name = "lngSupplierBank子表",
|
||||
columns = {
|
||||
@LogJoinColumn(field = "suCode",relatedField = "suCode", valueDirection = ValueDirectionType.RIGHT)
|
||||
},
|
||||
caseType = JoinCaseType.FULL, target = UpdateLngSupplierBankDto.class, type = JoinType.MANY)
|
||||
private List<UpdateLngSupplierBankDto> lngSupplierBankList;
|
||||
/**
|
||||
* lngSupplierContact
|
||||
*/
|
||||
@ApiModelProperty("lngSupplierContact子表")
|
||||
@LogJoin(name = "lngSupplierContact子表",
|
||||
columns = {
|
||||
@LogJoinColumn(field = "suCode",relatedField = "suCode", valueDirection = ValueDirectionType.RIGHT)
|
||||
},
|
||||
caseType = JoinCaseType.FULL, target = UpdateLngSupplierContactDto.class, type = JoinType.MANY)
|
||||
private List<UpdateLngSupplierContactDto> lngSupplierContactList;
|
||||
/**
|
||||
* lngSupplierDoc
|
||||
*/
|
||||
@ApiModelProperty("lngSupplierDoc子表")
|
||||
@LogJoin(name = "lngSupplierDoc子表",
|
||||
columns = {
|
||||
@LogJoinColumn(field = "suCode",relatedField = "suCode", valueDirection = ValueDirectionType.RIGHT)
|
||||
},
|
||||
caseType = JoinCaseType.FULL, target = UpdateLngSupplierDocDto.class, type = JoinType.MANY)
|
||||
private List<UpdateLngSupplierDocDto> lngSupplierDocList;
|
||||
}
|
||||
@ -0,0 +1,121 @@
|
||||
package com.xjrsoft.module.supplier.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-12-15
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Data
|
||||
public class LngSupplierBankVo {
|
||||
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
@ApiModelProperty("主键")
|
||||
private Long id;
|
||||
|
||||
|
||||
/**
|
||||
* 供应商编码
|
||||
*/
|
||||
@ApiModelProperty("供应商编码")
|
||||
private String suCode;
|
||||
|
||||
|
||||
/**
|
||||
* 银行
|
||||
*/
|
||||
@ApiModelProperty("银行")
|
||||
private String bankCode;
|
||||
|
||||
|
||||
/**
|
||||
* 账号名称
|
||||
*/
|
||||
@ApiModelProperty("账号名称")
|
||||
private String accountName;
|
||||
|
||||
|
||||
/**
|
||||
* 账号
|
||||
*/
|
||||
@ApiModelProperty("账号")
|
||||
private String account;
|
||||
|
||||
|
||||
/**
|
||||
* 默认账号(Y-是,N-否;只能有一个Y的有效记录)
|
||||
*/
|
||||
@ApiModelProperty("默认账号(Y-是,N-否;只能有一个Y的有效记录)")
|
||||
private String defaultSign;
|
||||
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@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;
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,135 @@
|
||||
package com.xjrsoft.module.supplier.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-12-15
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Data
|
||||
public class LngSupplierContactVo {
|
||||
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
@ApiModelProperty("主键")
|
||||
private Long id;
|
||||
|
||||
|
||||
/**
|
||||
* 供应商编码
|
||||
*/
|
||||
@ApiModelProperty("供应商编码")
|
||||
private String suCode;
|
||||
|
||||
|
||||
/**
|
||||
* 姓名
|
||||
*/
|
||||
@ApiModelProperty("姓名")
|
||||
private String contactName;
|
||||
|
||||
|
||||
/**
|
||||
* 联系电话
|
||||
*/
|
||||
@ApiModelProperty("联系电话")
|
||||
private String tel;
|
||||
|
||||
|
||||
/**
|
||||
* 通讯地址
|
||||
*/
|
||||
@ApiModelProperty("通讯地址")
|
||||
private String addrMail;
|
||||
|
||||
|
||||
/**
|
||||
* 电子邮箱
|
||||
*/
|
||||
@ApiModelProperty("电子邮箱")
|
||||
private String email;
|
||||
|
||||
|
||||
/**
|
||||
* 职位
|
||||
*/
|
||||
@ApiModelProperty("职位")
|
||||
private String position;
|
||||
|
||||
|
||||
/**
|
||||
* 有效标志(Y-有效,N-无效)
|
||||
*/
|
||||
@ApiModelProperty("有效标志(Y-有效,N-无效)")
|
||||
private String valid;
|
||||
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@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;
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,135 @@
|
||||
package com.xjrsoft.module.supplier.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-12-15
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Data
|
||||
public class LngSupplierDocVo {
|
||||
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
@ApiModelProperty("主键")
|
||||
private Long id;
|
||||
|
||||
|
||||
/**
|
||||
* 供应商编码
|
||||
*/
|
||||
@ApiModelProperty("供应商编码")
|
||||
private String suCode;
|
||||
|
||||
|
||||
/**
|
||||
* 资质证书类型
|
||||
*/
|
||||
@ApiModelProperty("资质证书类型")
|
||||
private String docTypeCode;
|
||||
|
||||
|
||||
/**
|
||||
* 资质证书编号
|
||||
*/
|
||||
@ApiModelProperty("资质证书编号")
|
||||
private String docNo;
|
||||
|
||||
|
||||
/**
|
||||
* 有效期开始
|
||||
*/
|
||||
@ApiModelProperty("有效期开始")
|
||||
private LocalDateTime dateFrom;
|
||||
|
||||
|
||||
/**
|
||||
* 有效期结束
|
||||
*/
|
||||
@ApiModelProperty("有效期结束")
|
||||
private LocalDateTime dateTo;
|
||||
|
||||
|
||||
/**
|
||||
* 显示顺序
|
||||
*/
|
||||
@ApiModelProperty("显示顺序")
|
||||
private Short sort;
|
||||
|
||||
|
||||
/**
|
||||
* 有效标志(Y-有效,N-无效)
|
||||
*/
|
||||
@ApiModelProperty("有效标志(Y-有效,N-无效)")
|
||||
private String valid;
|
||||
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@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;
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,68 @@
|
||||
package com.xjrsoft.module.supplier.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-12-15
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Data
|
||||
public class LngSupplierPageVo {
|
||||
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
@ApiModelProperty("主键")
|
||||
private String id;
|
||||
/**
|
||||
* 供应商名称(不能与名称、简称重复)
|
||||
*/
|
||||
@ApiModelProperty("供应商名称(不能与名称、简称重复)")
|
||||
private String suName;
|
||||
/**
|
||||
* 简称(不能与名称、简称重复)
|
||||
*/
|
||||
@ApiModelProperty("简称(不能与名称、简称重复)")
|
||||
private String suSname;
|
||||
/**
|
||||
* 国际/国内(I-国际,D-国内)
|
||||
*/
|
||||
@ApiModelProperty("国际/国内(I-国际,D-国内)")
|
||||
private String dI;
|
||||
/**
|
||||
* 企业性质(国有企业/非国有企业)
|
||||
*/
|
||||
@ApiModelProperty("企业性质(国有企业/非国有企业)")
|
||||
private String natureCode;
|
||||
/**
|
||||
* 供应商分类(一类/二类)
|
||||
*/
|
||||
@ApiModelProperty("供应商分类(一类/二类)")
|
||||
private String classCode;
|
||||
/**
|
||||
* 供应商类别(资源方/贸易商/托运商/接收站/多领域)
|
||||
*/
|
||||
@ApiModelProperty("供应商类别(资源方/贸易商/托运商/接收站/多领域)")
|
||||
private String typeCode;
|
||||
/**
|
||||
* 有效标志(Y-有效,N-无效)
|
||||
*/
|
||||
@ApiModelProperty("有效标志(Y-有效,N-无效)")
|
||||
private String valid;
|
||||
/**
|
||||
* 状态(未提交/审批中/已审批/已驳回)
|
||||
*/
|
||||
@ApiModelProperty("状态(未提交/审批中/已审批/已驳回)")
|
||||
private String approCode;
|
||||
|
||||
}
|
||||
@ -0,0 +1,239 @@
|
||||
package com.xjrsoft.module.supplier.vo;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @title: 表单出参
|
||||
* @Author 管理员
|
||||
* @Date: 2025-12-15
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Data
|
||||
public class LngSupplierVo {
|
||||
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
@ApiModelProperty("主键")
|
||||
private Long id;
|
||||
|
||||
|
||||
/**
|
||||
* 集团编码
|
||||
*/
|
||||
@ApiModelProperty("集团编码")
|
||||
private String suMcode;
|
||||
|
||||
|
||||
/**
|
||||
* 供应商编码(不能重复,以S开头)
|
||||
*/
|
||||
@ApiModelProperty("供应商编码(不能重复,以S开头)")
|
||||
private String suCode;
|
||||
|
||||
|
||||
/**
|
||||
* 供应商名称(不能与名称、简称重复)
|
||||
*/
|
||||
@ApiModelProperty("供应商名称(不能与名称、简称重复)")
|
||||
private String suName;
|
||||
|
||||
|
||||
/**
|
||||
* 简称(不能与名称、简称重复)
|
||||
*/
|
||||
@ApiModelProperty("简称(不能与名称、简称重复)")
|
||||
private String suSname;
|
||||
|
||||
|
||||
/**
|
||||
* 国际/国内(I-国际,D-国内)
|
||||
*/
|
||||
@ApiModelProperty("国际/国内(I-国际,D-国内)")
|
||||
private String dI;
|
||||
|
||||
|
||||
/**
|
||||
* 企业性质(国有企业/非国有企业)
|
||||
*/
|
||||
@ApiModelProperty("企业性质(国有企业/非国有企业)")
|
||||
private String natureCode;
|
||||
|
||||
|
||||
/**
|
||||
* 母公司名称
|
||||
*/
|
||||
@ApiModelProperty("母公司名称")
|
||||
private String parentName;
|
||||
|
||||
|
||||
/**
|
||||
* 统一社会信用代码(非空时不可重复)
|
||||
*/
|
||||
@ApiModelProperty("统一社会信用代码(非空时不可重复)")
|
||||
private String creditNo;
|
||||
|
||||
|
||||
/**
|
||||
* 纳税人识别号(非空时不可重复)
|
||||
*/
|
||||
@ApiModelProperty("纳税人识别号(非空时不可重复)")
|
||||
private String tiNo;
|
||||
|
||||
|
||||
/**
|
||||
* 法定代表人
|
||||
*/
|
||||
@ApiModelProperty("法定代表人")
|
||||
private String representative;
|
||||
|
||||
|
||||
/**
|
||||
* 注册资本(万元)
|
||||
*/
|
||||
@ApiModelProperty("注册资本(万元)")
|
||||
private String amtReg;
|
||||
|
||||
|
||||
/**
|
||||
* 注册地址
|
||||
*/
|
||||
@ApiModelProperty("注册地址")
|
||||
private String addrReg;
|
||||
|
||||
|
||||
/**
|
||||
* 通讯地址
|
||||
*/
|
||||
@ApiModelProperty("通讯地址")
|
||||
private String addrMail;
|
||||
|
||||
|
||||
/**
|
||||
* 成立日期
|
||||
*/
|
||||
@ApiModelProperty("成立日期")
|
||||
private LocalDateTime dateEstab;
|
||||
|
||||
|
||||
/**
|
||||
* 准入时间
|
||||
*/
|
||||
@ApiModelProperty("准入时间")
|
||||
private LocalDateTime dateEntry;
|
||||
|
||||
|
||||
/**
|
||||
* 供应商分类(一类/二类)
|
||||
*/
|
||||
@ApiModelProperty("供应商分类(一类/二类)")
|
||||
private String classCode;
|
||||
|
||||
|
||||
/**
|
||||
* 供应商类别(资源方/贸易商/托运商/接收站/多领域)
|
||||
*/
|
||||
@ApiModelProperty("供应商类别(资源方/贸易商/托运商/接收站/多领域)")
|
||||
private String typeCode;
|
||||
|
||||
|
||||
/**
|
||||
* 组织架构编码
|
||||
*/
|
||||
@ApiModelProperty("组织架构编码")
|
||||
private String orgCode;
|
||||
|
||||
|
||||
/**
|
||||
* 有效标志(Y-有效,N-无效)
|
||||
*/
|
||||
@ApiModelProperty("有效标志(Y-有效,N-无效)")
|
||||
private String valid;
|
||||
|
||||
|
||||
/**
|
||||
* 状态(未提交/审批中/已审批/已驳回)
|
||||
*/
|
||||
@ApiModelProperty("状态(未提交/审批中/已审批/已驳回)")
|
||||
private String approCode;
|
||||
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@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;
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* lngSupplierBank
|
||||
*/
|
||||
@ApiModelProperty("lngSupplierBank子表")
|
||||
private List<LngSupplierBankVo> lngSupplierBankList;
|
||||
/**
|
||||
* lngSupplierContact
|
||||
*/
|
||||
@ApiModelProperty("lngSupplierContact子表")
|
||||
private List<LngSupplierContactVo> lngSupplierContactList;
|
||||
/**
|
||||
* lngSupplierDoc
|
||||
*/
|
||||
@ApiModelProperty("lngSupplierDoc子表")
|
||||
private List<LngSupplierDocVo> lngSupplierDocList;
|
||||
|
||||
}
|
||||
@ -119,6 +119,9 @@ public class CountryRegionServiceImpl extends ServiceImpl<LngBRegionMapper, LngB
|
||||
@Override
|
||||
public List<LngBRegionVo> child(Long pid, String excludeType, String keyword, String startPCode) {
|
||||
List<Long> pidList = CollectionUtils.newArrayList();
|
||||
if(pid == null) {
|
||||
pid = 0L;
|
||||
}
|
||||
|
||||
if(StrUtil.isNotBlank(startPCode) && (pid == null || pid ==0) ){
|
||||
List<LngBRegion> pList = this.list(Wrappers.<LngBRegion>query()
|
||||
|
||||
@ -152,8 +152,6 @@ public class CustomerController {
|
||||
|
||||
@Override
|
||||
public UpdateLngCustomerDto before(DataOperationContent<UpdateLngCustomerDto> content) {
|
||||
String code = codeRuleClient.genEncode(CUSTOMER_CODE);
|
||||
dto.setCuCode("C"+code);
|
||||
return content.getObj();
|
||||
}
|
||||
|
||||
@ -163,7 +161,6 @@ public class CustomerController {
|
||||
if (StringUtils.isNotEmpty(msg)) {
|
||||
throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DB_FUNCTION_EXEC_ERROR, msg));
|
||||
}
|
||||
codeRuleClient.useEncode(CUSTOMER_CODE);
|
||||
return content.getObj();
|
||||
}
|
||||
}));
|
||||
|
||||
@ -0,0 +1,99 @@
|
||||
package com.xjrsoft.module.sales.controller;
|
||||
|
||||
import cn.dev33.satoken.annotation.SaCheckPermission;
|
||||
import cn.hutool.core.bean.BeanUtil;
|
||||
import cn.hutool.core.util.ObjectUtil;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.xjrsoft.common.model.result.R;
|
||||
import com.xjrsoft.common.page.ConventPage;
|
||||
import com.xjrsoft.common.page.PageOutput;
|
||||
import com.xjrsoft.common.utils.VoToColumnUtil;
|
||||
import com.xjrsoft.module.datalog.service.DatalogService;
|
||||
import com.xjrsoft.module.sales.dto.LngCustomerGroupPageDto;
|
||||
import com.xjrsoft.module.sales.dto.UpdateLngCustomerGroupDto;
|
||||
import com.xjrsoft.module.sales.entity.LngCustomerGroup;
|
||||
import com.xjrsoft.module.sales.service.ICustomerGroupService;
|
||||
import com.xjrsoft.module.sales.vo.LngCustomerGroupPageVo;
|
||||
import com.xjrsoft.module.sales.vo.LngCustomerGroupVo;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import lombok.AllArgsConstructor;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import javax.validation.Valid;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @title: 客户组
|
||||
* @Author 管理员
|
||||
* @Date: 2025-12-16
|
||||
* @Version 1.0
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/sales" + "/customerGroup")
|
||||
@Api(value = "/sales" + "/customerGroup",tags = "客户组代码")
|
||||
@AllArgsConstructor
|
||||
public class CustomerGroupController {
|
||||
|
||||
|
||||
private final ICustomerGroupService customerGroupService;
|
||||
private final DatalogService dataService;
|
||||
|
||||
@GetMapping(value = "/page")
|
||||
@ApiOperation(value="LngCustomerGroup列表(分页)")
|
||||
@SaCheckPermission("customerGroup:list")
|
||||
public R page(@Valid LngCustomerGroupPageDto dto){
|
||||
|
||||
LambdaQueryWrapper<LngCustomerGroup> queryWrapper = new LambdaQueryWrapper<>();
|
||||
queryWrapper
|
||||
.like(StrUtil.isNotBlank(dto.getGrpCode()),LngCustomerGroup::getGrpCode,dto.getGrpCode())
|
||||
.like(StrUtil.isNotBlank(dto.getTypeCode()),LngCustomerGroup::getTypeCode,dto.getTypeCode())
|
||||
.between(ObjectUtil.isNotNull(dto.getDateFromStart()) && ObjectUtil.isNotNull(dto.getDateFromEnd()),LngCustomerGroup::getDateFrom,dto.getDateFromStart(),dto.getDateFromEnd())
|
||||
.between(ObjectUtil.isNotNull(dto.getDateToStart()) && ObjectUtil.isNotNull(dto.getDateToEnd()),LngCustomerGroup::getDateTo,dto.getDateToStart(),dto.getDateToEnd())
|
||||
.like(StrUtil.isNotBlank(dto.getGrpName()),LngCustomerGroup::getGrpName,dto.getGrpName())
|
||||
.like(StrUtil.isNotBlank(dto.getNote()),LngCustomerGroup::getNote,dto.getNote())
|
||||
.orderByDesc(LngCustomerGroup::getId)
|
||||
.select(LngCustomerGroup.class,x -> VoToColumnUtil.fieldsToColumns(LngCustomerGroupPageVo.class).contains(x.getProperty()));
|
||||
IPage<LngCustomerGroup> page = customerGroupService.page(ConventPage.getPage(dto), queryWrapper);
|
||||
PageOutput<LngCustomerGroupPageVo> pageOutput = ConventPage.getPageOutput(page, LngCustomerGroupPageVo.class);
|
||||
return R.ok(pageOutput);
|
||||
}
|
||||
|
||||
@GetMapping(value = "/info")
|
||||
@ApiOperation(value="根据id查询LngCustomerGroup信息")
|
||||
@SaCheckPermission("customerGroup:detail")
|
||||
public R info(@RequestParam Long id){
|
||||
LngCustomerGroup lngCustomerGroup = customerGroupService.getByIdDeep(id);
|
||||
if (lngCustomerGroup == null) {
|
||||
return R.error("找不到此数据!");
|
||||
}
|
||||
return R.ok(BeanUtil.toBean(lngCustomerGroup, LngCustomerGroupVo.class));
|
||||
}
|
||||
|
||||
|
||||
@PostMapping
|
||||
@ApiOperation(value = "新增LngCustomerGroup")
|
||||
@SaCheckPermission("customerGroup:add")
|
||||
public R add(@Valid @RequestBody UpdateLngCustomerGroupDto dto){
|
||||
UpdateLngCustomerGroupDto res = dataService.insert(dto);
|
||||
return R.ok(res.getId());
|
||||
}
|
||||
|
||||
@PutMapping
|
||||
@ApiOperation(value = "修改LngCustomerGroup")
|
||||
@SaCheckPermission("customerGroup:edit")
|
||||
public R update(@Valid @RequestBody UpdateLngCustomerGroupDto dto){
|
||||
return R.ok(dataService.updateById(dto));
|
||||
}
|
||||
|
||||
@DeleteMapping
|
||||
@ApiOperation(value = "删除")
|
||||
@SaCheckPermission("customerGroup:delete")
|
||||
public R delete(@Valid @RequestBody List<Long> ids){
|
||||
return R.ok(dataService.deleteByIds(UpdateLngCustomerGroupDto.class, ids));
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@ -17,6 +17,7 @@ import com.xjrsoft.module.sales.entity.LngGradeSystem;
|
||||
import com.xjrsoft.module.sales.service.IGradeSystemService;
|
||||
import com.xjrsoft.module.sales.vo.LngGradeSystemPageVo;
|
||||
import com.xjrsoft.module.sales.vo.LngGradeSystemVo;
|
||||
import com.xjrsoft.module.system.client.ICodeRuleClient;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import lombok.AllArgsConstructor;
|
||||
@ -40,6 +41,8 @@ public class GradeSystemController {
|
||||
|
||||
private final IGradeSystemService gradeSystemService;
|
||||
private final DatalogService dataService;
|
||||
private final ICodeRuleClient codeRuleClient;
|
||||
private final String GS_CODE = "gsCode";
|
||||
|
||||
@GetMapping(value = "/page")
|
||||
@ApiOperation(value="LngGradeSystem列表(分页)")
|
||||
@ -82,7 +85,10 @@ public class GradeSystemController {
|
||||
@ApiOperation(value = "新增LngGradeSystem")
|
||||
@SaCheckPermission("gradeSystem:add")
|
||||
public R add(@Valid @RequestBody UpdateLngGradeSystemDto dto){
|
||||
String code = codeRuleClient.genEncode(GS_CODE);
|
||||
dto.setGsCode(code);
|
||||
UpdateLngGradeSystemDto res = dataService.insert(dto);
|
||||
codeRuleClient.useEncode(GS_CODE);
|
||||
return R.ok(res.getId());
|
||||
}
|
||||
|
||||
|
||||
@ -0,0 +1,116 @@
|
||||
package com.xjrsoft.module.sales.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.FieldFill;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.github.yulichang.annotation.EntityMapping;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
|
||||
|
||||
/**
|
||||
* @title: 客户组
|
||||
* @Author 管理员
|
||||
* @Date: 2025-12-16
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Data
|
||||
@TableName("lng_customer_group")
|
||||
@ApiModel(value = "客户组对象", description = "客户组")
|
||||
public class LngCustomerGroup implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
@ApiModelProperty("主键")
|
||||
@TableId
|
||||
private Long id;
|
||||
/**
|
||||
* 组编码(按类型自动编码)
|
||||
*/
|
||||
@ApiModelProperty("组编码(按类型自动编码)")
|
||||
private String grpCode;
|
||||
/**
|
||||
* 组说明
|
||||
*/
|
||||
@ApiModelProperty("组说明")
|
||||
private String grpName;
|
||||
/**
|
||||
* 类型(GD-挂单销售,JP-竞拍销售,JS-批量结算,YX-营销优惠活动,DX-客户定向销售)
|
||||
*/
|
||||
@ApiModelProperty("类型(GD-挂单销售,JP-竞拍销售,JS-批量结算,YX-营销优惠活动,DX-客户定向销售)")
|
||||
private String typeCode;
|
||||
/**
|
||||
* 起始日期
|
||||
*/
|
||||
@ApiModelProperty("起始日期")
|
||||
private LocalDateTime dateFrom;
|
||||
/**
|
||||
* 结束日期
|
||||
*/
|
||||
@ApiModelProperty("结束日期")
|
||||
private LocalDateTime dateTo;
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@ApiModelProperty("备注")
|
||||
private String note;
|
||||
/**
|
||||
* 创建人id
|
||||
*/
|
||||
@ApiModelProperty("创建人id")
|
||||
@TableField(fill = FieldFill.INSERT)
|
||||
private Long createUserId;
|
||||
/**
|
||||
* 创建时间
|
||||
*/
|
||||
@ApiModelProperty("创建时间")
|
||||
@TableField(fill = FieldFill.INSERT)
|
||||
private LocalDateTime createDate;
|
||||
/**
|
||||
* 修改人id
|
||||
*/
|
||||
@ApiModelProperty("修改人id")
|
||||
@TableField(fill = FieldFill.UPDATE)
|
||||
private Long modifyUserId;
|
||||
/**
|
||||
* 修改时间
|
||||
*/
|
||||
@ApiModelProperty("修改时间")
|
||||
@TableField(fill = FieldFill.UPDATE)
|
||||
private LocalDateTime modifyDate;
|
||||
/**
|
||||
* 租户id
|
||||
*/
|
||||
@ApiModelProperty("租户id")
|
||||
private Long tenantId;
|
||||
/**
|
||||
* 部门id
|
||||
*/
|
||||
@ApiModelProperty("部门id")
|
||||
@TableField(fill = FieldFill.INSERT)
|
||||
private Long deptId;
|
||||
/**
|
||||
* 数据权限id
|
||||
*/
|
||||
@ApiModelProperty("数据权限id")
|
||||
@TableField(fill = FieldFill.INSERT)
|
||||
private Long ruleUserId;
|
||||
|
||||
/**
|
||||
* lngCustomerGroupCustomer
|
||||
*/
|
||||
@ApiModelProperty("lngCustomerGroupCustomer子表")
|
||||
@TableField(exist = false)
|
||||
@EntityMapping(thisField = "grpCode", joinField = "grpCode")
|
||||
private List<LngCustomerGroupCustomer> lngCustomerGroupCustomerList;
|
||||
|
||||
}
|
||||
@ -0,0 +1,92 @@
|
||||
package com.xjrsoft.module.sales.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.FieldFill;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
|
||||
/**
|
||||
* @title: 客户组
|
||||
* @Author 管理员
|
||||
* @Date: 2025-12-16
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Data
|
||||
@TableName("lng_customer_group_customer")
|
||||
@ApiModel(value = "客户组对象", description = "客户组")
|
||||
public class LngCustomerGroupCustomer implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
@ApiModelProperty("主键")
|
||||
@TableId
|
||||
private String id;
|
||||
/**
|
||||
* 组编码
|
||||
*/
|
||||
@ApiModelProperty("组编码")
|
||||
private String grpCode;
|
||||
/**
|
||||
* 客户编码
|
||||
*/
|
||||
@ApiModelProperty("客户编码")
|
||||
private String cuCode;
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@ApiModelProperty("备注")
|
||||
private String note;
|
||||
/**
|
||||
* 创建人id
|
||||
*/
|
||||
@ApiModelProperty("创建人id")
|
||||
@TableField(fill = FieldFill.INSERT)
|
||||
private Long createUserId;
|
||||
/**
|
||||
* 创建时间
|
||||
*/
|
||||
@ApiModelProperty("创建时间")
|
||||
@TableField(fill = FieldFill.INSERT)
|
||||
private LocalDateTime createDate;
|
||||
/**
|
||||
* 修改人id
|
||||
*/
|
||||
@ApiModelProperty("修改人id")
|
||||
@TableField(fill = FieldFill.UPDATE)
|
||||
private Long modifyUserId;
|
||||
/**
|
||||
* 修改时间
|
||||
*/
|
||||
@ApiModelProperty("修改时间")
|
||||
@TableField(fill = FieldFill.UPDATE)
|
||||
private LocalDateTime modifyDate;
|
||||
/**
|
||||
* 租户id
|
||||
*/
|
||||
@ApiModelProperty("租户id")
|
||||
private Long tenantId;
|
||||
/**
|
||||
* 部门id
|
||||
*/
|
||||
@ApiModelProperty("部门id")
|
||||
@TableField(fill = FieldFill.INSERT)
|
||||
private Long deptId;
|
||||
/**
|
||||
* 数据权限id
|
||||
*/
|
||||
@ApiModelProperty("数据权限id")
|
||||
@TableField(fill = FieldFill.INSERT)
|
||||
private Long ruleUserId;
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,16 @@
|
||||
package com.xjrsoft.module.sales.mapper;
|
||||
|
||||
import com.github.yulichang.base.MPJBaseMapper;
|
||||
import com.xjrsoft.module.sales.entity.LngCustomerGroupCustomer;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
/**
|
||||
* @title: mapper
|
||||
* @Author 管理员
|
||||
* @Date: 2025-12-16
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Mapper
|
||||
public interface LngCustomerGroupCustomerMapper extends MPJBaseMapper<LngCustomerGroupCustomer> {
|
||||
|
||||
}
|
||||
@ -0,0 +1,17 @@
|
||||
package com.xjrsoft.module.sales.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.github.yulichang.base.MPJBaseMapper;
|
||||
import com.xjrsoft.module.sales.entity.LngCustomerGroup;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
/**
|
||||
* @title: mapper
|
||||
* @Author 管理员
|
||||
* @Date: 2025-12-16
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Mapper
|
||||
public interface LngCustomerGroupMapper extends MPJBaseMapper<LngCustomerGroup> {
|
||||
|
||||
}
|
||||
@ -0,0 +1,41 @@
|
||||
package com.xjrsoft.module.sales.service;
|
||||
|
||||
import com.github.yulichang.base.MPJBaseService;
|
||||
import com.github.yulichang.extension.mapping.base.MPJDeepService;
|
||||
import com.github.yulichang.extension.mapping.base.MPJRelationService;
|
||||
import com.xjrsoft.module.sales.entity.LngCustomerGroup;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @title: service
|
||||
* @Author 管理员
|
||||
* @Date: 2025-12-16
|
||||
* @Version 1.0
|
||||
*/
|
||||
|
||||
public interface ICustomerGroupService extends MPJBaseService<LngCustomerGroup>, MPJDeepService<LngCustomerGroup>, MPJRelationService<LngCustomerGroup> {
|
||||
/**
|
||||
* 新增
|
||||
*
|
||||
* @param lngCustomerGroup
|
||||
* @return
|
||||
*/
|
||||
Boolean add(LngCustomerGroup lngCustomerGroup);
|
||||
|
||||
/**
|
||||
* 更新
|
||||
*
|
||||
* @param lngCustomerGroup
|
||||
* @return
|
||||
*/
|
||||
Boolean update(LngCustomerGroup lngCustomerGroup);
|
||||
|
||||
/**
|
||||
* 删除
|
||||
*
|
||||
* @param ids
|
||||
* @return
|
||||
*/
|
||||
Boolean delete(List<Long> ids);
|
||||
}
|
||||
@ -0,0 +1,88 @@
|
||||
package com.xjrsoft.module.sales.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
import com.github.yulichang.base.MPJBaseServiceImpl;
|
||||
import com.xjrsoft.module.sales.entity.LngCustomerGroup;
|
||||
import com.xjrsoft.module.sales.entity.LngCustomerGroupCustomer;
|
||||
import com.xjrsoft.module.sales.mapper.LngCustomerGroupCustomerMapper;
|
||||
import com.xjrsoft.module.sales.mapper.LngCustomerGroupMapper;
|
||||
import com.xjrsoft.module.sales.service.ICustomerGroupService;
|
||||
import lombok.AllArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* @title: service
|
||||
* @Author 管理员
|
||||
* @Date: 2025-12-16
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Service
|
||||
@AllArgsConstructor
|
||||
public class CustomerGroupServiceImpl extends MPJBaseServiceImpl<LngCustomerGroupMapper, LngCustomerGroup> implements ICustomerGroupService {
|
||||
private final LngCustomerGroupMapper customerGroupLngCustomerGroupMapper;
|
||||
|
||||
private final LngCustomerGroupCustomerMapper customerGroupLngCustomerGroupCustomerMapper;
|
||||
|
||||
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public Boolean add(LngCustomerGroup lngCustomerGroup) {
|
||||
customerGroupLngCustomerGroupMapper.insert(lngCustomerGroup);
|
||||
for (LngCustomerGroupCustomer lngCustomerGroupCustomer : lngCustomerGroup.getLngCustomerGroupCustomerList()) {
|
||||
lngCustomerGroupCustomer.setGrpCode(lngCustomerGroup.getGrpCode());
|
||||
customerGroupLngCustomerGroupCustomerMapper.insert(lngCustomerGroupCustomer);
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public Boolean update(LngCustomerGroup lngCustomerGroup) {
|
||||
customerGroupLngCustomerGroupMapper.updateById(lngCustomerGroup);
|
||||
//********************************* LngCustomerGroupCustomer 增删改 开始 *******************************************/
|
||||
{
|
||||
// 查出所有子级的id
|
||||
List<LngCustomerGroupCustomer> lngCustomerGroupCustomerList = customerGroupLngCustomerGroupCustomerMapper.selectList(Wrappers.lambdaQuery(LngCustomerGroupCustomer.class).eq(LngCustomerGroupCustomer::getGrpCode, lngCustomerGroup.getGrpCode()).select(LngCustomerGroupCustomer::getId));
|
||||
List<String> lngCustomerGroupCustomerIds = lngCustomerGroupCustomerList.stream().map(LngCustomerGroupCustomer::getId).collect(Collectors.toList());
|
||||
//原有子表单 没有被删除的主键
|
||||
List<String> lngCustomerGroupCustomerOldIds = lngCustomerGroup.getLngCustomerGroupCustomerList().stream().map(LngCustomerGroupCustomer::getId).filter(Objects::nonNull).collect(Collectors.toList());
|
||||
//找到需要删除的id
|
||||
List<String> lngCustomerGroupCustomerRemoveIds = lngCustomerGroupCustomerIds.stream().filter(item -> !lngCustomerGroupCustomerOldIds.contains(item)).collect(Collectors.toList());
|
||||
|
||||
for (LngCustomerGroupCustomer lngCustomerGroupCustomer : lngCustomerGroup.getLngCustomerGroupCustomerList()) {
|
||||
//如果不等于空则修改
|
||||
if (lngCustomerGroupCustomer.getId() != null) {
|
||||
customerGroupLngCustomerGroupCustomerMapper.updateById(lngCustomerGroupCustomer);
|
||||
}
|
||||
//如果等于空 则新增
|
||||
else {
|
||||
//已经不存在的id 删除
|
||||
lngCustomerGroupCustomer.setGrpCode(lngCustomerGroup.getGrpCode());
|
||||
customerGroupLngCustomerGroupCustomerMapper.insert(lngCustomerGroupCustomer);
|
||||
}
|
||||
}
|
||||
//已经不存在的id 删除
|
||||
if(lngCustomerGroupCustomerRemoveIds.size() > 0){
|
||||
customerGroupLngCustomerGroupCustomerMapper.deleteBatchIds(lngCustomerGroupCustomerRemoveIds);
|
||||
}
|
||||
}
|
||||
//********************************* LngCustomerGroupCustomer 增删改 结束 *******************************************/
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public Boolean delete(List<Long> ids) {
|
||||
customerGroupLngCustomerGroupMapper.deleteBatchIds(ids);
|
||||
customerGroupLngCustomerGroupCustomerMapper.delete(Wrappers.lambdaQuery(LngCustomerGroupCustomer.class).in(LngCustomerGroupCustomer::getGrpCode, ids));
|
||||
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@ -82,7 +82,7 @@ public class CustomerServiceImpl extends MPJBaseServiceImpl<LngCustomerMapper, L
|
||||
bindDto.setTableName("lng_customer_doc");
|
||||
bindDto.setColumnName("fileList");
|
||||
bindDto.setFiles(updateLngCustomerDocDto.getFileList());
|
||||
fileClient.bindTableData(bindDto);
|
||||
fileClient.bindTableData(bindDto);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -0,0 +1,133 @@
|
||||
package com.xjrsoft.module.supplier.controller;
|
||||
|
||||
import cn.hutool.core.bean.BeanUtil;
|
||||
import cn.hutool.core.util.ObjectUtil;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
import com.xjrsoft.common.constant.GlobalConstant;
|
||||
import com.baomidou.mybatisplus.core.toolkit.StringPool;
|
||||
import com.xjrsoft.common.page.ConventPage;
|
||||
import com.xjrsoft.common.page.PageOutput;
|
||||
import com.xjrsoft.common.model.result.R;
|
||||
import com.xjrsoft.common.utils.VoToColumnUtil;
|
||||
import com.xjrsoft.module.supplier.dto.AddLngSupplierDto;
|
||||
import com.xjrsoft.module.supplier.dto.UpdateLngSupplierDto;
|
||||
import cn.dev33.satoken.annotation.SaCheckPermission;
|
||||
|
||||
import com.xjrsoft.module.supplier.dto.LngSupplierPageDto;
|
||||
import com.xjrsoft.module.supplier.entity.LngSupplier;
|
||||
import com.xjrsoft.module.supplier.service.ISupplierService;
|
||||
import com.xjrsoft.module.supplier.vo.LngSupplierPageVo;
|
||||
import com.xjrsoft.module.datalog.vo.DataChangeLogVo;
|
||||
import com.xjrsoft.module.datalog.service.DatalogService;
|
||||
import com.xjrsoft.module.supplier.vo.LngSupplierVo;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import lombok.AllArgsConstructor;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import javax.validation.Valid;
|
||||
import javax.validation.constraints.NotNull;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @title: 供应商
|
||||
* @Author 管理员
|
||||
* @Date: 2025-12-15
|
||||
* @Version 1.0
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/supplier" + "/supplier")
|
||||
@Api(value = "/supplier" + "/supplier",tags = "供应商代码")
|
||||
@AllArgsConstructor
|
||||
public class SupplierController {
|
||||
|
||||
|
||||
private final ISupplierService supplierService;
|
||||
private final DatalogService dataService;
|
||||
|
||||
@GetMapping(value = "/page")
|
||||
@ApiOperation(value="LngSupplier列表(分页)")
|
||||
@SaCheckPermission("supplier:list")
|
||||
public R page(@Valid LngSupplierPageDto dto){
|
||||
|
||||
LambdaQueryWrapper<LngSupplier> queryWrapper = new LambdaQueryWrapper<>();
|
||||
queryWrapper
|
||||
.like(StrUtil.isNotBlank(dto.getSuName()),LngSupplier::getSuName,dto.getSuName())
|
||||
.like(StrUtil.isNotBlank(dto.getSuSname()),LngSupplier::getSuSname,dto.getSuSname())
|
||||
.like(StrUtil.isNotBlank(dto.getNatureCode()),LngSupplier::getNatureCode,dto.getNatureCode())
|
||||
.like(StrUtil.isNotBlank(dto.getTypeCode()),LngSupplier::getTypeCode,dto.getTypeCode())
|
||||
.like(StrUtil.isNotBlank(dto.getClassCode()),LngSupplier::getClassCode,dto.getClassCode())
|
||||
.like(StrUtil.isNotBlank(dto.getDI()),LngSupplier::getDI,dto.getDI())
|
||||
.like(StrUtil.isNotBlank(dto.getValid()),LngSupplier::getValid,dto.getValid())
|
||||
.like(StrUtil.isNotBlank(dto.getApproCode()),LngSupplier::getApproCode,dto.getApproCode())
|
||||
.orderByDesc(LngSupplier::getId)
|
||||
.select(LngSupplier.class,x -> VoToColumnUtil.fieldsToColumns(LngSupplierPageVo.class).contains(x.getProperty()));
|
||||
IPage<LngSupplier> page = supplierService.page(ConventPage.getPage(dto), queryWrapper);
|
||||
PageOutput<LngSupplierPageVo> pageOutput = ConventPage.getPageOutput(page, LngSupplierPageVo.class);
|
||||
return R.ok(pageOutput);
|
||||
}
|
||||
|
||||
@GetMapping(value = "/info")
|
||||
@ApiOperation(value="根据id查询LngSupplier信息")
|
||||
@SaCheckPermission("supplier:detail")
|
||||
public R info(@RequestParam Long id){
|
||||
LngSupplier lngSupplier = supplierService.getByIdDeep(id);
|
||||
if (lngSupplier == null) {
|
||||
return R.error("找不到此数据!");
|
||||
}
|
||||
return R.ok(BeanUtil.toBean(lngSupplier, LngSupplierVo.class));
|
||||
}
|
||||
|
||||
@GetMapping(value = "/datalog")
|
||||
@ApiOperation(value="根据id查询LngSupplier数据详细日志")
|
||||
@SaCheckPermission("supplier:datalog")
|
||||
public R datalog(@RequestParam Long id){
|
||||
List<DataChangeLogVo> logs = dataService.findLogsByEntityId(UpdateLngSupplierDto.class,id);
|
||||
return R.ok(logs);
|
||||
}
|
||||
|
||||
|
||||
@PostMapping
|
||||
@ApiOperation(value = "新增LngSupplier")
|
||||
@SaCheckPermission("supplier:add")
|
||||
public R add(@Valid @RequestBody UpdateLngSupplierDto dto){
|
||||
UpdateLngSupplierDto res = dataService.insert(dto);
|
||||
return R.ok(res.getId());
|
||||
}
|
||||
|
||||
@PutMapping
|
||||
@ApiOperation(value = "修改LngSupplier")
|
||||
@SaCheckPermission("supplier:edit")
|
||||
public R update(@Valid @RequestBody UpdateLngSupplierDto dto){
|
||||
return R.ok(dataService.updateById(dto));
|
||||
}
|
||||
|
||||
@DeleteMapping
|
||||
@ApiOperation(value = "删除")
|
||||
@SaCheckPermission("supplier:delete")
|
||||
public R delete(@Valid @RequestBody List<Long> ids){
|
||||
return R.ok(dataService.deleteByIds(UpdateLngSupplierDto.class, ids));
|
||||
|
||||
}
|
||||
|
||||
@PostMapping("/enable")
|
||||
@ApiOperation(value = "启用LngSupplier")
|
||||
@SaCheckPermission("supplier:enable")
|
||||
public R enable(@Valid @RequestBody List<Long> ids){
|
||||
return R.ok(dataService.enable(UpdateLngSupplierDto.class,ids));
|
||||
}
|
||||
|
||||
|
||||
@PostMapping("/disable")
|
||||
@ApiOperation(value = "禁用LngSupplier")
|
||||
@SaCheckPermission("supplier:disable")
|
||||
public R disable(@Valid @RequestBody List<Long> ids){
|
||||
return R.ok(dataService.disable(UpdateLngSupplierDto.class,ids));
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,237 @@
|
||||
package com.xjrsoft.module.supplier.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.FieldFill;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableLogic;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.Version;
|
||||
import com.github.yulichang.annotation.EntityMapping;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
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 java.util.List;
|
||||
|
||||
|
||||
/**
|
||||
* @title: 供应商
|
||||
* @Author 管理员
|
||||
* @Date: 2025-12-15
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Data
|
||||
@TableName("lng_supplier")
|
||||
@ApiModel(value = "供应商对象", description = "供应商")
|
||||
public class LngSupplier implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
@ApiModelProperty("主键")
|
||||
@TableId
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 集团编码
|
||||
*/
|
||||
@ApiModelProperty("集团编码")
|
||||
private String suMcode;
|
||||
|
||||
/**
|
||||
* 供应商编码(不能重复,以S开头)
|
||||
*/
|
||||
@ApiModelProperty("供应商编码(不能重复,以S开头)")
|
||||
private String suCode;
|
||||
|
||||
/**
|
||||
* 供应商名称(不能与名称、简称重复)
|
||||
*/
|
||||
@ApiModelProperty("供应商名称(不能与名称、简称重复)")
|
||||
private String suName;
|
||||
|
||||
/**
|
||||
* 简称(不能与名称、简称重复)
|
||||
*/
|
||||
@ApiModelProperty("简称(不能与名称、简称重复)")
|
||||
private String suSname;
|
||||
|
||||
/**
|
||||
* 国际/国内(I-国际,D-国内)
|
||||
*/
|
||||
@ApiModelProperty("国际/国内(I-国际,D-国内)")
|
||||
private String dI;
|
||||
|
||||
/**
|
||||
* 企业性质(国有企业/非国有企业)
|
||||
*/
|
||||
@ApiModelProperty("企业性质(国有企业/非国有企业)")
|
||||
private String natureCode;
|
||||
|
||||
/**
|
||||
* 母公司名称
|
||||
*/
|
||||
@ApiModelProperty("母公司名称")
|
||||
private String parentName;
|
||||
|
||||
/**
|
||||
* 统一社会信用代码(非空时不可重复)
|
||||
*/
|
||||
@ApiModelProperty("统一社会信用代码(非空时不可重复)")
|
||||
private String creditNo;
|
||||
|
||||
/**
|
||||
* 纳税人识别号(非空时不可重复)
|
||||
*/
|
||||
@ApiModelProperty("纳税人识别号(非空时不可重复)")
|
||||
private String tiNo;
|
||||
|
||||
/**
|
||||
* 法定代表人
|
||||
*/
|
||||
@ApiModelProperty("法定代表人")
|
||||
private String representative;
|
||||
|
||||
/**
|
||||
* 注册资本(万元)
|
||||
*/
|
||||
@ApiModelProperty("注册资本(万元)")
|
||||
private String amtReg;
|
||||
|
||||
/**
|
||||
* 注册地址
|
||||
*/
|
||||
@ApiModelProperty("注册地址")
|
||||
private String addrReg;
|
||||
|
||||
/**
|
||||
* 通讯地址
|
||||
*/
|
||||
@ApiModelProperty("通讯地址")
|
||||
private String addrMail;
|
||||
|
||||
/**
|
||||
* 成立日期
|
||||
*/
|
||||
@ApiModelProperty("成立日期")
|
||||
private LocalDateTime dateEstab;
|
||||
|
||||
/**
|
||||
* 准入时间
|
||||
*/
|
||||
@ApiModelProperty("准入时间")
|
||||
private LocalDateTime dateEntry;
|
||||
|
||||
/**
|
||||
* 供应商分类(一类/二类)
|
||||
*/
|
||||
@ApiModelProperty("供应商分类(一类/二类)")
|
||||
private String classCode;
|
||||
|
||||
/**
|
||||
* 供应商类别(资源方/贸易商/托运商/接收站/多领域)
|
||||
*/
|
||||
@ApiModelProperty("供应商类别(资源方/贸易商/托运商/接收站/多领域)")
|
||||
private String typeCode;
|
||||
|
||||
/**
|
||||
* 组织架构编码
|
||||
*/
|
||||
@ApiModelProperty("组织架构编码")
|
||||
private String orgCode;
|
||||
|
||||
/**
|
||||
* 有效标志(Y-有效,N-无效)
|
||||
*/
|
||||
@ApiModelProperty("有效标志(Y-有效,N-无效)")
|
||||
private String valid;
|
||||
|
||||
/**
|
||||
* 状态(未提交/审批中/已审批/已驳回)
|
||||
*/
|
||||
@ApiModelProperty("状态(未提交/审批中/已审批/已驳回)")
|
||||
private String approCode;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@ApiModelProperty("备注")
|
||||
private String note;
|
||||
|
||||
/**
|
||||
* 创建人id
|
||||
*/
|
||||
@ApiModelProperty("创建人id")
|
||||
@TableField(fill = FieldFill.INSERT)
|
||||
private Long createUserId;
|
||||
|
||||
/**
|
||||
* 创建时间
|
||||
*/
|
||||
@ApiModelProperty("创建时间")
|
||||
@TableField(fill = FieldFill.INSERT)
|
||||
private LocalDateTime createDate;
|
||||
|
||||
/**
|
||||
* 修改人id
|
||||
*/
|
||||
@ApiModelProperty("修改人id")
|
||||
@TableField(fill = FieldFill.UPDATE)
|
||||
private Long modifyUserId;
|
||||
|
||||
/**
|
||||
* 修改时间
|
||||
*/
|
||||
@ApiModelProperty("修改时间")
|
||||
@TableField(fill = FieldFill.UPDATE)
|
||||
private LocalDateTime modifyDate;
|
||||
|
||||
/**
|
||||
* 租户id
|
||||
*/
|
||||
@ApiModelProperty("租户id")
|
||||
private Long tenantId;
|
||||
|
||||
/**
|
||||
* 部门id
|
||||
*/
|
||||
@ApiModelProperty("部门id")
|
||||
@TableField(fill = FieldFill.INSERT)
|
||||
private Long deptId;
|
||||
|
||||
/**
|
||||
* 数据权限id
|
||||
*/
|
||||
@ApiModelProperty("数据权限id")
|
||||
@TableField(fill = FieldFill.INSERT)
|
||||
private Long ruleUserId;
|
||||
|
||||
|
||||
/**
|
||||
* lngSupplierBank
|
||||
*/
|
||||
@ApiModelProperty("lngSupplierBank子表")
|
||||
@TableField(exist = false)
|
||||
@EntityMapping(thisField = "suCode", joinField = "suCode")
|
||||
private List<LngSupplierBank> lngSupplierBankList;
|
||||
/**
|
||||
* lngSupplierContact
|
||||
*/
|
||||
@ApiModelProperty("lngSupplierContact子表")
|
||||
@TableField(exist = false)
|
||||
@EntityMapping(thisField = "suCode", joinField = "suCode")
|
||||
private List<LngSupplierContact> lngSupplierContactList;
|
||||
/**
|
||||
* lngSupplierDoc
|
||||
*/
|
||||
@ApiModelProperty("lngSupplierDoc子表")
|
||||
@TableField(exist = false)
|
||||
@EntityMapping(thisField = "suCode", joinField = "suCode")
|
||||
private List<LngSupplierDoc> lngSupplierDocList;
|
||||
|
||||
}
|
||||
@ -0,0 +1,126 @@
|
||||
package com.xjrsoft.module.supplier.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.FieldFill;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableLogic;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.Version;
|
||||
import com.github.yulichang.annotation.EntityMapping;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
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 java.util.List;
|
||||
|
||||
|
||||
/**
|
||||
* @title: 供应商
|
||||
* @Author 管理员
|
||||
* @Date: 2025-12-15
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Data
|
||||
@TableName("lng_supplier_bank")
|
||||
@ApiModel(value = "供应商对象", description = "供应商")
|
||||
public class LngSupplierBank implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
@ApiModelProperty("主键")
|
||||
@TableId
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 供应商编码
|
||||
*/
|
||||
@ApiModelProperty("供应商编码")
|
||||
private String suCode;
|
||||
|
||||
/**
|
||||
* 银行
|
||||
*/
|
||||
@ApiModelProperty("银行")
|
||||
private String bankCode;
|
||||
|
||||
/**
|
||||
* 账号名称
|
||||
*/
|
||||
@ApiModelProperty("账号名称")
|
||||
private String accountName;
|
||||
|
||||
/**
|
||||
* 账号
|
||||
*/
|
||||
@ApiModelProperty("账号")
|
||||
private String account;
|
||||
|
||||
/**
|
||||
* 默认账号(Y-是,N-否;只能有一个Y的有效记录)
|
||||
*/
|
||||
@ApiModelProperty("默认账号(Y-是,N-否;只能有一个Y的有效记录)")
|
||||
private String defaultSign;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@ApiModelProperty("备注")
|
||||
private String note;
|
||||
|
||||
/**
|
||||
* 创建人id
|
||||
*/
|
||||
@ApiModelProperty("创建人id")
|
||||
@TableField(fill = FieldFill.INSERT)
|
||||
private Long createUserId;
|
||||
|
||||
/**
|
||||
* 创建时间
|
||||
*/
|
||||
@ApiModelProperty("创建时间")
|
||||
@TableField(fill = FieldFill.INSERT)
|
||||
private LocalDateTime createDate;
|
||||
|
||||
/**
|
||||
* 修改人id
|
||||
*/
|
||||
@ApiModelProperty("修改人id")
|
||||
@TableField(fill = FieldFill.UPDATE)
|
||||
private Long modifyUserId;
|
||||
|
||||
/**
|
||||
* 修改时间
|
||||
*/
|
||||
@ApiModelProperty("修改时间")
|
||||
@TableField(fill = FieldFill.UPDATE)
|
||||
private LocalDateTime modifyDate;
|
||||
|
||||
/**
|
||||
* 租户id
|
||||
*/
|
||||
@ApiModelProperty("租户id")
|
||||
private Long tenantId;
|
||||
|
||||
/**
|
||||
* 部门id
|
||||
*/
|
||||
@ApiModelProperty("部门id")
|
||||
@TableField(fill = FieldFill.INSERT)
|
||||
private Long deptId;
|
||||
|
||||
/**
|
||||
* 数据权限id
|
||||
*/
|
||||
@ApiModelProperty("数据权限id")
|
||||
@TableField(fill = FieldFill.INSERT)
|
||||
private Long ruleUserId;
|
||||
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,138 @@
|
||||
package com.xjrsoft.module.supplier.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.FieldFill;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableLogic;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.Version;
|
||||
import com.github.yulichang.annotation.EntityMapping;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
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 java.util.List;
|
||||
|
||||
|
||||
/**
|
||||
* @title: 供应商
|
||||
* @Author 管理员
|
||||
* @Date: 2025-12-15
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Data
|
||||
@TableName("lng_supplier_contact")
|
||||
@ApiModel(value = "供应商对象", description = "供应商")
|
||||
public class LngSupplierContact implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
@ApiModelProperty("主键")
|
||||
@TableId
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 供应商编码
|
||||
*/
|
||||
@ApiModelProperty("供应商编码")
|
||||
private String suCode;
|
||||
|
||||
/**
|
||||
* 姓名
|
||||
*/
|
||||
@ApiModelProperty("姓名")
|
||||
private String contactName;
|
||||
|
||||
/**
|
||||
* 联系电话
|
||||
*/
|
||||
@ApiModelProperty("联系电话")
|
||||
private String tel;
|
||||
|
||||
/**
|
||||
* 通讯地址
|
||||
*/
|
||||
@ApiModelProperty("通讯地址")
|
||||
private String addrMail;
|
||||
|
||||
/**
|
||||
* 电子邮箱
|
||||
*/
|
||||
@ApiModelProperty("电子邮箱")
|
||||
private String email;
|
||||
|
||||
/**
|
||||
* 职位
|
||||
*/
|
||||
@ApiModelProperty("职位")
|
||||
private String position;
|
||||
|
||||
/**
|
||||
* 有效标志(Y-有效,N-无效)
|
||||
*/
|
||||
@ApiModelProperty("有效标志(Y-有效,N-无效)")
|
||||
private String valid;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@ApiModelProperty("备注")
|
||||
private String note;
|
||||
|
||||
/**
|
||||
* 创建人id
|
||||
*/
|
||||
@ApiModelProperty("创建人id")
|
||||
@TableField(fill = FieldFill.INSERT)
|
||||
private Long createUserId;
|
||||
|
||||
/**
|
||||
* 创建时间
|
||||
*/
|
||||
@ApiModelProperty("创建时间")
|
||||
@TableField(fill = FieldFill.INSERT)
|
||||
private LocalDateTime createDate;
|
||||
|
||||
/**
|
||||
* 修改人id
|
||||
*/
|
||||
@ApiModelProperty("修改人id")
|
||||
@TableField(fill = FieldFill.UPDATE)
|
||||
private Long modifyUserId;
|
||||
|
||||
/**
|
||||
* 修改时间
|
||||
*/
|
||||
@ApiModelProperty("修改时间")
|
||||
@TableField(fill = FieldFill.UPDATE)
|
||||
private LocalDateTime modifyDate;
|
||||
|
||||
/**
|
||||
* 租户id
|
||||
*/
|
||||
@ApiModelProperty("租户id")
|
||||
private Long tenantId;
|
||||
|
||||
/**
|
||||
* 部门id
|
||||
*/
|
||||
@ApiModelProperty("部门id")
|
||||
@TableField(fill = FieldFill.INSERT)
|
||||
private Long deptId;
|
||||
|
||||
/**
|
||||
* 数据权限id
|
||||
*/
|
||||
@ApiModelProperty("数据权限id")
|
||||
@TableField(fill = FieldFill.INSERT)
|
||||
private Long ruleUserId;
|
||||
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,138 @@
|
||||
package com.xjrsoft.module.supplier.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.FieldFill;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableLogic;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.Version;
|
||||
import com.github.yulichang.annotation.EntityMapping;
|
||||
import io.swagger.annotations.ApiModel;
|
||||
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 java.util.List;
|
||||
|
||||
|
||||
/**
|
||||
* @title: 供应商
|
||||
* @Author 管理员
|
||||
* @Date: 2025-12-15
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Data
|
||||
@TableName("lng_supplier_doc")
|
||||
@ApiModel(value = "供应商对象", description = "供应商")
|
||||
public class LngSupplierDoc implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/**
|
||||
* 主键
|
||||
*/
|
||||
@ApiModelProperty("主键")
|
||||
@TableId
|
||||
private Long id;
|
||||
|
||||
/**
|
||||
* 供应商编码
|
||||
*/
|
||||
@ApiModelProperty("供应商编码")
|
||||
private String suCode;
|
||||
|
||||
/**
|
||||
* 资质证书类型
|
||||
*/
|
||||
@ApiModelProperty("资质证书类型")
|
||||
private String docTypeCode;
|
||||
|
||||
/**
|
||||
* 资质证书编号
|
||||
*/
|
||||
@ApiModelProperty("资质证书编号")
|
||||
private String docNo;
|
||||
|
||||
/**
|
||||
* 有效期开始
|
||||
*/
|
||||
@ApiModelProperty("有效期开始")
|
||||
private LocalDateTime dateFrom;
|
||||
|
||||
/**
|
||||
* 有效期结束
|
||||
*/
|
||||
@ApiModelProperty("有效期结束")
|
||||
private LocalDateTime dateTo;
|
||||
|
||||
/**
|
||||
* 显示顺序
|
||||
*/
|
||||
@ApiModelProperty("显示顺序")
|
||||
private Short sort;
|
||||
|
||||
/**
|
||||
* 有效标志(Y-有效,N-无效)
|
||||
*/
|
||||
@ApiModelProperty("有效标志(Y-有效,N-无效)")
|
||||
private String valid;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@ApiModelProperty("备注")
|
||||
private String note;
|
||||
|
||||
/**
|
||||
* 创建人id
|
||||
*/
|
||||
@ApiModelProperty("创建人id")
|
||||
@TableField(fill = FieldFill.INSERT)
|
||||
private Long createUserId;
|
||||
|
||||
/**
|
||||
* 创建时间
|
||||
*/
|
||||
@ApiModelProperty("创建时间")
|
||||
@TableField(fill = FieldFill.INSERT)
|
||||
private LocalDateTime createDate;
|
||||
|
||||
/**
|
||||
* 修改人id
|
||||
*/
|
||||
@ApiModelProperty("修改人id")
|
||||
@TableField(fill = FieldFill.UPDATE)
|
||||
private Long modifyUserId;
|
||||
|
||||
/**
|
||||
* 修改时间
|
||||
*/
|
||||
@ApiModelProperty("修改时间")
|
||||
@TableField(fill = FieldFill.UPDATE)
|
||||
private LocalDateTime modifyDate;
|
||||
|
||||
/**
|
||||
* 租户id
|
||||
*/
|
||||
@ApiModelProperty("租户id")
|
||||
private Long tenantId;
|
||||
|
||||
/**
|
||||
* 部门id
|
||||
*/
|
||||
@ApiModelProperty("部门id")
|
||||
@TableField(fill = FieldFill.INSERT)
|
||||
private Long deptId;
|
||||
|
||||
/**
|
||||
* 数据权限id
|
||||
*/
|
||||
@ApiModelProperty("数据权限id")
|
||||
@TableField(fill = FieldFill.INSERT)
|
||||
private Long ruleUserId;
|
||||
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,17 @@
|
||||
package com.xjrsoft.module.supplier.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.github.yulichang.base.MPJBaseMapper;
|
||||
import com.xjrsoft.module.supplier.entity.LngSupplierBank;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
/**
|
||||
* @title: mapper
|
||||
* @Author 管理员
|
||||
* @Date: 2025-12-15
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Mapper
|
||||
public interface LngSupplierBankMapper extends MPJBaseMapper<LngSupplierBank> {
|
||||
|
||||
}
|
||||
@ -0,0 +1,17 @@
|
||||
package com.xjrsoft.module.supplier.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.github.yulichang.base.MPJBaseMapper;
|
||||
import com.xjrsoft.module.supplier.entity.LngSupplierContact;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
/**
|
||||
* @title: mapper
|
||||
* @Author 管理员
|
||||
* @Date: 2025-12-15
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Mapper
|
||||
public interface LngSupplierContactMapper extends MPJBaseMapper<LngSupplierContact> {
|
||||
|
||||
}
|
||||
@ -0,0 +1,17 @@
|
||||
package com.xjrsoft.module.supplier.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.github.yulichang.base.MPJBaseMapper;
|
||||
import com.xjrsoft.module.supplier.entity.LngSupplierDoc;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
/**
|
||||
* @title: mapper
|
||||
* @Author 管理员
|
||||
* @Date: 2025-12-15
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Mapper
|
||||
public interface LngSupplierDocMapper extends MPJBaseMapper<LngSupplierDoc> {
|
||||
|
||||
}
|
||||
@ -0,0 +1,17 @@
|
||||
package com.xjrsoft.module.supplier.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.github.yulichang.base.MPJBaseMapper;
|
||||
import com.xjrsoft.module.supplier.entity.LngSupplier;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
/**
|
||||
* @title: mapper
|
||||
* @Author 管理员
|
||||
* @Date: 2025-12-15
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Mapper
|
||||
public interface LngSupplierMapper extends MPJBaseMapper<LngSupplier> {
|
||||
|
||||
}
|
||||
@ -0,0 +1,42 @@
|
||||
package com.xjrsoft.module.supplier.service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.github.yulichang.base.MPJBaseService;
|
||||
import com.github.yulichang.extension.mapping.base.MPJDeepService;
|
||||
import com.github.yulichang.extension.mapping.base.MPJRelationService;
|
||||
import com.xjrsoft.module.supplier.entity.LngSupplier;
|
||||
import lombok.Data;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @title: service
|
||||
* @Author 管理员
|
||||
* @Date: 2025-12-15
|
||||
* @Version 1.0
|
||||
*/
|
||||
|
||||
public interface ISupplierService extends MPJBaseService<LngSupplier>, MPJDeepService<LngSupplier>, MPJRelationService<LngSupplier> {
|
||||
/**
|
||||
* 新增
|
||||
*
|
||||
* @param lngSupplier
|
||||
* @return
|
||||
*/
|
||||
Boolean add(LngSupplier lngSupplier);
|
||||
|
||||
/**
|
||||
* 更新
|
||||
*
|
||||
* @param lngSupplier
|
||||
* @return
|
||||
*/
|
||||
Boolean update(LngSupplier lngSupplier);
|
||||
|
||||
/**
|
||||
* 删除
|
||||
*
|
||||
* @param ids
|
||||
* @return
|
||||
*/
|
||||
Boolean delete(List<Long> ids);
|
||||
}
|
||||
@ -0,0 +1,162 @@
|
||||
package com.xjrsoft.module.supplier.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.github.yulichang.base.MPJBaseServiceImpl;
|
||||
import com.xjrsoft.module.supplier.entity.LngSupplierBank;
|
||||
import com.xjrsoft.module.supplier.mapper.LngSupplierBankMapper;
|
||||
import com.xjrsoft.module.supplier.entity.LngSupplierContact;
|
||||
import com.xjrsoft.module.supplier.mapper.LngSupplierContactMapper;
|
||||
import com.xjrsoft.module.supplier.entity.LngSupplierDoc;
|
||||
import com.xjrsoft.module.supplier.mapper.LngSupplierDocMapper;
|
||||
import com.xjrsoft.module.supplier.entity.LngSupplier;
|
||||
import com.xjrsoft.module.supplier.mapper.LngSupplierMapper;
|
||||
import com.xjrsoft.module.supplier.service.ISupplierService;
|
||||
import lombok.AllArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
import java.util.stream.Collectors;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
|
||||
/**
|
||||
* @title: service
|
||||
* @Author 管理员
|
||||
* @Date: 2025-12-15
|
||||
* @Version 1.0
|
||||
*/
|
||||
@Service
|
||||
@AllArgsConstructor
|
||||
public class SupplierServiceImpl extends MPJBaseServiceImpl<LngSupplierMapper, LngSupplier> implements ISupplierService {
|
||||
private final LngSupplierMapper supplierLngSupplierMapper;
|
||||
|
||||
private final LngSupplierBankMapper supplierLngSupplierBankMapper;
|
||||
private final LngSupplierContactMapper supplierLngSupplierContactMapper;
|
||||
private final LngSupplierDocMapper supplierLngSupplierDocMapper;
|
||||
|
||||
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public Boolean add(LngSupplier lngSupplier) {
|
||||
supplierLngSupplierMapper.insert(lngSupplier);
|
||||
for (LngSupplierBank lngSupplierBank : lngSupplier.getLngSupplierBankList()) {
|
||||
lngSupplierBank.setSuCode(lngSupplier.getSuCode());
|
||||
supplierLngSupplierBankMapper.insert(lngSupplierBank);
|
||||
}
|
||||
for (LngSupplierContact lngSupplierContact : lngSupplier.getLngSupplierContactList()) {
|
||||
lngSupplierContact.setSuCode(lngSupplier.getSuCode());
|
||||
supplierLngSupplierContactMapper.insert(lngSupplierContact);
|
||||
}
|
||||
for (LngSupplierDoc lngSupplierDoc : lngSupplier.getLngSupplierDocList()) {
|
||||
lngSupplierDoc.setSuCode(lngSupplier.getSuCode());
|
||||
supplierLngSupplierDocMapper.insert(lngSupplierDoc);
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public Boolean update(LngSupplier lngSupplier) {
|
||||
supplierLngSupplierMapper.updateById(lngSupplier);
|
||||
//********************************* LngSupplierBank 增删改 开始 *******************************************/
|
||||
{
|
||||
// 查出所有子级的id
|
||||
List<LngSupplierBank> lngSupplierBankList = supplierLngSupplierBankMapper.selectList(Wrappers.lambdaQuery(LngSupplierBank.class).eq(LngSupplierBank::getSuCode, lngSupplier.getSuCode()).select(LngSupplierBank::getId));
|
||||
List<Long> lngSupplierBankIds = lngSupplierBankList.stream().map(LngSupplierBank::getId).collect(Collectors.toList());
|
||||
//原有子表单 没有被删除的主键
|
||||
List<Long> lngSupplierBankOldIds = lngSupplier.getLngSupplierBankList().stream().map(LngSupplierBank::getId).filter(Objects::nonNull).collect(Collectors.toList());
|
||||
//找到需要删除的id
|
||||
List<Long> lngSupplierBankRemoveIds = lngSupplierBankIds.stream().filter(item -> !lngSupplierBankOldIds.contains(item)).collect(Collectors.toList());
|
||||
|
||||
for (LngSupplierBank lngSupplierBank : lngSupplier.getLngSupplierBankList()) {
|
||||
//如果不等于空则修改
|
||||
if (lngSupplierBank.getId() != null) {
|
||||
supplierLngSupplierBankMapper.updateById(lngSupplierBank);
|
||||
}
|
||||
//如果等于空 则新增
|
||||
else {
|
||||
//已经不存在的id 删除
|
||||
lngSupplierBank.setSuCode(lngSupplier.getSuCode());
|
||||
supplierLngSupplierBankMapper.insert(lngSupplierBank);
|
||||
}
|
||||
}
|
||||
//已经不存在的id 删除
|
||||
if(lngSupplierBankRemoveIds.size() > 0){
|
||||
supplierLngSupplierBankMapper.deleteBatchIds(lngSupplierBankRemoveIds);
|
||||
}
|
||||
}
|
||||
//********************************* LngSupplierBank 增删改 结束 *******************************************/
|
||||
|
||||
//********************************* LngSupplierContact 增删改 开始 *******************************************/
|
||||
{
|
||||
// 查出所有子级的id
|
||||
List<LngSupplierContact> lngSupplierContactList = supplierLngSupplierContactMapper.selectList(Wrappers.lambdaQuery(LngSupplierContact.class).eq(LngSupplierContact::getSuCode, lngSupplier.getSuCode()).select(LngSupplierContact::getId));
|
||||
List<Long> lngSupplierContactIds = lngSupplierContactList.stream().map(LngSupplierContact::getId).collect(Collectors.toList());
|
||||
//原有子表单 没有被删除的主键
|
||||
List<Long> lngSupplierContactOldIds = lngSupplier.getLngSupplierContactList().stream().map(LngSupplierContact::getId).filter(Objects::nonNull).collect(Collectors.toList());
|
||||
//找到需要删除的id
|
||||
List<Long> lngSupplierContactRemoveIds = lngSupplierContactIds.stream().filter(item -> !lngSupplierContactOldIds.contains(item)).collect(Collectors.toList());
|
||||
|
||||
for (LngSupplierContact lngSupplierContact : lngSupplier.getLngSupplierContactList()) {
|
||||
//如果不等于空则修改
|
||||
if (lngSupplierContact.getId() != null) {
|
||||
supplierLngSupplierContactMapper.updateById(lngSupplierContact);
|
||||
}
|
||||
//如果等于空 则新增
|
||||
else {
|
||||
//已经不存在的id 删除
|
||||
lngSupplierContact.setSuCode(lngSupplier.getSuCode());
|
||||
supplierLngSupplierContactMapper.insert(lngSupplierContact);
|
||||
}
|
||||
}
|
||||
//已经不存在的id 删除
|
||||
if(lngSupplierContactRemoveIds.size() > 0){
|
||||
supplierLngSupplierContactMapper.deleteBatchIds(lngSupplierContactRemoveIds);
|
||||
}
|
||||
}
|
||||
//********************************* LngSupplierContact 增删改 结束 *******************************************/
|
||||
|
||||
//********************************* LngSupplierDoc 增删改 开始 *******************************************/
|
||||
{
|
||||
// 查出所有子级的id
|
||||
List<LngSupplierDoc> lngSupplierDocList = supplierLngSupplierDocMapper.selectList(Wrappers.lambdaQuery(LngSupplierDoc.class).eq(LngSupplierDoc::getSuCode, lngSupplier.getSuCode()).select(LngSupplierDoc::getId));
|
||||
List<Long> lngSupplierDocIds = lngSupplierDocList.stream().map(LngSupplierDoc::getId).collect(Collectors.toList());
|
||||
//原有子表单 没有被删除的主键
|
||||
List<Long> lngSupplierDocOldIds = lngSupplier.getLngSupplierDocList().stream().map(LngSupplierDoc::getId).filter(Objects::nonNull).collect(Collectors.toList());
|
||||
//找到需要删除的id
|
||||
List<Long> lngSupplierDocRemoveIds = lngSupplierDocIds.stream().filter(item -> !lngSupplierDocOldIds.contains(item)).collect(Collectors.toList());
|
||||
|
||||
for (LngSupplierDoc lngSupplierDoc : lngSupplier.getLngSupplierDocList()) {
|
||||
//如果不等于空则修改
|
||||
if (lngSupplierDoc.getId() != null) {
|
||||
supplierLngSupplierDocMapper.updateById(lngSupplierDoc);
|
||||
}
|
||||
//如果等于空 则新增
|
||||
else {
|
||||
//已经不存在的id 删除
|
||||
lngSupplierDoc.setSuCode(lngSupplier.getSuCode());
|
||||
supplierLngSupplierDocMapper.insert(lngSupplierDoc);
|
||||
}
|
||||
}
|
||||
//已经不存在的id 删除
|
||||
if(lngSupplierDocRemoveIds.size() > 0){
|
||||
supplierLngSupplierDocMapper.deleteBatchIds(lngSupplierDocRemoveIds);
|
||||
}
|
||||
}
|
||||
//********************************* LngSupplierDoc 增删改 结束 *******************************************/
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public Boolean delete(List<Long> ids) {
|
||||
supplierLngSupplierMapper.deleteBatchIds(ids);
|
||||
supplierLngSupplierBankMapper.delete(Wrappers.lambdaQuery(LngSupplierBank.class).in(LngSupplierBank::getSuCode, ids));
|
||||
supplierLngSupplierContactMapper.delete(Wrappers.lambdaQuery(LngSupplierContact.class).in(LngSupplierContact::getSuCode, ids));
|
||||
supplierLngSupplierDocMapper.delete(Wrappers.lambdaQuery(LngSupplierDoc.class).in(LngSupplierDoc::getSuCode, ids));
|
||||
|
||||
return true;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user