diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/EmInfoController.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/EmInfoController.java index c7eaa21..f5b6fc3 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/EmInfoController.java +++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/EmInfoController.java @@ -88,7 +88,7 @@ public class EmInfoController extends BladeController { }) @OperationAnnotation(moduleName = "设备管理",title = "设备信息",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE, - action = "分页条件") + action = "分页查询设备信息列表") public R> list(@ApiIgnore @RequestParam Map em_info, Query query) { QueryWrapper queryWrapper = Condition.getQueryWrapper(em_info, EmInfoEntity.class); queryWrapper.lambda().eq(EmInfoEntity::getGpid, 0); diff --git a/hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/systemlog/mapper/StatisticsMapper.xml b/hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/systemlog/mapper/StatisticsMapper.xml index 5c5c9d7..33eaa90 100644 --- a/hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/systemlog/mapper/StatisticsMapper.xml +++ b/hzims-service/hzims-middle/src/main/java/com/hnac/hzims/middle/systemlog/mapper/StatisticsMapper.xml @@ -10,7 +10,7 @@ module_name like concat('%',#{statistics.moduleName},'%') - date_format(date_calculated,'%Y-%m-%d') >= #{statistics.createTime} + and date_format(date_calculated,'%Y-%m-%d') >= #{statistics.createTime} and date_format(date_calculated,'%Y-%m-%d') <= #{statistics.endTime}