袁野 5 days ago
parent 9aabc0a08a
commit e9172cdae5
  1. 10
      bweb/src/main/java/com/bweb/controller/item/EnOilManagementController.java
  2. 4
      service/src/main/java/com/hfkj/service/item/impl/EnOilManagementServiceImpl.java

@ -118,6 +118,7 @@ public class EnOilManagementController {
body.setUpdateTime(new Date());
body.setOilDepotsId(enOilDepots.getId());
body.setCreateTime(new Date());
body.setCreateUser(sessionModel.getAccount().getId());
body.setStatus(1);
@ -139,6 +140,7 @@ public class EnOilManagementController {
public ResponseData queryList(@RequestParam(value = "type" , required = false) Integer type,
@RequestParam(value = "transportCarId" , required = false) Long transportCarId,
@RequestParam(value = "oilType" , required = false) Integer oilType,
@RequestParam(value = "oilDepotsId" , required = false) Long oilDepotsId,
@RequestParam(value = "transportCarNo" , required = false) String transportCarNo,
@RequestParam(value = "status" , required = false) Integer status,
@RequestParam(value = "supplier" , required = false) String supplier,
@ -149,13 +151,19 @@ public class EnOilManagementController {
if (sessionModel == null) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.ACCOUNT_LOGIN_NOT, "");
}
Map<String,Object> param = new HashMap<>();
if (sessionModel.getAccount().getObjectType().equals(SecUserObjectTypeEnum.type3.getCode())) {
param.put("oilDepotsId", sessionModel.getAccount().getObjectId());
} else {
param.put("oilDepotsId", oilDepotsId);
}
param.put("type", type);
param.put("transportCarId", transportCarId);
param.put("oilType", oilType);
param.put("transportCarNo", transportCarNo);
param.put("supplier", supplier);
param.put("status", status);
PageHelper.startPage(pageNum, pageSize);

@ -113,6 +113,10 @@ public class EnOilManagementServiceImpl implements EnOilManagementService {
if (MapUtils.getLong(map, "createUser") != null) {
criteria.andCreateUserEqualTo(MapUtils.getLong(map, "createUser"));
}
if (MapUtils.getLong(map, "oilDepotsId") != null) {
criteria.andOilDepotsIdEqualTo(MapUtils.getLong(map, "oilDepotsId"));
}
if (MapUtils.getInteger(map, "status") != null) {
criteria.andStatusEqualTo(MapUtils.getInteger(map, "status"));
}else {

Loading…
Cancel
Save