|
|
@@ -203,12 +203,12 @@ public class GrainConditionRecordServiceImpl extends ServiceImpl<GrainConditionR
|
|
203
|
203
|
@Override
|
|
204
|
204
|
public List<GrainConditionRecord> getByRoleTime(PageParam pageParam) {
|
|
205
|
205
|
|
|
206
|
|
- String houseId = null;
|
|
207
|
|
- String depotId = null;
|
|
|
206
|
+ Integer houseId = null;
|
|
|
207
|
+ Integer depotId = null;
|
|
208
|
208
|
if (!StringUtils.isEmpty(pageParam.getCondition())) {
|
|
209
|
209
|
JSONObject object = new JSONObject(pageParam.getCondition());
|
|
210
|
|
- houseId = object.optString("house_id").trim();
|
|
211
|
|
- depotId = object.optString("depot_id").trim();
|
|
|
210
|
+ houseId = object.optInt("house_id");
|
|
|
211
|
+ depotId = object.optInt("depot_id");
|
|
212
|
212
|
}
|
|
213
|
213
|
List<GrainConditionRecord> list = grainConditionRecordMapper.getByCheckPersonAndCheckTime(houseId,depotId);
|
|
214
|
214
|
for (GrainConditionRecord conditionRecord : list) {
|