From 8dde8181f4361917fc7cc45e943f600aefd0aa52 Mon Sep 17 00:00:00 2001 From: yxw Date: Mon, 18 Dec 2023 18:57:23 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=AD=E7=9F=A9=E7=AE=A1=E7=90=86=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=95=B0=E6=8D=AE=E6=9C=89=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serviceimpl/base/jx/TorqueManageService.java | 49 ++++++++++++---------- 1 file changed, 27 insertions(+), 22 deletions(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/jx/TorqueManageService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/jx/TorqueManageService.java index 63b1b2e..107e712 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/jx/TorqueManageService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/jx/TorqueManageService.java @@ -156,33 +156,38 @@ public class TorqueManageService implements ITorqueManageService { @Override public ListPager queryTorqueManageTaskDetailReportByPager(MesProcessTorqueManageTaskDetail mesTorqueManageTaskDetail, Pager pager) { - DdlPackBean packBean = MesExtHqlPack.getMesProcessTorqueManageTaskDetail(mesTorqueManageTaskDetail); - - pager = PagerHelper.getPager(pager, mesTorqueManageTaskDetailRDao.findByHqlWhereCount(packBean)); - List torqueManageTaskDetailList = mesTorqueManageTaskDetailRDao.findByHqlWhere(packBean); - - if (!CollectionUtils.isEmpty(torqueManageTaskDetailList)) { - - for (MesProcessTorqueManageTaskDetail torqueManageTaskDetail : torqueManageTaskDetailList) { - if (torqueManageTaskDetail != null) { - if (!StringUtils.isEmpty(torqueManageTaskDetail.getTorqueSpecValue())) { - List torqueSpecValueList = Arrays.stream(torqueManageTaskDetail.getTorqueSpecValue().split(MesExtConstWords.COMMA)).collect(Collectors.toList()); - StringBuffer torqueSpecValueDesc = new StringBuffer(); - for (String torqueSpecValue : torqueSpecValueList) { - torqueSpecValueDesc.append(MesExtEnumUtil.TORQUE_SPEC_VALUE.valueOfDescription(torqueSpecValue)); - torqueSpecValueDesc.append(MesExtConstWords.COMMA); + if (mesTorqueManageTaskDetail == null) { + pager = PagerHelper.getPager(pager, mesTorqueManageTaskDetailRDao.listCount()); + return new ListPager(mesTorqueManageTaskDetailRDao.listPager(pager), pager); + } else { + DdlPackBean hqlPack = MesExtHqlPack.getMesProcessTorqueManageTaskDetail(mesTorqueManageTaskDetail); + hqlPack.setOrderByStr(mesTorqueManageTaskDetail.orderBy()); + pager = PagerHelper.getPager(pager, mesTorqueManageTaskDetailRDao.findByHqlWhereCount(hqlPack)); + List torqueManageTaskDetailList = mesTorqueManageTaskDetailRDao.findByHqlWherePage(hqlPack, pager); + + if (!CollectionUtils.isEmpty(torqueManageTaskDetailList)) { + + for (MesProcessTorqueManageTaskDetail torqueManageTaskDetail : torqueManageTaskDetailList) { + if (torqueManageTaskDetail != null) { + if (!StringUtils.isEmpty(torqueManageTaskDetail.getTorqueSpecValue())) { + List torqueSpecValueList = Arrays.stream(torqueManageTaskDetail.getTorqueSpecValue().split(MesExtConstWords.COMMA)).collect(Collectors.toList()); + StringBuffer torqueSpecValueDesc = new StringBuffer(); + for (String torqueSpecValue : torqueSpecValueList) { + torqueSpecValueDesc.append(MesExtEnumUtil.TORQUE_SPEC_VALUE.valueOfDescription(torqueSpecValue)); + torqueSpecValueDesc.append(MesExtConstWords.COMMA); + } + torqueSpecValueDesc.deleteCharAt(torqueSpecValueDesc.length() - 1); + torqueManageTaskDetail.setTorqueSpecValueDesc(torqueSpecValueDesc.toString()); } - torqueSpecValueDesc.deleteCharAt(torqueSpecValueDesc.length() - 1); - torqueManageTaskDetail.setTorqueSpecValueDesc(torqueSpecValueDesc.toString()); - } - if (!StringUtils.isEmpty(torqueManageTaskDetail.getTorqueManageNo1())) torqueManageTaskDetail.setTorqueManageNo1Full("M60-"+ torqueManageTaskDetail.getTorqueManageNo1() +"-Q0"); - if (!StringUtils.isEmpty(torqueManageTaskDetail.getTorqueManageNo2())) torqueManageTaskDetail.setTorqueManageNo2Full("M60-"+ torqueManageTaskDetail.getTorqueManageNo2() +"-Q0"); - if (!StringUtils.isEmpty(torqueManageTaskDetail.getTorqueManageNo3())) torqueManageTaskDetail.setTorqueManageNo3Full("M60-"+ torqueManageTaskDetail.getTorqueManageNo3() +"-Q0"); + if (!StringUtils.isEmpty(torqueManageTaskDetail.getTorqueManageNo1())) torqueManageTaskDetail.setTorqueManageNo1Full("M60-"+ torqueManageTaskDetail.getTorqueManageNo1() +"-Q0"); + if (!StringUtils.isEmpty(torqueManageTaskDetail.getTorqueManageNo2())) torqueManageTaskDetail.setTorqueManageNo2Full("M60-"+ torqueManageTaskDetail.getTorqueManageNo2() +"-Q0"); + if (!StringUtils.isEmpty(torqueManageTaskDetail.getTorqueManageNo3())) torqueManageTaskDetail.setTorqueManageNo3Full("M60-"+ torqueManageTaskDetail.getTorqueManageNo3() +"-Q0"); + } } } + return new ListPager(torqueManageTaskDetailList, pager); } - return new ListPager(torqueManageTaskDetailList, pager); } @Override