扭矩管理查询数据有误

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<MesProcessTorqueManageTaskDetail> queryTorqueManageTaskDetailReportByPager(MesProcessTorqueManageTaskDetail mesTorqueManageTaskDetail, Pager pager) {
-        DdlPackBean packBean = MesExtHqlPack.getMesProcessTorqueManageTaskDetail(mesTorqueManageTaskDetail);
-
-        pager = PagerHelper.getPager(pager, mesTorqueManageTaskDetailRDao.findByHqlWhereCount(packBean));
-        List<MesProcessTorqueManageTaskDetail> torqueManageTaskDetailList = mesTorqueManageTaskDetailRDao.findByHqlWhere(packBean);
-
-        if (!CollectionUtils.isEmpty(torqueManageTaskDetailList)) {
-
-            for (MesProcessTorqueManageTaskDetail torqueManageTaskDetail : torqueManageTaskDetailList) {
-                if (torqueManageTaskDetail != null) {
-                    if (!StringUtils.isEmpty(torqueManageTaskDetail.getTorqueSpecValue())) {
-                        List<String> 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<MesProcessTorqueManageTaskDetail> torqueManageTaskDetailList = mesTorqueManageTaskDetailRDao.findByHqlWherePage(hqlPack, pager);
+
+            if (!CollectionUtils.isEmpty(torqueManageTaskDetailList)) {
+
+                for (MesProcessTorqueManageTaskDetail torqueManageTaskDetail : torqueManageTaskDetailList) {
+                    if (torqueManageTaskDetail != null) {
+                        if (!StringUtils.isEmpty(torqueManageTaskDetail.getTorqueSpecValue())) {
+                            List<String> 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