近期修改

19626

2023-10-31 fd9df05c48c09b4d7f39a3b401882bda226dedea

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

@@ -980,12 +980,14 @@
                soqlAsset += ' limit ' + selRecordOption + ' offset ' + String.valueOf((currPage - 1) * selctRecordNum - checkedAssetInfoNum);
                System.debug('Last page;');
            } else {
                // 20231103 Sit修改分页错误 Start
                // soqlAsset += ' limit ' + selRecordOption + ' offset ' + String.valueOf((currPage - 1) * selctRecordNum - checkedAssetInfoNum);
                if(oldAssetInfoList.size() > 10 && currPage == 2){
                    soqlAsset += ' limit ' + selRecordOption + ' offset ' + String.valueOf((currPage) * selctRecordNum - checkedAssetInfoNum);
                }else{
                    soqlAsset += ' limit ' + selRecordOption + ' offset ' + String.valueOf((currPage - 1) * selctRecordNum - checkedAssetInfoNum);
                }
                
                // 20231103 Sit修改分页错误 End
            }
        }
        // 最终检索结果
@@ -1216,9 +1218,10 @@

    public Date stringToDate(String dateStr) {  // Fri Jan 18 00:00:00 GMT 2019
        //System.debug('dateStr=====' + dateStr);
        // 20231103 陈京武  sit问题修改 Start
        dateStr = dateStr.split(' ')[0];
        return Date.valueOf(dateStr.replaceAll('/','-'));

        // 20231103 陈京武  sit问题修改 End
        //String monthStr = dateStr.substring(4,7);
        //Integer dayStr = Integer.ValueOf(dateStr.substring(8,10));
        //Integer yearStr = Integer.ValueOf(dateStr.substring(24,28));
@@ -1278,11 +1281,13 @@
            }
        }
        System.debug('333333');
         // 20231103 陈京武  sit问题修改 Start
        // 检索CSV中的ID检索Asset获得List<Asset>
        // try {
            if (allApiList.contains('Id')) {
                allApiList.remove(0);
            }
             // 20231103 陈京武  sit问题修改 End
            if (importApiList.contains('Id')) {
                importApiList.remove(0);
            }
@@ -1317,11 +1322,12 @@
                    if (!queryAssetFieldResult.isCalculated()) {
                        if (queryAssetFieldResult.getType() == Schema.DisplayType.Date) {
                            if (tempCsvBody[i][j+1] != '') {
                                // 20231103 陈京武  sit问题修改 Start
                                String s = tempCsvBody[i][j+1].substring(0,1);
                                if(s == '2'){
                                    tempAsset.put(importApiList[j], stringToDate(tempCsvBody[i][j+1]));
                                }
                                
                                // 20231103 陈京武  sit问题修改 End
                            }
                        } else if (queryAssetFieldResult.getType() == Schema.DisplayType.Boolean) {
                            if (tempCsvBody[i][j+1] != '') {
@@ -1384,11 +1390,13 @@
                ApexPages.Message errorMessage = new ApexPages.Message(ApexPages.severity.INFO, importSuccessfulMsg);
                ApexPages.addMessage(errorMessage);
            }
            // 20231103 陈京武  sit问题修改 Start
        // } catch (Exception e) {
        //     System.debug('1234 ' + e);
        //     ApexPages.Message errorMessage = new ApexPages.Message(ApexPages.severity.ERROR, '导入过程出现错误，导入文件中可能存在Fieldset中不存在的列名，请检查CSV文件。');
        //     ApexPages.addMessage(errorMessage);
        // }
        // 20231103 陈京武  sit问题修改 End

    }