Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gic-evaluate
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
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
base_platform_enterprise
gic-evaluate
Commits
5419079c
Commit
5419079c
authored
Sep 08, 2020
by
zhiwj
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
代码规范
parent
4b333294
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
21 additions
and
11 deletions
+21
-11
TabProblemMapper.java
...in/java/com/gic/evaluate/dao/mapper/TabProblemMapper.java
+1
-1
TabProblemReply.java
...rc/main/java/com/gic/evaluate/entity/TabProblemReply.java
+1
-1
EvaluateServiceImpl.java
...va/com/gic/evaluate/service/impl/EvaluateServiceImpl.java
+12
-2
EvaluateOverviewApiServiceImpl.java
...te/service/outer/impl/EvaluateOverviewApiServiceImpl.java
+2
-2
ProblemManageApiServiceImpl.java
...luate/service/outer/impl/ProblemManageApiServiceImpl.java
+2
-2
ProblemOutApiServiceImpl.java
...evaluate/service/outer/impl/ProblemOutApiServiceImpl.java
+3
-3
No files found.
gic-evaluate-service/src/main/java/com/gic/evaluate/dao/mapper/TabProblemMapper.java
View file @
5419079c
...
...
@@ -14,7 +14,7 @@ import java.util.List;
* @ClassName: TabProblemMapper
* @Description:
* @author zhiwj
* @date 2020-09-08 1
8:50
* @date 2020-09-08 1
9:05
*/
public
interface
TabProblemMapper
{
/**
...
...
gic-evaluate-service/src/main/java/com/gic/evaluate/entity/TabProblemReply.java
View file @
5419079c
...
...
@@ -10,7 +10,7 @@ import java.util.Date;
* @ClassName: TabProblemReply
* @Description:
* @author zhiwj
* @date 2020-09-08 1
8:50
* @date 2020-09-08 1
9:06
*/
public
class
TabProblemReply
{
/**
...
...
gic-evaluate-service/src/main/java/com/gic/evaluate/service/impl/EvaluateServiceImpl.java
View file @
5419079c
...
...
@@ -32,6 +32,16 @@ import java.util.*;
@Service
public
class
EvaluateServiceImpl
implements
EvaluateService
{
/**
* 产品要求查4年
*/
static
Integer
YEAR_NUM
=
4
;
/**
* 月数
*/
static
Integer
MONTH_NUM
=
4
;
@Autowired
private
TabEvaluateMapper
tabEvaluateMapper
;
private
Logger
logger
=
LogManager
.
getLogger
(
EvaluateServiceImpl
.
class
);
...
...
@@ -306,7 +316,7 @@ public class EvaluateServiceImpl implements EvaluateService {
private
List
<
String
>
getYear
()
{
List
<
String
>
list
=
new
ArrayList
<>();
int
year
=
DateUtil
.
getYear
(
new
Date
());
for
(
int
i
=
0
;
i
<=
4
;
i
++)
{
for
(
int
i
=
0
;
i
<=
YEAR_NUM
;
i
++)
{
list
.
add
((
year
-
i
)
+
""
);
}
return
list
;
...
...
@@ -316,7 +326,7 @@ public class EvaluateServiceImpl implements EvaluateService {
List
<
String
>
list
=
new
ArrayList
<>();
int
year
=
DateUtil
.
getYear
(
new
Date
());
DecimalFormat
decimalFormat
=
new
DecimalFormat
(
"00"
);
for
(
int
i
=
1
;
i
<=
12
;
i
++)
{
for
(
int
i
=
1
;
i
<=
MONTH_NUM
;
i
++)
{
String
month
=
year
+
"-"
+
decimalFormat
.
format
(
i
);
list
.
add
(
month
);
}
...
...
gic-evaluate-service/src/main/java/com/gic/evaluate/service/outer/impl/EvaluateOverviewApiServiceImpl.java
View file @
5419079c
...
...
@@ -218,8 +218,8 @@ public class EvaluateOverviewApiServiceImpl implements EvaluateOverviewApiServic
Calendar
cal2
=
Calendar
.
getInstance
();
cal2
.
setTime
(
endTimeDate
);
long
time2
=
cal2
.
getTimeInMillis
();
long
between
_d
ays
=
(
time2
-
time1
)
/
86400000L
;
int
days
=
Integer
.
parseInt
(
String
.
valueOf
(
between
_d
ays
));
long
between
D
ays
=
(
time2
-
time1
)
/
86400000L
;
int
days
=
Integer
.
parseInt
(
String
.
valueOf
(
between
D
ays
));
int
step
=
days
/
5
;
cal1
.
add
(
Calendar
.
DAY_OF_MONTH
,
step
);
...
...
gic-evaluate-service/src/main/java/com/gic/evaluate/service/outer/impl/ProblemManageApiServiceImpl.java
View file @
5419079c
...
...
@@ -45,8 +45,8 @@ public class ProblemManageApiServiceImpl implements ProblemManageApiService {
@Override
public
ServiceResponse
<
Page
<
ProblemDTO
>>
listProblem
(
ProblemQO
problemQO
)
{
com
.
github
.
pagehelper
.
Page
<
TabProblem
>
problemList
=
problemService
.
listProblem
(
problemQO
);
Page
<
ProblemDTO
>
problemD
TO
Page
=
PageHelperUtils
.
changePageHelperToCurrentPage
(
problemList
,
ProblemDTO
.
class
);
return
EnterpriseServiceResponse
.
success
(
problemD
TO
Page
);
Page
<
ProblemDTO
>
problemD
to
Page
=
PageHelperUtils
.
changePageHelperToCurrentPage
(
problemList
,
ProblemDTO
.
class
);
return
EnterpriseServiceResponse
.
success
(
problemD
to
Page
);
}
@Override
...
...
gic-evaluate-service/src/main/java/com/gic/evaluate/service/outer/impl/ProblemOutApiServiceImpl.java
View file @
5419079c
...
...
@@ -66,9 +66,9 @@ public class ProblemOutApiServiceImpl implements ProblemOutApiService {
problemDTO
.
setHasOtherImage
(
imgList
.
size
()
>
1
?
Constants
.
OPEN
:
Constants
.
CLOSE
);
}
ServiceResponse
<
MemberUserDTO
>
memberUserD
TO
ServiceResponse
=
memberUserApiService
.
getByMcuId
(
problemDTO
.
getMemberId
(),
problemDTO
.
getEnterpriseId
());
if
(
memberUserD
TO
ServiceResponse
.
isSuccess
())
{
MemberUserDTO
memberUserDTO
=
memberUserD
TO
ServiceResponse
.
getResult
();
ServiceResponse
<
MemberUserDTO
>
memberUserD
to
ServiceResponse
=
memberUserApiService
.
getByMcuId
(
problemDTO
.
getMemberId
(),
problemDTO
.
getEnterpriseId
());
if
(
memberUserD
to
ServiceResponse
.
isSuccess
())
{
MemberUserDTO
memberUserDTO
=
memberUserD
to
ServiceResponse
.
getResult
();
problemDTO
.
setMemberName
(
memberUserDTO
.
getName
());
problemDTO
.
setMemberPhone
(
memberUserDTO
.
getMobile
());
// 门店
...
...
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