Skip to content

T
traffic-front
Commit 23b09c1a authored by zhkwei's avatar zhkwei
Browse files
Options

CIT数据导入功能模块

parent 097ae99c
Hide whitespace changes
Inline Side-by-side
Showing with 509 additions and 204 deletions
atms-api/src/main/java/pwc/taxtech/atms/service/impl/AssetListServiceImpl.java
View file @ 23b09c1a
......@@ -168,7 +168,7 @@ public class AssetListServiceImpl extends BaseService {
Set assetNameSet = new HashSet();
List<CitAssetGroupResult> citAssetGroupResults = selectGroupResult(projectId);
StringBuilder periodSb = CitCommonUtil.getPeriod();
Integer period = CitCommonUtil.getPeriod();
List<CitAssetsList> citAssetsLists = new ArrayList<>();
StringBuilder errorMsgSb = new StringBuilder("第");
//通过循环来完成sheet获取每一行每一列数据并进行相关逻辑处理
......@@ -178,7 +178,7 @@ public class AssetListServiceImpl extends BaseService {
//赋值projectId
citAsset.setProjectId(projectId);
citAsset.setPeriod(Integer.valueOf(periodSb.toString()));
citAsset.setPeriod(Integer.valueOf(period));
//获取该行数据
Row rowData = sheet.getRow(rowNum);
......@@ -213,7 +213,7 @@ public class AssetListServiceImpl extends BaseService {
CitAssetGroupResult citAssetGroupResult = new CitAssetGroupResult();
citAssetGroupResult.setId(idService.nextId());
citAssetGroupResult.setProjectId(projectId);
citAssetGroupResult.setPeriod(Integer.valueOf(periodSb.toString()));
citAssetGroupResult.setPeriod(Integer.valueOf(period));
citAssetGroupResult.setAssetName(it.next());
assetGroupResultMapper.insertSelective(citAssetGroupResult);
}
......@@ -245,7 +245,6 @@ public class AssetListServiceImpl extends BaseService {
citAsset.setAssetGroupName(assetName);
//获取购入日期
Date date = new Date();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
citAsset.setBuyDate(sdf.parse(CitCommonUtil.getValue(rowData.getCell(15)).toString()));
//获取开始折旧日期,DD没有提供，我们要根据购入日期和税法分类做预处理自己转化
......
atms-api/src/main/java/pwc/taxtech/atms/service/impl/CitCommonUtil.java
View file @ 23b09c1a
package pwc.taxtech.atms.service.impl;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.CellType;
import java.util.Calendar;
......@@ -13,7 +14,7 @@ public class CitCommonUtil {
* 计算当前期间
* @return
*/
public static StringBuilder getPeriod(){
public static Integer getPeriod(){
//计算当前期间
Calendar now = Calendar.getInstance();
StringBuilder sb = new StringBuilder();
......@@ -22,7 +23,7 @@ public class CitCommonUtil {
sb.append(0);
}
sb.append(now.get(Calendar.MONTH) + 1);
return sb;
return Integer.valueOf(sb.toString());
}
......@@ -33,6 +34,9 @@ public class CitCommonUtil {
*/
public static Object getValue(Cell cell) {
Object obj = null;
if(cell == null){
return obj;
}
switch (cell.getCellTypeEnum()) {
case BOOLEAN:
obj = cell.getBooleanCellValue();
......
atms-api/src/main/java/pwc/taxtech/atms/service/impl/CitImportExcelServiceImpl.java
View file @ 23b09c1a
......@@ -21,6 +21,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.math.BigDecimal;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
@Service
......@@ -38,6 +39,21 @@ public class CitImportExcelServiceImpl extends BaseService {
@Autowired
private CitTrialBalanceMapper citTrialBalanceMapper;
@Autowired
private CitDraftAccountMappingMapper citDAMappingMapper;
@Autowired
private CitBalanceSheetPrcAdjustMapper citBSPrcAdjustMapper;
@Autowired
private CitProfitPrcAdjustMapper citProfitPrcAdjustMapper;
@Autowired
private CitEAMAssetsDisposalMapper citEAMAssetsMapper;
@Autowired
private CitSalaryAdvanceMapper citSalaryAdvanceMapper;
@Autowired
private FileService fileService;
......@@ -116,7 +132,7 @@ public class CitImportExcelServiceImpl extends BaseService {
String companyName = CitCommonUtil.getValue(sheet.getRow(1).getCell(19)).toString();
String companyCode = CitCommonUtil.getValue(sheet.getRow(1).getCell(9)).toString();
;
List<Organization> organizations = getOrganization(companyCode);
List<Organization> organizations = getOrganizationByCode(companyCode);
String orgId = "";
String taxPayerId = "";
if (organizations != null && organizations.size() > 0) {
......@@ -134,9 +150,19 @@ public class CitImportExcelServiceImpl extends BaseService {
CitJournalEntryAdjust citJournal = new CitJournalEntryAdjust();
citJournal.setId(idService.nextId());
citJournal.setPeriod(Integer.valueOf(CitCommonUtil.getPeriod().toString()));
citJournal.setPeriod(period);
citJournal.setOrganizationId(orgId);
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
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());
citJournal.setAccountedDr(new BigDecimal(CitCommonUtil.getValue(rowData.getCell(31)).toString()));
citJournal.setAccountedCr(new BigDecimal(CitCommonUtil.getValue(rowData.getCell(32)).toString()));
journalAdjustList.add(citJournal);
}
if (EnumTbImportType.CoverImport.getCode().equals(importType)) {
......@@ -149,7 +175,7 @@ public class CitImportExcelServiceImpl extends BaseService {
CitDataImportLog citDataImportLog = generalCitDataImportLog(companyCode, orgId, taxPayerId,
EnumCitImportType.JournalAdjust.getCode(), period / 100,
0, period % 100,
companyName, "日记账调整");
companyName, "日记账调整",true);
citDataImportLog.setRecordSize(insertBatchNum);
citDataImportLog.setErrorMsg("追加导入成功");
if (EnumTbImportType.CoverImport.getCode().equals(importType)) {
......@@ -190,37 +216,47 @@ public class CitImportExcelServiceImpl extends BaseService {
List<CitTrialBalance> trialBalanceList = new ArrayList<>();
List<CitDataImportLog> citDataImportLogList = new ArrayList<>();
Integer period = new Integer(CitCommonUtil.getValue(sheet.getRow(1).getCell(2)).toString().replace("-", ""));
String companyName = CitCommonUtil.getValue(sheet.getRow(1).getCell(19)).toString();
String companyCode = CitCommonUtil.getValue(sheet.getRow(1).getCell(9)).toString();
;
List<Organization> organizations = getOrganization(companyCode);
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();
Integer period = CitCommonUtil.getPeriod();
}
//通过循环来完成sheet获取每一行每一列数据并进行相关逻辑处理
for (int rowNum = sheet.getFirstRowNum() + 1; rowNum <= sheet.getLastRowNum(); rowNum++) {
for (int rowNum = sheet.getFirstRowNum() + 8; rowNum <= sheet.getLastRowNum(); rowNum++) {
//获取该行数据
Row rowData = sheet.getRow(rowNum);
CitTrialBalance trialBalance = new CitTrialBalance();
trialBalance.setId(idService.nextId());
trialBalance.setPeriod(Integer.valueOf(CitCommonUtil.getPeriod().toString()));
// citJournal.setAccountedCr( rowData.getCell(1).getStringCellValue());
trialBalance.setPeriod(period);
String companyCode = CitCommonUtil.getValue(rowData.getCell(5)).toString();
List<Organization> organizations = getOrganizationByCode(companyCode);
String companyName = "";
String orgId = "";
String taxPayerId = "";
if (organizations != null && organizations.size() > 0) {
orgId = organizations.get(0).getId();
companyName = organizations.get(0).getName();
taxPayerId = StringUtils.isNotEmpty(organizations.get(0).getLegalCode()) ?
organizations.get(0).getLegalCode() : organizations.get(0).getTaxPayerNumber();
}
trialBalance.setOrganizationId(orgId);
trialBalance.setAccountCode(CitCommonUtil.getValue(rowData.getCell(7)).toString());
trialBalance.setAccountDescription(CitCommonUtil.getValue(rowData.getCell(17)).toString());
//此期间默认为12
trialBalance.setAccountPeriod(12);
trialBalance.setBeginningBalance(new BigDecimal(CitCommonUtil.getValue(rowData.getCell(25)).toString()));
trialBalance.setEndingBalance(new BigDecimal(CitCommonUtil.getValue(rowData.getCell(39)).toString()));
trialBalanceList.add(trialBalance);
}
int insertBatchNum = citTrialBalanceMapper.insertBatch(trialBalanceList);
CitDataImportLog citDataImportLog = generalCitDataImportLog(companyCode, orgId, taxPayerId,
EnumCitImportType.JournalAdjust.getCode(), period / 100,
CitDataImportLog citDataImportLog = generalCitDataImportLog("", "", "",
EnumCitImportType.TrialBalance.getCode(), period / 100,
0, period % 100,
companyName, "日记账调整");
"", "试算平衡表", true);
citDataImportLog.setRecordSize(insertBatchNum);
citDataImportLog.setErrorMsg("追加导入成功");
if (EnumTbImportType.CoverImport.getCode().equals(importType)) {
......@@ -245,7 +281,7 @@ public class CitImportExcelServiceImpl extends BaseService {
*/
public OperationResultDto importDraftAccountMapping(InputStream inputStream, String fileName, String periodDate, Integer importType) throws IOException, InvalidFormatException, ParseException {
OperationResultDto<Object> saveResult = new OperationResultDto<>();
Workbook workbook = fileService.getWorkbook(inputStream, fileName, "citTrialBalance");
Workbook workbook = fileService.getWorkbook(inputStream, fileName, "citDraftAccountMapping");
if (workbook == null) {
saveResult.setResult(false);
saveResult.setResultMsg("读取Excel出现内部错误");
......@@ -259,39 +295,64 @@ public class CitImportExcelServiceImpl extends BaseService {
return saveResult;
}
List<CitTrialBalance> trialBalanceList = new ArrayList<>();
List<CitDraftAccountMapping> citDAMappings = new ArrayList<>();
List<CitDataImportLog> citDataImportLogList = new ArrayList<>();
Integer period = new Integer(CitCommonUtil.getValue(sheet.getRow(1).getCell(2)).toString().replace("-", ""));
String companyName = CitCommonUtil.getValue(sheet.getRow(1).getCell(19)).toString();
String companyCode = CitCommonUtil.getValue(sheet.getRow(1).getCell(9)).toString();
;
List<Organization> organizations = getOrganization(companyCode);
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();
}
Integer period = CitCommonUtil.getPeriod();
// List<Organization> organizations = getOrganization(companyCode);
// 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();
//
// }
//通过循环来完成sheet获取每一行每一列数据并进行相关逻辑处理
for (int rowNum = sheet.getFirstRowNum() + 1; rowNum <= sheet.getLastRowNum(); rowNum++) {
CitDataImportLog citDataImportLogError = generalCitDataImportLog("", "", "",
EnumCitImportType.DraftAccountMapping.getCode(), 0,
0, 0,
"", "底稿&科目Mapping表", false);
citDataImportLogError.setRecordSize(1);
//获取该行数据
Row rowData = sheet.getRow(rowNum);
CitTrialBalance trialBalance = new CitTrialBalance();
trialBalance.setId(idService.nextId());
trialBalance.setPeriod(Integer.valueOf(CitCommonUtil.getPeriod().toString()));
// citJournal.setAccountedCr( rowData.getCell(1).getStringCellValue());
trialBalanceList.add(trialBalance);
}
int insertBatchNum = citTrialBalanceMapper.insertBatch(trialBalanceList);
CitDataImportLog citDataImportLog = generalCitDataImportLog(companyCode, orgId, taxPayerId,
EnumCitImportType.JournalAdjust.getCode(), period / 100,
CitDraftAccountMapping citDAMapping = new CitDraftAccountMapping();
citDAMapping.setId(idService.nextId());
citDAMapping.setPeriod(period);
Object cellValue = CitCommonUtil.getValue(rowData.getCell(5));
if(cellValue == null){
citDataImportLogError.setErrorMsg("数据错误，第"+(rowNum+1)+"行科目代码为空");
citDataImportLogList.add(citDataImportLogError);
continue;
}
citDAMapping.setAcctCode(CitCommonUtil.getValue(rowData.getCell(5)).toString());
cellValue = CitCommonUtil.getValue(rowData.getCell(6));
if(cellValue == null){
citDataImportLogError.setErrorMsg("第"+(rowNum+1)+"行科目名称为空");
citDataImportLogList.add(citDataImportLogError);
continue;
}
citDAMapping.setAccountName(CitCommonUtil.getValue(rowData.getCell(6)).toString());
cellValue = CitCommonUtil.getValue(rowData.getCell(3));
if(cellValue == null){
citDataImportLogError.setErrorMsg("第"+(rowNum+1)+"行小类为空");
citDataImportLogList.add(citDataImportLogError);
continue;
}
citDAMapping.setAttribute(cellValue.toString());
citDAMappings.add(citDAMapping);
}
int insertBatchNum = citDAMappingMapper.insertBatch(citDAMappings);
CitDataImportLog citDataImportLog = generalCitDataImportLog("", "", "",
EnumCitImportType.DraftAccountMapping.getCode(), period / 100,
0, period % 100,
companyName, "日记账调整");
"", "底稿&科目Mapping表", true);
citDataImportLog.setRecordSize(insertBatchNum);
citDataImportLog.setErrorMsg("追加导入成功");
if (EnumTbImportType.CoverImport.getCode().equals(importType)) {
......@@ -330,16 +391,16 @@ public class CitImportExcelServiceImpl extends BaseService {
return saveResult;
}
List<CitTrialBalance> trialBalanceList = new ArrayList<>();
List<CitBalanceSheetPrcAdjust> citBSPrcAdjustList = new ArrayList<>();
List<CitDataImportLog> citDataImportLogList = new ArrayList<>();
Integer period = new Integer(CitCommonUtil.getValue(sheet.getRow(1).getCell(2)).toString().replace("-", ""));
String companyName = CitCommonUtil.getValue(sheet.getRow(1).getCell(19)).toString();
String companyCode = CitCommonUtil.getValue(sheet.getRow(1).getCell(9)).toString();
;
List<Organization> organizations = getOrganization(companyCode);
Integer period = CitCommonUtil.getPeriod();
String companyName = CitCommonUtil.getValue(sheet.getRow(5).getCell(1)).toString();
List<Organization> organizations = getOrganizationByName(companyName);
String companyCode = "";
String orgId = "";
String taxPayerId = "";
if (organizations != null && organizations.size() > 0) {
companyCode = organizations.get(0).getCode();
orgId = organizations.get(0).getId();
taxPayerId = StringUtils.isNotEmpty(organizations.get(0).getLegalCode()) ?
organizations.get(0).getLegalCode() : organizations.get(0).getTaxPayerNumber();
......@@ -347,22 +408,54 @@ public class CitImportExcelServiceImpl extends BaseService {
}
//通过循环来完成sheet获取每一行每一列数据并进行相关逻辑处理
for (int rowNum = sheet.getFirstRowNum() + 1; rowNum <= sheet.getLastRowNum(); rowNum++) {
for (int rowNum = sheet.getFirstRowNum() + 10; rowNum <= sheet.getLastRowNum(); rowNum++) {
//获取该行数据
Row rowData = sheet.getRow(rowNum);
CitTrialBalance trialBalance = new CitTrialBalance();
trialBalance.setId(idService.nextId());
trialBalance.setPeriod(Integer.valueOf(CitCommonUtil.getPeriod().toString()));
// citJournal.setAccountedCr( rowData.getCell(1).getStringCellValue());
trialBalanceList.add(trialBalance);
}
int insertBatchNum = citTrialBalanceMapper.insertBatch(trialBalanceList);
CitDataImportLog citDataImportLogError = generalCitDataImportLog("", "", "",
EnumCitImportType.BalanceSheetPrcAdjust.getCode(), 0,
0, 0,
"", "资产负债表(单家PRC)", false);
citDataImportLogError.setRecordSize(1);
CitBalanceSheetPrcAdjust citBSPrcAdjust = new CitBalanceSheetPrcAdjust();
citBSPrcAdjust.setId(idService.nextId());
citBSPrcAdjust.setPeriod(period);
citBSPrcAdjust.setOrganizationId(orgId);
Object cellValue = CitCommonUtil.getValue(rowData.getCell(0));
if(cellValue == null){
citDataImportLogError.setErrorMsg("第"+(rowNum+1)+"行项目名称为空");
citDataImportLogList.add(citDataImportLogError);
continue;
}
citBSPrcAdjust.setItemName(cellValue.toString());
cellValue = CitCommonUtil.getValue(rowData.getCell(1));
if(cellValue == null){
citDataImportLogError.setErrorMsg("第"+(rowNum+1)+"行期初余额为空");
citDataImportLogList.add(citDataImportLogError);
continue;
}
System.out.println(cellValue);
citBSPrcAdjust.setBegBal(new BigDecimal(cellValue.toString().replace(",","")));
cellValue = CitCommonUtil.getValue(rowData.getCell(2));
if(cellValue == null){
citDataImportLogError.setErrorMsg("第"+(rowNum+1)+"行期末余额为空");
citDataImportLogList.add(citDataImportLogError);
continue;
}
citBSPrcAdjust.setEndBal(new BigDecimal(cellValue.toString().replace(",","")));
citBSPrcAdjustList.add(citBSPrcAdjust);
}
int insertBatchNum = citBSPrcAdjustMapper.insertBatch(citBSPrcAdjustList);
CitDataImportLog citDataImportLog = generalCitDataImportLog(companyCode, orgId, taxPayerId,
EnumCitImportType.JournalAdjust.getCode(), period / 100,
EnumCitImportType.BalanceSheetPrcAdjust.getCode(), period / 100,
0, period % 100,
companyName, "日记账调整");
companyName, "资产负债表(单家PRC)", true);
citDataImportLog.setRecordSize(insertBatchNum);
citDataImportLog.setErrorMsg("追加导入成功");
if (EnumTbImportType.CoverImport.getCode().equals(importType)) {
......@@ -401,13 +494,12 @@ public class CitImportExcelServiceImpl extends BaseService {
return saveResult;
}
List<CitTrialBalance> trialBalanceList = new ArrayList<>();
List<CitProfitPrcAdjust> citProfitPrcAdjustList = new ArrayList<>();
List<CitDataImportLog> citDataImportLogList = new ArrayList<>();
Integer period = new Integer(CitCommonUtil.getValue(sheet.getRow(1).getCell(2)).toString().replace("-", ""));
String companyName = CitCommonUtil.getValue(sheet.getRow(1).getCell(19)).toString();
String companyCode = CitCommonUtil.getValue(sheet.getRow(1).getCell(9)).toString();
;
List<Organization> organizations = getOrganization(companyCode);
Integer period = CitCommonUtil.getPeriod();
String companyName = CitCommonUtil.getValue(sheet.getRow(4).getCell(1)).toString();
String companyCode = CitCommonUtil.getValue(sheet.getRow(5).getCell(1)).toString();
List<Organization> organizations = getOrganizationByCode(companyCode);
String orgId = "";
String taxPayerId = "";
if (organizations != null && organizations.size() > 0) {
......@@ -418,22 +510,51 @@ public class CitImportExcelServiceImpl extends BaseService {
}
//通过循环来完成sheet获取每一行每一列数据并进行相关逻辑处理
for (int rowNum = sheet.getFirstRowNum() + 1; rowNum <= sheet.getLastRowNum(); rowNum++) {
for (int rowNum = sheet.getFirstRowNum() + 10; rowNum <= sheet.getLastRowNum(); rowNum++) {
//获取该行数据
Row rowData = sheet.getRow(rowNum);
CitTrialBalance trialBalance = new CitTrialBalance();
trialBalance.setId(idService.nextId());
trialBalance.setPeriod(Integer.valueOf(CitCommonUtil.getPeriod().toString()));
// citJournal.setAccountedCr( rowData.getCell(1).getStringCellValue());
trialBalanceList.add(trialBalance);
}
int insertBatchNum = citTrialBalanceMapper.insertBatch(trialBalanceList);
CitDataImportLog citDataImportLogError = generalCitDataImportLog(companyCode, orgId, taxPayerId,
EnumCitImportType.ProfitPrcAdjust.getCode(), 0,
0, 0,
companyName, "利润表(单家PRC)", false);
citDataImportLogError.setRecordSize(1);
CitProfitPrcAdjust citProfitPrcAdjust = new CitProfitPrcAdjust();
citProfitPrcAdjust.setId(idService.nextId());
citProfitPrcAdjust.setPeriod(period);
Object cellValue = CitCommonUtil.getValue(rowData.getCell(0));
if(cellValue == null){
citDataImportLogError.setErrorMsg("第"+(rowNum+1)+"行项目名称为空");
citDataImportLogList.add(citDataImportLogError);
continue;
}
citProfitPrcAdjust.setItemName(CitCommonUtil.getValue(rowData.getCell(0)).toString());
cellValue = CitCommonUtil.getValue(rowData.getCell(1));
if(cellValue == null){
citDataImportLogError.setErrorMsg("第"+(rowNum+1)+"行当期发生为空");
citDataImportLogList.add(citDataImportLogError);
continue;
}
citProfitPrcAdjust.setPeriodAmt(new BigDecimal(cellValue.toString().replace(",","")));
cellValue = CitCommonUtil.getValue(rowData.getCell(2));
if(cellValue == null){
citDataImportLogError.setErrorMsg("第"+(rowNum+1)+"行本年累计为空");
citDataImportLogList.add(citDataImportLogError);
continue;
}
citProfitPrcAdjust.setYtdAmt(new BigDecimal(cellValue.toString().replace(",","")));
citProfitPrcAdjustList.add(citProfitPrcAdjust);
}
int insertBatchNum = citProfitPrcAdjustMapper.insertBatch(citProfitPrcAdjustList);
CitDataImportLog citDataImportLog = generalCitDataImportLog(companyCode, orgId, taxPayerId,
EnumCitImportType.JournalAdjust.getCode(), period / 100,
EnumCitImportType.ProfitPrcAdjust.getCode(), period / 100,
0, period % 100,
companyName, "日记账调整");
companyName, "利润表(单家PRC)", true);
citDataImportLog.setRecordSize(insertBatchNum);
citDataImportLog.setErrorMsg("追加导入成功");
if (EnumTbImportType.CoverImport.getCode().equals(importType)) {
......@@ -472,39 +593,52 @@ public class CitImportExcelServiceImpl extends BaseService {
return saveResult;
}
List<CitTrialBalance> trialBalanceList = new ArrayList<>();
List<CitEAMAssetsDisposal> citEAMAssetsList = new ArrayList<>();
List<CitDataImportLog> citDataImportLogList = new ArrayList<>();
Integer period = new Integer(CitCommonUtil.getValue(sheet.getRow(1).getCell(2)).toString().replace("-", ""));
String companyName = CitCommonUtil.getValue(sheet.getRow(1).getCell(19)).toString();
String companyCode = CitCommonUtil.getValue(sheet.getRow(1).getCell(9)).toString();
;
List<Organization> organizations = getOrganization(companyCode);
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();
}
Integer period = CitCommonUtil.getPeriod();
// List<Organization> organizations = getOrganization(companyCode);
// 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();
//
// }
//通过循环来完成sheet获取每一行每一列数据并进行相关逻辑处理
for (int rowNum = sheet.getFirstRowNum() + 1; rowNum <= sheet.getLastRowNum(); rowNum++) {
for (int rowNum = sheet.getFirstRowNum() + 3; rowNum <= sheet.getLastRowNum(); rowNum++) {
//获取该行数据
Row rowData = sheet.getRow(rowNum);
CitTrialBalance trialBalance = new CitTrialBalance();
trialBalance.setId(idService.nextId());
trialBalance.setPeriod(Integer.valueOf(CitCommonUtil.getPeriod().toString()));
// citJournal.setAccountedCr( rowData.getCell(1).getStringCellValue());
trialBalanceList.add(trialBalance);
}
int insertBatchNum = citTrialBalanceMapper.insertBatch(trialBalanceList);
CitDataImportLog citDataImportLog = generalCitDataImportLog(companyCode, orgId, taxPayerId,
EnumCitImportType.JournalAdjust.getCode(), period / 100,
CitDataImportLog citDataImportLogError = generalCitDataImportLog("", "", "",
EnumCitImportType.EAMAssetsDisposal.getCode(), 0,
0, 0,
"", "EAM资产处置金额记录表", false);
citDataImportLogError.setRecordSize(1);
CitEAMAssetsDisposal citEAMAssetsDisposal = new CitEAMAssetsDisposal();
citEAMAssetsDisposal.setId(idService.nextId());
citEAMAssetsDisposal.setPeriod(Integer.valueOf(CitCommonUtil.getPeriod().toString()));
String[] split = CitCommonUtil.getValue(rowData.getCell(1)).toString().replace("月", "").split("年");
StringBuilder sb = new StringBuilder(split[0]);
if(new Integer(split[1]) + 1 < 10){
sb.append(0);
}
sb.append(split[1]);
citEAMAssetsDisposal.setOccurPeriod(new Integer(sb.toString()));
citEAMAssetsDisposal.setAssetLabelNumber(CitCommonUtil.getValue(rowData.getCell(6)).toString());
citEAMAssetsDisposal.setCompensationSaleAmount(new BigDecimal(CitCommonUtil.getValue(rowData.getCell(7)).toString()));
citEAMAssetsList.add(citEAMAssetsDisposal);
}
int insertBatchNum = citEAMAssetsMapper.insertBatch(citEAMAssetsList);
CitDataImportLog citDataImportLog = generalCitDataImportLog("", "", "",
EnumCitImportType.EAMAssetsDisposal.getCode(), period / 100,
0, period % 100,
companyName, "日记账调整");
"", "EAM资产处置金额记录表", true);
citDataImportLog.setRecordSize(insertBatchNum);
citDataImportLog.setErrorMsg("追加导入成功");
if (EnumTbImportType.CoverImport.getCode().equals(importType)) {
......@@ -543,39 +677,51 @@ public class CitImportExcelServiceImpl extends BaseService {
return saveResult;
}
List<CitTrialBalance> trialBalanceList = new ArrayList<>();
List<CitSalaryAdvance> citSalaryAdvanceList = new ArrayList<>();
List<CitDataImportLog> citDataImportLogList = new ArrayList<>();
Integer period = new Integer(CitCommonUtil.getValue(sheet.getRow(1).getCell(2)).toString().replace("-", ""));
String companyName = CitCommonUtil.getValue(sheet.getRow(1).getCell(19)).toString();
String companyCode = CitCommonUtil.getValue(sheet.getRow(1).getCell(9)).toString();
;
List<Organization> organizations = getOrganization(companyCode);
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();
}
Integer period = CitCommonUtil.getPeriod();
// String companyName = CitCommonUtil.getValue(sheet.getRow(1).getCell(19)).toString();
// String companyCode = CitCommonUtil.getValue(sheet.getRow(1).getCell(9)).toString();
// ;
// List<Organization> organizations = getOrganization(companyCode);
// 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();
//
// }
//通过循环来完成sheet获取每一行每一列数据并进行相关逻辑处理
for (int rowNum = sheet.getFirstRowNum() + 1; rowNum <= sheet.getLastRowNum(); rowNum++) {
for (int rowNum = sheet.getFirstRowNum() + 2; rowNum <= sheet.getLastRowNum(); rowNum++) {
//获取该行数据
Row rowData = sheet.getRow(rowNum);
CitTrialBalance trialBalance = new CitTrialBalance();
trialBalance.setId(idService.nextId());
trialBalance.setPeriod(Integer.valueOf(CitCommonUtil.getPeriod().toString()));
// citJournal.setAccountedCr( rowData.getCell(1).getStringCellValue());
trialBalanceList.add(trialBalance);
CitDataImportLog citDataImportLogError = generalCitDataImportLog("", "", "",
EnumCitImportType.SalaryAdvance.getCode(), 0,
0, 0,
"", "预提重分类数据源", false);
citDataImportLogError.setRecordSize(1);
CitSalaryAdvance citSalaryAdvance = new CitSalaryAdvance();
citSalaryAdvance.setId(idService.nextId());
citSalaryAdvance.setPeriod(Integer.valueOf(CitCommonUtil.getPeriod().toString()));
citSalaryAdvance.setPoNo(Integer.valueOf(CitCommonUtil.getValue(rowData.getCell(0)).toString()));
citSalaryAdvance.setPoSubjectCode(CitCommonUtil.getValue(rowData.getCell(5)).toString());
citSalaryAdvance.setPoSubjectName(CitCommonUtil.getValue(rowData.getCell(6)).toString());
citSalaryAdvance.setAdvance(new BigDecimal(CitCommonUtil.getValue(rowData.getCell(16)).toString()));
citSalaryAdvance.setApprovedStandardInvoiceAmount(new BigDecimal(CitCommonUtil.getValue(rowData.getCell(18)).toString()));
citSalaryAdvanceList.add(citSalaryAdvance);
}
int insertBatchNum = citTrialBalanceMapper.insertBatch(trialBalanceList);
CitDataImportLog citDataImportLog = generalCitDataImportLog(companyCode, orgId, taxPayerId,
int insertBatchNum = citSalaryAdvanceMapper.insertBatch(citSalaryAdvanceList);
CitDataImportLog citDataImportLog = generalCitDataImportLog("", "", "",
EnumCitImportType.JournalAdjust.getCode(), period / 100,
0, period % 100,
companyName, "日记账调整");
"", "预提重分类数据源", true);
citDataImportLog.setRecordSize(insertBatchNum);
citDataImportLog.setErrorMsg("追加导入成功");
if (EnumTbImportType.CoverImport.getCode().equals(importType)) {
......@@ -619,22 +765,22 @@ public class CitImportExcelServiceImpl extends BaseService {
}
private CitDataImportLog generalCitDataImportLog(String companyCode, String orgId, String taxPayerId, Integer type, Integer periodYear,
Integer tmsPeriodMonth, Integer periodMonth, String companyName, String fileType) {
CitDataImportLog dataImportLog = new CitDataImportLog();
dataImportLog.setId(idService.nextId());
dataImportLog.setTaxpayerIdNum(taxPayerId);
dataImportLog.setType(type);
dataImportLog.setOrganizationId(orgId);
dataImportLog.setCompanyCode(companyCode);
dataImportLog.setCompanyName(companyName);
dataImportLog.setFileType(fileType);
dataImportLog.setPeriodYear(periodYear);
dataImportLog.setTmsPeriodMonth(tmsPeriodMonth);
dataImportLog.setPeriodMonth(periodMonth);
dataImportLog.setPeriodStatus("人工导入");
dataImportLog.setOperator(authUserHelper.getCurrentAuditor().get());
dataImportLog.setImportResult(true);
return dataImportLog;
Integer tmsPeriodMonth, Integer periodMonth, String companyName, String fileType, boolean importResult) {
CitDataImportLog citDataImportLog = new CitDataImportLog();
citDataImportLog.setId(idService.nextId());
citDataImportLog.setTaxpayerIdNum(taxPayerId);
citDataImportLog.setType(type);
citDataImportLog.setOrganizationId(orgId);
citDataImportLog.setCompanyCode(companyCode);
citDataImportLog.setCompanyName(companyName);
citDataImportLog.setFileType(fileType);
citDataImportLog.setPeriodYear(periodYear);
citDataImportLog.setTmsPeriodMonth(tmsPeriodMonth);
citDataImportLog.setPeriodMonth(periodMonth);
citDataImportLog.setPeriodStatus("人工导入");
citDataImportLog.setOperator(authUserHelper.getCurrentAuditor().get());
citDataImportLog.setImportResult(importResult);
return citDataImportLog;
}
/**
......@@ -694,11 +840,22 @@ public class CitImportExcelServiceImpl extends BaseService {
* @param companyCode
* @return
*/
private List<Organization> getOrganization(String companyCode) {
private List<Organization> getOrganizationByCode(String companyCode) {
OrganizationExample example = new OrganizationExample();
example.createCriteria().andCodeEqualTo(companyCode);
List<Organization> organizations = organizationMapper.selectByExample(example);
return organizations;
}
/**
* 根据公司code获取机构相关信息
* @param companyName
* @return
*/
private List<Organization> getOrganizationByName(String companyName) {
OrganizationExample example = new OrganizationExample();
example.createCriteria().andNameEqualTo(companyName);
List<Organization> organizations = organizationMapper.selectByExample(example);
return organizations;
}
}
atms-dao/src/main/java/pwc/taxtech/atms/entity/CitSalaryAdvance.java
View file @ 23b09c1a
......@@ -89,6 +89,17 @@ public class CitSalaryAdvance extends BaseEntity implements Serializable {
*/
private String poSubjectCode;
/**
* Database Column Remarks:
* PO主体名称
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column cit_salary_advance.po_subject_name
*
* @mbg.generated
*/
private String poSubjectName;
/**
* Database Column Remarks:
* 预提
......@@ -331,6 +342,30 @@ public class CitSalaryAdvance extends BaseEntity implements Serializable {
this.poSubjectCode = poSubjectCode == null ? null : poSubjectCode.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column cit_salary_advance.po_subject_name
*
* @return the value of cit_salary_advance.po_subject_name
*
* @mbg.generated
*/
public String getPoSubjectName() {
return poSubjectName;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column cit_salary_advance.po_subject_name
*
* @param poSubjectName the value for cit_salary_advance.po_subject_name
*
* @mbg.generated
*/
public void setPoSubjectName(String poSubjectName) {
this.poSubjectName = poSubjectName == null ? null : poSubjectName.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column cit_salary_advance.advance
......@@ -494,6 +529,7 @@ public class CitSalaryAdvance extends BaseEntity implements Serializable {
sb.append(", source=").append(source);
sb.append(", poNo=").append(poNo);
sb.append(", poSubjectCode=").append(poSubjectCode);
sb.append(", poSubjectName=").append(poSubjectName);
sb.append(", advance=").append(advance);
sb.append(", approvedStandardInvoiceAmount=").append(approvedStandardInvoiceAmount);
sb.append(", createdBy=").append(createdBy);
......
atms-dao/src/main/java/pwc/taxtech/atms/entity/CitSalaryAdvanceExample.java
View file @ 23b09c1a
......@@ -656,6 +656,76 @@ public class CitSalaryAdvanceExample {
return (Criteria) this;
}
public Criteria andPoSubjectNameIsNull() {
addCriterion("po_subject_name is null");
return (Criteria) this;
}
public Criteria andPoSubjectNameIsNotNull() {
addCriterion("po_subject_name is not null");
return (Criteria) this;
}
public Criteria andPoSubjectNameEqualTo(String value) {
addCriterion("po_subject_name =", value, "poSubjectName");
return (Criteria) this;
}
public Criteria andPoSubjectNameNotEqualTo(String value) {
addCriterion("po_subject_name <>", value, "poSubjectName");
return (Criteria) this;
}
public Criteria andPoSubjectNameGreaterThan(String value) {
addCriterion("po_subject_name >", value, "poSubjectName");
return (Criteria) this;
}
public Criteria andPoSubjectNameGreaterThanOrEqualTo(String value) {
addCriterion("po_subject_name >=", value, "poSubjectName");
return (Criteria) this;
}
public Criteria andPoSubjectNameLessThan(String value) {
addCriterion("po_subject_name <", value, "poSubjectName");
return (Criteria) this;
}
public Criteria andPoSubjectNameLessThanOrEqualTo(String value) {
addCriterion("po_subject_name <=", value, "poSubjectName");
return (Criteria) this;
}
public Criteria andPoSubjectNameLike(String value) {
addCriterion("po_subject_name like", value, "poSubjectName");
return (Criteria) this;
}
public Criteria andPoSubjectNameNotLike(String value) {
addCriterion("po_subject_name not like", value, "poSubjectName");
return (Criteria) this;
}
public Criteria andPoSubjectNameIn(List<String> values) {
addCriterion("po_subject_name in", values, "poSubjectName");
return (Criteria) this;
}
public Criteria andPoSubjectNameNotIn(List<String> values) {
addCriterion("po_subject_name not in", values, "poSubjectName");
return (Criteria) this;
}
public Criteria andPoSubjectNameBetween(String value1, String value2) {
addCriterion("po_subject_name between", value1, value2, "poSubjectName");
return (Criteria) this;
}
public Criteria andPoSubjectNameNotBetween(String value1, String value2) {
addCriterion("po_subject_name not between", value1, value2, "poSubjectName");
return (Criteria) this;
}
public Criteria andAdvanceIsNull() {
addCriterion("advance is null");
return (Criteria) this;
......
atms-dao/src/main/resources/pwc/taxtech/atms/dao/CitSalaryAdvanceMapper.xml
View file @ 23b09c1a
......@@ -13,6 +13,7 @@
<result column="source" jdbcType="VARCHAR" property="source" />
<result column="po_no" jdbcType="INTEGER" property="poNo" />
<result column="po_subject_code" jdbcType="VARCHAR" property="poSubjectCode" />
<result column="po_subject_name" jdbcType="VARCHAR" property="poSubjectName" />
<result column="advance" jdbcType="DECIMAL" property="advance" />
<result column="approved_standard_invoice_amount" jdbcType="DECIMAL" property="approvedStandardInvoiceAmount" />
<result column="created_by" jdbcType="VARCHAR" property="createdBy" />
......@@ -91,8 +92,8 @@
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
id, organization_id, project_id, period, source, po_no, po_subject_code, advance,
approved_standard_invoice_amount, created_by, updated_by, create_time, update_time
id, organization_id, project_id, period, source, po_no, po_subject_code, po_subject_name,
advance, approved_standard_invoice_amount, created_by, updated_by, create_time, update_time
</sql>
<select id="selectByExample" parameterType="pwc.taxtech.atms.entity.CitSalaryAdvanceExample" resultMap="BaseResultMap">
<!--
......@@ -147,14 +148,16 @@
-->
insert into cit_salary_advance (id, organization_id, project_id,
period, source, po_no,
po_subject_code, advance, approved_standard_invoice_amount,
created_by, updated_by, create_time,
update_time)
po_subject_code, po_subject_name, advance,
approved_standard_invoice_amount, created_by,
updated_by, create_time, update_time
)
values (#{id,jdbcType=BIGINT}, #{organizationId,jdbcType=VARCHAR}, #{projectId,jdbcType=VARCHAR},
#{period,jdbcType=INTEGER}, #{source,jdbcType=VARCHAR}, #{poNo,jdbcType=INTEGER},
#{poSubjectCode,jdbcType=VARCHAR}, #{advance,jdbcType=DECIMAL}, #{approvedStandardInvoiceAmount,jdbcType=DECIMAL},
#{createdBy,jdbcType=VARCHAR}, #{updatedBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP},
#{updateTime,jdbcType=TIMESTAMP})
#{poSubjectCode,jdbcType=VARCHAR}, #{poSubjectName,jdbcType=VARCHAR}, #{advance,jdbcType=DECIMAL},
#{approvedStandardInvoiceAmount,jdbcType=DECIMAL}, #{createdBy,jdbcType=VARCHAR},
#{updatedBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
)
</insert>
<insert id="insertSelective" parameterType="pwc.taxtech.atms.entity.CitSalaryAdvance">
<!--
......@@ -184,6 +187,9 @@
<if test="poSubjectCode != null">
po_subject_code,
</if>
<if test="poSubjectName != null">
po_subject_name,
</if>
<if test="advance != null">
advance,
</if>
......@@ -225,6 +231,9 @@
<if test="poSubjectCode != null">
#{poSubjectCode,jdbcType=VARCHAR},
</if>
<if test="poSubjectName != null">
#{poSubjectName,jdbcType=VARCHAR},
</if>
<if test="advance != null">
#{advance,jdbcType=DECIMAL},
</if>
......@@ -283,6 +292,9 @@
<if test="record.poSubjectCode != null">
po_subject_code = #{record.poSubjectCode,jdbcType=VARCHAR},
</if>
<if test="record.poSubjectName != null">
po_subject_name = #{record.poSubjectName,jdbcType=VARCHAR},
</if>
<if test="record.advance != null">
advance = #{record.advance,jdbcType=DECIMAL},
</if>
......@@ -319,6 +331,7 @@
source = #{record.source,jdbcType=VARCHAR},
po_no = #{record.poNo,jdbcType=INTEGER},
po_subject_code = #{record.poSubjectCode,jdbcType=VARCHAR},
po_subject_name = #{record.poSubjectName,jdbcType=VARCHAR},
advance = #{record.advance,jdbcType=DECIMAL},
approved_standard_invoice_amount = #{record.approvedStandardInvoiceAmount,jdbcType=DECIMAL},
created_by = #{record.createdBy,jdbcType=VARCHAR},
......@@ -354,6 +367,9 @@
<if test="poSubjectCode != null">
po_subject_code = #{poSubjectCode,jdbcType=VARCHAR},
</if>
<if test="poSubjectName != null">
po_subject_name = #{poSubjectName,jdbcType=VARCHAR},
</if>
<if test="advance != null">
advance = #{advance,jdbcType=DECIMAL},
</if>
......@@ -387,6 +403,7 @@
source = #{source,jdbcType=VARCHAR},
po_no = #{poNo,jdbcType=INTEGER},
po_subject_code = #{poSubjectCode,jdbcType=VARCHAR},
po_subject_name = #{poSubjectName,jdbcType=VARCHAR},
advance = #{advance,jdbcType=DECIMAL},
approved_standard_invoice_amount = #{approvedStandardInvoiceAmount,jdbcType=DECIMAL},
created_by = #{createdBy,jdbcType=VARCHAR},
......
atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/CitBSPrcAdjustExtendsMapper.xml
View file @ 23b09c1a
......@@ -3,7 +3,7 @@
<mapper namespace="pwc.taxtech.atms.dao.CitBalanceSheetPrcAdjustMapper">
<insert id="insertBatch" parameterType="java.util.List">
insert into balance_sheet_final
insert into cit_balance_sheet_prc_adjust
(<include refid="Base_Column_List"/>)
values
<foreach collection="list" item="item" index="index" separator=",">
......@@ -20,6 +20,10 @@
<when test="item.projectId != null">#{item.projectId,jdbcType=VARCHAR},</when>
<otherwise>'',</otherwise>
</choose>
<choose>
<when test="item.period != null">#{item.period,jdbcType=INTEGER},</when>
<otherwise>0,</otherwise>
</choose>
<choose>
<when test="item.date != null">#{item.date,jdbcType=TIMESTAMP},</when>
<otherwise>CURRENT_TIMESTAMP,</otherwise>
......@@ -28,10 +32,6 @@
<when test="item.source != null">#{item.source,jdbcType=VARCHAR},</when>
<otherwise>'',</otherwise>
</choose>
<choose>
<when test="item.period != null">#{item.period,jdbcType=INTEGER},</when>
<otherwise>0,</otherwise>
</choose>
<choose>
<when test="item.tmsPeriod != null">#{item.tmsPeriod,jdbcType=INTEGER},</when>
<otherwise>0,</otherwise>
......@@ -41,11 +41,11 @@
<otherwise>'',</otherwise>
</choose>
<choose>
<when test="item.begBal != null">#{item.beginningBalance,jdbcType=DECIMAL},</when>
<when test="item.endBal != null">#{item.endBal,jdbcType=DECIMAL},</when>
<otherwise>0,</otherwise>
</choose>
<choose>
<when test="item.endBal != null">#{item.endingBalance,jdbcType=DECIMAL},</when>
<when test="item.begBal != null">#{item.begBal,jdbcType=DECIMAL},</when>
<otherwise>0,</otherwise>
</choose>
<choose>
......
atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/CitDraftAccountMappingExtendsMapper.xml
View file @ 23b09c1a
......@@ -3,7 +3,7 @@
<mapper namespace="pwc.taxtech.atms.dao.CitDraftAccountMappingMapper">
<insert id="insertBatch" parameterType="java.util.List">
insert into balance_sheet_final
insert into cit_draft_account_mapping
(<include refid="Base_Column_List"/>)
values
<foreach collection="list" item="item" index="index" separator=",">
......
atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/CitEAMADisposalExtendsMapper.xml
View file @ 23b09c1a
......@@ -3,7 +3,7 @@
<mapper namespace="pwc.taxtech.atms.dao.CitEAMAssetsDisposalMapper">
<insert id="insertBatch" parameterType="java.util.List">
insert into balance_sheet_final
insert into cit_eam_assets_disposal
(<include refid="Base_Column_List"/>)
values
<foreach collection="list" item="item" index="index" separator=",">
......@@ -20,17 +20,21 @@
<when test="item.projectId != null">#{item.projectId,jdbcType=VARCHAR},</when>
<otherwise>'',</otherwise>
</choose>
<choose>
<when test="item.period != null">#{item.period,jdbcType=INTEGER},</when>
<otherwise>0,</otherwise>
</choose>
<choose>
<when test="item.source != null">#{item.source,jdbcType=VARCHAR},</when>
<otherwise>'',</otherwise>
</choose>
<choose>
<when test="item.period != null">#{item.period,jdbcType=INTEGER},</when>
<when test="item.occurPeriod != null">#{item.occurPeriod,jdbcType=INTEGER},</when>
<otherwise>0,</otherwise>
</choose>
<choose>
<when test="item.occurPeriod != null">#{item.occurPeriod,jdbcType=INTEGER},</when>
<otherwise>0,</otherwise>
<when test="item.assetLabelNumber != null">#{item.assetLabelNumber,jdbcType=VARCHAR},</when>
<otherwise>'',</otherwise>
</choose>
<choose>
<when test="item.compensationSaleAmount != null">#{item.compensationSaleAmount,jdbcType=DECIMAL},</when>
......
atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/CitProfitPrcAdjustExtendsMapper.xml
View file @ 23b09c1a
......@@ -3,7 +3,7 @@
<mapper namespace="pwc.taxtech.atms.dao.CitProfitPrcAdjustMapper">
<insert id="insertBatch" parameterType="java.util.List">
insert into balance_sheet_final
insert into cit_profit_prc_adjust
(<include refid="Base_Column_List"/>)
values
<foreach collection="list" item="item" index="index" separator=",">
......@@ -20,6 +20,10 @@
<when test="item.projectId != null">#{item.projectId,jdbcType=VARCHAR},</when>
<otherwise>'',</otherwise>
</choose>
<choose>
<when test="item.period != null">#{item.period,jdbcType=INTEGER},</when>
<otherwise>0,</otherwise>
</choose>
<choose>
<when test="item.date != null">#{item.date,jdbcType=TIMESTAMP},</when>
<otherwise>CURRENT_TIMESTAMP,</otherwise>
......@@ -28,10 +32,6 @@
<when test="item.source != null">#{item.source,jdbcType=VARCHAR},</when>
<otherwise>'',</otherwise>
</choose>
<choose>
<when test="item.period != null">#{item.period,jdbcType=INTEGER},</when>
<otherwise>0,</otherwise>
</choose>
<choose>
<when test="item.tmsPeriod != null">#{item.tmsPeriod,jdbcType=INTEGER},</when>
<otherwise>0,</otherwise>
......
atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/CitSalaryAdvanceExtendsMapper.xml
View file @ 23b09c1a
......@@ -3,7 +3,7 @@
<mapper namespace="pwc.taxtech.atms.dao.CitSalaryAdvanceMapper">
<insert id="insertBatch" parameterType="java.util.List">
insert into balance_sheet_final
insert into cit_salary_advance
(<include refid="Base_Column_List"/>)
values
<foreach collection="list" item="item" index="index" separator=",">
......@@ -21,17 +21,13 @@
<otherwise>'',</otherwise>
</choose>
<choose>
<when test="item.date != null">#{item.date,jdbcType=TIMESTAMP},</when>
<otherwise>CURRENT_TIMESTAMP,</otherwise>
<when test="item.period != null">#{item.period,jdbcType=INTEGER},</when>
<otherwise>0,</otherwise>
</choose>
<choose>
<when test="item.source != null">#{item.source,jdbcType=VARCHAR},</when>
<otherwise>'',</otherwise>
</choose>
<choose>
<when test="item.period != null">#{item.period,jdbcType=INTEGER},</when>
<otherwise>0,</otherwise>
</choose>
<choose>
<when test="item.poNo != null">#{item.poNo,jdbcType=INTEGER},</when>
<otherwise>0,</otherwise>
......@@ -40,6 +36,10 @@
<when test="item.poSubjectCode != null">#{item.poSubjectCode,jdbcType=VARCHAR},</when>
<otherwise>'',</otherwise>
</choose>
<choose>
<when test="item.poSubjectName != null">#{item.poSubjectName,jdbcType=VARCHAR},</when>
<otherwise>'',</otherwise>
</choose>
<choose>
<when test="item.advance != null">#{item.advance,jdbcType=DECIMAL},</when>
<otherwise>0,</otherwise>
......
atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/CitTrialBalanceExtendsMapper.xml
View file @ 23b09c1a
......@@ -3,7 +3,7 @@
<mapper namespace="pwc.taxtech.atms.dao.CitTrialBalanceMapper">
<insert id="insertBatch" parameterType="java.util.List">
insert into balance_sheet_final
insert into cit_trial_balance
(<include refid="Base_Column_List"/>)
values
<foreach collection="list" item="item" index="index" separator=",">
......
atms-web/src/main/webapp/Scripts/module-part2.js
View file @ 23b09c1a
......@@ -1379,8 +1379,8 @@ var dataImpModule = angular.module('app.dataImp', ['ui.grid', 'ui.router','ui.gr
});
$stateProvider.state({
name: 'citBSPrcAdjustImportDistribution',
url: "/importDistribution/citBalanceSheetPrcAdjust",
name: 'citBsPrcAdjustImportDistribution',
url: "/importDistribution/citBsPrcAdjust",
dsr: true,
views: {
'importContent': {
......@@ -1389,7 +1389,7 @@ var dataImpModule = angular.module('app.dataImp', ['ui.grid', 'ui.router','ui.gr
$scope.state = $state;
appTranslation.load([appTranslation.appPart]);
}],
template: '<data-import-cit-balance-sheet-adjust></data-import-cit-balance-sheet-adjust>'
template: '<data-import-cit-bs-prc-adjust></data-import-cit-bs-prc-adjust>'
}
},
resolve: scriptDependencyProvider.createDependenciesMap(scriptDependencyProvider.dataImp),
......@@ -1414,6 +1414,24 @@ var dataImpModule = angular.module('app.dataImp', ['ui.grid', 'ui.router','ui.gr
sticky: true
});
$stateProvider.state({
name: 'citEamAssetsDisposalImportDistribution',
url: "/importDistribution/citEamAssetsDisposal",
dsr: true,
views: {
'importContent': {
controller: ['$scope', '$state','appTranslation',
function ($scope, $state, appTranslation) {
$scope.state = $state;
appTranslation.load([appTranslation.appPart]);
}],
template: '<data-import-cit-eam-assets-disposal></data-import-cit-eam-assets-disposal>'
}
},
resolve: scriptDependencyProvider.createDependenciesMap(scriptDependencyProvider.dataImp),
sticky: true
});
$stateProvider.state({
name: 'citSalaryAdvanceImportDistribution',
url: "/importDistribution/citSalaryAdvance",
......
atms-web/src/main/webapp/app-resources/i18n/en-us/cit.json
View file @ 23b09c1a
......@@ -82,7 +82,7 @@
"AccountDepreciation": "税务折旧",
"CitJournalAdjustImport": "日记账调整导入-CIT",
"CitBalanceSheetPrcAdjustImport": "资产负债表（单家PRC）调整导入-CIT",
"CitProfitPrcAdjustImport": "利润表表（单家PRC）调整导入-CIT",
"CitProfitPrcAdjustImport": "利润表（单家PRC）调整导入-CIT",
"CitTrialBalanceImport": "试算平衡表导入-CIT",
"CitSalaryAdvanceImport": "预提重分类数据源导入-CIT",
"CitEAMAssetsDisposalImport": "EAM资产处置导入-CIT",
......
atms-web/src/main/webapp/app-resources/i18n/zh-CN/cit.json
View file @ 23b09c1a
......@@ -87,7 +87,7 @@
"AccountDepreciation": "税务折旧",
"CitJournalAdjustImport": "日记账调整导入-CIT",
"CitBalanceSheetPrcAdjustImport": "资产负债表（单家PRC）调整导入-CIT",
"CitProfitPrcAdjustImport": "利润表表（单家PRC）调整导入-CIT",
"CitProfitPrcAdjustImport": "利润表（单家PRC）调整导入-CIT",
"CitTrialBalanceImport": "试算平衡表导入-CIT",
"CitSalaryAdvanceImport": "预提重分类数据源导入-CIT",
"CitEAMAssetsDisposalImport": "EAM资产处置导入-CIT",
......
atms-web/src/main/webapp/app/common/controls/import/import-cit-balance-sheet-prc-adjust/import-cit-balance-sheet-prc-adjust.js → atms-web/src/main/webapp/app/common/controls/import/import-cit-bs-prc-adjust/import-cit-bs-prc-adjust.js
View file @ 23b09c1a
commonModule.directive('importCitBalanceSheetPrcAdjust', ['$log',
commonModule.directive('importCitBsPrcAdjust', ['$log',
function ($log) {
'use strict';
......@@ -6,7 +6,7 @@
return {
restrict: 'E',
templateUrl: '/app/common/controls/import/import-cit-balance-sheet-prc-adjust/import-cit-balance-sheet-prc-adjust.html' + '?_=' + Math.random(),
templateUrl: '/app/common/controls/import/import-cit-bs-prc-adjust/import-cit-bs-prc-adjust.html' + '?_=' + Math.random(),
scope: {
serviceTypeId: "=?",
periodId: "=?"
......
atms-web/src/main/webapp/app/common/controls/import/import-cit-draft-account-mapping/import-cit-draft-account-mapping.ctrl.js
View file @ 23b09c1a
commonModule.controller('importCitTrialBalanceController', ['$scope', '$log', '$translate', '$timeout', '$q', '$interval'
commonModule.controller('importCitDaftAccountMappingCon', ['$scope', '$log', '$translate', '$timeout', '$q', '$interval'
, 'apiInterceptor', 'Upload', 'citImportDataService', 'SweetAlert', 'uiGridConstants', '$uibModal'
, 'vatSessionService', 'enums', 'vatOperationLogService','$anchorScroll','$location',
function ($scope, $log, $translate, $timeout, $q, $interval
......
atms-web/src/main/webapp/app/common/controls/import/import-cit-EAM-assets-disposal/import-cit-EAM-assets-disposal.ctrl.js → atms-web/src/main/webapp/app/common/controls/import/import-cit-eam-assets-disposal/import-cit-eam-assets-disposal.ctrl.js
View file @ 23b09c1a
commonModule.controller('importCitEAMAssetsDisposalCon', ['$scope', '$log', '$translate', '$timeout', '$q', '$interval'
commonModule.controller('importCitEamAssetsDisposalCon', ['$scope', '$log', '$translate', '$timeout', '$q', '$interval'
, 'apiInterceptor', 'Upload', 'citImportDataService', 'SweetAlert', 'uiGridConstants', '$uibModal'
, 'vatSessionService', 'enums', 'vatOperationLogService','$anchorScroll','$location',
function ($scope, $log, $translate, $timeout, $q, $interval
......
atms-web/src/main/webapp/app/common/controls/import/import-cit-EAM-assets-disposal/import-cit-EAM-assets-disposal.html → atms-web/src/main/webapp/app/common/controls/import/import-cit-eam-assets-disposal/import-cit-eam-assets-disposal.html
View file @ 23b09c1a
<div class="import-cit-EAM-assets-disposal">
<div class="import-cit-eam-assets-disposal">
<!--标题-->
<div class="nav-wrapper">
<div class="nav-header" translate="CitEAMAssetsDisposalImport"></div>
......
atms-web/src/main/webapp/app/common/controls/import/import-cit-EAM-assets-disposal/import-cit-EAM-assets-disposal.js → atms-web/src/main/webapp/app/common/controls/import/import-cit-eam-assets-disposal/import-cit-eam-assets-disposal.js
View file @ 23b09c1a
commonModule.directive('importCitEAMAssetsDisposal', ['$log',
commonModule.directive('importCitEamAssetsDisposal', ['$log',
function ($log) {
'use strict';
$log.debug('importCitJournalAdjust.ctor()...');
$log.debug('importCitEamAssetsDisposal.ctor()...');
return {
restrict: 'E',
templateUrl: '/app/common/controls/import/import-cit-EAM-assets-disposal/import-cit-EAM-assets-disposal.html' + '?_=' + Math.random(),
templateUrl: '/app/common/controls/import/import-cit-eam-assets-disposal/import-cit-eam-assets-disposal.html' + '?_=' + Math.random(),
scope: {
serviceTypeId: "=?",
periodId: "=?"
},
controller: 'importCitEAMAssetsDisposalCon',
controller: 'importCitEamAssetsDisposalCon',
link: function (scope, element) {
$('.main-contents')[0].style.width = "260px";
$('.main-contents')[0].style.float = "left";
......
atms-web/src/main/webapp/app/common/controls/import/import-cit-EAM-assets-disposal/import-cit-EAM-assets-disposal.less → atms-web/src/main/webapp/app/common/controls/import/import-cit-eam-assets-disposal/import-cit-eam-assets-disposal.less
View file @ 23b09c1a
@import "~/app-resources/less/theme.less";
.import-cit-EAM-assets-disposal {
.import-cit-eam-assets-disposal {
/*background-color: @color-white;*/
padding-left: 20px;
/*min-height: 800px;*/
......
atms-web/src/main/webapp/app/dataImport/import-distribution/cit-balance-sheet-prc-adjust/data-import-cit-balance-sheet-adjust.js → atms-web/src/main/webapp/app/dataImport/import-distribution/cit-bs-prc-adjust/data-import-cit-bs-prc-adjust.js
View file @ 23b09c1a
citModule.directive('dataImportCitBalanceSheetAdjust', ['$log', 'enums',
citModule.directive('dataImportCitBsPrcAdjust', ['$log', 'enums',
function ($log, enums) {
'use strict';
$log.debug('dataImportInvoiceRecord.ctor()...');
$log.debug('dataImportCitBsPrcAdjust.ctor()...');
return {
restrict: 'E',
template: '<import-cit-balance-sheet-prc-adjust service-type-id="serviceTypeId" period-id="periodId"></import-cit-balance-sheet-prc-adjust>',
template: '<import-cit-bs-prc-adjust service-type-id="serviceTypeId" period-id="periodId"></import-cit-bs-prc-adjust>',
scope: {},
link: function (scope, element) {
scope.periodId = enums.wholeYearPeriod.import;
......
atms-web/src/main/webapp/app/dataImport/import-distribution/cit-EAM-assets-disposal/data-import-cit-EAM-assets-disposal.js → atms-web/src/main/webapp/app/dataImport/import-distribution/cit-eam-assets-disposal/data-import-cit-eam-assets-disposal.js
View file @ 23b09c1a
citModule.directive('dataImportCitEAMAssetsDisposal', ['$log', 'enums',
citModule.directive('dataImportCitEamAssetsDisposal', ['$log', 'enums',
function ($log, enums) {
'use strict';
$log.debug('dataImportInvoiceRecord.ctor()...');
$log.debug('dataImportCitEamAssetsDisposal.ctor()...');
return {
restrict: 'E',
template: '<import-cit-EAM-assets-disposal service-type-id="serviceTypeId" period-id="periodId"></import-cit-EAM-assets-disposal>',
template: '<import-cit-eam-assets-disposal service-type-id="serviceTypeId" period-id="periodId"></import-cit-eam-assets-disposal>',
scope: {},
link: function (scope, element) {
scope.periodId = enums.wholeYearPeriod.import;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment