src/main/java/com/zy/asrs/controller/MatController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/zy/asrs/mapper/MatMapper.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/zy/asrs/service/MatService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/zy/asrs/service/impl/MatServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/resources/mapper/MatMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/zy/asrs/controller/MatController.java
@@ -53,12 +53,17 @@ @RequestMapping(value = "/mat/list/pda/auth") @ManagerAuth public R pdaList(@RequestParam(required = true)Long tagId){ public R pdaList(@RequestParam(defaultValue = "1")Integer curr, @RequestParam(defaultValue = "20")Integer limit, @RequestParam Map<String, Object> param, @RequestParam(required = true) Long tagId){ EntityWrapper<Mat> wrapper = new EntityWrapper<>(); // wrapper.eq("tag_id", tagId); // wrapper.orderBy("create_time", false); List<Mat> mats = matService.selectList(wrapper); return R.ok().add(mats); Page<Mat> matPage = toPage(curr, limit, param, Mat.class); Page<Mat> page = matService.selectAllPage(matPage); // List<Mat> mats = matService.selectList(wrapper); return R.ok().add(page); } @RequestMapping(value = "/mat/search/pda/auth") src/main/java/com/zy/asrs/mapper/MatMapper.java
@@ -8,6 +8,7 @@ import com.zy.asrs.entity.Mat; import java.util.List; import java.util.Map; @Mapper @Repository @@ -17,4 +18,7 @@ Mat selectByMatnr(@Param("matnr")String matnr); List<Mat> selectAllPage(Map<String, Object> condition); int selectAllPageSize(Map<String, Object> condition); } src/main/java/com/zy/asrs/service/MatService.java
@@ -10,4 +10,5 @@ Mat selectByMatnr(String matnr); Page<Mat> selectAllPage(Page<Mat> matPage); } src/main/java/com/zy/asrs/service/impl/MatServiceImpl.java
@@ -2,10 +2,14 @@ import com.baomidou.mybatisplus.plugins.Page; import com.baomidou.mybatisplus.service.impl.ServiceImpl; import com.zy.asrs.entity.ManLocDetl; import org.springframework.stereotype.Service; import com.zy.asrs.entity.Mat; import com.zy.asrs.mapper.MatMapper; import com.zy.asrs.service.MatService; import java.util.List; import java.util.Map; @Service("matService") public class MatServiceImpl extends ServiceImpl<MatMapper, Mat> implements MatService { @@ -21,5 +25,14 @@ return this.baseMapper.selectByMatnr(matnr); } @Override public Page<Mat> selectAllPage(Page<Mat> matPage) { Map<String, Object> condition = matPage.getCondition(); List<Mat> manLocDetls = baseMapper.selectAllPage(condition); matPage.setRecords(manLocDetls); matPage.setTotal(baseMapper.selectAllPageSize(condition)); return matPage; } } src/main/resources/mapper/MatMapper.xml
@@ -76,4 +76,21 @@ <select id="selectByMatnr" resultMap="BaseResultMap"> select top 1 * from man_mat where 1=1 and matnr = #{matnr} </select> <select id="selectAllPage" resultMap="BaseResultMap"> select * from ( SELECT ROW_NUMBER() over (order by v.matnr desc) as row, v.* FROM man_mat v WHERE 1=1 ) t where t.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize}) </select> <select id="selectAllPageSize" resultType="java.lang.Integer"> select count(1) FROM man_mat v WHERE 1=1 </select> </mapper>