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

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

Browse Source
This commit is contained in:
张秉卓
2026-02-04 10:00:16 +08:00
parent 891111b0be 4393948065
commit 466342fec5
32 changed files with 2556 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesDto.java
View File

@ -4,6 +4,7 @@ import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.List;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.pictc.annotations.datalog.JoinCaseType;
import com.pictc.annotations.datalog.JoinType;
import com.pictc.annotations.datalog.LogAttrField;
@ -106,6 +107,7 @@ public class UpdateLngContractSalesDto implements Serializable {
*/
@LogField(name="合同签订日期",index=10)
@ApiModelProperty("合同签订日期")
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDateTime dateSign;
/**
@ -113,6 +115,7 @@ public class UpdateLngContractSalesDto implements Serializable {
*/
@LogField(name="有效期开始",index=11)
@ApiModelProperty("有效期开始")
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDateTime dateFrom;
/**
@ -120,6 +123,7 @@ public class UpdateLngContractSalesDto implements Serializable {
*/
@LogField(name="有效期结束",index=12)
@ApiModelProperty("有效期结束")
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDateTime dateTo;
/**
@ -127,6 +131,7 @@ public class UpdateLngContractSalesDto implements Serializable {
*/
@LogField(name="确认函开始日",index=13)
@ApiModelProperty("确认函开始日")
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDateTime dateCfmFrom;
/**
@ -134,6 +139,7 @@ public class UpdateLngContractSalesDto implements Serializable {
*/
@LogField(name="确认函结束日",index=14)
@ApiModelProperty("确认函结束日")
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDateTime dateCfmTo;
/**
@ -187,35 +193,46 @@ public class UpdateLngContractSalesDto implements Serializable {
/**
* lngContractPurPng
* lngContractSalesLng
*/
@ApiModelProperty("lngContractPurPng子表")
@LogJoin(name = "lngContractPurPng子表",
@ApiModelProperty("lngContractSalesLng子表")
@LogJoin(name = "lngContractSalesLng子表",
columns = {
@LogJoinColumn(field = "id",relatedField = "kId", valueDirection = ValueDirectionType.RIGHT)
},
caseType = JoinCaseType.FULL, target = UpdateLngContractPurPngDto.class, type = JoinType.MANY)
private List<UpdateLngContractPurPngDto> lngContractPurPngList;
caseType = JoinCaseType.FULL, target = UpdateLngContractSalesLngDto.class, type = JoinType.MANY)
private List<UpdateLngContractSalesLngDto> lngContractSalesLngList;
/**
* lngContractPurPngPoint
* LngContractSalesLngSta
*/
@ApiModelProperty("lngContractPurPngPoint子表")
@LogJoin(name = "lngContractPurPngPoint子表",
@ApiModelProperty("LngContractSalesLngSta子表")
@LogJoin(name = "LngContractSalesLngSta子表",
columns = {
@LogJoinColumn(field = "id",relatedField = "kId", valueDirection = ValueDirectionType.RIGHT)
},
caseType = JoinCaseType.FULL, target = UpdateLngContractPurPngPointDto.class, type = JoinType.MANY)
private List<UpdateLngContractPurPngPointDto> lngContractPurPngPointList;
caseType = JoinCaseType.FULL, target = UpdateLngContractSalesLngStaDto.class, type = JoinType.MANY)
private List<UpdateLngContractSalesLngStaDto> lngContractSalesLngStaList;
/**
* lngContractPurPngQty
* LngContractSalesLngSta
*/
@ApiModelProperty("LngContractSalesLngDisc子表")
@LogJoin(name = "LngContractSalesLngDisc子表",
columns = {
@LogJoinColumn(field = "id",relatedField = "kId", valueDirection = ValueDirectionType.RIGHT)
},
caseType = JoinCaseType.FULL, target = UpdateLngContractSalesLngDiscDto.class, type = JoinType.MANY)
private List<UpdateLngContractSalesLngDiscDto> lngContractSalesLngDiscList;
/**
* lngContractSalesLngQty
*/
@ApiModelProperty("lngContractPurPngQty子表")
@LogJoin(name = "lngContractPurPngQty子表",
@ApiModelProperty("LngContractSalesLngQty子表")
@LogJoin(name = "LngContractSalesLngQty子表",
columns = {
@LogJoinColumn(field = "id",relatedField = "kId", valueDirection = ValueDirectionType.RIGHT)
},
caseType = JoinCaseType.FULL, target = UpdateLngContractPurPngQtyDto.class, type = JoinType.MANY)
private List<UpdateLngContractPurPngQtyDto> lngContractPurPngQtyList;
caseType = JoinCaseType.FULL, target = UpdateLngContractSalesLngQtyDto.class, type = JoinType.MANY)
private List<UpdateLngContractSalesLngQtyDto> lngContractSalesLngQtyList;
/**
* lngContractApproRel
*/

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

@ -3,6 +3,7 @@ package com.xjrsoft.module.contract.dto;
import java.io.Serializable;
import java.time.LocalDateTime;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.pictc.annotations.datalog.LogField;
import com.pictc.annotations.datalog.LogTable;
@ -50,6 +51,7 @@ public class UpdateLngContractSalesLngDiscDto implements Serializable {
*/
@LogField(name="开始日期",index=3)
@ApiModelProperty("开始日期")
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDateTime dateFrom;
/**
@ -57,6 +59,7 @@ public class UpdateLngContractSalesLngDiscDto implements Serializable {
*/
@LogField(name="结束日期",index=4)
@ApiModelProperty("结束日期")
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDateTime dateTo;
/**

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

@ -4,6 +4,7 @@ import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.pictc.annotations.datalog.LogField;
import com.pictc.annotations.datalog.LogTable;
@ -44,6 +45,7 @@ public class UpdateLngContractSalesLngQtyDto implements Serializable {
*/
@LogField(name="开始日期",index=2)
@ApiModelProperty("开始日期")
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDateTime dateFrom;
/**
@ -51,6 +53,7 @@ public class UpdateLngContractSalesLngQtyDto implements Serializable {
*/
@LogField(name="结束日期",index=3)
@ApiModelProperty("结束日期")
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDateTime dateTo;
/**

15
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractFactRelVo.java
View File

@ -88,6 +88,7 @@ public class LngContractFactRelVo extends com.xjrsoft.common.model.base.BaseMode
*/
@ApiModelProperty("部门id")
private Long deptId;
/**
@ -146,6 +147,20 @@ public class LngContractFactRelVo extends com.xjrsoft.common.model.base.BaseMode
*/
@ApiModelProperty("联系电话")
private String tel;
/**
* 业务部门ID
*/
@ApiModelProperty("业务部门ID")
@Trans(type = TransType.DEPT, transToFieldName = "bDeptName")
private Long bDeptId;
/**
* 业务部门名称
*/
@ApiModelProperty("业务部门名称")
private String bDeptName;
/**
* lngFileUpload

9
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractSalesLngDiscVo.java
View File

@ -2,6 +2,10 @@ package com.xjrsoft.module.contract.vo;
import java.time.LocalDateTime;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.xjrsoft.common.annotation.Trans;
import com.xjrsoft.common.enums.TransType;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -32,13 +36,17 @@ public class LngContractSalesLngDiscVo extends com.xjrsoft.common.model.base.Bas
* 返优惠类型(M1-月返利/Y-年返利/M2月间平均返利/CU-客户评价返利)
*/
@ApiModelProperty("返优惠类型(M1-月返利/Y-年返利/M2月间平均返利/CU-客户评价返利)")
@Trans(type = TransType.DIC, id = "2016806282214830081",transToFieldName = "discTypeName")
private String discTypeCode;
private String discTypeName;
/**
* 开始日期
*/
@ApiModelProperty("开始日期")
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDateTime dateFrom;
@ -46,6 +54,7 @@ public class LngContractSalesLngDiscVo extends com.xjrsoft.common.model.base.Bas
* 结束日期
*/
@ApiModelProperty("结束日期")
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDateTime dateTo;

3
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractSalesLngQtyVo.java
View File

@ -3,6 +3,7 @@ package com.xjrsoft.module.contract.vo;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.xjrsoft.common.annotation.Trans;
import com.xjrsoft.common.enums.TransType;
@ -36,6 +37,7 @@ public class LngContractSalesLngQtyVo extends com.xjrsoft.common.model.base.Base
* 开始日期
*/
@ApiModelProperty("开始日期")
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDateTime dateFrom;
@ -43,6 +45,7 @@ public class LngContractSalesLngQtyVo extends com.xjrsoft.common.model.base.Base
* 结束日期
*/
@ApiModelProperty("结束日期")
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDateTime dateTo;

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

@ -3,6 +3,7 @@ package com.xjrsoft.module.contract.vo;
import java.time.LocalDateTime;
import java.util.List;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.pictc.annotations.datalog.LogAttrField;
import com.xjrsoft.common.annotation.Trans;
import com.xjrsoft.common.enums.TransType;
@ -97,6 +98,7 @@ public class LngContractSalesVo extends com.xjrsoft.common.model.base.BaseModel{
* 合同签订日期
*/
@ApiModelProperty("合同签订日期")
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDateTime dateSign;
@ -104,6 +106,7 @@ public class LngContractSalesVo extends com.xjrsoft.common.model.base.BaseModel{
* 有效期开始
*/
@ApiModelProperty("有效期开始")
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDateTime dateFrom;
@ -111,6 +114,7 @@ public class LngContractSalesVo extends com.xjrsoft.common.model.base.BaseModel{
* 有效期结束
*/
@ApiModelProperty("有效期结束")
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDateTime dateTo;
@ -118,6 +122,7 @@ public class LngContractSalesVo extends com.xjrsoft.common.model.base.BaseModel{
* 确认函开始日
*/
@ApiModelProperty("确认函开始日")
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDateTime dateCfmFrom;
@ -125,6 +130,7 @@ public class LngContractSalesVo extends com.xjrsoft.common.model.base.BaseModel{
* 确认函结束日
*/
@ApiModelProperty("确认函结束日")
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDateTime dateCfmTo;