Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
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
项目统一框架
amos-boot-biz
Commits
9a0a15b1
Commit
9a0a15b1
authored
Feb 29, 2024
by
tangwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改版本bug
parent
ebd3ed75
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
5 deletions
+4
-5
AcceptanceMapper.xml
...-api/src/main/resources/mapper/mysql/AcceptanceMapper.xml
+1
-2
BasicGridAcceptanceMapper.xml
...main/resources/mapper/mysql/BasicGridAcceptanceMapper.xml
+1
-1
WorkOrderServiceImpl.java
...ot/module/hygf/biz/service/impl/WorkOrderServiceImpl.java
+2
-2
No files found.
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/AcceptanceMapper.xml
View file @
9a0a15b1
...
@@ -90,7 +90,6 @@
...
@@ -90,7 +90,6 @@
</if>
</if>
</where>
</where>
ORDER BY
ORDER BY
FIELD(bga.acceptance_status, '1', '2', '3', '4', '5', '6', '7', '11', '8', '9', '10'),
bga.acceptance_rec_date DESC,bga.rec_date desc
bga.rec_date desc, bga.acceptance_rec_date DESC
</select>
</select>
</mapper>
</mapper>
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/BasicGridAcceptanceMapper.xml
View file @
9a0a15b1
...
@@ -69,6 +69,6 @@
...
@@ -69,6 +69,6 @@
</where>
</where>
ORDER BY
ORDER BY
FIELD(hbga.grid_status, '1', '2', '4', '3'),
FIELD(hbga.grid_status, '1', '2', '4', '3'),
hbga.rec_date desc,
hogaa.grid_connection_time desc
hogaa.grid_connection_time desc
</select>
</select>
</mapper>
</mapper>
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/WorkOrderServiceImpl.java
View file @
9a0a15b1
...
@@ -531,7 +531,7 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto,WorkOrder,Wor
...
@@ -531,7 +531,7 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto,WorkOrder,Wor
LambdaQueryWrapper
<
ConstructionRecords
>
up5
=
new
LambdaQueryWrapper
();
LambdaQueryWrapper
<
ConstructionRecords
>
up5
=
new
LambdaQueryWrapper
();
up5
.
eq
(
ConstructionRecords:
:
getWorkOrderId
,
workOrderId
);
up5
.
eq
(
ConstructionRecords:
:
getWorkOrderId
,
workOrderId
);
up5
.
eq
(
ConstructionRecords:
:
getWorkOrderPowerStationId
,
workOrderPowerStationId
);
up5
.
eq
(
ConstructionRecords:
:
getWorkOrderPowerStationId
,
workOrderPowerStationId
);
up5
.
orderBy
De
sc
(
ConstructionRecords:
:
getRecDate
);
up5
.
orderBy
A
sc
(
ConstructionRecords:
:
getRecDate
);
List
<
ConstructionRecords
>
li
=
constructionRecordsMapper
.
selectList
(
up5
);
List
<
ConstructionRecords
>
li
=
constructionRecordsMapper
.
selectList
(
up5
);
ConstructionRecords
data
=
new
ConstructionRecords
();
ConstructionRecords
data
=
new
ConstructionRecords
();
data
.
setConstructionRecordsList
(
li
);
data
.
setConstructionRecordsList
(
li
);
...
@@ -694,7 +694,7 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto,WorkOrder,Wor
...
@@ -694,7 +694,7 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto,WorkOrder,Wor
LambdaQueryWrapper
<
ConstructionRecords
>
up5
=
new
LambdaQueryWrapper
();
LambdaQueryWrapper
<
ConstructionRecords
>
up5
=
new
LambdaQueryWrapper
();
up5
.
eq
(
ConstructionRecords:
:
getWorkOrderId
,
workOrderId
);
up5
.
eq
(
ConstructionRecords:
:
getWorkOrderId
,
workOrderId
);
up5
.
eq
(
ConstructionRecords:
:
getWorkOrderPowerStationId
,
workOrderPowerStationId
);
up5
.
eq
(
ConstructionRecords:
:
getWorkOrderPowerStationId
,
workOrderPowerStationId
);
up5
.
orderBy
De
sc
(
ConstructionRecords:
:
getRecDate
);
up5
.
orderBy
A
sc
(
ConstructionRecords:
:
getRecDate
);
List
<
ConstructionRecords
>
li
=
constructionRecordsMapper
.
selectList
(
up5
);
List
<
ConstructionRecords
>
li
=
constructionRecordsMapper
.
selectList
(
up5
);
ConstructionRecords
data
=
new
ConstructionRecords
();
ConstructionRecords
data
=
new
ConstructionRecords
();
data
.
setConstructionRecordsList
(
li
);
data
.
setConstructionRecordsList
(
li
);
...
...
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