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

atms-dao/src/main/java/pwc/taxtech/atms/vat/dao/AdjustmentTableMapper.java

+package pwc.taxtech.atms.vat.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.MyVatMapper;
+import pwc.taxtech.atms.vat.entity.AdjustmentTable;
+import pwc.taxtech.atms.vat.entity.AdjustmentTableExample;
+
+@Mapper
+public interface AdjustmentTableMapper extends MyVatMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table adjustment_table
+     *
+     * @mbg.generated
+     */
+    long countByExample(AdjustmentTableExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table adjustment_table
+     *
+     * @mbg.generated
+     */
+    int deleteByExample(AdjustmentTableExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table adjustment_table
+     *
+     * @mbg.generated
+     */
+    int deleteByPrimaryKey(Long id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table adjustment_table
+     *
+     * @mbg.generated
+     */
+    int insert(AdjustmentTable record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table adjustment_table
+     *
+     * @mbg.generated
+     */
+    int insertSelective(AdjustmentTable record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table adjustment_table
+     *
+     * @mbg.generated
+     */
+    List<AdjustmentTable> selectByExampleWithRowbounds(AdjustmentTableExample example, RowBounds rowBounds);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table adjustment_table
+     *
+     * @mbg.generated
+     */
+    List<AdjustmentTable> selectByExample(AdjustmentTableExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table adjustment_table
+     *
+     * @mbg.generated
+     */
+    AdjustmentTable selectByPrimaryKey(Long id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table adjustment_table
+     *
+     * @mbg.generated
+     */
+    int updateByExampleSelective(@Param("record") AdjustmentTable record, @Param("example") AdjustmentTableExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table adjustment_table
+     *
+     * @mbg.generated
+     */
+    int updateByExample(@Param("record") AdjustmentTable record, @Param("example") AdjustmentTableExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table adjustment_table
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKeySelective(AdjustmentTable record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table adjustment_table
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKey(AdjustmentTable record);
+
+    int insertBatch(List<AdjustmentTable> rlits);
+
+}
\ No newline at end of file

atms-dao/src/main/java/pwc/taxtech/atms/vat/dao/RedLetterInfoTableMapper.java

+package pwc.taxtech.atms.vat.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.MyVatMapper;
+import pwc.taxtech.atms.vat.entity.RedLetterInfoTable;
+import pwc.taxtech.atms.vat.entity.RedLetterInfoTableExample;
+
+@Mapper
+public interface RedLetterInfoTableMapper extends MyVatMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table red_letter_info_table
+     *
+     * @mbg.generated
+     */
+    long countByExample(RedLetterInfoTableExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table red_letter_info_table
+     *
+     * @mbg.generated
+     */
+    int deleteByExample(RedLetterInfoTableExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table red_letter_info_table
+     *
+     * @mbg.generated
+     */
+    int deleteByPrimaryKey(Long id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table red_letter_info_table
+     *
+     * @mbg.generated
+     */
+    int insert(RedLetterInfoTable record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table red_letter_info_table
+     *
+     * @mbg.generated
+     */
+    int insertSelective(RedLetterInfoTable record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table red_letter_info_table
+     *
+     * @mbg.generated
+     */
+    List<RedLetterInfoTable> selectByExampleWithRowbounds(RedLetterInfoTableExample example, RowBounds rowBounds);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table red_letter_info_table
+     *
+     * @mbg.generated
+     */
+    List<RedLetterInfoTable> selectByExample(RedLetterInfoTableExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table red_letter_info_table
+     *
+     * @mbg.generated
+     */
+    RedLetterInfoTable selectByPrimaryKey(Long id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table red_letter_info_table
+     *
+     * @mbg.generated
+     */
+    int updateByExampleSelective(@Param("record") RedLetterInfoTable record, @Param("example") RedLetterInfoTableExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table red_letter_info_table
+     *
+     * @mbg.generated
+     */
+    int updateByExample(@Param("record") RedLetterInfoTable record, @Param("example") RedLetterInfoTableExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table red_letter_info_table
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKeySelective(RedLetterInfoTable record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table red_letter_info_table
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKey(RedLetterInfoTable record);
+
+    int insertBatch(List<RedLetterInfoTable> rlits);
+}
\ No newline at end of file

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

+commonModule.directive('importAdjustmentTable', ['$log',
+    function ($log) {
+        'use strict';
+        return {
+            restrict: 'E',
+            templateUrl: '/app/common/controls/import/import-adjust-table/import-adjust-table.html' + '?_=' + Math.random(),
+            scope: {
+                serviceTypeId: "=?",
+                periodId: "=?"
+            },
+            controller: 'importATController',
+            link: function (scope, element) {
+                $('.main-contents')[0].style.width = "260px";
+                $('.main-contents')[0].style.float = "left";
+                $('.main-contents')[0].style.styleFloat = "left";
+                $('.main-contents')[0].style.cssFloat = "left";
+            }
+        };
+
+    }
+]); 
\ No newline at end of file