Commit 9a0a15b1 authored by tangwei's avatar tangwei

修改版本bug

parent ebd3ed75
...@@ -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>
...@@ -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>
...@@ -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.orderByDesc(ConstructionRecords::getRecDate); up5.orderByAsc(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.orderByDesc(ConstructionRecords::getRecDate); up5.orderByAsc(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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment