Skip to content

T
traffic-front
Commit 072dc907 authored by chase's avatar chase
Browse files
Options

Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql

parents 5d2c5dca 68eb9555
Hide whitespace changes
Inline Side-by-side
Showing with 3091 additions and 110 deletions
atms-api/src/main/java/pwc/taxtech/atms/controller/CitDataPreviewController.java
View file @ 072dc907
......@@ -22,6 +22,7 @@ import static javax.servlet.http.HttpServletResponse.SC_NO_CONTENT;
import static javax.servlet.http.HttpServletResponse.SC_OK;
/**
* CIT数据预览功能模块Controller
* @author zhikai.z.wei
*/
@RestController
......@@ -31,12 +32,22 @@ public class CitDataPreviewController extends BaseController {
@Autowired
private CitDataPreviewServiceImpl citDataPreviewService;
/**
* 日记账合并版数据的获取
* @param citJournalAdjustDto
* @return
*/
@PostMapping("getJournalMergeData")
public PageInfo<CitJournalAdjustDto> getJournalMergeData(@RequestBody CitJournalAdjustDto citJournalAdjustDto) {
logger.debug(String.format("CIT日记账合并预览 Condition:%s", JSON.toJSONString(citJournalAdjustDto)));
return citDataPreviewService.getJournalMergeData(citJournalAdjustDto);
}
/**
* 日记账合并版导出
* @param paras
* @param response
*/
@RequestMapping(value = "exportJournalMergeData", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public void exportJournalMergeData(@RequestBody CitJournalAdjustDto paras, HttpServletResponse response) {
int count = citDataPreviewService.exportJournalMergeData2(paras, response);
......@@ -48,13 +59,22 @@ public class CitDataPreviewController extends BaseController {
}
/**
* 试算平衡表生成版的数据获取
* @param citTrialBalanceDto
* @return
*/
@PostMapping("getTbGeneVerData")
public PageInfo<CitTrialBalanceDto> getTbGeneVerData(@RequestBody CitTrialBalanceDto citTrialBalanceDto) {
logger.debug(String.format("CIT日记账合并预览 Condition:%s", JSON.toJSONString(citTrialBalanceDto)));
return citDataPreviewService.getTbGeneVerData(citTrialBalanceDto);
}
/**
* 试算平衡表生成版的导出
* @param paras
* @param response
*/
@RequestMapping(value = "exportTbGeneVerData", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public void exportTbGeneVerData(@RequestBody CitTrialBalanceDto paras, HttpServletResponse response) {
// response.setContentType("application/vnd.ms-excel;charset=utf-8");
......@@ -86,13 +106,23 @@ public class CitDataPreviewController extends BaseController {
}
}
/**
* 试算平衡表Mapping版的数据获取
* @param citTrialBalanceDto
* @return
*/
@PostMapping("getTbMappingVerData")
public PageInfo<CitTrialBalanceDto> getTbMappingVerData(@RequestBody CitTrialBalanceDto citTrialBalanceDto) {
logger.debug(String.format("CIT日记账合并预览 Condition:%s", JSON.toJSONString(citTrialBalanceDto)));
logger.debug(String.format("CIT算平衡表Mapping版 Condition:%s", JSON.toJSONString(citTrialBalanceDto)));
return citDataPreviewService.getTbMappingVerData(citTrialBalanceDto);
}
/**
* 试算平衡表Mapping版的导出
* @param paras
* @param response
*/
@RequestMapping(value = "exportTbMappingVerData", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public void exportTbMappingVerData(@RequestBody CitTrialBalanceDto paras, HttpServletResponse response) {
int count = citDataPreviewService.exportTbMappingVerData2(paras, response);
......
atms-api/src/main/java/pwc/taxtech/atms/controller/CitImportExcelController.java
View file @ 072dc907
......@@ -17,7 +17,7 @@ import java.util.List;
import static pwc.taxtech.atms.constant.enums.EnumCitImportType.JournalAdjust;
/**
* @Description 资产相关Controller
* @Description CIT文件导入Controller
* @Author zhikai.z.wei
*/
@RestController
......@@ -28,14 +28,22 @@ public class CitImportExcelController {
@Autowired
private CitImportExcelServiceImpl citImportExcelService;
/**
* CIT文件导入
* @param file
* @param orgIds
* @param periodDate
* @param importType
* @param importFileType
* @return
*/
@RequestMapping(value = "/citImportExcel", method = RequestMethod.POST)
public @ResponseBody
OperationResultDto citImportExcel(@RequestParam MultipartFile file, @RequestParam(required = false) String orgIds,
@RequestParam String periodDate,
@RequestParam Integer importType,
@RequestParam Integer importFileType){
logger.info("CIT调整版日记账导入");
logger.info("CIT文件导入");
OperationResultDto opeResultDto = new OperationResultDto();
try{
if (file == null || file.getSize() <= 0) {
......
atms-api/src/main/java/pwc/taxtech/atms/service/impl/CitDataPreviewServiceImpl.java
View file @ 072dc907
......@@ -41,6 +41,7 @@ import java.util.List;
import java.util.Map;
/**
* CIT数据预览功能模块
* @author zhikai.z.wei
* @Date: 02/03/2019
* @Description:
......@@ -76,7 +77,7 @@ public class CitDataPreviewServiceImpl extends BaseService {
}
/**
* 日记账导出
* 日记账导出(第一种方式)
* @param citJournalAdjustDto
* @param os
* @return
......@@ -101,6 +102,12 @@ public class CitDataPreviewServiceImpl extends BaseService {
}
}
/**
* 日记账导出(第二种方式)
* @param citJournalAdjustDto
* @param response
* @return
*/
public int exportJournalMergeData2(CitJournalAdjustDto citJournalAdjustDto, HttpServletResponse response){
CitJournalEntryAdjust citJournalEntryAdjust = beanUtil.copyProperties(citJournalAdjustDto, new CitJournalEntryAdjust());
List<CitJournalEntryAdjust> journalMerges = citJournalMapper.getJournalMerge(citJournalEntryAdjust);
......@@ -117,6 +124,10 @@ public class CitDataPreviewServiceImpl extends BaseService {
return 1;
}
/**
* 日记账导出(第一种方式)所用到的获取Excel表头
* @return
*/
private Map<String, String> generalJMHeader() {
Map<String, String> header = new LinkedHashMap<>();
header.put("ApprovalStatus","审批状态");
......@@ -169,7 +180,7 @@ public class CitDataPreviewServiceImpl extends BaseService {
}
/**
* 试算平衡表生成版的导出
* 试算平衡表生成版的导出(第一种方式)
* @param citTrialBalanceDto
* @param os
* @return
......@@ -220,6 +231,10 @@ public class CitDataPreviewServiceImpl extends BaseService {
return 1;
}
/**
* 试算平衡表生成版的导出(第一种方式)所用到的生成Excel的表头
* @return
*/
private Map<String, String> generalTbGeneVerHeader() {
Map<String, String> header = new LinkedHashMap<>();
header.put("AccountCode","科目代码");
......@@ -255,7 +270,7 @@ public class CitDataPreviewServiceImpl extends BaseService {
}
/**
* 试算平衡表Mapping版的导出
* 试算平衡表Mapping版的导出（第一种方式）
* @param citTrialBalanceDto
* @param os
* @return
......
atms-api/src/main/java/pwc/taxtech/atms/service/impl/CitImportExcelServiceImpl.java
View file @ 072dc907
......@@ -64,6 +64,9 @@ public class CitImportExcelServiceImpl extends BaseService {
@Resource
private ProjectMapper projectMapper;
@Resource
private CitTbamMapper citTbamMapper;
/**
* 根据导入的文件类型进行方法分发
*
......@@ -284,11 +287,19 @@ public class CitImportExcelServiceImpl extends BaseService {
if (EnumTbImportType.CoverImport.getCode().equals(importType)) {
//覆盖导入要删除原有的该操作人在当前期间导入的数据，且更改之前导入的日志记录状态
msg = "覆盖导入成功";
CitJournalEntryAdjustExample example = new CitJournalEntryAdjustExample();
CitJournalEntryAdjustExample.Criteria criteria = example.createCriteria();
criteria.andCreatedByEqualTo(currentUserName);
criteria.andPeriodEqualTo(period);
citJournalEntryAdjustMapper.deleteByExample(example);
CitJournalEntryAdjustExample citJEAExample = new CitJournalEntryAdjustExample();
citJEAExample.createCriteria().andCreatedByEqualTo(currentUserName).andPeriodEqualTo(period).andOrganizationIdIn(orgList);
logger.info("删除符合条件的日记账");
citJournalEntryAdjustMapper.deleteByExample(citJEAExample);
//删除自动生成的试算平衡表相关数据
CitTrialBalanceExample citTbExample = new CitTrialBalanceExample();
citTbExample.createCriteria().andPeriodEqualTo(period).andCreateByEqualTo(currentUserName).andOrganizationIdIn(orgList);
int deleteByExample = citTrialBalanceMapper.deleteByExample(citTbExample);
logger.info("删除符合条件的试算平衡表数据");
CitTbamExample citTbamExample = new CitTbamExample();
citTbamExample.createCriteria().andPeriodEqualTo(period).andCreateByEqualTo(currentUserName).andOrganizationIdIn(orgList);
logger.info("删除符合条件的试算平衡表Mapping数据");
citTbamMapper.deleteByExample(citTbamExample);
updateImportLog(EnumCitImportType.JournalAdjust.getCode());
}
int insertBatchNum = citJournalEntryAdjustMapper.insertBatch(journalAdjustList);
......@@ -299,7 +310,9 @@ public class CitImportExcelServiceImpl extends BaseService {
citDataImportLog.setErrorMsg(msg);
citDataImportLogList.add(citDataImportLog);
//导入日志录入到数据库
addDataImportLog(citDataImportLogList);
//根据日记账自动生成试算平衡表，即试算平衡表生成版
autoGeneTB(period, orgId, orgList);
saveResult.setResult(true);
saveResult.setResultMsg("导入成功");
......@@ -518,7 +531,8 @@ public class CitImportExcelServiceImpl extends BaseService {
continue;
}
DecimalFormat df=new DecimalFormat("0");
citDAMapping.setAcctCode(df.format(cellValue));
// String s = cellValue.toString();
citDAMapping.setAcctCode(cellValue.toString());
cellValue = CitCommonUtil.getValue(rowData.getCell(6));
if(cellValue == null){
......@@ -1203,7 +1217,7 @@ public class CitImportExcelServiceImpl extends BaseService {
}
/**
* 自动生成试算平衡表
* 自动生成试算平衡表和join出Mapping版的attribute mapping TB
* @param period
* @param orgList
* @return
......@@ -1215,14 +1229,17 @@ public class CitImportExcelServiceImpl extends BaseService {
StringBuilder periodSb = new StringBuilder();
periodSb.append(period);
periodSb.append("%");
//第二步，查出cit_journal_entry_adjust该期间的调整日记账，
List<CitJournalEntryAdjust> citJournalEntryAdjustList = citJournalEntryAdjustMapper.sumAmountByCondition(periodSb.toString(), orgList);
//第二步，查出cit_journal_entry_adjust该期间的调整日记账，
List<CitTrialBalance> trialBalanceList = new ArrayList<>();
//存放TB与Mapping结合的实体
List<CitTbam> citTbamList = 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);
......@@ -1249,10 +1266,33 @@ public class CitImportExcelServiceImpl extends BaseService {
//计算出期末余额，期末余额为期初余额+借方发生额-贷方发生额
trialBalance.setEndingBalance(lastYearBegBla.add(citJournal.getAccountedDr()).subtract(citJournal.getAccountedCr()));
//根据科目代码及期间查询出相应底稿&科目Mapping数据并赋值给实体CitTBam
CitDraftAccountMappingExample citDAMappingExample = new CitDraftAccountMappingExample();
citDAMappingExample.createCriteria().andAcctCodeEqualTo(citJournal.getSubjectCode()).andPeriodEqualTo(period);
List<CitDraftAccountMapping> citDraftAccountMappings = citDAMappingMapper.selectByExample(citDAMappingExample);
for (CitDraftAccountMapping daMapping : citDraftAccountMappings) {
CitTbam citTbam = new CitTbam();
//把根据日记账算出的TB数据复制到Mapping的TB
beanUtil.copyProperties(trialBalance,citTbam);
citTbam.setId(idService.nextId());
citTbam.setAttribute(daMapping.getAttribute());
citTbamList.add(citTbam);
}
// citDraftAccountMappings.stream().forEach(daMapping -> {
// citTbam.setId(idService.nextId());
// citTbam.setAttribute(daMapping.getAttribute());
// citTbamList.add(citTbam);
// if("70019900".equals(citTbam.getAccountCode())){
// System.out.println(citTbam.getId());
// }
// });
trialBalance.setId(idService.nextId());
trialBalanceList.add(trialBalance);
}
int insertBatch = citTrialBalanceMapper.insertBatch(trialBalanceList);
int insertBatch1 = citTbamMapper.insertBatch(citTbamList);
autoGeneResult.setResult(true);
autoGeneResult.setResultMsg("自动生成TB成功");
return autoGeneResult;
......
atms-api/src/main/java/pwc/taxtech/atms/service/impl/CitReportServiceImpl.java
View file @ 072dc907
......@@ -56,9 +56,8 @@ import static pwc.taxtech.atms.dto.vatdto.WrapPeriodJobDto.*;
@Component
public class CitReportServiceImpl extends BaseService {
private final static Logger logger = LoggerFactory.getLogger(CitReportServiceImpl.class);
private final static String[] functions = {"SGSR", "FSJZ", "ND", "BB", "XXFP", "GZSD", "PC", "JXFPMX",
"JXFP", "PSUM", "DFFS", "JFFS", "WPSR","WPNAME","WPTYPE", "SUM2", "SUM", "RSUMIF", "TABLESUM2"};
"JXFP", "PSUM", "DFFS", "JFFS", "WPSR", "WPNAME", "WPTYPE", "SUM2", "RSUMIF", "TABLESUMIF", "SUM"};
@Autowired
private OrganizationServiceTemplateGroupMapper orgServiceTemplateGroupMapper;
......@@ -162,17 +161,17 @@ public class CitReportServiceImpl extends BaseService {
}
public OperationResultDto generateCitData(String projectId, EnumServiceType serviceType, Boolean isMergeManualData,
Integer periodParam, Integer reportType, Optional<String> generator) {
Integer periodParam, Integer reportType, Optional<String> generator) {
OperationResultDto operationResultDto = new OperationResultDto();
//验证传入的业务类型参数和后台CIT所代表的业务类型是否一致
MyAsserts.assertEq(serviceType, EnumServiceType.CIT, new NotFoundException());
MyAsserts.assertNull(periodJobMapper.getRunningJob(projectId,periodParam), Exceptions.TASK_HAS_BEGINNING);
MyAsserts.assertNull(periodJobMapper.getRunningJob(projectId, periodParam), Exceptions.TASK_HAS_BEGINNING);
String status = periodApprovalMapper.getStatusByProjectIdAndPeriod(projectId, periodParam);
MyAsserts.assertTrue(status == null || !status.equals(Constant.APPROVAL_COMMITTED), Exceptions.REPORT_IN_PROCESS_OR_AGREED_EXCEPTION);
try {
//根据projectId获取相关报表
List<Template> templates = getTemplatesByProjectId(projectId);
List<String> dataValidateArray= new ArrayList<String>();
List<String> dataValidateArray = new ArrayList<String>();
/*dataValidateArray.add("DA001");
dataValidateArray.add("DA002");
dataValidateArray.add("DA003");*/
......@@ -186,7 +185,7 @@ public class CitReportServiceImpl extends BaseService {
try {
// TODO 进行数据校验
DataValidation(periodParam, projectId,genJob );
DataValidation(periodParam, projectId, genJob);
updateConfig(projectId, periodParam, isMergeManualData, templates, genJob);
......@@ -202,12 +201,12 @@ public class CitReportServiceImpl extends BaseService {
evaluator.evaluateAll();
reportGenerator.updateWorkbookCaclsValueToDb(projectId, periodParam, workbook, resources, isMergeManualData, genJob);
setStatus(genJob,STATUS_END);
setStatus(genJob, STATUS_END);
periodJobMapper.updateByPrimaryKey(genJob);
} catch (Exception e) {
setStatus(genJob, STATUS_ERROR);
e.printStackTrace();
genJob.setErrorMsg("Sever error "+e.getClass().getName());
genJob.setErrorMsg("Sever error " + e.getClass().getName());
periodJobMapper.updateByPrimaryKey(genJob);
}
}
......@@ -224,6 +223,7 @@ public class CitReportServiceImpl extends BaseService {
/**
* 根据projectId（卡片ID）获取模板
*
* @param projectId
* @return
*/
......@@ -247,6 +247,7 @@ public class CitReportServiceImpl extends BaseService {
/**
* 根据报表模板组ID查询在该组的报表模板
*
* @param templateGroupId
* @return
*/
......@@ -260,7 +261,7 @@ public class CitReportServiceImpl extends BaseService {
private CitJour*/
//数据校验
private void DataValidation(Integer periodParam, String projectId, PeriodJob genJob) {
setStatus(genJob,"DA004", STATUS_BEGIN);
setStatus(genJob, "DA004", STATUS_BEGIN);
//本期余额表
/* TrialBalanceExample trialBalanceExample = new TrialBalanceExample();
......@@ -280,18 +281,18 @@ public class CitReportServiceImpl extends BaseService {
Map<String, Object> map1 = new HashedMap();
map1.put("projectId", projectId);
map1.put("period", periodParam);
if((periodParam+"").length() == 1){
map1.put("period", "0"+ periodParam);
}else{
if ((periodParam + "").length() == 1) {
map1.put("period", "0" + periodParam);
} else {
map1.put("period", "" + periodParam);
}
List<AdjustmentTable> adjustmentTables = adjustmentTableMapper.selectBeforeAdjustData(map1);
Map<String, Object> map2 = new HashedMap();
map2.put("projectId", projectId);
if((periodParam+"").length() == 1){
map2.put("period", "0"+ periodParam);
}else{
if ((periodParam + "").length() == 1) {
map2.put("period", "0" + periodParam);
} else {
map2.put("period", "" + periodParam);
}
Map<String, Object> map = new HashMap<>();
......@@ -301,14 +302,14 @@ public class CitReportServiceImpl extends BaseService {
map.put("companyCode", mapProject.get("code"));
map.put("companyName", mapProject.get("name"));
List<JournalEntry> journalEntries = journalEntryMapper.selectNowAdjustData(map2);
for(int i =0; i< adjustmentTables.size(); i++){
for(int j =0; j< journalEntries.size(); j++){
for (int i = 0; i < adjustmentTables.size(); i++) {
for (int j = 0; j < journalEntries.size(); j++) {
JournalEntry journalEntry = journalEntries.get(j);
AdjustmentTable adjustmentTable = adjustmentTables.get(j);
if(journalEntry.getSegment3().equals(adjustmentTable.getSegment3()) &&
journalEntry.getSegment5().equals(adjustmentTable.getSegment5())&&
journalEntry.getSegment6().equals(adjustmentTable.getSegment6()) && journalEntry.getPeriodJrMinDr() != adjustmentTable.getPeriodDrMixCr() ){
setStatus(genJob,STATUS_ERROR );
if (journalEntry.getSegment3().equals(adjustmentTable.getSegment3()) &&
journalEntry.getSegment5().equals(adjustmentTable.getSegment5()) &&
journalEntry.getSegment6().equals(adjustmentTable.getSegment6()) && journalEntry.getPeriodJrMinDr() != adjustmentTable.getPeriodDrMixCr()) {
setStatus(genJob, STATUS_ERROR);
Constant.ReportDataValidateLog reportDataValidateLog = new Constant.ReportDataValidateLog(journalEntries.get(j).getSegment3(), journalEntries.get(j).getSegment5(), journalEntries.get(j).getSegment6());
//记录校验结果
//
......@@ -333,22 +334,23 @@ public class CitReportServiceImpl extends BaseService {
periodJobMapper.updateByPrimaryKey(genJob);
}
public void insertDataValidateResult(Map map){
public void insertDataValidateResult(Map map) {
DataValidateLog dataValidateLog = new DataValidateLog();
dataValidateLog.setCreateTime(new Date());
dataValidateLog.setPeriod((Integer) map.get("period"));
dataValidateLog.setProjectId((String)map.get("projectId"));
dataValidateLog.setValidateResult((String)map.get("validateResult"));
dataValidateLog.setResult((String)map.get("result"));
dataValidateLog.setOrganizationId((String)map.get("organizationId"));
dataValidateLog.setCompanyCode((String)map.get("companyCode"));
dataValidateLog.setCompanyName((String)map.get("companyName"));
dataValidateLog.setProjectId((String) map.get("projectId"));
dataValidateLog.setValidateResult((String) map.get("validateResult"));
dataValidateLog.setResult((String) map.get("result"));
dataValidateLog.setOrganizationId((String) map.get("organizationId"));
dataValidateLog.setCompanyCode((String) map.get("companyCode"));
dataValidateLog.setCompanyName((String) map.get("companyName"));
dataValidateLog.setTmsPeriod((Integer) map.get("tmsPeriod"));
dataValidateLogMapper.insert(dataValidateLog);
}
/**
* 清除配置，复制配置
*
* @param projectId
* @param period
* @param isMergeManualData
......@@ -367,6 +369,7 @@ public class CitReportServiceImpl extends BaseService {
/**
* 清除配置
*
* @param projectId
* @param period
* @param templateIds
......@@ -446,6 +449,7 @@ public class CitReportServiceImpl extends BaseService {
/**
* 复制各种配置
*
* @param projectId
* @param templates
* @param period
......@@ -488,6 +492,7 @@ public class CitReportServiceImpl extends BaseService {
/**
* 复制报表模板单元格定位及相关信息到卡片单元格模板
*
* @param projectId
* @param templateId
* @param period
......@@ -521,7 +526,7 @@ public class CitReportServiceImpl extends BaseService {
periodCellTemplateList.add(periodCellTemplate);
}
CommonUtils.subListWithLen(periodCellTemplateList,CommonUtils.BATCH_NUM).forEach(batch->{
CommonUtils.subListWithLen(periodCellTemplateList, CommonUtils.BATCH_NUM).forEach(batch -> {
periodCellTemplateMapper.batchInsert(batch);
});
......@@ -531,6 +536,7 @@ public class CitReportServiceImpl extends BaseService {
/**
* 复制单元格内容到卡片单元格内容
*
* @param projectId
* @param templateId
* @param period
......@@ -584,14 +590,15 @@ public class CitReportServiceImpl extends BaseService {
periodCellTemplateConfigList.add(periodCellTemplateConfig);
}
CommonUtils.subListWithLen(periodCellTemplateConfigList,CommonUtils.BATCH_NUM).forEach(batch->{
CommonUtils.subListWithLen(periodCellTemplateConfigList, CommonUtils.BATCH_NUM).forEach(batch -> {
periodCellTemplateConfigMapper.batchInsert(batch);
});
}
/**
* 固定转换公式
* 固定转换公式
*
* @param pctc
*/
private void fixedParsedFormula(PeriodCellTemplateConfig pctc) {
......@@ -627,6 +634,7 @@ public class CitReportServiceImpl extends BaseService {
/**
* 未知用途。。
*
* @param pctc
*/
private void fixedAccountCode(PeriodCellTemplateConfig pctc) {
......@@ -650,6 +658,7 @@ public class CitReportServiceImpl extends BaseService {
/**
* 获取符合条件的PeriodJob以供前台判断job执行的阶段
*
* @param projectId
* @param period
* @param jobId
......@@ -663,8 +672,8 @@ public class CitReportServiceImpl extends BaseService {
public OperationResultDto<List<ReportDto>> getFilterReportTemplate(String projectId, EnumServiceType serviceType, Integer periodParam) {
OperationResultDto<List<ReportDto>> result = new OperationResultDto<>();
CommonUtils.copyProperties(getReportTemplate(projectId,serviceType,periodParam),result);
if(!result.getResult() || CollectionUtils.isEmpty(result.getData())) {
CommonUtils.copyProperties(getReportTemplate(projectId, serviceType, periodParam), result);
if (!result.getResult() || CollectionUtils.isEmpty(result.getData())) {
return result;
}
int period = periodParam != null ? periodParam : 0;
......
atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/FormulaAgent.java
View file @ 072dc907
......@@ -131,7 +131,6 @@ public class FormulaAgent {
public PeriodCellData getCellData(String templateId, String cellId, int periodId, String projectId) {
PeriodReport report = getReportByTemplate(templateId, periodId, projectId);
MyAsserts.assertNotNull(report, Exceptions.BB_REPORT_NULL);
PeriodCellData cellData = getCellDataListByTemplate(cellId, report.getId());
MyAsserts.assertNotNull(cellData, Exceptions.BB_CELL_DATA_NULL);
return cellData;
......@@ -153,48 +152,71 @@ public class FormulaAgent {
if (split[0].indexOf(">=") != -1) {
filterValue = "> " + split[1] + "and" + filter + " =" + split[1];
}
if (split[0].indexOf("<=") != -1) {
} else if (split[0].indexOf("<=") != -1) {
filterValue = "< " + split[1] + "and" + filter + " =" + split[1];
} else {
filterValue = split[0] + "'" + split[1] + "'";
}
if ("cit_balance_sheet_prc_adjust".equals(tableName) || ("cit_profit_prc_adjust".equals(tableName))) {
try {
return _buildSql(getField, tableName, filter, filterValue, period, formulaContext, year, true);
} catch (Exception e) {
e.printStackTrace();
}
}
if ("CITZCFZB".equals(tableName) || ("CITLRB".equals(tableName))) {
try {
return _buildSql(getField, tableName, filter, filterValue, period, formulaContext, year, false);
} catch (Exception e) {
e.printStackTrace();
}
return _buildSql(getField, tableName, filter, filterValue, period, formulaContext, year, true);
return null;
}
public static String _buildSql(String getField, String tableName, String filter, String filterValue, Integer period, FormulaContext formulaContext, String year, boolean bool) {
String sql = "select " + getField + " from " + tableName + " where 1=1 and " + filter + filterValue;
String _p = "";
if (formulaContext.getPeriod() - period < 10) {
_p = year + "'0" + (formulaContext.getPeriod() - period) + "'";
} else {
_p = year + (formulaContext.getPeriod() - period);
public static String _buildSql(String getField, String tableName, String filter, String filterValue, Integer period, FormulaContext formulaContext, String year, boolean bool) throws Exception {
String sql = "select " + getField + " from " + tableName + " where 1=1 and " + filter + filterValue;
String _p = insertZero(formulaContext.getPeriod() - Math.abs(period));
String _period = insertZero(formulaContext.getPeriod());
String per = insertZero((formulaContext.getPeriod() - 1));
if (!bool) {
if (period == 0) {
sql += " and tms_period = " + year + _period;
} else if (period == -99) {
sql += " and tms_period between " + year + "01 and " + year + per;
} else if (period == 99) {
sql += " and tms_period between " + year + "01 and " + year + _period;
} else {
if (period > 0)
throw new Exception("参数不正确");
sql += " and tms_period between " + year + _p + " and " + year + per;
}
}
if (period == 0) {
sql += " and tms-period = " + formulaContext.getPeriod();
} else if (period == -99) {
sql += "and tms-period between '" + year + "01' and " + (formulaContext.getPeriod() - 1);
} else if (period == 99) {
sql += "and tms-period between '" + year + "01' and " + (formulaContext.getPeriod());
if (bool)
sql += " and period = " + year;
return sql;
}
public static String insertZero(Integer itr) {
String str = null;
if (itr < 10) {
str = "0" + itr;
} else {
sql += "and tms-period between " + _p + "and " + (formulaContext.getPeriod() - 1);
}
if (bool) {
sql += " and period = '" + year + period + "'";
str = "" + itr;
}
return sql;
return str;
}
@Autowired
JdbcTemplate jdbcTemplate;
public static void main(String[] args) {
System.out.println(buildSql("balance_sheet", "end_bal", "beg_bal", "> 0.00", 201810, "2", null));
;
}
/* public static void main(String[] args) {
FormulaAgent formulaAgent = new FormulaAgent();
FormulaContext formulaContext = new FormulaContext();
formulaContext.setPeriod(3);
formulaAgent.getTableDataByName("CITLRB", "end_bal", "item_name", "= 小帅哥", -3, "2018", formulaContext);
}*/
public Long getTableDataByName(String tableName, String getField, String filter, String filterValue, Integer period, String year, FormulaContext formulaContext) {
List<Map<String, Object>> stringObjectMap = jdbcTemplate.queryForList(buildSql(TableRule.map.get(tableName), getField, filter, filterValue, period, year, formulaContext));
......
atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/ReportGeneratorImpl.java
View file @ 072dc907
......@@ -512,7 +512,7 @@ public class ReportGeneratorImpl {
FreeRefFunction[] functionImpls = {new SGSR(formulaContext), new FSJZ(formulaContext), new ND(formulaContext),
new BB(formulaContext), new XXFP(formulaContext), new GZSD(formulaContext), new PC(formulaContext)
, new JXFPMX(formulaContext), new JXFP(formulaContext), new PSUM(formulaContext), new DFFS(formulaContext),
new JFFS(formulaContext), new WPSR(formulaContext),new WPNAME(formulaContext),new WPTYPE(formulaContext), new SUM2(formulaContext),
new JFFS(formulaContext), new WPSR(formulaContext), new WPNAME(formulaContext), new WPTYPE(formulaContext), new SUM2(formulaContext),
new SUM(formulaContext), new RSUMIF(formulaContext), new TABLESUMIF(formulaContext)};
UDFFinder udfs = new DefaultUDFFinder(functions, functionImpls);
UDFFinder udfToolpack = new AggregatingUDFFinder(udfs);
......
atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/ReportServiceImpl.java
View file @ 072dc907
......@@ -60,7 +60,7 @@ public class ReportServiceImpl extends BaseService {
private final static Logger logger = LoggerFactory.getLogger(ReportServiceImpl.class);
private BlockingQueue<PeriodJob> queue = new LinkedBlockingQueue<>();
private final static String[] functions = {"SGSR", "FSJZ", "ND", "BB", "XXFP", "GZSD", "PC", "JXFPMX",
"JXFP", "PSUM", "DFFS", "JFFS", "WPSR","WPNAME","WPTYPE"};
"JXFP", "PSUM", "DFFS", "JFFS", "WPSR","WPNAME","WPTYPE", "SUM2", "RSUMIF", "TABLESUMIF", "SUM"};
@Autowired
private ReportGeneratorImpl reportGenerator;
......@@ -507,12 +507,9 @@ public class ReportServiceImpl extends BaseService {
@Override
public void run() {
try {
updateConfig(projectId, periodParam, isMergeManualData, templates, genJob);
//进行数据校验
DataValidation(periodParam, projectId,genJob );
updateConfig(projectId, periodParam, isMergeManualData, templates, genJob);
PeriodResources resources = reportGenerator.getPeriodResources(projectId, periodParam,
templates.stream().map(Template::getId).collect(Collectors.toList()));
......
atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/report/functions/TABLESUMIF.java
View file @ 072dc907
......@@ -5,13 +5,9 @@ import org.apache.poi.ss.formula.eval.EvaluationException;
import org.apache.poi.ss.formula.eval.NumberEval;
import org.apache.poi.ss.formula.eval.ValueEval;
import org.apache.poi.ss.formula.functions.FreeRefFunction;
import pwc.taxtech.atms.dto.OperationResultDto;
import pwc.taxtech.atms.dto.TableRule;
import pwc.taxtech.atms.exception.Exceptions;
import java.util.HashMap;
import java.util.Map;
import static pwc.taxtech.atms.common.util.FormulaUtil.resolverInteger;
import static pwc.taxtech.atms.common.util.FormulaUtil.resolverString;
......@@ -66,7 +62,6 @@ public class TABLESUMIF extends FunctionBase implements FreeRefFunction {
e.printStackTrace();
return new NumberEval(0.00);
}
return new NumberEval(0.00);
}
}
atms-dao/src/main/java/pwc/taxtech/atms/dao/CitTbamMapper.java 0 → 100644
View file @ 072dc907
package pwc.taxtech.atms.dao;
import java.util.List;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.session.RowBounds;
import pwc.taxtech.atms.MyMapper;
import pwc.taxtech.atms.entity.CitTbam;
import pwc.taxtech.atms.entity.CitTbamExample;
@Mapper
public interface CitTbamMapper extends MyMapper {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table cit_tbam
*
* @mbg.generated
*/
long countByExample(CitTbamExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table cit_tbam
*
* @mbg.generated
*/
int deleteByExample(CitTbamExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table cit_tbam
*
* @mbg.generated
*/
int deleteByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table cit_tbam
*
* @mbg.generated
*/
int insert(CitTbam record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table cit_tbam
*
* @mbg.generated
*/
int insertSelective(CitTbam record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table cit_tbam
*
* @mbg.generated
*/
List<CitTbam> selectByExampleWithRowbounds(CitTbamExample example, RowBounds rowBounds);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table cit_tbam
*
* @mbg.generated
*/
List<CitTbam> selectByExample(CitTbamExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table cit_tbam
*
* @mbg.generated
*/
CitTbam selectByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table cit_tbam
*
* @mbg.generated
*/
int updateByExampleSelective(@Param("record") CitTbam record, @Param("example") CitTbamExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table cit_tbam
*
* @mbg.generated
*/
int updateByExample(@Param("record") CitTbam record, @Param("example") CitTbamExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table cit_tbam
*
* @mbg.generated
*/
int updateByPrimaryKeySelective(CitTbam record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table cit_tbam
*
* @mbg.generated
*/
int updateByPrimaryKey(CitTbam record);
/**
* 批量插入数据
* @author zhikai.z.wei
* @param citTbamList
* @return
*/
int insertBatch(List<CitTbam> citTbamList);
}
\ No newline at end of file
atms-dao/src/main/java/pwc/taxtech/atms/entity/CitTbam.java 0 → 100644
View file @ 072dc907
package pwc.taxtech.atms.entity;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
/**
*
* This class was generated by MyBatis Generator.
* This class corresponds to the database table cit_tbam
*
* @mbg.generated do_not_delete_during_merge
*/
public class CitTbam extends BaseEntity implements Serializable {
/**
* Database Column Remarks:
* 唯一编号
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column cit_tbam.id
*
* @mbg.generated
*/
private Long id;
/**
* Database Column Remarks:
* 机构编号
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column cit_tbam.organization_id
*
* @mbg.generated
*/
private String organizationId;
/**
* Database Column Remarks:
* 项目ID
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column cit_tbam.project_id
*
* @mbg.generated
*/
private String projectId;
/**
* Database Column Remarks:
* 数据日期
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column cit_tbam.date
*
* @mbg.generated
*/
private Date date;
/**
* Database Column Remarks:
* 来源
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column cit_tbam.source
*
* @mbg.generated
*/
private String source;
/**
* Database Column Remarks:
* 期间 yyyymm(区分卡片年份的期间，系统设计要求必有字段)
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column cit_tbam.period
*
* @mbg.generated
*/
private Integer period;
/**
* Database Column Remarks:
* 期间 yyyymm
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column cit_tbam.account_period
*
* @mbg.generated
*/
private Integer accountPeriod;
/**
* Database Column Remarks:
* 小类
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column cit_tbam.attribute
*
* @mbg.generated
*/
private String attribute;
/**
* Database Column Remarks:
* 科目代码
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column cit_tbam.account_code
*
* @mbg.generated
*/
private String accountCode;
/**
* Database Column Remarks:
* 科目说明
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column cit_tbam.account_description
*
* @mbg.generated
*/
private String accountDescription;
/**
* Database Column Remarks:
* 借方发生额
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column cit_tbam.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_tbam.credit_amount
*
* @mbg.generated
*/
private BigDecimal creditAmount;
/**
* Database Column Remarks:
* 期初余额
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column cit_tbam.beginning_balance
*
* @mbg.generated
*/
private BigDecimal beginningBalance;
/**
* Database Column Remarks:
* 期末余额
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column cit_tbam.ending_balance
*
* @mbg.generated
*/
private BigDecimal endingBalance;
/**
* Database Column Remarks:
* 创建人
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column cit_tbam.create_by
*
* @mbg.generated
*/
private String createBy;
/**
* Database Column Remarks:
* 创建时间
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column cit_tbam.create_time
*
* @mbg.generated
*/
private Date createTime;
/**
* Database Column Remarks:
* 更新时间
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column cit_tbam.update_time
*
* @mbg.generated
*/
private Date updateTime;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table cit_tbam
*
* @mbg.generated
*/
private static final long serialVersionUID = 1L;
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column cit_tbam.id
*
* @return the value of cit_tbam.id
*
* @mbg.generated
*/
public Long getId() {
return id;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column cit_tbam.id
*
* @param id the value for cit_tbam.id
*
* @mbg.generated
*/
public void setId(Long id) {
this.id = id;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column cit_tbam.organization_id
*
* @return the value of cit_tbam.organization_id
*
* @mbg.generated
*/
public String getOrganizationId() {
return organizationId;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column cit_tbam.organization_id
*
* @param organizationId the value for cit_tbam.organization_id
*
* @mbg.generated
*/
public void setOrganizationId(String organizationId) {
this.organizationId = organizationId == null ? null : organizationId.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column cit_tbam.project_id
*
* @return the value of cit_tbam.project_id
*
* @mbg.generated
*/
public String getProjectId() {
return projectId;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column cit_tbam.project_id
*
* @param projectId the value for cit_tbam.project_id
*
* @mbg.generated
*/
public void setProjectId(String projectId) {
this.projectId = projectId == null ? null : projectId.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column cit_tbam.date
*
* @return the value of cit_tbam.date
*
* @mbg.generated
*/
public Date getDate() {
return date;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column cit_tbam.date
*
* @param date the value for cit_tbam.date
*
* @mbg.generated
*/
public void setDate(Date date) {
this.date = date;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column cit_tbam.source
*
* @return the value of cit_tbam.source
*
* @mbg.generated
*/
public String getSource() {
return source;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column cit_tbam.source
*
* @param source the value for cit_tbam.source
*
* @mbg.generated
*/
public void setSource(String source) {
this.source = source == null ? null : source.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column cit_tbam.period
*
* @return the value of cit_tbam.period
*
* @mbg.generated
*/
public Integer getPeriod() {
return period;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column cit_tbam.period
*
* @param period the value for cit_tbam.period
*
* @mbg.generated
*/
public void setPeriod(Integer period) {
this.period = period;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column cit_tbam.account_period
*
* @return the value of cit_tbam.account_period
*
* @mbg.generated
*/
public Integer getAccountPeriod() {
return accountPeriod;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column cit_tbam.account_period
*
* @param accountPeriod the value for cit_tbam.account_period
*
* @mbg.generated
*/
public void setAccountPeriod(Integer accountPeriod) {
this.accountPeriod = accountPeriod;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column cit_tbam.attribute
*
* @return the value of cit_tbam.attribute
*
* @mbg.generated
*/
public String getAttribute() {
return attribute;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column cit_tbam.attribute
*
* @param attribute the value for cit_tbam.attribute
*
* @mbg.generated
*/
public void setAttribute(String attribute) {
this.attribute = attribute == null ? null : attribute.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column cit_tbam.account_code
*
* @return the value of cit_tbam.account_code
*
* @mbg.generated
*/
public String getAccountCode() {
return accountCode;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column cit_tbam.account_code
*
* @param accountCode the value for cit_tbam.account_code
*
* @mbg.generated
*/
public void setAccountCode(String accountCode) {
this.accountCode = accountCode == null ? null : accountCode.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column cit_tbam.account_description
*
* @return the value of cit_tbam.account_description
*
* @mbg.generated
*/
public String getAccountDescription() {
return accountDescription;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column cit_tbam.account_description
*
* @param accountDescription the value for cit_tbam.account_description
*
* @mbg.generated
*/
public void setAccountDescription(String accountDescription) {
this.accountDescription = accountDescription == null ? null : accountDescription.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column cit_tbam.debit_amount
*
* @return the value of cit_tbam.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_tbam.debit_amount
*
* @param debitAmount the value for cit_tbam.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_tbam.credit_amount
*
* @return the value of cit_tbam.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_tbam.credit_amount
*
* @param creditAmount the value for cit_tbam.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_tbam.beginning_balance
*
* @return the value of cit_tbam.beginning_balance
*
* @mbg.generated
*/
public BigDecimal getBeginningBalance() {
return beginningBalance;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column cit_tbam.beginning_balance
*
* @param beginningBalance the value for cit_tbam.beginning_balance
*
* @mbg.generated
*/
public void setBeginningBalance(BigDecimal beginningBalance) {
this.beginningBalance = beginningBalance;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column cit_tbam.ending_balance
*
* @return the value of cit_tbam.ending_balance
*
* @mbg.generated
*/
public BigDecimal getEndingBalance() {
return endingBalance;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column cit_tbam.ending_balance
*
* @param endingBalance the value for cit_tbam.ending_balance
*
* @mbg.generated
*/
public void setEndingBalance(BigDecimal endingBalance) {
this.endingBalance = endingBalance;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column cit_tbam.create_by
*
* @return the value of cit_tbam.create_by
*
* @mbg.generated
*/
public String getCreateBy() {
return createBy;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column cit_tbam.create_by
*
* @param createBy the value for cit_tbam.create_by
*
* @mbg.generated
*/
public void setCreateBy(String createBy) {
this.createBy = createBy == null ? null : createBy.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column cit_tbam.create_time
*
* @return the value of cit_tbam.create_time
*
* @mbg.generated
*/
public Date getCreateTime() {
return createTime;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column cit_tbam.create_time
*
* @param createTime the value for cit_tbam.create_time
*
* @mbg.generated
*/
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column cit_tbam.update_time
*
* @return the value of cit_tbam.update_time
*
* @mbg.generated
*/
public Date getUpdateTime() {
return updateTime;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column cit_tbam.update_time
*
* @param updateTime the value for cit_tbam.update_time
*
* @mbg.generated
*/
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table cit_tbam
*
* @mbg.generated
*/
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName());
sb.append(" [");
sb.append("Hash = ").append(hashCode());
sb.append(", id=").append(id);
sb.append(", organizationId=").append(organizationId);
sb.append(", projectId=").append(projectId);
sb.append(", date=").append(date);
sb.append(", source=").append(source);
sb.append(", period=").append(period);
sb.append(", accountPeriod=").append(accountPeriod);
sb.append(", attribute=").append(attribute);
sb.append(", accountCode=").append(accountCode);
sb.append(", accountDescription=").append(accountDescription);
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);
sb.append(", createTime=").append(createTime);
sb.append(", updateTime=").append(updateTime);
sb.append("]");
return sb.toString();
}
}
\ No newline at end of file
atms-dao/src/main/java/pwc/taxtech/atms/entity/CitTbamExample.java 0 → 100644
View file @ 072dc907
package pwc.taxtech.atms.entity;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
public class CitTbamExample {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table cit_tbam
*
* @mbg.generated
*/
protected String orderByClause;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table cit_tbam
*
* @mbg.generated
*/
protected boolean distinct;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table cit_tbam
*
* @mbg.generated
*/
protected List<Criteria> oredCriteria;
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table cit_tbam
*
* @mbg.generated
*/
public CitTbamExample() {
oredCriteria = new ArrayList<Criteria>();
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table cit_tbam
*
* @mbg.generated
*/
public void setOrderByClause(String orderByClause) {
this.orderByClause = orderByClause;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table cit_tbam
*
* @mbg.generated
*/
public String getOrderByClause() {
return orderByClause;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table cit_tbam
*
* @mbg.generated
*/
public void setDistinct(boolean distinct) {
this.distinct = distinct;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table cit_tbam
*
* @mbg.generated
*/
public boolean isDistinct() {
return distinct;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table cit_tbam
*
* @mbg.generated
*/
public List<Criteria> getOredCriteria() {
return oredCriteria;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table cit_tbam
*
* @mbg.generated
*/
public void or(Criteria criteria) {
oredCriteria.add(criteria);
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table cit_tbam
*
* @mbg.generated
*/
public Criteria or() {
Criteria criteria = createCriteriaInternal();
oredCriteria.add(criteria);
return criteria;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table cit_tbam
*
* @mbg.generated
*/
public Criteria createCriteria() {
Criteria criteria = createCriteriaInternal();
if (oredCriteria.size() == 0) {
oredCriteria.add(criteria);
}
return criteria;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table cit_tbam
*
* @mbg.generated
*/
protected Criteria createCriteriaInternal() {
Criteria criteria = new Criteria();
return criteria;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table cit_tbam
*
* @mbg.generated
*/
public void clear() {
oredCriteria.clear();
orderByClause = null;
distinct = false;
}
/**
* This class was generated by MyBatis Generator.
* This class corresponds to the database table cit_tbam
*
* @mbg.generated
*/
protected abstract static class GeneratedCriteria {
protected List<Criterion> criteria;
protected GeneratedCriteria() {
super();
criteria = new ArrayList<Criterion>();
}
public boolean isValid() {
return criteria.size() > 0;
}
public List<Criterion> getAllCriteria() {
return criteria;
}
public List<Criterion> getCriteria() {
return criteria;
}
protected void addCriterion(String condition) {
if (condition == null) {
throw new RuntimeException("Value for condition cannot be null");
}
criteria.add(new Criterion(condition));
}
protected void addCriterion(String condition, Object value, String property) {
if (value == null) {
throw new RuntimeException("Value for " + property + " cannot be null");
}
criteria.add(new Criterion(condition, value));
}
protected void addCriterion(String condition, Object value1, Object value2, String property) {
if (value1 == null || value2 == null) {
throw new RuntimeException("Between values for " + property + " cannot be null");
}
criteria.add(new Criterion(condition, value1, value2));
}
public Criteria andIdIsNull() {
addCriterion("id is null");
return (Criteria) this;
}
public Criteria andIdIsNotNull() {
addCriterion("id is not null");
return (Criteria) this;
}
public Criteria andIdEqualTo(Long value) {
addCriterion("id =", value, "id");
return (Criteria) this;
}
public Criteria andIdNotEqualTo(Long value) {
addCriterion("id <>", value, "id");
return (Criteria) this;
}
public Criteria andIdGreaterThan(Long value) {
addCriterion("id >", value, "id");
return (Criteria) this;
}
public Criteria andIdGreaterThanOrEqualTo(Long value) {
addCriterion("id >=", value, "id");
return (Criteria) this;
}
public Criteria andIdLessThan(Long value) {
addCriterion("id <", value, "id");
return (Criteria) this;
}
public Criteria andIdLessThanOrEqualTo(Long value) {
addCriterion("id <=", value, "id");
return (Criteria) this;
}
public Criteria andIdIn(List<Long> values) {
addCriterion("id in", values, "id");
return (Criteria) this;
}
public Criteria andIdNotIn(List<Long> values) {
addCriterion("id not in", values, "id");
return (Criteria) this;
}
public Criteria andIdBetween(Long value1, Long value2) {
addCriterion("id between", value1, value2, "id");
return (Criteria) this;
}
public Criteria andIdNotBetween(Long value1, Long value2) {
addCriterion("id not between", value1, value2, "id");
return (Criteria) this;
}
public Criteria andOrganizationIdIsNull() {
addCriterion("organization_id is null");
return (Criteria) this;
}
public Criteria andOrganizationIdIsNotNull() {
addCriterion("organization_id is not null");
return (Criteria) this;
}
public Criteria andOrganizationIdEqualTo(String value) {
addCriterion("organization_id =", value, "organizationId");
return (Criteria) this;
}
public Criteria andOrganizationIdNotEqualTo(String value) {
addCriterion("organization_id <>", value, "organizationId");
return (Criteria) this;
}
public Criteria andOrganizationIdGreaterThan(String value) {
addCriterion("organization_id >", value, "organizationId");
return (Criteria) this;
}
public Criteria andOrganizationIdGreaterThanOrEqualTo(String value) {
addCriterion("organization_id >=", value, "organizationId");
return (Criteria) this;
}
public Criteria andOrganizationIdLessThan(String value) {
addCriterion("organization_id <", value, "organizationId");
return (Criteria) this;
}
public Criteria andOrganizationIdLessThanOrEqualTo(String value) {
addCriterion("organization_id <=", value, "organizationId");
return (Criteria) this;
}
public Criteria andOrganizationIdLike(String value) {
addCriterion("organization_id like", value, "organizationId");
return (Criteria) this;
}
public Criteria andOrganizationIdNotLike(String value) {
addCriterion("organization_id not like", value, "organizationId");
return (Criteria) this;
}
public Criteria andOrganizationIdIn(List<String> values) {
addCriterion("organization_id in", values, "organizationId");
return (Criteria) this;
}
public Criteria andOrganizationIdNotIn(List<String> values) {
addCriterion("organization_id not in", values, "organizationId");
return (Criteria) this;
}
public Criteria andOrganizationIdBetween(String value1, String value2) {
addCriterion("organization_id between", value1, value2, "organizationId");
return (Criteria) this;
}
public Criteria andOrganizationIdNotBetween(String value1, String value2) {
addCriterion("organization_id not between", value1, value2, "organizationId");
return (Criteria) this;
}
public Criteria andProjectIdIsNull() {
addCriterion("project_id is null");
return (Criteria) this;
}
public Criteria andProjectIdIsNotNull() {
addCriterion("project_id is not null");
return (Criteria) this;
}
public Criteria andProjectIdEqualTo(String value) {
addCriterion("project_id =", value, "projectId");
return (Criteria) this;
}
public Criteria andProjectIdNotEqualTo(String value) {
addCriterion("project_id <>", value, "projectId");
return (Criteria) this;
}
public Criteria andProjectIdGreaterThan(String value) {
addCriterion("project_id >", value, "projectId");
return (Criteria) this;
}
public Criteria andProjectIdGreaterThanOrEqualTo(String value) {
addCriterion("project_id >=", value, "projectId");
return (Criteria) this;
}
public Criteria andProjectIdLessThan(String value) {
addCriterion("project_id <", value, "projectId");
return (Criteria) this;
}
public Criteria andProjectIdLessThanOrEqualTo(String value) {
addCriterion("project_id <=", value, "projectId");
return (Criteria) this;
}
public Criteria andProjectIdLike(String value) {
addCriterion("project_id like", value, "projectId");
return (Criteria) this;
}
public Criteria andProjectIdNotLike(String value) {
addCriterion("project_id not like", value, "projectId");
return (Criteria) this;
}
public Criteria andProjectIdIn(List<String> values) {
addCriterion("project_id in", values, "projectId");
return (Criteria) this;
}
public Criteria andProjectIdNotIn(List<String> values) {
addCriterion("project_id not in", values, "projectId");
return (Criteria) this;
}
public Criteria andProjectIdBetween(String value1, String value2) {
addCriterion("project_id between", value1, value2, "projectId");
return (Criteria) this;
}
public Criteria andProjectIdNotBetween(String value1, String value2) {
addCriterion("project_id not between", value1, value2, "projectId");
return (Criteria) this;
}
public Criteria andDateIsNull() {
addCriterion("date is null");
return (Criteria) this;
}
public Criteria andDateIsNotNull() {
addCriterion("date is not null");
return (Criteria) this;
}
public Criteria andDateEqualTo(Date value) {
addCriterion("date =", value, "date");
return (Criteria) this;
}
public Criteria andDateNotEqualTo(Date value) {
addCriterion("date <>", value, "date");
return (Criteria) this;
}
public Criteria andDateGreaterThan(Date value) {
addCriterion("date >", value, "date");
return (Criteria) this;
}
public Criteria andDateGreaterThanOrEqualTo(Date value) {
addCriterion("date >=", value, "date");
return (Criteria) this;
}
public Criteria andDateLessThan(Date value) {
addCriterion("date <", value, "date");
return (Criteria) this;
}
public Criteria andDateLessThanOrEqualTo(Date value) {
addCriterion("date <=", value, "date");
return (Criteria) this;
}
public Criteria andDateIn(List<Date> values) {
addCriterion("date in", values, "date");
return (Criteria) this;
}
public Criteria andDateNotIn(List<Date> values) {
addCriterion("date not in", values, "date");
return (Criteria) this;
}
public Criteria andDateBetween(Date value1, Date value2) {
addCriterion("date between", value1, value2, "date");
return (Criteria) this;
}
public Criteria andDateNotBetween(Date value1, Date value2) {
addCriterion("date not between", value1, value2, "date");
return (Criteria) this;
}
public Criteria andSourceIsNull() {
addCriterion("source is null");
return (Criteria) this;
}
public Criteria andSourceIsNotNull() {
addCriterion("source is not null");
return (Criteria) this;
}
public Criteria andSourceEqualTo(String value) {
addCriterion("source =", value, "source");
return (Criteria) this;
}
public Criteria andSourceNotEqualTo(String value) {
addCriterion("source <>", value, "source");
return (Criteria) this;
}
public Criteria andSourceGreaterThan(String value) {
addCriterion("source >", value, "source");
return (Criteria) this;
}
public Criteria andSourceGreaterThanOrEqualTo(String value) {
addCriterion("source >=", value, "source");
return (Criteria) this;
}
public Criteria andSourceLessThan(String value) {
addCriterion("source <", value, "source");
return (Criteria) this;
}
public Criteria andSourceLessThanOrEqualTo(String value) {
addCriterion("source <=", value, "source");
return (Criteria) this;
}
public Criteria andSourceLike(String value) {
addCriterion("source like", value, "source");
return (Criteria) this;
}
public Criteria andSourceNotLike(String value) {
addCriterion("source not like", value, "source");
return (Criteria) this;
}
public Criteria andSourceIn(List<String> values) {
addCriterion("source in", values, "source");
return (Criteria) this;
}
public Criteria andSourceNotIn(List<String> values) {
addCriterion("source not in", values, "source");
return (Criteria) this;
}
public Criteria andSourceBetween(String value1, String value2) {
addCriterion("source between", value1, value2, "source");
return (Criteria) this;
}
public Criteria andSourceNotBetween(String value1, String value2) {
addCriterion("source not between", value1, value2, "source");
return (Criteria) this;
}
public Criteria andPeriodIsNull() {
addCriterion("period is null");
return (Criteria) this;
}
public Criteria andPeriodIsNotNull() {
addCriterion("period is not null");
return (Criteria) this;
}
public Criteria andPeriodEqualTo(Integer value) {
addCriterion("period =", value, "period");
return (Criteria) this;
}
public Criteria andPeriodNotEqualTo(Integer value) {
addCriterion("period <>", value, "period");
return (Criteria) this;
}
public Criteria andPeriodGreaterThan(Integer value) {
addCriterion("period >", value, "period");
return (Criteria) this;
}
public Criteria andPeriodGreaterThanOrEqualTo(Integer value) {
addCriterion("period >=", value, "period");
return (Criteria) this;
}
public Criteria andPeriodLessThan(Integer value) {
addCriterion("period <", value, "period");
return (Criteria) this;
}
public Criteria andPeriodLessThanOrEqualTo(Integer value) {
addCriterion("period <=", value, "period");
return (Criteria) this;
}
public Criteria andPeriodIn(List<Integer> values) {
addCriterion("period in", values, "period");
return (Criteria) this;
}
public Criteria andPeriodNotIn(List<Integer> values) {
addCriterion("period not in", values, "period");
return (Criteria) this;
}
public Criteria andPeriodBetween(Integer value1, Integer value2) {
addCriterion("period between", value1, value2, "period");
return (Criteria) this;
}
public Criteria andPeriodNotBetween(Integer value1, Integer value2) {
addCriterion("period not between", value1, value2, "period");
return (Criteria) this;
}
public Criteria andAccountPeriodIsNull() {
addCriterion("account_period is null");
return (Criteria) this;
}
public Criteria andAccountPeriodIsNotNull() {
addCriterion("account_period is not null");
return (Criteria) this;
}
public Criteria andAccountPeriodEqualTo(Integer value) {
addCriterion("account_period =", value, "accountPeriod");
return (Criteria) this;
}
public Criteria andAccountPeriodNotEqualTo(Integer value) {
addCriterion("account_period <>", value, "accountPeriod");
return (Criteria) this;
}
public Criteria andAccountPeriodGreaterThan(Integer value) {
addCriterion("account_period >", value, "accountPeriod");
return (Criteria) this;
}
public Criteria andAccountPeriodGreaterThanOrEqualTo(Integer value) {
addCriterion("account_period >=", value, "accountPeriod");
return (Criteria) this;
}
public Criteria andAccountPeriodLessThan(Integer value) {
addCriterion("account_period <", value, "accountPeriod");
return (Criteria) this;
}
public Criteria andAccountPeriodLessThanOrEqualTo(Integer value) {
addCriterion("account_period <=", value, "accountPeriod");
return (Criteria) this;
}
public Criteria andAccountPeriodIn(List<Integer> values) {
addCriterion("account_period in", values, "accountPeriod");
return (Criteria) this;
}
public Criteria andAccountPeriodNotIn(List<Integer> values) {
addCriterion("account_period not in", values, "accountPeriod");
return (Criteria) this;
}
public Criteria andAccountPeriodBetween(Integer value1, Integer value2) {
addCriterion("account_period between", value1, value2, "accountPeriod");
return (Criteria) this;
}
public Criteria andAccountPeriodNotBetween(Integer value1, Integer value2) {
addCriterion("account_period not between", value1, value2, "accountPeriod");
return (Criteria) this;
}
public Criteria andAttributeIsNull() {
addCriterion("attribute is null");
return (Criteria) this;
}
public Criteria andAttributeIsNotNull() {
addCriterion("attribute is not null");
return (Criteria) this;
}
public Criteria andAttributeEqualTo(String value) {
addCriterion("attribute =", value, "attribute");
return (Criteria) this;
}
public Criteria andAttributeNotEqualTo(String value) {
addCriterion("attribute <>", value, "attribute");
return (Criteria) this;
}
public Criteria andAttributeGreaterThan(String value) {
addCriterion("attribute >", value, "attribute");
return (Criteria) this;
}
public Criteria andAttributeGreaterThanOrEqualTo(String value) {
addCriterion("attribute >=", value, "attribute");
return (Criteria) this;
}
public Criteria andAttributeLessThan(String value) {
addCriterion("attribute <", value, "attribute");
return (Criteria) this;
}
public Criteria andAttributeLessThanOrEqualTo(String value) {
addCriterion("attribute <=", value, "attribute");
return (Criteria) this;
}
public Criteria andAttributeLike(String value) {
addCriterion("attribute like", value, "attribute");
return (Criteria) this;
}
public Criteria andAttributeNotLike(String value) {
addCriterion("attribute not like", value, "attribute");
return (Criteria) this;
}
public Criteria andAttributeIn(List<String> values) {
addCriterion("attribute in", values, "attribute");
return (Criteria) this;
}
public Criteria andAttributeNotIn(List<String> values) {
addCriterion("attribute not in", values, "attribute");
return (Criteria) this;
}
public Criteria andAttributeBetween(String value1, String value2) {
addCriterion("attribute between", value1, value2, "attribute");
return (Criteria) this;
}
public Criteria andAttributeNotBetween(String value1, String value2) {
addCriterion("attribute not between", value1, value2, "attribute");
return (Criteria) this;
}
public Criteria andAccountCodeIsNull() {
addCriterion("account_code is null");
return (Criteria) this;
}
public Criteria andAccountCodeIsNotNull() {
addCriterion("account_code is not null");
return (Criteria) this;
}
public Criteria andAccountCodeEqualTo(String value) {
addCriterion("account_code =", value, "accountCode");
return (Criteria) this;
}
public Criteria andAccountCodeNotEqualTo(String value) {
addCriterion("account_code <>", value, "accountCode");
return (Criteria) this;
}
public Criteria andAccountCodeGreaterThan(String value) {
addCriterion("account_code >", value, "accountCode");
return (Criteria) this;
}
public Criteria andAccountCodeGreaterThanOrEqualTo(String value) {
addCriterion("account_code >=", value, "accountCode");
return (Criteria) this;
}
public Criteria andAccountCodeLessThan(String value) {
addCriterion("account_code <", value, "accountCode");
return (Criteria) this;
}
public Criteria andAccountCodeLessThanOrEqualTo(String value) {
addCriterion("account_code <=", value, "accountCode");
return (Criteria) this;
}
public Criteria andAccountCodeLike(String value) {
addCriterion("account_code like", value, "accountCode");
return (Criteria) this;
}
public Criteria andAccountCodeNotLike(String value) {
addCriterion("account_code not like", value, "accountCode");
return (Criteria) this;
}
public Criteria andAccountCodeIn(List<String> values) {
addCriterion("account_code in", values, "accountCode");
return (Criteria) this;
}
public Criteria andAccountCodeNotIn(List<String> values) {
addCriterion("account_code not in", values, "accountCode");
return (Criteria) this;
}
public Criteria andAccountCodeBetween(String value1, String value2) {
addCriterion("account_code between", value1, value2, "accountCode");
return (Criteria) this;
}
public Criteria andAccountCodeNotBetween(String value1, String value2) {
addCriterion("account_code not between", value1, value2, "accountCode");
return (Criteria) this;
}
public Criteria andAccountDescriptionIsNull() {
addCriterion("account_description is null");
return (Criteria) this;
}
public Criteria andAccountDescriptionIsNotNull() {
addCriterion("account_description is not null");
return (Criteria) this;
}
public Criteria andAccountDescriptionEqualTo(String value) {
addCriterion("account_description =", value, "accountDescription");
return (Criteria) this;
}
public Criteria andAccountDescriptionNotEqualTo(String value) {
addCriterion("account_description <>", value, "accountDescription");
return (Criteria) this;
}
public Criteria andAccountDescriptionGreaterThan(String value) {
addCriterion("account_description >", value, "accountDescription");
return (Criteria) this;
}
public Criteria andAccountDescriptionGreaterThanOrEqualTo(String value) {
addCriterion("account_description >=", value, "accountDescription");
return (Criteria) this;
}
public Criteria andAccountDescriptionLessThan(String value) {
addCriterion("account_description <", value, "accountDescription");
return (Criteria) this;
}
public Criteria andAccountDescriptionLessThanOrEqualTo(String value) {
addCriterion("account_description <=", value, "accountDescription");
return (Criteria) this;
}
public Criteria andAccountDescriptionLike(String value) {
addCriterion("account_description like", value, "accountDescription");
return (Criteria) this;
}
public Criteria andAccountDescriptionNotLike(String value) {
addCriterion("account_description not like", value, "accountDescription");
return (Criteria) this;
}
public Criteria andAccountDescriptionIn(List<String> values) {
addCriterion("account_description in", values, "accountDescription");
return (Criteria) this;
}
public Criteria andAccountDescriptionNotIn(List<String> values) {
addCriterion("account_description not in", values, "accountDescription");
return (Criteria) this;
}
public Criteria andAccountDescriptionBetween(String value1, String value2) {
addCriterion("account_description between", value1, value2, "accountDescription");
return (Criteria) this;
}
public Criteria andAccountDescriptionNotBetween(String value1, String value2) {
addCriterion("account_description not between", value1, value2, "accountDescription");
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;
}
public Criteria andBeginningBalanceIsNotNull() {
addCriterion("beginning_balance is not null");
return (Criteria) this;
}
public Criteria andBeginningBalanceEqualTo(BigDecimal value) {
addCriterion("beginning_balance =", value, "beginningBalance");
return (Criteria) this;
}
public Criteria andBeginningBalanceNotEqualTo(BigDecimal value) {
addCriterion("beginning_balance <>", value, "beginningBalance");
return (Criteria) this;
}
public Criteria andBeginningBalanceGreaterThan(BigDecimal value) {
addCriterion("beginning_balance >", value, "beginningBalance");
return (Criteria) this;
}
public Criteria andBeginningBalanceGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("beginning_balance >=", value, "beginningBalance");
return (Criteria) this;
}
public Criteria andBeginningBalanceLessThan(BigDecimal value) {
addCriterion("beginning_balance <", value, "beginningBalance");
return (Criteria) this;
}
public Criteria andBeginningBalanceLessThanOrEqualTo(BigDecimal value) {
addCriterion("beginning_balance <=", value, "beginningBalance");
return (Criteria) this;
}
public Criteria andBeginningBalanceIn(List<BigDecimal> values) {
addCriterion("beginning_balance in", values, "beginningBalance");
return (Criteria) this;
}
public Criteria andBeginningBalanceNotIn(List<BigDecimal> values) {
addCriterion("beginning_balance not in", values, "beginningBalance");
return (Criteria) this;
}
public Criteria andBeginningBalanceBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("beginning_balance between", value1, value2, "beginningBalance");
return (Criteria) this;
}
public Criteria andBeginningBalanceNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("beginning_balance not between", value1, value2, "beginningBalance");
return (Criteria) this;
}
public Criteria andEndingBalanceIsNull() {
addCriterion("ending_balance is null");
return (Criteria) this;
}
public Criteria andEndingBalanceIsNotNull() {
addCriterion("ending_balance is not null");
return (Criteria) this;
}
public Criteria andEndingBalanceEqualTo(BigDecimal value) {
addCriterion("ending_balance =", value, "endingBalance");
return (Criteria) this;
}
public Criteria andEndingBalanceNotEqualTo(BigDecimal value) {
addCriterion("ending_balance <>", value, "endingBalance");
return (Criteria) this;
}
public Criteria andEndingBalanceGreaterThan(BigDecimal value) {
addCriterion("ending_balance >", value, "endingBalance");
return (Criteria) this;
}
public Criteria andEndingBalanceGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("ending_balance >=", value, "endingBalance");
return (Criteria) this;
}
public Criteria andEndingBalanceLessThan(BigDecimal value) {
addCriterion("ending_balance <", value, "endingBalance");
return (Criteria) this;
}
public Criteria andEndingBalanceLessThanOrEqualTo(BigDecimal value) {
addCriterion("ending_balance <=", value, "endingBalance");
return (Criteria) this;
}
public Criteria andEndingBalanceIn(List<BigDecimal> values) {
addCriterion("ending_balance in", values, "endingBalance");
return (Criteria) this;
}
public Criteria andEndingBalanceNotIn(List<BigDecimal> values) {
addCriterion("ending_balance not in", values, "endingBalance");
return (Criteria) this;
}
public Criteria andEndingBalanceBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("ending_balance between", value1, value2, "endingBalance");
return (Criteria) this;
}
public Criteria andEndingBalanceNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("ending_balance not between", value1, value2, "endingBalance");
return (Criteria) this;
}
public Criteria andCreateByIsNull() {
addCriterion("create_by is null");
return (Criteria) this;
}
public Criteria andCreateByIsNotNull() {
addCriterion("create_by is not null");
return (Criteria) this;
}
public Criteria andCreateByEqualTo(String value) {
addCriterion("create_by =", value, "createBy");
return (Criteria) this;
}
public Criteria andCreateByNotEqualTo(String value) {
addCriterion("create_by <>", value, "createBy");
return (Criteria) this;
}
public Criteria andCreateByGreaterThan(String value) {
addCriterion("create_by >", value, "createBy");
return (Criteria) this;
}
public Criteria andCreateByGreaterThanOrEqualTo(String value) {
addCriterion("create_by >=", value, "createBy");
return (Criteria) this;
}
public Criteria andCreateByLessThan(String value) {
addCriterion("create_by <", value, "createBy");
return (Criteria) this;
}
public Criteria andCreateByLessThanOrEqualTo(String value) {
addCriterion("create_by <=", value, "createBy");
return (Criteria) this;
}
public Criteria andCreateByLike(String value) {
addCriterion("create_by like", value, "createBy");
return (Criteria) this;
}
public Criteria andCreateByNotLike(String value) {
addCriterion("create_by not like", value, "createBy");
return (Criteria) this;
}
public Criteria andCreateByIn(List<String> values) {
addCriterion("create_by in", values, "createBy");
return (Criteria) this;
}
public Criteria andCreateByNotIn(List<String> values) {
addCriterion("create_by not in", values, "createBy");
return (Criteria) this;
}
public Criteria andCreateByBetween(String value1, String value2) {
addCriterion("create_by between", value1, value2, "createBy");
return (Criteria) this;
}
public Criteria andCreateByNotBetween(String value1, String value2) {
addCriterion("create_by not between", value1, value2, "createBy");
return (Criteria) this;
}
public Criteria andCreateTimeIsNull() {
addCriterion("create_time is null");
return (Criteria) this;
}
public Criteria andCreateTimeIsNotNull() {
addCriterion("create_time is not null");
return (Criteria) this;
}
public Criteria andCreateTimeEqualTo(Date value) {
addCriterion("create_time =", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeNotEqualTo(Date value) {
addCriterion("create_time <>", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeGreaterThan(Date value) {
addCriterion("create_time >", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
addCriterion("create_time >=", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeLessThan(Date value) {
addCriterion("create_time <", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
addCriterion("create_time <=", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeIn(List<Date> values) {
addCriterion("create_time in", values, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeNotIn(List<Date> values) {
addCriterion("create_time not in", values, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeBetween(Date value1, Date value2) {
addCriterion("create_time between", value1, value2, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
addCriterion("create_time not between", value1, value2, "createTime");
return (Criteria) this;
}
public Criteria andUpdateTimeIsNull() {
addCriterion("update_time is null");
return (Criteria) this;
}
public Criteria andUpdateTimeIsNotNull() {
addCriterion("update_time is not null");
return (Criteria) this;
}
public Criteria andUpdateTimeEqualTo(Date value) {
addCriterion("update_time =", value, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeNotEqualTo(Date value) {
addCriterion("update_time <>", value, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeGreaterThan(Date value) {
addCriterion("update_time >", value, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) {
addCriterion("update_time >=", value, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeLessThan(Date value) {
addCriterion("update_time <", value, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeLessThanOrEqualTo(Date value) {
addCriterion("update_time <=", value, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeIn(List<Date> values) {
addCriterion("update_time in", values, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeNotIn(List<Date> values) {
addCriterion("update_time not in", values, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeBetween(Date value1, Date value2) {
addCriterion("update_time between", value1, value2, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeNotBetween(Date value1, Date value2) {
addCriterion("update_time not between", value1, value2, "updateTime");
return (Criteria) this;
}
}
/**
* This class was generated by MyBatis Generator.
* This class corresponds to the database table cit_tbam
*
* @mbg.generated do_not_delete_during_merge
*/
public static class Criteria extends GeneratedCriteria {
protected Criteria() {
super();
}
}
/**
* This class was generated by MyBatis Generator.
* This class corresponds to the database table cit_tbam
*
* @mbg.generated
*/
public static class Criterion {
private String condition;
private Object value;
private Object secondValue;
private boolean noValue;
private boolean singleValue;
private boolean betweenValue;
private boolean listValue;
private String typeHandler;
public String getCondition() {
return condition;
}
public Object getValue() {
return value;
}
public Object getSecondValue() {
return secondValue;
}
public boolean isNoValue() {
return noValue;
}
public boolean isSingleValue() {
return singleValue;
}
public boolean isBetweenValue() {
return betweenValue;
}
public boolean isListValue() {
return listValue;
}
public String getTypeHandler() {
return typeHandler;
}
protected Criterion(String condition) {
super();
this.condition = condition;
this.typeHandler = null;
this.noValue = true;
}
protected Criterion(String condition, Object value, String typeHandler) {
super();
this.condition = condition;
this.value = value;
this.typeHandler = typeHandler;
if (value instanceof List<?>) {
this.listValue = true;
} else {
this.singleValue = true;
}
}
protected Criterion(String condition, Object value) {
this(condition, value, null);
}
protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
super();
this.condition = condition;
this.value = value;
this.secondValue = secondValue;
this.typeHandler = typeHandler;
this.betweenValue = true;
}
protected Criterion(String condition, Object value, Object secondValue) {
this(condition, value, secondValue, null);
}
}
}
\ No newline at end of file
atms-dao/src/main/resources/pwc/taxtech/atms/dao/CitTbamMapper.xml 0 → 100644
View file @ 072dc907
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="pwc.taxtech.atms.dao.CitTbamMapper">
<resultMap id="BaseResultMap" type="pwc.taxtech.atms.entity.CitTbam">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
<id column="id" jdbcType="BIGINT" property="id" />
<result column="organization_id" jdbcType="VARCHAR" property="organizationId" />
<result column="project_id" jdbcType="VARCHAR" property="projectId" />
<result column="date" jdbcType="TIMESTAMP" property="date" />
<result column="source" jdbcType="VARCHAR" property="source" />
<result column="period" jdbcType="INTEGER" property="period" />
<result column="account_period" jdbcType="INTEGER" property="accountPeriod" />
<result column="attribute" jdbcType="VARCHAR" property="attribute" />
<result column="account_code" jdbcType="VARCHAR" property="accountCode" />
<result column="account_description" jdbcType="VARCHAR" property="accountDescription" />
<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" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
</resultMap>
<sql id="Example_Where_Clause">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
<where>
<foreach collection="oredCriteria" item="criteria" separator="or">
<if test="criteria.valid">
<trim prefix="(" prefixOverrides="and" suffix=")">
<foreach collection="criteria.criteria" item="criterion">
<choose>
<when test="criterion.noValue">
and ${criterion.condition}
</when>
<when test="criterion.singleValue">
and ${criterion.condition} #{criterion.value}
</when>
<when test="criterion.betweenValue">
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
</when>
<when test="criterion.listValue">
and ${criterion.condition}
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
#{listItem}
</foreach>
</when>
</choose>
</foreach>
</trim>
</if>
</foreach>
</where>
</sql>
<sql id="Update_By_Example_Where_Clause">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
<where>
<foreach collection="example.oredCriteria" item="criteria" separator="or">
<if test="criteria.valid">
<trim prefix="(" prefixOverrides="and" suffix=")">
<foreach collection="criteria.criteria" item="criterion">
<choose>
<when test="criterion.noValue">
and ${criterion.condition}
</when>
<when test="criterion.singleValue">
and ${criterion.condition} #{criterion.value}
</when>
<when test="criterion.betweenValue">
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
</when>
<when test="criterion.listValue">
and ${criterion.condition}
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
#{listItem}
</foreach>
</when>
</choose>
</foreach>
</trim>
</if>
</foreach>
</where>
</sql>
<sql id="Base_Column_List">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
id, organization_id, project_id, date, source, period, account_period, attribute,
account_code, account_description, debit_amount, credit_amount, beginning_balance,
ending_balance, create_by, create_time, update_time
</sql>
<select id="selectByExample" parameterType="pwc.taxtech.atms.entity.CitTbamExample" resultMap="BaseResultMap">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select
<if test="distinct">
distinct
</if>
<include refid="Base_Column_List" />
from cit_tbam
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
<if test="orderByClause != null">
order by ${orderByClause}
</if>
</select>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select
<include refid="Base_Column_List" />
from cit_tbam
where id = #{id,jdbcType=BIGINT}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
delete from cit_tbam
where id = #{id,jdbcType=BIGINT}
</delete>
<delete id="deleteByExample" parameterType="pwc.taxtech.atms.entity.CitTbamExample">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
delete from cit_tbam
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</delete>
<insert id="insert" parameterType="pwc.taxtech.atms.entity.CitTbam">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
insert into cit_tbam (id, organization_id, project_id,
date, source, period,
account_period, attribute, account_code,
account_description, 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},
#{accountPeriod,jdbcType=INTEGER}, #{attribute,jdbcType=VARCHAR}, #{accountCode,jdbcType=VARCHAR},
#{accountDescription,jdbcType=VARCHAR}, #{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.CitTbam">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
insert into cit_tbam
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
id,
</if>
<if test="organizationId != null">
organization_id,
</if>
<if test="projectId != null">
project_id,
</if>
<if test="date != null">
date,
</if>
<if test="source != null">
source,
</if>
<if test="period != null">
period,
</if>
<if test="accountPeriod != null">
account_period,
</if>
<if test="attribute != null">
attribute,
</if>
<if test="accountCode != null">
account_code,
</if>
<if test="accountDescription != null">
account_description,
</if>
<if test="debitAmount != null">
debit_amount,
</if>
<if test="creditAmount != null">
credit_amount,
</if>
<if test="beginningBalance != null">
beginning_balance,
</if>
<if test="endingBalance != null">
ending_balance,
</if>
<if test="createBy != null">
create_by,
</if>
<if test="createTime != null">
create_time,
</if>
<if test="updateTime != null">
update_time,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
#{id,jdbcType=BIGINT},
</if>
<if test="organizationId != null">
#{organizationId,jdbcType=VARCHAR},
</if>
<if test="projectId != null">
#{projectId,jdbcType=VARCHAR},
</if>
<if test="date != null">
#{date,jdbcType=TIMESTAMP},
</if>
<if test="source != null">
#{source,jdbcType=VARCHAR},
</if>
<if test="period != null">
#{period,jdbcType=INTEGER},
</if>
<if test="accountPeriod != null">
#{accountPeriod,jdbcType=INTEGER},
</if>
<if test="attribute != null">
#{attribute,jdbcType=VARCHAR},
</if>
<if test="accountCode != null">
#{accountCode,jdbcType=VARCHAR},
</if>
<if test="accountDescription != null">
#{accountDescription,jdbcType=VARCHAR},
</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>
<if test="endingBalance != null">
#{endingBalance,jdbcType=DECIMAL},
</if>
<if test="createBy != null">
#{createBy,jdbcType=VARCHAR},
</if>
<if test="createTime != null">
#{createTime,jdbcType=TIMESTAMP},
</if>
<if test="updateTime != null">
#{updateTime,jdbcType=TIMESTAMP},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="pwc.taxtech.atms.entity.CitTbamExample" resultType="java.lang.Long">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select count(*) from cit_tbam
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</select>
<update id="updateByExampleSelective" parameterType="map">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update cit_tbam
<set>
<if test="record.id != null">
id = #{record.id,jdbcType=BIGINT},
</if>
<if test="record.organizationId != null">
organization_id = #{record.organizationId,jdbcType=VARCHAR},
</if>
<if test="record.projectId != null">
project_id = #{record.projectId,jdbcType=VARCHAR},
</if>
<if test="record.date != null">
date = #{record.date,jdbcType=TIMESTAMP},
</if>
<if test="record.source != null">
source = #{record.source,jdbcType=VARCHAR},
</if>
<if test="record.period != null">
period = #{record.period,jdbcType=INTEGER},
</if>
<if test="record.accountPeriod != null">
account_period = #{record.accountPeriod,jdbcType=INTEGER},
</if>
<if test="record.attribute != null">
attribute = #{record.attribute,jdbcType=VARCHAR},
</if>
<if test="record.accountCode != null">
account_code = #{record.accountCode,jdbcType=VARCHAR},
</if>
<if test="record.accountDescription != null">
account_description = #{record.accountDescription,jdbcType=VARCHAR},
</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>
<if test="record.endingBalance != null">
ending_balance = #{record.endingBalance,jdbcType=DECIMAL},
</if>
<if test="record.createBy != null">
create_by = #{record.createBy,jdbcType=VARCHAR},
</if>
<if test="record.createTime != null">
create_time = #{record.createTime,jdbcType=TIMESTAMP},
</if>
<if test="record.updateTime != null">
update_time = #{record.updateTime,jdbcType=TIMESTAMP},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByExample" parameterType="map">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update cit_tbam
set id = #{record.id,jdbcType=BIGINT},
organization_id = #{record.organizationId,jdbcType=VARCHAR},
project_id = #{record.projectId,jdbcType=VARCHAR},
date = #{record.date,jdbcType=TIMESTAMP},
source = #{record.source,jdbcType=VARCHAR},
period = #{record.period,jdbcType=INTEGER},
account_period = #{record.accountPeriod,jdbcType=INTEGER},
attribute = #{record.attribute,jdbcType=VARCHAR},
account_code = #{record.accountCode,jdbcType=VARCHAR},
account_description = #{record.accountDescription,jdbcType=VARCHAR},
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},
create_time = #{record.createTime,jdbcType=TIMESTAMP},
update_time = #{record.updateTime,jdbcType=TIMESTAMP}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByPrimaryKeySelective" parameterType="pwc.taxtech.atms.entity.CitTbam">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update cit_tbam
<set>
<if test="organizationId != null">
organization_id = #{organizationId,jdbcType=VARCHAR},
</if>
<if test="projectId != null">
project_id = #{projectId,jdbcType=VARCHAR},
</if>
<if test="date != null">
date = #{date,jdbcType=TIMESTAMP},
</if>
<if test="source != null">
source = #{source,jdbcType=VARCHAR},
</if>
<if test="period != null">
period = #{period,jdbcType=INTEGER},
</if>
<if test="accountPeriod != null">
account_period = #{accountPeriod,jdbcType=INTEGER},
</if>
<if test="attribute != null">
attribute = #{attribute,jdbcType=VARCHAR},
</if>
<if test="accountCode != null">
account_code = #{accountCode,jdbcType=VARCHAR},
</if>
<if test="accountDescription != null">
account_description = #{accountDescription,jdbcType=VARCHAR},
</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>
<if test="endingBalance != null">
ending_balance = #{endingBalance,jdbcType=DECIMAL},
</if>
<if test="createBy != null">
create_by = #{createBy,jdbcType=VARCHAR},
</if>
<if test="createTime != null">
create_time = #{createTime,jdbcType=TIMESTAMP},
</if>
<if test="updateTime != null">
update_time = #{updateTime,jdbcType=TIMESTAMP},
</if>
</set>
where id = #{id,jdbcType=BIGINT}
</update>
<update id="updateByPrimaryKey" parameterType="pwc.taxtech.atms.entity.CitTbam">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update cit_tbam
set organization_id = #{organizationId,jdbcType=VARCHAR},
project_id = #{projectId,jdbcType=VARCHAR},
date = #{date,jdbcType=TIMESTAMP},
source = #{source,jdbcType=VARCHAR},
period = #{period,jdbcType=INTEGER},
account_period = #{accountPeriod,jdbcType=INTEGER},
attribute = #{attribute,jdbcType=VARCHAR},
account_code = #{accountCode,jdbcType=VARCHAR},
account_description = #{accountDescription,jdbcType=VARCHAR},
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},
create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP}
where id = #{id,jdbcType=BIGINT}
</update>
<select id="selectByExampleWithRowbounds" parameterType="pwc.taxtech.atms.entity.CitTbamExample" resultMap="BaseResultMap">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select
<if test="distinct">
distinct
</if>
<include refid="Base_Column_List" />
from cit_tbam
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
<if test="orderByClause != null">
order by ${orderByClause}
</if>
</select>
</mapper>
\ No newline at end of file
atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/CitEAMADisposalExtendsMapper.xml
View file @ 072dc907
......@@ -133,7 +133,22 @@
<select id ="selectByCondition" parameterType="pwc.taxtech.atms.entity.CitEAMAssetsDisposal" resultType="pwc.taxtech.atms.entity.CitEAMAssetsDisposal">
select
id, organization_id as organizationId, project_id as projectId, period, source, occur_period as occurPeriod, asset_label_number as assetLabelNumber,
compensation_sale_amount as compensationSaleAmount, created_by as createBy, updated_by as updateBy, create_time as createTime, update_time as updateTime
compensation_sale_amount as compensationSaleAmount, created_by as createBy, updated_by as updateBy, create_time as createTime, update_time as updateTime,
oa_asset_bill_type oaAssetBillType,
oa_asset_number oaAssetNumber,
scrap_reason scrapReason,
asset_number assetNumber,
asset_label_number assetLabelNumber,
compensation_sale_amount compensationSaleAmount,
liable_employee_num liableEmployeeNum,
liable_employee_name liableEmployeeName,
remit_employee_num remitEmployeeNum,
remit_employee_name remitEmployeeName,
remit_time remitTime,
remit_amount remitAmount,
gathering_company_name gatheringCompanyName,
gathering_company_account gatheringCompanyAccount,
remark
from cit_eam_assets_disposal
WHERE
<include refid="QueryCondition"/>
......
atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/CitSalaryAdvanceExtendsMapper.xml
View file @ 072dc907
......@@ -209,7 +209,37 @@
advance advance,
approved_standard_invoice_amount approvedStandardInvoiceAmount,
created_by createdBy,
create_time createTime
create_time createTime,
remark,
credit_prepaid_accounts as creditPrepaidAccounts,
debit_advance_gene as debitAdvanceGene,
ledger_id ledgerId,
exchange_rate exchangeRate,
reclassify_amount reclassifyAmount ,
check_one checkOne,
advance_write_off advanceWriteOff,
usable_balance usableBalance,
usable_invoice_amount usableInvoiceAmount,
paid_invoice_amount paidInvoiceAmount,
approved_standard_invoice_amount approvedStandardInvoiceAmount,
unexecuted_service_schedule unexecutedServiceSchedule,
advance advance ,
coupa_total_accept coupaTotalAccept,
executed_service_schedule executedServiceSchedule,
order_amount orderAmount,
currency currency,
standard_money standardMoney,
item item
supplier supplier,
cost_center costCenter,
cost_center_code costCenterCode,
po_subject_code poSubjectCode,
purchase_person purchasePerson,
lading_bill_person ladingBillPerson,
po_row poRow,
po_no poNo,
po_create_time poCreateTime,
from cit_salary_advance
WHERE
<include refid="QueryCondition"/>
......
atms-dao/src/main/resources/pwc/taxtech/atms/dao/extends/CitTbamExtendsMapper.xml 0 → 100644
View file @ 072dc907
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="pwc.taxtech.atms.dao.CitTbamMapper">
<insert id="insertBatch" parameterType="java.util.List">
insert into cit_tbam
(<include refid="Base_Column_List"/>)
values
<foreach collection="list" item="item" index="index" separator=",">
<trim prefix="(" suffix=")" suffixOverrides=",">
<choose>
<when test="item.id != null">#{item.id,jdbcType=BIGINT},</when>
<otherwise>0,</otherwise>
</choose>
<choose>
<when test="item.organizationId != null">#{item.organizationId,jdbcType=VARCHAR},</when>
<otherwise>'',</otherwise>
</choose>
<choose>
<when test="item.projectId != null">#{item.projectId,jdbcType=VARCHAR},</when>
<otherwise>'',</otherwise>
</choose>
<choose>
<when test="item.date != null">#{item.date,jdbcType=TIMESTAMP},</when>
<otherwise>CURRENT_TIMESTAMP,</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.accountPeriod != null">#{item.accountPeriod,jdbcType=INTEGER},</when>
<otherwise>0,</otherwise>
</choose>
<choose>
<when test="item.attribute != null">#{item.attribute,jdbcType=VARCHAR},</when>
<otherwise>'',</otherwise>
</choose>
<choose>
<when test="item.accountCode != null">#{item.accountCode,jdbcType=VARCHAR},</when>
<otherwise>'',</otherwise>
</choose>
<choose>
<when test="item.accountDescription != null">#{item.accountDescription,jdbcType=VARCHAR},</when>
<otherwise>'',</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>
</choose>
<choose>
<when test="item.endingBalance != null">#{item.endingBalance,jdbcType=DECIMAL},</when>
<otherwise>0,</otherwise>
</choose>
<choose>
<when test="item.createBy != null">#{item.createBy,jdbcType=VARCHAR},</when>
<otherwise>'',</otherwise>
</choose>
<choose>
<when test="item.createTime != null">#{item.createTime,jdbcType=TIMESTAMP},</when>
<otherwise>CURRENT_TIMESTAMP,</otherwise>
</choose>
<choose>
<when test="item.updateTime != null">#{item.updateTime,jdbcType=TIMESTAMP},</when>
<otherwise>CURRENT_TIMESTAMP,</otherwise>
</choose>
</trim>
</foreach>;
SELECT 1 FROM DUAL;
</insert>
</mapper>
\ No newline at end of file
atms-web/src/main/webapp/app-resources/i18n/zh-CN/cit.json
View file @ 072dc907
......@@ -1141,7 +1141,56 @@
"assetLabelNumber" : "资产标签号",
"compensationSaleAmount" : "赔偿/变卖金额",
"EAMDisposal" : "EAM资产处理金额",
"MainBodyCode": "主体代码"
"MainBodyCode": "主体代码",
"remark" : "摘要",
"creditPrepaidAccounts" : "贷:预付账款",
"debitAdvanceGene" : "借：预提费用-系统生成",
"ledgerId" : "账套",
"exchangeRate" : "汇率",
"reclassifyAmount" : "重分类金额",
"checkOne" : "校验",
"advanceWriteOff" : "预提/(预付)冲销",
"usableBalance" : "可用预付款余额",
"usableInvoiceAmount" : "可用预付款发票金额",
"paidInvoiceAmount" : "已付标准发票总金额",
"approvedStandardInvoiceAmount" : "已批准标准发票金额",
"unexecutedServiceSchedule" : "未执行服务金额",
"advance": "预提",
"coupaTotalAccept": "COUPA接收合计",
"executedServiceSchedule" : "已执行服务进度",
"orderAmount" : "订购金额",
"currency" : "币种",
"standardMoney": "本位币",
"item" : "ITEM",
"supplier" : "供应商",
"costCenter" : "成本中心",
"costCenterCode" : "成本中心CODE",
"poSubjectCode" : "PO主体CODE",
"purchasePerson" : "请购人",
"ladingBillPerson":"提单人",
"poRow":"PO行",
"poNo":"PO号",
"zczzrxx" : "资产责任人信息",
"xkrxx" : "汇款人信息",
"skgsxx" : "收款公司信息",
"occurPeriod": "发生期间",
"oaAssetBillType" : "相关OA资产单单据类型",
"oaAssetNumber" : "相关OA资产单单号",
"scrapReason" : "报废原因",
"assetNumber" : "资产编号",
"assetLabelNumber" : "资产标签号",
"compensationSaleAmount" : "赔偿/变卖金额",
"liableEmployeeNum" : "员工工号",
"liableEmployeeName" : "员工姓名",
"remitEmployeeNum" : "员工工号",
"remitEmployeeName" : "员工姓名",
"remitTime" : "汇款时间",
"remitAmount" : "汇款金额",
"gatheringCompanyName" : "收款公司名称",
"gatheringCompanyAccount":"收款公司账号"
}
\ No newline at end of file
atms-web/src/main/webapp/app/cit/preview/cit-preview-eamDisposal-list/cit-preview-eamDisposal-list.ctrl.js
View file @ 072dc907
......@@ -28,12 +28,36 @@
function initAssetResultDxGrid() {
var dupColumns = [
{ caption: $translate.instant('ImportErrorPopUpNoCol'), dataField: "index", width: 50, allowEditing: false, fixed: true },
{ caption: $translate.instant('period'), dataField: "period", width: '15%', allowEditing: false, fixed: true },
{ caption: $translate.instant('source'), dataField: "source", width: '15%', allowEditing: false, fixed: true },
{ caption: $translate.instant('assetLabelNumber'), dataField: "assetLabelNumber", width: '15%', allowEditing: false, fixed: true },
{ caption: $translate.instant('compensationSaleAmount'), dataField: "compensationSaleAmount", width: '15%', allowEditing: false, fixed: true },
{ caption: $translate.instant('createdBy'), dataField: "createBy", width: '15%', allowEditing: false, fixed: true },
{ caption: $translate.instant('createTime'), dataField: "createTime", width: '15%', allowEditing: false, fixed: true }
{ caption: $translate.instant('occurPeriod'), dataField: "occurPeriod", allowEditing: false, fixed: true },
{ caption: $translate.instant('oaAssetBillType'), dataField: "oaAssetBillType", allowEditing: false, fixed: true },
{ caption: $translate.instant('oaAssetNumber'), dataField: "oaAssetNumber", allowEditing: false, fixed: true },
{ caption: $translate.instant('scrapReason'), dataField: "scrapReason", allowEditing: false, fixed: true },
{ caption: $translate.instant('assetNumber'), dataField: "assetNumber", allowEditing: false, fixed: true },
{ caption: $translate.instant('assetLabelNumber'), dataField: "assetLabelNumber", allowEditing: false, fixed: true },
{ caption: $translate.instant('compensationSaleAmount'), dataField: "compensationSaleAmount", allowEditing: false, fixed: true },
{
caption: $translate.instant('zczzrxx'), alignment: 'center',
columns: [
{ caption: $translate.instant('liableEmployeeNum'), dataField: "liableEmployeeNum", allowEditing: false, fixed: true },
{ caption: $translate.instant('liableEmployeeName'), dataField: "liableEmployeeName", allowEditing: false, fixed: true }
]
},{
caption: $translate.instant('xkrxx'), alignment: 'center',
columns: [
{ caption: $translate.instant('remitEmployeeNum'), dataField: "remitEmployeeNum", allowEditing: false, fixed: true },
{ caption: $translate.instant('remitEmployeeName'), dataField: "remitEmployeeName", allowEditing: false, fixed: true },
{ caption: $translate.instant('remitTime'), dataField: "remitTime", allowEditing: false, fixed: true },
{ caption: $translate.instant('remitAmount'), dataField: "remitAmount", allowEditing: false, fixed: true }
]
},
{
caption: $translate.instant('skgsxx'), alignment: 'center',
columns: [
{ caption: $translate.instant('gatheringCompanyName'), dataField: "gatheringCompanyName", allowEditing: false, fixed: true },
{ caption: $translate.instant('gatheringCompanyAccount'), dataField: "gatheringCompanyAccount", allowEditing: false, fixed: true }
]
},
{ caption: $translate.instant('remark'), dataField: "remark", allowEditing: false, fixed: true }
];
$scope.assetsResultGridOptions = {
......
atms-web/src/main/webapp/app/cit/preview/cit-preview-salaryAdvance-list/cit-preview-salaryAdvance-list.ctrl.js
View file @ 072dc907
......@@ -30,15 +30,36 @@
function initAssetResultDxGrid() {
var dupColumns = [
{ caption: $translate.instant('ImportErrorPopUpNoCol'), dataField: "index", width: 50, allowEditing: false, fixed: true },
{ caption: $translate.instant('poSubjectName'), dataField: "poSubjectName", width: '30%', allowEditing: false, fixed: true },
/* { caption: $translate.instant('organizationId'), dataField: "organizationId", width: 120, allowEditing: false, fixed: true },
{ caption: $translate.instant('ProjectNameCol'), dataField: "projectName", width: 120, allowEditing: false, fixed: true },*/
{ caption: $translate.instant('period'), dataField: "period", width: '15%', allowEditing: false, fixed: true },
{ caption: $translate.instant('source'), dataField: "source", width: '15%', allowEditing: false, fixed: true },
{ caption: $translate.instant('advancePrice'), dataField: "advance", width: '15%', allowEditing: false, fixed: true },
{ caption: $translate.instant('approvedPrice'), dataField: "approvedStandardInvoiceAmount", width: 200, allowEditing: false, fixed: true },
/* { caption: $translate.instant('createBy'), dataField: "createdBy", width: 200, allowEditing: false, fixed: true },*/
{ caption: $translate.instant('createTime'), dataField: "createTime", width: '15%', allowEditing: false, fixed: true }
{ caption: $translate.instant('poNo'), dataField: "poNo", allowEditing: false, fixed: true },
{ caption: $translate.instant('poRow'), dataField: "poRow", allowEditing: false, fixed: true },
{ caption: "PO创建日期", dataField: "createTime", allowEditing: false, fixed: true },
{ caption: $translate.instant('ladingBillPerson'), dataField: "ladingBillPerson", allowEditing: false, fixed: true },
{ caption: $translate.instant('purchasePerson'), dataField: "purchasePerson", width: 200, allowEditing: false, fixed: true },
{ caption: $translate.instant('poSubjectCode'), dataField: "poSubjectCode", allowEditing: false, fixed: true },
{ caption: $translate.instant('poSubjectName'), dataField: "poSubjectName", allowEditing: false, fixed: true },
{ caption: $translate.instant('costCenterCode'), dataField: "costCenterCode", allowEditing: false, fixed: true },
{ caption: $translate.instant('costCenter'), dataField: "costCenter", allowEditing: false, fixed: true },
{ caption: $translate.instant('supplier'), dataField: "supplier", allowEditing: false, fixed: true },
{ caption: $translate.instant('item'), dataField: "item", allowEditing: false, fixed: true },
{ caption: $translate.instant('standardMoney'), dataField: "standardMoney", allowEditing: false, fixed: true },
{ caption: $translate.instant('currency'), dataField: "currency", allowEditing: false, fixed: true },
{ caption: $translate.instant('orderAmount'), dataField: "orderAmount", allowEditing: false, fixed: true },
{ caption: $translate.instant('executedServiceSchedule'), dataField: "executedServiceSchedule", allowEditing: false, fixed: true },
{ caption: $translate.instant('coupaTotalAccept'), dataField: "coupaTotalAccept", allowEditing: false, fixed: true },
{ caption: $translate.instant('advance'), dataField: "advance", allowEditing: false, fixed: true },
{ caption: $translate.instant('unexecutedServiceSchedule'), dataField: "unexecutedServiceSchedule", allowEditing: false, fixed: true },
{ caption: $translate.instant('approvedStandardInvoiceAmount'), dataField: "approvedStandardInvoiceAmount", allowEditing: false, fixed: true },
{ caption: $translate.instant('paidInvoiceAmount'), dataField: "paidInvoiceAmount", allowEditing: false, fixed: true },
{ caption: $translate.instant('usableInvoiceAmount'), dataField: "usableInvoiceAmount", allowEditing: false, fixed: true },
{ caption: $translate.instant('usableBalance'), dataField: "usableBalance", allowEditing: false, fixed: true },
{ caption: $translate.instant('advanceWriteOff'), dataField: "advanceWriteOff", allowEditing: false, fixed: true },
{ caption: $translate.instant('checkOne'), dataField: "checkOne", allowEditing: false, fixed: true },
{ caption: $translate.instant('reclassifyAmount'), dataField: "reclassifyAmount", allowEditing: false, fixed: true },
{ caption: $translate.instant('exchangeRate'), dataField: "exchangeRate", allowEditing: false, fixed: true },
{ caption: $translate.instant('ledgerId'), dataField: "ledgerId", allowEditing: false, fixed: true },
{ caption: $translate.instant('debitAdvanceGene'), dataField: "debitAdvanceGene", allowEditing: false, fixed: true },
{ caption: $translate.instant('creditPrepaidAccounts'), dataField: "creditPrepaidAccounts", allowEditing: false, fixed: true },
{ caption: $translate.instant('remark'), dataField: "remark", allowEditing: false, fixed: true }
];
$scope.assetsResultGridOptions = {
......@@ -77,10 +98,8 @@
visible: true
},
onRowUpdating: function (e) {
},
onToolbarPreparing: function (e) {
}
}
}
......@@ -110,7 +129,6 @@
var initListData = function(){
citPreviewDataService.getCitPreviewSalaryAdvanceDataList($scope.queryParams).success(function (res) {
$scope.listData = commonWebService._index(res.list);
$scope.queryParams.pagingOptions.totalItems = res.pageInfo.totalCount;
//$scope.$apply();
......
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