报表管理初次修改

Procedure/backend/project/src/main/java/com/sundata/product/rwa/businessconfig/utils/FilesValueCheckUtils.java

@@ -276,6 +276,7 @@ public class FilesValueCheckUtils {
         // 遍历每一个sheet页
         ReportCalculationModel model = null;
         for (int i =0;i<sheetNum;i++){
+            // 序号
             int reportNo = 0;
             // 读取第i个sheet页
             Sheet sheet = book.getSheetAt(i);
@@ -309,18 +310,21 @@ public class FilesValueCheckUtils {
                     // 报表计算单元编号计入(报表编号+sheet页号+行号+列号)
                     model.setReportUnitNo(defineModel.getReportNo()+
                             String.valueOf(i+1)+String.valueOf(rowNum+1)+String.valueOf(cellNum+1));
+                    // 序号记录
+                    reportNo = reportNo + 1;
+                    model.setId(String.valueOf(reportNo));
                     if (cellData.getCellType().equals(CellType.FORMULA)) {
                         if (cellData.getCellFormula().equals("ROW()&\"-\"&COLUMN()")) {
                             // 序号记录
-                            reportNo = reportNo + 1;
-                            model.setId(String.valueOf(reportNo));
+//                            reportNo = reportNo + 1;
+//                            model.setId(String.valueOf(reportNo));
                             model.setExcelFormula(cellData.getCellFormula());
                             // 需填报的单元详情列表
                             modelFillInList.add(model);
                         } else {
                             // 序号记录
-                            reportNo = reportNo + 1;
-                            model.setId(String.valueOf(reportNo));
+//                            reportNo = reportNo + 1;
+//                            model.setId(String.valueOf(reportNo));
                             // 需计算的单元详情列表计
                             model.setExcelFormula(cellData.getCellFormula());
                             modelCalcList.add(model);

Procedure/frontend/projectb/config/config.ts

@@ -102,7 +102,7 @@ export default defineConfig({
 
    { path: '/product_list' , component: './rwa_calc_config_dataparam/product_list' },
    { path: '/info_list' , component: './rwa_calc_config_002offbalanceprotype/info_list' },
-   
+
 
    { path: '/CustomerTable' , component: './project/dataquality/CustomerTable'},
    { path: '/CollateralTable' , component: './project/dataquality/CollateralTable'},
@@ -119,7 +119,7 @@ export default defineConfig({
    { path: '/GuaranteeTable' , component: './project/dataquality/GuaranteeTable' },
 
 
-   
+
   // 解析
   { path: '/rdp/rdpAnalysis/analTemplate/query/:prodCode', component: './rdpMng/Template/QueryList/queryList' },
   { path: '/rdp/rdpAnalysis/analTemplate/maintain/:prodCode', component: './rdpMng/Template/InfoMaintain/infoMaintain' },
@@ -178,11 +178,13 @@ export default defineConfig({
     { path: '/supplementtaskmanagement' , component: './product/datasupplementary/supplementtaskmanagement'},
     { path: '/datasupplementation' , component: './product/datasupplementary/datasupplementation'},
 
+    // 内管报表
+    { path: '/capitaloccupymonitor' , component: './product/internal/capitaloccupymonitor'},
   ],
 
 
 
-  
+
   /**
   proxy: {
     '/api/': {

Procedure/frontend/projectb/src/pages/product/report_form_config_reportcreater/reportfillingconfig.tsx

@@ -434,14 +434,19 @@ const analyseFile = async (data: ReportDefinitionModel) => {
       valueType: 'option',
       width:150,
       ellipsis:true,
-      render: (_, record) => [
+      render: (index, record) => [
         <SDOperate
           key="roleCfg"
           icon={<WomanOutlined />}
           successMessage=""
           onClick={
             ()=>{
-              fillInActionRef.current?.startEditable(record?.id);
+              if (record?.id != null ) {
+                fillInActionRef.current?.startEditable(record?.id);
+              } else {
+                fillInActionRef.current?.startEditable(''+index);
+              }
+              
            } }
         >
           编辑