编号

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

@@ -6277,10 +6277,12 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
             selectAllNodeTable="select * from m_wbs_tree_contract where p_id="+dto.getNodeId()+" and table_owner in (4,5,6) and is_deleted=0";
         }
         List<WbsTreeContract> tables = jdbcTemplate.query(selectAllNodeTable, new BeanPropertyRowMapper<>(WbsTreeContract.class));
+        //查询出当前表单
         String selectTable="select * from m_wbs_tree_contract where p_key_id="+dto.getPkeyId();
         WbsTreeContract wbsContract = jdbcTemplate.queryForObject(selectTable, new BeanPropertyRowMapper<>(WbsTreeContract.class));
         Long excelId = wbsContract.getExcelId();
         String nodeName = wbsContract.getNodeName();
+        //判断是否为复制表，如果是复制表取本表以及之后的表，如果不是复制表直接取全部
         int sufix =0;
         if(nodeName.contains("_")){
             sufix = Integer.parseInt(nodeName.substring(nodeName.lastIndexOf("_") +1));
@@ -6298,8 +6300,11 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
                 }
             }
         }
+        //表单排序
         resultList.sort(new ExcelTabServiceImpl.WbsTreeContractComparator());
+        //根据规则生成编号
         List<String> numbers = generateNumbers(dto);
+        //构造入库数据
         Map<WbsTreeContract,  Map<String,String>> reData = new HashMap<>();
         String key = dto.getKey();
         String[] strings = key.split("__");
@@ -6333,7 +6338,7 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
         }
         //保存数据入库并且生成pdf
         saveDataAndGeneratePdf(reData,dto.getNodeId(),dto.getClassify(),wbsContract.getContractId(),wbsContract.getProjectId());
-        return null;
+        return R.status( true);
     }
 
     private void saveDataAndGeneratePdf(Map<WbsTreeContract, Map<String, String>> reData,String nodeId,String classify,String contractId,String projectId) throws Exception {
@@ -6382,8 +6387,10 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
                 String sql="update "+wbsTreeContract.getInitTableName()+" set "+Key.get()+" = '"+dataMap2.get(Key.get())+"' where p_key_id = "+wbsTreeContract.getPKeyId();
                 jdbcTemplate.update(sql);
             }
+            //生成单张pdf
             getBussPdfInfo(wbsTreeContract.getPKeyId());
         }
+        //合并pdf
         getBussPdfs(nodeId, classify, contractId, projectId);
     }
 
@@ -6406,6 +6413,7 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
             );
         } else if (dto.getType() == 2) {
             // 处理组合编号
+            //前半部分
             List<String> part1List = generateSinglePartNumbers(
                     dto.getIncreType1(),
                     dto.getCycleType1(),
@@ -6413,7 +6421,7 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
                     dto.getStartNumber1(),
                     dto.getEndNumber1()
             );
-
+            //后半部分
             List<String> part2List = generateSinglePartNumbers(
                     dto.getIncreType2(),
                     dto.getCycleType2(),