Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
jiedao-api-boot-master
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lanbaoming
jiedao-api-boot-master
Commits
09fec791
Commit
09fec791
authored
Jul 03, 2024
by
lanbaoming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
2024-07-03-2提交
parent
28573096
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
8 additions
and
11 deletions
+8
-11
FileModel.java
.../cn/iocoder/yudao/framework/common/util/io/FileModel.java
+1
-1
ReportCustomerAnalysisExcelExportEvent.java
.../event/export/ReportCustomerAnalysisExcelExportEvent.java
+0
-1
ReportSalesAnalysisExcelExportEvent.java
...ore/event/export/ReportSalesAnalysisExcelExportEvent.java
+1
-1
ShipmentReceivableExcelExportPushEvent2.java
...event/export/ShipmentReceivableExcelExportPushEvent2.java
+0
-1
CustomerAnalysisControl.java
...le/delivery/controller/admin/CustomerAnalysisControl.java
+1
-1
EcwReportPermissionController.java
...ivery/controller/admin/EcwReportPermissionController.java
+1
-1
SalesAnalysisResp.java
...coder/yudao/module/delivery/entity/SalesAnalysisResp.java
+1
-1
SalesReportImpl.java
...r/yudao/module/delivery/service/Impl/SalesReportImpl.java
+1
-2
ReceiptItemResp.java
...r/yudao/module/wealth/vo/receiptItem/ReceiptItemResp.java
+2
-2
No files found.
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/io/FileModel.java
View file @
09fec791
...
...
@@ -3,7 +3,7 @@ package cn.iocoder.yudao.framework.common.util.io;
import
lombok.Data
;
/*
lanbm 2024-05-31 add
上传文件数据结构
*/
@Data
...
...
yudao-framework/yudao-spring-boot-starter-config/src/main/java/cn/iocoder/yudao/framework/apollo/core/event/export/ReportCustomerAnalysisExcelExportEvent.java
View file @
09fec791
...
...
@@ -4,7 +4,6 @@ import io.swagger.annotations.ApiModelProperty;
import
lombok.Data
;
/*
lanbm 2024-05-01 add
销售分析报表导出excel
*/
@Data
...
...
yudao-framework/yudao-spring-boot-starter-config/src/main/java/cn/iocoder/yudao/framework/apollo/core/event/export/ReportSalesAnalysisExcelExportEvent.java
View file @
09fec791
...
...
@@ -4,7 +4,7 @@ import io.swagger.annotations.ApiModelProperty;
import
lombok.Data
;
/*
客户分析报表导出
lanbm 2024-05-01 add
客户分析报表导出
*/
@Data
public
class
ReportSalesAnalysisExcelExportEvent
{
...
...
yudao-framework/yudao-spring-boot-starter-config/src/main/java/cn/iocoder/yudao/framework/apollo/core/event/export/ShipmentReceivableExcelExportPushEvent2.java
View file @
09fec791
...
...
@@ -4,7 +4,6 @@ import io.swagger.annotations.ApiModelProperty;
import
lombok.Data
;
/*
lanbm 2024-05-25 lanbm add
*/
@Data
public
class
ShipmentReceivableExcelExportPushEvent2
{
...
...
yudao-module-delivery/yudao-module-delivery-rest/src/main/java/cn/iocoder/yudao/module/delivery/controller/admin/CustomerAnalysisControl.java
View file @
09fec791
...
...
@@ -53,7 +53,7 @@ import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.E
/**
* (CustomerAnalysis)客户分析报表
*
* @author
lanbm
* @author
* @since 2024-03-27 21:25:55
*/
@RestController
...
...
yudao-module-delivery/yudao-module-delivery-rest/src/main/java/cn/iocoder/yudao/module/delivery/controller/admin/EcwReportPermissionController.java
View file @
09fec791
...
...
@@ -28,7 +28,7 @@ import java.util.List;
/**
* 报表权限(EcwReportPermission)表控制层
*
* @author
lanbm
* @author
* @since 2024-04-09 23:10:39
*/
@RestController
...
...
yudao-module-delivery/yudao-module-delivery-rest/src/main/java/cn/iocoder/yudao/module/delivery/entity/SalesAnalysisResp.java
View file @
09fec791
...
...
@@ -70,7 +70,7 @@ public class SalesAnalysisResp {
private
long
shCustomerId
;
/*
资源类型
lanbm 2024-04-29 add
资源类型
*/
private
String
cfResourceType
;
//发货人资源类型
private
String
shResourceType
;
//收货人资源类型
...
...
yudao-module-delivery/yudao-module-delivery-rest/src/main/java/cn/iocoder/yudao/module/delivery/service/Impl/SalesReportImpl.java
View file @
09fec791
...
...
@@ -406,8 +406,7 @@ public class SalesReportImpl implements SalesReportService {
}
/*
计算百分比
lanbm 2024-04-10 add
计算百分比d
*/
private
String
getPercentage
(
BigDecimal
part
,
BigDecimal
total
)
{
BigDecimal
percentage
=
part
.
divide
(
total
,
5
,
...
...
yudao-module-wealth/yudao-module-wealth-core/src/main/java/cn/iocoder/yudao/module/wealth/vo/receiptItem/ReceiptItemResp.java
View file @
09fec791
...
...
@@ -134,13 +134,13 @@ public class ReceiptItemResp {
private
String
createBpm
;
/*
提交审批时间
lanbm 2024-06-07
提交审批时间
*/
@JsonFormat
(
pattern
=
FORMAT_YEAR_MONTH_DAY
)
private
Date
createTimeBpm
;
/*
审批通过时间
lanbm 2024-06-07
审批通过时间
*/
@JsonFormat
(
pattern
=
FORMAT_YEAR_MONTH_DAY
)
private
Date
updateTimeBpm
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment