diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfYhRecordMapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfYhRecordMapper.java index 9d783b7d..867eb1fe 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfYhRecordMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfYhRecordMapper.java @@ -90,6 +90,9 @@ public interface DfYhRecordMapper extends BaseMapper { "AND (DATE_FORMAT(bsdx.create_time, '%Y-%m-%d %H:%i:%s') >= DATE_FORMAT(#{dto.patrolStart} , '%Y-%m-%d %H:%i:%s') "+ "AND DATE_FORMAT(bsdx.create_time, '%Y-%m-%d %H:%i:%s') <= DATE_FORMAT(#{dto.patrolEnd} , '%Y-%m-%d %H:%i:%s')) "+ " " + + " "+ + "adb.adcd like concat(#{dto.adcdQx}, '%') "+ + " "+ "group by adb.adcd ,bsdx.duty_holder_type "+ "") List situation (@Param("dto") DfYhStatisticsQueDto data); diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhRecordService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhRecordService.java index 41fbc2f2..6ea57067 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhRecordService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhRecordService.java @@ -59,9 +59,7 @@ public class DfYhRecordService extends DefaultApprovalBusinessService xList =new ArrayList<>(); - DfYhCharInfoDto.YAxis yAxisInfo=new DfYhCharInfoDto.YAxis(); - yAxisInfo.setName("次数"); - yAxisInfo.setUnit("个"); + ListyAxisList=new ArrayList<>(); for (Map.Entry> entry : groupingByList.entrySet()) { // 设置 x轴 xList.add(entry.getKey()); @@ -73,8 +71,13 @@ public class DfYhRecordService extends DefaultApprovalBusinessService