CIT数据导入模板下载功能补充

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

@@ -13,6 +13,7 @@ import org.joda.time.DateTime;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Required;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -23,6 +24,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.context.ServletContextAware;
 import pwc.taxtech.atms.common.util.MyAsserts;
+import pwc.taxtech.atms.constant.enums.EnumCitImportType;
 import pwc.taxtech.atms.constant.enums.EnumImportType;
 import pwc.taxtech.atms.dpo.TemplateUniqDto;
 import pwc.taxtech.atms.dto.*;
@@ -238,10 +240,15 @@ public class TemplateController extends BaseController implements ServletContext
     }
 
     @RequestMapping(value = "file/downloadTemplate", method = RequestMethod.GET)
-    public void fileDownload(@RequestParam Integer fileType,HttpServletResponse response){
+    public void fileDownload(@RequestParam Integer fileType, @RequestParam(required=false) Integer serviceType, HttpServletResponse response){
         //获取网站部署路径(通过ServletContext对象)，用于确定下载文件位置，从而实现下载
         String path = servletContext.getRealPath("/")+"\\WEB-INF\\classes";
-        String fileName = getFileName(fileType);
+        String fileName = "";
+        if(serviceType == null){
+            fileName = getFileName(fileType);
+        }else{
+            fileName = getCitFileName(fileType);
+        }
         response.setContentType("multipart/form-data");
         response.setHeader("Content-Disposition", "attachment;fileName="+fileName+".xlsx");
         ServletOutputStream out;
@@ -288,6 +295,25 @@ public class TemplateController extends BaseController implements ServletContext
         return null;
     }
 
+    private String getCitFileName(Integer fileType) {
+        if(EnumCitImportType.JournalAdjust.getCode().equals(fileType)){
+            return EnumCitImportType.JournalAdjust.name();
+        }else if(EnumCitImportType.TrialBalance.getCode().equals(fileType)){
+            return EnumCitImportType.TrialBalance.name();
+        }else if(EnumCitImportType.DraftAccountMapping.getCode().equals(fileType)){
+            return EnumCitImportType.DraftAccountMapping.name();
+        }else if(EnumCitImportType.BalanceSheetPrcAdjust.getCode().equals(fileType)){
+            return EnumCitImportType.BalanceSheetPrcAdjust.name();
+        }else if(EnumCitImportType.ProfitPrcAdjust.getCode().equals(fileType)){
+            return EnumCitImportType.ProfitPrcAdjust.name();
+        }else if(EnumCitImportType.EAMAssetsDisposal.getCode().equals(fileType)){
+            return EnumCitImportType.EAMAssetsDisposal.name();
+        }else if(EnumCitImportType.SalaryAdvance.getCode().equals(fileType)){
+            return EnumCitImportType.SalaryAdvance.name();
+        }
+        return null;
+    }
+
 
     @Override
     public void setServletContext(ServletContext servletContext) {

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

 package pwc.taxtech.atms.service.impl;
 
+import org.apache.poi.hssf.usermodel.HSSFDateUtil;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.CellType;
 
+import java.text.SimpleDateFormat;
 import java.util.Calendar;
+import java.util.Date;
 
 /**
  * @author ZhiKai Z Wei
@@ -45,6 +48,11 @@ public class CitCommonUtil {
                 obj = cell.getErrorCellValue();
                 break;
             case NUMERIC:
+                if(HSSFDateUtil.isCellDateFormatted(cell)){
+                    SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
+                    obj = sdf.format(cell.getDateCellValue());
+                    break;
+                }
                 obj = cell.getNumericCellValue();
                 break;
             case STRING:

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

@@ -612,7 +612,6 @@ public class CitImportExcelServiceImpl extends BaseService {
             //获取该行数据
             Row rowData = sheet.getRow(rowNum);
 
-
             CitDataImportLog citDataImportLogError = generalCitDataImportLog("", "", "",
                     EnumCitImportType.EAMAssetsDisposal.getCode(), 0,
                     0, 0,
@@ -623,7 +622,7 @@ public class CitImportExcelServiceImpl extends BaseService {
             citEAMAssetsDisposal.setId(idService.nextId());
             citEAMAssetsDisposal.setPeriod(Integer.valueOf(CitCommonUtil.getPeriod().toString()));
 
-            String[] split = CitCommonUtil.getValue(rowData.getCell(1)).toString().replace("月", "").split("年");
+            String[] split = CitCommonUtil.getValue(rowData.getCell(1)).toString().split("-");
             StringBuilder sb = new StringBuilder(split[0]);
             if(new Integer(split[1]) + 1 < 10){
                 sb.append(0);
@@ -709,9 +708,36 @@ public class CitImportExcelServiceImpl extends BaseService {
             citSalaryAdvance.setId(idService.nextId());
             citSalaryAdvance.setPeriod(Integer.valueOf(CitCommonUtil.getPeriod().toString()));
 
-            citSalaryAdvance.setPoNo(Integer.valueOf(CitCommonUtil.getValue(rowData.getCell(0)).toString()));
+            Object cellValue = CitCommonUtil.getValue(rowData.getCell(0));
+            if(cellValue == null){
+                citDataImportLogError.setErrorMsg("第"+(rowNum+1)+"行PO号为空");
+                citDataImportLogList.add(citDataImportLogError);
+                continue;
+            }
+            citSalaryAdvance.setPoNo(cellValue.toString());
+
+            cellValue = CitCommonUtil.getValue(rowData.getCell(5));
+            if(cellValue == null){
+                citDataImportLogError.setErrorMsg("第"+(rowNum+1)+"行PO主体CODE为空");
+                citDataImportLogList.add(citDataImportLogError);
+                continue;
+            }
             citSalaryAdvance.setPoSubjectCode(CitCommonUtil.getValue(rowData.getCell(5)).toString());
+
+            cellValue = CitCommonUtil.getValue(rowData.getCell(6));
+            if(cellValue == null){
+                citDataImportLogError.setErrorMsg("第"+(rowNum+1)+"行PO主体为空");
+                citDataImportLogList.add(citDataImportLogError);
+                continue;
+            }
             citSalaryAdvance.setPoSubjectName(CitCommonUtil.getValue(rowData.getCell(6)).toString());
+
+            cellValue = CitCommonUtil.getValue(rowData.getCell(16));
+            if(cellValue == null){
+                citDataImportLogError.setErrorMsg("第"+(rowNum+1)+"行预提为空");
+                citDataImportLogList.add(citDataImportLogError);
+                continue;
+            }
             citSalaryAdvance.setAdvance(new BigDecimal(CitCommonUtil.getValue(rowData.getCell(16)).toString()));
             citSalaryAdvance.setApprovedStandardInvoiceAmount(new BigDecimal(CitCommonUtil.getValue(rowData.getCell(18)).toString()));
 
@@ -719,7 +745,7 @@ public class CitImportExcelServiceImpl extends BaseService {
         }
         int insertBatchNum = citSalaryAdvanceMapper.insertBatch(citSalaryAdvanceList);
         CitDataImportLog citDataImportLog = generalCitDataImportLog("", "", "",
-                EnumCitImportType.JournalAdjust.getCode(), period / 100,
+                EnumCitImportType.SalaryAdvance.getCode(), period / 100,
                 0, period % 100,
                 "", "预提重分类数据源", true);
         citDataImportLog.setRecordSize(insertBatchNum);

atms-dao/src/main/java/pwc/taxtech/atms/entity/CitSalaryAdvance.java

@@ -76,7 +76,7 @@ public class CitSalaryAdvance extends BaseEntity implements Serializable {
      *
      * @mbg.generated
      */
-    private Integer poNo;
+    private String poNo;
 
     /**
      * Database Column Remarks:
@@ -302,7 +302,7 @@ public class CitSalaryAdvance extends BaseEntity implements Serializable {
      *
      * @mbg.generated
      */
-    public Integer getPoNo() {
+    public String getPoNo() {
         return poNo;
     }
 
@@ -314,8 +314,8 @@ public class CitSalaryAdvance extends BaseEntity implements Serializable {
      *
      * @mbg.generated
      */
-    public void setPoNo(Integer poNo) {
-        this.poNo = poNo;
+    public void setPoNo(String poNo) {
+        this.poNo = poNo == null ? null : poNo.trim();
     }
 
     /**

atms-dao/src/main/java/pwc/taxtech/atms/entity/CitSalaryAdvanceExample.java

@@ -536,52 +536,62 @@ public class CitSalaryAdvanceExample {
             return (Criteria) this;
         }
 
-        public Criteria andPoNoEqualTo(Integer value) {
+        public Criteria andPoNoEqualTo(String value) {
             addCriterion("po_no =", value, "poNo");
             return (Criteria) this;
         }
 
-        public Criteria andPoNoNotEqualTo(Integer value) {
+        public Criteria andPoNoNotEqualTo(String value) {
             addCriterion("po_no <>", value, "poNo");
             return (Criteria) this;
         }
 
-        public Criteria andPoNoGreaterThan(Integer value) {
+        public Criteria andPoNoGreaterThan(String value) {
             addCriterion("po_no >", value, "poNo");
             return (Criteria) this;
         }
 
-        public Criteria andPoNoGreaterThanOrEqualTo(Integer value) {
+        public Criteria andPoNoGreaterThanOrEqualTo(String value) {
             addCriterion("po_no >=", value, "poNo");
             return (Criteria) this;
         }
 
-        public Criteria andPoNoLessThan(Integer value) {
+        public Criteria andPoNoLessThan(String value) {
             addCriterion("po_no <", value, "poNo");
             return (Criteria) this;
         }
 
-        public Criteria andPoNoLessThanOrEqualTo(Integer value) {
+        public Criteria andPoNoLessThanOrEqualTo(String value) {
             addCriterion("po_no <=", value, "poNo");
             return (Criteria) this;
         }
 
-        public Criteria andPoNoIn(List<Integer> values) {
+        public Criteria andPoNoLike(String value) {
+            addCriterion("po_no like", value, "poNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andPoNoNotLike(String value) {
+            addCriterion("po_no not like", value, "poNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andPoNoIn(List<String> values) {
             addCriterion("po_no in", values, "poNo");
             return (Criteria) this;
         }
 
-        public Criteria andPoNoNotIn(List<Integer> values) {
+        public Criteria andPoNoNotIn(List<String> values) {
             addCriterion("po_no not in", values, "poNo");
             return (Criteria) this;
         }
 
-        public Criteria andPoNoBetween(Integer value1, Integer value2) {
+        public Criteria andPoNoBetween(String value1, String value2) {
             addCriterion("po_no between", value1, value2, "poNo");
             return (Criteria) this;
         }
 
-        public Criteria andPoNoNotBetween(Integer value1, Integer value2) {
+        public Criteria andPoNoNotBetween(String value1, String value2) {
             addCriterion("po_no not between", value1, value2, "poNo");
             return (Criteria) this;
         }

atms-dao/src/main/resources/pwc/taxtech/atms/dao/CitSalaryAdvanceMapper.xml

@@ -11,7 +11,7 @@
     <result column="project_id" jdbcType="VARCHAR" property="projectId" />
     <result column="period" jdbcType="INTEGER" property="period" />
     <result column="source" jdbcType="VARCHAR" property="source" />
-    <result column="po_no" jdbcType="INTEGER" property="poNo" />
+    <result column="po_no" jdbcType="VARCHAR" property="poNo" />
     <result column="po_subject_code" jdbcType="VARCHAR" property="poSubjectCode" />
     <result column="po_subject_name" jdbcType="VARCHAR" property="poSubjectName" />
     <result column="advance" jdbcType="DECIMAL" property="advance" />
@@ -153,7 +153,7 @@
       updated_by, create_time, update_time
       )
     values (#{id,jdbcType=BIGINT}, #{organizationId,jdbcType=VARCHAR}, #{projectId,jdbcType=VARCHAR}, 
-      #{period,jdbcType=INTEGER}, #{source,jdbcType=VARCHAR}, #{poNo,jdbcType=INTEGER}, 
+      #{period,jdbcType=INTEGER}, #{source,jdbcType=VARCHAR}, #{poNo,jdbcType=VARCHAR}, 
       #{poSubjectCode,jdbcType=VARCHAR}, #{poSubjectName,jdbcType=VARCHAR}, #{advance,jdbcType=DECIMAL}, 
       #{approvedStandardInvoiceAmount,jdbcType=DECIMAL}, #{createdBy,jdbcType=VARCHAR}, 
       #{updatedBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
@@ -226,7 +226,7 @@
         #{source,jdbcType=VARCHAR},
       </if>
       <if test="poNo != null">
-        #{poNo,jdbcType=INTEGER},
+        #{poNo,jdbcType=VARCHAR},
       </if>
       <if test="poSubjectCode != null">
         #{poSubjectCode,jdbcType=VARCHAR},
@@ -287,7 +287,7 @@
         source = #{record.source,jdbcType=VARCHAR},
       </if>
       <if test="record.poNo != null">
-        po_no = #{record.poNo,jdbcType=INTEGER},
+        po_no = #{record.poNo,jdbcType=VARCHAR},
       </if>
       <if test="record.poSubjectCode != null">
         po_subject_code = #{record.poSubjectCode,jdbcType=VARCHAR},
@@ -329,7 +329,7 @@
       project_id = #{record.projectId,jdbcType=VARCHAR},
       period = #{record.period,jdbcType=INTEGER},
       source = #{record.source,jdbcType=VARCHAR},
-      po_no = #{record.poNo,jdbcType=INTEGER},
+      po_no = #{record.poNo,jdbcType=VARCHAR},
       po_subject_code = #{record.poSubjectCode,jdbcType=VARCHAR},
       po_subject_name = #{record.poSubjectName,jdbcType=VARCHAR},
       advance = #{record.advance,jdbcType=DECIMAL},
@@ -362,7 +362,7 @@
         source = #{source,jdbcType=VARCHAR},
       </if>
       <if test="poNo != null">
-        po_no = #{poNo,jdbcType=INTEGER},
+        po_no = #{poNo,jdbcType=VARCHAR},
       </if>
       <if test="poSubjectCode != null">
         po_subject_code = #{poSubjectCode,jdbcType=VARCHAR},
@@ -401,7 +401,7 @@
       project_id = #{projectId,jdbcType=VARCHAR},
       period = #{period,jdbcType=INTEGER},
       source = #{source,jdbcType=VARCHAR},
-      po_no = #{poNo,jdbcType=INTEGER},
+      po_no = #{poNo,jdbcType=VARCHAR},
       po_subject_code = #{poSubjectCode,jdbcType=VARCHAR},
       po_subject_name = #{poSubjectName,jdbcType=VARCHAR},
       advance = #{advance,jdbcType=DECIMAL},

atms-web/src/main/webapp/app/common/controls/import/import-cit-bs-prc-adjust/import-cit-bs-prc-adjust.ctrl.js

 commonModule.controller('importCitBalanceSheetPrcAdjustCon', ['$scope', '$log', '$translate', '$timeout', '$q', '$interval'
     , 'apiInterceptor', 'Upload', 'citImportDataService', 'SweetAlert', 'uiGridConstants', '$uibModal'
-    , 'vatSessionService', 'enums', 'vatOperationLogService','$anchorScroll','$location',
+    , 'vatSessionService', 'enums', 'vatOperationLogService','templateService',
     function ($scope, $log, $translate, $timeout, $q, $interval
         , apiInterceptor, Upload, citImportDataService, SweetAlert, uiGridConstants, $uibModal
-        , vatSessionService, enums, vatOperationLogService, $anchorScroll,$location) {
+        , vatSessionService, enums, vatOperationLogService,templateService) {
         'use strict';
         // $anchorScroll.yOffset=55;
         // $location.hash('top');
@@ -383,6 +383,36 @@
             ele1.datepicker("setDate", $scope.selectedDate);
         };
 
+        $scope.downloadTemplate = function () {
+            debugger;
+            templateService.citDownloadTemplate(constant.citImportFileType.BalanceSheetPrcAdjust).success(function (data, status, headers) {
+                var octetStreamMime = 'application/octet-stream';
+                var contentType = headers('content-type') || octetStreamMime;
+                if (window.navigator.msSaveBlob) {
+                    var blob = new Blob([data], {
+                        type: contentType
+                    });
+                    navigator.msSaveBlob(blob, "AdjustmentTable");
+                } else {
+                    var urlCreator = window.URL || window.webkitURL || window.mozURL || window.msURL;
+                    if (urlCreator) {
+                        var a = document.createElement('a');
+                        var blob = new Blob([data], {
+                            type: contentType
+                        });
+                        var url = urlCreator.createObjectURL(blob);
+                        a.href = url;
+                        a.target = '_blank';
+                        a.download = "BalanceSheetPrcAdjust.xlsx";
+                        document.body.appendChild(a);
+                        a.click();
+                    }
+                }
+            }).error(function () {
+                SweetAlert.error($translate.instant('PleaseContactAdministrator'));
+            });
+        };
+
         //开始
         (function initialize() {
             debugger;

atms-web/src/main/webapp/app/common/controls/import/import-cit-bs-prc-adjust/import-cit-bs-prc-adjust.js

@@ -14,6 +14,7 @@
             controller: 'importCitBalanceSheetPrcAdjustCon',
             link: function (scope, element) {
                 $('.main-contents')[0].style.width = "260px";
+                $('.data-import-contents')[0].style.display = "block";
                 $('.main-contents')[0].style.float = "left";
                 $('.main-contents')[0].style.styleFloat = "left";
                 $('.main-contents')[0].style.cssFloat = "left";

atms-web/src/main/webapp/app/common/controls/import/import-cit-draft-account-mapping/import-cit-draft-account-mapping.ctrl.js

 commonModule.controller('importCitDaftAccountMappingCon', ['$scope', '$log', '$translate', '$timeout', '$q', '$interval'
     , 'apiInterceptor', 'Upload', 'citImportDataService', 'SweetAlert', 'uiGridConstants', '$uibModal'
-    , 'vatSessionService', 'enums', 'vatOperationLogService','$anchorScroll','$location',
+    , 'vatSessionService', 'enums', 'vatOperationLogService','templateService',
     function ($scope, $log, $translate, $timeout, $q, $interval
         , apiInterceptor, Upload, citImportDataService, SweetAlert, uiGridConstants, $uibModal
-        , vatSessionService, enums, vatOperationLogService, $anchorScroll,$location) {
+        , vatSessionService, enums, vatOperationLogService, templateService) {
         'use strict';
         // $anchorScroll.yOffset=55;
         // $location.hash('top');
@@ -383,6 +383,36 @@
             ele1.datepicker("setDate", $scope.selectedDate);
         };
 
+        $scope.downloadTemplate = function () {
+            debugger;
+            templateService.citDownloadTemplate(constant.citImportFileType.DraftAccountMapping).success(function (data, status, headers) {
+                var octetStreamMime = 'application/octet-stream';
+                var contentType = headers('content-type') || octetStreamMime;
+                if (window.navigator.msSaveBlob) {
+                    var blob = new Blob([data], {
+                        type: contentType
+                    });
+                    navigator.msSaveBlob(blob, "AdjustmentTable");
+                } else {
+                    var urlCreator = window.URL || window.webkitURL || window.mozURL || window.msURL;
+                    if (urlCreator) {
+                        var a = document.createElement('a');
+                        var blob = new Blob([data], {
+                            type: contentType
+                        });
+                        var url = urlCreator.createObjectURL(blob);
+                        a.href = url;
+                        a.target = '_blank';
+                        a.download = "DraftAccountMapping.xlsx";
+                        document.body.appendChild(a);
+                        a.click();
+                    }
+                }
+            }).error(function () {
+                SweetAlert.error($translate.instant('PleaseContactAdministrator'));
+            });
+        };
+
         //开始
         (function initialize() {
             debugger;

atms-web/src/main/webapp/app/common/controls/import/import-cit-draft-account-mapping/import-cit-draft-account-mapping.js

@@ -14,6 +14,7 @@
             controller: 'importCitDaftAccountMappingCon',
             link: function (scope, element) {
                 $('.main-contents')[0].style.width = "260px";
+                $('.data-import-contents')[0].style.display = "block";
                 $('.main-contents')[0].style.float = "left";
                 $('.main-contents')[0].style.styleFloat = "left";
                 $('.main-contents')[0].style.cssFloat = "left";

atms-web/src/main/webapp/app/common/controls/import/import-cit-eam-assets-disposal/import-cit-eam-assets-disposal.ctrl.js

 commonModule.controller('importCitEamAssetsDisposalCon', ['$scope', '$log', '$translate', '$timeout', '$q', '$interval'
     , 'apiInterceptor', 'Upload', 'citImportDataService', 'SweetAlert', 'uiGridConstants', '$uibModal'
-    , 'vatSessionService', 'enums', 'vatOperationLogService','$anchorScroll','$location',
+    , 'vatSessionService', 'enums', 'vatOperationLogService','templateService',
     function ($scope, $log, $translate, $timeout, $q, $interval
         , apiInterceptor, Upload, citImportDataService, SweetAlert, uiGridConstants, $uibModal
-        , vatSessionService, enums, vatOperationLogService, $anchorScroll,$location) {
+        , vatSessionService, enums, vatOperationLogService, templateService) {
         'use strict';
         // $anchorScroll.yOffset=55;
         // $location.hash('top');
@@ -383,6 +383,36 @@
             ele1.datepicker("setDate", $scope.selectedDate);
         };
 
+        $scope.downloadTemplate = function () {
+            debugger;
+            templateService.citDownloadTemplate(constant.citImportFileType.EAMAssetsDisposal).success(function (data, status, headers) {
+                var octetStreamMime = 'application/octet-stream';
+                var contentType = headers('content-type') || octetStreamMime;
+                if (window.navigator.msSaveBlob) {
+                    var blob = new Blob([data], {
+                        type: contentType
+                    });
+                    navigator.msSaveBlob(blob, "AdjustmentTable");
+                } else {
+                    var urlCreator = window.URL || window.webkitURL || window.mozURL || window.msURL;
+                    if (urlCreator) {
+                        var a = document.createElement('a');
+                        var blob = new Blob([data], {
+                            type: contentType
+                        });
+                        var url = urlCreator.createObjectURL(blob);
+                        a.href = url;
+                        a.target = '_blank';
+                        a.download = "EAMAssetsDisposal.xlsx";
+                        document.body.appendChild(a);
+                        a.click();
+                    }
+                }
+            }).error(function () {
+                SweetAlert.error($translate.instant('PleaseContactAdministrator'));
+            });
+        };
+
         //开始
         (function initialize() {
             debugger;

atms-web/src/main/webapp/app/common/controls/import/import-cit-eam-assets-disposal/import-cit-eam-assets-disposal.js

@@ -14,6 +14,7 @@
             controller: 'importCitEamAssetsDisposalCon',
             link: function (scope, element) {
                 $('.main-contents')[0].style.width = "260px";
+                $('.data-import-contents')[0].style.display = "block";
                 $('.main-contents')[0].style.float = "left";
                 $('.main-contents')[0].style.styleFloat = "left";
                 $('.main-contents')[0].style.cssFloat = "left";

atms-web/src/main/webapp/app/common/controls/import/import-cit-journal-adjust/import-cit-journal-adjust.ctrl.js

 commonModule.controller('importCitJournalAdjustController', ['$scope', '$log', '$translate', '$timeout', '$q', '$interval'
     , 'apiInterceptor', 'Upload', 'citImportDataService', 'SweetAlert', 'uiGridConstants', '$uibModal'
-    , 'vatSessionService', 'enums', 'vatOperationLogService','$anchorScroll','$location',
+    , 'vatSessionService', 'enums', 'vatOperationLogService','templateService',
     function ($scope, $log, $translate, $timeout, $q, $interval
         , apiInterceptor, Upload, citImportDataService, SweetAlert, uiGridConstants, $uibModal
-        , vatSessionService, enums, vatOperationLogService, $anchorScroll,$location) {
+        , vatSessionService, enums, vatOperationLogService, templateService) {
         'use strict';
         // $anchorScroll.yOffset=55;
         // $location.hash('top');
@@ -384,6 +384,36 @@ debugger;
             ele1.datepicker("setDate", $scope.selectedDate);
         };
 
+        $scope.downloadTemplate = function () {
+            debugger;
+            templateService.citDownloadTemplate(constant.citImportFileType.JournalAdjust).success(function (data, status, headers) {
+                var octetStreamMime = 'application/octet-stream';
+                var contentType = headers('content-type') || octetStreamMime;
+                if (window.navigator.msSaveBlob) {
+                    var blob = new Blob([data], {
+                        type: contentType
+                    });
+                    navigator.msSaveBlob(blob, "AdjustmentTable");
+                } else {
+                    var urlCreator = window.URL || window.webkitURL || window.mozURL || window.msURL;
+                    if (urlCreator) {
+                        var a = document.createElement('a');
+                        var blob = new Blob([data], {
+                            type: contentType
+                        });
+                        var url = urlCreator.createObjectURL(blob);
+                        a.href = url;
+                        a.target = '_blank';
+                        a.download = "JournalAdjust.xlsx";
+                        document.body.appendChild(a);
+                        a.click();
+                    }
+                }
+            }).error(function () {
+                SweetAlert.error($translate.instant('PleaseContactAdministrator'));
+            });
+        };
+
         //开始
         (function initialize() {
 debugger;

atms-web/src/main/webapp/app/common/controls/import/import-cit-journal-adjust/import-cit-journal-adjust.js

@@ -14,6 +14,7 @@
             controller: 'importCitJournalAdjustController',
             link: function (scope, element) {
                 $('.main-contents')[0].style.width = "260px";
+                $('.data-import-contents')[0].style.display = "block";
                 $('.main-contents')[0].style.float = "left";
                 $('.main-contents')[0].style.styleFloat = "left";
                 $('.main-contents')[0].style.cssFloat = "left";

atms-web/src/main/webapp/app/common/controls/import/import-cit-profit-prc-adjust/import-cit-profit-prc-adjust.ctrl.js

 commonModule.controller('importCitProfitPrcAdjustCon', ['$scope', '$log', '$translate', '$timeout', '$q', '$interval'
     , 'apiInterceptor', 'Upload', 'citImportDataService', 'SweetAlert', 'uiGridConstants', '$uibModal'
-    , 'vatSessionService', 'enums', 'vatOperationLogService','$anchorScroll','$location',
+    , 'vatSessionService', 'enums', 'vatOperationLogService','templateService',
     function ($scope, $log, $translate, $timeout, $q, $interval
         , apiInterceptor, Upload, citImportDataService, SweetAlert, uiGridConstants, $uibModal
-        , vatSessionService, enums, vatOperationLogService, $anchorScroll,$location) {
+        , vatSessionService, enums, vatOperationLogService, templateService) {
         'use strict';
         // $anchorScroll.yOffset=55;
         // $location.hash('top');
@@ -383,6 +383,36 @@
             ele1.datepicker("setDate", $scope.selectedDate);
         };
 
+        $scope.downloadTemplate = function () {
+            debugger;
+            templateService.citDownloadTemplate(constant.citImportFileType.ProfitPrcAdjust).success(function (data, status, headers) {
+                var octetStreamMime = 'application/octet-stream';
+                var contentType = headers('content-type') || octetStreamMime;
+                if (window.navigator.msSaveBlob) {
+                    var blob = new Blob([data], {
+                        type: contentType
+                    });
+                    navigator.msSaveBlob(blob, "AdjustmentTable");
+                } else {
+                    var urlCreator = window.URL || window.webkitURL || window.mozURL || window.msURL;
+                    if (urlCreator) {
+                        var a = document.createElement('a');
+                        var blob = new Blob([data], {
+                            type: contentType
+                        });
+                        var url = urlCreator.createObjectURL(blob);
+                        a.href = url;
+                        a.target = '_blank';
+                        a.download = "ProfitPrcAdjust.xlsx";
+                        document.body.appendChild(a);
+                        a.click();
+                    }
+                }
+            }).error(function () {
+                SweetAlert.error($translate.instant('PleaseContactAdministrator'));
+            });
+        };
+
         //开始
         (function initialize() {
             debugger;

atms-web/src/main/webapp/app/common/controls/import/import-cit-profit-prc-adjust/import-cit-profit-prc-adjust.js

@@ -14,6 +14,7 @@
             controller: 'importCitProfitPrcAdjustCon',
             link: function (scope, element) {
                 $('.main-contents')[0].style.width = "260px";
+                $('.data-import-contents')[0].style.display = "block";
                 $('.main-contents')[0].style.float = "left";
                 $('.main-contents')[0].style.styleFloat = "left";
                 $('.main-contents')[0].style.cssFloat = "left";

atms-web/src/main/webapp/app/common/controls/import/import-cit-salary-advance/import-cit-salary-advance.ctrl.js

 commonModule.controller('importCitSalaryAdvanceCon', ['$scope', '$log', '$translate', '$timeout', '$q', '$interval'
     , 'apiInterceptor', 'Upload', 'citImportDataService', 'SweetAlert', 'uiGridConstants', '$uibModal'
-    , 'vatSessionService', 'enums', 'vatOperationLogService','$anchorScroll','$location',
+    , 'vatSessionService', 'enums', 'vatOperationLogService','templateService',
     function ($scope, $log, $translate, $timeout, $q, $interval
         , apiInterceptor, Upload, citImportDataService, SweetAlert, uiGridConstants, $uibModal
-        , vatSessionService, enums, vatOperationLogService, $anchorScroll,$location) {
+        , vatSessionService, enums, vatOperationLogService, templateService) {
         'use strict';
         // $anchorScroll.yOffset=55;
         // $location.hash('top');
@@ -383,6 +383,36 @@
             ele1.datepicker("setDate", $scope.selectedDate);
         };
 
+        $scope.downloadTemplate = function () {
+            debugger;
+            templateService.citDownloadTemplate(constant.citImportFileType.SalaryAdvance).success(function (data, status, headers) {
+                var octetStreamMime = 'application/octet-stream';
+                var contentType = headers('content-type') || octetStreamMime;
+                if (window.navigator.msSaveBlob) {
+                    var blob = new Blob([data], {
+                        type: contentType
+                    });
+                    navigator.msSaveBlob(blob, "AdjustmentTable");
+                } else {
+                    var urlCreator = window.URL || window.webkitURL || window.mozURL || window.msURL;
+                    if (urlCreator) {
+                        var a = document.createElement('a');
+                        var blob = new Blob([data], {
+                            type: contentType
+                        });
+                        var url = urlCreator.createObjectURL(blob);
+                        a.href = url;
+                        a.target = '_blank';
+                        a.download = "SalaryAdvance.xlsx";
+                        document.body.appendChild(a);
+                        a.click();
+                    }
+                }
+            }).error(function () {
+                SweetAlert.error($translate.instant('PleaseContactAdministrator'));
+            });
+        };
+
         //开始
         (function initialize() {
             debugger;

atms-web/src/main/webapp/app/common/controls/import/import-cit-salary-advance/import-cit-salary-advance.js

@@ -14,6 +14,7 @@
             controller: 'importCitSalaryAdvanceCon',
             link: function (scope, element) {
                 $('.main-contents')[0].style.width = "260px";
+                $('.data-import-contents')[0].style.display = "block";
                 $('.main-contents')[0].style.float = "left";
                 $('.main-contents')[0].style.styleFloat = "left";
                 $('.main-contents')[0].style.cssFloat = "left";

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

 commonModule.controller('importCitTrialBalanceController', ['$scope', '$log', '$translate', '$timeout', '$q', '$interval'
     , 'apiInterceptor', 'Upload', 'citImportDataService', 'SweetAlert', 'uiGridConstants', '$uibModal'
-    , 'vatSessionService', 'enums', 'vatOperationLogService','$anchorScroll','$location',
+    , 'vatSessionService', 'enums', 'vatOperationLogService','templateService',
     function ($scope, $log, $translate, $timeout, $q, $interval
         , apiInterceptor, Upload, citImportDataService, SweetAlert, uiGridConstants, $uibModal
-        , vatSessionService, enums, vatOperationLogService, $anchorScroll,$location) {
+        , vatSessionService, enums, vatOperationLogService, templateService) {
         'use strict';
         // $anchorScroll.yOffset=55;
         // $location.hash('top');
@@ -383,6 +383,36 @@
             ele1.datepicker("setDate", $scope.selectedDate);
         };
 
+        $scope.downloadTemplate = function () {
+            debugger;
+            templateService.citDownloadTemplate(constant.citImportFileType.TrialBalance).success(function (data, status, headers) {
+                var octetStreamMime = 'application/octet-stream';
+                var contentType = headers('content-type') || octetStreamMime;
+                if (window.navigator.msSaveBlob) {
+                    var blob = new Blob([data], {
+                        type: contentType
+                    });
+                    navigator.msSaveBlob(blob, "TrialBalance");
+                } else {
+                    var urlCreator = window.URL || window.webkitURL || window.mozURL || window.msURL;
+                    if (urlCreator) {
+                        var a = document.createElement('a');
+                        var blob = new Blob([data], {
+                            type: contentType
+                        });
+                        var url = urlCreator.createObjectURL(blob);
+                        a.href = url;
+                        a.target = '_blank';
+                        a.download = "TrialBalance.xlsx";
+                        document.body.appendChild(a);
+                        a.click();
+                    }
+                }
+            }).error(function () {
+                SweetAlert.error($translate.instant('PleaseContactAdministrator'));
+            });
+        };
+
         //开始
         (function initialize() {
             debugger;

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

@@ -14,6 +14,7 @@
             controller: 'importCitTrialBalanceController',
             link: function (scope, element) {
                 $('.main-contents')[0].style.width = "260px";
+                $('.data-import-contents')[0].style.display = "block";
                 $('.main-contents')[0].style.float = "left";
                 $('.main-contents')[0].style.styleFloat = "left";
                 $('.main-contents')[0].style.cssFloat = "left";

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

@@ -2,408 +2,11 @@
 webservices.factory('citImportDataService', ['$http', 'apiConfig', function ($http, apiConfig) {
     'use strict';
     return {
-        sample: function () {
-            return $http.get('url', apiConfig.createVat());
-        },
-        /************************************************input invoice*********************************************************/
-        importInputInvoiceData: function (inputInvoiceList, importType) {
-            return $http.post('/inputInvoiceImport/importInputInvoice',
-                { InputInvoiceList: inputInvoiceList, ImportType: importType }, apiConfig.createVat());
-        },
-        getInputInvoiceList: function (period) {
-            return $http.get('/inputInvoiceImport/getInputInvoiceList/' + period, apiConfig.createVat());
-        },
-        deleteInputInvoiceDuplicateData: function (invoiceIDs) {
-            return $http.post('/inputInvoiceImport/deleteDuplicateData', invoiceIDs, apiConfig.createVat());
-        },
-        validateInputInvoiceInfo: function (period) {
-            return $http.get('/inputInvoiceImport/validateInputInvoiceInfo/' + period, apiConfig.createVat());
-        },
-        clearInputInvoiceData: function (period) {
-            return $http.get('/inputInvoiceImport/clearInputInvoiceData/' + period, apiConfig.createVat());
-        },
-
-        /************************************************input invoice item*********************************************************/
-        importInputInvoiceItemData: function (inputInvoiceItemList, importType) {
-            return $http.post('/inputInvoiceImport/importInputInvoiceItem',
-                { InputInvoiceItemList: inputInvoiceItemList, ImportType: importType }, apiConfig.createVat());
-        },
-        getInputInvoiceItemList: function (period) {
-            return $http.get('/inputInvoiceImport/getInputInvoiceItemList/' + period, apiConfig.createVat());
-        },
-        validateInputInvoiceItemInfo: function (period) {
-            return $http.get('/inputInvoiceImport/validateInputInvoiceItemInfo/' + period, apiConfig.createVat());
-        },
-        clearInputInvoiceItemData: function (period) {
-            return $http.get('/inputInvoiceImport/clearInputInvoiceItemData/' + period, apiConfig.createVat());
-        },
-
-        /************************************************journal entry*********************************************************/
-        importJournalEntryData: function (journalEntryList, importType) {
-            return $http.post('/journalEntryImport/importJournalEntry', { VoucherList: journalEntryList, ImportType: importType }, apiConfig.createVat());
-        },
-        getValidationDtoInfo: function (type, period) {
-            return $http.get('/journalEntryImport/getValidationInfo/' + type + '/' + period, apiConfig.createVat());
-        },
-        getJournalEntryData: function (period) {
-            return $http.get('/journalEntryImport/getJournalEntryData/' + period, apiConfig.createVat());
-        },
-
-        queryJournalEntryData: function (queryDto) {
-            return $http.post('/journalEntryImport/queryJournalEntryData', {
-                PageInfo: queryDto.pageInfo,
-                PeriodId: queryDto.periodId,
-            }, apiConfig.createVat());
-        },
-
-        deleteAdjustAudit: function (deleteDto){
-            return $http.post('/journalEntryImport/deleteAdjustAudit',
-                {
-                    ServiceTypeId: deleteDto.serviceTypeId,
-                    PeriodIds: deleteDto.periodIds
-                }, apiConfig.createVat());
-        },
-
-        deleteJournalEntryData: function (voucherIDs) {
-            return $http.post('/journalEntryImport/deleteDuplicateData', voucherIDs, apiConfig.createVat());
-        },
-        validateJournalEntryData: function (period) {
-            return $http.get('/journalEntryImport/validateJournalEntryData/' + period, apiConfig.createVat());
-        },
-        clearJournalEntryData: function (period) {
-            return $http.get('/journalEntryImport/clearJournalEntryData/' + period, apiConfig.createVat());
-        },
-
-
-        //auditAdjust
-        ImportAuditAdjust: function (list, period, importType) {
-            return $http.post('/journalEntryImport/importAuditAdjust/' + period, { VoucherList: list, ImportType: importType }, apiConfig.createVat());
-        },
-        GetAuditAdjust: function (period) {
-            return $http.get('/journalEntryImport/getAuditAdjust/' + period, apiConfig.createVat());
-        },
-
-        queryAuditAdjust: function (queryDto) {
-            return $http.post('/journalEntryImport/queryAuditAdjust', {
-                PageInfo: queryDto.pageInfo,
-                PeriodId: queryDto.periodId,
-            }, apiConfig.createVat());
-        },
-
-        IsImportAuditAdjustOnly: function(projectId,periodId){
-            return $http.get('/journalEntryImport/isImportAuditAdjustOnly/' + projectId + '/' + periodId, apiConfig.createVat());
-        },
-
-        /************************************************Import output*********************************************************/
-
-        importOutputInvoiceData: function (outputInvoiceList, outputInvoiceItemList, importType) {
-            return $http.post('/outputInvoiceImport/importOutputInvoice',
-                { OutputInvoiceList: outputInvoiceList, OutputInvoiceItemList: outputInvoiceItemList, ImportType: importType }, apiConfig.createVat());
-        },
-        importOutputValidate: function (outputInvoiceList) {
-            return $http.post('/outputInvoiceImport/importValidate', outputInvoiceList, apiConfig.createVat());
-        },
-        getOutputInvoiceList: function (period) {
-            return $http.get('/outputInvoiceImport/getOutputInvoiceList' + '/' + period, apiConfig.createVat());
-        },
-        deleteOutputDupData: function (invoiceIDs) {
-            return $http.post('/outputInvoiceImport/deleteOutputDuplicateData', invoiceIDs, apiConfig.createVat());
-        },
-        refreshOutputInvoice: function (period) {
-            return $http.get('/outputInvoiceImport/refreshOutputInvoice/' + period, apiConfig.createVat());
-        },
-        clearOutputData: function (periodID) {
-            return $http.get('/outputInvoiceImport/clearOutputData/' + periodID, apiConfig.createVat());
-        },
-
-        /************************************************Import Evidence*********************************************************/
-        getEvidenceList: function (param) {
-            return $http.post('/outputInvoiceImport/getEvidenceList', {
-                QueryType: param.queryType,
-                QueryString: param.queryString,
-                IsCurrentPeriod: param.isCurrentPeriod,
-                PeriodId: param.periodId
-            }, apiConfig.createVat());
-        },
-        deleteEvidences: function (evidencelist) {
-            return $http.post('/outputInvoiceImport/deleteEvidences', evidencelist, apiConfig.createVat());
-        },
-        downloadEvidence: function (param) {
-            return $http.post('/outputInvoiceImport/DownLoadEvidence', {
-                filePath: param.filePath,
-                fileName: param.fileName
-            }, apiConfig.createVat({ responseType: 'arraybuffer' }));
-        },
-
-
-        /************************************************Tb entry*********************************************************/
-        deleteTbData: function (periodID) {
-            return $http.get('/DataImport/ClearTbData/' + periodID, apiConfig.createVat());
-        },
-
-        clearServiceTbData: function (dto){
-            return $http.post('/DataImport/ClearServiceTbData', {
-                ServiceTypeId: dto.serviceTypeId,
-                Periods: dto.periods,
-                ProjectId: dto.projectId
-            }, apiConfig.createVat());
-        },
-
-        clearErpData: function (periodId) {
-            return $http.get('/financeImportData/clearErpTable/' + periodId, apiConfig.create());
-        },
-        updatePeriodStatus: function (queryImportDto) {
-            return $http.post('/ProjectInfo/updatePeriodStatus', {
-                serviceTypeId: queryImportDto.serviceTypeId,
-                periods: queryImportDto.periods,
-                projectId: queryImportDto.projectId,
-                importTypeId: queryImportDto.importTypeId
-            }, apiConfig.createVat());
-        },
-        //此处是vat系统，默认servcieType = 2
-        getImportType: function (projectID, periodID) {
-            return $http.get('/ProjectInfo/getImportType/' + projectID + '/' + periodID + '/' + constant.serviceType.VAT, apiConfig.createVat());
-        },
-        getFileContent: function (tempFileName, selectedSheetIndex, topRowNumber) {
-            return $http.get('/DataImport/FileContent/' + tempFileName + '/' + selectedSheetIndex + '/' + topRowNumber, apiConfig.createVat());
-        },
-        //getFileContentByDbName: function(tempFileName, selectedSheetIndex,topRowNumber){
-        //    return $http.get('/DataImport/FileContent/' + tempFileName + '/' + selectedSheetIndex + '/' + topRowNumber, apiConfig.createVat({dbName:dbName}));
-        //},
-        importBalanceList: function (balanceList, importType,serviceTypeId) {
-            return $http.post('/DataImport/ImportBalance', { balanceList: balanceList, importType: importType, serviceTypeId: serviceTypeId }, apiConfig.createVat());
-        },
-        getBalanceList: function (period,projectId) {
-            return $http.get('/DataImport/GetBalanceList/' + period + '/' + projectId, apiConfig.createVat());
-        },
-
-        queryTrialBalanceData: function(queryDto){
-            return $http.post('/DataImport/queryTrialBalanceData', {
-                PageInfo: queryDto.pageInfo,
-                PeriodId: queryDto.periodId,
-                ProjectId: queryDto.projectId,
-                ServiceTypeId: queryDto.serviceTypeId
-            }, apiConfig.createVat());
-        },
-
-        deleteDuplicateTbData: function (balanceIds) {
-            return $http.post('/DataImport/DeleteDuplicateTbData', balanceIds, apiConfig.createVat());
-        },
-        refreshTrialBalance: function (period,serviceTypeId) {
-            return $http.get('/DataImport/RefreshTrialBalance/' + period + "/" + serviceTypeId, apiConfig.createVat());
-        },
-
-        refreshTrialBalancePeriods: function (queryDto) {
-            return $http.post('/DataImport/RefreshTrialBalancePeriods', {
-                Periods: queryDto.periods,
-                ServiceTypeId: queryDto.serviceTypeId
-            }, apiConfig.createVat());
-        },
-
-        getValidationList: function (type, period) {
-            return $http.get('/DataImport/GetValidationList/' + type + '/' + period, apiConfig.createVat());
-        },
-
-        getServiceValidationList : function (type, period, serviceTypeId, projectId){
-            return $http.get('/DataImport/GetServiceValidationList/' + type + '/' + period + '/' + serviceTypeId + '/' + projectId, apiConfig.createVat());
-        },
-
-        getTBImportedPeriods: function (projectId, serviceTypeId) {
-            return $http.get("/DataImport/getTBImportedPeriods/" + projectId + '/' + serviceTypeId, apiConfig.createVat());
-        },
-
-        isImportData: function (projectId, importTypeId) {
-            return $http.get('/ProjectInfo/isProjectImportedData/' + projectId + '/' + importTypeId, apiConfig.createVat());
-        },
-
-        getProjectImportType: function (queryImportType) {
-            return $http.post('/ProjectInfo/getProjectImportType', {
-                serviceTypeId: queryImportType.serviceTypeId,
-                periods: queryImportType.periods,
-                projectId: queryImportType.projectId
-            }, apiConfig.createVat());
-        },
-
-        clearTableByPeriods: function (periods) {
-            return $http.post("/DataImport/clearTableByPeriods", { periods: periods }, apiConfig.createVat());
-        },
-
-        getAdjustAuditPeriods: function () {
-            return $http.get("/journalEntryImport/getAdjustAuditPeriods", apiConfig.createVat());
-        },
-
-        validateJournalEntryByPeriods: function () {
-            return $http.get("/journalEntryImport/validateJournalEntryByPeriods", apiConfig.createVat());
-        },
-
-
-        /****************************************************************************************************/
-        /* Tony's Beatup services */
-        getBalanceDataForDisplay: function (category, fromPeriod, toPeriod, criteria, orgId) {
-            return $http.post('/DataImport/GetBalanceDataForDisplay', {
-                category: category,
-                fromPeriod: fromPeriod,
-                toPeriod: toPeriod,
-                criteria: criteria,
-                orgId: orgId
-            }, apiConfig.createVat());
-            // return $http.get('/DataImport/GetBalanceDataForDisplay?category=' + category + '&fromPeriod=' + fromPeriod + '&toPeriod=' + toPeriod + '&criteria=' + criteria, apiConfig.createVat());
-        },
-
-        queryGlBalance: function (fromPeriod, toPeriod, orgId) {
-            return $http.post('/DataImport/queryGlBalance', {
-                fromPeriod: fromPeriod,
-                toPeriod: toPeriod,
-                orgId: orgId
-            }, apiConfig.createVat());
-        },
-
-        updateACustomPrice: function (customId, invoiceAmount) {
-            return $http.get('/CustomsInvoice/UpdateACustomPrice?customId=' + customId + '&invoiceAmount=' + invoiceAmount, apiConfig.createVat());
-        },
-
-        getCustomsInvoiceDataForDisplay: function (fromPeriod, toPeriod, criteria, pagination) {
-            return $http.get('/CustomsInvoice/GetCustomsInvoiceDataForDisplay?fromPeriod=' + fromPeriod + '&toPeriod=' + toPeriod + '&criteria=' + criteria + '&pagination=' + pagination, apiConfig.createVat());
-        },
-        getExportCustomInvoiceList: function (criteria) {
-            return $http.post('/CustomsInvoice/ExportQueryData/get?criteria=' + criteria, {},apiConfig.createVat({ responseType: 'arraybuffer' }));
-        },
-        getParentCodesForDisplay: function (category) {
-            return $http.get('/DataImport/GetParentCodesForDisplay?category=' + category , apiConfig.createVat());
-        },
-
-        /* workflow */
-        getVoucherList: function (param) {
-            return $http.post('/outputInvoiceImport/getVoucherList', {
-                QueryType: param.queryType,
-                QueryString: param.queryString,
-                IsCurrentPeriod: param.isCurrentPeriod,
-                PeriodId: param.periodId
-            }, apiConfig.createVat());
-        },
-        updateEvidencesComments: function (commentsWithFileId) {
-            return $http.post('/outputInvoiceImport/updateEvidencesComments', commentsWithFileId, apiConfig.createVat());
-        },
-
-        getJePeriods: function () {
-            return $http.get("/journalEntryImport/getJePeriods", apiConfig.createVat());
-        },
-
-        /************************************************Mappings*********************************************************/
-        SaveVourcherMappings: function (list, period, isAddition) {
-            return $http.post('/vimapping/savevmappings' + '/' + period + '/' + isAddition, list, apiConfig.createVat());
-        },
-        GetVourcherMappings: function (period) {
-            return $http.get('/vimapping/getvmappings' + '/' + period, apiConfig.createVat());
-        },
-        SaveInvoiceMappings: function (list, period, isAddition) {
-            return $http.post('/vimapping/saveimappings' + '/' + period + '/' + isAddition, list, apiConfig.createVat());
-        },
-        GetInvoiceMappings: function (period) {
-            return $http.get('/vimapping/getimappings' + '/' + period, apiConfig.createVat());
-        },
-        deleteVourcherMappings: function (ids) {
-            return $http.post('/vimapping/deletevmappings', ids, apiConfig.createVat());
-        },
-        validDBVoucherMapping: function (period) {
-            return $http.post('/vimapping/validvmappings/' + '/' + period, null, apiConfig.createVat());
-        },
-        deleteInvoiceMappings: function (ids) {
-            return $http.post('/vimapping/deleteimappings', ids, apiConfig.createVat());
-        },
-        validDBInvoiceMapping: function (period) {
-            return $http.post('/vimapping/validimappings/' + '/' + period, null, apiConfig.createVat());
-        },
-
-        /************************************************CustomsInvoice*********************************************************/
-        importCustomsInvoiceList: function (custList, importType) {
-            return $http.post('/CustomsInvoice/ImportCustomsInvoice', { customsList: custList, importType: importType }, apiConfig.createVat());
-        },
-
-        getCustomsInvoiceList: function () {
-            return $http.get('/CustomsInvoice/GetCustomsInvoices', apiConfig.createVat());
-        },
-
-        getCustomsInvoicesByPeriodId: function (periodId) {
-            return $http.get('/CustomsInvoice/GetCustomsInvoicesByPeriodId/' + periodId, apiConfig.createVat());
-        },
-
-        deleteCustomsInvoicesByPeriodId: function (periodId) {
-            return $http.get('/CustomsInvoice/DeleteCustomsInvoices/' + periodId, apiConfig.createVat());
-        },
-
-        getCustomsInvoicesValidates: function (periodId) {
-            return $http.get('/CustomsInvoice/getCustomsInvoicesValidates/' + periodId, apiConfig.createVat());
-        },
-
-        getPayNumDuplicateDetails: function () {
-            return $http.get('/CustomsInvoice/getPayNumDuplicateDetails', apiConfig.createVat());
-        },
-
-        deleteCustomInvoiceByIds: function (customsIds) {
-            return $http.post('/CustomsInvoice/deleteCustomInvoiceByIds',customsIds,apiConfig.createVat());
-        },
-
-        updateCustomsInvoiceValidation: function (periodId) {
-            return $http.get('/CustomsInvoice/updateCustomsInvoiceValidation/'+ periodId,apiConfig.createVat());
-        },
-
-
-        /************************************************CustomsInvoice*********************************************************/
-        /***************************************批量数据导入服务 start**************************************************************/
-        getAllTables: function (serviceType) {
-            return $http.get('/DataImport/getAllTables/' + serviceType, apiConfig.createVat());
-        },
-        getTableInfoList: function (serviceType, orgID) {
-            return $http.get('/DataImport/getTableInfoList/' + serviceType + '/' + orgID, apiConfig.createVat());
-        },
-        getMappedList: function (tableInfoId, orgID) {
-            return $http.get('/DataImport/getMappedList/' + tableInfoId + '/' + orgID, apiConfig.createVat());
-        },
-
-
-        getTableMenuList: function () {
-            return $http.get('/DataImport/getTableMenuList', apiConfig.createVat());
-        },
-
-        getTempFileContent: function (tempFileName, selectedSheetIndex, topRowNumber) {
-            return $http.get('/DataImport/TempFileContent/' + tempFileName + '/' + selectedSheetIndex + '/' + topRowNumber, apiConfig.createVat());
-        },
-
-        importData: function (importDto) {
-            return $http.post('/DataImport/importData', importDto, apiConfig.createVat());
-        },
-
-        GetDataFromExcelByChunk: function (ChunkDto) {
-            return $http.post('/DataImport/getDataFromExcelByChunk', ChunkDto, apiConfig.createVat());
-        },
-
-        GetDataFromExcelByChunkByBack: function (ChunkDto) {
-            return $http.post('/DataImport/getDataFromExcelByChunkByBack', ChunkDto, apiConfig.createVat());
-        },
-
-        getImportedData: function (queryDto) {
-            return $http.post('/DataImport/getImportedData', queryDto, apiConfig.createVat());
-        },
-        getFilterImportedData: function (queryDto) {
-            return $http.post('/DataImport/getFilterImportedData', queryDto, apiConfig.createVat());
-        },
-        getSelectedFilterImportedData: function (queryDto) {
-            return $http.post('/DataImport/getSelectedFilterImportedData', queryDto, apiConfig.createVat());
-        },
-        getPeriodList: function (tableInfoId) {
-            return $http.get('/DataImport/getPeriodList/' + tableInfoId, apiConfig.createVat());
-        },
-        deleteDataByPeriod: function (period, tableInfoId) {
-            return $http.get('/DataImport/deleteDataByPeriod/' + period + '/' + tableInfoId, apiConfig.createVat());
-        },
-        /***************************************批量数据导入服务 end**************************************************************/
-
         /***************************************批量数据导入服务(真) start**************************************************************/
 
         getCitDataImportLog: function (type) {
             return $http.get('/citImport/getCitDataImportLog?type=' + type, apiConfig.create());
-        }
+        },
         /***************************************批量数据导入服务(真) end**************************************************************/
 
     };

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

@@ -128,6 +128,9 @@ webservices.factory('templateService', ['$log', '$http', '$q', 'apiConfig', 'htt
             getTemplateJson: getTemplateJson,
             downloadTemplate: function (fileType) {
                 return $http.get('/template/file/downloadTemplate?fileType=' + fileType , apiConfig.create({ responseType: 'arraybuffer' }));
+            },
+            citDownloadTemplate: function (fileType) {
+                return $http.get('/template/file/downloadTemplate?fileType=' + fileType + '&serviceType=' + 1 , apiConfig.create({ responseType: 'arraybuffer' }));
             }
         };
     }]);
\ No newline at end of file