|
|
@@ -62,6 +62,19 @@ public class KcswController {
|
|
62
|
62
|
Map<String, Object> queryByExample = kcswService.queryByExample(orgId);
|
|
63
|
63
|
return queryByExample;
|
|
64
|
64
|
}
|
|
|
65
|
+
|
|
|
66
|
+ @RequestMapping(value="/countByBl", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
|
|
|
67
|
+ @ApiOperation(value="根据库存总量", notes = "根据库存总量")
|
|
|
68
|
+ @ApiImplicitParams({
|
|
|
69
|
+ @ApiImplicitParam(name = "orgId", value = "单位ID", paramType = "query")
|
|
|
70
|
+ })
|
|
|
71
|
+ public String countByBl(Integer orgId) {
|
|
|
72
|
+ Map<String, Object> map = new HashMap<String, Object>();
|
|
|
73
|
+ map.put("orgId", orgId);
|
|
|
74
|
+ String countKcsl = kcswService.countByBl(map);
|
|
|
75
|
+ countKcsl = ObjectUtils.toString(countKcsl, "0");
|
|
|
76
|
+ return countKcsl;
|
|
|
77
|
+ }
|
|
65
|
78
|
|
|
66
|
79
|
/**
|
|
67
|
80
|
* 根据等级分组查询
|
|
|
@@ -113,11 +126,10 @@ public class KcswController {
|
|
113
|
126
|
@ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
|
|
114
|
127
|
@ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
|
|
115
|
128
|
@ApiImplicitParam(name = "kcswStr", value = "条件集合", paramType = "query"),
|
|
116
|
|
- @ApiImplicitParam(name = "order", value = "排序方式", paramType = "query"),
|
|
117
|
|
- @ApiImplicitParam(name="kcsl", value="库存数量", paramType="query")
|
|
|
129
|
+ @ApiImplicitParam(name = "order", value = "排序方式", paramType = "query")
|
|
118
|
130
|
})
|
|
119
|
131
|
public PageInfo<DataKcglKcswDefault> getList(Integer pageNum, Integer pageSize, String kcswStr,
|
|
120
|
|
- String order, String kcsl){
|
|
|
132
|
+ String order){
|
|
121
|
133
|
ObjectMapper mapper = new ObjectMapper();
|
|
122
|
134
|
DataKcglKcswDefault kcsw = null;
|
|
123
|
135
|
PageInfo<DataKcglKcswDefault> pageInfo = null;
|
|
|
@@ -141,10 +153,6 @@ public class KcswController {
|
|
141
|
153
|
if (null != kcsw.getUnitid() && !"".equals(kcsw.getUnitid())) {
|
|
142
|
154
|
criteria.andUnitidEqualTo(kcsw.getUnitid());
|
|
143
|
155
|
}
|
|
144
|
|
- /* 库存数量模糊查询 */
|
|
145
|
|
- if (null != kcsl && !"".equals(kcsl)) {
|
|
146
|
|
- criteria.andKcslLike("%"+kcsl+"%");
|
|
147
|
|
- }
|
|
148
|
156
|
/* 排序 */
|
|
149
|
157
|
if (null != order && !"".equals(order)) {
|
|
150
|
158
|
example.setOrderByClause(order);
|