Merge remote-tracking branch 'origin/master' into master

@@ -514,6 +514,8 @@ public class EquipmentController {
         String energyLevel = equipmentDTO.getEquipmentInfo().getEnergyLevel();//能耗等级
         //Integer isSpecial = equipmentDTO.getEquipmentInfo().getIsSpecial();
         String isMeterage = equipmentDTO.getEquipmentInfo().getIsMeterage();//是否计量设备
+        String orderFiled = equipmentDTO.getOrderFiled();
+        boolean orderType = equipmentDTO.isOrderType();
 
         List<String> equipmentLevelList = null;
         Base base = BaseFactory.JOIN().select(EquipmentAsset.class).select(EquipmentInfo.class).select(EquipmentBrand.class).select(EquipmentCategory.class)
@@ -540,8 +542,12 @@ public class EquipmentController {
                 .like(StringUtils.isNotEmpty(equipmentCode), "equipment_code", equipmentCode)
                 .eq(StringUtils.isNotEmpty(equipmentStatus), "equipment_status", equipmentStatus)
                 .like(StringUtils.isNotEmpty(installPosition), EquipmentInfo::getInstallPosition, installPosition)
-                .eq(StringUtils.isNotEmpty(equipmentDTO.getEquipmentInfo().getId()), "equipment_info.id", equipmentDTO.getEquipmentInfo().getId())
-                .orderBy(true,false,"equipment_info.create_time");
+                .eq(StringUtils.isNotEmpty(equipmentDTO.getEquipmentInfo().getId()), "equipment_info.id", equipmentDTO.getEquipmentInfo().getId());
+        if (StringUtils.isNotEmpty(orderFiled)) {
+            base.orderBy(true,orderType,"equipment_info." + orderFiled);
+        }else {
+            base.orderBy(true,false,"equipment_info.create_time");
+        }
         Page<Map<String, Object>> mapPage = (Page<Map<String, Object>>) base.queryForPage(new Page<>(equipmentDTO.getPageNo(), equipmentDTO.getPageSize()));
 
         // 转义

@@ -19,8 +19,9 @@ public class EquipmentDTO {
     private EquipmentAsset equipmentAsset = new EquipmentAsset();
     private EquipmentInfo equipmentInfo = new EquipmentInfo();
     private List<EquipmentInfoExtParam> equipmentInfoExtParams = new ArrayList<EquipmentInfoExtParam>();
-
     private Long pageNo = 1L;
     private Long pageSize = 10L;
+    private String orderFiled;//排序字段
+    private boolean orderType;//排序类型,true:升序,false:降序
 
 }

@@ -158,7 +158,7 @@ public class InspectionAnalysisController {
     @GetMapping("/getInspectionTaskIndicators")
     public Result<InspectionTaskIndicatorsVO> getInspectionTaskIndicators(String startDate,String endDate){
         Result<InspectionTaskIndicatorsVO> result = new Result<>();
-        InspectionTaskIndicatorsVO inspectionTaskIndicatorsVO = inspectionAnalysisService.getInspectionTaskIndicators(startDate,endDate);
+        InspectionTaskIndicatorsVO inspectionTaskIndicatorsVO = inspectionAnalysisService.getInspectionTaskIndicatorsNew(startDate,endDate);
         result.setSuccess(true);
         result.setResult(inspectionTaskIndicatorsVO);
         return result;
@@ -188,7 +188,7 @@ public class InspectionAnalysisController {
     @GetMapping("/getInspectionTaskOverview")
     public Result<InspectionTaskOverviewVO> getInspectionTaskOverview(String startDate, String endDate){
         Result<InspectionTaskOverviewVO> result = new Result<>();
-        InspectionTaskOverviewVO inspectionTaskIndicatorVO = inspectionAnalysisService.getInspectionTaskOverview(startDate,endDate);
+        InspectionTaskOverviewVO inspectionTaskIndicatorVO = inspectionAnalysisService.getInspectionTaskOverviewNew(startDate,endDate);
         result.setSuccess(true);
         result.setResult(inspectionTaskIndicatorVO);
         return result;
@@ -221,7 +221,7 @@ public class InspectionAnalysisController {
     @GetMapping("/getInspectionEquipIndicators")
     public Result<InspectionEquipIndicatorsVO> getInspectionEquipIndicators(String startDate, String endDate){
         Result<InspectionEquipIndicatorsVO> result = new Result<>();
-        InspectionEquipIndicatorsVO inspectionEquipIndicatorsVO = inspectionAnalysisService.getInspectionEquipIndicators(startDate,endDate);
+        InspectionEquipIndicatorsVO inspectionEquipIndicatorsVO = inspectionAnalysisService.getInspectionEquipIndicatorsNew(startDate,endDate);
         result.setSuccess(true);
         result.setResult(inspectionEquipIndicatorsVO);
         return result;
@@ -251,7 +251,7 @@ public class InspectionAnalysisController {
     @GetMapping("/getInspectionEquipOverview")
     public Result<InspectionEquipOverviewVO> getInspectionEquipOverview(String startDate, String endDate){
         Result<InspectionEquipOverviewVO> result = new Result<>();
-        InspectionEquipOverviewVO inspectionEquipOverviewVO = inspectionAnalysisService.getInspectionEquipOverview(startDate,endDate);
+        InspectionEquipOverviewVO inspectionEquipOverviewVO = inspectionAnalysisService.getInspectionEquipOverviewNew(startDate,endDate);
         result.setSuccess(true);
         result.setResult(inspectionEquipOverviewVO);
         return result;

@@ -26,9 +26,12 @@ public interface InspectionPointFillGroupMapper extends BaseMapper<InspectionPoi
             "\tleft join inspection_fill_choice ifc on ifi.id = ifc.inspection_fill_id ${ew.customSqlSegment}")
     List<InspectionPointFillGroupAndFillVO> getList(@Param(Constants.WRAPPER) QueryWrapper<InspectionPointFillGroupAndFillVO> inspectionPointFillGroupAndFillVOQueryWrapper);
 
-    @Select("select 'sys_struct_dict' node_type,id,'' parent_id,struct_name title from sys_struct_dict ssd where ssd.depart_id = #{departId}\n" +
-            "union all\n" +
-            "select 'equip_info' node_type,ei.id,ssd.id parent_id,ei.equipment_name title from equipment_info ei left join sys_struct_dict ssd on " +
-            " ei.structures = ssd.id where ssd.depart_id = #{departId}")
+    @Select("SELECT * FROM\t(\tSELECT 'sys_struct_dict' AS node_type,ssd.id,'' AS parent_id,ssd.struct_name AS title,ssd.sort_num,NULL AS equipment_name\n" +
+            "\tFROM sys_struct_dict ssd WHERE ssd.depart_id = #{departId}\n" +
+            "\tUNION ALL SELECT\n" +
+            "\t\t'equip_info' AS node_type,ei.id,ssd.id AS parent_id,ei.equipment_name AS title,ssd.sort_num,ei.equipment_name -- 用于排序\n" +
+            "\tFROM equipment_info ei LEFT JOIN sys_struct_dict ssd ON ei.structures = ssd.id \n" +
+            "\tWHERE ssd.depart_id = #{departId}\n" +
+            "\t) AS combined_result ORDER BY node_type DESC,sort_num,equipment_name;")
     List<InspectionStructEquipVO> getSysStructDictAndEquipInfo(@Param("departId") String departId);
 }

@@ -20,7 +20,7 @@ public interface IInspectionAnalysisService {
      * @return
      */
     InspectionTaskIndicatorsVO getInspectionTaskIndicators(String startDate, String endDate);
-
+    InspectionTaskIndicatorsVO getInspectionTaskIndicatorsNew(String startDate, String endDate);
     /***
      * 巡检分析-巡检任务指标-详情
      * @param departIds
@@ -36,7 +36,7 @@ public interface IInspectionAnalysisService {
      * @return
      */
     InspectionEquipIndicatorsVO getInspectionEquipIndicators(String startDate, String endDate);
-
+    InspectionEquipIndicatorsVO getInspectionEquipIndicatorsNew(String startDate, String endDate);
     /***
      * 巡检分析-巡检设备指标--详情
      * @param startDate
@@ -52,6 +52,7 @@ public interface IInspectionAnalysisService {
      * @return
      */
     InspectionTaskOverviewVO getInspectionTaskOverview(String startDate, String endDate);
+    InspectionTaskOverviewVO getInspectionTaskOverviewNew(String startDate, String endDate);
 
     /***
      * 巡检分析-巡检任务概况
@@ -69,6 +70,8 @@ public interface IInspectionAnalysisService {
      */
     InspectionEquipOverviewVO getInspectionEquipOverview(String startDate, String endDate);
 
+    InspectionEquipOverviewVO getInspectionEquipOverviewNew(String startDate, String endDate);
+
     /***
      * 巡检分析-巡检设备概况-详情
      * @param departIds