计量电签修改

blade-service/blade-e-visa/src/main/java/org/springblade/evisa/service/impl/EVDataServiceImpl.java

@@ -378,7 +378,7 @@ public class EVDataServiceImpl implements EVDataService {
                         // 添加签字
                         String addSqlBatch = "insert into u_task_batch(id,task_parallel_id,json_data,create_user,create_dept,create_time,update_user,update_time,status,is_deleted,nick_name,sign_format,sign_type) \n" +
                                 " SELECT a.id,a.process_instance_id,json_object('approvalFileList',json_array(),'approvalType',b.approval_type,'comment','','flag','OK','formDataId',b.form_data_id,'parallelProcessInstanceId',a.parallel_process_instance_id,'pass',true,'taskId',b.id) as  json_data,a.task_user,a.create_dept,a.create_time,a.update_user,a.update_time,1 as status,0 as is_deleted,a.task_user_name as nick_name ,1 as sign_format,1 as sign_type from u_task_parallel a,u_task b where b.`status` in(1,2) and  a.process_instance_id=b.process_instance_id \n" +
-                                " and b.id="+taskApp.getTaskId()+" and a.parallel_process_instance_id not in(SELECT JSON_EXTRACT(c.json_data, '$.parallelProcessInstanceId') from u_task_batch c)";
+                                " and b.id="+taskApp.getTaskId()+" and a.parallel_process_instance_id not in(SELECT JSON_EXTRACT(c.json_data, '$.parallelProcessInstanceId') from u_task_batch c where sign_type=1)";
                         jdbcTemplate.execute(addSqlBatch);
                     }
                     updateSql = "update s_interim_pay_certificate set approve_status=" + taskApp.getSigType() + ",update_time=SYSDATE(), raw_url='" + taskApp.getLastFilePdfUrl() + "' where contract_period_id = " + taskApp.getFormDataId();

blade-service/blade-meter/src/main/java/org/springblade/meter/controller/TaskController.java

@@ -4993,7 +4993,7 @@ public class TaskController extends BladeController {
                                  pageStart = 300 * i;
                                  pageEnd = pageNum;
                              }
-                             int pdfByPage = this.getPdfByPage(pageStart, pageEnd, lasPdf, localPdf);
+                             int pdfByPage = this.getPdfByPage(pageStart, pageEnd, pdfUrl, localPdf);
                              if(pdfByPage==0){
                                  BladeFile bladeFile1 = newIOSSClient.uploadFile( SnowFlakeUtil.get() + ".pdf", localPdf);
                                  String pagePdfUrl=bladeFile1.getLink();
@@ -5010,7 +5010,7 @@ public class TaskController extends BladeController {
         }
         public int getPdfByPage(int startPage, int endPage, String filePath, String savePath) {
             // 使用try-with-resources自动关闭资源
-            try (InputStream inputStream = new FileInputStream(filePath);
+            try (InputStream inputStream = CommonUtil.getOSSInputStream(filePath);
                  PDDocument document = PDDocument.load(inputStream, MemoryUsageSetting.setupMixed(100 * 1024 * 1024));
                  PDDocument newDocument = new PDDocument()) {