格克

jeecg-boot-module-demo/src/main/java/org/jeecg/modules/geke/userShift/controller/UserShiftController.java

@@ -187,23 +187,25 @@ public class UserShiftController extends JeecgController<UserShift, IUserShiftSe
 
 
 
-	 @GetMapping(value = "/queryByUser")
-	 public Result<?> queryByUser(UserShift userShift) throws ParseException {
-		// List<Map<String, Object>> oneUserShift = userShiftService.getMothUserShifts(userShift.getUserId(), DateUtils.formatDate(userShift.getShiftDate()));
-		 List<Map<String, Object>> maps = userShiftService.mothUserShift(DateUtils.formatDate(userShift.getShiftDate()));
-		 if (maps.size()<1){
-			 maps=null;
-		 }
-		 return Result.OK(maps);
-	 }
+//	 @GetMapping(value = "/queryByUser")
+//	 public Result<?> queryByUser(UserShift userShift) throws ParseException {
+//		// List<Map<String, Object>> oneUserShift = userShiftService.getMothUserShifts(userShift.getUserId(), DateUtils.formatDate(userShift.getShiftDate()));
+//		 List<Map<String, Object>> maps = userShiftService.mothUserShift(DateUtils.formatDate(userShift.getShiftDate()));
+//		 if (maps.size()<1){
+//			 maps=null;
+//		 }
+//		 return Result.OK(maps);
+//	 }
 
 	 @GetMapping(value = "/queryMothByUser")
-	 public Result<?> queryMothByUser(UserShift userShift) throws ParseException {
-		 List<Map<String, Object>> maps = userShiftService.mothUserShift(DateUtils.formatDate(userShift.getShiftDate()));
-		 if (maps.size()<1){
-			 maps=null;
-		 }
+	 public Result<?> queryMothByUser(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+									  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+									  HttpServletRequest req,UserShift userShift) throws ParseException {
+		 IPage<Map<String, Object>> maps = userShiftService.mothUserShift(DateUtils.formatDate(userShift.getShiftDate()),pageNo,pageSize);
+
 		 return Result.OK(maps);
 	 }
 
+
+
 }

jeecg-boot-module-demo/src/main/java/org/jeecg/modules/geke/userShift/mapper/UserShiftMapper.java

@@ -41,5 +41,5 @@ public interface UserShiftMapper extends BaseMapper<UserShift> {
 
     List<Map<String,Object>> getMothUserShifts(@Param("userid")String userid, @Param("date")String date);
 
-    List<Map<String,Object>>getUsers();
+    List<Map<String,Object>>getUsers(Page<Map<String,Object>> page);
 }

jeecg-boot-module-demo/src/main/java/org/jeecg/modules/geke/userShift/mapper/xml/UserShiftMapper.xml

@@ -68,7 +68,7 @@ order by a.shift_date desc
         order by date_format(a.shift_date,'%Y-%m-%d') asc
     </select>
     <select id="getUsers" resultType="java.util.Map">
-        select id,realname from sys_user where del_flag='0';
+        select id,realname from sys_user where del_flag='0'
     </select>
 
 </mapper>

jeecg-boot-module-demo/src/main/java/org/jeecg/modules/geke/userShift/service/IUserShiftService.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.geke.userShift.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.geke.userShift.entity.UserShift;
@@ -30,7 +31,7 @@ public interface IUserShiftService extends IService<UserShift> {
 
     List<Map<String,Object>> getMothUserShifts(String userid, String date);
 
-    List<Map<String,Object>>mothUserShift(String date) throws ParseException;
-
+    IPage<Map<String,Object>>mothUserShift(String date,Integer pageNo,Integer pageSize) throws ParseException;
 
+    IPage<Map<String,Object>> getUsers(Page<Map<String,Object>> page);
 }

jeecg-boot-module-demo/src/main/java/org/jeecg/modules/geke/userShift/service/impl/UserShiftServiceImpl.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.geke.userShift.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.jeecg.common.util.DateUtils;
 import org.jeecg.modules.geke.userShift.entity.UserDept;
@@ -98,19 +99,21 @@ public class UserShiftServiceImpl extends ServiceImpl<UserShiftMapper, UserShift
     }
 
     @Override
-    public List<Map<String, Object>> mothUserShift(String date) throws ParseException {
+    public IPage<Map<String, Object>> mothUserShift(String date,Integer pageNo,Integer pageSize) throws ParseException {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-        List<Map<String, Object>> users = userShiftMapper.getUsers();
+        Page<Map<String, Object>> page = new Page<Map<String, Object>>(pageNo, pageSize);
+        IPage<Map<String, Object>> users = getUsers(page);
         Calendar calendar = Calendar.getInstance();
         calendar.setTime(sdf.parse(date));
+
         int year = calendar.get(Calendar.YEAR);//年份
         int month = calendar.get(calendar.MONTH) + 1;//月份
         int actualMaximum = calendar.getActualMaximum(Calendar.DAY_OF_MONTH);//获取前端传过来的时间获取月份的总天数
 
         for(int i=1;i<=actualMaximum;i++){
-            for (Map user:users){
+            for (Map user:users.getRecords()){
                 String shiftid="";
-                String  shiftname="暂无";
+                String  shiftname="";
                 List<Map<String, Object>> id = userShiftMapper.getOneUserShift(user.get("id").toString(), year +"-"+ month+"-" + i, "");
                if (id.size()>0) {
                    shiftname=id.get(0).get("name").toString();
@@ -118,10 +121,14 @@ public class UserShiftServiceImpl extends ServiceImpl<UserShiftMapper, UserShift
                }
                 user.put("a" + i, shiftname);
                 user.put("shfitid",shiftid);
-                user.put("date" + i, sdf.format(year + month + i));
             }
         }
 
         return users;
     }
+
+    @Override
+    public IPage<Map<String, Object>> getUsers(Page<Map<String, Object>> page) {
+        return page.setRecords(userShiftMapper.getUsers(page));
+    }
 }