Skip to content

T
traffic-front
Commit 87e5ed17 authored by frank.xa.zhang's avatar frank.xa.zhang
Browse files
Options

Merge branch 'dev' into dev_frank

parents f02fc7a3 86d4e745
Show whitespace changes
Inline Side-by-side
Showing with 309 additions and 243 deletions
atms-api/pom.xml
View file @ 87e5ed17
......@@ -383,6 +383,12 @@
</includes>
<filtering>true</filtering><!-- replace variable attribute or not -->
</resource>
<resource>
<directory>test/resources</directory>
<includes>
<include>**/*.properties</include>
</includes>
</resource>
</resources>
<plugins>
<plugin>
......@@ -395,7 +401,7 @@
</archive>
<webResources>
<resource>
<directory>src/main/webapp-filtered</directory>
<directory>test</directory>
<includes>
<include>**</include>
</includes>
......
atms-api/src/main/java/pwc/taxtech/atms/controller/AtmsExceptionHandler.java 0 → 100644
View file @ 87e5ed17
package pwc.taxtech.atms.controller;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.ControllerAdvice;
import org.springframework.web.bind.annotation.ExceptionHandler;
import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler;
import pwc.taxtech.atms.exception.ApplicationException;
import pwc.taxtech.atms.exception.ServiceException;
@ControllerAdvice
public class AtmsExceptionHandler extends ResponseEntityExceptionHandler {
@ExceptionHandler(value = {
ApplicationException.class,
ServiceException.class
})
protected ResponseEntity<Object> handleExceptions(Exception ex) throws ServiceException {
logger.error("Rest Exception!", ex);
if (ex instanceof ApplicationException) {
return handleApplicationException((ApplicationException) ex);
} else if (ex instanceof ServiceException) {
return handleServiceException((ServiceException) ex);
} else {
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).build();
}
}
private ResponseEntity<Object> handleApplicationException(ApplicationException ex) {
throw ex;
}
private ResponseEntity<Object> handleServiceException(ServiceException ex) throws ServiceException {
throw ex;
}
}
atms-api/src/main/java/pwc/taxtech/atms/controller/CustomsInvoiceController.java
View file @ 87e5ed17
......@@ -5,6 +5,8 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.http.HttpStatus;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
......@@ -16,6 +18,7 @@ import pwc.taxtech.atms.dto.vatdto.CustomsInvoiceDto;
import pwc.taxtech.atms.dto.vatdto.CustomsInvoiceFilter;
import pwc.taxtech.atms.dto.vatdto.JsonCustomsInvoice;
import pwc.taxtech.atms.dto.vatdto.JsonCustomsInvoiceDto;
import pwc.taxtech.atms.exception.ApplicationException;
import pwc.taxtech.atms.thirdparty.ExcelUtil;
import pwc.taxtech.atms.vat.service.CustomsInvoiceService;
......@@ -50,6 +53,11 @@ public class CustomsInvoiceController {
return convertCustomsInvoiceDataToJson(fromPeriod, toPeriod, filter, paging);
}
@RequestMapping(value = "GetCustomsInvoicesByPeriodId/{periodId}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public ResponseEntity getCustomsInvoicesByPeriodId(@PathVariable Integer periodId) {
return ResponseEntity.ok().body(customsInvoiceService.getCustomsInvoicesByPeriodId(periodId));
}
@RequestMapping(value = "ExportQueryData/get", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public void exportQueryData(@RequestParam String criteria, HttpServletResponse response) {
CustomsInvoiceFilter filter = new CustomsInvoiceFilter();
......
atms-api/src/main/java/pwc/taxtech/atms/service/impl/CustomerServiceImpl.java
View file @ 87e5ed17
......@@ -19,9 +19,7 @@ import org.springframework.util.Assert;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
import com.alibaba.fastjson.JSON;
import pwc.taxtech.atms.common.ApplicationException;
import pwc.taxtech.atms.exception.ApplicationException;
import pwc.taxtech.atms.common.AuthUserHelper;
import pwc.taxtech.atms.common.CommonConstants;
import pwc.taxtech.atms.common.CommonUtils;
......
atms-api/src/main/java/pwc/taxtech/atms/vat/service/CustomsInvoiceService.java
View file @ 87e5ed17
package pwc.taxtech.atms.vat.service;
import org.springframework.http.ResponseEntity;
import pwc.taxtech.atms.dto.vatdto.CustomsInvoiceDto;
import java.util.List;
......@@ -12,4 +13,6 @@ public interface CustomsInvoiceService {
* @return
*/
List<CustomsInvoiceDto> getCustomsInvoicesByPeriodIds(int fromPeriod, int toPeriod);
List<CustomsInvoiceDto> getCustomsInvoicesByPeriodId(Integer periodId);
}
atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/CustomsInvoiceServiceImpl.java
View file @ 87e5ed17
......@@ -42,6 +42,9 @@ public class CustomsInvoiceServiceImpl extends VatAbstractService implements Cus
@Override
public List<CustomsInvoiceDto> getCustomsInvoicesByPeriodId(Integer periodId) {
CustomsInvoiceExample example = new CustomsInvoiceExample();
// example.createCriteria().andPeriodIdEqualTo(periodId)
return null;
}
}
atms-api/src/main/resources/RuntimeDbScripts/MYSQL/CreateProjectDB.sql
View file @ 87e5ed17
......@@ -183,58 +183,6 @@ CREATE TABLE IF NOT EXISTS `DBKeyword_ProjectDbName`.`BalanceStdManual` (
ENGINE = InnoDB
DEFAULT CHARACTER SET = utf8mb4;
-- -----------------------------------------------------
-- Table `DBKeyword_ProjectDbName`.`CellComment`
-- -----------------------------------------------------
CREATE TABLE IF NOT EXISTS `DBKeyword_ProjectDbName`.`CellComment` (
`ID` VARCHAR(128) NOT NULL,
`CellDataId` VARCHAR(128) NOT NULL,
`UserId` VARCHAR(128) NOT NULL,
`UserName` VARCHAR(50) NULL DEFAULT NULL,
`Comment` TEXT NULL DEFAULT NULL,
`ReplyToUserName` VARCHAR(50) NULL DEFAULT NULL,
`CreateTime` DATETIME NOT NULL,
`UpdateTime` DATETIME NOT NULL,
PRIMARY KEY (`ID`))
ENGINE = InnoDB
DEFAULT CHARACTER SET = utf8mb4;
-- -----------------------------------------------------
-- Table `DBKeyword_ProjectDbName`.`CellData`
-- -----------------------------------------------------
CREATE TABLE IF NOT EXISTS `DBKeyword_ProjectDbName`.`CellData` (
`ID` VARCHAR(128) NOT NULL,
`ReportID` VARCHAR(128) NOT NULL,
`CellTemplateID` VARCHAR(128) NOT NULL,
`Data` VARCHAR(200) NULL DEFAULT NULL,
`FormulaExp` LONGTEXT NULL DEFAULT NULL,
`Creator` VARCHAR(128) NOT NULL,
`CreateTime` DATETIME NOT NULL,
`Updater` VARCHAR(128) NOT NULL,
`UpdateTime` DATETIME NOT NULL,
PRIMARY KEY (`ID`))
ENGINE = InnoDB
DEFAULT CHARACTER SET = utf8mb4;
-- -----------------------------------------------------
-- Table `DBKeyword_ProjectDbName`.`CellDataSource`
-- -----------------------------------------------------
CREATE TABLE IF NOT EXISTS `DBKeyword_ProjectDbName`.`CellDataSource` (
`ID` VARCHAR(128) NOT NULL,
`CellTemplateID` VARCHAR(128) NOT NULL,
`CellDataID` VARCHAR(128) NOT NULL,
`DataSourceID` VARCHAR(128) NOT NULL,
`OperationType` INT(11) NULL DEFAULT NULL,
`CreateTime` DATETIME NOT NULL,
`UpdateTime` DATETIME NOT NULL,
PRIMARY KEY (`ID`))
ENGINE = InnoDB
DEFAULT CHARACTER SET = utf8mb4;
-- -----------------------------------------------------
-- Table `DBKeyword_ProjectDbName`.`CompanyBalance`
-- -----------------------------------------------------
......@@ -348,44 +296,6 @@ CREATE TABLE IF NOT EXISTS `DBKeyword_ProjectDbName`.`CustomsInvoice` (
ENGINE = InnoDB
DEFAULT CHARACTER SET = utf8mb4;
-- -----------------------------------------------------
-- Table `DBKeyword_ProjectDbName`.`DataSource`
-- -----------------------------------------------------
CREATE TABLE IF NOT EXISTS `DBKeyword_ProjectDbName`.`DataSource` (
`ID` VARCHAR(128) NOT NULL,
`Type` INT(11) NOT NULL,
`Name` TEXT NULL DEFAULT NULL,
`Amount` DECIMAL(20,4) NULL DEFAULT NULL,
`Description` LONGTEXT NULL DEFAULT NULL,
`KeyValueDataID` VARCHAR(128) NULL DEFAULT NULL,
`Creator` VARCHAR(128) NOT NULL,
`CreateTime` DATETIME NOT NULL,
`Updater` VARCHAR(128) NOT NULL,
`UpdateTime` DATETIME NOT NULL,
`RowName` TEXT NULL DEFAULT NULL,
`ColumnName` TEXT NULL DEFAULT NULL,
`RowIndex` INT(11) NULL DEFAULT NULL,
`RemapBatchId` VARCHAR(128) NULL DEFAULT NULL,
`ColumnIndex` INT(11) NULL DEFAULT NULL,
PRIMARY KEY (`ID`))
ENGINE = InnoDB
DEFAULT CHARACTER SET = utf8mb4;
-- -----------------------------------------------------
-- Table `DBKeyword_ProjectDbName`.`DataSourceDetail`
-- -----------------------------------------------------
CREATE TABLE IF NOT EXISTS `DBKeyword_ProjectDbName`.`DataSourceDetail` (
`ID` VARCHAR(128) NOT NULL,
`DataSourceID` VARCHAR(128) NOT NULL,
`DataSourceType` INT(11) NOT NULL,
`ItemValue` VARCHAR(128) NOT NULL,
PRIMARY KEY (`ID`))
ENGINE = InnoDB
DEFAULT CHARACTER SET = utf8mb4;
-- -----------------------------------------------------
-- Table `DBKeyword_ProjectDbName`.`EnterpriseAccount`
-- -----------------------------------------------------
......@@ -838,155 +748,6 @@ CREATE TABLE IF NOT EXISTS `DBKeyword_ProjectDbName`.`PeriodCellReference` (
PRIMARY KEY (`ID`, `Period`))
ENGINE = InnoDB
DEFAULT CHARACTER SET = utf8mb4;
-- -----------------------------------------------------
-- Table `DBKeyword_ProjectDbName`.`PeriodCellTemplate`
-- -----------------------------------------------------
CREATE TABLE IF NOT EXISTS `DBKeyword_ProjectDbName`.`PeriodCellTemplate` (
`ID` VARCHAR(128) NOT NULL,
`Period` INT(11) NOT NULL,
`ReportTemplateID` VARCHAR(128) NOT NULL,
`RowIndex` INT(11) NOT NULL,
`RowName` TEXT NULL DEFAULT NULL,
`ColumnIndex` INT(11) NOT NULL,
`ColumnName` TEXT NULL DEFAULT NULL,
`Comment` TEXT NULL DEFAULT NULL,
`CreateTime` DATETIME NOT NULL,
`UpdateTime` DATETIME NOT NULL,
`CopyFromID` VARCHAR(128) NULL DEFAULT NULL,
`DataType` INT(11) NULL DEFAULT NULL,
`IsReadOnly` INT(11) NULL DEFAULT NULL,
PRIMARY KEY (`ID`, `Period`))
ENGINE = InnoDB
DEFAULT CHARACTER SET = utf8mb4;
-- -----------------------------------------------------
-- Table `DBKeyword_ProjectDbName`.`PeriodCellTemplateConfig`
-- -----------------------------------------------------
CREATE TABLE IF NOT EXISTS `DBKeyword_ProjectDbName`.`PeriodCellTemplateConfig` (
`ID` VARCHAR(128) NOT NULL,
`Period` INT(11) NOT NULL,
`CellTemplateID` VARCHAR(128) NOT NULL,
`ReportTemplateID` VARCHAR(128) NULL DEFAULT NULL,
`DataSourceType` INT(11) NOT NULL,
`Formula` TEXT NULL DEFAULT NULL,
`ParsedFormula` TEXT NULL DEFAULT NULL,
`FormulaDescription` TEXT NULL DEFAULT NULL,
`AccountCodes` TEXT NULL DEFAULT NULL,
`InvoiceType` INT(11) NULL DEFAULT NULL,
`TaxRate` VARCHAR(50) NULL DEFAULT NULL,
`InvoiceAmountType` INT(11) NULL DEFAULT NULL,
`ModelIDs` TEXT NULL DEFAULT NULL,
`Creator` VARCHAR(128) NOT NULL,
`CreateTime` DATETIME NOT NULL,
`Updater` VARCHAR(128) NOT NULL,
`UpdateTime` DATETIME NOT NULL,
`InvoiceCategory` VARCHAR(50) NULL DEFAULT NULL,
`FormulaDataSource` TEXT NULL DEFAULT NULL,
`Validation` TEXT NULL DEFAULT NULL,
`ParsedValidation` TEXT NULL DEFAULT NULL,
`ValidationDescription` TEXT NULL DEFAULT NULL,
`VoucherKeyword` TEXT NULL DEFAULT NULL,
PRIMARY KEY (`ID`, `Period`))
ENGINE = InnoDB
DEFAULT CHARACTER SET = utf8mb4;
-- -----------------------------------------------------
-- Table `DBKeyword_ProjectDbName`.`PeriodFormulaBlock`
-- -----------------------------------------------------
CREATE TABLE IF NOT EXISTS `DBKeyword_ProjectDbName`.`PeriodFormulaBlock` (
`ID` VARCHAR(128) NOT NULL,
`Period` INT(11) NOT NULL,
`FormulaBlock` VARCHAR(50) NOT NULL,
`Index` INT(11) NOT NULL,
`Data` VARCHAR(200) NULL DEFAULT NULL,
`ResultType` INT(11) NULL DEFAULT NULL,
`DataSourceInfo` LONGTEXT NULL DEFAULT NULL,
`IsCalculated` SMALLINT(6) NULL DEFAULT NULL,
`Creator` VARCHAR(128) NULL DEFAULT NULL,
`CreateTime` DATETIME NULL DEFAULT NULL,
`Updater` VARCHAR(128) NULL DEFAULT NULL,
`UpdateTime` DATETIME NULL DEFAULT NULL,
PRIMARY KEY (`ID`, `Period`))
ENGINE = InnoDB
DEFAULT CHARACTER SET = utf8mb4;
-- -----------------------------------------------------
-- Table `DBKeyword_ProjectDbName`.`PeriodTaxPayerReportRule`
-- -----------------------------------------------------
CREATE TABLE IF NOT EXISTS `DBKeyword_ProjectDbName`.`PeriodTaxPayerReportRule` (
`ID` VARCHAR(128) NOT NULL,
`IsDefault` INT(11) NOT NULL,
`Period` INT(11) NOT NULL,
`TaxPayerType` INT(11) NOT NULL,
`TemplateGroupID` VARCHAR(128) NOT NULL,
`OrganizationID` LONGTEXT NULL DEFAULT NULL,
`CreateTime` DATETIME NOT NULL,
`UpdateTime` DATETIME NOT NULL,
PRIMARY KEY (`ID`, `Period`))
ENGINE = InnoDB
DEFAULT CHARACTER SET = utf8mb4;
-- -----------------------------------------------------
-- Table `DBKeyword_ProjectDbName`.`PeriodTaxRuleSetting`
-- -----------------------------------------------------
CREATE TABLE IF NOT EXISTS `DBKeyword_ProjectDbName`.`PeriodTaxRuleSetting` (
`ID` VARCHAR(128) NOT NULL,
`Name` VARCHAR(50) NOT NULL,
`IsDefault` INT(11) NOT NULL,
`Period` INT(11) NOT NULL,
`GroupName` VARCHAR(50) NULL DEFAULT NULL,
`TaxBase` TEXT NOT NULL,
`TaxRate` DECIMAL(20,4) NOT NULL,
`CreateTime` DATETIME NOT NULL,
`UpdateTime` DATETIME NOT NULL,
PRIMARY KEY (`ID`, `Period`))
ENGINE = InnoDB
DEFAULT CHARACTER SET = utf8mb4;
-- -----------------------------------------------------
-- Table `DBKeyword_ProjectDbName`.`PeriodTaxRuleSettingOrganization`
-- -----------------------------------------------------
CREATE TABLE IF NOT EXISTS `DBKeyword_ProjectDbName`.`PeriodTaxRuleSettingOrganization` (
`ID` VARCHAR(128) NOT NULL,
`TaxSettingID` VARCHAR(128) NOT NULL,
`Period` INT(11) NOT NULL,
`OrganizationID` VARCHAR(128) NOT NULL,
`CreateTime` DATETIME NOT NULL,
`UpdateTime` DATETIME NOT NULL,
PRIMARY KEY (`ID`, `Period`))
ENGINE = InnoDB
DEFAULT CHARACTER SET = utf8mb4;
-- -----------------------------------------------------
-- Table `DBKeyword_ProjectDbName`.`PeriodTemplate`
-- -----------------------------------------------------
CREATE TABLE IF NOT EXISTS `DBKeyword_ProjectDbName`.`PeriodTemplate` (
`ID` VARCHAR(128) NOT NULL,
`Period` INT(11) NOT NULL,
`Name` TEXT NOT NULL,
`Code` TEXT NULL DEFAULT NULL,
`Path` TEXT NOT NULL,
`ReportType` INT(11) NULL DEFAULT NULL,
`TemplateGroupID` VARCHAR(128) NOT NULL,
`OrderIndex` INT(11) NULL DEFAULT NULL,
`CreateTime` DATETIME NOT NULL,
`UpdateTime` DATETIME NOT NULL,
`IsSystemType` INT(11) NOT NULL,
`IsActiveAssociation` INT(11) NOT NULL,
`ParentId` VARCHAR(128) NULL DEFAULT NULL,
PRIMARY KEY (`ID`, `Period`))
ENGINE = InnoDB
DEFAULT CHARACTER SET = utf8mb4;
-- -----------------------------------------------------
-- Table `DBKeyword_ProjectDbName`.`Report`
-- -----------------------------------------------------
......@@ -1121,6 +882,231 @@ CREATE TABLE IF NOT EXISTS `DBKeyword_ProjectDbName`.`VoucherMapping` (
ENGINE = InnoDB
DEFAULT CHARACTER SET = utf8mb4;
CREATE TABLE IF NOT EXISTS `DBKeyword_ProjectDbName`.`cell_comment` (
`id` bigint(18) unsigned NOT NULL,
`cell_data_id` bigint(18) unsigned NOT NULL DEFAULT '0',
`user_id` varchar(128) NOT NULL DEFAULT '',
`user_name` varchar(50) NOT NULL DEFAULT '',
`comment` varchar(1000) NOT NULL DEFAULT '',
`reply_to_user_name` varchar(50) NOT NULL DEFAULT '',
`create_time` datetime NOT NULL DEFAULT '1970-01-01 08:00:00',
`update_time` datetime NOT NULL DEFAULT '1970-01-01 08:00:00',
`create_by` varchar(128) NOT NULL DEFAULT '',
`update_by` varchar(128) NOT NULL DEFAULT '',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
/*Table structure for table `cell_data` */
CREATE TABLE IF NOT EXISTS `DBKeyword_ProjectDbName`.`cell_data` (
`id` bigint(18) unsigned NOT NULL,
`report_id` varchar(128) NOT NULL DEFAULT '',
`cell_template_id` varchar(128) NOT NULL DEFAULT '',
`data` varchar(200) NOT NULL DEFAULT '',
`formula_exp` varchar(1000) NOT NULL DEFAULT '',
`create_by` varchar(128) NOT NULL DEFAULT '',
`create_time` datetime NOT NULL DEFAULT '1970-01-01 08:00:00',
`update_by` varchar(128) NOT NULL DEFAULT '',
`update_time` datetime NOT NULL DEFAULT '1970-01-01 08:00:00',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
/*Table structure for table `cell_data_source` */
CREATE TABLE IF NOT EXISTS `DBKeyword_ProjectDbName`.`cell_data_source` (
`id` bigint(18) unsigned NOT NULL,
`cell_template_id` bigint(18) unsigned NOT NULL DEFAULT '0',
`cell_data_id` bigint(18) unsigned NOT NULL DEFAULT '0',
`data_source_id` bigint(18) unsigned NOT NULL DEFAULT '0',
`operation_type` int(11) unsigned NOT NULL DEFAULT '0',
`create_time` datetime NOT NULL DEFAULT '1970-01-01 08:00:00',
`update)_time` datetime NOT NULL DEFAULT '1970-01-01 08:00:00',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
/*Table structure for table `data_source` */
CREATE TABLE IF NOT EXISTS `DBKeyword_ProjectDbName`.`data_source` (
`id` bigint(18) unsigned NOT NULL,
`type` int(11) unsigned NOT NULL DEFAULT '0',
`name` varchar(1000) NOT NULL DEFAULT '',
`amount` decimal(20,4) NOT NULL DEFAULT '0.0000',
`description` varchar(1000) NOT NULL DEFAULT '',
`key_value_data_id` varchar(128) NOT NULL DEFAULT '',
`create_by` varchar(128) NOT NULL DEFAULT '',
`create_time` datetime NOT NULL DEFAULT '1970-01-01 08:00:00',
`update_by` varchar(128) NOT NULL DEFAULT '',
`update_time` datetime NOT NULL DEFAULT '1970-01-01 08:00:00',
`row_name` varchar(1000) NOT NULL DEFAULT '',
`column_name` varchar(1000) NOT NULL DEFAULT '',
`row_index` int(11) unsigned NOT NULL DEFAULT '0',
`remap_batch_id` varchar(128) NOT NULL DEFAULT '',
`column_index` int(11) unsigned NOT NULL DEFAULT '0',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
/*Table structure for table `data_source_detail` */
CREATE TABLE IF NOT EXISTS `DBKeyword_ProjectDbName`.`data_source_detail` (
`id` bigint(18) unsigned NOT NULL,
`data_source_id` bigint(18) unsigned NOT NULL DEFAULT '0',
`data_source_type` int(11) unsigned NOT NULL DEFAULT '0',
`item_value` varchar(128) NOT NULL DEFAULT '',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
/*Table structure for table `period_cell_template` */
CREATE TABLE IF NOT EXISTS `DBKeyword_ProjectDbName`.`period_cell_template` (
`id` bigint(18) unsigned NOT NULL,
`period` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '月份',
`report_template_id` varchar(128) NOT NULL DEFAULT '' COMMENT '报表模板ID',
`row_index` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '行号',
`row_name` varchar(200) NOT NULL DEFAULT '' COMMENT '行名称',
`column_index` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '列号',
`column_name` varchar(200) NOT NULL DEFAULT '' COMMENT '列名称',
`comment` varchar(1000) NOT NULL DEFAULT '' COMMENT '注释',
`create_time` datetime NOT NULL DEFAULT '1970-01-01 08:00:00' COMMENT '创建时间',
`update_time` datetime NOT NULL DEFAULT '1970-01-01 08:00:00' COMMENT '更新时间',
`cell_template_id` bigint(18) unsigned NOT NULL DEFAULT '0' COMMENT '主库单元格模板ID',
`data_type` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '数据类型',
`is_read_only` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '是否只读',
`copy_from_id` bigint(18) unsigned NOT NULL DEFAULT '0' COMMENT '复制数据源ID',
`create_by` varchar(128) NOT NULL DEFAULT '',
`update_by` varchar(128) NOT NULL DEFAULT '',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
/*Table structure for table `period_cell_template_config` */
CREATE TABLE IF NOT EXISTS `DBKeyword_ProjectDbName`.`period_cell_template_config` (
`id` bigint(18) unsigned NOT NULL,
`period` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '月份',
`cell_template_id` varchar(128) NOT NULL DEFAULT '' COMMENT '单元格模板ID',
`report_template_id` varchar(128) NOT NULL DEFAULT '' COMMENT '报表模板ID',
`data_source_type` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '数据源类型',
`formula` varchar(500) NOT NULL DEFAULT '' COMMENT '公式',
`parsed_formula` varchar(1000) NOT NULL DEFAULT '' COMMENT '解析后公式',
`formula_description` varbinary(1000) NOT NULL DEFAULT '' COMMENT '公式描述',
`account_codes` varchar(1000) NOT NULL DEFAULT '' COMMENT '账套代码',
`invoice_type` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '发票类型',
`tax_rate` varchar(50) NOT NULL DEFAULT '' COMMENT '税率',
`invoice_amount_type` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '发票账户类型',
`model_ids` varchar(1000) NOT NULL DEFAULT '' COMMENT '模型IDs',
`create_by` varchar(128) NOT NULL DEFAULT '' COMMENT '创建者',
`create_time` datetime NOT NULL DEFAULT '1970-01-01 08:00:00' COMMENT '创建时间',
`update_by` varchar(128) NOT NULL DEFAULT '' COMMENT '更改者',
`update_time` datetime NOT NULL DEFAULT '1970-01-01 08:00:00' COMMENT '更改时间',
`invoice_category` varchar(50) NOT NULL DEFAULT '' COMMENT '发票类型',
`formula_data_source` varchar(1000) NOT NULL DEFAULT '' COMMENT '公式数据源',
`validation` varchar(1000) NOT NULL DEFAULT '' COMMENT '验证信息',
`parsed_validation` varchar(1000) NOT NULL DEFAULT '' COMMENT '解析验证信息',
`validation_description` varchar(1000) NOT NULL DEFAULT '' COMMENT '验证信息描述',
`voucher_keyword` varchar(1000) NOT NULL DEFAULT '' COMMENT '票证关键字',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
/*Table structure for table `period_formula_block` */
CREATE TABLE IF NOT EXISTS `DBKeyword_ProjectDbName`.`period_formula_block` (
`id` bigint(18) unsigned NOT NULL,
`period` int(11) unsigned NOT NULL DEFAULT '0',
`report_id` bigint(18) unsigned NOT NULL DEFAULT '0',
`cell_template_id` bigint(18) unsigned NOT NULL DEFAULT '0',
`formula_expression` varchar(1000) NOT NULL DEFAULT '',
`data` varchar(200) NOT NULL DEFAULT '',
`data_source_id` bigint(18) unsigned NOT NULL DEFAULT '0',
`create_by` varchar(128) NOT NULL,
`create_time` datetime NOT NULL DEFAULT '1970-01-01 08:00:00',
`update_by` varchar(128) NOT NULL,
`update_time` datetime NOT NULL DEFAULT '1970-01-01 08:00:00',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
/*Table structure for table `period_tax_payer_report_rule` */
CREATE TABLE IF NOT EXISTS `DBKeyword_ProjectDbName`.`period_tax_payer_report_rule` (
`id` bigint(18) unsigned NOT NULL,
`is_default` int(11) unsigned NOT NULL DEFAULT '0',
`period` int(11) unsigned NOT NULL DEFAULT '0',
`tax_payer_type` int(11) unsigned NOT NULL DEFAULT '0',
`template_group_id` varchar(128) NOT NULL DEFAULT '',
`organization_id` varchar(128) NOT NULL DEFAULT '',
`create_time` datetime NOT NULL DEFAULT '1970-01-01 08:00:00',
`update_time` datetime NOT NULL DEFAULT '1970-01-01 08:00:00',
`tax_payer_report_rule_id` bigint(18) unsigned NOT NULL DEFAULT '0',
`create_by` varchar(128) NOT NULL DEFAULT '',
`update_by` varchar(128) NOT NULL DEFAULT '',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
/*Table structure for table `period_tax_rule_setting` */
CREATE TABLE IF NOT EXISTS `DBKeyword_ProjectDbName`.`period_tax_rule_setting` (
`id` bigint(18) unsigned NOT NULL,
`name` varchar(50) NOT NULL DEFAULT '',
`is_default` int(11) unsigned NOT NULL DEFAULT '0',
`period` int(11) unsigned NOT NULL DEFAULT '0',
`group_name` varchar(50) NOT NULL DEFAULT '',
`tax_base` varchar(1000) NOT NULL DEFAULT '',
`tax_rate` decimal(18,4) NOT NULL DEFAULT '0.0000',
`create_time` datetime NOT NULL,
`update_time` datetime NOT NULL,
`tax_rule_setting_id` bigint(18) unsigned NOT NULL DEFAULT '0',
`create_by` varchar(128) NOT NULL DEFAULT '',
`update_by` varchar(128) NOT NULL DEFAULT '',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
/*Table structure for table `period_tax_rule_setting_organization` */
CREATE TABLE IF NOT EXISTS `DBKeyword_ProjectDbName`.`period_tax_rule_setting_organization` (
`id` bigint(18) unsigned NOT NULL,
`tax_setting_id` bigint(18) unsigned NOT NULL DEFAULT '0',
`period` int(11) unsigned NOT NULL DEFAULT '0',
`organization_id` varchar(128) NOT NULL DEFAULT '',
`create_time` datetime NOT NULL DEFAULT '1970-01-01 08:00:00',
`update_time` datetime NOT NULL DEFAULT '1970-01-01 08:00:00',
`tax_rule_setting_organization_id` bigint(18) unsigned NOT NULL DEFAULT '0',
`create_by` varchar(128) NOT NULL DEFAULT '',
`update_by` varchar(128) NOT NULL DEFAULT '',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
/*Table structure for table `period_template` */
CREATE TABLE IF NOT EXISTS `DBKeyword_ProjectDbName`.`period_template` (
`id` bigint(18) unsigned NOT NULL,
`period` int(11) unsigned NOT NULL DEFAULT '0',
`name` varchar(1000) NOT NULL DEFAULT '',
`code` varchar(1000) NOT NULL DEFAULT '',
`path` varchar(1000) NOT NULL DEFAULT '',
`report_type` int(11) unsigned NOT NULL DEFAULT '0',
`template_group_id` varchar(128) NOT NULL DEFAULT '',
`order_index` int(11) unsigned NOT NULL DEFAULT '0',
`create_time` datetime NOT NULL DEFAULT '1970-01-01 08:00:00',
`update_time` datetime NOT NULL DEFAULT '1970-01-01 08:00:00',
`is_system_type` int(11) unsigned NOT NULL DEFAULT '0',
`is_active_association` int(11) unsigned NOT NULL DEFAULT '0',
`parent_id` varchar(128) NOT NULL DEFAULT '',
`template_id` bigint(18) unsigned NOT NULL DEFAULT '0',
`create_by` varchar(128) NOT NULL DEFAULT '',
`update_by` varchar(128) NOT NULL DEFAULT '',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
Insert INTO EnterpriseAccount
SELECT
a.ID,
......
atms-api/src/test/java/pwc/taxtech/atms/ControllerApiTranslator.java 0 → 100644
View file @ 87e5ed17
package pwc.taxtech.atms;
import org.apache.ibatis.io.Resources;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.BufferedReader;
import java.io.IOException;
public class ControllerApiTranslator {
public static void main(String[] args) throws IOException {
BufferedReader reader = new BufferedReader(Resources.getResourceAsReader("api_temp.properties"));
String line="";
while ((line=reader.readLine())!=null){
System.out.println(line);
}
}
}
atms-api/src/test/resources/api_temp.properties 0 → 100644
View file @ 87e5ed17
[HttpGet, Route("GetCustomsInvoicesByPeriodId/{periodId}")]
public IHttpActionResult GetCustomsInvoicesByPeriodId(int periodId)
{
return Ok(_customsInvoiceService.GetCustomsInvoicesByPeriodId(periodId));
}
\ No newline at end of file
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