Merge branch 'dev' into dev_eddie

atms-api/src/main/java/pwc/taxtech/atms/dao/AccountMapper.java → atms-api/src/main/java/pwc/taxtech/atms/dao/CustomAccountMapper.java

@@ -12,7 +12,7 @@ import pwc.taxtech.atms.MyMapper;
 import pwc.taxtech.atms.entitiy.EnterpriseAccount;
 
 @Mapper
-public interface AccountMapper extends MyMapper {
+public interface CustomAccountMapper extends MyMapper {
 
     @Select("SELECT ea.ID,ea.Code,ea.Name,ea.ParentCode,ea.FullName,"
             + "CASE WHEN am.StandardAccountCode='0000' THEN am.StandardAccountCode ELSE sa.Code END StdCode,"

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

@@ -36,7 +36,7 @@ public class AbstractService {
     @Autowired
     protected AccountMappingMapper accountMappingMapper;
     @Autowired
-    protected AccountMapper accountMapper;
+    protected CustomAccountMapper customAccountMapper;
     @Autowired
     protected MailQueueMapper mailQueueMapper;
     @Autowired

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

@@ -97,7 +97,7 @@ public class AccountServiceImpl extends AbstractService implements AccountServic
 
     private boolean isStdExists(String enterpriseAccountSetID, String enterpirseAccountCode, String industryID, String organizationID) {
         
-        Long stdAccountsCount = accountMapper.countStandardAccounts(enterpriseAccountSetID, enterpirseAccountCode, industryID, organizationID);
+        Long stdAccountsCount = customAccountMapper.countStandardAccounts(enterpriseAccountSetID, enterpirseAccountCode, industryID, organizationID);
         
         return stdAccountsCount>=1;
     }

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

@@ -1640,7 +1640,7 @@ public class EnterpriseAccountServiceImpl extends AbstractService implements Ent
      * @return
      */
     private List<EnterpriseAccount> getMappingResultByParentCode(String parentCode, String accountSetID, String industryID, String orgID) {
-        return accountMapper.getMappingResult(accountSetID, industryID, orgID, parentCode);
+        return customAccountMapper.getMappingResult(accountSetID, industryID, orgID, parentCode);
     }
     
     private void addMapParentAccountResult(String key, List<String> value)

atms-api/src/test/java/pwc/taxtech/atms/service/impl/EnterpriseAccountServiceIT.java

@@ -166,7 +166,7 @@ public class EnterpriseAccountServiceIT extends CommonIT {
 	    String industryID = "0";
 	    String orgID = "5d6a7685-4dd0-46b2-83af-6db1380f8fc6";
         String parentCode = "1001";
-	    List<EnterpriseAccount> epAccounts = accountMapper.getMappingResult(accountSetID, industryID, orgID, parentCode);
+	    List<EnterpriseAccount> epAccounts = customAccountMapper.getMappingResult(accountSetID, industryID, orgID, parentCode);
 	    System.out.println(epAccounts);
 	}*/