diff --git a/src/main/java/com/spring/modules/base/controller/LaborClassController.java b/src/main/java/com/spring/modules/base/controller/LaborClassController.java index 677b8c95..7d52eb44 100644 --- a/src/main/java/com/spring/modules/base/controller/LaborClassController.java +++ b/src/main/java/com/spring/modules/base/controller/LaborClassController.java @@ -1,9 +1,11 @@ package com.spring.modules.base.controller; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.spring.common.utils.PageUtils; import com.spring.common.utils.R; import com.spring.modules.base.entity.LaborClass; import com.spring.modules.base.service.LaborClassService; +import com.spring.modules.base.entity.WorkerLevelQueryDTO; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -49,5 +51,16 @@ public class LaborClassController { return R.ok("操作成功"); } + /*** + * 查询人员等级列表 + * + * @param data + * @return 人员等级 + */ + @PostMapping("/list/workerLevel") + public R queryWorkerLevelList(@RequestBody WorkerLevelQueryDTO data) { + PageUtils page = laborClassService.queryWorkerLevelList(data); + return R.ok().put("page", page); + } } diff --git a/src/main/java/com/spring/modules/base/entity/WorkerLevelQueryDTO.java b/src/main/java/com/spring/modules/base/entity/WorkerLevelQueryDTO.java new file mode 100644 index 00000000..6af79c37 --- /dev/null +++ b/src/main/java/com/spring/modules/base/entity/WorkerLevelQueryDTO.java @@ -0,0 +1,26 @@ +package com.spring.modules.base.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.spring.common.utils.QueryPage; +import lombok.Data; + +@Data +public class WorkerLevelQueryDTO extends QueryPage { + /** + * 工厂 + */ + @TableField("site") + private String site; + + /** + * 加工中心编码 + */ + @TableField("level_id") + private String levelId; + + /** + * 加工中心名称 + */ + @TableField("level_desc") + private String levelDesc; +} diff --git a/src/main/java/com/spring/modules/base/mapper/LaborClassMapper.java b/src/main/java/com/spring/modules/base/mapper/LaborClassMapper.java index 21168756..be968912 100644 --- a/src/main/java/com/spring/modules/base/mapper/LaborClassMapper.java +++ b/src/main/java/com/spring/modules/base/mapper/LaborClassMapper.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.spring.modules.base.entity.LaborClass; +import com.spring.modules.base.entity.WorkerLevelQueryDTO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -17,5 +18,7 @@ import org.apache.ibatis.annotations.Param; public interface LaborClassMapper extends BaseMapper { IPage queryLaborClasByPage(@Param("page") Page page, @Param("params") LaborClass laborClass); + + IPage queryWorkerLevelAll(Page laborClassPage, WorkerLevelQueryDTO data); } diff --git a/src/main/java/com/spring/modules/base/service/Impl/LaborClassServiceImpl.java b/src/main/java/com/spring/modules/base/service/Impl/LaborClassServiceImpl.java index 6921859e..d52a7fae 100644 --- a/src/main/java/com/spring/modules/base/service/Impl/LaborClassServiceImpl.java +++ b/src/main/java/com/spring/modules/base/service/Impl/LaborClassServiceImpl.java @@ -3,9 +3,12 @@ package com.spring.modules.base.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.spring.common.utils.PageUtils; import com.spring.modules.base.entity.LaborClass; import com.spring.modules.base.mapper.LaborClassMapper; import com.spring.modules.base.service.LaborClassService; +import com.spring.modules.base.entity.WorkerLevelQueryDTO; +import com.spring.modules.part.entity.WorkCenter; import org.springframework.stereotype.Service; /** @@ -31,5 +34,11 @@ public class LaborClassServiceImpl extends ServiceImpl list = this.baseMapper.queryWorkerLevelAll(new Page(data.getPage(), data.getLimit()), data); + return new PageUtils(list); + } } diff --git a/src/main/java/com/spring/modules/base/service/LaborClassService.java b/src/main/java/com/spring/modules/base/service/LaborClassService.java index d26109ba..c47a514d 100644 --- a/src/main/java/com/spring/modules/base/service/LaborClassService.java +++ b/src/main/java/com/spring/modules/base/service/LaborClassService.java @@ -1,9 +1,10 @@ package com.spring.modules.base.service; -import cn.hutool.db.Page; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; +import com.spring.common.utils.PageUtils; import com.spring.modules.base.entity.LaborClass; +import com.spring.modules.base.entity.WorkerLevelQueryDTO; /** * (LaborClass)表服务接口 @@ -16,5 +17,7 @@ public interface LaborClassService extends IService { IPage queryLaborClasByPage(int no, int size, LaborClass laborClass); void updateLaborClass(LaborClass laborClass); + + PageUtils queryWorkerLevelList(WorkerLevelQueryDTO data); } diff --git a/src/main/resources/mapper/base/LaborClassMapper.xml b/src/main/resources/mapper/base/LaborClassMapper.xml index 0a67231f..b990e039 100644 --- a/src/main/resources/mapper/base/LaborClassMapper.xml +++ b/src/main/resources/mapper/base/LaborClassMapper.xml @@ -32,4 +32,16 @@ + \ No newline at end of file