1、EAM和预提导入与展示；2、VAT日记账导入时间展示

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

@@ -529,7 +529,7 @@ public class AssetListServiceImpl extends BaseService {
                 //把购入日期放入到Calendar
                 cal.setTime(citAsset.getBuyDate());
                 //获取截止去年累计折旧期间,此值根据分类
-                citAsset.setTaxToLastYearDepreciationPeriod((year-1-cal.get(Calendar.YEAR)) == -1?0:((year-1-cal.get(Calendar.YEAR))*12+12-cal.get(Calendar.MONTH)+1));
+                citAsset.setTaxToLastYearDepreciationPeriod((year-1-cal.get(Calendar.YEAR)) == -1?0:((year-1-cal.get(Calendar.YEAR))*12+12-cal.get(Calendar.MONTH)));
                 //获取截止本年累计折旧期间,此值根据分类
                 if("完全报废".equals(citAsset.getScrapType())){
                     calendar.setTime(citAsset.getDisposedDate());

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

@@ -798,7 +798,6 @@ public class CitImportExcelServiceImpl extends BaseService {
             msg = "覆盖导入成功";
             CitBalanceSheetPrcAdjustExample example = new CitBalanceSheetPrcAdjustExample();
             CitBalanceSheetPrcAdjustExample.Criteria criteria = example.createCriteria();
-            criteria.andCreateByEqualTo(currentUserName);
             criteria.andPeriodEqualTo(period);
             criteria.andProjectIdEqualTo(project.getId());
             citBSPrcAdjustMapper.deleteByExample(example);
@@ -937,7 +936,6 @@ public class CitImportExcelServiceImpl extends BaseService {
             msg = "覆盖导入成功";
             CitProfitPrcAdjustExample example = new CitProfitPrcAdjustExample();
             CitProfitPrcAdjustExample.Criteria criteria = example.createCriteria();
-            criteria.andCreateByEqualTo(currentUserName);
             criteria.andPeriodEqualTo(period);
             criteria.andProjectIdEqualTo(project.getId());
             citProfitPrcAdjustMapper.deleteByExample(example);
@@ -1047,7 +1045,6 @@ public class CitImportExcelServiceImpl extends BaseService {
             msg = "覆盖导入成功";
             CitEAMAssetsDisposalExample example = new CitEAMAssetsDisposalExample();
             CitEAMAssetsDisposalExample.Criteria criteria = example.createCriteria();
-            criteria.andCreatedByEqualTo(currentUserName);
             criteria.andPeriodEqualTo(period);
             citEAMAssetsMapper.deleteByExample(example);
             updateImportLog(EnumCitImportType.EAMAssetsDisposal.getCode());
@@ -1255,7 +1252,6 @@ public class CitImportExcelServiceImpl extends BaseService {
             msg = "覆盖导入成功";
             CitSalaryAdvanceExample example = new CitSalaryAdvanceExample();
             CitSalaryAdvanceExample.Criteria criteria = example.createCriteria();
-            criteria.andCreatedByEqualTo(currentUserName);
             criteria.andPeriodEqualTo(period);
             criteria.andMonthEqualTo(month);
             citSalaryAdvanceMapper.deleteByExample(example);

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

@@ -29,7 +29,6 @@ public class CitPreviewDataServiceImpl extends  BaseService {
         CitSalaryAdvanceExample.Criteria criteria = example.createCriteria();
         criteria.andProjectIdEqualTo(citSalaryDataDto.getProjectId());
         criteria.andPeriodEqualTo(citSalaryDataDto.getPeriod());
-        criteria.andCreatedByEqualTo(authUserHelper.getCurrentAuditor().get());
         if(!"".equals(citSalaryDataDto.getPoSubjectName()) && citSalaryDataDto.getPoSubjectName() !=  null){//根据PO主体名称进行查询
             criteria.andPoSubjectNameEqualTo(citSalaryDataDto.getPoSubjectName());
         }

atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/extends/JournalEntryExtendsMapper.xml

@@ -37,6 +37,7 @@
     <if test="jeCondition.containsAdjustmentRecord!=null">
       AND contains_adjustment_record = #{jeCondition.containsAdjustmentRecord,jdbcType=BYTE}
     </if>
+    order by create_time desc
   </sql>
 
   <select id="selectByCondition" parameterType="pwc.taxtech.atms.vat.dpo.JournalEntryCondition" resultMap="BaseResultMap">

atms-web/src/main/webapp/app/cit/preview/cit-preview-eamDisposal-list/cit-preview-eamDisposal-list.ctrl.js

@@ -82,7 +82,7 @@
                     pageSize: 100,
                 },
                 searchPanel: {
-                    visible: true,
+                    visible: false,
                     width: 240,
                     placeholder: $translate.instant('SearchPlaceholder')
                 },
@@ -106,6 +106,7 @@
 
         //导出数据
         $scope.downloadTB = function () {
+            $scope.queryParams.period = vatSessionService.year;
             citPreviewDataService.exportData( $scope.queryParams).success(function (data, status, headers) {
                 if(status===204){
                     SweetAlert.warning("没有数据可以下载");
@@ -119,7 +120,7 @@
         
         
         $scope.doDataReset = function () {
-            $scope.queryParams.period = null;
+            $scope.queryParams.period = vatSessionService.year;
             $scope.queryParams.compensationSaleAmount = null;
             $scope.queryParams.assetLabelNumber = null;
             $scope.refreshConfigGrid();
@@ -129,6 +130,7 @@
         }
 
         var initListData = function(){
+            $scope.queryParams.period = vatSessionService.year;
             citPreviewDataService.getCitPreviewEamDisposalDataList($scope.queryParams).success(function (res) {
                 $scope.listData = commonWebService._index(res.list);
                 $scope.queryParams.pagingOptions.totalItems = res.pageInfo.totalCount;
@@ -144,6 +146,7 @@
 
         //刷新页面
         $scope.refreshConfigGrid = function () {
+            $scope.queryParams.period = vatSessionService.year;
             citPreviewDataService.getCitPreviewEamDisposalDataList($scope.queryParams)
                 .success(function (res) {
                     if (res && res.list) {

atms-web/src/main/webapp/app/cit/preview/cit-preview-eamDisposal-list/vat-preview-eamDisposal-search.html

@@ -3,7 +3,7 @@
     <div class="popover-content">
         <div>
             <table class="table table-responsive">
-                <tr>
+                <tr style="display: none">
                     <td>
                         <span translate="period"></span>
                         <input class="form-control input-width-middle" placeholder="{{'period' | translate}}" type="text" id="segment3" ng-model="queryParams.period" />

atms-web/src/main/webapp/app/cit/preview/cit-preview-salaryAdvance-list/cit-preview-salaryAdvance-list.ctrl.js

@@ -85,7 +85,7 @@
                     pageSize: 100,
                 },
                 searchPanel: {
-                    visible: true,
+                    visible: false,
                     width: 240,
                     placeholder: $translate.instant('SearchPlaceholder')
                 },
@@ -122,7 +122,7 @@
 
 
         $scope.doDataReset = function () {
-            $scope.queryParams.period = null;
+            $scope.queryParams.period = vatSessionService.year;
             $scope.queryParams.poSubjectName = null;
             $scope.refreshConfigGrid();
         }

atms-web/src/main/webapp/app/cit/preview/cit-preview-salaryAdvance-list/vat-preview-salaryAdvance-search.html

@@ -3,7 +3,7 @@
     <div class="popover-content">
         <div>
             <table class="table table-responsive">
-                <tr>
+                <tr style="display: none">
                     <td>
                         <span translate="period"></span>
                         <input class="form-control input-width-middle" placeholder="{{'period' | translate}}" type="text" id="segment3" ng-model="queryParams.period" />
@@ -11,7 +11,7 @@
                 </tr>
                 <tr>
                     <td>
-                        <span translate="compensationSaleAmount"></span>
+                        <span translate="poSubjectName"></span>
                         <input class="form-control input-width-middle" type="text"  placeholder="{{'poSubjectName' | translate}}"id="segment3Name" ng-model="queryParams.poSubjectName" />
                     </td>
                 </tr>

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

@@ -1013,6 +1013,24 @@ debugger;
                     }
                 }
             });
+
+            if ('export' == $scope.evenType) {
+                var xhr = new XMLHttpRequest();
+                xhr.onload = function (e) {
+                    var arraybuffer = xhr.response;
+                    exportToExcel(arraybuffer, vatSessionService.project.name + '-' + vatSessionService.month + '-纳税申报.xlsx');
+                    $('#busy-indicator-container').hide();
+                };
+                xhr.open("POST", apiInterceptor.webApiHostUrl + '/Report/exportReportData/' + vatSessionService.project.id + '/' + vatSessionService.month, true);
+                xhr.setRequestHeader("Authorization", apiInterceptor.tokenType + ' ' + apiInterceptor.apiToken());
+                xhr.setRequestHeader("Content-Type", 'application/json;charset=UTF-8');
+                xhr.responseType = "arraybuffer";
+                xhr.send(JSON.stringify({
+                    reportIds: reportIds
+                }));
+                return;
+            }
+
             if ('upload' == $scope.evenType) {
                 var xhr = new XMLHttpRequest();
                 xhr.onload = function (e) {

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

@@ -81,7 +81,7 @@
                     $scope.ledgerName = data.list[0].ledgerName;
                     $scope.currencyCode = data.list[0].currencyCode;
                     $scope.status = data.list[0].status;
-                    $scope.importDate = $filter('date')(data.list[0].date, "yyyy-MM-dd hh:mm:ss");
+                    $scope.importDate = $filter('date')(data.list[0].createTime, "yyyy-MM-dd HH:mm:ss");
                 }
             });
         };

atms-web/src/main/webapp/app/vat/preview/vat-preview-journal/vat-preview-journal.html

@@ -17,7 +17,7 @@
         {{'EnterpriseAccountSetName' | translate}}<span class="numAmount">{{ledgerName}}</span>&nbsp;&nbsp;&nbsp;
         {{'EnterpriseAccountSetCurrency' | translate}}<span class="numAmount">{{currencyCode}}</span>&nbsp;&nbsp;&nbsp;
         {{'IsCloseAccount' | translate}}<span class="numAmount">{{status}}</span>
-        {{'ImportTime' | translate}}<span class="numAmount">{{importDate| date:'yyyy-MM-dd hh:mm:ss'}}</span>
+        {{'ImportTime' | translate}}<span class="numAmount">{{importDate| date:'yyyy-MM-dd HH:mm:ss'}}</span>
     </div>
 
     <div id="filterCriteriaDiv" style="max-width:98%;margin-bottom:2px;" ng-show="criteriaList.length>0">