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

【add】行程单、超标功能新增SF工号筛选条件

This commit is contained in:
nixj 2024-07-12 13:36:31 +08:00
parent 595f7b7d3d
commit 3bca3cbb97
4 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/chint/manage/entity/query/ItineraryPageQuery.java
View File

@ -11,6 +11,7 @@ import java.util.List;
public class ItineraryPageQuery extends BaseQuery {
private String applicant="";// 申请人
private String actualOrderNo=""; //申请单号
private String employeeNo=""; //SF工号
private List<String> userIds=new ArrayList<>();
private List<String> companyCodes=new ArrayList<>();

1
src/main/java/com/chint/manage/entity/query/StandardQuery.java
View File

@ -10,6 +10,7 @@ import java.util.List;
@Data
public class StandardQuery extends BaseQuery {
private String applicant="";// 申请人
private String employeeNo=""; //SF工号
private String companyName=""; // 出差公司
private String orderNo=""; //订单号
private String actualOrderNo=""; //申请单号

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

@ -48,6 +48,10 @@ public class JdbcConsumptionDetailRepositoryImpl implements JdbcConsumptionDetai
query += "AND roef.company_code IN (:companyCodes) ";
}
if (!dto.getEmployeeNo().isEmpty()) {
query += "AND ro.user_id = (:employeeNo) ";
}
if (!dto.getUserIds().isEmpty()) {
query += "AND ro.user_id IN (:userIds) ";
}
@ -62,6 +66,7 @@ public class JdbcConsumptionDetailRepositoryImpl implements JdbcConsumptionDetai
.of(dto.getPageNum() - 1, dto.getPageSize());
params.put("actualOrderNo", dto.getActualOrderNo());
params.put("userIds", dto.getUserIds());
params.put("employeeNo", dto.getEmployeeNo());
params.put("companyCodes", dto.getCompanyCodes());
params.put("offset", pageRequest.getOffset());
params.put("limit", pageRequest.getPageSize());

5
src/main/java/com/chint/manage/mapper/impl/ManageOrderDetailRepositoryImpl.java
View File

@ -45,6 +45,10 @@ public class ManageOrderDetailRepositoryImpl implements ManageOrderDetailReposit
query+="AND oes.applicant LIKE (:applicant) ";
}
if (!dto.getEmployeeNo().isEmpty()) {
query+="AND oes.employee_no = (:employeeNo) ";
}
if (!dto.getOrderNo().isEmpty()) {
dto.setOrderNo(dto.getOrderNo()+"%");
query+="AND oes.order_no LIKE (:orderNo) ";
@ -69,6 +73,7 @@ public class ManageOrderDetailRepositoryImpl implements ManageOrderDetailReposit
.of(dto.getPageNum() - 1, dto.getPageSize());
params.put("actualOrderNo", dto.getActualOrderNo());
params.put("applicant", dto.getApplicant());
params.put("employeeNo", dto.getEmployeeNo());
params.put("companyName", dto.getCompanyName());
params.put("companyCods", dto.getCompanyCods());
params.put("orderNo", dto.getOrderNo());