fixed 列表排序问题

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

@@ -45,7 +45,7 @@
 
 
 
-
+        ORDER BY std_user_biz.rec_date DESC
     </select>
 
     <select  id="getorgcode"  resultType="Map">

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

@@ -32,9 +32,9 @@
            and hygf_work_order.region_company_id =#{dto.regionCompanyId}
        </if>
        ORDER BY
-       FIELD(hygf_work_order.work_order_status, '待施工', '施工中', '待登记', '登记中', '待审核', '审核中', '未通过', '已完工'),
+       hygf_work_order.rec_date DESC,
 
-       hygf_work_order.rec_date DESC
+       FIELD(hygf_work_order.work_order_status, '待施工', '施工中', '待登记', '登记中', '待审核', '审核中', '未通过', '已完工')
 
    </select>
 
@@ -56,7 +56,12 @@
         LEFT JOIN hygf_peasant_household on  hygf_peasant_household.sequence_nbr=hygf_work_order_power_station.peasant_household_id
         LEFT JOIN hygf_power_station_engineering_info on hygf_power_station_engineering_info.work_order_power_station_id=hygf_work_order_power_station.sequence_nbr
 
-    <where>
+        ORDER BY
+        FIELD(hygf_work_order_power_station.power_station_construction_status, '待登记', '待审核', '已完成'),
+
+        hygf_power_station_engineering_info.completion_date DESC
+
+        <where>
 
         <if test="dto.workOrderId!=null and dto.workOrderId!=''">
             and hygf_work_order.sequence_nbr = #{dto.workOrderId}

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

@@ -904,6 +904,7 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
         QueryWrapper<PeasantHousehold> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("amos_user_id", peasantHouseholdPageDto.getNhUserId());
         queryWrapper.like(StrUtil.isNotEmpty(peasantHouseholdPageDto.getPeasantHouseholdNo()),"peasant_household_no", "%"+peasantHouseholdPageDto.getPeasantHouseholdNo()+"%");
+        queryWrapper.orderByDesc("rec_date");
         return this.baseMapper.selectPage(new Page<>(peasantHouseholdPageDto.getCurrent(),peasantHouseholdPageDto.getSize()),queryWrapper);
     }
 }
\ No newline at end of file