#

atms-api/src/main/java/pwc/taxtech/atms/controller/CitPreviewDataController.java

@@ -26,6 +26,10 @@ import java.util.UUID;
 import static javax.servlet.http.HttpServletResponse.SC_NO_CONTENT;
 import static javax.servlet.http.HttpServletResponse.SC_OK;
 
+/**
+ * authoer kevin
+ * version 1.0
+ */
 @Controller
 @RequestMapping("api/v1/citPreviewDataController")
 public class CitPreviewDataController extends  BaseController {
@@ -45,7 +49,7 @@ public class CitPreviewDataController extends  BaseController {
         return   new CamelPagingResultDto<>(citPreviewDataService.getCitPreviewEamDisposalDataList(citSalaryDataDto));
     }
 
-    @RequestMapping(value = "exportDataEAM/get", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    @RequestMapping(value = "exportDataEAM", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     public void exportDataEAM(@RequestBody CitEAMAssetsDisposal citEAMAssetsDisposal, HttpServletResponse response) {
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat( "yyyy-MM-dd hh:MM:ss");
         String format = simpleDateFormat.format(new Date());

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

@@ -93,6 +93,7 @@ public class CitPreviewDataServiceImpl extends  BaseService {
             ExcelUtil.exportExcel(header, list, response);
             return list.size();
         } catch (Exception e) {
+            e.printStackTrace();
             logger.error("EAM资产处理金额记录表: %s", e.getMessage());
             return 0;
         }

atms-api/src/test/java/pwc/taxtech/atms/service/impl/EbsApiServiceImplTest.java

@@ -31,7 +31,7 @@ public class EbsApiServiceImplTest extends CommonIT {
     }
     @Test
     public void queryRemoteServerThenUpdateOrg(){
-        List<OrganizationQueryDto> items = Lists.newArrayList();
+        List<OrganizationQueryDto> items = new ArrayList();
         for(int i=0;i<2;i++){
             OrganizationQueryDto dto = new OrganizationQueryDto();
             dto.setTaxPayerNumber("sadsafsdf3232");

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

@@ -3,13 +3,13 @@
 <mapper namespace="pwc.taxtech.atms.dao.CitEAMAssetsDisposalMapper">
   <sql id="QueryCondition">
     1 = 1
-    <if test="@com.github.pagehelper.util.StringUtil@isNotEmpty(citEAMAssetsDisposal.orgId)">
+    <if test="@com.github.pagehelper.util.StringUtil@isNotEmpty(citEAMAssetsDisposal.period)">
       AND period= #{citEAMAssetsDisposal.period,jdbcType=VARCHAR}
     </if>
-    <if test="citEAMAssetsDisposal.periodStart!=null">
+    <if test="citEAMAssetsDisposal.compensationSaleAmount!=null">
       AND compensation_sale_amount &gt;= #{citEAMAssetsDisposal.compensationSaleAmount,jdbcType=INTEGER}
     </if>
-    <if test="citEAMAssetsDisposal.periodEnd!=null">
+    <if test="citEAMAssetsDisposal.assetLabelNumber!=null">
       AND asset_label_number &lt;= #{citEAMAssetsDisposal.assetLabelNumber,jdbcType=INTEGER}
     </if>
   </sql>

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

@@ -57,12 +57,12 @@
         function initAssetResultDxGrid() {
             var dupColumns = [
                 { caption: $translate.instant('ImportErrorPopUpNoCol'), dataField: "index", width: 50, allowEditing: false, fixed: true },
-                { caption: $translate.instant('period'), dataField: "period", width: 200, allowEditing: false, fixed: true },
-                { caption: $translate.instant('source'), dataField: "source", width: 200, allowEditing: false, fixed: true },
-                { caption: $translate.instant('assetLabelNumber'), dataField: "assetLabelNumber", width: 200, allowEditing: false, fixed: true },
-                { caption: $translate.instant('compensationSaleAmount'), dataField: "compensationSaleAmount", width: 200, allowEditing: false, fixed: true },
-                { caption: $translate.instant('createdBy'), dataField: "createBy", width: 200, allowEditing: false, fixed: true },
-                { caption: $translate.instant('createTime'), dataField: "createTime", width: 200, allowEditing: false, fixed: true }
+                { caption: $translate.instant('period'), dataField: "period", width: '15%', allowEditing: false, fixed: true },
+                { caption: $translate.instant('source'), dataField: "source", width: '15%', allowEditing: false, fixed: true },
+                { caption: $translate.instant('assetLabelNumber'), dataField: "assetLabelNumber", width: '15%', allowEditing: false, fixed: true },
+                { caption: $translate.instant('compensationSaleAmount'), dataField: "compensationSaleAmount", width: '15%', allowEditing: false, fixed: true },
+                { caption: $translate.instant('createdBy'), dataField: "createBy", width: '15%', allowEditing: false, fixed: true },
+                { caption: $translate.instant('createTime'), dataField: "createTime", width: '15%', allowEditing: false, fixed: true }
             ];
 
             $scope.assetsResultGridOptions = {
@@ -117,7 +117,7 @@
                     return;
                 }
                 vatExportService.exportToExcel(data, status, headers, 'EAM资产处置金额记录表.xls');
-            }).error(function () {
+            }).error(function (error) {
                 SweetAlert.error($translate.instant('PleaseContactAdministrator'));
             });
         }
@@ -129,7 +129,7 @@
             $scope.queryParams.assetLabelNumber = "";
         }
         $scope.doSearch = function () {
-            refreshConfigGrid();
+            $scope.refreshConfigGrid();
         }
 
         var initListData = function(){
@@ -163,7 +163,7 @@
         (function initialize() {
 
             $('#input-invoice-period-picker').focus(function () {
-                $('.filter-button').popover("hide");
+                    $('.filter-button').popover("hide");
             });
             //初始化month-picker
             $('#input-invoice-period-picker').rangePicker({
@@ -182,6 +182,9 @@
                 totalItems: 0,  //总数据
                 pageSize: 20,  //每页多少条数据
             };
+         /*   $scope.$watch('queryParams.pagingOptions',function (newValue, oldValue) {
+                $scope.pagingOptions = newValue;
+            });*/
             initAssetResultDxGrid();
             initListData();
 

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

@@ -21,7 +21,7 @@
 
     <div id="gridContainer" dx-data-grid="assetsResultGridOptions"></div>
     <div class="page-footer">
-        <ack-pagination page-options="pagingOptions"
+        <ack-pagination page-options="queryParams.pagingOptions"
                         refresh-table="refreshConfigGrid()"></ack-pagination>
     </div>
     </div>

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

@@ -6,19 +6,19 @@
                 <tr>
                     <td>
                         <span translate="period"></span>
-                        <input class="form-control input-width-middle" type="text" id="segment3" ng-model="queryParams.period" />
+                        <input class="form-control input-width-middle" placeholder="{{'period' | translate}}" type="text" id="segment3" ng-model="queryParams.period" />
                     </td>
                 </tr>
                 <tr>
                     <td>
                         <span translate="compensationSaleAmount"></span>
-                        <input class="form-control input-width-middle" type="text" id="segment3Name" ng-model="queryParams.compensationSaleAmount" />
+                        <input class="form-control input-width-middle" type="text"  placeholder="{{'compensationSaleAmount' | translate}}"id="segment3Name" ng-model="queryParams.compensationSaleAmount" />
                     </td>
                 </tr>
                 <tr>
                     <td>
                         <span translate="assetLabelNumber"></span>
-                        <input class="form-control input-width-middle" type="text" id="segment5" ng-model="queryParams.assetLabelNumber" />
+                        <input class="form-control input-width-middle" type="text" placeholder="{{'assetLabelNumber' | translate}}" id="segment5" ng-model="queryParams.assetLabelNumber" />
                     </td>
                 </tr>
             </table>

atms-web/src/main/webapp/app/common/webservices/common.svc.js

@@ -358,7 +358,7 @@ webservices.factory('commonWebService', ['$http', 'apiConfig', 'loginContext', '
         },
         _index :function (data) {
                 var index = 1;
-                for(var   i of data){
+                for(var   i in data){
                     i.index = index;
                     index++;
                 }