From 5c4cb3ad65b75d4853cc8e4fba67d5f759c14d86 Mon Sep 17 00:00:00 2001 From: wr <1754607820@qq.com> Date: Thu, 26 Oct 2023 19:47:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=80=E6=9C=AF=E7=9B=91=E7=9D=A3=EF=BC=8C?= =?UTF-8?q?=E5=8F=8D=E9=A6=88=E5=8D=95=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/njcn/process/controller/SupvAlarmBackController.java | 2 +- .../com/njcn/process/mapper/mapping/SupvAlarmBackMapper.xml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/controller/SupvAlarmBackController.java b/pqs-process/process-boot/src/main/java/com/njcn/process/controller/SupvAlarmBackController.java index d5aceb62a..b8c89c89f 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/controller/SupvAlarmBackController.java +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/controller/SupvAlarmBackController.java @@ -80,7 +80,7 @@ public class SupvAlarmBackController extends BaseController { @ApiOperation("分页查询预告警单反馈") @ApiImplicitParam(name = "param",value = "请求体",required = true) public HttpResult> pageAlarmBack(@RequestBody SupvAlarmBackParam param){ - String methodDescribe = getMethodDescribe("pagePlanHis"); + String methodDescribe = getMethodDescribe("pageAlarmBack"); Page supvPlanHisPage = supvAlarmBackService.pageAlarmBack(param); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, supvPlanHisPage, methodDescribe); } diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/SupvAlarmBackMapper.xml b/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/SupvAlarmBackMapper.xml index 0cdf60c0c..2c8142143 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/SupvAlarmBackMapper.xml +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/SupvAlarmBackMapper.xml @@ -11,6 +11,9 @@ supv_alarm sa INNER JOIN supv_alarm_back sab on sab.work_Alarm_Id = sa.Alarm_Id + + AND sa.Alarm_Id = #{param.workAlarmId} + AND DATE_FORMAT(sab.complete_Time, '%Y-%m-%d') >= DATE_FORMAT(#{param.searchBeginTime}, '%Y-%m-%d')