From a78df52829b9d2ce677429674a66808188836d6d Mon Sep 17 00:00:00 2001 From: wulin Date: Tue, 15 Sep 2020 13:59:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E7=A7=BB=E5=8A=A8=E7=AB=AF?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=81=94=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ResultRecordController.java | 1 + .../modules/app/entity/SearchStaffEntity.java | 42 +++++++++++++++++++ .../controller/EmployeeController.java | 40 +++--------------- .../equipment/dao/EquipmentInfoMapper.java | 4 ++ .../service/IEquipmentInfoService.java | 8 ++++ .../service/SpecialApplyInfoService.java | 3 +- .../impl/EquipmentInfoServiceImpl.java | 12 +++++- .../mapper/equipment/EquipmentInfoMapper.xml | 11 +++++ .../resources/mapper/generator/StaffDao.xml | 6 +-- 9 files changed, 86 insertions(+), 41 deletions(-) create mode 100644 src/main/java/com/lz/modules/app/entity/SearchStaffEntity.java diff --git a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java index f4ce2d75..7851a998 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -39,6 +39,7 @@ import org.springframework.web.bind.annotation.*; import java.math.BigDecimal; import java.text.SimpleDateFormat; +import java.time.LocalDate; import java.util.*; import java.util.stream.Collectors; diff --git a/src/main/java/com/lz/modules/app/entity/SearchStaffEntity.java b/src/main/java/com/lz/modules/app/entity/SearchStaffEntity.java new file mode 100644 index 00000000..a96b2a8f --- /dev/null +++ b/src/main/java/com/lz/modules/app/entity/SearchStaffEntity.java @@ -0,0 +1,42 @@ +package com.lz.modules.app.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * 员工基本信息表 + * + * @author fumeiai + * @email fumeiai@linzikg.com + * @date 2020-04-29 20:59:20 + */ +@Data +@TableName("lz_staff") +public class SearchStaffEntity implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * 自增主键 + */ + @TableId + private Long id; + + /** + * 员工姓名 + */ + private String name; + /** + * 性别【1:男；2:女；0：未知】 + */ + + //盐 + private String position; + //描述，name-position + private String desc; + + +} diff --git a/src/main/java/com/lz/modules/equipment/controller/EmployeeController.java b/src/main/java/com/lz/modules/equipment/controller/EmployeeController.java index 8b6b5ff0..7c5e60ea 100644 --- a/src/main/java/com/lz/modules/equipment/controller/EmployeeController.java +++ b/src/main/java/com/lz/modules/equipment/controller/EmployeeController.java @@ -1,41 +1,26 @@ package com.lz.modules.equipment.controller; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.lz.common.utils.PageUtils; import com.lz.common.utils.R; import com.lz.common.utils.RedisUtils; -import com.lz.common.utils.StringUtil; -import com.lz.modules.app.annotation.Login; -import com.lz.modules.app.entity.StaffEntity; import com.lz.modules.app.service.StaffService; import com.lz.modules.equipment.entity.EquipmentInfo; -import com.lz.modules.equipment.entity.SpecialApplyInfo; import com.lz.modules.equipment.entity.model.FindByNameModel; import com.lz.modules.equipment.entity.model.FindEmployeeResModel; -import com.lz.modules.equipment.entity.model.FindEquipmentResModel; import com.lz.modules.equipment.entity.model.FindEquipmentsByNameModel; import com.lz.modules.equipment.service.IEquipmentInfoService; import com.lz.modules.equipment.service.SpecialApplyInfoService; import com.lz.modules.sys.controller.AbstractController; -import com.lz.modules.sys.oauth2.TokenGenerator; import io.swagger.annotations.*; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.MediaType; -import org.springframework.util.CollectionUtils; -import org.springframework.util.DigestUtils; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import javax.validation.Valid; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; /** * @Author: djc @@ -80,27 +65,12 @@ public class EmployeeController extends AbstractController { @PostMapping("findUsersEquipmentsByName") public R findUsersEquipmentsByName(@RequestBody @ApiParam FindEquipmentsByNameModel nameModel){ - /*Page data = new Page<>(); - Page equipmentInfoPage = iEquipmentInfoService.selectPage( - new Page<>(nameModel.getCurrPage(), nameModel.getPageSize()), - new EntityWrapper() - .eq("is_delete", 0) - .eq(nameModel.isEmployee(), "user_id", nameModel.getUserId()) - .eq(!nameModel.isEmployee(), "sai_id", nameModel.getUserId())); - List records = equipmentInfoPage.getRecords(); - if(CollectionUtils.isEmpty(records)){ - return R.ok(); - } - List list = records.stream().map(info -> { - FindEquipmentResModel model = new FindEquipmentResModel(); - BeanUtils.copyProperties(info, model); - return model; - }).collect(Collectors.toList()); - data.setTotal(equipmentInfoPage.getPages()); - data.setRecords(list); - return R.ok().put("data", data);*/ - return null; + PageUtils pageUtils = PageUtils.startPage(nameModel.getCurrPage(), nameModel.getPageSize()).doSelect( + page -> iEquipmentInfoService.selectByStaffIdOrDepId(page, nameModel) + ); + + return R.ok().put("data", pageUtils); } diff --git a/src/main/java/com/lz/modules/equipment/dao/EquipmentInfoMapper.java b/src/main/java/com/lz/modules/equipment/dao/EquipmentInfoMapper.java index 3ecc2ca9..95118845 100644 --- a/src/main/java/com/lz/modules/equipment/dao/EquipmentInfoMapper.java +++ b/src/main/java/com/lz/modules/equipment/dao/EquipmentInfoMapper.java @@ -11,6 +11,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.lz.modules.equipment.entity.EquipmentInfo; import com.lz.modules.equipment.entity.EquipmentInfoReq; +import com.lz.modules.equipment.entity.model.FindByNameModel; +import com.lz.modules.equipment.entity.model.FindEquipmentsByNameModel; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -38,4 +40,6 @@ public interface EquipmentInfoMapper extends BaseMapper { List selectByCondition(IPage page, EquipmentInfoReq req); + + List selectByStaffIdOrDepId(@Param("page") IPage page, @Param("nameModel") FindEquipmentsByNameModel nameModel); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/equipment/service/IEquipmentInfoService.java b/src/main/java/com/lz/modules/equipment/service/IEquipmentInfoService.java index adaf184a..73851ebf 100644 --- a/src/main/java/com/lz/modules/equipment/service/IEquipmentInfoService.java +++ b/src/main/java/com/lz/modules/equipment/service/IEquipmentInfoService.java @@ -1,13 +1,19 @@ package com.lz.modules.equipment.service; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.lz.common.utils.PageUtils; import com.lz.modules.equipment.entity.EquipmentDto; import com.lz.modules.equipment.entity.EquipmentInfo; import com.lz.modules.equipment.entity.EquipmentInfoReq; +import com.lz.modules.equipment.entity.model.FindByNameModel; +import com.lz.modules.equipment.entity.model.FindEmployeeResModel; +import com.lz.modules.equipment.entity.model.FindEquipmentsByNameModel; import com.lz.modules.sys.entity.SysUserEntity; +import java.util.List; + /** *

* 服务类 @@ -41,4 +47,6 @@ public interface IEquipmentInfoService extends IService { EquipmentInfo selectEquipmentInfoByCode(String code); PageUtils selectByCondition(EquipmentInfoReq req); + + List selectByStaffIdOrDepId(IPage page, FindEquipmentsByNameModel nameModel); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/equipment/service/SpecialApplyInfoService.java b/src/main/java/com/lz/modules/equipment/service/SpecialApplyInfoService.java index aa61f634..9528436d 100644 --- a/src/main/java/com/lz/modules/equipment/service/SpecialApplyInfoService.java +++ b/src/main/java/com/lz/modules/equipment/service/SpecialApplyInfoService.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.lz.modules.equipment.entity.SpecialApplyInfo; import com.lz.modules.equipment.entity.model.FindByNameModel; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -37,5 +38,5 @@ public interface SpecialApplyInfoService extends IService { SpecialApplyInfo selectSpecialApplyInfoByTypeDesc(String owner); - List selectBySearchName(IPage page, FindByNameModel nameModel); + List selectBySearchName(@Param("page")IPage page, @Param("model")FindByNameModel nameModel); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/equipment/service/impl/EquipmentInfoServiceImpl.java b/src/main/java/com/lz/modules/equipment/service/impl/EquipmentInfoServiceImpl.java index 0fa9538f..8b04cf6e 100644 --- a/src/main/java/com/lz/modules/equipment/service/impl/EquipmentInfoServiceImpl.java +++ b/src/main/java/com/lz/modules/equipment/service/impl/EquipmentInfoServiceImpl.java @@ -1,5 +1,6 @@ package com.lz.modules.equipment.service.impl; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.lz.common.emun.EquipmentState; @@ -11,6 +12,8 @@ import com.lz.modules.app.entity.StaffEntity; import com.lz.modules.app.service.StaffService; import com.lz.modules.equipment.dao.*; import com.lz.modules.equipment.entity.*; +import com.lz.modules.equipment.entity.model.FindByNameModel; +import com.lz.modules.equipment.entity.model.FindEquipmentsByNameModel; import com.lz.modules.equipment.service.IEquipmentInfoService; import com.lz.modules.sys.entity.SysUserEntity; import org.springframework.beans.BeanUtils; @@ -247,13 +250,18 @@ public class EquipmentInfoServiceImpl extends ServiceImpl selectByStaffIdOrDepId(IPage page, FindEquipmentsByNameModel nameModel){ + return equipmentInfoMapper.selectByStaffIdOrDepId(page, nameModel); } } diff --git a/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml b/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml index 96468633..f4c25a4c 100644 --- a/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml +++ b/src/main/resources/mapper/equipment/EquipmentInfoMapper.xml @@ -232,5 +232,16 @@ order by id desc + + diff --git a/src/main/resources/mapper/generator/StaffDao.xml b/src/main/resources/mapper/generator/StaffDao.xml index 1136ba1e..ca9d9594 100644 --- a/src/main/resources/mapper/generator/StaffDao.xml +++ b/src/main/resources/mapper/generator/StaffDao.xml @@ -437,10 +437,10 @@ select * from lz_staff where is_delete = 0 and employee_id = #{employeeId} limit 1 - + select staf.id, staf.name, occ.position, concat(staf.name, '-', occ.position) as 'desc' from lz_staff staf LEFT JOIN lz_staff_occupation occ on staf.id = occ.staff_id where staf.is_delete = 0 - AND name LIKE CONCAT('%',#{model.name},'%') + AND staf.name LIKE CONCAT('%',#{model.name},'%')