Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
D
data-acquisition
Project
Project
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
竹天卫
data-acquisition
Commits
57e2efef
Commit
57e2efef
authored
Jun 08, 2021
by
罗贤顺
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复问题
parent
c48fa0ad
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
7 additions
and
5 deletions
+7
-5
TProcessesCrusher.java
...ise/sc/acquisition/business/entity/TProcessesCrusher.java
+1
-1
ProjectEnum.java
...n/wise/sc/acquisition/business/enumation/ProjectEnum.java
+3
-1
TProcessesCrusherQuery.java
...uisition/business/model/query/TProcessesCrusherQuery.java
+1
-1
TProcessesBlastServiceImpl.java
...ion/business/service/impl/TProcessesBlastServiceImpl.java
+1
-1
TProcessesCrusherMapper.xml
...c/acquisition/business/mapper/TProcessesCrusherMapper.xml
+1
-1
No files found.
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TProcessesCrusher.java
View file @
57e2efef
...
@@ -35,7 +35,7 @@ public class TProcessesCrusher implements Serializable {
...
@@ -35,7 +35,7 @@ public class TProcessesCrusher implements Serializable {
/**
/**
* 破碎站名称
* 破碎站名称
*/
*/
@TableField
(
"CrusherStation
Name
"
)
@TableField
(
"CrusherStation
ID
"
)
private
String
CrusherStationID
;
private
String
CrusherStationID
;
/**
/**
...
...
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/enumation/ProjectEnum.java
View file @
57e2efef
...
@@ -258,7 +258,9 @@ public class ProjectEnum {
...
@@ -258,7 +258,9 @@ public class ProjectEnum {
A
(
1
,
"a."
,
"别名a"
),
A
(
1
,
"a."
,
"别名a"
),
B
(
2
,
"b."
,
"别名b"
);
B
(
2
,
"b."
,
"别名b"
),
C
(
3
,
"c."
,
"别名c"
);
// 成员变量
// 成员变量
private
int
value
;
private
int
value
;
...
...
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/model/query/TProcessesCrusherQuery.java
View file @
57e2efef
...
@@ -34,7 +34,7 @@ public class TProcessesCrusherQuery {
...
@@ -34,7 +34,7 @@ public class TProcessesCrusherQuery {
/**
/**
* 破碎站名称
* 破碎站名称
*/
*/
@ApiModelProperty
(
"CrusherStation
Name
"
)
@ApiModelProperty
(
"CrusherStation
ID
"
)
private
String
CrusherStationID
;
private
String
CrusherStationID
;
/**
/**
...
...
acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesBlastServiceImpl.java
View file @
57e2efef
...
@@ -57,7 +57,7 @@ public class TProcessesBlastServiceImpl extends ServiceImpl<TProcessesBlastMappe
...
@@ -57,7 +57,7 @@ public class TProcessesBlastServiceImpl extends ServiceImpl<TProcessesBlastMappe
//如果设计时间不为空 因为涉及到表连接,需要创建字段别名
//如果设计时间不为空 因为涉及到表连接,需要创建字段别名
if
(
tProcessesBlastQuery
.
getBlastDate
()
!=
null
)
{
if
(
tProcessesBlastQuery
.
getBlastDate
()
!=
null
)
{
StringBuilder
stringBuilder
=
new
StringBuilder
();
StringBuilder
stringBuilder
=
new
StringBuilder
();
stringBuilder
.
append
(
ProjectEnum
.
TableAlias
.
A
.
getLabel
()).
append
(
ProjectEnum
.
TProcessesBlast
.
BLAST_DATE
.
getLabel
());
stringBuilder
.
append
(
ProjectEnum
.
TableAlias
.
C
.
getLabel
()).
append
(
ProjectEnum
.
TProcessesBlast
.
BLAST_DATE
.
getLabel
());
//前端传来的时间可能为2021-04-05 17:37:33.000, 需要查询 2021-04-05 00:00:00 到 2021-04-05 23:59:59 的数据 故作处理
//前端传来的时间可能为2021-04-05 17:37:33.000, 需要查询 2021-04-05 00:00:00 到 2021-04-05 23:59:59 的数据 故作处理
queryWrapper
queryWrapper
.
ge
(
stringBuilder
.
toString
(),
DateUtil
.
getBeginTimeStr
(
tProcessesBlastQuery
.
getBlastDate
()))
.
ge
(
stringBuilder
.
toString
(),
DateUtil
.
getBeginTimeStr
(
tProcessesBlastQuery
.
getBlastDate
()))
...
...
acquisition-business/target/classes/cn/wise/sc/acquisition/business/mapper/TProcessesCrusherMapper.xml
View file @
57e2efef
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
<!-- 表和实体字段对照关系, 类似RestultMap -->
<!-- 表和实体字段对照关系, 类似RestultMap -->
<sql
id=
"TProcessesCrusherColumns"
>
<sql
id=
"TProcessesCrusherColumns"
>
a.Uid,
a.Uid,
a.CrusherStation
Name
,
a.CrusherStation
ID
,
a.CrushDate,
a.CrushDate,
a.Manager,
a.Manager,
a.Supervisor,
a.Supervisor,
...
...
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