diff --git a/src/main/java/com/chint/manage/entity/query/ConsumptionDetailQuery.java b/src/main/java/com/chint/manage/entity/query/ConsumptionDetailQuery.java index 0f921087..60ea6c9a 100644 --- a/src/main/java/com/chint/manage/entity/query/ConsumptionDetailQuery.java +++ b/src/main/java/com/chint/manage/entity/query/ConsumptionDetailQuery.java @@ -19,7 +19,7 @@ public class ConsumptionDetailQuery extends BaseQuery{ */ private Integer productType; private String userName=""; - private String userCode=""; + private String employeeNo=""; //SF工号 private String actualOrderNo=""; //申请单号 // private List orderIds=new ArrayList<>(); private List orderNos=new ArrayList<>(); diff --git a/src/main/java/com/chint/manage/mapper/impl/JdbcConsumptionDetailRepositoryImpl.java b/src/main/java/com/chint/manage/mapper/impl/JdbcConsumptionDetailRepositoryImpl.java index 0b473bbb..4c5a198b 100644 --- a/src/main/java/com/chint/manage/mapper/impl/JdbcConsumptionDetailRepositoryImpl.java +++ b/src/main/java/com/chint/manage/mapper/impl/JdbcConsumptionDetailRepositoryImpl.java @@ -187,8 +187,8 @@ public class JdbcConsumptionDetailRepositoryImpl implements JdbcConsumptionDetai dto.setUserName(dto.getUserName() + "%"); query += "AND tod.booking_name LIKE (:userName)"; } - if (!dto.getUserCode().isEmpty()) { - query += "AND tod.booking_user_code = (:userCode)"; + if (!dto.getEmployeeNo().isEmpty()) { + query += "AND tod.booking_user_code = (:employeeNo)"; } if (!dto.getCompanyCodes().isEmpty()) { @@ -199,7 +199,7 @@ public class JdbcConsumptionDetailRepositoryImpl implements JdbcConsumptionDetai query += "AND tod.order_no IN (:orderNos)"; } - params.put("userCode", dto.getUserCode()); + params.put("employeeNo", dto.getEmployeeNo()); params.put("userName", dto.getUserName()); params.put("orderNos", dto.getOrderNos()); params.put("companyCodes", dto.getCompanyCodes());