Commit 09fec791 authored by lanbaoming's avatar lanbaoming

2024-07-03-2提交

parent 28573096
...@@ -3,7 +3,7 @@ package cn.iocoder.yudao.framework.common.util.io; ...@@ -3,7 +3,7 @@ package cn.iocoder.yudao.framework.common.util.io;
import lombok.Data; import lombok.Data;
/* /*
lanbm 2024-05-31 add
上传文件数据结构 上传文件数据结构
*/ */
@Data @Data
......
...@@ -4,7 +4,6 @@ import io.swagger.annotations.ApiModelProperty; ...@@ -4,7 +4,6 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
/* /*
lanbm 2024-05-01 add
销售分析报表导出excel 销售分析报表导出excel
*/ */
@Data @Data
......
...@@ -4,7 +4,7 @@ import io.swagger.annotations.ApiModelProperty; ...@@ -4,7 +4,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
/* /*
客户分析报表导出 lanbm 2024-05-01 add 客户分析报表导出
*/ */
@Data @Data
public class ReportSalesAnalysisExcelExportEvent { public class ReportSalesAnalysisExcelExportEvent {
......
...@@ -4,7 +4,6 @@ import io.swagger.annotations.ApiModelProperty; ...@@ -4,7 +4,6 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
/* /*
lanbm 2024-05-25 lanbm add
*/ */
@Data @Data
public class ShipmentReceivableExcelExportPushEvent2 { public class ShipmentReceivableExcelExportPushEvent2 {
......
...@@ -53,7 +53,7 @@ import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.E ...@@ -53,7 +53,7 @@ import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.E
/** /**
* (CustomerAnalysis)客户分析报表 * (CustomerAnalysis)客户分析报表
* *
* @author lanbm * @author
* @since 2024-03-27 21:25:55 * @since 2024-03-27 21:25:55
*/ */
@RestController @RestController
......
...@@ -28,7 +28,7 @@ import java.util.List; ...@@ -28,7 +28,7 @@ import java.util.List;
/** /**
* 报表权限(EcwReportPermission)表控制层 * 报表权限(EcwReportPermission)表控制层
* *
* @author lanbm * @author
* @since 2024-04-09 23:10:39 * @since 2024-04-09 23:10:39
*/ */
@RestController @RestController
......
...@@ -70,7 +70,7 @@ public class SalesAnalysisResp { ...@@ -70,7 +70,7 @@ public class SalesAnalysisResp {
private long shCustomerId; private long shCustomerId;
/* /*
资源类型 lanbm 2024-04-29 add 资源类型
*/ */
private String cfResourceType;//发货人资源类型 private String cfResourceType;//发货人资源类型
private String shResourceType;//收货人资源类型 private String shResourceType;//收货人资源类型
......
...@@ -406,8 +406,7 @@ public class SalesReportImpl implements SalesReportService { ...@@ -406,8 +406,7 @@ public class SalesReportImpl implements SalesReportService {
} }
/* /*
计算百分比 计算百分比d
lanbm 2024-04-10 add
*/ */
private String getPercentage(BigDecimal part, BigDecimal total) { private String getPercentage(BigDecimal part, BigDecimal total) {
BigDecimal percentage = part.divide(total, 5, BigDecimal percentage = part.divide(total, 5,
......
...@@ -134,13 +134,13 @@ public class ReceiptItemResp { ...@@ -134,13 +134,13 @@ public class ReceiptItemResp {
private String createBpm; private String createBpm;
/* /*
提交审批时间 lanbm 2024-06-07 提交审批时间
*/ */
@JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY) @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY)
private Date createTimeBpm; private Date createTimeBpm;
/* /*
审批通过时间 lanbm 2024-06-07 审批通过时间
*/ */
@JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY) @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY)
private Date updateTimeBpm; private Date updateTimeBpm;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment