From 95f9967a7d602f8194cc8ebf6a679c6f84b9bbb1 Mon Sep 17 00:00:00 2001
From: whycrzh <ruanzhigang@whycst.com>
Date: 星期三, 20 一月 2021 17:22:14 +0800
Subject: [PATCH] update userTask.byTask
---
src/main/java/com/fgkj/services/User_taskService.java | 43 ++++++++++++++++++++++++++++---------------
1 files changed, 28 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/fgkj/services/User_taskService.java b/src/main/java/com/fgkj/services/User_taskService.java
index fa12499..8413d24 100644
--- a/src/main/java/com/fgkj/services/User_taskService.java
+++ b/src/main/java/com/fgkj/services/User_taskService.java
@@ -496,23 +496,36 @@
}
//0.1浣滀笟绠＄悊鏌ヨuser_task鎵�鏈変俊鎭�
- public ServiceModel serchByTask(Task_Batt_Test tbt){
+ public ServiceModel serchByTask(Task_Batt_Test tbt) {
ServiceModel model = new ServiceModel();
- List<Task_Batt_Test> list=mapper.serchByTask(tbt);
- System.out.println(list.size());
- if(list!=null&&list.size()>0){
- for(int i=0;i<list.size();i++){
- list.get(i).getUinf().setuName(UtilityFactory.UidsToUnames(list.get(i).getBinf().getStationName1()));
- }
+ List<Task_Batt_Test> list = mapper.serchByTask(tbt);
+ for (int i = 0; i < list.size(); i++) {
+ PageBean pageBean = new PageBean();
+ list.get(i).setPageBean(pageBean);
+ list.get(i).setUinf(new User_inf());//灏佽缁撴灉闆嗗師鏈�
+ }
+// System.out.println(list.size());
- model.setCode(1);
- model.setData(list);
-
- }else{
- model.setCode(0);
- model.setMsg("鏌ヨ澶辫触锛�");
- }
- //System.out.println(((List<Task_Batt_Test>)model.getData()).get(0).getUinf());
+ int index = 0;
+ if (list != null && list.size() > 0) {
+ System.out.println("tbt.getPageBean() = " + tbt.getPageBean());
+ int i1 = (tbt.getPageBean().getPageCurr() - 1) * tbt.getPageBean().getPageSize();
+ int i2 = tbt.getPageBean().getPageSize() * tbt.getPageBean().getPageCurr();
+ for (int i = i1; i < i2 && i < list.size(); i++) {
+ list.get(index++).getPageBean().setPageAll(list.size());
+ }
+ for (int i = 0; i < list.size(); i++) {
+ list.get(i).getUinf().setuName(UtilityFactory.UidsToUnames(list.get(i).getBinf().getStationName1()));
+ }
+
+ model.setCode(1);
+ model.setData(list);
+
+ } else {
+ model.setCode(0);
+ model.setMsg("鏌ヨ澶辫触锛�");
+ }
+ //System.out.println(((List<Task_Batt_Test>)model.getData()).get(0).getUinf());
return model;
}
//4.1鏍规嵁缁存姢鍖烘煡璇㈡墍鏈夌殑鐢垫睜缁勫拰瀵瑰簲鐨勫寘鏈轰汉(妯℃澘鍒涘缓)鍜岀淮鎶や汉鍛樹俊鎭互鍙婂悇绫讳綔涓氬搴旂殑鐢垫睜缁勪俊鎭�
--
Gitblit v1.9.1