From 3734974695b65ccf63b1df9281deede91195fc11 Mon Sep 17 00:00:00 2001
From: zhitong.yu <xynz17@163.com>
Date: 星期二, 16 四月 2024 17:09:55 +0800
Subject: [PATCH] 通用版本V1.5    注:修复历史考勤时间范围查找

---
 src/main/java/com/hxzk/service/impl/PersonServiceImpl.java |   37 ++++++++++++++++++++++++++++---------
 1 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/hxzk/service/impl/PersonServiceImpl.java b/src/main/java/com/hxzk/service/impl/PersonServiceImpl.java
index 5a476cf..8bf5111 100644
--- a/src/main/java/com/hxzk/service/impl/PersonServiceImpl.java
+++ b/src/main/java/com/hxzk/service/impl/PersonServiceImpl.java
@@ -1,6 +1,8 @@
 package com.hxzk.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -8,10 +10,12 @@
 import com.hxzk.mapper.PersonDao;
 import com.hxzk.pojo.TbPerson;
 import com.hxzk.pojo.TbTag;
+import com.hxzk.pojo.TbWarning;
 import com.hxzk.service.PersonService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Arrays;
 import java.util.List;
 
 @Service
@@ -91,9 +95,7 @@
     @Override
     public PageInfo<TbPerson> findAllRenYuan(Integer page, Integer limit) {
         PageHelper.startPage(page,limit);
-        QueryWrapper<TbPerson> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("baoliu19", "铻嶅悎缁堢").or().eq("baoliu19", "绯荤粺榛樿").or().eq("baoliu19","lora鏍囩");
-        List<TbPerson> cardList = baseMapper.selectList(queryWrapper);
+        List<TbPerson> cardList = personDao.findPersonAll();
         PageInfo<TbPerson> info = new PageInfo<>(cardList);
         return info;
     }
@@ -142,12 +144,18 @@
     }
 
     @Override
-    public List<TbPersonAndDepartment> findSanWei() {
+    public List<TbPersonAndDepartment> findSanWeiOnline() {
         QueryWrapper queryWrapper = new QueryWrapper<>();
         return personDao.findAllBuMen2();
     }
 
     @Override
+    public List<TbPersonAndDepartment> findSanWeiOffOnline() {
+        QueryWrapper queryWrapper = new QueryWrapper<>();
+        return personDao.findAllBuMen3();
+    }
+
+    @Override
     public List<TbPersonAndDepartment> getGps() {
         QueryWrapper queryWrapper = new QueryWrapper<>();
         List<TbPersonAndDepartment> people = personDao.findAllBuMen();
@@ -167,6 +175,17 @@
     }
 
     @Override
+    public List<TbPerson> FindFidPersons(String[] FID) {
+        LambdaQueryWrapper<TbPerson> queryWrapper = Wrappers.lambdaQuery(TbPerson.class);
+        // 鏋勯�犳煡璇㈡潯浠�
+        queryWrapper.in(TbPerson::getBaoliu39, FID);
+
+        // 鏌ヨ鏁版嵁搴�
+        List<TbPerson> resultList = baseMapper.selectList(queryWrapper);
+        return resultList;
+    }
+
+    @Override
     public int findTagidPerson(String tagid) {
         QueryWrapper queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("p_tagid",tagid);
@@ -200,15 +219,15 @@
     }
 
     @Override
-    public List<TbPerson> findpersonAll() {
-        QueryWrapper queryWrapper = new QueryWrapper<>();
-        return baseMapper.selectList(queryWrapper);
-    }
-    @Override
     public List<TbPerson> findSanWeiFloorPerson(String baoliu38) {
         QueryWrapper queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("baoliu39",baoliu38);
         queryWrapper.eq("p_online","1");
         return baseMapper.selectList(queryWrapper);
     }
+
+    @Override
+    public List<TbPerson> FindShowJianZhu() {
+        return personDao.FindShowJianZhu();
+    }
 }

--
Gitblit v1.10.0