计量表格修改

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

@@ -28,6 +28,7 @@ import org.springblade.common.constant.MeasurementStorage;
 import org.springblade.common.utils.BaseUtils;
 import org.springblade.common.utils.CommonUtil;
 import org.springblade.common.utils.SnowFlakeUtil;
+import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.base.BaseEntity;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.mp.support.Condition;
@@ -2274,47 +2275,47 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
         String sql="Select * from s_contract_meter_period where contract_id="+contractId+" and is_deleted=0"+" order by start_date";
         List<ContractMeterPeriod> list = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(ContractMeterPeriod.class));
         //获取所有excel报表源数据
-        String sqlForExcel = "SELECT p.p_key_id,e.id,p.html_url,e.file_url FROM m_wbs_tree_private as p LEFT JOIN m_excel_tab as e on p.excel_id=e.id where p.wbs_type=3 AND p.is_deleted=0 AND p.type=2"+" and p.project_id="+projectId;
+        String sqlForExcel = "SELECT p.p_key_id,e.name,e.id,p.html_url,e.file_url FROM m_wbs_tree_private as p LEFT JOIN m_excel_tab as e on p.excel_id=e.id where p.wbs_type=3 AND p.is_deleted=0 AND p.type=2"+" and p.project_id="+projectId;
         List<ExcelTabVo1> excelTabs = jdbcTemplate.query(sqlForExcel, new BeanPropertyRowMapper<>(ExcelTabVo1.class));
         ArrayList<ReportResult> reportResults = new ArrayList<>();
         //中期支付报表封面
-        Optional<ExcelTabVo1> excel = excelTabs.stream().filter(e -> e.getId().toString().equals("1780876698961629186")).findFirst();
+        Optional<ExcelTabVo1> excel = excelTabs.stream().filter(e -> e.getName().contains("中期支付报表封面")).findFirst();
         //String url = "https://blade-oss-chongqing.oss-cn-shenzhen.aliyuncs.com//upload/20240828/3ee50ef54005c95bd724bcabae54058c.XLSX";
         String url = excel.get().getFileUrl();
         String htmlUrl=excel.get().getHtmlUrl();
         Long pKeyId = excel.get().getPKeyId();
         //中间支付审核表
-        Optional<ExcelTabVo1> excel1 = excelTabs.stream().filter(e -> e.getId().toString().equals("1780876742800494593")).findFirst();
+        Optional<ExcelTabVo1> excel1 = excelTabs.stream().filter(e -> e.getName().contains("中间支付审核表")).findFirst();
         //String url1 = "https://blade-oss-chongqing.oss-cn-shenzhen.aliyuncs.com//upload/20241120/ea6c945827dd2990a9c7b1957fe201c4.XLSX";
         String url1 = excel1.get().getFileUrl();
         String htmlUrl1=excel1.get().getHtmlUrl();
         Long pKeyId1 = excel1.get().getPKeyId();
         //补助款申请支付审核表
-        Optional<ExcelTabVo1> excel2 = excelTabs.stream().filter(e -> e.getId().toString().equals("1780876780238852097")).findFirst();
+        Optional<ExcelTabVo1> excel2 = excelTabs.stream().filter(e -> e.getName().contains("补助款申请支付审核表")).findFirst();
         //String url2 = "https://blade-oss-chongqing.oss-cn-shenzhen.aliyuncs.com//upload/20241120/970eec0eb3cf3d215263a0e2f24c142e.xlsx";
         String url2 = excel2.get().getFileUrl();
         String htmlUrl2=excel2.get().getHtmlUrl();
         Long pKeyId2 = excel2.get().getPKeyId();
         //中间计量支付证书
-        Optional<ExcelTabVo1> excel3 = excelTabs.stream().filter(e -> e.getId().toString().equals("1780876814359515138")).findFirst();
+        Optional<ExcelTabVo1> excel3 = excelTabs.stream().filter(e -> e.getName().contains("中间计量支付证书")).findFirst();
         //String url3 = "https://blade-oss-chongqing.oss-cn-shenzhen.aliyuncs.com//upload/20240828/fb1110ae6aab7295759775206e5b44b8.XLSX";
         String url3 = excel3.get().getFileUrl();
         String htmlUrl3=excel3.get().getHtmlUrl();
         Long pKeyId3 = excel3.get().getPKeyId();
         //中间计量支付申请表
-        Optional<ExcelTabVo1> excel4 = excelTabs.stream().filter(e -> e.getId().toString().equals("1780876859939016705")).findFirst();
+        Optional<ExcelTabVo1> excel4 = excelTabs.stream().filter(e -> e.getName().contains("中间计量支付申请表")).findFirst();
         //String url4="https://blade-oss-chongqing.oss-cn-shenzhen.aliyuncs.com//upload/20240828/bff82dd0a1b7394f5fdab1322a3e6023.XLSX";
         String url4=excel4.get().getFileUrl();
         String htmlUrl4=excel4.get().getHtmlUrl();
         Long pKeyId4 = excel4.get().getPKeyId();
         //工程支付月报
-        Optional<ExcelTabVo1> excel5 = excelTabs.stream().filter(e -> e.getId().toString().equals("1780876896593039362")).findFirst();
+        Optional<ExcelTabVo1> excel5 = excelTabs.stream().filter(e -> e.getName().contains("工程支付月报")).findFirst();
         //String url5="https://blade-oss-chongqing.oss-cn-shenzhen.aliyuncs.com//upload/20240903/c8a5b424eace6c26b2edf9b9b33f088a.XLSX";
         String url5=excel5.get().getFileUrl();
         String htmlUrl5=excel5.get().getHtmlUrl();
         Long pKeyId5 = excel5.get().getPKeyId();
         //清单支付报表
-        Optional<ExcelTabVo1> excel6 = excelTabs.stream().filter(e -> e.getId().toString().equals("1780876940398350338")).findFirst();
+        Optional<ExcelTabVo1> excel6 = excelTabs.stream().filter(e -> e.getName().contains("清单支付")).findFirst();
         //String url6="https://blade-oss-chongqing.oss-cn-shenzhen.aliyuncs.com//upload/20241120/e168f024c8055362664a276ad3721cb7.XLSX";
         String url6=excel6.get().getFileUrl();
         String htmlUrl6=excel6.get().getHtmlUrl();