修改排序，以及施工管理详情增加施工操作记录

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/SurveyInfoAllDto.java

 package com.yeejoin.amos.boot.module.hygf.api.dto;
 
-import com.yeejoin.amos.boot.module.hygf.api.entity.HygfOnGrid;
-import com.yeejoin.amos.boot.module.hygf.api.entity.PowerStationConstructionData;
-import com.yeejoin.amos.boot.module.hygf.api.entity.PowerStationEngineeringInfo;
-import com.yeejoin.amos.boot.module.hygf.api.entity.WorkOrder;
+import com.yeejoin.amos.boot.module.hygf.api.entity.*;
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
 
@@ -49,5 +46,7 @@ public class SurveyInfoAllDto {
     WorkOrder workOrder;
 
 
+    //自审信息
 
+    ConstructionRecords constructionRecords;
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/AcceptanceMapper.xml

@@ -90,6 +90,7 @@
             </if>
         </where>
         ORDER BY
+        FIELD(bga.acceptance_status, '1', '2', '3', '4', '5', '6', '7', '11', '8', '9', '10'),
         bga.rec_date desc, bga.acceptance_rec_date DESC
     </select>
 </mapper>

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/BasicGridAcceptanceMapper.xml

@@ -67,6 +67,8 @@
                 AND DATE_FORMAT(hogaa.grid_connection_time, '%Y-%m-%d') = DATE_FORMAT( #{map.gridConnectionTime}, '%Y-%m-%d')
             </if>
         </where>
-        ORDER BY  hbga.rec_date desc, hogaa.grid_connection_time desc
+        ORDER BY
+        FIELD(hbga.grid_status, '1', '2', '4', '3'),
+        hbga.rec_date desc, hogaa.grid_connection_time desc
     </select>
 </mapper>

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/WorkOrderMapper.xml

@@ -31,7 +31,10 @@
        <if test="dto.regionCompanyId!=null and dto.regionCompanyId!=''">
            and hygf_work_order.region_company_id =#{dto.regionCompanyId}
        </if>
-       ORDER BY hygf_work_order.rec_date DESC
+       ORDER BY
+       FIELD(hygf_work_order.work_order_status, '待施工', '施工中', '待登记', '登记中', '待审核', '审核中', '未通过', '已完工'),
+
+       hygf_work_order.rec_date DESC
 
    </select>
 
@@ -95,7 +98,11 @@
         <if test="dto.regionCompanyId!=null and dto.regionCompanyId!=''">
             and hygf_work_order.region_company_id =#{dto.regionCompanyId}
         </if>
-        ORDER BY hygf_work_order_power_station.rec_date DESC
+        ORDER BY
+
+        FIELD(hygf_work_order_power_station.power_station_construction_status, '待施工', '施工中', '待登记', '登记中', '待审核', '审核中', '未通过', '已完工'),
+
+        hygf_work_order_power_station.rec_date DESC
     </where>
 
     </select>

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/WorkOrderServiceImpl.java

@@ -524,6 +524,21 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto,WorkOrder,Wor
             powerStationEngineeringInfo.setConstructionRegionManager(workOrder.getConstructionRegionManager());
             powerStationEngineeringInfo.setConstructionRegionManagerPhone(workOrder.getConstructionRegionManagerPhone());
         }
+
+
+
+        //施工自审
+        LambdaQueryWrapper<ConstructionRecords> up5=new LambdaQueryWrapper();
+        up5.eq(ConstructionRecords::getWorkOrderId,workOrderId);
+        up5.eq(ConstructionRecords::getWorkOrderPowerStationId,workOrderPowerStationId);
+        up5.orderByDesc(ConstructionRecords::getRecDate);
+        List<ConstructionRecords>   li=constructionRecordsMapper.selectList(up5);
+        ConstructionRecords data=new ConstructionRecords();
+        data.setConstructionRecordsList(li);
+        surveyInfoAllDto.setConstructionRecords(data);
+
+
+
         //并网信息
         LambdaQueryWrapper<HygfOnGrid> up4=new LambdaQueryWrapper();
         up4.eq(HygfOnGrid::getWorkOrderId,workOrderId);