merge

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

@@ -50,8 +50,7 @@ public class TaxDocumentController {
     @PostMapping("add")
     @ResponseBody
     public boolean addTaxDocument(@RequestBody TaxDocument taxDocument,
-                                  @RequestPart("file") MultipartFile file,
-                                  @RequestParam(required = false) String modual) {
+                                  @RequestParam MultipartFile file) {
         return taxDocumentService.addTaxDocumentList(file,taxDocument);
     }
 

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

@@ -53,9 +53,13 @@ public class TaxDocumentServiceImpl {
         if(CollectionUtils.isNotEmpty(uploadDetail.getList())){
             urlMap = uploadDetail.getList().stream().collect(Collectors.toMap(DidiFileUploadDetailResult::getUid, didiFileUploadDetailResult -> didiFileUploadDetailResult.getViewHttpUrl()));
         }
-        for(TaxDocument data:dataList){
-            data.setFilePositionUrl(urlMap.get(data.getFileUploadId()));
+        if(urlMap!=null){
+            for(TaxDocument data:dataList){
+                data.setFilePositionUrl(urlMap.get(data.getFileUploadId()));
+            }
         }
+
+
         return dataList;
     }
 
@@ -87,7 +91,7 @@ public class TaxDocumentServiceImpl {
         }
         //档案名称 fileName
         if (StringUtils.isNotBlank(taxDocumentDto.getFileName())) {
-            criteria.andFileNameEqualTo(taxDocumentDto.getFileName());
+            criteria.andFileNameLike(taxDocumentDto.getFileName());
         }
         //业务线 businessLine
         if (StringUtils.isNotBlank(taxDocumentDto.getBusinessLine())) {

atms-web/src/main/webapp/app/taxDocumentManage/tax-document-list/tax-document-list.html

@@ -355,6 +355,7 @@
                     <div class="TDL-query-val">
                         <select ng-model="queryFieldModel.companyName" class="form-control radius3"
                                 title="{{queryFieldModel.companyName}}" required placeholder="{{'PleaseSelected' | translate}}">
+                            <option selected></option>
                             <option ng-repeat="(key,companyName) in companyNameOptionsMap"
                                     ng-click="queryFieldModel.companyId = key"
                                     value="{{companyName}}">{{companyName}}</option>
@@ -614,7 +615,7 @@
                                 {{'Duration' | translate}}
                             </label>
                             <div class="col-sm-11" style="width:61.67%">
-                                <input type='text' placeholder="{{'PleaseSelected' | translate}}" date-time-picker data-date-format="yyyy-mm-dd" style="width:320px;"
+                                <input type='text' placeholder="{{'PleaseSelected' | translate}}" date-time-picker data-date-format="yyyy/mm/dd" style="width:320px;"
                                        class="form-control" ng-model="editFieldModel.ownTime" required
                                        data-min-view="2"/>
                             </div>
@@ -624,7 +625,7 @@
                                 {{'AvailabilityDate' | translate}}
                             </label>
                             <div class="col-sm-11" style="width:61.67%">
-                                <input type='text' placeholder="{{'PleaseSelected' | translate}}" date-time-picker data-date-format="yyyy-mm-dd" style="width:320px;"
+                                <input type='text' placeholder="{{'PleaseSelected' | translate}}" date-time-picker data-date-format="yyyy/mm/dd" style="width:320px;"
                                        class="form-control" ng-model="editFieldModel.fileTime"
                                        data-min-view="2"/>
                             </div>
@@ -632,7 +633,7 @@
                         <div class="col-sm-6 form-group">
                             <label class="col-sm-3 control-label" translate="DueDate"></label>
                             <div class="col-sm-11" style="width:61.67%">
-                                <input type='text' placeholder="{{'PleaseSelected' | translate}}" date-time-picker data-date-format="yyyy-mm-dd" style="width:320px;"
+                                <input type='text' placeholder="{{'PleaseSelected' | translate}}" date-time-picker data-date-format="yyyy/mm/dd" style="width:320px;"
                                        class="form-control" ng-model="editFieldModel.effectiveTime"
                                        data-min-view="2"/>
                             </div>
@@ -821,7 +822,7 @@
                                             {{'Duration' | translate}}
                                         </label>
                                         <div class="col-sm-11" style="width:61.67%">
-                                            <input type='text' placeholder="{{'PleaseSelected' | translate}}" date-time-picker data-date-format="yyyy-mm-dd" style="width:280px;"
+                                            <input type='text' placeholder="{{'PleaseSelected' | translate}}" date-time-picker data-date-format="yyyy/mm/dd" style="width:280px;"
                                                    class="form-control" ng-model="editFieldItem.ownTime" required
                                                    data-min-view="2"/>
                                         </div>
@@ -831,7 +832,7 @@
                                             {{'AvailabilityDate' | translate}}
                                         </label>
                                         <div class="col-sm-11" style="width:61.67%">
-                                            <input type='text' placeholder="{{'PleaseSelected' | translate}}" date-time-picker data-date-format="yyyy-mm-dd" style="width:280px;"
+                                            <input type='text' placeholder="{{'PleaseSelected' | translate}}" date-time-picker data-date-format="yyyy/mm/dd" style="width:280px;"
                                                    class="form-control" ng-model="editFieldItem.fileTime"
                                                    data-min-view="2"/>
                                         </div>
@@ -839,7 +840,7 @@
                                     <div class="col-sm-6 form-group">
                                         <label class="col-sm-3 control-label" translate="DueDate"></label>
                                         <div class="col-sm-11" style="width:61.67%">
-                                            <input type='text' placeholder="{{'PleaseSelected' | translate}}" date-time-picker data-date-format="yyyy-mm-dd" style="width:280px;"
+                                            <input type='text' placeholder="{{'PleaseSelected' | translate}}" date-time-picker data-date-format="yyyy/mm/dd" style="width:280px;"
                                                    class="form-control" ng-model="editFieldItem.effectiveTime"
                                                    data-min-view="2"/>
                                         </div>
@@ -903,7 +904,7 @@
             <div class="modal-content">
                 <div class="modal-header">
                     <span class="close" data-dismiss="modal" aria-hidden="true" ng-click="hideFilePreviewPop()">×</span>
-                    <div class="modal-title">{{fileName}}</div>
+                    <div class="modal-title">{{currentSheetName}}</div>
                 </div>
                 <div class="modal-body">
                     <div class="dx-viewport demo-container" id="preview_dataGrid">
@@ -911,6 +912,37 @@
                 </div>
 
             </div>
+
+            <button class="TDL-pdf-paging-btn TDL-pdf-paging-btn-prev" ng-click="prevPaging_xls()" title="上一页">&lt;</button>
+            <button class="TDL-pdf-paging-btn TDL-pdf-paging-btn-next" ng-click="nextPaging_xls()" title="下一页">&gt;</button>
+        </div>
+    </div>
+
+    <div class="modal fade" id="uploadResultPop" tabindex="-1" role="dialog" aria-labelledby="myModal" data-backdrop="static" data-keyboard="false">
+        <div class="modal-dialog" style="width:80%;" role="document">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <div class="modal-title">提示讯息</div>
+                </div>
+                <div class="modal-body">
+                    <p ng-if="multiUploadSuccessItems.length">{{multiUploadSuccessItems.length}}个档案上传成功</p>
+                    <ul>
+                        <li ng-repeat="item in multiUploadSuccessItems">
+                            <span>{{item._file.name}}</span>
+                        </li>
+                    </ul>
+                    <p ng-if="multiUploadErrorItems.length">{{multiUploadErrorItems.length}}个档案上传失败</p>
+                    <ul>
+                        <li ng-repeat="item in multiUploadErrorItems">
+                            <span>{{item._file.name}}</span>
+                        </li>
+                    </ul>
+                </div>
+                <div class="modal-footer">
+                    <button class="btn btn-primary" translate="Confirm" ng-click="confirmUploadResult()"></button>
+                    <!--<button type="button" class="btn btn-third" data-dismiss="modal" translate="Cancel"></button>-->
+                </div>
+            </div>
         </div>
     </div>
 

atms-web/src/main/webapp/app/taxDocumentManage/tax-document-list/tax-document-list.svc.js

@@ -2,8 +2,8 @@
  * Created by Administrator on 2019/3/1 0001.
  */
 taxDocumentManageModule.factory('taxDocumentListService',
-    ['$q', 'apiConfig', 'jqFetch','apiInterceptor',
-        function ($q, apiConfig, jqFetch,apiInterceptor) {
+    ['$q', 'apiConfig', 'jqFetch', 'apiInterceptor',
+        function ($q, apiConfig, jqFetch, apiInterceptor) {
             'use strict';
             return {
                 fetchMainList: function (params) {
@@ -15,33 +15,35 @@ taxDocumentManageModule.factory('taxDocumentListService',
                 editRecord: function (params) {
                     return jqFetch.post(apiInterceptor.webApiHostUrl + '/taxDoc/edit', params);
                 },
-                verifyDuplicate:function(params){
+                verifyDuplicate: function (params) {
                     return jqFetch.post(apiInterceptor.webApiHostUrl + '/taxDoc/queryWhetherData', params);
                 },
-                getFileInfoOptions:function(params){
+                getFileInfoOptions: function (params) {
                     return jqFetch.post(apiInterceptor.webApiHostUrl + '/fileTypes/query4SelectionBox', params);
                 },
-                getCompanyNameOptions:function(params){
+                getCompanyNameOptions: function (params) {
                     return jqFetch.get(apiInterceptor.webApiHostUrl + '/org/getMyOrgList', params);
                 },
-                delFileRecordItems:function(params){
+                delFileRecordItems: function (params) {
                     return jqFetch.post(apiInterceptor.webApiHostUrl + '/taxDoc/batchDelete', params);
                 },
-                getBinaryData:function(url){
+                getBinaryData: function (url) {
                     var defer = $q.defer();
                     var oReq = new XMLHttpRequest();
-                    oReq.onload = function(e) {
+                    oReq.onload = function (e) {
                         var arraybuffer = oReq.response;
-                        console.info("arraybuffer:",arraybuffer);
+                        console.info("arraybuffer:", arraybuffer);
                         defer.resolve(arraybuffer);
                     };
+                    // oReq.open("GET", 'http://47.94.233.173:11007/static/erp_tax_system/3221D133-85B8-4E22-AE9B-DBEBD942D217?expire=1552361736&signiture=_Wz1_8Z6T8h5qnZAGpoRa8kNZeqmE7KoztKeehzYK4U=', true);
                     oReq.open("GET", url, true);
                     oReq.responseType = "arraybuffer";
                     oReq.send();
+
+                    // return jqFetch.get(url,{},'arraybuffer');
                     return defer.promise;
                 }
 
 
-
             };
         }]);
\ No newline at end of file