echo
/
route
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
lulz1 2024-07-12 13:32:03 +08:00
parent 79f777c3c6 ff097fbb08
commit 595f7b7d3d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/chint/manage/entity/query/ConsumptionDetailQuery.java
View File

@ -19,7 +19,7 @@ public class ConsumptionDetailQuery extends BaseQuery{
*/ */
private Integer productType; private Integer productType;
private String userName=""; private String userName="";
private String userCode=""; private String employeeNo=""; //SF工号
private String actualOrderNo=""; //申请单号 private String actualOrderNo=""; //申请单号
// private List<Long> orderIds=new ArrayList<>(); // private List<Long> orderIds=new ArrayList<>();
private List<String> orderNos=new ArrayList<>(); private List<String> orderNos=new ArrayList<>();

6
src/main/java/com/chint/manage/mapper/impl/JdbcConsumptionDetailRepositoryImpl.java
View File

@ -187,8 +187,8 @@ public class JdbcConsumptionDetailRepositoryImpl implements JdbcConsumptionDetai
dto.setUserName(dto.getUserName() + "%"); dto.setUserName(dto.getUserName() + "%");
query += "AND tod.booking_name LIKE (:userName)"; query += "AND tod.booking_name LIKE (:userName)";
} }
if (!dto.getUserCode().isEmpty()) { if (!dto.getEmployeeNo().isEmpty()) {
query += "AND tod.booking_user_code = (:userCode)"; query += "AND tod.booking_user_code = (:employeeNo)";
} }
if (!dto.getCompanyCodes().isEmpty()) { if (!dto.getCompanyCodes().isEmpty()) {
@ -199,7 +199,7 @@ public class JdbcConsumptionDetailRepositoryImpl implements JdbcConsumptionDetai
query += "AND tod.order_no IN (:orderNos)"; query += "AND tod.order_no IN (:orderNos)";
} }
params.put("userCode", dto.getUserCode()); params.put("employeeNo", dto.getEmployeeNo());
params.put("userName", dto.getUserName()); params.put("userName", dto.getUserName());
params.put("orderNos", dto.getOrderNos()); params.put("orderNos", dto.getOrderNos());
params.put("companyCodes", dto.getCompanyCodes()); params.put("companyCodes", dto.getCompanyCodes());