1、fixbug

2、vat数据预览-科目余额表

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

+package pwc.taxtech.atms.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.github.pagehelper.PageInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import pwc.taxtech.atms.dto.vatdto.dd.TrialBalanceDto;
+import pwc.taxtech.atms.dto.vatdto.TrialBalanceParam;
+import pwc.taxtech.atms.service.impl.DataPreviewSerivceImpl;
+
+@RestController
+@RequestMapping("/api/v1/dataPreview/")
+public class DataPreviewController extends BaseController {
+
+    @Autowired
+    private DataPreviewSerivceImpl dataPreviewSerivceImpl;
+
+    @PostMapping("getTBDataForDisplay")
+    public PageInfo<TrialBalanceDto> getTBDataForDisplay(@RequestBody TrialBalanceParam param) {
+        logger.debug(String.format("科目余额查询 Condition:%s", JSON.toJSONString(param)));
+        return dataPreviewSerivceImpl.getTBDataForDisplay(param);
+    }
+}

atms-api/src/main/java/pwc/taxtech/atms/dto/vatdto/TrialBalanceCondition.java

+package pwc.taxtech.atms.dto.vatdto;
+
+public class TrialBalanceCondition {
+    private String category;
+    private String criteria;
+    private String orgId;
+    private Integer fromPeriod;
+    private Integer toPeriod;
+
+    public String getCategory() {
+        return this.category;
+    }
+
+    public void setCategory(String category) {
+        this.category = category;
+    }
+
+    public String getCriteria() {
+        return this.criteria;
+    }
+
+    public void setCriteria(String criteria) {
+        this.criteria = criteria;
+    }
+
+    public Integer getFromPeriod() {
+        return this.fromPeriod;
+    }
+
+    public void setFromPeriod(Integer fromPeriod) {
+        this.fromPeriod = fromPeriod;
+    }
+
+    public Integer getToPeriod() {
+        return this.toPeriod;
+    }
+
+    public void setToPeriod(Integer toPeriod) {
+        this.toPeriod = toPeriod;
+    }
+
+    public String getOrgId() {
+        return this.orgId;
+    }
+
+    public void setOrgId(String orgId) {
+        this.orgId = orgId;
+    }
+}

atms-api/src/main/java/pwc/taxtech/atms/dto/vatdto/TrialBalanceParam.java

 package pwc.taxtech.atms.dto.vatdto;
 
+import pwc.taxtech.atms.dpo.PagingDto;
+
 public class TrialBalanceParam {
-    private String category;
-    private String criteria;
-    private String orgId;
-    private Integer fromPeriod;
-    private Integer toPeriod;
 
-    public String getCategory() {
-        return this.category;
-    }
+    private PagingDto pageInfo;
 
-    public void setCategory(String category) {
-        this.category = category;
-    }
+    private String orgId;
 
-    public String getCriteria() {
-        return this.criteria;
-    }
+    private Integer fromPeriod;
 
-    public void setCriteria(String criteria) {
-        this.criteria = criteria;
-    }
+    private Integer toPeriod;
 
     public Integer getFromPeriod() {
         return this.fromPeriod;
@@ -46,4 +35,12 @@ public class TrialBalanceParam {
     public void setOrgId(String orgId) {
         this.orgId = orgId;
     }
+
+    public PagingDto getPageInfo() {
+        return pageInfo;
+    }
+
+    public void setPageInfo(PagingDto pageInfo) {
+        this.pageInfo = pageInfo;
+    }
 }

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

+package pwc.taxtech.atms.service.impl;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.google.common.collect.Lists;
+import org.springframework.stereotype.Service;
+import pwc.taxtech.atms.dto.vatdto.TrialBalanceParam;
+import pwc.taxtech.atms.dto.vatdto.dd.TrialBalanceDto;
+import pwc.taxtech.atms.vat.dao.TrialBalanceMapper;
+import pwc.taxtech.atms.vat.entity.TrialBalance;
+import pwc.taxtech.atms.vat.entity.TrialBalanceExample;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @Auther: Gary J Li
+ * @Date: 01/02/2019 10:36
+ * @Description:
+ */
+@Service
+public class DataPreviewSerivceImpl extends BaseService {
+
+    @Resource
+    private TrialBalanceMapper trialBalanceMapper;
+
+
+    public PageInfo<TrialBalanceDto> getTBDataForDisplay(TrialBalanceParam param) {
+
+        TrialBalanceExample trialBalanceExample = new TrialBalanceExample();
+        trialBalanceExample.createCriteria().andOrganizationIdEqualTo(param.getOrgId())
+                .andPeriodBetween(param.getFromPeriod(), param.getToPeriod());
+
+        PageHelper.startPage(param.getPageInfo().getPageIndex(), param.getPageInfo().getPageSize());
+
+        List<TrialBalance> trialBalances = trialBalanceMapper.selectByExample(trialBalanceExample);
+
+        List<TrialBalanceDto> trialBalanceDtos = Lists.newArrayList();
+
+        trialBalances.forEach(tb -> {
+            TrialBalanceDto trialBalanceDto = new TrialBalanceDto();
+            beanUtil.copyProperties(tb, trialBalanceDto);
+            trialBalanceDtos.add(trialBalanceDto);
+        });
+
+        return new PageInfo<>(trialBalanceDtos);
+    }
+}

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

@@ -26,11 +26,12 @@ import pwc.taxtech.atms.common.message.EnterpriseAccountSetOrgMessage;
 import pwc.taxtech.atms.common.message.LogMessage;
 import pwc.taxtech.atms.common.message.OrganizationMessage;
 import pwc.taxtech.atms.common.util.BeanUtil;
-import pwc.taxtech.atms.common.util.DateUtils;
 import pwc.taxtech.atms.constant.*;
-import pwc.taxtech.atms.constant.enums.EnumApiUpdateFlag;
 import pwc.taxtech.atms.dao.*;
 import pwc.taxtech.atms.dpo.*;
+import pwc.taxtech.atms.dpo.OrgBasicDto;
+import pwc.taxtech.atms.dpo.OrgGeneralInfoMiddleDto;
+import pwc.taxtech.atms.dpo.OrgInfoDto;
 import pwc.taxtech.atms.dto.AreaOrganizationStatistics;
 import pwc.taxtech.atms.dto.AreaStatistics;
 import pwc.taxtech.atms.dto.IndustryDto;
@@ -49,10 +50,7 @@ import pwc.taxtech.atms.dto.dimension.OrgDashboardParams;
 import pwc.taxtech.atms.dto.navtree.DevTreeDto;
 import pwc.taxtech.atms.dto.navtree.IvhTreeDto;
 import pwc.taxtech.atms.dto.navtree.NavTreeDto;
-import pwc.taxtech.atms.dto.organization.OrgCountDto;
-import pwc.taxtech.atms.dto.organization.OrgCustomDto;
-import pwc.taxtech.atms.dto.organization.OrgDisplayDto;
-import pwc.taxtech.atms.dto.organization.OrgDto;
+import pwc.taxtech.atms.dto.organization.*;
 import pwc.taxtech.atms.dto.organization.OrgGeneralInfoDto;
 import pwc.taxtech.atms.dto.user.NameDto;
 import pwc.taxtech.atms.dto.vatdto.JsonExportDto;
@@ -1945,7 +1943,6 @@ public class OrganizationServiceImpl {
     public OrganizationExtraDto getSingleOrgExtraByOrgId(String orgId) {
         OrganizationExtraDto result = organizationExtraMapper.selectByOrgId(orgId).stream().findFirst()
                 .orElse(null);
-        Assert.notNull(result, "Org ExtraInfo result is null");
         return result;
     }
 

atms-dao/etc/generator-mysql/vatGeneratorConfig.xml

@@ -29,18 +29,39 @@
             <property name="forceBigDecimals" value="false" />
         </javaTypeResolver>
 
-        <javaModelGenerator targetPackage="pwc.taxtech.atms.vat.entity" targetProject="../src/main/java">
+        <javaModelGenerator targetPackage="pwc.taxtech.atms.vat.entity" targetProject="../../src/main/java">
             <property name="trimStrings" value="true" />
+            <property name="rootClass" value="pwc.taxtech.atms.entity.BaseEntity"/>
         </javaModelGenerator>
 
-        <sqlMapGenerator targetPackage="pwc.taxtech.atms.vat.dao" targetProject="../src/main/resources">
+        <sqlMapGenerator targetPackage="pwc.taxtech.atms.vat.dao" targetProject="../../src/main/resources">
         </sqlMapGenerator>
 
-        <javaClientGenerator type="XMLMAPPER" targetPackage="pwc.taxtech.atms.vat.dao" targetProject="../src/main/java">
+        <javaClientGenerator type="XMLMAPPER" targetPackage="pwc.taxtech.atms.vat.dao" targetProject="../../src/main/java">
             <property name="rootInterface" value="pwc.taxtech.atms.MyVatMapper" />
         </javaClientGenerator>
 
-        <table tableName="account" domainObjectName="Account">
+        <table tableName="trial_balance" domainObjectName="TrialBalance">
+            <property name="useActualColumnNames" value="false"/>
+            <property name="ignoreQualifiersAtRuntime" value="true"/>
+        </table>
+
+        <table tableName="profit_loss_statement" domainObjectName="ProfitLossStatement">
+            <property name="useActualColumnNames" value="false"/>
+            <property name="ignoreQualifiersAtRuntime" value="true"/>
+        </table>
+
+        <table tableName="balance_sheet" domainObjectName="BalanceSheet">
+            <property name="useActualColumnNames" value="false"/>
+            <property name="ignoreQualifiersAtRuntime" value="true"/>
+        </table>
+
+        <table tableName="journal_entry" domainObjectName="JournalEntry">
+            <property name="useActualColumnNames" value="false"/>
+            <property name="ignoreQualifiersAtRuntime" value="true"/>
+        </table>
+
+        <!--<table tableName="account" domainObjectName="Account">
             <property name="useActualColumnNames" value="false"/>
             <property name="ignoreQualifiersAtRuntime" value="true"/>
             <columnOverride column="is_leaf" javaType="Boolean"/>
@@ -440,7 +461,7 @@
         <table tableName="period_standard_account" domainObjectName="PeriodStandardAccount">
             <property name="useActualColumnNames" value="false"/>
             <property name="ignoreQualifiersAtRuntime" value="true"/>
-        </table>
+        </table>-->
 
     </context>
 </generatorConfiguration>
\ No newline at end of file

atms-dao/etc/generator-mysql/vat_run.bat

 rem see http://www.mybatis.org/generator/running/runningFromCmdLine.html
 cd /d %~dp0
-call java -classpath .;./* org.mybatis.generator.api.ShellRunner -configfile vatGeneratorConfig.xml -overwrite -verbose -tables data_source
+call java -classpath .;./* org.mybatis.generator.api.ShellRunner -configfile vatGeneratorConfig.xml -overwrite
 echo @@@@@@@@@@@ DONE @@@@@@@@@@@
 pause
\ No newline at end of file

atms-dao/src/main/java/pwc/taxtech/atms/dao/OrganizationExtraMapper.java

 package pwc.taxtech.atms.dao;
 
-import java.util.Arrays;
 import java.util.List;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;

atms-dao/src/main/java/pwc/taxtech/atms/dpo/OrgBasicDto.java

@@ -102,6 +102,14 @@ public class OrgBasicDto {
 
     private Date generalTaxPayerEffectiveTime;
 
+    private Boolean oversea;
+
+    private String regStatus;
+
+    private String nationalEconomicIndustry;
+
+    private Boolean engageNationalProhibitIndustry;
+
     public String getId() {
         return id;
     }
@@ -525,4 +533,36 @@ public class OrgBasicDto {
     public void setLogoutTime(Date logoutTime) {
         this.logoutTime = logoutTime;
     }
+
+    public Boolean getOversea() {
+        return oversea;
+    }
+
+    public void setOversea(Boolean oversea) {
+        this.oversea = oversea;
+    }
+
+    public String getRegStatus() {
+        return regStatus;
+    }
+
+    public void setRegStatus(String regStatus) {
+        this.regStatus = regStatus;
+    }
+
+    public String getNationalEconomicIndustry() {
+        return nationalEconomicIndustry;
+    }
+
+    public void setNationalEconomicIndustry(String nationalEconomicIndustry) {
+        this.nationalEconomicIndustry = nationalEconomicIndustry;
+    }
+
+    public Boolean getEngageNationalProhibitIndustry() {
+        return engageNationalProhibitIndustry;
+    }
+
+    public void setEngageNationalProhibitIndustry(Boolean engageNationalProhibitIndustry) {
+        this.engageNationalProhibitIndustry = engageNationalProhibitIndustry;
+    }
 }

atms-dao/src/main/java/pwc/taxtech/atms/dpo/OrgInfoDto.java

@@ -212,8 +212,8 @@ public class OrgInfoDto {
         return isActive;
     }
 
-    public void setIsActive(Boolean active) {
-        isActive = active;
+    public void setIsActive(Boolean isActive) {
+        this.isActive = isActive;
     }
 
     public String getId() {

atms-dao/src/main/java/pwc/taxtech/atms/dpo/OrganizationExtraDto.java

 package pwc.taxtech.atms.dpo;
 
-import pwc.taxtech.atms.entity.BaseEntity;
-
 import java.io.Serializable;
 import java.util.Date;
 

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

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

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

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

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

@@ -22,6 +22,56 @@
     </select>
 
     <resultMap id="OrgBasicDto" type="pwc.taxtech.atms.dpo.OrgBasicDto">
+        <id column="id" jdbcType="VARCHAR" property="id" />
+        <result column="client_code" jdbcType="VARCHAR" property="clientCode" />
+        <result column="name" jdbcType="VARCHAR" property="name" />
+        <result column="code" jdbcType="VARCHAR" property="code" />
+        <result column="parent_id" jdbcType="VARCHAR" property="parentId" />
+        <result column="tax_payer_number" jdbcType="VARCHAR" property="taxPayerNumber" />
+        <result column="region_id" jdbcType="VARCHAR" property="regionId" />
+        <result column="structure_id" jdbcType="VARCHAR" property="structureId" />
+        <result column="industry_id" jdbcType="VARCHAR" property="industryId" />
+        <result column="business_unit_id" jdbcType="VARCHAR" property="businessUnitId" />
+        <result column="is_active" jdbcType="BIT" property="isActive" />
+        <result column="p_level" jdbcType="INTEGER" property="pLevel" />
+        <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+        <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+        <result column="area_id" jdbcType="VARCHAR" property="areaId" />
+        <result column="english_name" jdbcType="VARCHAR" property="englishName" />
+        <result column="abbreviation" jdbcType="VARCHAR" property="abbreviation" />
+        <result column="invoice_type" jdbcType="VARCHAR" property="invoiceType" />
+        <result column="legal_person_name" jdbcType="VARCHAR" property="legalPersonName" />
+        <result column="manufacture_address" jdbcType="VARCHAR" property="manufactureAddress" />
+        <result column="register_address" jdbcType="VARCHAR" property="registerAddress" />
+        <result column="bank_account_name" jdbcType="VARCHAR" property="bankAccountName" />
+        <result column="bank_account_number" jdbcType="VARCHAR" property="bankAccountNumber" />
+        <result column="phone_number" jdbcType="VARCHAR" property="phoneNumber" />
+        <result column="registration_type" jdbcType="VARCHAR" property="registrationType" />
+        <result column="remark" jdbcType="VARCHAR" property="remark" />
+        <result column="vehicle_routing_location" jdbcType="VARCHAR" property="vehicleRoutingLocation" />
+        <result column="ratepayer" jdbcType="VARCHAR" property="ratepayer" />
+        <result column="address" jdbcType="VARCHAR" property="address" />
+        <result column="foundation_date" jdbcType="TIMESTAMP" property="foundationDate" />
+        <result column="registration_date" jdbcType="TIMESTAMP" property="registrationDate" />
+        <result column="registration_location" jdbcType="VARCHAR" property="registrationLocation" />
+        <result column="registration_capital" jdbcType="VARCHAR" property="registrationCapital" />
+        <result column="business_allotted_time_from" jdbcType="TIMESTAMP" property="businessAllottedTimeFrom" />
+        <result column="business_allotted_time_to" jdbcType="TIMESTAMP" property="businessAllottedTimeTo" />
+        <result column="legal_code" jdbcType="VARCHAR" property="legalCode" />
+        <result column="vehicleroutinglocation" jdbcType="VARCHAR" property="vehicleroutinglocation" />
+        <result column="business_scope" jdbcType="VARCHAR" property="businessScope" />
+        <result column="architecture_type" jdbcType="VARCHAR" property="architectureType" />
+        <result column="num_of_branches" jdbcType="TINYINT" property="numOfBranches" />
+        <result column="api_update_flag" jdbcType="BIT" property="apiUpdateFlag" />
+        <result column="effec_time_of_general_taxpayers" jdbcType="TIMESTAMP" property="effecTimeOfGeneralTaxpayers" />
+        <result column="registration_location_en" jdbcType="VARCHAR" property="registrationLocationEn" />
+        <result column="paid_in_capital" jdbcType="VARCHAR" property="paidInCapital" />
+        <result column="general_tax_payer_effective_time" jdbcType="TIMESTAMP" property="generalTaxPayerEffectiveTime" />
+        <result column="oversea" jdbcType="BIT" property="oversea" />
+        <result column="reg_status" jdbcType="VARCHAR" property="regStatus" />
+        <result column="national_economic_industry" jdbcType="VARCHAR" property="nationalEconomicIndustry" />
+        <result column="engage_national_prohibit_industry" jdbcType="BIT" property="engageNationalProhibitIndustry" />
+        <result column="logout_time" jdbcType="TIMESTAMP" property="logoutTime" />
         <result column="BUSINESS_UNIT_ID" jdbcType="VARCHAR" property="businessUnitId"/>
         <result column="BUSINESS_UNIT_NAME" jdbcType="VARCHAR" property="businessUnitName"/>
         <result column="AREA_ID" jdbcType="VARCHAR" property="areaId"/>
@@ -452,6 +502,56 @@
     </select>
 
     <resultMap id="OrgDtoForGetSingleOrgByOrgID" type="pwc.taxtech.atms.dpo.OrganizationDto">
+        <id column="id" jdbcType="VARCHAR" property="id" />
+        <result column="client_code" jdbcType="VARCHAR" property="clientCode" />
+        <result column="name" jdbcType="VARCHAR" property="name" />
+        <result column="code" jdbcType="VARCHAR" property="code" />
+        <result column="parent_id" jdbcType="VARCHAR" property="parentId" />
+        <result column="tax_payer_number" jdbcType="VARCHAR" property="taxPayerNumber" />
+        <result column="region_id" jdbcType="VARCHAR" property="regionId" />
+        <result column="structure_id" jdbcType="VARCHAR" property="structureId" />
+        <result column="industry_id" jdbcType="VARCHAR" property="industryId" />
+        <result column="business_unit_id" jdbcType="VARCHAR" property="businessUnitId" />
+        <result column="is_active" jdbcType="BIT" property="isActive" />
+        <result column="p_level" jdbcType="INTEGER" property="pLevel" />
+        <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+        <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
+        <result column="area_id" jdbcType="VARCHAR" property="areaId" />
+        <result column="english_name" jdbcType="VARCHAR" property="englishName" />
+        <result column="abbreviation" jdbcType="VARCHAR" property="abbreviation" />
+        <result column="invoice_type" jdbcType="VARCHAR" property="invoiceType" />
+        <result column="legal_person_name" jdbcType="VARCHAR" property="legalPersonName" />
+        <result column="manufacture_address" jdbcType="VARCHAR" property="manufactureAddress" />
+        <result column="register_address" jdbcType="VARCHAR" property="registerAddress" />
+        <result column="bank_account_name" jdbcType="VARCHAR" property="bankAccountName" />
+        <result column="bank_account_number" jdbcType="VARCHAR" property="bankAccountNumber" />
+        <result column="phone_number" jdbcType="VARCHAR" property="phoneNumber" />
+        <result column="registration_type" jdbcType="VARCHAR" property="registrationType" />
+        <result column="remark" jdbcType="VARCHAR" property="remark" />
+        <result column="vehicle_routing_location" jdbcType="VARCHAR" property="vehicleRoutingLocation" />
+        <result column="ratepayer" jdbcType="VARCHAR" property="ratepayer" />
+        <result column="address" jdbcType="VARCHAR" property="address" />
+        <result column="foundation_date" jdbcType="TIMESTAMP" property="foundationDate" />
+        <result column="registration_date" jdbcType="TIMESTAMP" property="registrationDate" />
+        <result column="registration_location" jdbcType="VARCHAR" property="registrationLocation" />
+        <result column="registration_capital" jdbcType="VARCHAR" property="registrationCapital" />
+        <result column="business_allotted_time_from" jdbcType="TIMESTAMP" property="businessAllottedTimeFrom" />
+        <result column="business_allotted_time_to" jdbcType="TIMESTAMP" property="businessAllottedTimeTo" />
+        <result column="legal_code" jdbcType="VARCHAR" property="legalCode" />
+        <result column="vehicleroutinglocation" jdbcType="VARCHAR" property="vehicleroutinglocation" />
+        <result column="business_scope" jdbcType="VARCHAR" property="businessScope" />
+        <result column="architecture_type" jdbcType="VARCHAR" property="architectureType" />
+        <result column="num_of_branches" jdbcType="TINYINT" property="numOfBranches" />
+        <result column="api_update_flag" jdbcType="BIT" property="apiUpdateFlag" />
+        <result column="effec_time_of_general_taxpayers" jdbcType="TIMESTAMP" property="effecTimeOfGeneralTaxpayers" />
+        <result column="registration_location_en" jdbcType="VARCHAR" property="registrationLocationEn" />
+        <result column="paid_in_capital" jdbcType="VARCHAR" property="paidInCapital" />
+        <result column="general_tax_payer_effective_time" jdbcType="TIMESTAMP" property="generalTaxPayerEffectiveTime" />
+        <result column="oversea" jdbcType="BIT" property="oversea" />
+        <result column="reg_status" jdbcType="VARCHAR" property="regStatus" />
+        <result column="national_economic_industry" jdbcType="VARCHAR" property="nationalEconomicIndustry" />
+        <result column="engage_national_prohibit_industry" jdbcType="BIT" property="engageNationalProhibitIndustry" />
+        <result column="logout_time" jdbcType="TIMESTAMP" property="logoutTime" />
         <result column="INDUSTRY_NAME" jdbcType="VARCHAR" property="industryName"/>
         <result column="REGION_NAME" jdbcType="VARCHAR" property="regionName"/>
         <result column="STRUCTURE_NAME" jdbcType="VARCHAR" property="structureName"/>

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

@@ -2,7 +2,69 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="pwc.taxtech.atms.dao.OrganizationExtraMapper">
 
-  <select id="selectByOrgId" resultType="pwc.taxtech.atms.dpo.OrganizationExtraDto">
+  <resultMap id="OrganizationExtraDto" type="pwc.taxtech.atms.dpo.OrganizationExtraDto">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="organization_id" jdbcType="VARCHAR" property="organizationId" />
+    <result column="unified_social_credit_code" jdbcType="VARCHAR" property="unifiedSocialCreditCode" />
+    <result column="reg_financial_accounting_type" jdbcType="BIT" property="regFinancialAccountingType" />
+    <result column="tax_reg_status" jdbcType="VARCHAR" property="taxRegStatus" />
+    <result column="tax_credit_rating" jdbcType="VARCHAR" property="taxCreditRating" />
+    <result column="applicable_accounting_rule" jdbcType="VARCHAR" property="applicableAccountingRule" />
+    <result column="low_value_consumables_amortization_method" jdbcType="VARCHAR" property="lowValueConsumablesAmortizationMethod" />
+    <result column="depreciation_method" jdbcType="VARCHAR" property="depreciationMethod" />
+    <result column="accounting_software" jdbcType="VARCHAR" property="accountingSoftware" />
+    <result column="complete_record_total_institutions" jdbcType="BIT" property="completeRecordTotalInstitutions" />
+    <result column="tax_client_person_name" jdbcType="VARCHAR" property="taxClientPersonName" />
+    <result column="tax_client_person_phone_num" jdbcType="VARCHAR" property="taxClientPersonPhoneNum" />
+    <result column="tax_client_person_id_num" jdbcType="VARCHAR" property="taxClientPersonIdNum" />
+    <result column="ticket_holder_name" jdbcType="VARCHAR" property="ticketHolderName" />
+    <result column="ticket_holder_phone_num" jdbcType="VARCHAR" property="ticketHolderPhoneNum" />
+    <result column="national_tax_hall_address" jdbcType="VARCHAR" property="nationalTaxHallAddress" />
+    <result column="national_tax_administrator_name" jdbcType="VARCHAR" property="nationalTaxAdministratorName" />
+    <result column="national_tax_administrator_phone_num" jdbcType="VARCHAR" property="nationalTaxAdministratorPhoneNum" />
+    <result column="local_tax_hall_address" jdbcType="VARCHAR" property="localTaxHallAddress" />
+    <result column="local_tax_administrator_name" jdbcType="VARCHAR" property="localTaxAdministratorName" />
+    <result column="local_tax_administrator_phone_num" jdbcType="VARCHAR" property="localTaxAdministratorPhoneNum" />
+    <result column="eta_website" jdbcType="VARCHAR" property="etaWebsite" />
+    <result column="sign_tripartite_agreement" jdbcType="BIT" property="signTripartiteAgreement" />
+    <result column="reporting_currency" jdbcType="VARCHAR" property="reportingCurrency" />
+    <result column="consolidation_time" jdbcType="TIMESTAMP" property="consolidationTime" />
+    <result column="fiscal_year_deadline" jdbcType="TIMESTAMP" property="fiscalYearDeadline" />
+    <result column="tax_agent" jdbcType="VARCHAR" property="taxAgent" />
+    <result column="tax_agent_contact" jdbcType="VARCHAR" property="taxAgentContact" />
+    <result column="other_facts" jdbcType="VARCHAR" property="otherFacts" />
+    <result column="tax_return_business_type" jdbcType="TINYINT" property="taxReturnBusinessType" />
+    <result column="small_meager_profit" jdbcType="BIT" property="smallMeagerProfit" />
+    <result column="listed_company" jdbcType="BIT" property="listedCompany" />
+    <result column="applicable_accounting_standards_or_accounting_systems" jdbcType="INTEGER" property="applicableAccountingStandardsOrAccountingSystems" />
+    <result column="tax_payer_number_vat" jdbcType="VARCHAR" property="taxPayerNumberVat" />
+    <result column="tax_payer_number_cit" jdbcType="VARCHAR" property="taxPayerNumberCit" />
+    <result column="tax_client_person_email_address" jdbcType="VARCHAR" property="taxClientPersonEmailAddress" />
+    <result column="bank_account_name" jdbcType="VARCHAR" property="bankAccountName" />
+    <result column="bank_account_number" jdbcType="VARCHAR" property="bankAccountNumber" />
+    <result column="legal_person_name" jdbcType="VARCHAR" property="legalPersonName" />
+    <result column="legal_person_phone_number" jdbcType="VARCHAR" property="legalPersonPhoneNumber" />
+    <result column="legal_person_landline_num" jdbcType="VARCHAR" property="legalPersonLandlineNum" />
+    <result column="legal_person_email_address" jdbcType="VARCHAR" property="legalPersonEmailAddress" />
+    <result column="reg_financial_officer_name" jdbcType="VARCHAR" property="regFinancialOfficerName" />
+    <result column="reg_financial_officer_phone_num" jdbcType="VARCHAR" property="regFinancialOfficerPhoneNum" />
+    <result column="reg_financial_officer_landline_num" jdbcType="VARCHAR" property="regFinancialOfficerLandlineNum" />
+    <result column="reg_financial_officer_email_address" jdbcType="VARCHAR" property="regFinancialOfficerEmailAddress" />
+    <result column="secondary_approval_amount" jdbcType="BIGINT" property="secondaryApprovalAmount" />
+    <result column="business_registration_number" jdbcType="VARCHAR" property="businessRegistrationNumber" />
+    <result column="par_value" jdbcType="REAL" property="parValue" />
+    <result column="issued_shares" jdbcType="BIGINT" property="issuedShares" />
+    <result column="directors" jdbcType="VARCHAR" property="directors" />
+    <result column="actual_business_address" jdbcType="VARCHAR" property="actualBusinessAddress" />
+    <result column="tax_rule_introduction" jdbcType="VARCHAR" property="taxRuleIntroduction" />
+    <result column="audit_requirements" jdbcType="VARCHAR" property="auditRequirements" />
+  </resultMap>
+
+  <select id="selectByOrgId" resultMap="OrganizationExtraDto">
     SELECT
     orgEx.*
     FROM

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

@@ -1615,5 +1615,15 @@
     "vid": "Voucher ID",
     "voucherMapping": "Voucher re-categorisation",
     "voucherMappingDesc": "Voucher Mapping",
+    "offlineBilling": "线下开票",
+    "invoiceRecord": "已开增值税发票记录",
+    "InvoiceRecordTitle": "已开增值税发票记录",
+    "certifiedInvoicesList": "已认证发票清单",
+    "redLetterInformationTable": "红字信息表",
+    "coupaPurchasingReport": "Coupa采购报告",
+    "adjustmentTable": "调整表",
+    "incomeStatement": "利润表",
+    "quarterlyOwnersEquityChangeTable": "季度所有者权益变动表",
+    "directMethodCashFlowStatement": "直接法现金流量表",
     "~MustBeEndOneApp": "I Must be the End One, please!"
 }
\ No newline at end of file

atms-web/src/main/webapp/app/admin/infrastructure/organizationManage/organization-manage.ctrl.js

@@ -1974,7 +1974,6 @@
                 loadTaxOfficerDatagrid();
                 loadEmployeeDatagrid();
                 loadTaxpayerQualificationDatagrid();
-
             };
 
 

atms-web/src/main/webapp/app/common/controls/edit-organization-modal/edit-organization-modal.ctrl.js

@@ -358,6 +358,9 @@ controller('editOrganizationModalController', ['$scope', '$log', '$translate', '
                     orgData.parentID = NoOptions.id;
                 }
 
+                $scope.isInternational = $scope.selectCompany.oversea;
+                $scope.isLocal = !$scope.isInternational;
+
                 $scope.selfDimensionError = false;
 
                 // 设置层级

atms-web/src/main/webapp/app/common/controls/edit-organization-modal/edit-organization-modal.html

@@ -4,12 +4,12 @@
             <div class="modal-content">
                 <div class="modal-header">
                     <div class="modal-title" ng-if="isAdd">{{'AddOrganization' | translate}}
-                        <button type="button" class="btn btn-in-grid" style="width: 117px;" ng-click="changeInternational()" ng-show="isLocal"><i class="mdui-icon material-icons">&#xe428;</i>{{'International' | translate}}</button>
-                        <button type="button" class="btn btn-in-grid" style="width: 117px;" ng-click="changeLocal()" ng-show="!isLocal"><i class="mdui-icon material-icons">&#xe428;</i>{{'Local' | translate}}</button>
+                        <button type="button" class="btn btn-in-grid" style="width: 117px;" ng-click="changeInternational()" ng-show="isAdd&&isLocal"><i class="mdui-icon material-icons">&#xe428;</i>{{'International' | translate}}</button>
+                        <button type="button" class="btn btn-in-grid" style="width: 117px;" ng-click="changeLocal()" ng-show="isAdd&&!isLocal"><i class="mdui-icon material-icons">&#xe428;</i>{{'Local' | translate}}</button>
                     </div>
                     <div class="modal-title" ng-if="!isAdd">{{'EditOrganization' | translate}}
-                        <button type="button" class="btn btn-in-grid" style="width: 117px;" ng-click="changeInternational()" ng-show="isLocal"><i class="mdui-icon material-icons">&#xe428;</i>{{'International' | translate}}</button>
-                        <button type="button" class="btn btn-in-grid" style="width: 117px;" ng-click="changeLocal()" ng-show="!isLocal"><i class="mdui-icon material-icons">&#xe428;</i>{{'Local' | translate}}</button>
+                        <button type="button" class="btn btn-in-grid" style="width: 117px;" ng-click="changeInternational()" ng-show="isAdd&&isLocal"><i class="mdui-icon material-icons">&#xe428;</i>{{'International' | translate}}</button>
+                        <button type="button" class="btn btn-in-grid" style="width: 117px;" ng-click="changeLocal()" ng-show="isAdd&&!isLocal"><i class="mdui-icon material-icons">&#xe428;</i>{{'Local' | translate}}</button>
                     </div>
                 </div>
                 <div id="orgControlTab" ng-if="isAdd">

atms-web/src/main/webapp/app/common/utils/constant.js

@@ -445,6 +445,37 @@ constant.vatPermission = {
         },
         inputInvoice: {
             queryCode: '02.002.003'
+        },
+        // todo 维护入数据库
+        invoiceRecord: {
+            queryCode: '02.002.007'
+        },
+        certifiedInvoicesList: {
+            queryCode: '02.002.008'
+        },
+        redLetterInformationTable: {
+            queryCode: '02.002.009'
+        },
+        coupaPurchasingReport: {
+            queryCode: '02.002.010'
+        },
+        adjustmentTab: {
+            queryCode: '02.002.011'
+        },
+        balanceSheet: {
+            queryCode: '02.002.012'
+        },
+        incomeStatement: {
+            queryCode: '02.002.013'
+        },
+        quarterlyOwnersEquityChangeTable: {
+            queryCode: '02.002.014'
+        },
+        directMethodCashFlowStatement: {
+            queryCode: '02.002.015'
+        },
+        trialBalance: {
+            queryCode: '02.002.016'
         }
     },
     dataManage: {

atms-web/src/main/webapp/app/common/vatservices/vatPreviewService.js

@@ -174,6 +174,15 @@
         },
         getEnterpriseAccount: function () {
             return $http.get('/voucher/getEnterpriseAccount', apiConfig.create());
+        },
+
+
+
+        /****************************************************************************************************/
+        /* Tony's Beatup services */
+        getTBDataForDisplay: function (queryParams) {
+            return $http.post('/dataPreview/getTBDataForDisplay', queryParams, apiConfig.createVat());
+            // return $http.get('/DataImport/GetBalanceDataForDisplay?category=' + category + '&fromPeriod=' + fromPeriod + '&toPeriod=' + toPeriod + '&criteria=' + criteria, apiConfig.createVat());
         }
     };
 }]);
\ No newline at end of file

atms-web/src/main/webapp/app/vat/preview/vat-preview-adjustment-tab/vat-preview-adjustment-tab.js

+vatModule.directive('vatPreviewAdjustmentTab', ['$log', 'browserService', '$translate', 'region', '$timeout',
+    function ($log, browserService, $translate, region, $timeout) {
+        $log.debug('vatPreviewAdjustmentTab.ctor()...');
+
+        return {
+            restrict: 'E',
+            templateUrl: '/app/vat/preview/vat-preview-adjustment-tab/vat-preview-adjustment-tab.html' + '?_=' + Math.random(),
+            scope: {},
+            controller: 'VatPreviewAdjustmentTabController',
+            link: function ($scope, element) {
+
+            }
+        }
+    }
+]);
\ No newline at end of file