Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql

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/en-us/taxDocumentList.json

 {
-  "DocumentAttr":"DocumentAttr",
-  "DocumentType":"DocumentType",
-  "DocumentName":"DocumentName",
+  "Document Attribute":"Document Attribute",
+  "Document Type":"Document Type",
+  "Document Name":"Document Name",
   "IsRequired":"Is Required",
   "PleaseChecksRequired":"Please Checks Required",
-  "BusinessLine":"BusinessLine",
-  "CorporationName":"CorporationName",
-  "AvailabilityDate":"AvailabilityDate",
-  "Duration":"Duration",
-  "DueDate":"DueDate",
-  "TaxType":"TaxType",
-  "EntityIndex":"EntityIndex",
-  "EntityStorageLocation":"EntityStorageLocation",
-  "EntityCustodian":"EntityCustodian",
-  "ApprovalStatus":"ApprovalStatus",
+  "Business Line":"Business Line",
+  "Company Name":"Company Name",
+  "Effective_Date":"Effective_Date",
+  "Period":"Period",
+  "Due Date":"Due Date",
+  "Tax Type":"Tax Type",
+  "Storage Index":"Storage Index",
+  "Storage Location":"Storage Location",
+  "Custodian":"Custodian",
+  "Approval Status":"Approval Status",
   "ApprovalPass":"ApprovalPass",
   "ApprovalReject":"ApprovalReject",
   "ApprovalStandby":"ApprovalStandby",
-  "UploadDate":"UploadDate",
+  "Upload Date":"Upload Date",
   "Creator":"Creator",
   "Remarks":"Remarks",
-  "MoreFields":"MoreFields",
-  "LessFields":"LessFields",
+  "More":"More",
+  "Less":"Less",
   "Search":"Search",
   "Reset":"Reset",
   "Preview":"Preview",
-  "DelRecord":"DelRecord",
-  "CreateRecord":"CreateRecord",
-  "ExportTable":"ExportTable",
-  "DownloadAttachment":"DownloadAttachment",
+  "Delete Record":"Delete Record",
+  "Create Record":"Create Record",
+  "Export Record":"Export Record",
+  "Download Attachment":"Download Attachment",
   "Log":"Log",
-  "MultiUpload":"MultiUpload",
+  "Multiple File Upload":"Multiple File Upload",
   "MultiUploadFailList":"MultiUploadFailList",
   "UnFile":"UnFile",
   "UnRecord":"UnRecord",
@@ -44,18 +44,20 @@
   "Edited":"Edited",
   "Created":"Created",
   "CoverConfirm":"CoverConfirm",
-  "NoData":"NoData",
-  "PleaseSelected":"PleaseSelected",
-  "PleaseType":"PleaseType",
+  "No Data":"No Data",
+  "Please Select":"Please Select",
+  "Please Type":"Please Type",
   "Tips":"Tips",
   "EntityStorageDescription":"EntityStorageDescription",
   "multiUpload":"multiUpload",
   "UploadAttach":"UploadAttach",
   "Edit":"Edit",
-  "DocumentPath":"DocumentPath",
+  "Document Path":"Document Path",
   "PreviewFile":"PreviewFile",
   "UploadSuccessCount":"UploadSuccessCount",
   "UploadFailCount":"UploadFailCount",
-  "DeleteConfirm":"DeleteConfirm",
-  "FileTimeDateRangeError":"FileTimeDateRangeError"
+  "Confirm delete":"Confirm delete",
+  "FileTimeDateRangeError":"FileTimeDateRangeError",
+  "Warning":"Warning",
+  "Page {0} of {1} ({2} items)":"Page {0} of {1} ({2} items)"
 }
\ No newline at end of file

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

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

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

 {
-  "DocumentAttr":"档案属性",
+  "Document Attribute":"档案属性",
   "Document":"档案",
   "IsRequired":"为必填字段，不能为空，请检查",
   "PleaseChecksRequired":"请检查必填字段",
-  "DocumentType":"档案类型",
-  "DocumentName":"档案名称",
-  "BusinessLine":"业务线",
-  "CorporationName":"公司名称",
-  "AvailabilityDate":"文件生效日期",
-  "Duration":"所属期间",
-  "DueDate":"到期日",
-  "TaxType":"税种",
-  "EntityIndex":"实物索引号",
-  "EntityStorageLocation":"实物存放地点",
-  "EntityCustodian":"保管人",
-  "ApprovalStatus":"审批状态",
+  "Document Type":"档案类型",
+  "Document Name":"档案名称",
+  "Business Line":"业务线",
+  "Company Name":"公司名称",
+  "Effective_Date":"文件生效日期",
+  "Period":"所属期间",
+  "Due Date":"到期日",
+  "Tax Type":"税种",
+  "Storage Index":"实物索引号",
+  "Storage Location":"实物存放地点",
+  "Custodian":"保管人",
+  "Approval Status":"审批状态",
   "ApprovalPass":"审批通过",
   "ApprovalReject":"拒绝审批",
   "ApprovalStandby":"待审批",
-  "UploadDate":"上传日期",
+  "Upload Date":"上传日期",
   "Creator":"创建人",
   "Remarks":"档案备注",
-  "MoreFields":"查看更多",
-  "LessFields":"收起",
+  "More":"查看更多",
+  "Less":"收起",
   "Search":"查询",
   "Reset":"重置",
   "Preview":"预览",
-  "DelRecord":"删除记录",
-  "CreateRecord":"新建记录",
-  "ExportTable":"导出列表",
-  "DownloadAttachment":"下载附件",
+  "Delete Record":"删除记录",
+  "Create Record":"新建记录",
+  "Export Record":"导出列表",
+  "Download Attachment":"下载附件",
   "Log":"日志",
-  "MultiUpload":"批量上传",
+  "Multiple File Upload":"批量上传",
   "MultiUploadFailList":"批量上传失败列表",
   "UnFile":"未支持的文件类型",
   "UnRecord":"当前记录没有附件信息",
@@ -46,17 +46,19 @@
   "Created":"新建成功",
   "CoverConfirm":"当前记录已经存在，是否进行覆盖？",
   "NoData":"当前无数据可下载",
-  "PleaseSelected":"请选择",
-  "PleaseType":"请输入",
+  "Please Select":"请选择",
+  "Please Type":"请输入",
   "Tips":"提示讯息",
   "EntityStorageDescription":"请将实物档案存放地址精确到某个档案柜",
   "multiUpload":"批量上传",
   "UploadAttach":"上传附件",
   "Edit":"编辑",
-  "DocumentPath":"档案路径",
+  "Document Path":"档案路径",
   "PreviewFile":"预览文件",
   "UploadSuccessCount":"个档案上传成功:",
   "UploadFailCount":"个档案上传失败:",
-  "DeleteConfirm":"是否确认删除记录？",
-  "FileTimeDateRangeError": "'到期日'不能早于'文件生效日期'"
+  "Confirm delete":"是否确认删除记录？",
+  "FileTimeDateRangeError": "'到期日'不能早于'文件生效日期'",
+  "Warning":"提示",
+  "Page {0} of {1} ({2} items)":"当前 {0}页 /共 {1}页 ({2} 项)"
 }
\ No newline at end of file

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/reduction/cit-calculate-data/cit-calculate-data.ctrl.js

@@ -578,7 +578,6 @@ debugger;
             var tasks = JSON.parse(job.status);
 
             if (job.jobStatus == 'End') {
-
                 items.forEach(function (item, index) {
 
                     item.status = 'completed';
@@ -632,10 +631,11 @@ debugger;
             items.forEach(function (item, index) {
 
                 item.items.forEach(function (_task, index) {
-
+                    var temp = false;
                     tasks.forEach(function (task) {
 
                         if (task.code == _task.code) {
+                            temp = true;
                             if (task.status == 'Error') {
                                 _task.status = 'error';
                             } else if (task.status == 'End') {
@@ -645,7 +645,12 @@ debugger;
                             }
                             _task.text = $translate.instant(_task.status);
                         }
-                    })
+                    });
+                    //此时证明该code还未开始
+                    if(!temp){
+                        _task.status = 'unstarted';
+                        _task.text = $translate.instant(_task.status);
+                    }
                 })
             });
         }

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) {

atms-web/src/main/webapp/app/framework/app-usr-operate-log/app-usr-operate-log.ctrl.js

@@ -78,7 +78,7 @@ frameworkModule.controller('appUsrOperateLogController',
                     },
                     pager: {
                         allowedPageSizes: 5,
-                        infoText: "当前 {0}页 /共 {1}页 ({2} 项)",
+                        infoText:$translate.instant('Page {0} of {1} ({2} items)'),
                         showInfo: true,
                         showNavigationButtons: true,
                         showPageSizeSelector: true,

atms-web/src/main/webapp/app/framework/app-usr-operate-log/app-usr-operate-log.html

@@ -40,7 +40,7 @@
 
                             <button class="btn log-export-btn" ng-click="exportTableData()">
                                 <i class="fa fa-file-excel-o"></i>
-                                <span translate="ExportTable"></span>
+                                <span translate="Export Record"></span>
                             </button>
                             <div dx-data-grid="dataGridOptions"></div>
                         </div>