Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

技术监督，反馈单查询修改

Browse Source
This commit is contained in:
wr
2023-10-26 19:47:39 +08:00
parent b7a1697e67
commit 5c4cb3ad65
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pqs-process/process-boot/src/main/java/com/njcn/process/controller/SupvAlarmBackController.java
View File

@@ -80,7 +80,7 @@ public class SupvAlarmBackController extends BaseController {
@ApiOperation("分页查询预告警单反馈") @ApiOperation("分页查询预告警单反馈")
@ApiImplicitParam(name = "param",value = "请求体",required = true) @ApiImplicitParam(name = "param",value = "请求体",required = true)
public HttpResult<Page<SupvAlarmBack>> pageAlarmBack(@RequestBody SupvAlarmBackParam param){ public HttpResult<Page<SupvAlarmBack>> pageAlarmBack(@RequestBody SupvAlarmBackParam param){
String methodDescribe = getMethodDescribe("pagePlanHis"); String methodDescribe = getMethodDescribe("pageAlarmBack");
Page<SupvAlarmBack> supvPlanHisPage = supvAlarmBackService.pageAlarmBack(param); Page<SupvAlarmBack> supvPlanHisPage = supvAlarmBackService.pageAlarmBack(param);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, supvPlanHisPage, methodDescribe); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, supvPlanHisPage, methodDescribe);
} }

3
pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/SupvAlarmBackMapper.xml
View File

@@ -11,6 +11,9 @@
supv_alarm sa supv_alarm sa
INNER JOIN supv_alarm_back sab on sab.work_Alarm_Id = sa.Alarm_Id INNER JOIN supv_alarm_back sab on sab.work_Alarm_Id = sa.Alarm_Id
<where> <where>
<if test="param.workAlarmId != null and param.workAlarmId != ''">
AND sa.Alarm_Id = #{param.workAlarmId}
</if>
<if test="param.searchBeginTime != null and param.searchBeginTime != ''"> <if test="param.searchBeginTime != null and param.searchBeginTime != ''">
AND DATE_FORMAT(sab.complete_Time, '%Y-%m-%d') &gt;= DATE_FORMAT(#{param.searchBeginTime}, '%Y-%m-%d') AND DATE_FORMAT(sab.complete_Time, '%Y-%m-%d') &gt;= DATE_FORMAT(#{param.searchBeginTime}, '%Y-%m-%d')
</if> </if>