Browse Source

2025-5-29

master
Aoi_Tori 9 months ago
parent
commit
4123f69d3c
  1. 13
      src/main/java/com/spring/modules/base/controller/LaborClassController.java
  2. 26
      src/main/java/com/spring/modules/base/entity/WorkerLevelQueryDTO.java
  3. 3
      src/main/java/com/spring/modules/base/mapper/LaborClassMapper.java
  4. 9
      src/main/java/com/spring/modules/base/service/Impl/LaborClassServiceImpl.java
  5. 5
      src/main/java/com/spring/modules/base/service/LaborClassService.java
  6. 12
      src/main/resources/mapper/base/LaborClassMapper.xml

13
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);
}
}

26
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;
}

3
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<LaborClass> {
IPage<LaborClass> queryLaborClasByPage(@Param("page") Page<LaborClass> page, @Param("params") LaborClass laborClass);
IPage<LaborClass> queryWorkerLevelAll(Page<LaborClass> laborClassPage, WorkerLevelQueryDTO data);
}

9
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<LaborClassMapper, LaborCl
.set(LaborClass::getCurrentLevelCost,laborClass.getCurrentLevelCost())
.update();
}
@Override
public PageUtils queryWorkerLevelList(WorkerLevelQueryDTO data) {
IPage<LaborClass> list = this.baseMapper.queryWorkerLevelAll(new Page<LaborClass>(data.getPage(), data.getLimit()), data);
return new PageUtils(list);
}
}

5
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<LaborClass> {
IPage<LaborClass> queryLaborClasByPage(int no, int size, LaborClass laborClass);
void updateLaborClass(LaborClass laborClass);
PageUtils queryWorkerLevelList(WorkerLevelQueryDTO data);
}

12
src/main/resources/mapper/base/LaborClassMapper.xml

@ -32,4 +32,16 @@
</where>
</trim>
</select>
<select id="queryWorkerLevelAll" resultType="com.spring.modules.base.entity.LaborClass">
SELECT level_id levelId, level_desc levelDesc
FROM labor_class
WHERE active = 'Y'
AND site = #{data.site}
<if test="data.levelId != null and data.levelId != ''">
AND level_id LIKE #{data.levelId}
</if>
<if test="data.levelDesc != null and data.levelDesc != ''">
AND level_desc LIKE #{data.levelDesc}
</if>
</select>
</mapper>
Loading…
Cancel
Save