admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

包头bug修复

Browse Source
This commit is contained in:
guoshengxiong 2024-11-19 18:05:31 +08:00
parent cb7ddf2c93
commit 2f2fe8436a
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/zhgd/xmgl/modules/baotou/controller/NondestructiveTestOrderTicketController.java
View File

@ -144,7 +144,7 @@ public class NondestructiveTestOrderTicketController {
Integer qualified = FlowUtil.getPullDownInteger(m, "field8817951200764"); Integer qualified = FlowUtil.getPullDownInteger(m, "field8817951200764");
PipelineWeldingRecord weldingRecord = new PipelineWeldingRecord(); PipelineWeldingRecord weldingRecord = new PipelineWeldingRecord();
weldingRecord.setId(id); 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); records.add(weldingRecord);
} }
} }

1
src/main/java/com/zhgd/xmgl/modules/baotou/controller/PipelineWeldingRecordController.java
View File

@ -57,6 +57,7 @@ public class PipelineWeldingRecordController {
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "query", required = true, dataType = "Integer"), @ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "query", required = true, dataType = "Integer"),
@ApiImplicitParam(name = "pageSize", 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") @GetMapping(value = "/page")
public Result<IPage<PipelineWeldingRecord>> queryPageList(@ApiIgnore @RequestParam HashMap<String, Object> param) { public Result<IPage<PipelineWeldingRecord>> queryPageList(@ApiIgnore @RequestParam HashMap<String, Object> param) {

7
src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/PipelineWeldingRecordServiceImpl.java
View File

@ -1,5 +1,6 @@
package com.zhgd.xmgl.modules.baotou.service.impl; package com.zhgd.xmgl.modules.baotou.service.impl;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.zhgd.jeecg.common.execption.OpenAlertException; import com.zhgd.jeecg.common.execption.OpenAlertException;
import com.zhgd.xmgl.modules.baotou.entity.DeviceUnit; 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.entity.PipelineWeldingRecord;
import com.zhgd.xmgl.modules.baotou.mapper.PipelineWeldingRecordMapper; import com.zhgd.xmgl.modules.baotou.mapper.PipelineWeldingRecordMapper;
import com.zhgd.xmgl.modules.baotou.service.IPipelineWeldingRecordService; 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 org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
@ -48,7 +51,11 @@ public class PipelineWeldingRecordServiceImpl extends ServiceImpl<PipelineWeldin
} }
private QueryWrapper<PipelineWeldingRecord> getQueryWrapper(HashMap<String, Object> param) { private QueryWrapper<PipelineWeldingRecord> getQueryWrapper(HashMap<String, Object> param) {
String addIds = MapUtils.getString(param, "addIds");
QueryWrapper<PipelineWeldingRecord> queryWrapper = QueryGenerator.initPageQueryWrapper(PipelineWeldingRecord.class, param, true); QueryWrapper<PipelineWeldingRecord> 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)); queryWrapper.orderByDesc(RefUtil.fieldNameUlc(PipelineWeldingRecord::getId));
return queryWrapper; return queryWrapper;
} }