CIT数据导入试算平衡表自动生成功能及整体优化

atms-api/src/main/java/pwc/taxtech/atms/common/util/DateUtils.java

@@ -135,6 +135,17 @@ public class DateUtils {
         return period;
     }
 
+    /**
+     * 将yyyy- 等字符串转换为区间格式 yyyy
+     * @param dateStr
+     * @return
+     */
+    public static Integer strToPeriodY(String dateStr) {
+        dateStr = dateStr.replace(" ","");
+        Integer period = Integer.valueOf(dateStr.substring(0, 4));
+        return period;
+    }
+
 
     /**
      * 将yyyymm 字符串转换为区间格式 yyyyMM

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

@@ -79,7 +79,7 @@ public class CitImportExcelServiceImpl extends BaseService {
         if (StringUtils.isBlank(periodDate) || "null".equals(periodDate)) {
             throw new ServiceException(ErrorMessageCN.DoNotSelectPeriod);
         }
-        Integer period = DateUtils.strToPeriod(periodDate);
+        Integer period = DateUtils.strToPeriodY(periodDate);
 
         //获取上传文件类型的枚举值
         EnumCitImportType enumValue = EnumCitImportType.valueOf(importFileType);
@@ -141,7 +141,8 @@ public class CitImportExcelServiceImpl extends BaseService {
 //        Integer period = CitCommonUtil.getPeriod();
         String companyName = CitCommonUtil.getValue(sheet.getRow(1).getCell(19)).toString();
         String companyCode = CitCommonUtil.getValue(sheet.getRow(1).getCell(9)).toString();
-        ;
+
+        //根据code（主体）获取机构相关信息
         List<Organization> organizations = getOrganizationByCode(companyCode);
         String orgId = "";
         String taxPayerId = "";
@@ -161,50 +162,64 @@ public class CitImportExcelServiceImpl extends BaseService {
             return saveResult;
         }
 
-
+        String currentUserName = authUserHelper.getCurrentAuditor().get();
         //通过循环来完成sheet获取每一行每一列数据并进行相关逻辑处理
         for (int rowNum = sheet.getFirstRowNum() + 1; rowNum <= sheet.getLastRowNum(); rowNum++) {
-
+            CitDataImportLog citDataImportLogError = generalCitDataImportLog("", "", "",
+                    EnumCitImportType.JournalAdjust.getCode(), 0,
+                    0, 0,
+                    "", "日记账调整版", false);
+            citDataImportLogError.setRecordSize(1);
             //获取该行数据
             Row rowData = sheet.getRow(rowNum);
-
-
+            //拼接日记账调整版的实体
             CitJournalEntryAdjust citJournal = new CitJournalEntryAdjust();
             citJournal.setId(idService.nextId());
             citJournal.setPeriod(period);
             citJournal.setOrganizationId(orgId);
+            citJournal.setCreatedBy(currentUserName);
+
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
             citJournal.setAccountPeriod(new Integer(CitCommonUtil.getValue(rowData.getCell(2)).toString().replace("-", "")));
             citJournal.setAccountingDate(sdf.parse(CitCommonUtil.getValue(rowData.getCell(3)).toString()));
             citJournal.setVoucherNum(CitCommonUtil.getValue(rowData.getCell(7)).toString());
             citJournal.setDescription(CitCommonUtil.getValue(rowData.getCell(8)).toString());
-            citJournal.setSegment1(CitCommonUtil.getValue(rowData.getCell(9)).toString());
-            citJournal.setSegment3(CitCommonUtil.getValue(rowData.getCell(11)).toString());
-            citJournal.setSegment1Name(CitCommonUtil.getValue(rowData.getCell(19)).toString());
-            citJournal.setSegment3Name(CitCommonUtil.getValue(rowData.getCell(21)).toString());
-            Object cellvalue = CitCommonUtil.getValue(rowData.getCell(31));
-            if(cellvalue == null){
-                cellvalue = "0";
+            citJournal.setOrgCode(CitCommonUtil.getValue(rowData.getCell(9)).toString());
+            Object cellValue = CitCommonUtil.getValue(rowData.getCell(11));
+            if(cellValue == null){
+                citDataImportLogError.setErrorMsg("数据错误，第"+(rowNum+1)+"行科目代码为空");
+                citDataImportLogList.add(citDataImportLogError);
+                continue;
             }
-            citJournal.setAccountedDr(new BigDecimal(cellvalue.toString()));
-            cellvalue = CitCommonUtil.getValue(rowData.getCell(32));
-            if(cellvalue == null){
-                cellvalue = "0";
+            citJournal.setSubjectCode(cellValue.toString());
+            citJournal.setOrgName(CitCommonUtil.getValue(rowData.getCell(19)).toString());
+            citJournal.setSubjectName(CitCommonUtil.getValue(rowData.getCell(21)).toString());
+            //借方金额
+            cellValue = CitCommonUtil.getValue(rowData.getCell(31));
+            if(cellValue == null){
+                cellValue = "0";
             }
-            citJournal.setAccountedCr(new BigDecimal(cellvalue.toString()));
-
+            citJournal.setAccountedDr(new BigDecimal(cellValue.toString()));
+            //贷方金额
+            cellValue = CitCommonUtil.getValue(rowData.getCell(32));
+            if(cellValue == null){
+                cellValue = "0";
+            }
+            citJournal.setAccountedCr(new BigDecimal(cellValue.toString()));
             journalAdjustList.add(citJournal);
         }
 
+        //判断导入的方式
         String msg = "追加导入成功";
         if (EnumTbImportType.CoverImport.getCode().equals(importType)) {
+            //覆盖导入要删除原有的该操作人在当前期间导入的数据，且更改之前导入的日志记录状态
             msg = "覆盖导入成功";
             CitJournalEntryAdjustExample example = new CitJournalEntryAdjustExample();
             CitJournalEntryAdjustExample.Criteria criteria = example.createCriteria();
-            criteria.andCreatedByEqualTo(authUserHelper.getCurrentAuditor().get());
+            criteria.andCreatedByEqualTo(currentUserName);
             criteria.andPeriodEqualTo(period);
             citJournalEntryAdjustMapper.deleteByExample(example);
-            updateImportLog(1);
+            updateImportLog(EnumCitImportType.JournalAdjust.getCode());
         }
         int insertBatchNum = citJournalEntryAdjustMapper.insertBatch(journalAdjustList);
         CitDataImportLog citDataImportLog = generalCitDataImportLog(companyCode, orgId, taxPayerId,
@@ -216,6 +231,7 @@ public class CitImportExcelServiceImpl extends BaseService {
 
         citDataImportLogList.add(citDataImportLog);
         addDataImportLog(citDataImportLogList);
+        autoGeneTB(period, orgId, orgList);
         saveResult.setResult(true);
         saveResult.setResultMsg("导入成功");
         return saveResult;
@@ -256,6 +272,7 @@ public class CitImportExcelServiceImpl extends BaseService {
         Map<String, Integer> companySuccessMap = new HashMap();
         Map<String, Integer> companyFailMap = new HashMap();
         Map<String, Integer> noCompanyMap = new HashMap();
+        String currentUserName = authUserHelper.getCurrentAuditor().get();
         //通过循环来完成sheet获取每一行每一列数据并进行相关逻辑处理
         for (int rowNum = sheet.getFirstRowNum() + 8; rowNum <= sheet.getLastRowNum(); rowNum++) {
 
@@ -265,6 +282,7 @@ public class CitImportExcelServiceImpl extends BaseService {
             CitTrialBalance trialBalance = new CitTrialBalance();
             trialBalance.setId(idService.nextId());
             trialBalance.setPeriod(period);
+            trialBalance.setCreateBy(currentUserName);
 
             CitDataImportLog citDataImportLogError = generalCitDataImportLog("", "", "",
                     EnumCitImportType.TrialBalance.getCode(), 0,
@@ -286,7 +304,6 @@ public class CitImportExcelServiceImpl extends BaseService {
             String orgId = "";
             String taxPayerId = "";
             if (organizations != null && organizations.size() > 0) {
-
                 orgId = organizations.get(0).getId();
                 taxPayerId = StringUtils.isNotEmpty(organizations.get(0).getLegalCode()) ?
                         organizations.get(0).getLegalCode() : organizations.get(0).getTaxPayerNumber();
@@ -301,13 +318,13 @@ public class CitImportExcelServiceImpl extends BaseService {
                 sb.append(",");
                 sb.append(companyName);
                 if(!orgList.contains(orgId)){
-                    companyFailMap.put(sb.toString(),companyFailMap.get(sb.toString())==null?1:companyFailMap.get(sb.toString())+1);
+                    companyFailMap.put(sb.toString(),companyFailMap.containsKey(sb.toString())?companyFailMap.get(sb.toString())+1:1);
                     continue;
                 }
-                companySuccessMap.put(sb.toString(),companySuccessMap.get(sb.toString())==null?1:companySuccessMap.get(sb.toString())+1);
+                companySuccessMap.put(sb.toString(),companySuccessMap.containsKey(sb.toString())?companySuccessMap.get(sb.toString())+1:1);
 
             }else{
-                noCompanyMap.put(companyCode,companySuccessMap.get(companyCode)==null?1:companySuccessMap.get(companyCode)+1);
+                noCompanyMap.put(companyCode,noCompanyMap.containsKey(companyCode)?noCompanyMap.get(companyCode)+1:1);
                 continue;
             }
 
@@ -328,10 +345,10 @@ public class CitImportExcelServiceImpl extends BaseService {
             msg = "覆盖导入成功";
             CitTrialBalanceExample citTrialBalanceExample = new CitTrialBalanceExample();
             CitTrialBalanceExample.Criteria criteria = citTrialBalanceExample.createCriteria();
-            criteria.andCreateByEqualTo(authUserHelper.getCurrentAuditor().get());
+            criteria.andCreateByEqualTo(currentUserName);
             criteria.andPeriodEqualTo(period);
             citTrialBalanceMapper.deleteByExample(citTrialBalanceExample);
-            updateImportLog(1);
+            updateImportLog(EnumCitImportType.TrialBalance.getCode());
         }
         int insertBatchNum = citTrialBalanceMapper.insertBatch(trialBalanceList);
 
@@ -402,7 +419,7 @@ public class CitImportExcelServiceImpl extends BaseService {
         List<CitDraftAccountMapping> citDAMappings = new ArrayList<>();
         List<CitDataImportLog> citDataImportLogList = new ArrayList<>();
 //        Integer period = CitCommonUtil.getPeriod();
-
+        String currentUserName = authUserHelper.getCurrentAuditor().get();
         //通过循环来完成sheet获取每一行每一列数据并进行相关逻辑处理
         for (int rowNum = sheet.getFirstRowNum() + 1; rowNum <= sheet.getLastRowNum(); rowNum++) {
 
@@ -417,6 +434,8 @@ public class CitImportExcelServiceImpl extends BaseService {
             CitDraftAccountMapping citDAMapping = new CitDraftAccountMapping();
             citDAMapping.setId(idService.nextId());
             citDAMapping.setPeriod(period);
+            citDAMapping.setCreatedBy(currentUserName);
+
             Object cellValue = CitCommonUtil.getValue(rowData.getCell(5));
             if(cellValue == null){
                 citDataImportLogError.setErrorMsg("数据错误，第"+(rowNum+1)+"行科目代码为空");
@@ -448,10 +467,10 @@ public class CitImportExcelServiceImpl extends BaseService {
             msg = "覆盖导入成功";
             CitDraftAccountMappingExample example = new CitDraftAccountMappingExample();
             CitDraftAccountMappingExample.Criteria criteria = example.createCriteria();
-            criteria.andCreatedByEqualTo(authUserHelper.getCurrentAuditor().get());
+            criteria.andCreatedByEqualTo(currentUserName);
             criteria.andPeriodEqualTo(period);
             citDAMappingMapper.deleteByExample(example);
-            updateImportLog(1);
+            updateImportLog(EnumCitImportType.DraftAccountMapping.getCode());
         }
 
         int insertBatchNum = citDAMappingMapper.insertBatch(citDAMappings);
@@ -521,7 +540,7 @@ public class CitImportExcelServiceImpl extends BaseService {
             saveResult.setResultMsg(ErrorMessageCN.NoCompanyError);
             return saveResult;
         }
-
+        String currentUserName = authUserHelper.getCurrentAuditor().get();
         //通过循环来完成sheet获取每一行每一列数据并进行相关逻辑处理
         for (int rowNum = sheet.getFirstRowNum() + 10; rowNum <= sheet.getLastRowNum(); rowNum++) {
 
@@ -538,6 +557,7 @@ public class CitImportExcelServiceImpl extends BaseService {
             citBSPrcAdjust.setId(idService.nextId());
             citBSPrcAdjust.setPeriod(period);
             citBSPrcAdjust.setOrganizationId(orgId);
+            citBSPrcAdjust.setCreateBy(currentUserName);
 
             Object cellValue = CitCommonUtil.getValue(rowData.getCell(0));
             if(cellValue == null){
@@ -572,10 +592,10 @@ public class CitImportExcelServiceImpl extends BaseService {
             msg = "覆盖导入成功";
             CitBalanceSheetPrcAdjustExample example = new CitBalanceSheetPrcAdjustExample();
             CitBalanceSheetPrcAdjustExample.Criteria criteria = example.createCriteria();
-            criteria.andCreateByEqualTo(authUserHelper.getCurrentAuditor().get());
+            criteria.andCreateByEqualTo(currentUserName);
             criteria.andPeriodEqualTo(period);
             citBSPrcAdjustMapper.deleteByExample(example);
-            updateImportLog(1);
+            updateImportLog(EnumCitImportType.BalanceSheetPrcAdjust.getCode());
         }
 
         int insertBatchNum = citBSPrcAdjustMapper.insertBatch(citBSPrcAdjustList);
@@ -587,6 +607,8 @@ public class CitImportExcelServiceImpl extends BaseService {
         citDataImportLog.setErrorMsg(msg);
         citDataImportLogList.add(citDataImportLog);
         addDataImportLog(citDataImportLogList);
+        saveResult.setResult(true);
+        saveResult.setResultMsg("导入成功");
         return null;
     }
 
@@ -642,7 +664,7 @@ public class CitImportExcelServiceImpl extends BaseService {
             saveResult.setResultMsg(ErrorMessageCN.DoNotSelectCompany);
             return saveResult;
         }
-
+        String currentUserName = authUserHelper.getCurrentAuditor().get();
         //通过循环来完成sheet获取每一行每一列数据并进行相关逻辑处理
         for (int rowNum = sheet.getFirstRowNum() + 10; rowNum <= sheet.getLastRowNum(); rowNum++) {
 
@@ -658,6 +680,7 @@ public class CitImportExcelServiceImpl extends BaseService {
             CitProfitPrcAdjust citProfitPrcAdjust = new CitProfitPrcAdjust();
             citProfitPrcAdjust.setId(idService.nextId());
             citProfitPrcAdjust.setPeriod(period);
+            citProfitPrcAdjust.setCreateBy(currentUserName);
 
             Object cellValue = CitCommonUtil.getValue(rowData.getCell(0));
             if(cellValue == null){
@@ -690,10 +713,10 @@ public class CitImportExcelServiceImpl extends BaseService {
             msg = "覆盖导入成功";
             CitProfitPrcAdjustExample example = new CitProfitPrcAdjustExample();
             CitProfitPrcAdjustExample.Criteria criteria = example.createCriteria();
-            criteria.andCreateByEqualTo(authUserHelper.getCurrentAuditor().get());
+            criteria.andCreateByEqualTo(currentUserName);
             criteria.andPeriodEqualTo(period);
             citProfitPrcAdjustMapper.deleteByExample(example);
-            updateImportLog(1);
+            updateImportLog(EnumCitImportType.ProfitPrcAdjust.getCode());
         }
 
         int insertBatchNum = citProfitPrcAdjustMapper.insertBatch(citProfitPrcAdjustList);
@@ -738,7 +761,7 @@ public class CitImportExcelServiceImpl extends BaseService {
         List<CitEAMAssetsDisposal> citEAMAssetsList = new ArrayList<>();
         List<CitDataImportLog> citDataImportLogList = new ArrayList<>();
 //        Integer period = CitCommonUtil.getPeriod();
-
+        String currentUserName = authUserHelper.getCurrentAuditor().get();
         //通过循环来完成sheet获取每一行每一列数据并进行相关逻辑处理
         for (int rowNum = sheet.getFirstRowNum() + 3; rowNum <= sheet.getLastRowNum(); rowNum++) {
 
@@ -754,6 +777,7 @@ public class CitImportExcelServiceImpl extends BaseService {
             CitEAMAssetsDisposal citEAMAssetsDisposal = new CitEAMAssetsDisposal();
             citEAMAssetsDisposal.setId(idService.nextId());
             citEAMAssetsDisposal.setPeriod(Integer.valueOf(CitCommonUtil.getPeriod().toString()));
+            citEAMAssetsDisposal.setCreatedBy(currentUserName);
 
             String[] split = CitCommonUtil.getValue(rowData.getCell(1)).toString().split("-");
             StringBuilder sb = new StringBuilder(split[0]);
@@ -772,10 +796,10 @@ public class CitImportExcelServiceImpl extends BaseService {
             msg = "覆盖导入成功";
             CitEAMAssetsDisposalExample example = new CitEAMAssetsDisposalExample();
             CitEAMAssetsDisposalExample.Criteria criteria = example.createCriteria();
-            criteria.andCreatedByEqualTo(authUserHelper.getCurrentAuditor().get());
+            criteria.andCreatedByEqualTo(currentUserName);
             criteria.andPeriodEqualTo(period);
             citEAMAssetsMapper.deleteByExample(example);
-            updateImportLog(1);
+            updateImportLog(EnumCitImportType.EAMAssetsDisposal.getCode());
         }
 
         int insertBatchNum = citEAMAssetsMapper.insertBatch(citEAMAssetsList);
@@ -787,7 +811,9 @@ public class CitImportExcelServiceImpl extends BaseService {
         citDataImportLog.setErrorMsg(msg);
         citDataImportLogList.add(citDataImportLog);
         addDataImportLog(citDataImportLogList);
-        return null;
+        saveResult.setResult(true);
+        saveResult.setResultMsg("导入成功");
+        return saveResult;
     }
 
     /**
@@ -824,6 +850,7 @@ public class CitImportExcelServiceImpl extends BaseService {
         Map<String, Integer> companySuccessMap = new HashMap();
         Map<String, Integer> companyFailMap = new HashMap();
         Map<String, Integer> noCompanyMap = new HashMap();
+        String currentUserName = authUserHelper.getCurrentAuditor().get();
         //通过循环来完成sheet获取每一行每一列数据并进行相关逻辑处理
         for (int rowNum = sheet.getFirstRowNum() + 2; rowNum <= sheet.getLastRowNum(); rowNum++) {
 
@@ -866,19 +893,20 @@ public class CitImportExcelServiceImpl extends BaseService {
                 sb.append(",");
                 sb.append(companyName);
                 if(!orgList.contains(orgId)){
-                    companyFailMap.put(sb.toString(),companyFailMap.get(sb.toString())==null?1:companyFailMap.get(sb.toString())+1);
+                    companyFailMap.put(sb.toString(),companyFailMap.containsKey(sb.toString())?companyFailMap.get(sb.toString())+1:1);
                     continue;
                 }
-                companySuccessMap.put(sb.toString(),companySuccessMap.get(sb.toString())==null?1:companySuccessMap.get(sb.toString())+1);
+                companySuccessMap.put(sb.toString(),companySuccessMap.containsKey(sb.toString())?companySuccessMap.get(sb.toString())+1:1);
 
             }else{
-                noCompanyMap.put(companyCode,companySuccessMap.get(companyCode)==null?1:companySuccessMap.get(companyCode)+1);
+                noCompanyMap.put(companyCode,noCompanyMap.containsKey(companyCode)?noCompanyMap.get(companyCode)+1:1);
                 continue;
             }
 
             CitSalaryAdvance citSalaryAdvance = new CitSalaryAdvance();
             citSalaryAdvance.setId(idService.nextId());
             citSalaryAdvance.setPeriod(Integer.valueOf(CitCommonUtil.getPeriod().toString()));
+            citSalaryAdvance.setCreatedBy(currentUserName);
 
             Object cellValue = CitCommonUtil.getValue(rowData.getCell(0));
             if(cellValue == null){
@@ -917,10 +945,10 @@ public class CitImportExcelServiceImpl extends BaseService {
             msg = "覆盖导入成功";
             CitSalaryAdvanceExample example = new CitSalaryAdvanceExample();
             CitSalaryAdvanceExample.Criteria criteria = example.createCriteria();
-            criteria.andCreatedByEqualTo(authUserHelper.getCurrentAuditor().get());
+            criteria.andCreatedByEqualTo(currentUserName);
             criteria.andPeriodEqualTo(period);
             citSalaryAdvanceMapper.deleteByExample(example);
-            updateImportLog(1);
+            updateImportLog(EnumCitImportType.SalaryAdvance.getCode());
         }
         int insertBatchNum = citSalaryAdvanceMapper.insertBatch(citSalaryAdvanceList);
 
@@ -954,9 +982,6 @@ public class CitImportExcelServiceImpl extends BaseService {
             citDataImportLogError.setErrorMsg(ErrorMessageCN.NoCompanyError);
             citDataImportLogList.add(citDataImportLogError);
         }
-        if (EnumTbImportType.CoverImport.getCode().equals(importType)) {
-            updateImportLog(1);
-        }
         addDataImportLog(citDataImportLogList);
         return null;
     }
@@ -1056,13 +1081,6 @@ public class CitImportExcelServiceImpl extends BaseService {
         return citDataImportLogDtos;
     }
 
-    private boolean isSheetEmpty(Sheet sheet) {
-        if (null == sheet.getRow(0).getCell(0)) {
-            return true;
-        }
-        return false;
-    }
-
     /**
      * 根据公司code获取机构相关信息
      * @param companyCode
@@ -1086,4 +1104,57 @@ public class CitImportExcelServiceImpl extends BaseService {
         return organizations;
     }
 
+    /**
+     * 自动生成试算平衡表
+     * @param period
+     * @param orgList
+     * @return
+     */
+    public OperationResultDto autoGeneTB(Integer period, String orgId, List<String> orgList){
+
+        //第一步，根据合并日记账计算出借方发生额，贷方发生额，科目代码等相关信息
+        StringBuilder periodSb = new StringBuilder();
+        periodSb.append(period);
+        periodSb.append("%");
+        List<CitJournalEntryAdjust> citJournalEntryAdjustList = citJournalEntryAdjustMapper.sumAmountByCondition(periodSb.toString(), orgList);
+
+        //第二步，查出cit_journal_entry_adjust该期间的调整日记账，
+        List<CitTrialBalance> trialBalanceList = new ArrayList<>();
+        String currentUserName = authUserHelper.getCurrentAuditor().get();
+        for (CitJournalEntryAdjust citJournal:citJournalEntryAdjustList) {
+            CitTrialBalance trialBalance = new CitTrialBalance();
+            trialBalance.setId(idService.nextId());
+            trialBalance.setPeriod(period);
+            trialBalance.setCreateBy(currentUserName);
+            trialBalance.setOrganizationId(orgId);
+            trialBalance.setAccountCode(citJournal.getSubjectCode());
+            trialBalance.setAccountDescription(citJournal.getSubjectName());
+            //此期间默认为12
+            trialBalance.setAccountPeriod(12);
+            //借方发生额
+            trialBalance.setDebitAmount(citJournal.getAccountedDr());
+            //贷方发生额
+            trialBalance.setCreditAmount(citJournal.getAccountedCr());
+
+            //查询出该科目代码的上一年的期末余额，查询条件为科目代码和期间
+            BigDecimal lastYearBegBla = new BigDecimal(0);
+            CitTrialBalanceExample citTrialBalanceExample = new CitTrialBalanceExample();
+            CitTrialBalanceExample.Criteria criteria = citTrialBalanceExample.createCriteria();
+            criteria.andAccountCodeEqualTo(citJournal.getSubjectCode());
+            criteria.andPeriodEqualTo(period-1);
+            List<CitTrialBalance> trialBalances = citTrialBalanceMapper.selectByExample(citTrialBalanceExample);
+            if(trialBalances != null || trialBalances.size() > 0){
+                lastYearBegBla = trialBalances.get(0).getBeginningBalance();
+            }
+            trialBalance.setBeginningBalance(lastYearBegBla);
+
+            //计算出期末余额，期末余额为期初余额+借方发生额-贷方发生额
+            trialBalance.setEndingBalance(lastYearBegBla.add(citJournal.getAccountedDr()).subtract(citJournal.getAccountedCr()));
+            trialBalanceList.add(trialBalance);
+        }
+
+        int insertBatch = citTrialBalanceMapper.insertBatch(trialBalanceList);
+        return null;
+    }
+
 }

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

@@ -107,4 +107,6 @@ public interface CitJournalEntryAdjustMapper extends MyMapper {
     int updateByPrimaryKey(CitJournalEntryAdjust record);
 
     int insertBatch(List<CitJournalEntryAdjust> citJournalAdjustList);
+
+    List<CitJournalEntryAdjust> sumAmountByCondition(@Param("period") String period, @Param("orgList") List<String> orgList);
 }
\ No newline at end of file

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

@@ -248,44 +248,44 @@ public class CitJournalEntryAdjust extends BaseEntity implements Serializable {
      *   主体代码 
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column cit_journal_entry_adjust.segment1
+     * This field corresponds to the database column cit_journal_entry_adjust.org_code
      *
      * @mbg.generated
      */
-    private String segment1;
+    private String orgCode;
 
     /**
      * Database Column Remarks:
      *   科目代码 
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column cit_journal_entry_adjust.segment3
+     * This field corresponds to the database column cit_journal_entry_adjust.subject_code
      *
      * @mbg.generated
      */
-    private String segment3;
+    private String subjectCode;
 
     /**
      * Database Column Remarks:
      *   主体说明 
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column cit_journal_entry_adjust.segment1_name
+     * This field corresponds to the database column cit_journal_entry_adjust.org_name
      *
      * @mbg.generated
      */
-    private String segment1Name;
+    private String orgName;
 
     /**
      * Database Column Remarks:
      *   科目说明 
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column cit_journal_entry_adjust.segment3_name
+     * This field corresponds to the database column cit_journal_entry_adjust.subject_name
      *
      * @mbg.generated
      */
-    private String segment3Name;
+    private String subjectName;
 
     /**
      * Database Column Remarks:
@@ -889,98 +889,98 @@ public class CitJournalEntryAdjust extends BaseEntity implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column cit_journal_entry_adjust.segment1
+     * This method returns the value of the database column cit_journal_entry_adjust.org_code
      *
-     * @return the value of cit_journal_entry_adjust.segment1
+     * @return the value of cit_journal_entry_adjust.org_code
      *
      * @mbg.generated
      */
-    public String getSegment1() {
-        return segment1;
+    public String getOrgCode() {
+        return orgCode;
     }
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column cit_journal_entry_adjust.segment1
+     * This method sets the value of the database column cit_journal_entry_adjust.org_code
      *
-     * @param segment1 the value for cit_journal_entry_adjust.segment1
+     * @param orgCode the value for cit_journal_entry_adjust.org_code
      *
      * @mbg.generated
      */
-    public void setSegment1(String segment1) {
-        this.segment1 = segment1 == null ? null : segment1.trim();
+    public void setOrgCode(String orgCode) {
+        this.orgCode = orgCode == null ? null : orgCode.trim();
     }
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column cit_journal_entry_adjust.segment3
+     * This method returns the value of the database column cit_journal_entry_adjust.subject_code
      *
-     * @return the value of cit_journal_entry_adjust.segment3
+     * @return the value of cit_journal_entry_adjust.subject_code
      *
      * @mbg.generated
      */
-    public String getSegment3() {
-        return segment3;
+    public String getSubjectCode() {
+        return subjectCode;
     }
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column cit_journal_entry_adjust.segment3
+     * This method sets the value of the database column cit_journal_entry_adjust.subject_code
      *
-     * @param segment3 the value for cit_journal_entry_adjust.segment3
+     * @param subjectCode the value for cit_journal_entry_adjust.subject_code
      *
      * @mbg.generated
      */
-    public void setSegment3(String segment3) {
-        this.segment3 = segment3 == null ? null : segment3.trim();
+    public void setSubjectCode(String subjectCode) {
+        this.subjectCode = subjectCode == null ? null : subjectCode.trim();
     }
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column cit_journal_entry_adjust.segment1_name
+     * This method returns the value of the database column cit_journal_entry_adjust.org_name
      *
-     * @return the value of cit_journal_entry_adjust.segment1_name
+     * @return the value of cit_journal_entry_adjust.org_name
      *
      * @mbg.generated
      */
-    public String getSegment1Name() {
-        return segment1Name;
+    public String getOrgName() {
+        return orgName;
     }
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column cit_journal_entry_adjust.segment1_name
+     * This method sets the value of the database column cit_journal_entry_adjust.org_name
      *
-     * @param segment1Name the value for cit_journal_entry_adjust.segment1_name
+     * @param orgName the value for cit_journal_entry_adjust.org_name
      *
      * @mbg.generated
      */
-    public void setSegment1Name(String segment1Name) {
-        this.segment1Name = segment1Name == null ? null : segment1Name.trim();
+    public void setOrgName(String orgName) {
+        this.orgName = orgName == null ? null : orgName.trim();
     }
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column cit_journal_entry_adjust.segment3_name
+     * This method returns the value of the database column cit_journal_entry_adjust.subject_name
      *
-     * @return the value of cit_journal_entry_adjust.segment3_name
+     * @return the value of cit_journal_entry_adjust.subject_name
      *
      * @mbg.generated
      */
-    public String getSegment3Name() {
-        return segment3Name;
+    public String getSubjectName() {
+        return subjectName;
     }
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column cit_journal_entry_adjust.segment3_name
+     * This method sets the value of the database column cit_journal_entry_adjust.subject_name
      *
-     * @param segment3Name the value for cit_journal_entry_adjust.segment3_name
+     * @param subjectName the value for cit_journal_entry_adjust.subject_name
      *
      * @mbg.generated
      */
-    public void setSegment3Name(String segment3Name) {
-        this.segment3Name = segment3Name == null ? null : segment3Name.trim();
+    public void setSubjectName(String subjectName) {
+        this.subjectName = subjectName == null ? null : subjectName.trim();
     }
 
     /**
@@ -1208,10 +1208,10 @@ public class CitJournalEntryAdjust extends BaseEntity implements Serializable {
         sb.append(", name=").append(name);
         sb.append(", voucherNum=").append(voucherNum);
         sb.append(", description=").append(description);
-        sb.append(", segment1=").append(segment1);
-        sb.append(", segment3=").append(segment3);
-        sb.append(", segment1Name=").append(segment1Name);
-        sb.append(", segment3Name=").append(segment3Name);
+        sb.append(", orgCode=").append(orgCode);
+        sb.append(", subjectCode=").append(subjectCode);
+        sb.append(", orgName=").append(orgName);
+        sb.append(", subjectName=").append(subjectName);
         sb.append(", accountedDr=").append(accountedDr);
         sb.append(", accountedCr=").append(accountedCr);
         sb.append(", createdBy=").append(createdBy);

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

@@ -1616,283 +1616,283 @@ public class CitJournalEntryAdjustExample {
             return (Criteria) this;
         }
 
-        public Criteria andSegment1IsNull() {
-            addCriterion("segment1 is null");
+        public Criteria andOrgCodeIsNull() {
+            addCriterion("org_code is null");
             return (Criteria) this;
         }
 
-        public Criteria andSegment1IsNotNull() {
-            addCriterion("segment1 is not null");
+        public Criteria andOrgCodeIsNotNull() {
+            addCriterion("org_code is not null");
             return (Criteria) this;
         }
 
-        public Criteria andSegment1EqualTo(String value) {
-            addCriterion("segment1 =", value, "segment1");
+        public Criteria andOrgCodeEqualTo(String value) {
+            addCriterion("org_code =", value, "orgCode");
             return (Criteria) this;
         }
 
-        public Criteria andSegment1NotEqualTo(String value) {
-            addCriterion("segment1 <>", value, "segment1");
+        public Criteria andOrgCodeNotEqualTo(String value) {
+            addCriterion("org_code <>", value, "orgCode");
             return (Criteria) this;
         }
 
-        public Criteria andSegment1GreaterThan(String value) {
-            addCriterion("segment1 >", value, "segment1");
+        public Criteria andOrgCodeGreaterThan(String value) {
+            addCriterion("org_code >", value, "orgCode");
             return (Criteria) this;
         }
 
-        public Criteria andSegment1GreaterThanOrEqualTo(String value) {
-            addCriterion("segment1 >=", value, "segment1");
+        public Criteria andOrgCodeGreaterThanOrEqualTo(String value) {
+            addCriterion("org_code >=", value, "orgCode");
             return (Criteria) this;
         }
 
-        public Criteria andSegment1LessThan(String value) {
-            addCriterion("segment1 <", value, "segment1");
+        public Criteria andOrgCodeLessThan(String value) {
+            addCriterion("org_code <", value, "orgCode");
             return (Criteria) this;
         }
 
-        public Criteria andSegment1LessThanOrEqualTo(String value) {
-            addCriterion("segment1 <=", value, "segment1");
+        public Criteria andOrgCodeLessThanOrEqualTo(String value) {
+            addCriterion("org_code <=", value, "orgCode");
             return (Criteria) this;
         }
 
-        public Criteria andSegment1Like(String value) {
-            addCriterion("segment1 like", value, "segment1");
+        public Criteria andOrgCodeLike(String value) {
+            addCriterion("org_code like", value, "orgCode");
             return (Criteria) this;
         }
 
-        public Criteria andSegment1NotLike(String value) {
-            addCriterion("segment1 not like", value, "segment1");
+        public Criteria andOrgCodeNotLike(String value) {
+            addCriterion("org_code not like", value, "orgCode");
             return (Criteria) this;
         }
 
-        public Criteria andSegment1In(List<String> values) {
-            addCriterion("segment1 in", values, "segment1");
+        public Criteria andOrgCodeIn(List<String> values) {
+            addCriterion("org_code in", values, "orgCode");
             return (Criteria) this;
         }
 
-        public Criteria andSegment1NotIn(List<String> values) {
-            addCriterion("segment1 not in", values, "segment1");
+        public Criteria andOrgCodeNotIn(List<String> values) {
+            addCriterion("org_code not in", values, "orgCode");
             return (Criteria) this;
         }
 
-        public Criteria andSegment1Between(String value1, String value2) {
-            addCriterion("segment1 between", value1, value2, "segment1");
+        public Criteria andOrgCodeBetween(String value1, String value2) {
+            addCriterion("org_code between", value1, value2, "orgCode");
             return (Criteria) this;
         }
 
-        public Criteria andSegment1NotBetween(String value1, String value2) {
-            addCriterion("segment1 not between", value1, value2, "segment1");
+        public Criteria andOrgCodeNotBetween(String value1, String value2) {
+            addCriterion("org_code not between", value1, value2, "orgCode");
             return (Criteria) this;
         }
 
-        public Criteria andSegment3IsNull() {
-            addCriterion("segment3 is null");
+        public Criteria andSubjectCodeIsNull() {
+            addCriterion("subject_code is null");
             return (Criteria) this;
         }
 
-        public Criteria andSegment3IsNotNull() {
-            addCriterion("segment3 is not null");
+        public Criteria andSubjectCodeIsNotNull() {
+            addCriterion("subject_code is not null");
             return (Criteria) this;
         }
 
-        public Criteria andSegment3EqualTo(String value) {
-            addCriterion("segment3 =", value, "segment3");
+        public Criteria andSubjectCodeEqualTo(String value) {
+            addCriterion("subject_code =", value, "subjectCode");
             return (Criteria) this;
         }
 
-        public Criteria andSegment3NotEqualTo(String value) {
-            addCriterion("segment3 <>", value, "segment3");
+        public Criteria andSubjectCodeNotEqualTo(String value) {
+            addCriterion("subject_code <>", value, "subjectCode");
             return (Criteria) this;
         }
 
-        public Criteria andSegment3GreaterThan(String value) {
-            addCriterion("segment3 >", value, "segment3");
+        public Criteria andSubjectCodeGreaterThan(String value) {
+            addCriterion("subject_code >", value, "subjectCode");
             return (Criteria) this;
         }
 
-        public Criteria andSegment3GreaterThanOrEqualTo(String value) {
-            addCriterion("segment3 >=", value, "segment3");
+        public Criteria andSubjectCodeGreaterThanOrEqualTo(String value) {
+            addCriterion("subject_code >=", value, "subjectCode");
             return (Criteria) this;
         }
 
-        public Criteria andSegment3LessThan(String value) {
-            addCriterion("segment3 <", value, "segment3");
+        public Criteria andSubjectCodeLessThan(String value) {
+            addCriterion("subject_code <", value, "subjectCode");
             return (Criteria) this;
         }
 
-        public Criteria andSegment3LessThanOrEqualTo(String value) {
-            addCriterion("segment3 <=", value, "segment3");
+        public Criteria andSubjectCodeLessThanOrEqualTo(String value) {
+            addCriterion("subject_code <=", value, "subjectCode");
             return (Criteria) this;
         }
 
-        public Criteria andSegment3Like(String value) {
-            addCriterion("segment3 like", value, "segment3");
+        public Criteria andSubjectCodeLike(String value) {
+            addCriterion("subject_code like", value, "subjectCode");
             return (Criteria) this;
         }
 
-        public Criteria andSegment3NotLike(String value) {
-            addCriterion("segment3 not like", value, "segment3");
+        public Criteria andSubjectCodeNotLike(String value) {
+            addCriterion("subject_code not like", value, "subjectCode");
             return (Criteria) this;
         }
 
-        public Criteria andSegment3In(List<String> values) {
-            addCriterion("segment3 in", values, "segment3");
+        public Criteria andSubjectCodeIn(List<String> values) {
+            addCriterion("subject_code in", values, "subjectCode");
             return (Criteria) this;
         }
 
-        public Criteria andSegment3NotIn(List<String> values) {
-            addCriterion("segment3 not in", values, "segment3");
+        public Criteria andSubjectCodeNotIn(List<String> values) {
+            addCriterion("subject_code not in", values, "subjectCode");
             return (Criteria) this;
         }
 
-        public Criteria andSegment3Between(String value1, String value2) {
-            addCriterion("segment3 between", value1, value2, "segment3");
+        public Criteria andSubjectCodeBetween(String value1, String value2) {
+            addCriterion("subject_code between", value1, value2, "subjectCode");
             return (Criteria) this;
         }
 
-        public Criteria andSegment3NotBetween(String value1, String value2) {
-            addCriterion("segment3 not between", value1, value2, "segment3");
+        public Criteria andSubjectCodeNotBetween(String value1, String value2) {
+            addCriterion("subject_code not between", value1, value2, "subjectCode");
             return (Criteria) this;
         }
 
-        public Criteria andSegment1NameIsNull() {
-            addCriterion("segment1_name is null");
+        public Criteria andOrgNameIsNull() {
+            addCriterion("org_name is null");
             return (Criteria) this;
         }
 
-        public Criteria andSegment1NameIsNotNull() {
-            addCriterion("segment1_name is not null");
+        public Criteria andOrgNameIsNotNull() {
+            addCriterion("org_name is not null");
             return (Criteria) this;
         }
 
-        public Criteria andSegment1NameEqualTo(String value) {
-            addCriterion("segment1_name =", value, "segment1Name");
+        public Criteria andOrgNameEqualTo(String value) {
+            addCriterion("org_name =", value, "orgName");
             return (Criteria) this;
         }
 
-        public Criteria andSegment1NameNotEqualTo(String value) {
-            addCriterion("segment1_name <>", value, "segment1Name");
+        public Criteria andOrgNameNotEqualTo(String value) {
+            addCriterion("org_name <>", value, "orgName");
             return (Criteria) this;
         }
 
-        public Criteria andSegment1NameGreaterThan(String value) {
-            addCriterion("segment1_name >", value, "segment1Name");
+        public Criteria andOrgNameGreaterThan(String value) {
+            addCriterion("org_name >", value, "orgName");
             return (Criteria) this;
         }
 
-        public Criteria andSegment1NameGreaterThanOrEqualTo(String value) {
-            addCriterion("segment1_name >=", value, "segment1Name");
+        public Criteria andOrgNameGreaterThanOrEqualTo(String value) {
+            addCriterion("org_name >=", value, "orgName");
             return (Criteria) this;
         }
 
-        public Criteria andSegment1NameLessThan(String value) {
-            addCriterion("segment1_name <", value, "segment1Name");
+        public Criteria andOrgNameLessThan(String value) {
+            addCriterion("org_name <", value, "orgName");
             return (Criteria) this;
         }
 
-        public Criteria andSegment1NameLessThanOrEqualTo(String value) {
-            addCriterion("segment1_name <=", value, "segment1Name");
+        public Criteria andOrgNameLessThanOrEqualTo(String value) {
+            addCriterion("org_name <=", value, "orgName");
             return (Criteria) this;
         }
 
-        public Criteria andSegment1NameLike(String value) {
-            addCriterion("segment1_name like", value, "segment1Name");
+        public Criteria andOrgNameLike(String value) {
+            addCriterion("org_name like", value, "orgName");
             return (Criteria) this;
         }
 
-        public Criteria andSegment1NameNotLike(String value) {
-            addCriterion("segment1_name not like", value, "segment1Name");
+        public Criteria andOrgNameNotLike(String value) {
+            addCriterion("org_name not like", value, "orgName");
             return (Criteria) this;
         }
 
-        public Criteria andSegment1NameIn(List<String> values) {
-            addCriterion("segment1_name in", values, "segment1Name");
+        public Criteria andOrgNameIn(List<String> values) {
+            addCriterion("org_name in", values, "orgName");
             return (Criteria) this;
         }
 
-        public Criteria andSegment1NameNotIn(List<String> values) {
-            addCriterion("segment1_name not in", values, "segment1Name");
+        public Criteria andOrgNameNotIn(List<String> values) {
+            addCriterion("org_name not in", values, "orgName");
             return (Criteria) this;
         }
 
-        public Criteria andSegment1NameBetween(String value1, String value2) {
-            addCriterion("segment1_name between", value1, value2, "segment1Name");
+        public Criteria andOrgNameBetween(String value1, String value2) {
+            addCriterion("org_name between", value1, value2, "orgName");
             return (Criteria) this;
         }
 
-        public Criteria andSegment1NameNotBetween(String value1, String value2) {
-            addCriterion("segment1_name not between", value1, value2, "segment1Name");
+        public Criteria andOrgNameNotBetween(String value1, String value2) {
+            addCriterion("org_name not between", value1, value2, "orgName");
             return (Criteria) this;
         }
 
-        public Criteria andSegment3NameIsNull() {
-            addCriterion("segment3_name is null");
+        public Criteria andSubjectNameIsNull() {
+            addCriterion("subject_name is null");
             return (Criteria) this;
         }
 
-        public Criteria andSegment3NameIsNotNull() {
-            addCriterion("segment3_name is not null");
+        public Criteria andSubjectNameIsNotNull() {
+            addCriterion("subject_name is not null");
             return (Criteria) this;
         }
 
-        public Criteria andSegment3NameEqualTo(String value) {
-            addCriterion("segment3_name =", value, "segment3Name");
+        public Criteria andSubjectNameEqualTo(String value) {
+            addCriterion("subject_name =", value, "subjectName");
             return (Criteria) this;
         }
 
-        public Criteria andSegment3NameNotEqualTo(String value) {
-            addCriterion("segment3_name <>", value, "segment3Name");
+        public Criteria andSubjectNameNotEqualTo(String value) {
+            addCriterion("subject_name <>", value, "subjectName");
             return (Criteria) this;
         }
 
-        public Criteria andSegment3NameGreaterThan(String value) {
-            addCriterion("segment3_name >", value, "segment3Name");
+        public Criteria andSubjectNameGreaterThan(String value) {
+            addCriterion("subject_name >", value, "subjectName");
             return (Criteria) this;
         }
 
-        public Criteria andSegment3NameGreaterThanOrEqualTo(String value) {
-            addCriterion("segment3_name >=", value, "segment3Name");
+        public Criteria andSubjectNameGreaterThanOrEqualTo(String value) {
+            addCriterion("subject_name >=", value, "subjectName");
             return (Criteria) this;
         }
 
-        public Criteria andSegment3NameLessThan(String value) {
-            addCriterion("segment3_name <", value, "segment3Name");
+        public Criteria andSubjectNameLessThan(String value) {
+            addCriterion("subject_name <", value, "subjectName");
             return (Criteria) this;
         }
 
-        public Criteria andSegment3NameLessThanOrEqualTo(String value) {
-            addCriterion("segment3_name <=", value, "segment3Name");
+        public Criteria andSubjectNameLessThanOrEqualTo(String value) {
+            addCriterion("subject_name <=", value, "subjectName");
             return (Criteria) this;
         }
 
-        public Criteria andSegment3NameLike(String value) {
-            addCriterion("segment3_name like", value, "segment3Name");
+        public Criteria andSubjectNameLike(String value) {
+            addCriterion("subject_name like", value, "subjectName");
             return (Criteria) this;
         }
 
-        public Criteria andSegment3NameNotLike(String value) {
-            addCriterion("segment3_name not like", value, "segment3Name");
+        public Criteria andSubjectNameNotLike(String value) {
+            addCriterion("subject_name not like", value, "subjectName");
             return (Criteria) this;
         }
 
-        public Criteria andSegment3NameIn(List<String> values) {
-            addCriterion("segment3_name in", values, "segment3Name");
+        public Criteria andSubjectNameIn(List<String> values) {
+            addCriterion("subject_name in", values, "subjectName");
             return (Criteria) this;
         }
 
-        public Criteria andSegment3NameNotIn(List<String> values) {
-            addCriterion("segment3_name not in", values, "segment3Name");
+        public Criteria andSubjectNameNotIn(List<String> values) {
+            addCriterion("subject_name not in", values, "subjectName");
             return (Criteria) this;
         }
 
-        public Criteria andSegment3NameBetween(String value1, String value2) {
-            addCriterion("segment3_name between", value1, value2, "segment3Name");
+        public Criteria andSubjectNameBetween(String value1, String value2) {
+            addCriterion("subject_name between", value1, value2, "subjectName");
             return (Criteria) this;
         }
 
-        public Criteria andSegment3NameNotBetween(String value1, String value2) {
-            addCriterion("segment3_name not between", value1, value2, "segment3Name");
+        public Criteria andSubjectNameNotBetween(String value1, String value2) {
+            addCriterion("subject_name not between", value1, value2, "subjectName");
             return (Criteria) this;
         }
 

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

@@ -111,6 +111,28 @@ public class CitTrialBalance extends BaseEntity implements Serializable {
      */
     private Integer accountPeriod;
 
+    /**
+     * Database Column Remarks:
+     *   借方发生额
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cit_trial_balance.debit_amount
+     *
+     * @mbg.generated
+     */
+    private BigDecimal debitAmount;
+
+    /**
+     * Database Column Remarks:
+     *   贷方发生额
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cit_trial_balance.credit_amount
+     *
+     * @mbg.generated
+     */
+    private BigDecimal creditAmount;
+
     /**
      * Database Column Remarks:
      *   期初余额
@@ -134,6 +156,8 @@ public class CitTrialBalance extends BaseEntity implements Serializable {
     private BigDecimal endingBalance;
 
     /**
+     * Database Column Remarks:
+     *   创建人
      *
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column cit_trial_balance.create_by
@@ -388,6 +412,54 @@ public class CitTrialBalance extends BaseEntity implements Serializable {
         this.accountPeriod = accountPeriod;
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column cit_trial_balance.debit_amount
+     *
+     * @return the value of cit_trial_balance.debit_amount
+     *
+     * @mbg.generated
+     */
+    public BigDecimal getDebitAmount() {
+        return debitAmount;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column cit_trial_balance.debit_amount
+     *
+     * @param debitAmount the value for cit_trial_balance.debit_amount
+     *
+     * @mbg.generated
+     */
+    public void setDebitAmount(BigDecimal debitAmount) {
+        this.debitAmount = debitAmount;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column cit_trial_balance.credit_amount
+     *
+     * @return the value of cit_trial_balance.credit_amount
+     *
+     * @mbg.generated
+     */
+    public BigDecimal getCreditAmount() {
+        return creditAmount;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column cit_trial_balance.credit_amount
+     *
+     * @param creditAmount the value for cit_trial_balance.credit_amount
+     *
+     * @mbg.generated
+     */
+    public void setCreditAmount(BigDecimal creditAmount) {
+        this.creditAmount = creditAmount;
+    }
+
     /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column cit_trial_balance.beginning_balance
@@ -529,6 +601,8 @@ public class CitTrialBalance extends BaseEntity implements Serializable {
         sb.append(", accountCode=").append(accountCode);
         sb.append(", accountDescription=").append(accountDescription);
         sb.append(", accountPeriod=").append(accountPeriod);
+        sb.append(", debitAmount=").append(debitAmount);
+        sb.append(", creditAmount=").append(creditAmount);
         sb.append(", beginningBalance=").append(beginningBalance);
         sb.append(", endingBalance=").append(endingBalance);
         sb.append(", createBy=").append(createBy);

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

@@ -786,6 +786,126 @@ public class CitTrialBalanceExample {
             return (Criteria) this;
         }
 
+        public Criteria andDebitAmountIsNull() {
+            addCriterion("debit_amount is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDebitAmountIsNotNull() {
+            addCriterion("debit_amount is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDebitAmountEqualTo(BigDecimal value) {
+            addCriterion("debit_amount =", value, "debitAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andDebitAmountNotEqualTo(BigDecimal value) {
+            addCriterion("debit_amount <>", value, "debitAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andDebitAmountGreaterThan(BigDecimal value) {
+            addCriterion("debit_amount >", value, "debitAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andDebitAmountGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("debit_amount >=", value, "debitAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andDebitAmountLessThan(BigDecimal value) {
+            addCriterion("debit_amount <", value, "debitAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andDebitAmountLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("debit_amount <=", value, "debitAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andDebitAmountIn(List<BigDecimal> values) {
+            addCriterion("debit_amount in", values, "debitAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andDebitAmountNotIn(List<BigDecimal> values) {
+            addCriterion("debit_amount not in", values, "debitAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andDebitAmountBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("debit_amount between", value1, value2, "debitAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andDebitAmountNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("debit_amount not between", value1, value2, "debitAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreditAmountIsNull() {
+            addCriterion("credit_amount is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreditAmountIsNotNull() {
+            addCriterion("credit_amount is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreditAmountEqualTo(BigDecimal value) {
+            addCriterion("credit_amount =", value, "creditAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreditAmountNotEqualTo(BigDecimal value) {
+            addCriterion("credit_amount <>", value, "creditAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreditAmountGreaterThan(BigDecimal value) {
+            addCriterion("credit_amount >", value, "creditAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreditAmountGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("credit_amount >=", value, "creditAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreditAmountLessThan(BigDecimal value) {
+            addCriterion("credit_amount <", value, "creditAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreditAmountLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("credit_amount <=", value, "creditAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreditAmountIn(List<BigDecimal> values) {
+            addCriterion("credit_amount in", values, "creditAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreditAmountNotIn(List<BigDecimal> values) {
+            addCriterion("credit_amount not in", values, "creditAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreditAmountBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("credit_amount between", value1, value2, "creditAmount");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreditAmountNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("credit_amount not between", value1, value2, "creditAmount");
+            return (Criteria) this;
+        }
+
         public Criteria andBeginningBalanceIsNull() {
             addCriterion("beginning_balance is null");
             return (Criteria) this;

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

@@ -27,10 +27,10 @@
     <result column="name" jdbcType="VARCHAR" property="name" />
     <result column="voucher_num" jdbcType="VARCHAR" property="voucherNum" />
     <result column="description" jdbcType="VARCHAR" property="description" />
-    <result column="segment1" jdbcType="VARCHAR" property="segment1" />
-    <result column="segment3" jdbcType="VARCHAR" property="segment3" />
-    <result column="segment1_name" jdbcType="VARCHAR" property="segment1Name" />
-    <result column="segment3_name" jdbcType="VARCHAR" property="segment3Name" />
+    <result column="org_code" jdbcType="VARCHAR" property="orgCode" />
+    <result column="subject_code" jdbcType="VARCHAR" property="subjectCode" />
+    <result column="org_name" jdbcType="VARCHAR" property="orgName" />
+    <result column="subject_name" jdbcType="VARCHAR" property="subjectName" />
     <result column="accounted_dr" jdbcType="DECIMAL" property="accountedDr" />
     <result column="accounted_cr" jdbcType="DECIMAL" property="accountedCr" />
     <result column="created_by" jdbcType="VARCHAR" property="createdBy" />
@@ -113,8 +113,8 @@
     -->
     id, organization_id, project_id, period, date, source, ledger_id, ledger_name, currency_code, 
     status, header_id, line_num, approval_status, posted_status, account_period, accounting_date, 
-    journal_source, category, name, voucher_num, description, segment1, segment3, segment1_name, 
-    segment3_name, accounted_dr, accounted_cr, created_by, created_date, late_updated_by, 
+    journal_source, category, name, voucher_num, description, org_code, subject_code, 
+    org_name, subject_name, accounted_dr, accounted_cr, created_by, created_date, late_updated_by, 
     late_updated_date, create_time, update_time
   </sql>
   <select id="selectByExample" parameterType="pwc.taxtech.atms.entity.CitJournalEntryAdjustExample" resultMap="BaseResultMap">
@@ -175,8 +175,8 @@
       approval_status, posted_status, account_period, 
       accounting_date, journal_source, category, 
       name, voucher_num, description, 
-      segment1, segment3, segment1_name, 
-      segment3_name, accounted_dr, accounted_cr, 
+      org_code, subject_code, org_name, 
+      subject_name, accounted_dr, accounted_cr, 
       created_by, created_date, late_updated_by, 
       late_updated_date, create_time, update_time
       )
@@ -187,8 +187,8 @@
       #{approvalStatus,jdbcType=VARCHAR}, #{postedStatus,jdbcType=VARCHAR}, #{accountPeriod,jdbcType=INTEGER}, 
       #{accountingDate,jdbcType=TIMESTAMP}, #{journalSource,jdbcType=VARCHAR}, #{category,jdbcType=VARCHAR}, 
       #{name,jdbcType=VARCHAR}, #{voucherNum,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, 
-      #{segment1,jdbcType=VARCHAR}, #{segment3,jdbcType=VARCHAR}, #{segment1Name,jdbcType=VARCHAR}, 
-      #{segment3Name,jdbcType=VARCHAR}, #{accountedDr,jdbcType=DECIMAL}, #{accountedCr,jdbcType=DECIMAL}, 
+      #{orgCode,jdbcType=VARCHAR}, #{subjectCode,jdbcType=VARCHAR}, #{orgName,jdbcType=VARCHAR}, 
+      #{subjectName,jdbcType=VARCHAR}, #{accountedDr,jdbcType=DECIMAL}, #{accountedCr,jdbcType=DECIMAL}, 
       #{createdBy,jdbcType=VARCHAR}, #{createdDate,jdbcType=TIMESTAMP}, #{lateUpdatedBy,jdbcType=VARCHAR}, 
       #{lateUpdatedDate,jdbcType=TIMESTAMP}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
       )
@@ -263,17 +263,17 @@
       <if test="description != null">
         description,
       </if>
-      <if test="segment1 != null">
-        segment1,
+      <if test="orgCode != null">
+        org_code,
       </if>
-      <if test="segment3 != null">
-        segment3,
+      <if test="subjectCode != null">
+        subject_code,
       </if>
-      <if test="segment1Name != null">
-        segment1_name,
+      <if test="orgName != null">
+        org_name,
       </if>
-      <if test="segment3Name != null">
-        segment3_name,
+      <if test="subjectName != null">
+        subject_name,
       </if>
       <if test="accountedDr != null">
         accounted_dr,
@@ -364,17 +364,17 @@
       <if test="description != null">
         #{description,jdbcType=VARCHAR},
       </if>
-      <if test="segment1 != null">
-        #{segment1,jdbcType=VARCHAR},
+      <if test="orgCode != null">
+        #{orgCode,jdbcType=VARCHAR},
       </if>
-      <if test="segment3 != null">
-        #{segment3,jdbcType=VARCHAR},
+      <if test="subjectCode != null">
+        #{subjectCode,jdbcType=VARCHAR},
       </if>
-      <if test="segment1Name != null">
-        #{segment1Name,jdbcType=VARCHAR},
+      <if test="orgName != null">
+        #{orgName,jdbcType=VARCHAR},
       </if>
-      <if test="segment3Name != null">
-        #{segment3Name,jdbcType=VARCHAR},
+      <if test="subjectName != null">
+        #{subjectName,jdbcType=VARCHAR},
       </if>
       <if test="accountedDr != null">
         #{accountedDr,jdbcType=DECIMAL},
@@ -482,17 +482,17 @@
       <if test="record.description != null">
         description = #{record.description,jdbcType=VARCHAR},
       </if>
-      <if test="record.segment1 != null">
-        segment1 = #{record.segment1,jdbcType=VARCHAR},
+      <if test="record.orgCode != null">
+        org_code = #{record.orgCode,jdbcType=VARCHAR},
       </if>
-      <if test="record.segment3 != null">
-        segment3 = #{record.segment3,jdbcType=VARCHAR},
+      <if test="record.subjectCode != null">
+        subject_code = #{record.subjectCode,jdbcType=VARCHAR},
       </if>
-      <if test="record.segment1Name != null">
-        segment1_name = #{record.segment1Name,jdbcType=VARCHAR},
+      <if test="record.orgName != null">
+        org_name = #{record.orgName,jdbcType=VARCHAR},
       </if>
-      <if test="record.segment3Name != null">
-        segment3_name = #{record.segment3Name,jdbcType=VARCHAR},
+      <if test="record.subjectName != null">
+        subject_name = #{record.subjectName,jdbcType=VARCHAR},
       </if>
       <if test="record.accountedDr != null">
         accounted_dr = #{record.accountedDr,jdbcType=DECIMAL},
@@ -550,10 +550,10 @@
       name = #{record.name,jdbcType=VARCHAR},
       voucher_num = #{record.voucherNum,jdbcType=VARCHAR},
       description = #{record.description,jdbcType=VARCHAR},
-      segment1 = #{record.segment1,jdbcType=VARCHAR},
-      segment3 = #{record.segment3,jdbcType=VARCHAR},
-      segment1_name = #{record.segment1Name,jdbcType=VARCHAR},
-      segment3_name = #{record.segment3Name,jdbcType=VARCHAR},
+      org_code = #{record.orgCode,jdbcType=VARCHAR},
+      subject_code = #{record.subjectCode,jdbcType=VARCHAR},
+      org_name = #{record.orgName,jdbcType=VARCHAR},
+      subject_name = #{record.subjectName,jdbcType=VARCHAR},
       accounted_dr = #{record.accountedDr,jdbcType=DECIMAL},
       accounted_cr = #{record.accountedCr,jdbcType=DECIMAL},
       created_by = #{record.createdBy,jdbcType=VARCHAR},
@@ -633,17 +633,17 @@
       <if test="description != null">
         description = #{description,jdbcType=VARCHAR},
       </if>
-      <if test="segment1 != null">
-        segment1 = #{segment1,jdbcType=VARCHAR},
+      <if test="orgCode != null">
+        org_code = #{orgCode,jdbcType=VARCHAR},
       </if>
-      <if test="segment3 != null">
-        segment3 = #{segment3,jdbcType=VARCHAR},
+      <if test="subjectCode != null">
+        subject_code = #{subjectCode,jdbcType=VARCHAR},
       </if>
-      <if test="segment1Name != null">
-        segment1_name = #{segment1Name,jdbcType=VARCHAR},
+      <if test="orgName != null">
+        org_name = #{orgName,jdbcType=VARCHAR},
       </if>
-      <if test="segment3Name != null">
-        segment3_name = #{segment3Name,jdbcType=VARCHAR},
+      <if test="subjectName != null">
+        subject_name = #{subjectName,jdbcType=VARCHAR},
       </if>
       <if test="accountedDr != null">
         accounted_dr = #{accountedDr,jdbcType=DECIMAL},
@@ -698,10 +698,10 @@
       name = #{name,jdbcType=VARCHAR},
       voucher_num = #{voucherNum,jdbcType=VARCHAR},
       description = #{description,jdbcType=VARCHAR},
-      segment1 = #{segment1,jdbcType=VARCHAR},
-      segment3 = #{segment3,jdbcType=VARCHAR},
-      segment1_name = #{segment1Name,jdbcType=VARCHAR},
-      segment3_name = #{segment3Name,jdbcType=VARCHAR},
+      org_code = #{orgCode,jdbcType=VARCHAR},
+      subject_code = #{subjectCode,jdbcType=VARCHAR},
+      org_name = #{orgName,jdbcType=VARCHAR},
+      subject_name = #{subjectName,jdbcType=VARCHAR},
       accounted_dr = #{accountedDr,jdbcType=DECIMAL},
       accounted_cr = #{accountedCr,jdbcType=DECIMAL},
       created_by = #{createdBy,jdbcType=VARCHAR},

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

@@ -15,6 +15,8 @@
     <result column="account_code" jdbcType="VARCHAR" property="accountCode" />
     <result column="account_description" jdbcType="VARCHAR" property="accountDescription" />
     <result column="account_period" jdbcType="INTEGER" property="accountPeriod" />
+    <result column="debit_amount" jdbcType="DECIMAL" property="debitAmount" />
+    <result column="credit_amount" jdbcType="DECIMAL" property="creditAmount" />
     <result column="beginning_balance" jdbcType="DECIMAL" property="beginningBalance" />
     <result column="ending_balance" jdbcType="DECIMAL" property="endingBalance" />
     <result column="create_by" jdbcType="VARCHAR" property="createBy" />
@@ -93,7 +95,8 @@
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     id, organization_id, project_id, date, source, period, account_code, account_description, 
-    account_period, beginning_balance, ending_balance, create_by, create_time, update_time
+    account_period, debit_amount, credit_amount, beginning_balance, ending_balance, create_by, 
+    create_time, update_time
   </sql>
   <select id="selectByExample" parameterType="pwc.taxtech.atms.entity.CitTrialBalanceExample" resultMap="BaseResultMap">
     <!--
@@ -149,13 +152,15 @@
     insert into cit_trial_balance (id, organization_id, project_id, 
       date, source, period, 
       account_code, account_description, account_period, 
-      beginning_balance, ending_balance, create_by, 
-      create_time, update_time)
+      debit_amount, credit_amount, beginning_balance, 
+      ending_balance, create_by, create_time, 
+      update_time)
     values (#{id,jdbcType=BIGINT}, #{organizationId,jdbcType=VARCHAR}, #{projectId,jdbcType=VARCHAR}, 
       #{date,jdbcType=TIMESTAMP}, #{source,jdbcType=VARCHAR}, #{period,jdbcType=INTEGER}, 
       #{accountCode,jdbcType=VARCHAR}, #{accountDescription,jdbcType=VARCHAR}, #{accountPeriod,jdbcType=INTEGER}, 
-      #{beginningBalance,jdbcType=DECIMAL}, #{endingBalance,jdbcType=DECIMAL}, #{createBy,jdbcType=VARCHAR}, 
-      #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP})
+      #{debitAmount,jdbcType=DECIMAL}, #{creditAmount,jdbcType=DECIMAL}, #{beginningBalance,jdbcType=DECIMAL}, 
+      #{endingBalance,jdbcType=DECIMAL}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{updateTime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="pwc.taxtech.atms.entity.CitTrialBalance">
     <!--
@@ -191,6 +196,12 @@
       <if test="accountPeriod != null">
         account_period,
       </if>
+      <if test="debitAmount != null">
+        debit_amount,
+      </if>
+      <if test="creditAmount != null">
+        credit_amount,
+      </if>
       <if test="beginningBalance != null">
         beginning_balance,
       </if>
@@ -235,6 +246,12 @@
       <if test="accountPeriod != null">
         #{accountPeriod,jdbcType=INTEGER},
       </if>
+      <if test="debitAmount != null">
+        #{debitAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="creditAmount != null">
+        #{creditAmount,jdbcType=DECIMAL},
+      </if>
       <if test="beginningBalance != null">
         #{beginningBalance,jdbcType=DECIMAL},
       </if>
@@ -296,6 +313,12 @@
       <if test="record.accountPeriod != null">
         account_period = #{record.accountPeriod,jdbcType=INTEGER},
       </if>
+      <if test="record.debitAmount != null">
+        debit_amount = #{record.debitAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="record.creditAmount != null">
+        credit_amount = #{record.creditAmount,jdbcType=DECIMAL},
+      </if>
       <if test="record.beginningBalance != null">
         beginning_balance = #{record.beginningBalance,jdbcType=DECIMAL},
       </if>
@@ -331,6 +354,8 @@
       account_code = #{record.accountCode,jdbcType=VARCHAR},
       account_description = #{record.accountDescription,jdbcType=VARCHAR},
       account_period = #{record.accountPeriod,jdbcType=INTEGER},
+      debit_amount = #{record.debitAmount,jdbcType=DECIMAL},
+      credit_amount = #{record.creditAmount,jdbcType=DECIMAL},
       beginning_balance = #{record.beginningBalance,jdbcType=DECIMAL},
       ending_balance = #{record.endingBalance,jdbcType=DECIMAL},
       create_by = #{record.createBy,jdbcType=VARCHAR},
@@ -371,6 +396,12 @@
       <if test="accountPeriod != null">
         account_period = #{accountPeriod,jdbcType=INTEGER},
       </if>
+      <if test="debitAmount != null">
+        debit_amount = #{debitAmount,jdbcType=DECIMAL},
+      </if>
+      <if test="creditAmount != null">
+        credit_amount = #{creditAmount,jdbcType=DECIMAL},
+      </if>
       <if test="beginningBalance != null">
         beginning_balance = #{beginningBalance,jdbcType=DECIMAL},
       </if>
@@ -403,6 +434,8 @@
       account_code = #{accountCode,jdbcType=VARCHAR},
       account_description = #{accountDescription,jdbcType=VARCHAR},
       account_period = #{accountPeriod,jdbcType=INTEGER},
+      debit_amount = #{debitAmount,jdbcType=DECIMAL},
+      credit_amount = #{creditAmount,jdbcType=DECIMAL},
       beginning_balance = #{beginningBalance,jdbcType=DECIMAL},
       ending_balance = #{endingBalance,jdbcType=DECIMAL},
       create_by = #{createBy,jdbcType=VARCHAR},

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

@@ -93,19 +93,19 @@
                     <otherwise>'',</otherwise>
                 </choose>
                 <choose>
-          <when test="item.segment1 != null">#{item.segment1,jdbcType=VARCHAR},</when>
+                    <when test="item.orgCode != null">#{item.orgCode,jdbcType=VARCHAR},</when>
                     <otherwise>'',</otherwise>
                 </choose>
                 <choose>
-          <when test="item.segment3 != null">#{item.segment3,jdbcType=VARCHAR},</when>
+                    <when test="item.subjectCode != null">#{item.subjectCode,jdbcType=VARCHAR},</when>
                     <otherwise>'',</otherwise>
                 </choose>
                 <choose>
-          <when test="item.segment1Name != null">#{item.segment1Name,jdbcType=VARCHAR},</when>
+                    <when test="item.orgName != null">#{item.orgName,jdbcType=VARCHAR},</when>
                     <otherwise>'',</otherwise>
                 </choose>
                 <choose>
-          <when test="item.segment3Name != null">#{item.segment3Name,jdbcType=VARCHAR},</when>
+                    <when test="item.subjectName != null">#{item.subjectName,jdbcType=VARCHAR},</when>
                     <otherwise>'',</otherwise>
                 </choose>
                 <choose>
@@ -141,8 +141,50 @@
                     <otherwise>CURRENT_TIMESTAMP,</otherwise>
                 </choose>
             </trim>
-    </foreach>;
+        </foreach>
+        ;
         SELECT 1 FROM DUAL;
     </insert>
 
+    <select id="sumAmountByCondition" parameterType="map" resultMap="BaseResultMap">
+        SELECT
+        subject_code as subject_code,
+        sum(jfinal.accounted_dr) as accounted_dr,
+        sum(jfinal.accounted_cr) as accounted_cr
+        from
+        (
+        select
+        cj.accounted_dr as accounted_dr,
+        cj.accounted_cr as accounted_cr ,
+        cj.subject_code as subject_code
+        from
+        cit_journal_entry_adjust cj
+        where
+        cj.period like #{period}
+        <if test="orgList != null and orgList.size > 0">
+            AND organization_id in
+            <foreach item="item" index="index" collection="orgList" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+
+        UNION ALL
+
+        select
+        j.accounted_dr as accounted_dr,
+        j.accounted_cr as accounted_cr,
+        j.segment3 as subject_code
+        from
+        journal_entry j
+        where
+        j.period like #{period}
+        <if test="orgList != null and orgList.size > 0">
+            AND organization_id in
+            <foreach item="item" index="index" collection="orgList" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+        ) as jfinal
+        group by jfinal.subject_code
+    </select>
 </mapper>
\ No newline at end of file

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

@@ -44,7 +44,14 @@
           <when test="item.accountPeriod != null">#{item.accountPeriod,jdbcType=INTEGER},</when>
           <otherwise>0,</otherwise>
         </choose>
-
+        <choose>
+          <when test="item.debitAmount != null">#{item.debitAmount,jdbcType=DECIMAL},</when>
+          <otherwise>0,</otherwise>
+        </choose>
+        <choose>
+          <when test="item.creditAmount != null">#{item.creditAmount,jdbcType=DECIMAL},</when>
+          <otherwise>0,</otherwise>
+        </choose>
         <choose>
           <when test="item.beginningBalance != null">#{item.beginningBalance,jdbcType=DECIMAL},</when>
           <otherwise>0,</otherwise>
@@ -69,5 +76,46 @@
     </foreach>;
     SELECT 1 FROM DUAL;
   </insert>
+  <select id="selectLastYearBegBla" parameterType="map" resultMap="BaseResultMap">
+    SELECT
+    subject_code as subject_code,
+    sum(jfinal.accounted_dr) as accounted_dr,
+    sum(jfinal.accounted_cr) as accounted_cr
+    from
+    (
+    select
+    cj.accounted_dr as accounted_dr,
+    cj.accounted_cr as accounted_cr ,
+    cj.subject_code as subject_code
+    from
+    cit_journal_entry_adjust cj
+    where
+    cj.period like #{period}
+    <if test="orgList != null and orgList.size > 0">
+      AND organization_id in
+      <foreach item="item" index="index" collection="orgList" open="(" separator="," close=")">
+        #{item}
+      </foreach>
+    </if>
+
+    UNION ALL
+
+    select
+    j.accounted_dr as accounted_dr,
+    j.accounted_cr as accounted_cr,
+    j.segment3 as subject_code
+    from
+    journal_entry j
+    where
+    j.period like #{period}
+    <if test="orgList != null and orgList.size > 0">
+      AND organization_id in
+      <foreach item="item" index="index" collection="orgList" open="(" separator="," close=")">
+        #{item}
+      </foreach>
+    </if>
+    ) as jfinal
+    group by jfinal.subject_code
+  </select>
 
 </mapper>
\ No newline at end of file

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

@@ -328,11 +328,11 @@
     "InvoiceStatistics":"Invoice Statistics",
     "CITAdjustmentJournal":"CIT Adjustment Journal",
     "CITTrialBalance":"CIT TrialBalance",
-    "CITDocumentSubjectMappingTable":"CIT Document Subject Mapping Table",
+    "CITDocumentSubjectMappingTable":"CIT Draft Subject Mapping",
     "CITBalanceSheetPRC":"CIT Balance Sheet PRC",
     "CITProfitStatementPRC":"CIT Profit Statement PRC",
-    "CITEAMAssetDisposalAmountRecord":"CIT EAM Asset Disposal Amount Record",
-    "CITPreClassifiedDataSource":"CIT PreClassified DataSource",
+    "CITEAMAssetDisposalAmountRecord":"CIT EAM Disposal Amount",
+    "CITPreClassifiedDataSource":"CIT PreClassified",
     "Configuration":"Configuration",
     "RevenueTypeConfiguration":"Revenue Type Config",
 

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

@@ -876,10 +876,10 @@
     "InvoiceStatistics":"发票统计资料",
     "CITAdjustmentJournal":"CIT-调整日记账",
     "CITTrialBalance":"CIT-试算平衡表",
-    "CITDocumentSubjectMappingTable":"CIT-底稿&科目Mapping表",
+    "CITDocumentSubjectMappingTable":"CIT-底稿科目Mapping",
     "CITBalanceSheetPRC":"CIT-资产负债表(单家PRC)",
     "CITProfitStatementPRC":"CIT-利润表(单家PRC)",
-    "CITEAMAssetDisposalAmountRecord":"CIT-EAM资产处置金额记录表",
+    "CITEAMAssetDisposalAmountRecord":"CIT-EAM处置金额记录表",
     "CITPreClassifiedDataSource":"CIT-预提重分类数据源",
     "Configuration":"配置",
     "RevenueTypeConfiguration":"收入类型配置",

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

@@ -32,6 +32,11 @@
         $scope.importExcelFile = null;
         $scope.UploadPeriodTime = null;
 
+        $scope.companyList = [];
+        $scope.checkedCompanyList = [];
+        $scope.checkedCompanyCodeList = [];
+        $scope.checkedCompanyTypeList = "";
+        $scope.maxTitleLength = constant.maxButtonTitleLength;
 
         //写日志
         var logDto = {
@@ -143,7 +148,8 @@
                 return;
             }
             var orgIds = JSON.stringify($scope.checkedCompanyCodeList);
-
+            //控制背景阴影的出现
+            $('#busy-indicator-container').show();
             Upload.upload({
                 url: uploadUrl,
                 data: {
@@ -397,6 +403,53 @@
             });
         };
 
+
+        $scope.selectOne = function () {
+            $scope.checkedCompanyList = [];
+            angular.forEach($scope.companyList , function (i) {
+                var index = $scope.checkedCompanyList.indexOf(i.id);
+                if(i.checked && index === -1) {
+                    $scope.checkedCompanyList.push(i);
+                } else if (!i.checked && index !== -1){
+                    $scope.checkedCompanyList.splice(index, 1);
+                }
+            });
+
+            $scope.selectedAll = $scope.companyList.length === $scope.checkedCompanyList.length;
+
+            $scope.checkedCompanyTypeList = "";
+            $scope.checkedCompanyCodeList = [];
+            angular.forEach($scope.checkedCompanyList,function (i) {
+                $scope.checkedCompanyTypeList += i.name+";";
+                $scope.checkedCompanyCodeList.push(i.id);
+            });
+            console.log($scope.checkedCompanyList);
+        };
+
+        $scope.selectAll = function () {
+            if($scope.selectedAll) {
+                $scope.selectedOne = true;
+                $scope.checkedCompanyList = [];
+                angular.forEach($scope.companyList, function (i, index) {
+                    $scope.checkedCompanyList.push(i);
+                    i.checked = true;
+                })
+            }else {
+                $scope.selectedOne = false;
+                $scope.checkedCompanyList = [];
+                angular.forEach($scope.companyList, function (i, index) {
+                    i.checked = false;
+                })
+            }
+            $scope.checkedCompanyTypeList = "";
+            $scope.checkedCompanyCodeList = [];
+            angular.forEach($scope.checkedCompanyList,function (i) {
+                $scope.checkedCompanyTypeList += i.name;
+                $scope.checkedCompanyCodeList.push(i.id);
+            });
+            console.log($scope.checkedCompanyList);
+        };
+
         $scope.downloadTemplate = function () {
             debugger;
             templateService.citDownloadTemplate(constant.citImportFileType.BalanceSheetPrcAdjust).success(function (data, status, headers) {

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

@@ -140,6 +140,8 @@
                 SweetAlert.warning($translate.instant('PleaseSelectPeriod'));
                 return;
             }
+            //控制背景阴影的出现
+            $('#busy-indicator-container').show();
 
             Upload.upload({
                 url: uploadUrl,

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

@@ -140,7 +140,8 @@
                 SweetAlert.warning($translate.instant('PleaseSelectPeriod'));
                 return;
             }
-
+            //控制背景阴影的出现
+            $('#busy-indicator-container').show();
             Upload.upload({
                 url: uploadUrl,
                 data: {

atms-web/src/main/webapp/app/common/controls/import/import-cit-journal-adjust/import-cit-journal-adjust.ctrl.js

@@ -36,6 +36,7 @@
         $scope.checkedCompanyList = [];
         $scope.checkedCompanyCodeList = [];
         $scope.checkedCompanyTypeList = "";
+        $scope.maxTitleLength = constant.maxButtonTitleLength;
 
 
 
@@ -151,7 +152,8 @@
             }
             var orgIds = JSON.stringify($scope.checkedCompanyCodeList);
 
-
+            //控制背景阴影的出现
+            $('#busy-indicator-container').show();
             Upload.upload({
                 url: uploadUrl,
                 data: {
@@ -173,7 +175,7 @@
                 debugger;
                 $('#busy-indicator-container').hide();
                 deferred.resolve();
-                if (resp.result) {
+                if (resp.result || resp.data) {
                     debugger;
                     logDto.UpdateState = $translate.instant('ImportSuccess');
                     vatOperationLogService.addOperationLog(logDto);

atms-web/src/main/webapp/app/common/controls/import/import-cit-profit-prc-adjust/import-cit-profit-prc-adjust.ctrl.js

@@ -36,6 +36,7 @@
         $scope.checkedCompanyList = [];
         $scope.checkedCompanyCodeList = [];
         $scope.checkedCompanyTypeList = "";
+        $scope.maxTitleLength = constant.maxButtonTitleLength;
 
         //写日志
         var logDto = {
@@ -147,7 +148,8 @@
                 return;
             }
             var orgIds = JSON.stringify($scope.checkedCompanyCodeList);
-
+            //控制背景阴影的出现
+            $('#busy-indicator-container').show();
             Upload.upload({
                 url: uploadUrl,
                 data: {

atms-web/src/main/webapp/app/common/controls/import/import-cit-salary-advance/import-cit-salary-advance.ctrl.js

@@ -36,6 +36,7 @@
         $scope.checkedCompanyList = [];
         $scope.checkedCompanyCodeList = [];
         $scope.checkedCompanyTypeList = "";
+        $scope.maxTitleLength = constant.maxButtonTitleLength;
 
 
         //写日志
@@ -148,7 +149,8 @@
                 return;
             }
             var orgIds = JSON.stringify($scope.checkedCompanyCodeList);
-
+            //控制背景阴影的出现
+            $('#busy-indicator-container').show();
             Upload.upload({
                 url: uploadUrl,
                 data: {

atms-web/src/main/webapp/app/common/controls/import/import-cit-trial-balance/import-cit-trial-balance.ctrl.js

@@ -38,6 +38,8 @@
         $scope.checkedCompanyCodeList = [];
         $scope.checkedCompanyTypeList = "";
 
+        $scope.maxTitleLength = constant.maxButtonTitleLength;
+
 
         //写日志
         var logDto = {
@@ -149,7 +151,8 @@
                 return;
             }
             var orgIds = JSON.stringify($scope.checkedCompanyCodeList);
-
+            //控制背景阴影的出现
+            $('#busy-indicator-container').show();
             Upload.upload({
                 url: uploadUrl,
                 data: {

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

@@ -1428,6 +1428,17 @@ constant.importFileType = {
     ExtractInvoiceData: 11
 };
 
+constant.citImportFileType = {
+    undefined: 0,
+    JournalAdjust: 1,
+    TrialBalance: 2,
+    DraftAccountMapping: 3,
+    BalanceSheetPrcAdjust: 4,
+    ProfitPrcAdjust: 5,
+    EAMAssetsDisposal: 6,
+    SalaryAdvance: 7
+};
+
 constant.fileTypeList = [
     {code:0,type:"月度科目余额表"},
     {code:1,type:"日记账"},

atms-web/src/main/webapp/app/common/webservices/citImportData.svc.js

@@ -9,5 +9,8 @@ webservices.factory('citImportDataService', ['$http', 'apiConfig', function ($ht
         },
         /***************************************批量数据导入服务(真) end**************************************************************/
 
+        autoGeneTB: function () {
+            return $http.post('/citImport/getCitDataImportLog', apiConfig.create());
+        },
     };
 }]);
\ No newline at end of file