Merge branch 'develop' into feature/JDK11
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
Some checks failed
IntegryManagementSystem_Multi/pipeline/head There was a failure building this commit
This commit is contained in:
@@ -258,9 +258,9 @@ public class PvmAccettazioneService {
|
||||
String serCollo = collo.getSerCollo();
|
||||
Integer numCollo = collo.getNumCollo();
|
||||
|
||||
String cond = " mtb_colr.gestione = 'A' AND mtb_colr.data_collo = " + UtilityDB.valueDateToString(dataCollo, CommonConstants.DATE_FORMAT_YMD)
|
||||
String cond = " (mtb_colr.gestione = 'A' AND mtb_colr.data_collo = " + UtilityDB.valueDateToString(dataCollo, CommonConstants.DATE_FORMAT_YMD)
|
||||
+ " AND " + " mtb_colr.ser_collo = " + UtilityDB.valueToString(serCollo) + " AND "
|
||||
+ " mtb_colr.num_collo = " + numCollo;
|
||||
+ " mtb_colr.num_collo = " + numCollo + ")";
|
||||
if (!UtilityString.isNullOrEmpty(whereCondColli)) {
|
||||
whereCondColli += " OR ";
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user