fix:工程巡查概况统计

shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfYhRecordMapper.java

@@ -90,6 +90,9 @@ public interface DfYhRecordMapper extends BaseMapper<DfYhRecord> {
             "AND (DATE_FORMAT(bsdx.create_time, '%Y-%m-%d %H:%i:%s') &gt;= DATE_FORMAT(#{dto.patrolStart} , '%Y-%m-%d %H:%i:%s') "+
             "AND DATE_FORMAT(bsdx.create_time, '%Y-%m-%d %H:%i:%s') &lt;= DATE_FORMAT(#{dto.patrolEnd} , '%Y-%m-%d %H:%i:%s')) "+
             "</if> " +
+            "<if test='dto.adcdQx != null and searchDto.adcdQx != \"\"'> "+
+            "adb.adcd like concat(#{dto.adcdQx}, '%')  "+
+            "</if> "+
             "group by adb.adcd ,bsdx.duty_holder_type "+
             "</script>")
     List<DfYhStatisticsModelDto> situation (@Param("dto") DfYhStatisticsQueDto data);

shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhRecordService.java

@@ -59,9 +59,7 @@ public class DfYhRecordService extends DefaultApprovalBusinessService<DfYhRecord
                 .collect(Collectors.groupingBy(DfYhStatisticsModelDto::getAdcd));
 
         List<String> xList =new ArrayList<>();
-        DfYhCharInfoDto.YAxis yAxisInfo=new DfYhCharInfoDto.YAxis();
-        yAxisInfo.setName("次数");
-        yAxisInfo.setUnit("个");
+        List<DfYhCharInfoDto.YAxis>yAxisList=new ArrayList<>();
         for (Map.Entry<String, List<DfYhStatisticsModelDto>> entry : groupingByList.entrySet()) {
             // 设置 x轴
             xList.add(entry.getKey());
@@ -73,8 +71,13 @@ public class DfYhRecordService extends DefaultApprovalBusinessService<DfYhRecord
                 seriesList.add(series);
             }
             // 设置 y轴
+            DfYhCharInfoDto.YAxis yAxisInfo=new DfYhCharInfoDto.YAxis();
+            yAxisInfo.setName("次数");
+            yAxisInfo.setUnit("个");
             yAxisInfo.setSeries(seriesList);
         }
+        dtoInfo.setYAxis(yAxisList);
+        dtoInfo.setXAxis(xList);
         return dtoInfo;
     }