fix

Nolife999 · Dec 3, 2019 · 09bdd3d · 09bdd3d
1 parent b8a506e
commit 09bdd3d
Show file tree

Hide file tree

Showing 3 changed files with 539 additions and 520 deletions.
diff --git a/db/is2-insert-selemix.sql b/db/is2-insert-selemix.sql
@@ -8,9 +8,9 @@ SET FOREIGN_KEY_CHECKS=0;
 -- -----------------------------------------------------
 -- BUSINESS_PROCESS
 -- -----------------------------------------------------
-INSERT INTO `is2_business_process` (`ID`, `NAME`, `DESCR`, `LABEL`, `PARENT`, `ORDER`) VALUES (75,'Selezione Errori Influenti ','Esegue la stima, predizione e valuta gli errori influenti automaticamente in due step','Selezione2S',NULL,1);
-INSERT INTO `is2_business_process` (`ID`, `NAME`, `DESCR`, `LABEL`, `PARENT`, `ORDER`) VALUES (160,'Stima e selezione','Esecuzione del processo di stima, predizione e selezione automatica','Bistep',75,1);
-
+INSERT INTO `is2_business_process` (`ID`, `NAME`, `DESCR`, `LABEL`, `PARENT`, `ORDER`) VALUES (80,'Selezione Errori Influenti multi process','Esegue la stima, predizione e valuta gli errori influenti in due processi successivi','Selezione2P',NULL,1);
+INSERT INTO `is2_business_process` (`ID`, `NAME`, `DESCR`, `LABEL`, `PARENT`, `ORDER`) VALUES (110,'Stima e Predizione','Escuzione del processo di stima e predizione','Estimates',80,1);
+INSERT INTO `is2_business_process` (`ID`, `NAME`, `DESCR`, `LABEL`, `PARENT`, `ORDER`) VALUES (130,'Editing Selettivo','Esecuzione del processo di selezione dei valori influenti','Selection',80,2);
 -- -----------------------------------------------------
 -- CATALOGUE OF BUSINESS SERVICES
 -- -----------------------------------------------------
@@ -39,13 +39,13 @@ INSERT INTO `is2_process_step` (`ID`, `NAME`, `DESCR`, `BUSINESS_SERVICE_ID`)  V
 -- MANY TO MANY RELATION -> BUSINESS_FUNCTION - BUSINESS_PROCESS
 -- -----------------------------------------------------
 INSERT INTO `is2_link_function_process` (`BUSINESS_FUNCTION_ID`, `BUSINESS_PROCESS_ID`)
-	VALUES (2,75);
+	VALUES (2,80);
 
 -- -----------------------------------------------------
 -- MANY TO MANY RELATION -> BUSINESS_PROCESS - PROCESS_STEP
 -- -----------------------------------------------------
 INSERT INTO `is2_link_process_step` (`BUSINESS_PROCESS_ID`, `PROCESS_STEP_ID`) 
-	VALUES (160,10),(160,30);
+	VALUES (110,10),(130,30);
 -- -----------------------------------------------------
 -- 
 -- SECTION PROCESS DESIGN - END

diff --git a/src/main/java/it/istat/is2/workflow/batch/WorkFlowBatchDao.java b/src/main/java/it/istat/is2/workflow/batch/WorkFlowBatchDao.java
@@ -16,12 +16,21 @@ public interface WorkFlowBatchDao extends CrudRepository<Batch, Long> {
 
 	public List<Batch> findByIdSessione(Long idSessione);
 
+	public void deleteByJobInstanceId(@Param("jobInstanceId")Long jobInstanceId);
+
 	@Query("SELECT batch.jobInstanceId FROM Batch batch WHERE batch.idElaborazione = :idElab")
 	public List<Long> findJobInstanceIdByElabId(@Param("idElab")Long idElab);
 
 	@Modifying
 	@Query(value="DELETE FROM BATCH_JOB_INSTANCE WHERE JOB_INSTANCE_ID = ?1", nativeQuery=true)
 	public void deleteJobInstanceById(@Param("jobInstanceId")Long jobInstanceId);
 
+	@Modifying
+	@Query(value="DELETE FROM batch_job_execution WHERE JOB_INSTANCE_ID = ?1", nativeQuery=true)
+	public void deleteBatchJobExecutionById(@Param("jobInstanceId")Long jobInstanceId);
+
+	@Modifying
+	@Query(value="DELETE FROM batch_job_execution_context WHERE JOB_INSTANCE_ID = ?1", nativeQuery=true)
+	public void deleteBatchJobExecutionContextById(@Param("jobInstanceId")Long jobInstanceId);
 
 }