CIT数据导入功能模块

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

@@ -168,7 +168,7 @@ public class AssetListServiceImpl extends BaseService {
         Set assetNameSet = new HashSet();
         List<CitAssetGroupResult> citAssetGroupResults = selectGroupResult(projectId);
 
-        StringBuilder periodSb = CitCommonUtil.getPeriod();
+        Integer period = CitCommonUtil.getPeriod();
         List<CitAssetsList> citAssetsLists = new ArrayList<>();
         StringBuilder errorMsgSb = new StringBuilder("第");
         //通过循环来完成sheet获取每一行每一列数据并进行相关逻辑处理
@@ -178,7 +178,7 @@ public class AssetListServiceImpl extends BaseService {
             //赋值projectId
             citAsset.setProjectId(projectId);
 
-            citAsset.setPeriod(Integer.valueOf(periodSb.toString()));
+            citAsset.setPeriod(Integer.valueOf(period));
 
             //获取该行数据
             Row rowData = sheet.getRow(rowNum);
@@ -213,7 +213,7 @@ public class AssetListServiceImpl extends BaseService {
             CitAssetGroupResult citAssetGroupResult = new CitAssetGroupResult();
             citAssetGroupResult.setId(idService.nextId());
             citAssetGroupResult.setProjectId(projectId);
-            citAssetGroupResult.setPeriod(Integer.valueOf(periodSb.toString()));
+            citAssetGroupResult.setPeriod(Integer.valueOf(period));
             citAssetGroupResult.setAssetName(it.next());
             assetGroupResultMapper.insertSelective(citAssetGroupResult);
         }
@@ -245,7 +245,6 @@ public class AssetListServiceImpl extends BaseService {
         citAsset.setAssetGroupName(assetName);
 
         //获取购入日期
-        Date date = new Date();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         citAsset.setBuyDate(sdf.parse(CitCommonUtil.getValue(rowData.getCell(15)).toString()));
         //获取开始折旧日期,DD没有提供，我们要根据购入日期和税法分类做预处理自己转化

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

 package pwc.taxtech.atms.service.impl;
 
 import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.CellType;
 
 import java.util.Calendar;
 
@@ -13,7 +14,7 @@ public class CitCommonUtil {
      * 计算当前期间
      * @return
      */
-    public static StringBuilder getPeriod(){
+    public static Integer getPeriod(){
         //计算当前期间
         Calendar now = Calendar.getInstance();
         StringBuilder sb = new StringBuilder();
@@ -22,7 +23,7 @@ public class CitCommonUtil {
             sb.append(0);
         }
         sb.append(now.get(Calendar.MONTH) + 1);
-        return sb;
+        return Integer.valueOf(sb.toString());
     }
 
 
@@ -33,6 +34,9 @@ public class CitCommonUtil {
      */
     public static Object getValue(Cell cell) {
         Object obj = null;
+        if(cell == null){
+            return obj;
+        }
         switch (cell.getCellTypeEnum()) {
             case BOOLEAN:
                 obj = cell.getBooleanCellValue();

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

@@ -89,6 +89,17 @@ public class CitSalaryAdvance extends BaseEntity implements Serializable {
      */
     private String poSubjectCode;
 
+    /**
+     * Database Column Remarks:
+     *   PO主体名称
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cit_salary_advance.po_subject_name
+     *
+     * @mbg.generated
+     */
+    private String poSubjectName;
+
     /**
      * Database Column Remarks:
      *   预提
@@ -331,6 +342,30 @@ public class CitSalaryAdvance extends BaseEntity implements Serializable {
         this.poSubjectCode = poSubjectCode == null ? null : poSubjectCode.trim();
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column cit_salary_advance.po_subject_name
+     *
+     * @return the value of cit_salary_advance.po_subject_name
+     *
+     * @mbg.generated
+     */
+    public String getPoSubjectName() {
+        return poSubjectName;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column cit_salary_advance.po_subject_name
+     *
+     * @param poSubjectName the value for cit_salary_advance.po_subject_name
+     *
+     * @mbg.generated
+     */
+    public void setPoSubjectName(String poSubjectName) {
+        this.poSubjectName = poSubjectName == null ? null : poSubjectName.trim();
+    }
+
     /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column cit_salary_advance.advance
@@ -494,6 +529,7 @@ public class CitSalaryAdvance extends BaseEntity implements Serializable {
         sb.append(", source=").append(source);
         sb.append(", poNo=").append(poNo);
         sb.append(", poSubjectCode=").append(poSubjectCode);
+        sb.append(", poSubjectName=").append(poSubjectName);
         sb.append(", advance=").append(advance);
         sb.append(", approvedStandardInvoiceAmount=").append(approvedStandardInvoiceAmount);
         sb.append(", createdBy=").append(createdBy);

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

@@ -656,6 +656,76 @@ public class CitSalaryAdvanceExample {
             return (Criteria) this;
         }
 
+        public Criteria andPoSubjectNameIsNull() {
+            addCriterion("po_subject_name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPoSubjectNameIsNotNull() {
+            addCriterion("po_subject_name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPoSubjectNameEqualTo(String value) {
+            addCriterion("po_subject_name =", value, "poSubjectName");
+            return (Criteria) this;
+        }
+
+        public Criteria andPoSubjectNameNotEqualTo(String value) {
+            addCriterion("po_subject_name <>", value, "poSubjectName");
+            return (Criteria) this;
+        }
+
+        public Criteria andPoSubjectNameGreaterThan(String value) {
+            addCriterion("po_subject_name >", value, "poSubjectName");
+            return (Criteria) this;
+        }
+
+        public Criteria andPoSubjectNameGreaterThanOrEqualTo(String value) {
+            addCriterion("po_subject_name >=", value, "poSubjectName");
+            return (Criteria) this;
+        }
+
+        public Criteria andPoSubjectNameLessThan(String value) {
+            addCriterion("po_subject_name <", value, "poSubjectName");
+            return (Criteria) this;
+        }
+
+        public Criteria andPoSubjectNameLessThanOrEqualTo(String value) {
+            addCriterion("po_subject_name <=", value, "poSubjectName");
+            return (Criteria) this;
+        }
+
+        public Criteria andPoSubjectNameLike(String value) {
+            addCriterion("po_subject_name like", value, "poSubjectName");
+            return (Criteria) this;
+        }
+
+        public Criteria andPoSubjectNameNotLike(String value) {
+            addCriterion("po_subject_name not like", value, "poSubjectName");
+            return (Criteria) this;
+        }
+
+        public Criteria andPoSubjectNameIn(List<String> values) {
+            addCriterion("po_subject_name in", values, "poSubjectName");
+            return (Criteria) this;
+        }
+
+        public Criteria andPoSubjectNameNotIn(List<String> values) {
+            addCriterion("po_subject_name not in", values, "poSubjectName");
+            return (Criteria) this;
+        }
+
+        public Criteria andPoSubjectNameBetween(String value1, String value2) {
+            addCriterion("po_subject_name between", value1, value2, "poSubjectName");
+            return (Criteria) this;
+        }
+
+        public Criteria andPoSubjectNameNotBetween(String value1, String value2) {
+            addCriterion("po_subject_name not between", value1, value2, "poSubjectName");
+            return (Criteria) this;
+        }
+
         public Criteria andAdvanceIsNull() {
             addCriterion("advance is null");
             return (Criteria) this;

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

@@ -13,6 +13,7 @@
     <result column="source" jdbcType="VARCHAR" property="source" />
     <result column="po_no" jdbcType="INTEGER" 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" />
     <result column="approved_standard_invoice_amount" jdbcType="DECIMAL" property="approvedStandardInvoiceAmount" />
     <result column="created_by" jdbcType="VARCHAR" property="createdBy" />
@@ -91,8 +92,8 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    id, organization_id, project_id, period, source, po_no, po_subject_code, advance, 
-    approved_standard_invoice_amount, created_by, updated_by, create_time, update_time
+    id, organization_id, project_id, period, source, po_no, po_subject_code, po_subject_name, 
+    advance, approved_standard_invoice_amount, created_by, updated_by, create_time, update_time
   </sql>
   <select id="selectByExample" parameterType="pwc.taxtech.atms.entity.CitSalaryAdvanceExample" resultMap="BaseResultMap">
     <!--
@@ -147,14 +148,16 @@
     -->
     insert into cit_salary_advance (id, organization_id, project_id, 
       period, source, po_no, 
-      po_subject_code, advance, approved_standard_invoice_amount, 
-      created_by, updated_by, create_time, 
-      update_time)
+      po_subject_code, po_subject_name, advance, 
+      approved_standard_invoice_amount, created_by, 
+      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}, 
-      #{poSubjectCode,jdbcType=VARCHAR}, #{advance,jdbcType=DECIMAL}, #{approvedStandardInvoiceAmount,jdbcType=DECIMAL}, 
-      #{createdBy,jdbcType=VARCHAR}, #{updatedBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{updateTime,jdbcType=TIMESTAMP})
+      #{poSubjectCode,jdbcType=VARCHAR}, #{poSubjectName,jdbcType=VARCHAR}, #{advance,jdbcType=DECIMAL}, 
+      #{approvedStandardInvoiceAmount,jdbcType=DECIMAL}, #{createdBy,jdbcType=VARCHAR}, 
+      #{updatedBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
+      )
   </insert>
   <insert id="insertSelective" parameterType="pwc.taxtech.atms.entity.CitSalaryAdvance">
     <!--
@@ -184,6 +187,9 @@
       <if test="poSubjectCode != null">
         po_subject_code,
       </if>
+      <if test="poSubjectName != null">
+        po_subject_name,
+      </if>
       <if test="advance != null">
         advance,
       </if>
@@ -225,6 +231,9 @@
       <if test="poSubjectCode != null">
         #{poSubjectCode,jdbcType=VARCHAR},
       </if>
+      <if test="poSubjectName != null">
+        #{poSubjectName,jdbcType=VARCHAR},
+      </if>
       <if test="advance != null">
         #{advance,jdbcType=DECIMAL},
       </if>
@@ -283,6 +292,9 @@
       <if test="record.poSubjectCode != null">
         po_subject_code = #{record.poSubjectCode,jdbcType=VARCHAR},
       </if>
+      <if test="record.poSubjectName != null">
+        po_subject_name = #{record.poSubjectName,jdbcType=VARCHAR},
+      </if>
       <if test="record.advance != null">
         advance = #{record.advance,jdbcType=DECIMAL},
       </if>
@@ -319,6 +331,7 @@
       source = #{record.source,jdbcType=VARCHAR},
       po_no = #{record.poNo,jdbcType=INTEGER},
       po_subject_code = #{record.poSubjectCode,jdbcType=VARCHAR},
+      po_subject_name = #{record.poSubjectName,jdbcType=VARCHAR},
       advance = #{record.advance,jdbcType=DECIMAL},
       approved_standard_invoice_amount = #{record.approvedStandardInvoiceAmount,jdbcType=DECIMAL},
       created_by = #{record.createdBy,jdbcType=VARCHAR},
@@ -354,6 +367,9 @@
       <if test="poSubjectCode != null">
         po_subject_code = #{poSubjectCode,jdbcType=VARCHAR},
       </if>
+      <if test="poSubjectName != null">
+        po_subject_name = #{poSubjectName,jdbcType=VARCHAR},
+      </if>
       <if test="advance != null">
         advance = #{advance,jdbcType=DECIMAL},
       </if>
@@ -387,6 +403,7 @@
       source = #{source,jdbcType=VARCHAR},
       po_no = #{poNo,jdbcType=INTEGER},
       po_subject_code = #{poSubjectCode,jdbcType=VARCHAR},
+      po_subject_name = #{poSubjectName,jdbcType=VARCHAR},
       advance = #{advance,jdbcType=DECIMAL},
       approved_standard_invoice_amount = #{approvedStandardInvoiceAmount,jdbcType=DECIMAL},
       created_by = #{createdBy,jdbcType=VARCHAR},

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

@@ -3,7 +3,7 @@
 <mapper namespace="pwc.taxtech.atms.dao.CitBalanceSheetPrcAdjustMapper">
 
   <insert id="insertBatch" parameterType="java.util.List">
-    insert into balance_sheet_final
+    insert into cit_balance_sheet_prc_adjust
     (<include refid="Base_Column_List"/>)
     values
     <foreach collection="list" item="item" index="index" separator=",">
@@ -20,6 +20,10 @@
           <when test="item.projectId != null">#{item.projectId,jdbcType=VARCHAR},</when>
           <otherwise>'',</otherwise>
         </choose>
+        <choose>
+          <when test="item.period != null">#{item.period,jdbcType=INTEGER},</when>
+          <otherwise>0,</otherwise>
+        </choose>
         <choose>
           <when test="item.date != null">#{item.date,jdbcType=TIMESTAMP},</when>
           <otherwise>CURRENT_TIMESTAMP,</otherwise>
@@ -28,10 +32,6 @@
           <when test="item.source != null">#{item.source,jdbcType=VARCHAR},</when>
           <otherwise>'',</otherwise>
         </choose>
-        <choose>
-          <when test="item.period != null">#{item.period,jdbcType=INTEGER},</when>
-          <otherwise>0,</otherwise>
-        </choose>
         <choose>
           <when test="item.tmsPeriod != null">#{item.tmsPeriod,jdbcType=INTEGER},</when>
           <otherwise>0,</otherwise>
@@ -41,11 +41,11 @@
           <otherwise>'',</otherwise>
         </choose>
         <choose>
-          <when test="item.begBal != null">#{item.beginningBalance,jdbcType=DECIMAL},</when>
+          <when test="item.endBal != null">#{item.endBal,jdbcType=DECIMAL},</when>
           <otherwise>0,</otherwise>
         </choose>
         <choose>
-          <when test="item.endBal != null">#{item.endingBalance,jdbcType=DECIMAL},</when>
+          <when test="item.begBal != null">#{item.begBal,jdbcType=DECIMAL},</when>
           <otherwise>0,</otherwise>
         </choose>
         <choose>

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

@@ -3,7 +3,7 @@
 <mapper namespace="pwc.taxtech.atms.dao.CitDraftAccountMappingMapper">
 
   <insert id="insertBatch" parameterType="java.util.List">
-    insert into balance_sheet_final
+    insert into cit_draft_account_mapping
     (<include refid="Base_Column_List"/>)
     values
     <foreach collection="list" item="item" index="index" separator=",">

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

@@ -3,7 +3,7 @@
 <mapper namespace="pwc.taxtech.atms.dao.CitEAMAssetsDisposalMapper">
 
   <insert id="insertBatch" parameterType="java.util.List">
-    insert into balance_sheet_final
+    insert into cit_eam_assets_disposal
     (<include refid="Base_Column_List"/>)
     values
     <foreach collection="list" item="item" index="index" separator=",">
@@ -20,17 +20,21 @@
           <when test="item.projectId != null">#{item.projectId,jdbcType=VARCHAR},</when>
           <otherwise>'',</otherwise>
         </choose>
+        <choose>
+          <when test="item.period != null">#{item.period,jdbcType=INTEGER},</when>
+          <otherwise>0,</otherwise>
+        </choose>
         <choose>
           <when test="item.source != null">#{item.source,jdbcType=VARCHAR},</when>
           <otherwise>'',</otherwise>
         </choose>
         <choose>
-          <when test="item.period != null">#{item.period,jdbcType=INTEGER},</when>
+          <when test="item.occurPeriod != null">#{item.occurPeriod,jdbcType=INTEGER},</when>
           <otherwise>0,</otherwise>
         </choose>
         <choose>
-          <when test="item.occurPeriod != null">#{item.occurPeriod,jdbcType=INTEGER},</when>
-          <otherwise>0,</otherwise>
+          <when test="item.assetLabelNumber != null">#{item.assetLabelNumber,jdbcType=VARCHAR},</when>
+          <otherwise>'',</otherwise>
         </choose>
         <choose>
           <when test="item.compensationSaleAmount != null">#{item.compensationSaleAmount,jdbcType=DECIMAL},</when>

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

@@ -3,7 +3,7 @@
 <mapper namespace="pwc.taxtech.atms.dao.CitProfitPrcAdjustMapper">
 
   <insert id="insertBatch" parameterType="java.util.List">
-    insert into balance_sheet_final
+    insert into cit_profit_prc_adjust
     (<include refid="Base_Column_List"/>)
     values
     <foreach collection="list" item="item" index="index" separator=",">
@@ -20,6 +20,10 @@
           <when test="item.projectId != null">#{item.projectId,jdbcType=VARCHAR},</when>
           <otherwise>'',</otherwise>
         </choose>
+        <choose>
+          <when test="item.period != null">#{item.period,jdbcType=INTEGER},</when>
+          <otherwise>0,</otherwise>
+        </choose>
         <choose>
           <when test="item.date != null">#{item.date,jdbcType=TIMESTAMP},</when>
           <otherwise>CURRENT_TIMESTAMP,</otherwise>
@@ -28,10 +32,6 @@
           <when test="item.source != null">#{item.source,jdbcType=VARCHAR},</when>
           <otherwise>'',</otherwise>
         </choose>
-        <choose>
-          <when test="item.period != null">#{item.period,jdbcType=INTEGER},</when>
-          <otherwise>0,</otherwise>
-        </choose>
         <choose>
           <when test="item.tmsPeriod != null">#{item.tmsPeriod,jdbcType=INTEGER},</when>
           <otherwise>0,</otherwise>

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

@@ -3,7 +3,7 @@
 <mapper namespace="pwc.taxtech.atms.dao.CitSalaryAdvanceMapper">
 
   <insert id="insertBatch" parameterType="java.util.List">
-    insert into balance_sheet_final
+    insert into cit_salary_advance
     (<include refid="Base_Column_List"/>)
     values
     <foreach collection="list" item="item" index="index" separator=",">
@@ -21,17 +21,13 @@
           <otherwise>'',</otherwise>
         </choose>
         <choose>
-          <when test="item.date != null">#{item.date,jdbcType=TIMESTAMP},</when>
-          <otherwise>CURRENT_TIMESTAMP,</otherwise>
+          <when test="item.period != null">#{item.period,jdbcType=INTEGER},</when>
+          <otherwise>0,</otherwise>
         </choose>
         <choose>
           <when test="item.source != null">#{item.source,jdbcType=VARCHAR},</when>
           <otherwise>'',</otherwise>
         </choose>
-        <choose>
-          <when test="item.period != null">#{item.period,jdbcType=INTEGER},</when>
-          <otherwise>0,</otherwise>
-        </choose>
         <choose>
           <when test="item.poNo != null">#{item.poNo,jdbcType=INTEGER},</when>
           <otherwise>0,</otherwise>
@@ -40,6 +36,10 @@
           <when test="item.poSubjectCode != null">#{item.poSubjectCode,jdbcType=VARCHAR},</when>
           <otherwise>'',</otherwise>
         </choose>
+        <choose>
+          <when test="item.poSubjectName != null">#{item.poSubjectName,jdbcType=VARCHAR},</when>
+          <otherwise>'',</otherwise>
+        </choose>
         <choose>
           <when test="item.advance != null">#{item.advance,jdbcType=DECIMAL},</when>
           <otherwise>0,</otherwise>

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

@@ -3,7 +3,7 @@
 <mapper namespace="pwc.taxtech.atms.dao.CitTrialBalanceMapper">
 
   <insert id="insertBatch" parameterType="java.util.List">
-    insert into balance_sheet_final
+    insert into cit_trial_balance
     (<include refid="Base_Column_List"/>)
     values
     <foreach collection="list" item="item" index="index" separator=",">

atms-web/src/main/webapp/Scripts/module-part2.js

@@ -1379,8 +1379,8 @@ var dataImpModule = angular.module('app.dataImp', ['ui.grid', 'ui.router','ui.gr
             });
 
             $stateProvider.state({
-                name: 'citBSPrcAdjustImportDistribution',
-                url: "/importDistribution/citBalanceSheetPrcAdjust",
+                name: 'citBsPrcAdjustImportDistribution',
+                url: "/importDistribution/citBsPrcAdjust",
                 dsr: true,
                 views: {
                     'importContent': {
@@ -1389,7 +1389,7 @@ var dataImpModule = angular.module('app.dataImp', ['ui.grid', 'ui.router','ui.gr
                                 $scope.state = $state;
                                 appTranslation.load([appTranslation.appPart]);
                             }],
-                        template: '<data-import-cit-balance-sheet-adjust></data-import-cit-balance-sheet-adjust>'
+                        template: '<data-import-cit-bs-prc-adjust></data-import-cit-bs-prc-adjust>'
                     }
                 },
                 resolve: scriptDependencyProvider.createDependenciesMap(scriptDependencyProvider.dataImp),
@@ -1414,6 +1414,24 @@ var dataImpModule = angular.module('app.dataImp', ['ui.grid', 'ui.router','ui.gr
                 sticky: true
             });
 
+            $stateProvider.state({
+                name: 'citEamAssetsDisposalImportDistribution',
+                url: "/importDistribution/citEamAssetsDisposal",
+                dsr: true,
+                views: {
+                    'importContent': {
+                        controller: ['$scope', '$state','appTranslation',
+                            function ($scope, $state, appTranslation) {
+                                $scope.state = $state;
+                                appTranslation.load([appTranslation.appPart]);
+                            }],
+                        template: '<data-import-cit-eam-assets-disposal></data-import-cit-eam-assets-disposal>'
+                    }
+                },
+                resolve: scriptDependencyProvider.createDependenciesMap(scriptDependencyProvider.dataImp),
+                sticky: true
+            });
+
             $stateProvider.state({
                 name: 'citSalaryAdvanceImportDistribution',
                 url: "/importDistribution/citSalaryAdvance",

atms-web/src/main/webapp/app-resources/i18n/en-us/cit.json

@@ -82,7 +82,7 @@
     "AccountDepreciation": "税务折旧",
     "CitJournalAdjustImport": "日记账调整导入-CIT",
     "CitBalanceSheetPrcAdjustImport": "资产负债表（单家PRC）调整导入-CIT",
-    "CitProfitPrcAdjustImport": "利润表表（单家PRC）调整导入-CIT",
+    "CitProfitPrcAdjustImport": "利润表（单家PRC）调整导入-CIT",
     "CitTrialBalanceImport": "试算平衡表导入-CIT",
     "CitSalaryAdvanceImport": "预提重分类数据源导入-CIT",
     "CitEAMAssetsDisposalImport": "EAM资产处置导入-CIT",

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

@@ -87,7 +87,7 @@
     "AccountDepreciation": "税务折旧",
     "CitJournalAdjustImport": "日记账调整导入-CIT",
     "CitBalanceSheetPrcAdjustImport": "资产负债表（单家PRC）调整导入-CIT",
-    "CitProfitPrcAdjustImport": "利润表表（单家PRC）调整导入-CIT",
+    "CitProfitPrcAdjustImport": "利润表（单家PRC）调整导入-CIT",
     "CitTrialBalanceImport": "试算平衡表导入-CIT",
     "CitSalaryAdvanceImport": "预提重分类数据源导入-CIT",
     "CitEAMAssetsDisposalImport": "EAM资产处置导入-CIT",

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

-commonModule.directive('importCitBalanceSheetPrcAdjust', ['$log',
+commonModule.directive('importCitBsPrcAdjust', ['$log',
     function ($log) {
 
         'use strict';
@@ -6,7 +6,7 @@
 
         return {
             restrict: 'E',
-            templateUrl: '/app/common/controls/import/import-cit-balance-sheet-prc-adjust/import-cit-balance-sheet-prc-adjust.html' + '?_=' + Math.random(),
+            templateUrl: '/app/common/controls/import/import-cit-bs-prc-adjust/import-cit-bs-prc-adjust.html' + '?_=' + Math.random(),
             scope: {
                 serviceTypeId: "=?",
                 periodId: "=?"

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

-commonModule.controller('importCitTrialBalanceController', ['$scope', '$log', '$translate', '$timeout', '$q', '$interval'
+commonModule.controller('importCitDaftAccountMappingCon', ['$scope', '$log', '$translate', '$timeout', '$q', '$interval'
     , 'apiInterceptor', 'Upload', 'citImportDataService', 'SweetAlert', 'uiGridConstants', '$uibModal'
     , 'vatSessionService', 'enums', 'vatOperationLogService','$anchorScroll','$location',
     function ($scope, $log, $translate, $timeout, $q, $interval

atms-web/src/main/webapp/app/common/controls/import/import-cit-EAM-assets-disposal/import-cit-EAM-assets-disposal.ctrl.js → 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'
+commonModule.controller('importCitEamAssetsDisposalCon', ['$scope', '$log', '$translate', '$timeout', '$q', '$interval'
     , 'apiInterceptor', 'Upload', 'citImportDataService', 'SweetAlert', 'uiGridConstants', '$uibModal'
     , 'vatSessionService', 'enums', 'vatOperationLogService','$anchorScroll','$location',
     function ($scope, $log, $translate, $timeout, $q, $interval

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

-<div class="import-cit-EAM-assets-disposal">
+<div class="import-cit-eam-assets-disposal">
     <!--标题-->
     <div class="nav-wrapper">
         <div class="nav-header" translate="CitEAMAssetsDisposalImport"></div>

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

-commonModule.directive('importCitEAMAssetsDisposal', ['$log',
+commonModule.directive('importCitEamAssetsDisposal', ['$log',
     function ($log) {
 
         'use strict';
-        $log.debug('importCitJournalAdjust.ctor()...');
+        $log.debug('importCitEamAssetsDisposal.ctor()...');
 
         return {
             restrict: 'E',
-            templateUrl: '/app/common/controls/import/import-cit-EAM-assets-disposal/import-cit-EAM-assets-disposal.html' + '?_=' + Math.random(),
+            templateUrl: '/app/common/controls/import/import-cit-eam-assets-disposal/import-cit-eam-assets-disposal.html' + '?_=' + Math.random(),
             scope: {
                 serviceTypeId: "=?",
                 periodId: "=?"
             },
-            controller: 'importCitEAMAssetsDisposalCon',
+            controller: 'importCitEamAssetsDisposalCon',
             link: function (scope, element) {
                 $('.main-contents')[0].style.width = "260px";
                 $('.main-contents')[0].style.float = "left";

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

 @import "~/app-resources/less/theme.less";
 
-.import-cit-EAM-assets-disposal {
+.import-cit-eam-assets-disposal {
     /*background-color: @color-white;*/
     padding-left: 20px;
     /*min-height: 800px;*/

atms-web/src/main/webapp/app/dataImport/import-distribution/cit-balance-sheet-prc-adjust/data-import-cit-balance-sheet-adjust.js → atms-web/src/main/webapp/app/dataImport/import-distribution/cit-bs-prc-adjust/data-import-cit-bs-prc-adjust.js

-citModule.directive('dataImportCitBalanceSheetAdjust', ['$log', 'enums',
+citModule.directive('dataImportCitBsPrcAdjust', ['$log', 'enums',
     function ($log, enums) {
         'use strict';
-        $log.debug('dataImportInvoiceRecord.ctor()...');
+        $log.debug('dataImportCitBsPrcAdjust.ctor()...');
 
         return {
             restrict: 'E',
-            template: '<import-cit-balance-sheet-prc-adjust service-type-id="serviceTypeId" period-id="periodId"></import-cit-balance-sheet-prc-adjust>',
+            template: '<import-cit-bs-prc-adjust service-type-id="serviceTypeId" period-id="periodId"></import-cit-bs-prc-adjust>',
             scope: {},
             link: function (scope, element) {
                 scope.periodId = enums.wholeYearPeriod.import;

atms-web/src/main/webapp/app/dataImport/import-distribution/cit-EAM-assets-disposal/data-import-cit-EAM-assets-disposal.js → atms-web/src/main/webapp/app/dataImport/import-distribution/cit-eam-assets-disposal/data-import-cit-eam-assets-disposal.js

-citModule.directive('dataImportCitEAMAssetsDisposal', ['$log', 'enums',
+citModule.directive('dataImportCitEamAssetsDisposal', ['$log', 'enums',
     function ($log, enums) {
         'use strict';
-        $log.debug('dataImportInvoiceRecord.ctor()...');
+        $log.debug('dataImportCitEamAssetsDisposal.ctor()...');
 
         return {
             restrict: 'E',
-            template: '<import-cit-EAM-assets-disposal service-type-id="serviceTypeId" period-id="periodId"></import-cit-EAM-assets-disposal>',
+            template: '<import-cit-eam-assets-disposal service-type-id="serviceTypeId" period-id="periodId"></import-cit-eam-assets-disposal>',
             scope: {},
             link: function (scope, element) {
                 scope.periodId = enums.wholeYearPeriod.import;