Merge remote-tracking branch 'origin/dev_mysql' into dev_mysql

atms-dao/src/main/java/pwc/taxtech/atms/analysis/dao/AnalysisTaxReturnEndMapper.java

+package pwc.taxtech.atms.analysis.dao;
+
+import java.util.List;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.session.RowBounds;
+import pwc.taxtech.atms.MyAnalysisMapper;
+import pwc.taxtech.atms.analysis.entity.AnalysisTaxReturnEnd;
+import pwc.taxtech.atms.analysis.entity.AnalysisTaxReturnEndExample;
+
+@Mapper
+public interface AnalysisTaxReturnEndMapper extends MyAnalysisMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_tax_return_end
+     *
+     * @mbg.generated
+     */
+    long countByExample(AnalysisTaxReturnEndExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_tax_return_end
+     *
+     * @mbg.generated
+     */
+    int deleteByExample(AnalysisTaxReturnEndExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_tax_return_end
+     *
+     * @mbg.generated
+     */
+    int deleteByPrimaryKey(Long id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_tax_return_end
+     *
+     * @mbg.generated
+     */
+    int insert(AnalysisTaxReturnEnd record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_tax_return_end
+     *
+     * @mbg.generated
+     */
+    int insertSelective(AnalysisTaxReturnEnd record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_tax_return_end
+     *
+     * @mbg.generated
+     */
+    List<AnalysisTaxReturnEnd> selectByExampleWithRowbounds(AnalysisTaxReturnEndExample example, RowBounds rowBounds);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_tax_return_end
+     *
+     * @mbg.generated
+     */
+    List<AnalysisTaxReturnEnd> selectByExample(AnalysisTaxReturnEndExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_tax_return_end
+     *
+     * @mbg.generated
+     */
+    AnalysisTaxReturnEnd selectByPrimaryKey(Long id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_tax_return_end
+     *
+     * @mbg.generated
+     */
+    int updateByExampleSelective(@Param("record") AnalysisTaxReturnEnd record, @Param("example") AnalysisTaxReturnEndExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_tax_return_end
+     *
+     * @mbg.generated
+     */
+    int updateByExample(@Param("record") AnalysisTaxReturnEnd record, @Param("example") AnalysisTaxReturnEndExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_tax_return_end
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKeySelective(AnalysisTaxReturnEnd record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table analysis_tax_return_end
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKey(AnalysisTaxReturnEnd record);
+}
\ No newline at end of file

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

@@ -1505,12 +1505,14 @@
   "Alternate2Description": "Alternate 2 Description",
   "YYYY-MM": "YYYY-MM",
   "profitLoss": "Profit Statement",
+  "profitLossPRC": "Profit Statement PRC",
   "ProfitLossTitle": "Profit Statement",
   "CurrentPeriodAmount": "Current Period Amount",
   "ThisYearAccumulatedAmount": "This Year Accumulated Amount",
   "quarterlyOwnersEquityChangeTable": "Quarterly Owners Equity Change Table",
   "directMethodCashFlowStatement": "Direct Method Cash Flow Statement",
   "offBalanceSheet": "Balance Sheet",
+  "offBalanceSheetPRC": "Balance Sheet PRC",
   "OffBalanceSheetTitle": "Balance sheet",
   "InitialBalance": "Beginning Balance",
   "journal": "Journal Entry",

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

@@ -1989,6 +1989,7 @@
     "YYYY-MM": "YYYY-MM",
 
     "profitLoss": "利润表",
+    "profitLossPRC": "利润表PRC",
     "ProfitLossTitle": "利润表",
     "CurrentPeriodAmount": "本期发生额",
     "ThisYearAccumulatedAmount": "本年累计",
@@ -2000,6 +2001,8 @@
     "DirectMethodCashFlowStatementTitle": "直接法现金流量表",
 
     "offBalanceSheet" : "资产负债表",
+    "offBalanceSheetPRC": "资产负债表PRC",
+
     "OffBalanceSheetTitle" : "资产负债表",
     "InitialBalance" : "年初余额",
 

atms-web/src/main/webapp/app/vat/import/vat-import-layout/vat-import-layout.ctrl.js

@@ -30,7 +30,7 @@ function ($scope, $log, $translate, $location, loginContext, enums, vatSessionSe
             },
             {
                 name: 'offBalanceSheet', permission: constant.vatPermission.dataPreview.offBalanceSheet.queryCode,
-                text: $translate.instant('offBalanceSheetPRC'), icon: 'fa fa-file-text-o', show: true
+                text: $translate.inunreturned-taxstant('offBalanceSheetPRC'), icon: 'fa fa-file-text-o', show: true
             },
             {
                 name: 'journal', permission: constant.vatPermission.dataPreview.journal.queryCode,