diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractSalesLngDiscVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractSalesLngDiscVo.java index ba685b7..13ee1e2 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractSalesLngDiscVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractSalesLngDiscVo.java @@ -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; diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractSalesLngQtyVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractSalesLngQtyVo.java index 4539b7a..59bad8f 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractSalesLngQtyVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractSalesLngQtyVo.java @@ -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; diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractSalesVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractSalesVo.java index 50e8257..02c085b 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractSalesVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractSalesVo.java @@ -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; diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/service/impl/ContractPurPngServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/service/impl/ContractPurPngServiceImpl.java index 849e03a..30614cf 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/service/impl/ContractPurPngServiceImpl.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/service/impl/ContractPurPngServiceImpl.java @@ -50,10 +50,7 @@ public class ContractPurPngServiceImpl extends MPJBaseServiceImpl