提交 3b17c8fe authored 作者: tykj's avatar tykj

fix(核查):修正区排序问题

上级 603b5d6a
...@@ -56,6 +56,7 @@ import com.tykj.dev.misc.base.ResultObj; ...@@ -56,6 +56,7 @@ import com.tykj.dev.misc.base.ResultObj;
import com.tykj.dev.misc.base.StatusEnum; import com.tykj.dev.misc.base.StatusEnum;
import com.tykj.dev.misc.exception.ApiException; import com.tykj.dev.misc.exception.ApiException;
import com.tykj.dev.misc.utils.JacksonUtil; import com.tykj.dev.misc.utils.JacksonUtil;
import com.tykj.dev.misc.utils.PageUtil;
import com.tykj.dev.socket.MyWebSocket; import com.tykj.dev.socket.MyWebSocket;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
...@@ -367,15 +368,16 @@ public class DeviceCheckController { ...@@ -367,15 +368,16 @@ public class DeviceCheckController {
} }
@ApiOperation(value = "根据id查询核查详情数据", notes = "可以通过这个接口查询核查详情数据") @ApiOperation(value = "根据id查询核查详情数据", notes = "可以通过这个接口查询核查详情数据")
@GetMapping("/detail/unit/{unitId}") @PostMapping("/detail/unit/{unitId}")
public ResponseEntity<ResultObj<List<CheckDetailVo>>> findDetailsByUnitId(@PathVariable Integer unitId) { public ResponseEntity findDetailsByUnitId(@PathVariable Integer unitId,
Units unit = unitsRepo.findById(unitId).get(); @RequestBody CheckBillSelectVo checkBillSelectVo) {
Specification<DeviceCheckDetail> pred = Specifications.<DeviceCheckDetail>and() Specification<DeviceCheckDetail> pred = Specifications.<DeviceCheckDetail>and()
.eq("checkUnit", unit.getName()) .eq("checkUnitId", unitId)
.build(); .build();
List<CheckDetailVo> detailVoList = detailRepo.findAll(pred).stream() List<CheckDetailVo> detailVoList = detailRepo.findAll(pred,checkBillSelectVo.getPageable()).stream()
.map(transUtil::CheckDetailDo2Vo) .map(transUtil::CheckDetailDo2Vo)
.collect(toList()); .collect(toList());
return ResponseEntity.ok(new ResultObj<>(detailVoList)); return ResponseEntity.ok(new ResultObj<>(detailVoList));
} }
......
...@@ -378,7 +378,6 @@ public class ConfirmCheckServiceImpl implements ConfirmCheckService, CommandLine ...@@ -378,7 +378,6 @@ public class ConfirmCheckServiceImpl implements ConfirmCheckService, CommandLine
return PageUtil.getPerPage(checkBillSelectVo.getPage(), checkBillSelectVo.getSize(), tableVos, checkBillSelectVo.getPageable()); return PageUtil.getPerPage(checkBillSelectVo.getPage(), checkBillSelectVo.getSize(), tableVos, checkBillSelectVo.getPageable());
} }
/** /**
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论