【update】超标报表去除SF工号查询条件
This commit is contained in:
parent
9e8807c19f
commit
dc8c270fab
|
@ -9,5 +9,4 @@ public class StandardQuery extends BaseQuery {
|
||||||
private String companyName=""; // 出差公司
|
private String companyName=""; // 出差公司
|
||||||
private String orderNo=""; //订单号
|
private String orderNo=""; //订单号
|
||||||
private String actualOrderNo=""; //申请单号
|
private String actualOrderNo=""; //申请单号
|
||||||
private String employeeNo=""; //SF工号
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -18,5 +18,5 @@ public interface JdbcOrderExceedStandardRepository extends CrudRepository<OrderE
|
||||||
@Query("UPDATE order_exceed_standard SET approval_status = :status WHERE order_no = :orderNo")
|
@Query("UPDATE order_exceed_standard SET approval_status = :status WHERE order_no = :orderNo")
|
||||||
void updateApprovalStatusById(@Param("status") String status, @Param("orderNo") String 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);
|
||||||
}
|
}
|
||||||
|
|
|
@ -105,11 +105,10 @@ public class ManageServiceImpl implements ManageService {
|
||||||
|
|
||||||
PageRequest pageRequest = PageRequest
|
PageRequest pageRequest = PageRequest
|
||||||
.of(dto.getPageNum() - 1, dto.getPageSize(), Sort.by("id").descending());
|
.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.getCompanyName(),
|
||||||
dto.getActualOrderNo(),
|
dto.getActualOrderNo(),
|
||||||
dto.getOrderNo(),
|
dto.getOrderNo(),
|
||||||
dto.getEmployeeNo(),
|
|
||||||
orderNos,
|
orderNos,
|
||||||
pageRequest);
|
pageRequest);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue