瀏覽代碼

查询条件

gaodd 1 年之前
父節點
當前提交
e5b0ba1a1a

+ 4 - 4
src/main/java/com/chinaitop/depot/product/controller/DataKcglCplkcswDefaultController.java

@@ -23,9 +23,9 @@ import io.swagger.annotations.ApiOperation;
23
  * shine
23
  * shine
24
  * 成品粮 库存实物
24
  * 成品粮 库存实物
25
  */
25
  */
26
+@RequestMapping(value="/cplkc")
27
+@Api(tags="成品粮油库存实物")
26
 @RestController
28
 @RestController
27
-@RequestMapping(value = "/cplkc")
28
-@Api(value= "DataKcglCplkcswDefaultController", description = "成品粮油库存实物")
29
 public class DataKcglCplkcswDefaultController {
29
 public class DataKcglCplkcswDefaultController {
30
 
30
 
31
     @Resource
31
     @Resource
@@ -45,9 +45,9 @@ public class DataKcglCplkcswDefaultController {
45
 
45
 
46
     })
46
     })
47
     public PageInfo<DataKcglCplkcswDefault> getList(Integer pageNum, Integer pageSize, 
47
     public PageInfo<DataKcglCplkcswDefault> getList(Integer pageNum, Integer pageSize, 
48
-    		String houseName, String wareName, String sjjlspmc, Integer orgId){
48
+    		String houseId, String wareId, String sjjlspmc, Integer orgId){
49
     	
49
     	
50
-        List<DataKcglCplkcswDefault> list = dataKcglCplkcswDefaultService.getlist(pageNum,pageSize,houseName,wareName,sjjlspmc,orgId);
50
+        List<DataKcglCplkcswDefault> list = dataKcglCplkcswDefaultService.getlist(pageNum,pageSize,houseId,wareId,sjjlspmc,orgId);
51
         		 
51
         		 
52
         PageInfo<DataKcglCplkcswDefault> pageInfo = new PageInfo<DataKcglCplkcswDefault>(list);
52
         PageInfo<DataKcglCplkcswDefault> pageInfo = new PageInfo<DataKcglCplkcswDefault>(list);
53
         return pageInfo;
53
         return pageInfo;

+ 1 - 1
src/main/java/com/chinaitop/depot/product/service/DataKcglCplkcswDefaultService.java

@@ -10,7 +10,7 @@ import com.chinaitop.depot.product.model.DataKcglCplkcswDefault;
10
  */
10
  */
11
 public interface DataKcglCplkcswDefaultService {
11
 public interface DataKcglCplkcswDefaultService {
12
 
12
 
13
-	List<DataKcglCplkcswDefault> getlist(Integer pageNum, Integer pageSize, String houseName, String wareName,
13
+	List<DataKcglCplkcswDefault> getlist(Integer pageNum, Integer pageSize, String houseId, String wareId,
14
 			String sjjlspmc, Integer orgId);
14
 			String sjjlspmc, Integer orgId);
15
 
15
 
16
 	DataKcglCplkcswDefault getById(String id);
16
 	DataKcglCplkcswDefault getById(String id);

+ 5 - 5
src/main/java/com/chinaitop/depot/product/service/impl/DataKcglCplkcswDefaultServiceImpl.java

@@ -20,17 +20,17 @@ public class DataKcglCplkcswDefaultServiceImpl implements DataKcglCplkcswDefault
20
 	private DataKcglCplkcswDefaultMapper dataKcglCplkcswDefaultMapper;
20
 	private DataKcglCplkcswDefaultMapper dataKcglCplkcswDefaultMapper;
21
 
21
 
22
 	@Override
22
 	@Override
23
-	public List<DataKcglCplkcswDefault> getlist(Integer pageNum, Integer pageSize, String houseName, String wareName,
23
+	public List<DataKcglCplkcswDefault> getlist(Integer pageNum, Integer pageSize, String houseId, String wareId,
24
 			String sjjlspmc, Integer orgId) {
24
 			String sjjlspmc, Integer orgId) {
25
 		
25
 		
26
 		DataKcglCplkcswDefaultExample dataKcglCplkcswDefaultExample = new DataKcglCplkcswDefaultExample();
26
 		DataKcglCplkcswDefaultExample dataKcglCplkcswDefaultExample = new DataKcglCplkcswDefaultExample();
27
     	DataKcglCplkcswDefaultExample.Criteria criteria = dataKcglCplkcswDefaultExample.createCriteria();
27
     	DataKcglCplkcswDefaultExample.Criteria criteria = dataKcglCplkcswDefaultExample.createCriteria();
28
         
28
         
29
-        if(ParameterUtil.isnotnull(houseName)){
30
-           criteria.andChmcLike(houseName);
29
+        if(ParameterUtil.isnotnull(houseId)){
30
+           criteria.andChEqualTo(houseId);
31
         }
31
         }
32
-        if(ParameterUtil.isnotnull(wareName)){
33
-            criteria.andHwmcLike(wareName);
32
+        if(ParameterUtil.isnotnull(wareId)){
33
+            criteria.andHwhEqualTo(wareId);
34
          }
34
          }
35
         if(ParameterUtil.isnotnull(sjjlspmc)){
35
         if(ParameterUtil.isnotnull(sjjlspmc)){
36
             criteria.andSjjlspmcLike(sjjlspmc);
36
             criteria.andSjjlspmcLike(sjjlspmc);