|
|
@@ -65,7 +65,8 @@ public class StorageQualitycheckController {
|
|
65
|
65
|
@ApiImplicitParam(name = "depotType", value = "判断是否是代储", paramType = "query"),
|
|
66
|
66
|
})
|
|
67
|
67
|
public PageInfo<StorageQualitycheck> listPage(Integer pageNum, Integer pageSize, StorageQualitycheck qualitycheck,
|
|
68
|
|
- String checktype,String checkResult,String depotType,String createTime) {
|
|
|
68
|
+ String checktype,String checkResult,String depotType,String createTime,
|
|
|
69
|
+ Integer processState) {
|
|
69
|
70
|
StorageQualitycheck qualityCheck = new StorageQualitycheck();
|
|
70
|
71
|
|
|
71
|
72
|
//根据后台传来的参数进行查找相应类型的类别0:初检 1:验收 2:质量普查 3:出库
|
|
|
@@ -113,6 +114,9 @@ public class StorageQualitycheckController {
|
|
113
|
114
|
qualityCheck.setDepotId(Integer.parseInt(depotType));
|
|
114
|
115
|
}
|
|
115
|
116
|
|
|
|
117
|
+ if(processState != null){
|
|
|
118
|
+ qualityCheck.setProcessState(processState);
|
|
|
119
|
+ }
|
|
116
|
120
|
//归档用时间查询
|
|
117
|
121
|
if(ParameterUtil.isnotnull(createTime)){
|
|
118
|
122
|
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|