|
|
@@ -61,11 +61,12 @@ public class StorageQualitycheckController {
|
|
61
|
61
|
@ApiImplicitParam(name = "subType", value = "粮食品种", paramType = "query"),
|
|
62
|
62
|
@ApiImplicitParam(name = "searchStartDate", value = "开始日期", paramType = "query"),
|
|
63
|
63
|
@ApiImplicitParam(name = "searchEndDate", value = "结束日期", paramType = "query"),
|
|
64
|
|
- @ApiImplicitParam(name = "orgId", value = "单位ID", paramType = "query")
|
|
|
64
|
+ @ApiImplicitParam(name = "orgId", value = "单位ID", paramType = "query"),
|
|
|
65
|
+ @ApiImplicitParam(name = "flagType", value = "验收结果", paramType = "query")
|
|
65
|
66
|
})
|
|
66
|
67
|
public PageInfo<StorageQualitycheck> listPage(Integer pageNum, Integer pageSize,
|
|
67
|
68
|
StorageQualitycheck qualitycheck, String checktype, String checkResult,
|
|
68
|
|
- String quality, Integer subType, String searchStartDate, String searchEndDate, Integer orgId) {
|
|
|
69
|
+ String quality, Integer subType, String searchStartDate, String searchEndDate, Integer orgId, String flagType) {
|
|
69
|
70
|
StorageQualitycheck qualityCheck = new StorageQualitycheck();
|
|
70
|
71
|
//根据后台传来的参数进行查找相应类型的类别0:初检 1:验收 2:质量普查 3:出库
|
|
71
|
72
|
if (StringUtils.isNotBlank(checktype)){
|
|
|
@@ -115,9 +116,9 @@ public class StorageQualitycheckController {
|
|
115
|
116
|
}
|
|
116
|
117
|
|
|
117
|
118
|
//验收结果
|
|
118
|
|
-// if (qualitycheck.getFlagType() != null) {
|
|
119
|
|
-// qualityCheck.setFlagType(flagType);
|
|
120
|
|
-// }
|
|
|
119
|
+ if (flagType != null) {
|
|
|
120
|
+ qualityCheck.setFlagType(Integer.valueOf(flagType));
|
|
|
121
|
+ }
|
|
121
|
122
|
|
|
122
|
123
|
qualityCheck.setHistoryStatus(0);//0:最新数据 1:历史数据
|
|
123
|
124
|
//查询出未封仓的质量管理信息 封仓状态:0:未封仓,1:已封仓
|