From 2f2fe8436a30fe4728f3616c91ccc7c49ce018a7 Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Tue, 19 Nov 2024 18:05:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=85=E5=A4=B4bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../NondestructiveTestOrderTicketController.java | 2 +- .../baotou/controller/PipelineWeldingRecordController.java | 1 + .../service/impl/PipelineWeldingRecordServiceImpl.java | 7 +++++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/controller/NondestructiveTestOrderTicketController.java b/src/main/java/com/zhgd/xmgl/modules/baotou/controller/NondestructiveTestOrderTicketController.java index 96aa1ed74..8b5ce899c 100644 --- a/src/main/java/com/zhgd/xmgl/modules/baotou/controller/NondestructiveTestOrderTicketController.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/controller/NondestructiveTestOrderTicketController.java @@ -144,7 +144,7 @@ public class NondestructiveTestOrderTicketController { Integer qualified = FlowUtil.getPullDownInteger(m, "field8817951200764"); PipelineWeldingRecord weldingRecord = new PipelineWeldingRecord(); weldingRecord.setId(id); - weldingRecord.setTestingQualified(Objects.equals(qualified, 1) ? 1 : 0); + weldingRecord.setTestingQualified(Objects.equals(qualified, 1) ? 1 : (Objects.equals(qualified, 0) ? 0 : -1)); records.add(weldingRecord); } } diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/controller/PipelineWeldingRecordController.java b/src/main/java/com/zhgd/xmgl/modules/baotou/controller/PipelineWeldingRecordController.java index 55e62093a..827db3046 100644 --- a/src/main/java/com/zhgd/xmgl/modules/baotou/controller/PipelineWeldingRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/controller/PipelineWeldingRecordController.java @@ -57,6 +57,7 @@ public class PipelineWeldingRecordController { @ApiImplicitParams({ @ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "query", required = true, dataType = "Integer"), @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"), + @ApiImplicitParam(name = "addIds", value = "查询出addIds（多个,分割）", paramType = "query", required = false, dataType = "String"), }) @GetMapping(value = "/page") public Result> queryPageList(@ApiIgnore @RequestParam HashMap param) { diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/PipelineWeldingRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/PipelineWeldingRecordServiceImpl.java index 103d0b94b..0f31527a5 100644 --- a/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/PipelineWeldingRecordServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/PipelineWeldingRecordServiceImpl.java @@ -1,5 +1,6 @@ package com.zhgd.xmgl.modules.baotou.service.impl; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.zhgd.jeecg.common.execption.OpenAlertException; import com.zhgd.xmgl.modules.baotou.entity.DeviceUnit; @@ -7,6 +8,8 @@ import com.zhgd.xmgl.modules.baotou.entity.PipelineWelder; import com.zhgd.xmgl.modules.baotou.entity.PipelineWeldingRecord; import com.zhgd.xmgl.modules.baotou.mapper.PipelineWeldingRecordMapper; import com.zhgd.xmgl.modules.baotou.service.IPipelineWeldingRecordService; +import com.zhgd.xmgl.util.MapUtil; +import org.apache.commons.collections.MapUtils; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -48,7 +51,11 @@ public class PipelineWeldingRecordServiceImpl extends ServiceImpl getQueryWrapper(HashMap param) { + String addIds = MapUtils.getString(param, "addIds"); QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(PipelineWeldingRecord.class, param, true); + if (StrUtil.isNotBlank(addIds)) { + queryWrapper.lambda().or().in(PipelineWeldingRecord::getId, StrUtil.split(addIds,",")); + } queryWrapper.orderByDesc(RefUtil.fieldNameUlc(PipelineWeldingRecord::getId)); return queryWrapper; }