fix naming issue
parent
29ccd209f6
commit
e2001174dd
|
@ -196,7 +196,7 @@ public class FinishedItemDAO {
|
||||||
return namedParameterJdbcTemplate.query(SELECT_BY_JOB_CARD_AND_DATE, params, new FinishedItemRowMapper());
|
return namedParameterJdbcTemplate.query(SELECT_BY_JOB_CARD_AND_DATE, params, new FinishedItemRowMapper());
|
||||||
}
|
}
|
||||||
|
|
||||||
public Long findByOperationDoneDateAndIdsAndQaStatus(String startDate, String endDate, String qaStatus, List<Long> ids){
|
public Long findByOperationDateAndIdsAndQaStatus(String startDate, String endDate, String qaStatus, List<Long> ids){
|
||||||
MapSqlParameterSource params = new MapSqlParameterSource();
|
MapSqlParameterSource params = new MapSqlParameterSource();
|
||||||
params.addValue( "start_date", startDate );
|
params.addValue( "start_date", startDate );
|
||||||
params.addValue( "end_date", endDate );
|
params.addValue( "end_date", endDate );
|
||||||
|
|
|
@ -78,11 +78,11 @@ public class DashboardService {
|
||||||
Long operationNotPerformed = 0L;
|
Long operationNotPerformed = 0L;
|
||||||
|
|
||||||
if (finishing != null && !finishing.isEmpty()) {
|
if (finishing != null && !finishing.isEmpty()) {
|
||||||
approved = finishedItemDAO.findByOperationDoneDateAndIdsAndQaStatus(startDate1, endDate1, "APPROVED", finishing);
|
approved = finishedItemDAO.findByOperationDateAndIdsAndQaStatus(startDate1, endDate1, "APPROVED", finishing);
|
||||||
operationNotPerformed = finishedItemDAO.findByOperationDoneDateAndIdsAndQaStatus(null, endDate1, "-", finishing);
|
operationNotPerformed = finishedItemDAO.findByOperationDateAndIdsAndQaStatus(null, endDate1, "-", finishing);
|
||||||
rejectFinishedItem = finishedItemDAO.findByOperationDoneDateAndIdsAndQaStatus(null, endDate1, "REJECT", finishing);
|
rejectFinishedItem = finishedItemDAO.findByOperationDateAndIdsAndQaStatus(null, endDate1, "REJECT", finishing);
|
||||||
washFinishedItem = finishedItemDAO.findByOperationDoneDateAndIdsAndQaStatus(startDate1, endDate1, "WASHED", finishing);
|
washFinishedItem = finishedItemDAO.findByOperationDateAndIdsAndQaStatus(startDate1, endDate1, "WASHED", finishing);
|
||||||
alterationPieceFinish = finishedItemDAO.findByOperationDoneDateAndIdsAndQaStatus(null, endDate1, "ALTER", finishing);
|
alterationPieceFinish = finishedItemDAO.findByOperationDateAndIdsAndQaStatus(null, endDate1, "ALTER", finishing);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue