parent: cc266a1e | 补丁 | 提交 | ignore whitespace
FUYU
2023-05-19 559771a80cf779dc13a84ecd2f178e6ca5a8353a 
备份省目标录入
4个文件已修改
292 ■■■■■ 已修改文件
force-app/main/default/classes/SetProvinceTargetBatch.cls 35 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/classes/SetProvinceTargetController.cls 234 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/classes/SetProvinceTargetControllerTest.cls 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/pages/SetProvinceTarget.page 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 force-app/main/default/classes/SetProvinceTargetBatch.cls


@@ -197,14 +197,35 @@


            }


            proportion.put('OTH', doubleOTH);




            String strObjectiveProportionENG = System.Label.ObjectiveProportionENG;


            List<String> objectiveProportionENG = strObjectiveProportionENG.split(',');


            List<Double> doubleENG = new List<Double>();


            for (String strENG : objectiveProportionENG) {


                doubleENG.add(Double.valueOf(strENG));


            //DB202305277681 fy 20230517 start




            // String strObjectiveProportionENG = System.Label.ObjectiveProportionENG;


            // List<String> objectiveProportionENG = strObjectiveProportionENG.split(',');


            // List<Double> doubleENG = new List<Double>();


            // for (String strENG : objectiveProportionENG) {


            //     doubleENG.add(Double.valueOf(strENG));


            // }


            // proportion.put('ENG', doubleENG);


            // proportion.put('_ENG', doubleENG);


            String strObjectiveProportionENG1 = System.Label.ObjectiveProportionENG;


            List<String> objectiveProportionENG1 = strObjectiveProportionENG1.split(',');


            List<Double> doubleENG1 = new List<Double>();


            for (String strENG1 : objectiveProportionENG1) {


                doubleENG1.add(Double.valueOf(strENG1));


            }


            proportion.put('ENG', doubleENG);


            proportion.put('_ENG', doubleENG);


            proportion.put('ENG1', doubleENG1);


            proportion.put('_ENG1', doubleENG1);




            String strObjectiveProportionENG2 = System.Label.ObjectiveProportionENG;


            List<String> objectiveProportionENG2 = strObjectiveProportionENG2.split(',');


            List<Double> doubleENG2 = new List<Double>();


            for (String strENG2 : objectiveProportionENG2) {


                doubleENG2.add(Double.valueOf(strENG2));


            }


            proportion.put('ENG2', doubleENG2);


            proportion.put('_ENG2', doubleENG2);


            


            //DB202305277681 fy 20230517 end


        }


        //初始化既存目标数据


        oppMap = new Map<String, Opportunity>();




 force-app/main/default/classes/SetProvinceTargetController.cls


@@ -28,9 +28,14 @@


        salesDpt.add(new SelectOption('1.华北','1.华北'));


        salesDpt.add(new SelectOption('2.东北','2.东北'));


        salesDpt.add(new SelectOption('3.西北','3.西北'));


        salesDpt.add(new SelectOption('4.华东','4.华东'));


        salesDpt.add(new SelectOption('5.华南','5.华南'));


        salesDpt.add(new SelectOption('6.西南','6.西南'));


        // DB202305259561 fy 20230517 start


        // salesDpt.add(new SelectOption('4.华东','4.华东'));


        // salesDpt.add(new SelectOption('5.华南','5.华南'));


        // salesDpt.add(new SelectOption('6.西南','6.西南'));


        salesDpt.add(new SelectOption('4.西南','4.西南'));


        salesDpt.add(new SelectOption('5.华东','5.华东'));


        salesDpt.add(new SelectOption('6.华南','6.华南'));


        // DB202305259561 fy 20230517 end


        return salesDpt;


    }


    


@@ -57,11 +62,17 @@


    private Map<String, OCM_Management_Province__c> OCM_MpMap;


    private List<String> AllOwnerSystem;


    private static String[] CIfromass = new String[] {'GI','ET','BF','GDP'};


    private static String[] SPfromass = new String[] {'GS','URO','GYN','ENT','ENG'};


    //DB202305277681 fy 20230517 start


    // private static String[] SPfromass = new String[] {'GS','URO','GYN','ENT','ENG'};


    private static String[] SPfromass = new String[] {'GS','URO','GYN','ENT','ENG1','ENG2'};


    //DB202305277681 fy 20230517 end


    // 金额分类


    //private static String[] amountCategory = new String[] {'GI','ET','BF','GS','URO','GYN','ENT','OTH'};


    //省目标(SetProvinceTarget):隐藏OTH。追加ENG。


    private static String[] amountCategory = new String[] {'GI','ET','BF','GS','URO','GYN','ENT','ENG'};


    //DB202305277681 fy 20230517 start


    // private static String[] amountCategory = new String[] {'GI','ET','BF','GS','URO','GYN','ENT','ENG'};


    private static String[] amountCategory = new String[] {'GI','ET','BF','GS','URO','GYN','ENT','ENG1','ENG2'};


    //DB202305277681 fy 20230517 end


    //SWAG-C9YDDE  2021/12/28 fy start


    // private static String[] amountCategory = new String[] {'GDP','GI','ET','BF','GS','URO','GYN','ENT','ENG'};


    //SWAG-C9YDDE  2021/12/28 fy end


@@ -72,7 +83,10 @@


    public String users6_ID = System.Label.s6_ID;


    public boolean JianDangfalg { get; set; }


    //fy 修改 end


    private static String[] titlepage = new String[] {'销售本部', '省','GI', 'ET', 'BF', 'GS', 'URO', 'GYN', 'ENT', 'ENG'};


    //DB202305277681 fy 20230517 start


    // private static String[] titlepage = new String[] {'销售本部', '省','GI', 'ET', 'BF', 'GS', 'URO', 'GYN', 'ENT', 'ENG'};


    private static String[] titlepage = new String[] {'销售本部', '省','GI', 'ET', 'BF', 'GS', 'URO', 'GYN', 'ENT','ENG1','ENG2'};


    //DB202305277681 fy 20230517 start


    //SWAG-C9YDDE  2021/12/28 fy start


    // private static String[] titlepage = new String[] {'销售本部', '省', '担当','GDP','GI', 'ET', 'BF', 'GS', 'URO', 'GYN', 'ENT', 'ENG'};


    //SWAG-C9YDDE  2021/12/28 fy end


@@ -103,8 +117,12 @@


        System.debug('user6IdList:  '+user6IdList);


        System.debug('JianDangfalg:  '+JianDangfalg);


        if(JianDangfalg){


            amountCategory = new String[] {'GDP','GI','ET','BF','GS','URO','GYN','ENT','ENG'};


            titlepage = new String[] {'销售本部', '省','GDP','GI', 'ET', 'BF', 'GS', 'URO', 'GYN', 'ENT', 'ENG'};


            //DB202305277681 fy 20230517 start


            // amountCategory = new String[] {'GDP','GI','ET','BF','GS','URO','GYN','ENT','ENG'};


            // titlepage = new String[] {'销售本部', '省','GDP','GI', 'ET', 'BF', 'GS', 'URO', 'GYN', 'ENT', 'ENG'};


            amountCategory = new String[] {'GDP','GI','ET','BF','GS','URO','GYN','ENT','ENG1','ENG2'};


            titlepage = new String[] {'销售本部', '省','GDP','GI', 'ET', 'BF', 'GS', 'URO', 'GYN', 'ENT','ENG1','ENG2'};


            //DB202305277681 fy 20230517 end


        }


        System.debug('amountCategory===:  '+amountCategory);


        //fy 修改 20220412


@@ -207,15 +225,33 @@


                doubleOTH.add(Double.valueOf(strOTH));


            }


            proportion.put('OTH', doubleOTH);




            String strObjectiveProportionENG = System.Label.ObjectiveProportionENG;


            List<String> objectiveProportionENG = strObjectiveProportionENG.split(',');


            List<Double> doubleENG = new List<Double>();


            for (String strENG : objectiveProportionENG) {


                doubleENG.add(Double.valueOf(strENG));


            //DB202305277681 fy 20230517 start


            // String strObjectiveProportionENG = System.Label.ObjectiveProportionENG;


            // List<String> objectiveProportionENG = strObjectiveProportionENG.split(',');


            // List<Double> doubleENG = new List<Double>();


            // for (String strENG : objectiveProportionENG) {


            //     doubleENG.add(Double.valueOf(strENG));


            // }


            // proportion.put('ENG', doubleENG);


            // proportion.put('_ENG', doubleENG);


            String strObjectiveProportionENG1 = System.Label.ObjectiveProportionENG;


            List<String> objectiveProportionENG1 = strObjectiveProportionENG1.split(',');


            List<Double> doubleENG1 = new List<Double>();


            for (String strENG1 : objectiveProportionENG1) {


                doubleENG1.add(Double.valueOf(strENG1));


            }


            proportion.put('ENG', doubleENG);


            proportion.put('_ENG', doubleENG);


            proportion.put('ENG1', doubleENG1);


            proportion.put('_ENG1', doubleENG1);




            String strObjectiveProportionENG2 = System.Label.ObjectiveProportionENG;


            List<String> objectiveProportionENG2 = strObjectiveProportionENG2.split(',');


            List<Double> doubleENG2 = new List<Double>();


            for (String strENG2 : objectiveProportionENG2) {


                doubleENG2.add(Double.valueOf(strENG2));


            }


            proportion.put('ENG2', doubleENG2);


            proportion.put('_ENG2', doubleENG2);


            //DB202305277681 fy 20230517 end


        }


        // 当前用户信息


        if (loginUser == null) {


@@ -337,7 +373,10 @@


    public PageReference importCSVFile() {


        try{


            if(JianDangfalg){


                titlepage = new String[] {'销售本部', '省','GDP','GI', 'ET', 'BF', 'GS', 'URO', 'GYN', 'ENT', 'ENG'};


                //DB202305277681 fy 20230517 start


                // titlepage = new String[] {'销售本部', '省','GDP','GI', 'ET', 'BF', 'GS', 'URO', 'GYN', 'ENT', 'ENG'};


                titlepage = new String[] {'销售本部', '省','GDP','GI', 'ET', 'BF', 'GS', 'URO', 'GYN', 'ENT', 'ENG1','ENG2'};


                //DB202305277681 fy 20230517 end


            }


            String csvData = ApexPages.currentPage().getParameters().get('csvData');


            // 将内容转换成为中文


@@ -416,7 +455,11 @@


                Integer URO_Number = 0;


                Integer GYN_Number = 0;


                Integer ENT_Number = 0;


                Integer ENG_Number = 0;


                //DB202305277681 fy 20230517 start


                // Integer ENG_Number = 0;


                Integer ENG1_Number = 0;


                Integer ENG2_Number = 0;


                //DB202305277681 fy 20230517 end


                if(JianDangfalg){


                    //2021/12/28 中间表寄存数据 by ld fy


                    GDP_Number = 2;


@@ -428,7 +471,11 @@


                    URO_Number = 7;


                    GYN_Number = 8;


                    ENT_Number = 9;


                    ENG_Number = 10;


                    //DB202305277681 fy 20230517 start


                    // ENG_Number = 10;


                    ENG1_Number = 10;


                    ENG2_Number = 11;


                    //DB202305277681 fy 20230517 end


                }else{


                    GI_Number = 2;


                    ET_Number = 3;


@@ -437,7 +484,11 @@


                    URO_Number = 6;


                    GYN_Number = 7;


                    ENT_Number = 8;


                    ENG_Number = 9;


                    //DB202305277681 fy 20230517 start


                    // ENG_Number = 9;


                    ENG1_Number = 9;


                    ENG2_Number = 10;


                    //DB202305277681 fy 20230517 end


                }


                upsertPGSIList = new List<Provincial_Goal_Setting_Input__c>();//初始化，解决重复导入数据 id重复得问题


                for (String key : szMap.keySet()) {


@@ -497,15 +548,27 @@


                        


                    Decimal GYN_Amount = String.isNotBlank(csvRecordData[GYN_Number]) ? Decimal.valueOf(csvRecordData[GYN_Number]) : 0.00;


                    DataSplicing(GYN_Amount,key_shengfen + '_GYN',Provincial_Goal_Setting_InputMap1,SPassistant,csvRecordData);


                    system.debug('ENG_Number--->'+csvRecordData[ENG_Number]);


                    


                    Decimal ENT_Amount = String.isNotBlank(csvRecordData[ENT_Number]) ? Decimal.valueOf(csvRecordData[ENT_Number]) : 0.00;


                    DataSplicing(ENT_Amount,key_shengfen + '_ENT',Provincial_Goal_Setting_InputMap1,SPassistant,csvRecordData);


                    system.debug('ENG_Number--->'+csvRecordData[ENG_Number]);


                    //因为最后一列数据有空格，所以加.trim()


                    Decimal ENG_Amount = String.isNotBlank(csvRecordData[ENG_Number]) ? Decimal.valueOf(csvRecordData[ENG_Number].trim()) : 0.00;


                    // Decimal.valueOf(String str)


                    DataSplicing(ENG_Amount,key_shengfen + '_ENG',Provincial_Goal_Setting_InputMap1,SPassistant,csvRecordData);


                    


                    //因为最后一列数据有空格，所以加.trim()






                    //DB202305277681 fy 20230517 start


                    // Decimal ENG_Amount = String.isNotBlank(csvRecordData[ENG_Number]) ? Decimal.valueOf(csvRecordData[ENG_Number].trim()) : 0.00;


                    // // Decimal.valueOf(String str)


                    // DataSplicing(ENG_Amount,key_shengfen + '_ENG',Provincial_Goal_Setting_InputMap1,SPassistant,csvRecordData);


                    system.debug('ENG1_Number--->'+csvRecordData[ENG1_Number]);


                    Decimal ENG1_Amount = String.isNotBlank(csvRecordData[ENG1_Number]) ? Decimal.valueOf(csvRecordData[ENG1_Number]) : 0.00;


                    DataSplicing(ENG1_Amount,key_shengfen + '_ENG1',Provincial_Goal_Setting_InputMap1,SPassistant,csvRecordData);


                    


                    system.debug('ENG2_Number--->'+csvRecordData[ENG2_Number]);




                    Decimal ENG2_Amount = String.isNotBlank(csvRecordData[ENG2_Number]) ? Decimal.valueOf(csvRecordData[ENG2_Number].trim()) : 0.00;


                    DataSplicing(ENG2_Amount,key_shengfen + '_ENG2',Provincial_Goal_Setting_InputMap1,SPassistant,csvRecordData);


                    


                    //DB202305277681 fy 20230517 end


                    //拼接Key


                }


                if(null!=upsertPGSIList && upsertPGSIList.size()>0){


@@ -624,7 +687,9 @@


    // 数据赋值


    private void setBean(Integer year) {


        if(JianDangfalg){


            amountCategory = new String[] {'GDP','GI','ET','BF','GS','URO','GYN','ENT','ENG'};


            //DB202305277681 fy 20230517 start


            amountCategory = new String[] {'GDP','GI','ET','BF','GS','URO','GYN','ENT','ENG1','ENG2'};


            //DB202305277681 fy 20230517 end


        }


        // 取得当前年度目标数据


        Opportunity[] opportunitys = [select


@@ -653,7 +718,7 @@


            //20210225 ljh WLIG-BV8CHF update  财年 end


            isPast = false;


            if (iYear < currentYear) {


                isPast = true;


                isPast = true; 


            } else if (iYear == currentYear) {


                if (Date.today().month() == 3) {


                    isPast = true;


@@ -713,6 +778,11 @@


        provinceList.add('宁夏自治区');


        provinceList.add('甘肃省');


        provinceList.add('新疆自治区');


        provinceList.add('四川省');


        provinceList.add('重庆市');


        provinceList.add('云南省');


        provinceList.add('贵州省');


        provinceList.add('西藏自治区');


        provinceList.add('上海市');


        provinceList.add('江苏省');


        provinceList.add('浙江省');


@@ -725,11 +795,7 @@


        provinceList.add('湖北省');


        provinceList.add('湖南省');


        provinceList.add('深圳市');


        provinceList.add('四川省');


        provinceList.add('重庆市');


        provinceList.add('云南省');


        provinceList.add('贵州省');


        provinceList.add('西藏自治区');


        


        AllOwnerSystem = provinceList;


        salesDptMap.put('0.无',provinceList);


        


@@ -758,6 +824,18 @@


        provinceList.add('甘肃省');


        provinceList.add('新疆自治区');


        salesDptMap.put('3.西北',provinceList);




        


        provinceList = new List<String>();


        provinceList.add('四川省');


        provinceList.add('重庆市');


        provinceList.add('云南省');


        provinceList.add('贵州省');


        provinceList.add('西藏自治区');


    // DB202305259561 fy 20230517 start


        // salesDptMap.put('6.西南',provinceList);


        salesDptMap.put('4.西南',provinceList);


    // DB202305259561 fy 20230517 end


        


        provinceList = new List<String>();


        provinceList.add('上海市');


@@ -766,7 +844,10 @@


        provinceList.add('福建省');


        provinceList.add('安徽省');


        provinceList.add('江西省');


        salesDptMap.put('4.华东',provinceList);


    // DB202305259561 fy 20230517 start


        // salesDptMap.put('4.华东',provinceList);


        salesDptMap.put('5.华东',provinceList);


    // DB202305259561 fy 20230517 end


        


        provinceList = new List<String>();


        provinceList.add('广东省');


@@ -775,15 +856,11 @@


        provinceList.add('湖北省');


        provinceList.add('湖南省');


        provinceList.add('深圳市');


        salesDptMap.put('5.华南',provinceList);


    // DB202305259561 fy 20230517 start


        // salesDptMap.put('5.华南',provinceList);


        salesDptMap.put('6.华南',provinceList);


    // DB202305259561 fy 20230517 end


        


        provinceList = new List<String>();


        provinceList.add('四川省');


        provinceList.add('重庆市');


        provinceList.add('云南省');


        provinceList.add('贵州省');


        provinceList.add('西藏自治区');


        salesDptMap.put('6.西南',provinceList);


        


        provinceMap = new Map<string,string>();


        


@@ -806,26 +883,49 @@


        provinceMap.put('宁夏自治区','3.西北');


        provinceMap.put('甘肃省','3.西北');


        provinceMap.put('新疆自治区','3.西北');




    // DB202305259561 fy 20230517 start


        // provinceMap.put('上海市','4.华东');


        // provinceMap.put('江苏省','4.华东');


        // provinceMap.put('浙江省','4.华东');


        // provinceMap.put('福建省','4.华东');


        // provinceMap.put('安徽省','4.华东');


        // provinceMap.put('江西省','4.华东');


        


        provinceMap.put('上海市','4.华东');


        provinceMap.put('江苏省','4.华东');


        provinceMap.put('浙江省','4.华东');


        provinceMap.put('福建省','4.华东');


        provinceMap.put('安徽省','4.华东');


        provinceMap.put('江西省','4.华东');


        // provinceMap.put('广东省','5.华南');


        // provinceMap.put('广西自治区','5.华南');


        // provinceMap.put('海南省','5.华南');


        // provinceMap.put('湖北省','5.华南');


        // provinceMap.put('湖南省','5.华南');


        // provinceMap.put('深圳市','5.华南');


        


        provinceMap.put('广东省','5.华南');


        provinceMap.put('广西自治区','5.华南');


        provinceMap.put('海南省','5.华南');


        provinceMap.put('湖北省','5.华南');


        provinceMap.put('湖南省','5.华南');


        provinceMap.put('深圳市','5.华南');


        // provinceMap.put('四川省','6.西南');


        // provinceMap.put('重庆市','6.西南');


        // provinceMap.put('云南省','6.西南');


        // provinceMap.put('贵州省','6.西南');


        // provinceMap.put('西藏自治区','6.西南');




        provinceMap.put('四川省','4.西南');


        provinceMap.put('重庆市','4.西南');


        provinceMap.put('云南省','4.西南');


        provinceMap.put('贵州省','4.西南');


        provinceMap.put('西藏自治区','4.西南');




        provinceMap.put('上海市','5.华东');


        provinceMap.put('江苏省','5.华东');


        provinceMap.put('浙江省','5.华东');


        provinceMap.put('福建省','5.华东');


        provinceMap.put('安徽省','5.华东');


        provinceMap.put('江西省','5.华东');


        


        provinceMap.put('四川省','6.西南');


        provinceMap.put('重庆市','6.西南');


        provinceMap.put('云南省','6.西南');


        provinceMap.put('贵州省','6.西南');


        provinceMap.put('西藏自治区','6.西南');


        provinceMap.put('广东省','6.华南');


        provinceMap.put('广西自治区','6.华南');


        provinceMap.put('海南省','6.华南');


        provinceMap.put('湖北省','6.华南');


        provinceMap.put('湖南省','6.华南');


        provinceMap.put('深圳市','6.华南');


        


    // DB202305259561 fy 20230517 end


    }


    


    // 是否删除整行数据


@@ -998,7 +1098,10 @@


        List<OCM_Management_Province__c> OCM_MpList = [select Id,Province__c,GI_assistant__c,SP_assistant__c,Name from OCM_Management_Province__c where Province__c in :AllOwnerSystem ];


        for ( OCM_Management_Province__c OCM_Mp : OCM_MpList ) {


            //过滤掉不符合条件的数据 fy


            if(OCM_Mp.Name!='集采课'&&OCM_Mp.Name!='青岛'){


            // 20230329 ljh start


            // if(OCM_Mp.Name!='集采课'&&OCM_Mp.Name!='青岛'){


            if(OCM_Mp.Name!='集采课'){


            // 20230329 ljh end


                OCM_MpMap.put(OCM_Mp.Province__c, OCM_Mp);


            }


        }


@@ -1055,8 +1158,12 @@


        List<Opportunity> saveList = new List<Opportunity>();


        List<Opportunity> deleteList = new List<Opportunity>();


        //fy 修改 20220412


        system.debug('JianDangfalg+++'+JianDangfalg);


        if(JianDangfalg){


            amountCategory = new String[] {'GDP','GI','ET','BF','GS','URO','GYN','ENT','ENG'};


            //DB202305277681 fy 20230517 start


            // amountCategory = new String[] {'GDP','GI','ET','BF','GS','URO','GYN','ENT','ENG'};


            amountCategory = new String[] {'GDP','GI','ET','BF','GS','URO','GYN','ENT','ENG1','ENG2'};


            //DB202305277681 fy 20230517 end


        }


        //fy 修改 20220412


        Savepoint sp = Database.setSavepoint();


@@ -1187,7 +1294,10 @@


                }


            }


            if(JianDangfalg){


                amountCategory = new String[] {'GDP','GI','ET','BF','GS','URO','GYN','ENT','ENG'};


                //DB202305277681 fy 20230517 start


                // amountCategory = new String[] {'GDP','GI','ET','BF','GS','URO','GYN','ENT','ENG'};


                amountCategory = new String[] {'GDP','GI','ET','BF','GS','URO','GYN','ENT','ENG1','ENG2'};


                //DB202305277681 fy 20230517 end


            }


            //fy 20220418


            // 按金额分类，查找数据，并设值




 force-app/main/default/classes/SetProvinceTargetControllerTest.cls


@@ -536,7 +536,7 @@


            sptc.searchByDpt();


             //导出


            sptc.exportBycsv();


            sptc.csvAsString = '销售本部,省,GDP,GI,ET,BF,GS,URO,GYN,ENT,ENG\n5.华东,上海市,100,2000,2345,123,1200,400,500,40,55';


            sptc.csvAsString = '销售本部,省,GDP,GI,ET,BF,GS,URO,GYN,ENT,ENG1,ENG2\n5.华东,上海市,100,2000,2345,123,1200,400,500,40,55,3';


            //test read csv file


            sptc.importCSVFile();






 force-app/main/default/pages/SetProvinceTarget.page


@@ -1,4 +1,4 @@


<apex:page id="Page" showHeader="false" sidebar="false" Controller="SetProvinceTargetController" action="{!init}">


<apex:page id="Page" showHeader="false" sidebar="false" Controller="SetProvinceTargetController" action="{!init}" lightningStylesheets="true">


<head>


<title>各省目标设定</title>


    


@@ -44,7 +44,10 @@




function calc() {


    debugger;


    var JianDangfalg3 =j$(escapeVfId('Page:Form:editBlock:JianDangfalg')).value();


     // DB202305259561 fy 20230517 start


    // var JianDangfalg3 =j$(escapeVfId('Page:Form:editBlock:JianDangfalg')).value();


    var JianDangfalg3 = '{!JianDangfalg}';


     // DB202305259561 fy 20230517 end


    // alert('sss= '+s);


    var isorgtbl = j$('div[name=bodyTable]');


    var tbl = document.getElementById('MainTable');


@@ -54,12 +57,15 @@


        datarows -= 2;


    }


    var allSum = 0;


    var cols = [0, 0, 0, 0, 0, 0, 0, 0];


    //DB202305277681 fy 20230517 start


    // var cols = [0, 0, 0, 0, 0, 0, 0, 0];


    var cols = [0, 0, 0, 0, 0, 0, 0, 0, 0];


    //DB202305277681 fy 20230517 end


    // 行


    for (var i = 0; i < datarows; i++) {


        var rowSum = 0;


        // 列


        for (var j = 0; j < 8; j++) {


        for (var j = 0; j < 9; j++) {


            var amount = 0;


            var x=j;


            if(JianDangfalg3=='true'){


@@ -78,7 +84,7 @@




    }


    // 列


    for (var j = 0; j < 8; j++) {


    for (var j = 0; j < 9; j++) {


        j$(escapeVfId('totalcol' + j)).text(toNumComma(cols[j]));


    }


    // 総計


@@ -301,7 +307,7 @@


                    <!-- <td class="dataCell" id="NameHold"></td> -->


                    <td class="dataCell" style="text-align:center;">合计</td>


                    <apex:variable value="JianDangfalg" var="JianDangfalg2" rendered="{!IF(JianDangfalg, true, false)}" >


                    <td class="dataCell" style="text-align:right;" id="totalcol8"></td>


                    <td class="dataCell" style="text-align:right;" id="totalcol9"></td>


                    </apex:variable>


                    <td class="dataCell" style="text-align:right;" id="totalcol0"></td>


                    <td class="dataCell" style="text-align:right;" id="totalcol1"></td>


@@ -311,6 +317,9 @@


                    <td class="dataCell" style="text-align:right;" id="totalcol5"></td>


                    <td class="dataCell" style="text-align:right;" id="totalcol6"></td>


                    <td class="dataCell" style="text-align:right;" id="totalcol7"></td>


                    <!-- DB202305277681 fy 20230517 start -->


                    <td class="dataCell" style="text-align:right;" id="totalcol8"></td>


                    <!-- DB202305277681 fy 20230517 end -->


                    <td class="dataCell" style="text-align:right;" id="totalAll"></td>


                </tr>


                <apex:repeat value="{!dataBeans}" var="dbs" id="dbRepeat">