|
|
@@ -96,8 +96,12 @@ public class EVDataServiceImpl implements EVDataService {
|
|
|
List<String> eVisaConfigList = PDFUtils.getPdfSignIds(fileUrl, taskApp);
|
|
|
if (eVisaConfigList == null || eVisaConfigList.size() == 0) {
|
|
|
//没有电签配置,默认当前任务为不签字审批,返回成功
|
|
|
- taskApp.setSigState(2);
|
|
|
- taskApp.setSignSmg("pdf未获取到关键字Id");
|
|
|
+ if(taskApp.getSigState() == 10) {
|
|
|
+ taskApp.setSigState(2);
|
|
|
+ } else {
|
|
|
+ taskApp.setSigState(2);
|
|
|
+ taskApp.setSignSmg("pdf未获取到关键字Id");
|
|
|
+ }
|
|
|
SignBackPdfInfo(taskApp);
|
|
|
return;
|
|
|
}
|
|
|
@@ -407,7 +411,12 @@ public class EVDataServiceImpl implements EVDataService {
|
|
|
}
|
|
|
this.jdbcTemplate.execute("delete from u_task_batch where id in(" + taskApp.getId()+")");
|
|
|
}else{
|
|
|
- this.jdbcTemplate.execute("update u_task_parallel set exe_count=(exe_count+1), e_visa_status=99,e_visa_content='" + taskApp.getSignSmg() + "' ,update_time=SYSDATE() where parallel_process_instance_id in (" + taskApp.getParallelProcessInstanceId() + ")");
|
|
|
+ if (taskApp.getSigType() == 1) {
|
|
|
+ this.jdbcTemplate.execute("update u_task_parallel set exe_count=(exe_count+1), e_visa_status=99,e_visa_content='" + taskApp.getSignSmg() + "' ,update_time=SYSDATE() where parallel_process_instance_id in (" + taskApp.getParallelProcessInstanceId() + ")");
|
|
|
+ } else {
|
|
|
+ // 签章失败
|
|
|
+ this.jdbcTemplate.execute("update u_task_parallel set exe_count=(exe_count+1), meter_task_repeal_desc='" + taskApp.getSignSmg() + "' ,update_time=SYSDATE() where parallel_process_instance_id in (" + taskApp.getParallelProcessInstanceId() + ")");
|
|
|
+ }
|
|
|
this.jdbcTemplate.execute("update u_task set status=1 ,update_time=SYSDATE() where id='" + taskApp.getTaskId() + "'");
|
|
|
if (totalCount >= 3) {
|
|
|
this.jdbcTemplate.execute("delete from u_task_batch where id in(" + taskApp.getId()+")");
|