Skip to content
Toggle navigation
Projects
Groups
Snippets
Help
yangxiujun
/
paidan_demo
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit 7abb9edf
authored
Nov 16, 2023
by
Ren Ping
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:博西PEA_V1.0-排班结果:工作队没有工程师的人均统计值显示null
1 parent
1f4324a1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
12 deletions
project-dispatch/src/main/resources/application-dev.yaml
project-order/src/main/java/com/dituhui/pea/order/service/impl/ScheduleServiceImpl.java
project-dispatch/src/main/resources/application-dev.yaml
View file @
7abb9ed
...
...
@@ -3,7 +3,7 @@ server:
dispatch
:
cron
:
expr
:
0
32
8-23 * * ?
expr
:
0
25
8-23 * * ?
next-day-limit
:
20
# expr: 0 */10 8-18 * * ?
...
...
@@ -49,13 +49,13 @@ spring:
enabled
:
false
datasource
:
driver-class-name
:
com.mysql.cj.jdbc.Driver
#
url: jdbc:mysql://127.0.0.1:3306/saas_aftersale_test?serverTimezone=Asia/Shanghai
#
username: root
#
password: 123456
url
:
jdbc:mysql://localhost:32306/saas_aftersale_test?serverTimezone=Asia/Shanghai
username
:
boxi
password
:
boxi_dev_0725
type
:
com.alibaba.druid.pool.DruidDataSource
url
:
jdbc:mysql://127.0.0.1:3306/saas_aftersale_test?serverTimezone=Asia/Shanghai
username
:
root
password
:
123456
#
url: jdbc:mysql://localhost:32306/saas_aftersale_test?serverTimezone=Asia/Shanghai
#
username: boxi
#
password: boxi_dev_0725
#
type: com.alibaba.druid.pool.DruidDataSource
jpa
:
show-sql
:
true
...
...
project-order/src/main/java/com/dituhui/pea/order/service/impl/ScheduleServiceImpl.java
View file @
7abb9ed
...
...
@@ -128,10 +128,10 @@ public class ScheduleServiceImpl implements ScheduleService {
List
<
ScheduleOverviewResp
.
Item
>
children
=
new
ArrayList
<>();
Integer
teamDistance
=
0
;
Integer
minOrderSum
=
null
;
Integer
maxOrderSum
=
null
;
Integer
minDistance
=
null
;
Integer
maxDistance
=
null
;
Integer
minOrderSum
=
0
;
Integer
maxOrderSum
=
0
;
Integer
minDistance
=
0
;
Integer
maxDistance
=
0
;
for
(
Map
.
Entry
<
String
,
List
<
EngineerInfoEntity
>>
entry
:
engineers
.
entrySet
())
{
ScheduleOverviewResp
.
Item
child
=
new
ScheduleOverviewResp
.
Item
();
...
...
Write
Preview
Markdown
is supported
Attach a file
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 post a comment