质检-同步合同段-一件重签时不允许删除旧html

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/feign/WbsTreeContractOldHtmlClient.java

@@ -20,4 +20,6 @@ public interface WbsTreeContractOldHtmlClient {
     @PostMapping(API_PREFIX + "/save")
     Boolean save(@RequestBody List<WbsTreeContractOldHtml> data);
 
+    @PostMapping(API_PREFIX + "/deleteByContractFormIds")
+    void deleteByContractFormIds(@RequestBody List<Long> collect);
 }

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/ExcelTabController.java

@@ -2013,11 +2013,13 @@ public class ExcelTabController extends BladeController {
         }
         executionTime.info("----公式填充执行完毕----");
 
-        //删除旧html数据
-        List<String> collect = tableInfoList.stream().map(TableInfo::getPkeyId).collect(Collectors.toList());
-        boolean update = wbsTreeContractOldHtmlService.update(Wrappers.<WbsTreeContractOldHtml>update().lambda()
-                .set(WbsTreeContractOldHtml::getIsDeleted, 1)
-                .in(WbsTreeContractOldHtml::getContractFormId, collect));
+        //删除旧html数据 重刷电签不允许删除旧html
+        if(dataInfo.get("isNotDelOldHtml") == null){
+            List<String> collect = tableInfoList.stream().map(TableInfo::getPkeyId).collect(Collectors.toList());
+            boolean update = wbsTreeContractOldHtmlService.update(Wrappers.<WbsTreeContractOldHtml>update().lambda()
+                    .set(WbsTreeContractOldHtml::getIsDeleted, 1)
+                    .in(WbsTreeContractOldHtml::getContractFormId, collect));
+        }
 
         //保存数据到数据库
         R<Object> result = this.excelTabService.saveOrUpdateInfo(tableInfoList);
@@ -2029,8 +2031,9 @@ public class ExcelTabController extends BladeController {
         }
         executionTime.info("----数据合并前----");
 
+        BladeUser user = SecureUtil.getUser();
         //异步生成pdf 和 合并pdf
-        excelTabService.synchronizedPdf(tableInfoList,nodeId, classify, contractId, projectId);
+        excelTabService.synchronizedPdf(tableInfoList,nodeId + ":" + user.getUserId(), classify, contractId, projectId);
 
         executionTime.info("---PDF合并耗时---");
         //更新缓存
@@ -4525,6 +4528,7 @@ public class ExcelTabController extends BladeController {
                 }
                 js2.put("orderList", array);
                 js.put("dataInfo", js2);
+                js.put("isNotDelOldHtml", 1);
                 this.saveBussData2(js);
             }
         } catch (Exception e) {

blade-service/blade-manager/src/main/java/org/springblade/manager/feign/WbsTreeContractOldHtmlClientImpl.java

@@ -1,5 +1,6 @@
 package org.springblade.manager.feign;
 
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.AllArgsConstructor;
 import org.springblade.manager.entity.WbsTreeContractOldHtml;
 import org.springblade.manager.service.WbsTreeContractOldHtmlService;
@@ -21,4 +22,12 @@ public class WbsTreeContractOldHtmlClientImpl implements WbsTreeContractOldHtmlC
     public Boolean save(List<WbsTreeContractOldHtml> data) {
         return wbsTreeContractOldHtmlService.saveBatch(data);
     }
+
+    @Override
+    public void deleteByContractFormIds(List<Long> collect) {
+        wbsTreeContractOldHtmlService.update(Wrappers.<WbsTreeContractOldHtml>update().lambda()
+                .set(WbsTreeContractOldHtml::getIsDeleted, 1)
+                .eq(WbsTreeContractOldHtml::getIsDeleted, 0)
+                .in(WbsTreeContractOldHtml::getContractFormId, collect));
+    }
 }