计量电签bug修改

blade-service/blade-e-visa/src/main/java/org/springblade/evisa/controller/EVController.java

@@ -120,5 +120,7 @@ public class EVController {
         System.out.println("活跃数量" + executor.getActiveCount());
         System.out.println("总共数量" + executor.getTaskCount());
         System.out.println("完成数量" + executor.getCompletedTaskCount());
+        String updateSql="UPDATE s_interim_pay_certificate set status=2 where `status`=1 and id in(SELECT data_id from (SELECT DISTINCT data_id,count(1) zcount,SUM(if(`status`=2,1,0)) wcount from s_interim_task where  `status`=2 GROUP BY data_id) c where c.zcount=c.wcount)";
+        jdbcTemplate.execute(updateSql);
     }
 }

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

@@ -381,7 +381,7 @@ public class EVDataServiceImpl implements EVDataService {
                                 " 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();
+                    updateSql = "update s_interim_pay_certificate set approve_status=" + taskApp.getSigType() + ",update_time=SYSDATE(), raw_url='" + taskApp.getLastFilePdfUrl() + "', pre_pdf_url='" + taskApp.getLastFilePdfUrl() + "' where contract_period_id = " + taskApp.getFormDataId();
                 } else if (taskApp.getApprovalType() == 6 || taskApp.getApprovalType() == 7) {
                     updateSql = "update s_material_start_statement set approve_status=" + taskApp.getSigType() + ",update_time=SYSDATE(), raw_url='" + taskApp.getLastFilePdfUrl() + "' where meter_period_id = " + taskApp.getFormDataId();
                 } else if (taskApp.getApprovalType() == 8) {

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/ExcelTabServiceImpl.java

@@ -6436,6 +6436,9 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
                     } else { //空行
                         List<Map<String, String>> left = new ArrayList<>();
                         List<Map<String, String>> top = new ArrayList<>();
+                        if(y1==15){
+                            System.out.println("123");
+                        }
                         for (int k = 0; k < zikey.size(); k++) {
                             String name = zikey.get(k).get("name");
                             int xx1 = Integer.parseInt(zikey.get(k).get("x1"));
@@ -6506,6 +6509,7 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
                         // 质检表特殊处理匹配
 
                         String parm = i + "," + j + "," + x1 + "," + x2 + "," + y1 + "," + y2 + ",$event";
+
                         // 设置文本信息
                         ExctabCell exctabCell = new ExctabCell();
                         if ((textInfo.indexOf("年") >= 0 && textInfo.indexOf("月") >= 0 && textInfo.indexOf("日") >= 0) || inputText.indexOf("日期") >= 0) {
@@ -7133,6 +7137,9 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
             top1_max = maxList.stream().mapToInt(m -> Integer.parseInt(m.get("x2"))).max().getAsInt();
         }
 
+        if(y==13){
+            System.out.println("123");
+        }
 
         //区域计算
         for (int j = 0; j < tds.size(); j++) {

blade-service/blade-manager/src/main/java/org/springblade/manager/utils/ExcelInfoUtils.java

@@ -199,7 +199,7 @@ public class ExcelInfoUtils {
             File writeFile = new File(htmlUrl);
             FileUtil.writeToFile(writeFile, doc1.html(), Boolean.parseBoolean("UTF-8"));
             if (html2.exists()) {
-               // html2.delete();
+                html2.delete();
             }
             wb2.dispose();
             wb.dispose();