From d88e0057c906d3aa2cef697cc96041c8d750a8da Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期五, 19 八月 2022 15:11:09 +0800
Subject: [PATCH] material/getMaterialLimit 查询所有物料(分页，模糊查询) 修改带上关联关系和包含物料编码的产品
---
src/main/java/com/whyc/service/MaterialService.java | 31 ++++++++++---------------------
1 files changed, 10 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/whyc/service/MaterialService.java b/src/main/java/com/whyc/service/MaterialService.java
index 8e2a1e8..995a350 100644
--- a/src/main/java/com/whyc/service/MaterialService.java
+++ b/src/main/java/com/whyc/service/MaterialService.java
@@ -1,7 +1,6 @@
package com.whyc.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.whyc.dto.Response;
@@ -17,28 +16,28 @@
@Autowired(required = false)
private MaterialMapper mapper;
//鏌ヨ鎵�鏈夌殑鏁ｈ浠朵俊鎭姞璁剧疆浜嗘浛鎹㈠叧绯荤殑瀛愪欢淇℃伅
- public Response getAllMaterial(String category,String subCode,String subName,String subModel,int pageCurr,int pageSize) {
+ /*public Response getAllMaterial(String category,String subCode,String subName,String subModel,int pageCurr,int pageSize) {
PageHelper.startPage(pageCurr,pageSize);
- /*QueryWrapper wrapper=new QueryWrapper();
+ *//*QueryWrapper wrapper=new QueryWrapper();
wrapper.orderByAsc("id");
- List<Material> list=mapper.selectList(wrapper);*/
+ List<Material> list=mapper.selectList(wrapper);*//*
List<Material> list=mapper.getAllMaterial(category,subCode,subName,subModel);
PageInfo pageInfo=new PageInfo(list);
return new Response().setII(1,list.size()>0?true:false,pageInfo,"杩斿洖鎵�鏈夌殑鏁ｈ浠�");
- }
+ }*/
//鏌ヨ鎵�鏈夌殑鏁ｈ浠朵俊鎭笉鍒嗛〉
- public Response getMaterialWithoutSub(String parentModel, String subName,int version) {
+ /*public Response getMaterialWithoutSub(String parentModel, String subName,int version) {
List<Material> list=mapper.getMaterialWithoutSub(parentModel,subName,version);
return new Response().setII(1,list.size()>0?true:false,list,"杩斿洖瀛愪欢娌℃湁娣诲姞杩囪仈绯荤殑鏁ｈ浠�");
- }
+ }*/
//鍒犻櫎鏁ｈ浠讹紙灏嗘暎瑁呬欢鏍囪瘑涓轰笉鍙敤锛�
- public Response deleteMaterial(int id) {
+ /*public Response deleteMaterial(int id) {
UpdateWrapper wrapper=new UpdateWrapper();
wrapper.set("status",0);
wrapper.eq("id",id);
int bl=mapper.update(null,wrapper);
return new Response().setII(1,bl>0?true:false,bl,"灏嗘暎瑁呬欢鏍囪瘑涓轰笉鍙敤");
- }
+ }*/
public List<Material> getList() {
return mapper.selectList(null);
@@ -55,18 +54,8 @@
//鏌ヨ鎵�鏈夌墿鏂�(鍒嗛〉锛屾ā绯婃煡璇�)
public Response getMaterialLimit(String subCode, String subName, String subModel, int pageCurr, int pageSize) {
- PageHelper.startPage(pageCurr,pageSize);
- QueryWrapper wrapper=new QueryWrapper();
- if(subCode!=null&&!subCode.isEmpty()){
- wrapper.like("sub_code",subCode);
- }
- if(subName!=null&&!subName.isEmpty()){
- wrapper.like("sub_name",subName);
- }
- if(subModel!=null&&!subModel.isEmpty()){
- wrapper.like("sub_model",subModel);
- }
- List<Material> list=mapper.selectList(wrapper);
+ PageHelper.startPage(pageCurr,pageSize);
+ List<Material> list=mapper.getMaterialLimit(subCode,subName,subModel);
PageInfo pageInfo=new PageInfo(list);
return new Response().setII(1,list.size()>0?true:false,pageInfo,"鏌ヨ鎵�鏈夌墿鏂�(鍒嗛〉锛屾ā绯婃煡璇�)");
}
--
Gitblit v1.9.1