From 72b0e02fdaab1f0f5048c58f2eb09bfd9ab0a07e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AE=B5=E9=A3=9E=E5=AE=87?= <2684146481@qq.com> Date: Wed, 26 Jul 2023 16:59:55 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=97=A5=E5=BF=97=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/hnac/hzims/equipment/controller/EmInfoController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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); From edd288e2f96266d559125b8000c74a5359573b55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AE=B5=E9=A3=9E=E5=AE=87?= <2684146481@qq.com> Date: Wed, 26 Jul 2023 17:04:38 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/hnac/hzims/middle/systemlog/mapper/StatisticsMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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}