diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/AddLngFileUploadDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/AddLngFileUploadDto.java index 787cf18..20407ef 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/AddLngFileUploadDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/AddLngFileUploadDto.java @@ -63,7 +63,7 @@ public class AddLngFileUploadDto implements Serializable { */ @ApiModelProperty("") @LogField(name="",index=0) - private Long filesize; + private Long fileSize; /** * */ @@ -82,5 +82,9 @@ public class AddLngFileUploadDto implements Serializable { @ApiModelProperty("") @LogField(name="",index=0) private Long tenantId; + + @LogField(name="",index=10) + @ApiModelProperty("") + private Long xjrFileId; } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngFileUploadDto.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngFileUploadDto.java index e230d7a..c2c7bd7 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngFileUploadDto.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngFileUploadDto.java @@ -80,7 +80,7 @@ public class UpdateLngFileUploadDto implements Serializable { */ @LogField(name="",index=6) @ApiModelProperty("") - private Long filesize; + private Long fileSize; /** * @@ -103,5 +103,7 @@ public class UpdateLngFileUploadDto implements Serializable { @ApiModelProperty("") private Long tenantId; - + @LogField(name="",index=10) + @ApiModelProperty("") + private Long xjrFileId; } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngFileUploadVo.java b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngFileUploadVo.java index f05f4df..bee7962 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngFileUploadVo.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngFileUploadVo.java @@ -9,6 +9,7 @@ import java.math.BigDecimal; import java.util.List; import com.baomidou.mybatisplus.annotation.TableField; +import com.pictc.annotations.datalog.LogField; /** * @title: 表单出参 @@ -65,7 +66,7 @@ public class LngFileUploadVo { * */ @ApiModelProperty("") - private Long filesize; + private Long fileSize; /** @@ -134,5 +135,9 @@ public class LngFileUploadVo { @ApiModelProperty("") private String presignedUrl; + + @LogField(name="",index=10) + @ApiModelProperty("") + private Long xjrFileId; } diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/entity/LngFileUpload.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/entity/LngFileUpload.java index effac17..97cc2b2 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/entity/LngFileUpload.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/entity/LngFileUpload.java @@ -71,7 +71,7 @@ public class LngFileUpload implements Serializable { * */ @ApiModelProperty("") - private Long filesize; + private Long fileSize; /** * @@ -136,5 +136,8 @@ public class LngFileUpload implements Serializable { @ApiModelProperty("") @TableField(exist = false) private String presignedUrl; + + //@ApiModelProperty("") + //private Long xjrFileId; } \ No newline at end of file diff --git a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/service/impl/CustomerServiceImpl.java b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/service/impl/CustomerServiceImpl.java index 75f92a9..a1b57c7 100644 --- a/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/service/impl/CustomerServiceImpl.java +++ b/itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/sales/service/impl/CustomerServiceImpl.java @@ -84,10 +84,10 @@ public class CustomerServiceImpl extends MPJBaseServiceImpl