1、CIT加入财务报表报表类型；2、日记账数据预览加入导入方式搜索条件；3、CIT报表处理正则表达式还原；

atms-api/src/main/java/pwc/taxtech/atms/service/impl/CitDataPreviewServiceImpl.java

@@ -57,6 +57,7 @@ public class CitDataPreviewServiceImpl extends BaseService {
     public PageInfo<CitJournalAdjustDto> getJournalMergeData(CitJournalAdjustDto citJournalAdjustDto) {
         CitJournalEntryAdjust citJournalEntryAdjust = beanUtil.copyProperties(citJournalAdjustDto, new CitJournalEntryAdjust());
         List<String> orgList = getOrgList(citJournalAdjustDto.getProjectId());
+        //判断选择的期间是否为12月，若为12月份则需查询出到13期的内容
         if (citJournalEntryAdjust.getPeriodEnd() != null && citJournalEntryAdjust.getPeriodEnd() % 100 == 12) {
             citJournalEntryAdjust.setPeriodEnd(citJournalEntryAdjust.getPeriodEnd() / 100 * 100 + 13);
         }

atms-api/src/main/java/pwc/taxtech/atms/service/impl/CitReportServiceImpl.java

@@ -234,7 +234,7 @@ public class CitReportServiceImpl extends BaseService {
                         setStatus(genJob, STATUS_END);
                         periodJobMapper.updateByPrimaryKey(genJob);
 
-                        reportGenerator.citUpdateWorkbookCaclsValueToDb(projectId, periodParam, workbook, resources, isMergeManualData, genJob);
+                        reportGenerator.updateWorkbookCaclsValueToDb(projectId, periodParam, workbook, resources, isMergeManualData, genJob);
 
                         //===============================================start validation compute==========================================================
                         //todo: 1.get the data from workbook, then put the data into new workbook
@@ -1704,7 +1704,7 @@ public class CitReportServiceImpl extends BaseService {
         ByteArrayOutputStream bout = new ByteArrayOutputStream();
         Workbook tWorkbook = null;
         try {
-            tWorkbook = reportGenerator.createWorkBookByPeriodTemplate(dataList);
+            tWorkbook = reportGenerator.createCitWorkBookByPeriodTemplate(dataList);
             tWorkbook.write(bout);
 
 //            FileUpload fileUpload = didiFileUploadService.uploadFile(bout.toByteArray(), "demo.xlsx", FileUploadEnum.BizSource.PERIOD_REPORT_TEMPLATE_UPLOAD.name());

atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/report/functions/TBM.java

@@ -144,7 +144,7 @@ public class TBM extends FunctionBase implements FreeRefFunction {
                     dto.setAmount(balance.getEndBalBeq().multiply(new BigDecimal(-1)));
                 }
             }
-            amount = amount.add(dto.getAmount());
+            amount = amount.add(dto.getAmount()==null?(new BigDecimal(0)):dto.getAmount());
             dto.setPeriod(period);
             dto.setIsOnlyManualInput(Boolean.FALSE);
             dto.setName(Constant.DataSourceName.ReportDataSource);

atms-web/src/main/webapp/app-resources/i18n/en-us/app.json

@@ -868,5 +868,6 @@
     "NumOfBranches":"分公司数量",
     "ConditionColumnNum": "Search Condition Column Num",
     "Condition": "Search Condition",
-    "RevenueTypeConfiguration":"Revenue Type Config"
+    "RevenueTypeConfiguration":"Revenue Type Config",
+    "FinancialStatementsType": "Financial Statements"
 }

atms-web/src/main/webapp/app-resources/i18n/zh-CN/app.json

@@ -927,5 +927,6 @@
     "ConditionColumnNum": "条件列",
     "Condition": "查询条件",
     "Cancel4Tax": "取消",
+    "FinancialStatementsType": "财务报表",
     "~MustBeEndOneApp": "I Must be the End One, please!"
 }

atms-web/src/main/webapp/app/admin/systemConfiguration/ruleEngineeConfiguration/fixedAssetsRuleEnginee/fixed-assets-rule-enginee.ctrl.js

@@ -211,7 +211,26 @@
                 var m = data.year.substring(0, data.year.length - 1);
                 $scope.fixedAssetsObject.year = m;
             }
-
+            //根据当前资产的一级分类判断当前modal需要显示的标签
+            if (type == "1"){
+                $scope.assetAdd = "StandardFixedAssetsAdd";
+                $scope.assetEdit = "StandardFixedAssetsEdit";
+                $scope.assetCode = "FixedAssetsCode";
+                $scope.assetName = "FixedAssetsName";
+                $scope.assetAgeLimit = "FixedAssetsAgeLimit";
+            } else if(type == "2") {
+                $scope.assetAdd = "LongTermPendingAdd";
+                $scope.assetEdit = "LongTermPendingEdit";
+                $scope.assetCode = "LongTermPendingCode";
+                $scope.assetName = "LongTermPendingName";
+                $scope.assetAgeLimit = "LongTermPendingAgeLimit";
+            } else if(type == "3") {
+                $scope.assetAdd = "IntangibleAssetsAdd";
+                $scope.assetEdit = "IntangibleAssetsEdit";
+                $scope.assetCode = "IntangibleAssetsCode";
+                $scope.assetName = "IntangibleAssetsName";
+                $scope.assetAgeLimit = "IntangibleAssetsAgeLimit";
+            }
             $(editModalSelector).modal('show');
         };
         $scope.editMapping = function (data) {

atms-web/src/main/webapp/app/cit/import/cit-import-asset-list/cit-import-asset-list.ctrl.js

@@ -519,7 +519,7 @@
                                 rowData.taxDepreciationPeriod = null;
                             } else {
                                 rowData.assetDetailGroupId = aseetDetailList[0].id;
-                                rowData.taxDepreciationPeriod = aseetDetailList[0].groupYear;
+                                rowData.taxDepreciationPeriod = aseetDetailList[0].groupYear * 12;
                             }
                             ;
                         },
@@ -543,7 +543,7 @@
                                 return item.id == value;
                             });
                             if (aseetDetailList.length > 0) {
-                                rowData.taxDepreciationPeriod = aseetDetailList[0].groupYear;
+                                rowData.taxDepreciationPeriod = aseetDetailList[0].groupYear * 12;
                             }
                         },
                         lookup: {

atms-web/src/main/webapp/app/cit/preview/cit-preview-journal-merge/cit-preview-journal-merge-search.html

@@ -21,6 +21,12 @@
                         <input class="form-control input-width-middle" type="text" id="description" ng-model="queryParams.description" />
                     </td>
                 </tr>
+                <tr>
+                    <td>
+                        <span translate="importWay"></span>
+                        <input class="form-control input-width-middle" type="text" id="source" ng-model="queryParams.source" />
+                    </td>
+                </tr>
                 <tr style="display: none">
                     <td>
                         <span translate="orgCode"></span>

atms-web/src/main/webapp/app/cit/preview/cit-preview-journal-merge/cit-preview-journal-merge.ctrl.js

@@ -43,6 +43,7 @@
                 subjectCode: null,
                 subjectName: null,
                 description: null,
+                source: null,
                 orgCode: null,
                 orgName: null,
                 documentDate: null,
@@ -97,6 +98,7 @@
                 subjectCode: null,
                 subjectName: null,
                 description: null,
+                source: null,
                 orgCode: null,
                 orgName: null,
                 documentDate: null,

atms-web/src/main/webapp/app/cit/report/cit-report-view/cit-report-view.ctrl.js

@@ -980,7 +980,7 @@
 
         //批量导出EXCEL
         $scope.export = function () {
-debugger;
+            $('#busy-indicator-container').show();
             var grp = _.find($scope.$parent.$parent.groups, function (g) {
                 return g.name == 'TaxReturnType';
             });
@@ -1028,6 +1028,7 @@ debugger;
                 xhr.send(JSON.stringify({
                     reportIds: reportIds
                 }));
+                $('#busy-indicator-container').hide();
                 return;
             }
 
@@ -1048,6 +1049,7 @@ debugger;
                 xhr.send(JSON.stringify({
                     reportIds: reportIds
                 }));
+                $('#busy-indicator-container').hide();
                 return;
             }
 

atms-web/src/main/webapp/app/common/controls/import/import-cit-trial-balance/import-cit-trial-balance.html

@@ -57,7 +57,7 @@
                                 ng-click="downloadTemplate()"></button>
 
                         <button type="button"
-                                class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;"
+                                class="btn btn-vat-primary" style="float:right; margin-right: 10px;margin-left: 30px;margin-top: 8px;display: none"
                                 translate="AddImportBtn"
                                 ng-click="importFile(importEnum.AddImport)"></button>
 

atms-web/src/main/webapp/app/common/utils/constant.js

@@ -66,7 +66,8 @@ constant.citReportTypeList = [
     {value: 2, name: 'QuarterlyFilingReturnType', orderIndex: 2},
     {value: 3, name: 'WorkingPaperType', orderIndex: 3},
     {value: 4, name: 'DocumentListType', orderIndex: 4},
-    {value: 5, name: 'OtherTaxes', orderIndex: 5}];
+    {value: 5, name: 'FinancialStatementsType', orderIndex: 5},
+    {value: 6, name: 'OtherTaxes', orderIndex: 6}];
 
 constant.cfReportTypeList = [
     {value: 1, name: '企业所得税预算'},

atms-web/src/main/webapp/app/dataImport/log/import-log/import-log.ctrl.js

@@ -107,6 +107,17 @@
                     allowHeaderFiltering: false,
                     width: '15%',
                     caption: $translate.instant('Status')
+                }, {
+                    dataField: "operator",
+                    allowHeaderFiltering: false,
+                    width: '10%',
+                    caption: $translate.instant('Creator')
+                },{
+                    dataField: "createTime",
+                    dataType: "date",
+                    format: "yyyy-MM-dd HH:mm:ss",
+                    width: '15%',
+                    caption: $translate.instant('OperateTime')
                 }
                 ],
                 onContentReady: function (e) {