表单排序2

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/dto/IdsDTO.java

@@ -1,13 +0,0 @@
-package org.springblade.manager.dto;
-
-import lombok.Data;
-
-/**
- * @Param
- * @Author wangwl
- * @Date 2024/6/18 11:55
- **/
-@Data
-public class IdsDTO {
-    String ids;
-}

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/dto/TableSortDTO.java

@@ -0,0 +1,17 @@
+package org.springblade.manager.dto;
+
+import lombok.Data;
+
+/**
+ * @Param
+ * @Author wangwl
+ * @Date 2024/6/18 11:55
+ **/
+@Data
+public class TableSortDTO {
+    private String ids;
+    private String contractId;
+    private String nodeIds;
+    private String classify;
+    private String projectId;
+}

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

@@ -4,8 +4,6 @@ import com.aspose.cells.LoadFormat;
 import com.aspose.cells.LoadOptions;
 import com.aspose.cells.SaveFormat;
 import com.aspose.cells.Workbook;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.google.common.collect.Lists;
@@ -33,7 +31,7 @@ import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.IoUtil;
 import org.springblade.core.tool.utils.ObjectUtil;
 import org.springblade.core.tool.utils.ResourceUtil;
-import org.springblade.manager.dto.IdsDTO;
+import org.springblade.manager.dto.TableSortDTO;
 import org.springblade.manager.dto.WbsTreeContractDTO2;
 import org.springblade.manager.entity.ContractInfo;
 import org.springblade.manager.entity.WbsTreeContract;
@@ -43,8 +41,6 @@ import org.springblade.manager.service.IWbsTreeContractService;
 import org.springblade.manager.service.impl.WbsTreeContractServiceImpl;
 import org.springblade.manager.utils.FileUtils;
 import org.springblade.manager.vo.*;
-import org.springblade.meter.entity.MiddleMeterApply;
-import org.springblade.resource.feign.NewIOSSClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.jdbc.core.BeanPropertyRowMapper;
@@ -84,6 +80,8 @@ public class WbsTreeContractController extends BladeController {
     private final ContractClient contractClient;
     private static Logger logger = LoggerFactory.getLogger(WbsTreeContractController.class);
 
+    private final ExcelTabController excelTabController;
+
     @GetMapping("/search-node-tables")
     @ApiOperationSupport(order = 1)
     @ApiOperation(value = "查询当前节点下所有元素表信息", notes = "传入节点primaryKeyId、type、合同段id、项目id")
@@ -741,10 +739,20 @@ public class WbsTreeContractController extends BladeController {
     @ApiOperationSupport(order = 42)
     @ApiOperation(value = "表单排序", notes = "传入ids")
     @ApiImplicitParams(value = {
-            @ApiImplicitParam(name = "ids", value = "节点pKeyId，按顺序逗号拼接", required = true)
+            @ApiImplicitParam(name = "ids", value = "节点pKeyId，按顺序逗号拼接", required = true),
+            @ApiImplicitParam(name = "contractId", value = "contractId", required = true),
+            @ApiImplicitParam(name = "nodeIds", value = "nodeIds", required = true),
+            @ApiImplicitParam(name = "classify", value = "classify", required = true),
+            @ApiImplicitParam(name = "projectId", value = "projectId", required = true)
     })
-    public R tableSort(@RequestBody IdsDTO dto) {
+    public R tableSort(@RequestBody TableSortDTO dto) {
+        //生成PDF失败不影响排序
         wbsTreeContractServiceImpl.tableSort(dto);
+        try {
+            excelTabController.synPDFInfo(dto.getContractId(),dto.getNodeIds(),dto.getClassify(),dto.getProjectId());
+        }catch (Exception e){
+            return R.fail("重新生成PDF失败："+e.getMessage());
+        }
         return R.success("成功");
     }
 

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

@@ -32,7 +32,7 @@ import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.node.ForestNodeMerger;
 import org.springblade.core.tool.utils.*;
 import org.springblade.manager.bean.NodeVO;
-import org.springblade.manager.dto.IdsDTO;
+import org.springblade.manager.dto.TableSortDTO;
 import org.springblade.manager.dto.RangeInfo;
 import org.springblade.manager.dto.WbsTreeContractDTO;
 import org.springblade.manager.dto.WbsTreeContractDTO2;
@@ -46,7 +46,6 @@ import org.springblade.manager.mapper.WbsTreePrivateMapper;
 import org.springblade.manager.service.ITableFileService;
 import org.springblade.manager.service.IWbsTreeContractService;
 import org.springblade.manager.vo.*;
-import org.springblade.meter.entity.MeterMidPayItemContract;
 import org.springblade.system.cache.ParamCache;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
@@ -55,7 +54,6 @@ import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.LinkedCaseInsensitiveMap;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
@@ -2357,7 +2355,7 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
         return R.success("操作成功");
     }
 
-    public void tableSort(IdsDTO dto) {
+    public void tableSort(TableSortDTO dto) {
         String ids = dto.getIds();
         if (StringUtils.isNotBlank(ids)) {
             List<Long> split = Func.toLongList(ids);