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

【update】超标报表去除SF工号查询条件

This commit is contained in:
nixj 2024-06-20 13:16:01 +08:00
parent 9e8807c19f
commit dc8c270fab
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,5 +9,4 @@ public class StandardQuery extends BaseQuery {
private String companyName=""; // 出差公司
private String orderNo=""; //订单号
private String actualOrderNo=""; //申请单号
private String employeeNo=""; //SF工号
}

2
src/main/java/com/chint/manage/mapper/JdbcOrderExceedStandardRepository.java
View File

@ -18,5 +18,5 @@ public interface JdbcOrderExceedStandardRepository extends CrudRepository<OrderE
@Query("UPDATE order_exceed_standard SET approval_status = :status WHERE order_no = :orderNo")
void updateApprovalStatusById(@Param("status") String status, @Param("orderNo") String orderNo);
Page<OrderExceedStandard> findAllByApplicantContainsAndCompanyNameContainsAndActualOrderNoContainsAndOrderNoContainsAndEmployeeNoContainsAndOrderNoIn(String applicant, String company, String actualOrderNo, String orderNo,String employeeNo, List<String> orderNos, Pageable pageable);
Page<OrderExceedStandard> findAllByApplicantContainsAndCompanyNameContainsAndActualOrderNoContainsAndOrderNoContainsAndOrderNoIn(String applicant, String company, String actualOrderNo, String orderNo, List<String> orderNos, Pageable pageable);
}

3
src/main/java/com/chint/manage/service/impl/ManageServiceImpl.java
View File

@ -105,11 +105,10 @@ public class ManageServiceImpl implements ManageService {
PageRequest pageRequest = PageRequest
.of(dto.getPageNum() - 1, dto.getPageSize(), Sort.by("id").descending());
Page<OrderExceedStandard> page=jdbcOrderExceedStandardRepository.findAllByApplicantContainsAndCompanyNameContainsAndActualOrderNoContainsAndOrderNoContainsAndEmployeeNoContainsAndOrderNoIn(dto.getApplicant(),
Page<OrderExceedStandard> page=jdbcOrderExceedStandardRepository.findAllByApplicantContainsAndCompanyNameContainsAndActualOrderNoContainsAndOrderNoContainsAndOrderNoIn(dto.getApplicant(),
dto.getCompanyName(),
dto.getActualOrderNo(),
dto.getOrderNo(),
dto.getEmployeeNo(),
orderNos,
pageRequest);