Skip to content

T
traffic-front
Commit f74b9e30 authored by neo.wang's avatar neo.wang
Browse files
Options

Merge branch 'dev_oracle' into 'dev' 

Dev oracle

See merge request root/atms!111
parents ef68702d 5d993a92
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 374 additions and 273 deletions
atms-api/src/main/java/pwc/taxtech/atms/common/util/SpringContextUtil.java
View file @ f74b9e30
......@@ -38,10 +38,10 @@ public class SpringContextUtil implements ApplicationContextAware {
public static VatEnterpriseAccountDao vatEnterpriseAccountDao;
public static VatEnterpriseAccountMapper vatEnterpriseAccountMapper;
public static BalanceStdManualMapper balanceStdManualMapper;
public static OutputVATInvoiceMapper outputVATInvoiceMapper;
public static OutputVatInvoiceMapper outputVATInvoiceMapper;
public static PeriodTaxRuleSettingMapper periodTaxRuleSettingMapper;
public static InputVatInvoiceDao inputVatInvoiceDao;
public static InputVATInvoiceMapper inputVATInvoiceMapper;
public static InputVatInvoiceMapper inputVATInvoiceMapper;
public static AssetsListMapper assetsListMapper;
public static ProjectMapper projectMapper;
public static CellDataSourceMapper cellDataSourceMapper;
......@@ -79,10 +79,10 @@ public class SpringContextUtil implements ApplicationContextAware {
vatEnterpriseAccountDao = webApplicationContext.getBean(VatEnterpriseAccountDao.class);
vatEnterpriseAccountMapper = webApplicationContext.getBean(VatEnterpriseAccountMapper.class);
balanceStdManualMapper = webApplicationContext.getBean(BalanceStdManualMapper.class);
outputVATInvoiceMapper = webApplicationContext.getBean(OutputVATInvoiceMapper.class);
outputVATInvoiceMapper = webApplicationContext.getBean(OutputVatInvoiceMapper.class);
periodTaxRuleSettingMapper = webApplicationContext.getBean(PeriodTaxRuleSettingMapper.class);
inputVatInvoiceDao = webApplicationContext.getBean(InputVatInvoiceDao.class);
inputVATInvoiceMapper = webApplicationContext.getBean(InputVATInvoiceMapper.class);
inputVATInvoiceMapper = webApplicationContext.getBean(InputVatInvoiceMapper.class);
assetsListMapper = webApplicationContext.getBean(AssetsListMapper.class);
projectMapper = webApplicationContext.getBean(ProjectMapper.class);
cellDataSourceMapper = webApplicationContext.getBean(CellDataSourceMapper.class);
......
atms-api/src/main/java/pwc/taxtech/atms/controller/InputInvoiceImportController.java
View file @ f74b9e30
......@@ -18,7 +18,7 @@ import pwc.taxtech.atms.service.IdentityService;
import pwc.taxtech.atms.thirdparty.ExcelSheet;
import pwc.taxtech.atms.thirdparty.ExcelUtil;
import pwc.taxtech.atms.vat.dpo.InputInvoicePreviewQueryParam;
import pwc.taxtech.atms.vat.entity.InputVATInvoiceItem;
import pwc.taxtech.atms.vat.entity.InputVatInvoiceItem;
import pwc.taxtech.atms.vat.service.impl.InputInvoiceDataImportServiceImpl;
import javax.servlet.http.HttpServletResponse;
......@@ -114,7 +114,7 @@ public class InputInvoiceImportController {
excelSheetB.setHeaders(header2);
excelSheetB.setSheetName("sheetB");
List<InputVATInvoiceItem> inputInvoiceItemList = new ArrayList<>();
List<InputVatInvoiceItem> inputInvoiceItemList = new ArrayList<>();
for (InputVATInvoiceDto item : list) {
inputInvoiceItemList.addAll(inputInvoiceDataImportService.getInputInvoiceItemTreeViewData(item.getID()));
}
......
atms-api/src/main/java/pwc/taxtech/atms/dto/vatdto/ImportInputInvoiceItemDto.java
View file @ f74b9e30
package pwc.taxtech.atms.dto.vatdto;
import pwc.taxtech.atms.vat.entity.InputVATInvoiceItem;
import pwc.taxtech.atms.vat.entity.InputVatInvoiceItem;
import java.util.List;
public class ImportInputInvoiceItemDto {
public List<InputVATInvoiceItem> InputInvoiceItemList;
public List<InputVatInvoiceItem> InputInvoiceItemList;
public int ImportType ;
}
atms-api/src/main/java/pwc/taxtech/atms/dto/vatdto/ImportOutputInvoiceDto.java
View file @ f74b9e30
package pwc.taxtech.atms.dto.vatdto;
import pwc.taxtech.atms.vat.entity.OutputVATInvoice;
import pwc.taxtech.atms.vat.entity.OutputVATInvoiceItem;
import pwc.taxtech.atms.vat.entity.OutputVatInvoice;
import pwc.taxtech.atms.vat.entity.OutputVatInvoiceItem;
import java.util.List;
public class ImportOutputInvoiceDto {
public List<OutputVATInvoice> OutputInvoiceList ;
public List<OutputVATInvoiceItem> OutputInvoiceItemList ;
public List<OutputVatInvoice> OutputInvoiceList ;
public List<OutputVatInvoiceItem> OutputInvoiceItemList ;
public Integer ImportType ;
}
atms-api/src/main/java/pwc/taxtech/atms/dto/vatdto/InputVATInvoiceDto.java
View file @ f74b9e30
package pwc.taxtech.atms.dto.vatdto;
import pwc.taxtech.atms.constant.enums.EnumInvoiceType;
import pwc.taxtech.atms.vat.entity.InputVATInvoice;
import pwc.taxtech.atms.vat.entity.InputVatInvoice;
import java.math.BigDecimal;
import java.util.Date;
......@@ -139,8 +139,8 @@ public class InputVATInvoiceDto extends InputVATInvoiceBaseDto {
return EnumInvoiceType.values()[this.invoiceType].getName();
}
public InputVATInvoice extractInvoice(){
InputVATInvoice invoice = new InputVATInvoice();
public InputVatInvoice extractInvoice(){
InputVatInvoice invoice = new InputVatInvoice();
invoice.setID(getID());
invoice.setPeriodID(getPeriodID());
invoice.setInvoiceCode(getInvoiceCode());
......
atms-api/src/main/java/pwc/taxtech/atms/dto/vatdto/InputVATInvoiceResultDto.java
View file @ f74b9e30
......@@ -3,14 +3,14 @@ package pwc.taxtech.atms.dto.vatdto;
import lombok.Getter;
import lombok.Setter;
import pwc.taxtech.atms.vat.entity.GoodsMapping;
import pwc.taxtech.atms.vat.entity.InputVATInvoice;
import pwc.taxtech.atms.vat.entity.InputVATInvoiceItem;
import pwc.taxtech.atms.vat.entity.InputVatInvoice;
import pwc.taxtech.atms.vat.entity.InputVatInvoiceItem;
@Setter
@Getter
public class InputVATInvoiceResultDto {
private String invoiceID;
private InputVATInvoice inputVATInvoice;
private InputVATInvoiceItem inputVATInvoiceItem;
private InputVatInvoice inputVATInvoice;
private InputVatInvoiceItem inputVATInvoiceItem;
private GoodsMapping goodsMapping;
}
atms-api/src/main/java/pwc/taxtech/atms/dto/vatdto/OutputVATInvoiceDto.java
View file @ f74b9e30
......@@ -2,13 +2,13 @@ package pwc.taxtech.atms.dto.vatdto;
import lombok.Getter;
import lombok.Setter;
import pwc.taxtech.atms.vat.entity.OutputVATInvoice;
import pwc.taxtech.atms.vat.entity.OutputVATInvoiceItem;
import pwc.taxtech.atms.vat.entity.OutputVatInvoice;
import pwc.taxtech.atms.vat.entity.OutputVatInvoiceItem;
@Getter
@Setter
public class OutputVATInvoiceDto {
private String invoiceID;
private OutputVATInvoice invoice;
private OutputVATInvoiceItem invoiceItem;
private OutputVatInvoice invoice;
private OutputVatInvoiceItem invoiceItem;
}
atms-api/src/main/java/pwc/taxtech/atms/vat/dao/InputVatInvoiceDao.java
View file @ f74b9e30
......@@ -3,21 +3,20 @@ package pwc.taxtech.atms.vat.dao;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import pwc.taxtech.atms.vat.dao.InputVATInvoiceMapper;
import pwc.taxtech.atms.vat.entity.InputVATInvoice;
import pwc.taxtech.atms.vat.entity.InputVATInvoiceExample;
import pwc.taxtech.atms.vat.entity.InputVatInvoice;
import pwc.taxtech.atms.vat.entity.InputVatTInvoiceExample;
import java.util.List;
@Service
public class InputVatInvoiceDao {
@Autowired
InputVATInvoiceMapper inputVATInvoiceMapper;
InputVatInvoiceMapper inputVATInvoiceMapper;
public List<InputVATInvoice> getInputVATInvoice(Integer period, Integer invoiceType, String checkPass, String scanPass,String notPass) {
InputVATInvoiceExample example = new InputVATInvoiceExample();
InputVATInvoiceExample.Criteria criteria = example.createCriteria();
InputVATInvoiceExample.Criteria criteria1 = example.createCriteria();
public List<InputVatInvoice> getInputVATInvoice(Integer period, Integer invoiceType, String checkPass, String scanPass, String notPass) {
InputVatTInvoiceExample example = new InputVatTInvoiceExample();
InputVatTInvoiceExample.Criteria criteria = example.createCriteria();
InputVatTInvoiceExample.Criteria criteria1 = example.createCriteria();
if (period != null) {
......
atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/InputInvoiceDataImportServiceImpl.java
View file @ f74b9e30
......@@ -13,10 +13,10 @@ import pwc.taxtech.atms.dto.FieldsMapper;
import pwc.taxtech.atms.dto.OperationResultDto;
import pwc.taxtech.atms.dto.vatdto.InputVATInvoiceDto;
import pwc.taxtech.atms.vat.dpo.InputInvoicePreviewQueryParam;
import pwc.taxtech.atms.vat.entity.InputVATInvoice;
import pwc.taxtech.atms.vat.entity.InputVATInvoiceExample;
import pwc.taxtech.atms.vat.entity.InputVATInvoiceItem;
import pwc.taxtech.atms.vat.entity.InputVATInvoiceItemExample;
import pwc.taxtech.atms.vat.entity.InputVatInvoice;
import pwc.taxtech.atms.vat.entity.InputVatTInvoiceExample;
import pwc.taxtech.atms.vat.entity.InputVatInvoiceItem;
import pwc.taxtech.atms.vat.entity.InputVatInvoiceItemExample;
import java.io.StringReader;
import java.util.ArrayList;
......@@ -52,19 +52,19 @@ public class InputInvoiceDataImportServiceImpl extends VatAbstractService {
return qResult;
}
public List<InputVATInvoiceItem> getInputInvoiceItemTreeViewData(String id) {
InputVATInvoiceItemExample example = new InputVATInvoiceItemExample();
public List<InputVatInvoiceItem> getInputInvoiceItemTreeViewData(String id) {
InputVatInvoiceItemExample example = new InputVatInvoiceItemExample();
example.createCriteria().andInputVATInvoiceIDEqualTo(id);
return inputVATInvoiceItemMapper.selectByExample(example);
}
public List<InputVATInvoiceDto> getInputInvoiceList(Integer period) {
InputVATInvoiceExample inputVATInvoiceExample = new InputVATInvoiceExample();
InputVatTInvoiceExample inputVATInvoiceExample = new InputVatTInvoiceExample();
inputVATInvoiceExample.createCriteria().andPeriodIDEqualTo(period.intValue());
List<InputVATInvoice> inputVatEntity = inputVATInvoiceMapper.selectByExample(inputVATInvoiceExample);
inputVatEntity.sort(Comparator.comparing(InputVATInvoice::getInvoiceNumber));
inputVatEntity.sort(Comparator.comparing(InputVATInvoice::getCreateTime));
List<InputVatInvoice> inputVatEntity = inputVATInvoiceMapper.selectByExample(inputVATInvoiceExample);
inputVatEntity.sort(Comparator.comparing(InputVatInvoice::getInvoiceNumber));
inputVatEntity.sort(Comparator.comparing(InputVatInvoice::getCreateTime));
List<InputVATInvoiceDto> result = new ArrayList<>(inputVatEntity.size());
inputVatEntity.forEach(m -> {
......@@ -82,20 +82,20 @@ public class InputInvoiceDataImportServiceImpl extends VatAbstractService {
return result;
}
public List<InputVATInvoiceItem> getInputInvoiceItemList(Integer period) {
InputVATInvoiceItemExample example = new InputVATInvoiceItemExample();
public List<InputVatInvoiceItem> getInputInvoiceItemList(Integer period) {
InputVatInvoiceItemExample example = new InputVatInvoiceItemExample();
example.createCriteria().andPeriodIDEqualTo(period.intValue());
return inputVATInvoiceItemMapper.selectByExample(example);
}
public OperationResultDto ImportInputInvoiceItemData(List<InputVATInvoiceItem> inputInvoiceItemDtoList, int importType, String userID) {
public OperationResultDto ImportInputInvoiceItemData(List<InputVatInvoiceItem> inputInvoiceItemDtoList, int importType, String userID) {
if (inputInvoiceItemDtoList.size() > 0) {
int period = inputInvoiceItemDtoList.get(0).getPeriodID();
inputInvoiceItemDtoList.forEach(item -> {
//导入之前需要将汇总表的主键更新到明细表中,如果找不到汇总信息，则设置为空
InputVATInvoiceExample example = new InputVATInvoiceExample();
InputVatTInvoiceExample example = new InputVatTInvoiceExample();
example.createCriteria().andInvoiceCodeEqualTo(item.getInvoiceCode()).andInvoiceNumberEqualTo(item.getInvoiceNumber());
InputVATInvoice invoiceTotal = inputVATInvoiceMapper.selectByExample(example).stream().findFirst().get();
InputVatInvoice invoiceTotal = inputVATInvoiceMapper.selectByExample(example).stream().findFirst().get();
item.setInputVATInvoiceID(invoiceTotal == null ? "" : invoiceTotal.getID());
item.setID(UUID.randomUUID().toString());
......
atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/OutputInvoiceServiceImpl.java
View file @ f74b9e30
......@@ -19,9 +19,9 @@ import pwc.taxtech.atms.vat.dpo.OutputVATInvoiceInfoDto;
import pwc.taxtech.atms.vat.dpo.QueryOutputDto;
import pwc.taxtech.atms.vat.entity.ImportFile;
import pwc.taxtech.atms.vat.entity.ImportFileExample;
import pwc.taxtech.atms.vat.entity.OutputVATInvoiceExample;
import pwc.taxtech.atms.vat.entity.OutputVATInvoiceItem;
import pwc.taxtech.atms.vat.entity.OutputVATInvoiceItemExample;
import pwc.taxtech.atms.vat.entity.OutputVatInvoiceExample;
import pwc.taxtech.atms.vat.entity.OutputVatInvoiceItem;
import pwc.taxtech.atms.vat.entity.OutputVatInvoiceItemExample;
import java.io.StringReader;
import java.math.BigDecimal;
......@@ -92,7 +92,7 @@ public class OutputInvoiceServiceImpl extends VatAbstractService {
result.addAll(outputVATInvoiceMapper.queryOutputDetailWithItem(period));
if (!result.isEmpty()) {
result.sort(Comparator.comparing(OutputVATInvoiceInfoDto::getInvoiceID));
OutputVATInvoiceExample example = new OutputVATInvoiceExample();
OutputVatInvoiceExample example = new OutputVatInvoiceExample();
example.createCriteria().andPeriodIDEqualTo(period.intValue());
dtoResult.setReturnCode(Long.valueOf(outputVATInvoiceMapper.countByExample(example)).intValue());
}else {
......@@ -106,12 +106,12 @@ public class OutputInvoiceServiceImpl extends VatAbstractService {
private List<OutputVATInvoiceInfoDto> getOutputDetailInfoList(List<OutputVATInvoiceInfoDto> query) {
List<OutputVATInvoiceInfoDto> list = new ArrayList<>();
List<OutputVATInvoiceItem> outItem = outputVATInvoiceItemMapper.selectByExample(new OutputVATInvoiceItemExample());
List<OutputVatInvoiceItem> outItem = outputVATInvoiceItemMapper.selectByExample(new OutputVatInvoiceItemExample());
if (query != null && query.size() > 0) {
for (OutputVATInvoiceInfoDto dto : query) {
List<OutputVATInvoiceItem> itemList = outItem.stream()
List<OutputVatInvoiceItem> itemList = outItem.stream()
.filter(a -> a.getInvoiceID().equals(dto.getInvoiceID()))
.sorted(Comparator.comparing(OutputVATInvoiceItem::getSeqNo))
.sorted(Comparator.comparing(OutputVatInvoiceItem::getSeqNo))
.collect(Collectors.toList());
if (itemList != null && itemList.size() > 0) {
......@@ -265,11 +265,11 @@ public class OutputInvoiceServiceImpl extends VatAbstractService {
}
}
public List<OutputVATInvoiceItem> QueryOutputInvoiceItemList(String invoiceID) {
OutputVATInvoiceItemExample example = new OutputVATInvoiceItemExample();
public List<OutputVatInvoiceItem> QueryOutputInvoiceItemList(String invoiceID) {
OutputVatInvoiceItemExample example = new OutputVatInvoiceItemExample();
example.createCriteria().andInvoiceIDEqualTo(invoiceID);
List<OutputVATInvoiceItem> result=outputVATInvoiceItemMapper.selectByExample(example);
result.stream().sorted(Comparator.comparing(OutputVATInvoiceItem::getSeqNo));
List<OutputVatInvoiceItem> result=outputVATInvoiceItemMapper.selectByExample(example);
result.stream().sorted(Comparator.comparing(OutputVatInvoiceItem::getSeqNo));
return result;
}
}
atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/VatAbstractService.java
View file @ f74b9e30
......@@ -21,15 +21,15 @@ public class VatAbstractService {
@Autowired
public VatStandardAccountMapper vatStandardAccountMapper;
@Autowired
public InputVATInvoiceMapper inputVATInvoiceMapper;
public InputVatInvoiceMapper inputVATInvoiceMapper;
@Autowired
public OutputVATInvoiceMapper outputVATInvoiceMapper;
public OutputVatInvoiceMapper outputVATInvoiceMapper;
@Autowired
public CustomsInvoiceMapper customsInvoiceMapper;
@Autowired
public OutputVATInvoiceItemMapper outputVATInvoiceItemMapper;
public OutputVatInvoiceItemMapper outputVATInvoiceItemMapper;
@Autowired
public InputVATInvoiceItemMapper inputVATInvoiceItemMapper;
public InputVatInvoiceItemMapper inputVATInvoiceItemMapper;
@Autowired
public ProjectMapper projectMapper;
@Autowired
......
atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/report/functions/JXFP.java
View file @ f74b9e30
......@@ -10,7 +10,7 @@ import pwc.taxtech.atms.constant.enums.EnumOperationType;
import pwc.taxtech.atms.constant.enums.FormulaDataSourceDetailType;
import pwc.taxtech.atms.constant.enums.KeyValueConfigResultType;
import pwc.taxtech.atms.dto.vatdto.InputInvoiceDataSourceDto;
import pwc.taxtech.atms.vat.entity.InputVATInvoice;
import pwc.taxtech.atms.vat.entity.InputVatInvoice;
import java.math.BigDecimal;
import java.util.*;
......@@ -74,7 +74,7 @@ public class JXFP extends FunctionBase implements FreeRefFunction {
calendar.add(Calendar.YEAR, 1);
Date endDate = calendar.getTime();
List<InputVATInvoice> inputVATInvoices;
List<InputVatInvoice> inputVATInvoices;
if (authenticationType == 1 && formulaContext.getIsYear()) {
inputVATInvoices = SpringContextUtil.inputVatInvoiceDao.getInputVATInvoice(null, invoiceType,
Constant.InputInvoiceCertificationResult.CheckPass, Constant.InputInvoiceCertificationResult.ScanPass,
......@@ -126,7 +126,7 @@ public class JXFP extends FunctionBase implements FreeRefFunction {
}
List<InputInvoiceDataSourceDto> dataSource = new ArrayList<>();
for (InputVATInvoice x : inputVATInvoices) {
for (InputVatInvoice x : inputVATInvoices) {
InputInvoiceDataSourceDto inputInvoiceDataSourceDto = new InputInvoiceDataSourceDto();
inputInvoiceDataSourceDto.setAmount(FormulaHelper.roundValue(x.getAmount(), KeyValueConfigResultType.Accounting,
null, formulaContext));
......
atms-dao/etc/generator-oracle/vatGeneratorConfig.xml
View file @ f74b9e30
......@@ -301,19 +301,6 @@
<columnOverride column="DATA_SOURCE_TYPE" javaType="java.lang.Integer" />
</table>
<table tableName="ENTERPRISE_ACCOUNT" domainObjectName="EnterpriseAccount">
<property name="useActualColumnNames" value="false"/>
<property name="ignoreQualifiersAtRuntime" value="true"/>
<columnOverride column="ACCT_PROP" javaType="java.lang.Integer" />
<columnOverride column="SUB_PROP" javaType="java.lang.Integer" />
<columnOverride column="ACCT_LEVEL" javaType="java.lang.Integer" />
<columnOverride column="DIRECTION" javaType="java.lang.Integer" />
<columnOverride column="IS_LEAF" javaType="java.lang.Boolean" />
<columnOverride column="IS_ACTIVE" javaType="java.lang.Boolean" />
<columnOverride column="IS_DUMMY" javaType="java.lang.Integer" />
<columnOverride column="IS_IN_VOUCHER" javaType="java.lang.Integer" />
</table>
<table tableName="ENTRIES_CHECK_DETAIL_RESULT" domainObjectName="EntriesCheckDetailResult">
<property name="useActualColumnNames" value="false"/>
<property name="ignoreQualifiersAtRuntime" value="true"/>
......@@ -471,15 +458,6 @@
<columnOverride column="RELATED_CELL_DATA_ID" javaType="java.lang.Long" />
</table>
<table tableName="OPERATION_LOG" domainObjectName="OperationLog">
<property name="useActualColumnNames" value="false"/>
<property name="ignoreQualifiersAtRuntime" value="true"/>
<columnOverride column="MODULE_ID" javaType="java.lang.Integer" />
<columnOverride column="OPERATION_TYPE" javaType="java.lang.Integer" />
<columnOverride column="PERIOD" javaType="java.lang.Integer" />
<columnOverride column="SERVICE_TYPE" javaType="java.lang.Integer" />
</table>
<table tableName="OUTPUT_VAT_INVOICE" domainObjectName="OutputVatInvoice">
<property name="useActualColumnNames" value="false"/>
<property name="ignoreQualifiersAtRuntime" value="true"/>
......@@ -604,18 +582,6 @@
<columnOverride column="PERIOD" javaType="java.lang.Integer" />
</table>
<table tableName="STANDARD_ACCOUNT" domainObjectName="StandardAccount">
<property name="useActualColumnNames" value="false"/>
<property name="ignoreQualifiersAtRuntime" value="true"/>
<columnOverride column="ACCT_PROP" javaType="java.lang.Integer" />
<columnOverride column="SUB_PROP" javaType="java.lang.Integer" />
<columnOverride column="ACCT_LEVEL" javaType="java.lang.Integer" />
<columnOverride column="DIRECTION" javaType="java.lang.Integer" />
<columnOverride column="IS_LEAF" javaType="java.lang.Boolean" />
<columnOverride column="RULE_TYPE" javaType="java.lang.Integer" />
<columnOverride column="IS_ACTIVE" javaType="java.lang.Boolean" />
</table>
<table tableName="VALIDATION_INFO" domainObjectName="ValidationInfo">
<property name="useActualColumnNames" value="false"/>
<property name="ignoreQualifiersAtRuntime" value="true"/>
......
atms-dao/src/main/java/pwc/taxtech/atms/vat/dao/InputVATInvoiceItemMapper.java
View file @ f74b9e30
......@@ -5,18 +5,18 @@ import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.session.RowBounds;
import pwc.taxtech.atms.MyVatMapper;
import pwc.taxtech.atms.vat.entity.InputVATInvoiceItem;
import pwc.taxtech.atms.vat.entity.InputVATInvoiceItemExample;
import pwc.taxtech.atms.vat.entity.InputVatInvoiceItem;
import pwc.taxtech.atms.vat.entity.InputVatInvoiceItemExample;
@Mapper
public interface InputVATInvoiceItemMapper extends MyVatMapper {
public interface InputVatInvoiceItemMapper extends MyVatMapper {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table InputVATInvoiceItem
*
* @mbg.generated
*/
long countByExample(InputVATInvoiceItemExample example);
long countByExample(InputVatInvoiceItemExample example);
/**
* This method was generated by MyBatis Generator.
......@@ -24,7 +24,7 @@ public interface InputVATInvoiceItemMapper extends MyVatMapper {
*
* @mbg.generated
*/
int deleteByExample(InputVATInvoiceItemExample example);
int deleteByExample(InputVatInvoiceItemExample example);
/**
* This method was generated by MyBatis Generator.
......@@ -40,7 +40,7 @@ public interface InputVATInvoiceItemMapper extends MyVatMapper {
*
* @mbg.generated
*/
int insert(InputVATInvoiceItem record);
int insert(InputVatInvoiceItem record);
/**
* This method was generated by MyBatis Generator.
......@@ -48,7 +48,7 @@ public interface InputVATInvoiceItemMapper extends MyVatMapper {
*
* @mbg.generated
*/
int insertSelective(InputVATInvoiceItem record);
int insertSelective(InputVatInvoiceItem record);
/**
* This method was generated by MyBatis Generator.
......@@ -56,7 +56,7 @@ public interface InputVATInvoiceItemMapper extends MyVatMapper {
*
* @mbg.generated
*/
List<InputVATInvoiceItem> selectByExampleWithRowbounds(InputVATInvoiceItemExample example, RowBounds rowBounds);
List<InputVatInvoiceItem> selectByExampleWithRowbounds(InputVatInvoiceItemExample example, RowBounds rowBounds);
/**
* This method was generated by MyBatis Generator.
......@@ -64,7 +64,7 @@ public interface InputVATInvoiceItemMapper extends MyVatMapper {
*
* @mbg.generated
*/
List<InputVATInvoiceItem> selectByExample(InputVATInvoiceItemExample example);
List<InputVatInvoiceItem> selectByExample(InputVatInvoiceItemExample example);
/**
* This method was generated by MyBatis Generator.
......@@ -72,7 +72,7 @@ public interface InputVATInvoiceItemMapper extends MyVatMapper {
*
* @mbg.generated
*/
InputVATInvoiceItem selectByPrimaryKey(String ID);
InputVatInvoiceItem selectByPrimaryKey(String ID);
/**
* This method was generated by MyBatis Generator.
......@@ -80,7 +80,7 @@ public interface InputVATInvoiceItemMapper extends MyVatMapper {
*
* @mbg.generated
*/
int updateByExampleSelective(@Param("record") InputVATInvoiceItem record, @Param("example") InputVATInvoiceItemExample example);
int updateByExampleSelective(@Param("record") InputVatInvoiceItem record, @Param("example") InputVatInvoiceItemExample example);
/**
* This method was generated by MyBatis Generator.
......@@ -88,7 +88,7 @@ public interface InputVATInvoiceItemMapper extends MyVatMapper {
*
* @mbg.generated
*/
int updateByExample(@Param("record") InputVATInvoiceItem record, @Param("example") InputVATInvoiceItemExample example);
int updateByExample(@Param("record") InputVatInvoiceItem record, @Param("example") InputVatInvoiceItemExample example);
/**
* This method was generated by MyBatis Generator.
......@@ -96,7 +96,7 @@ public interface InputVATInvoiceItemMapper extends MyVatMapper {
*
* @mbg.generated
*/
int updateByPrimaryKeySelective(InputVATInvoiceItem record);
int updateByPrimaryKeySelective(InputVatInvoiceItem record);
/**
* This method was generated by MyBatis Generator.
......@@ -104,5 +104,5 @@ public interface InputVATInvoiceItemMapper extends MyVatMapper {
*
* @mbg.generated
*/
int updateByPrimaryKey(InputVATInvoiceItem record);
int updateByPrimaryKey(InputVatInvoiceItem record);
}
\ No newline at end of file
atms-dao/src/main/java/pwc/taxtech/atms/vat/dao/InputVATInvoiceMapper.java
View file @ f74b9e30
......@@ -9,18 +9,18 @@ import pwc.taxtech.atms.vat.dpo.CellInvoiceDto;
import pwc.taxtech.atms.vat.dpo.InputInvoicePreviewQueryParam;
import pwc.taxtech.atms.vat.dpo.InputVATInvoiceItemExtendDto;
import pwc.taxtech.atms.vat.dpo.InputVATInvoiceResultDto;
import pwc.taxtech.atms.vat.entity.InputVATInvoice;
import pwc.taxtech.atms.vat.entity.InputVATInvoiceExample;
import pwc.taxtech.atms.vat.entity.InputVatInvoice;
import pwc.taxtech.atms.vat.entity.InputVatTInvoiceExample;
@Mapper
public interface InputVATInvoiceMapper extends MyVatMapper {
public interface InputVatInvoiceMapper extends MyVatMapper {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table InputVATInvoice
*
* @mbg.generated
*/
long countByExample(InputVATInvoiceExample example);
long countByExample(InputVatTInvoiceExample example);
/**
* This method was generated by MyBatis Generator.
......@@ -28,7 +28,7 @@ public interface InputVATInvoiceMapper extends MyVatMapper {
*
* @mbg.generated
*/
int deleteByExample(InputVATInvoiceExample example);
int deleteByExample(InputVatTInvoiceExample example);
/**
* This method was generated by MyBatis Generator.
......@@ -44,7 +44,7 @@ public interface InputVATInvoiceMapper extends MyVatMapper {
*
* @mbg.generated
*/
int insert(InputVATInvoice record);
int insert(InputVatInvoice record);
/**
* This method was generated by MyBatis Generator.
......@@ -52,7 +52,7 @@ public interface InputVATInvoiceMapper extends MyVatMapper {
*
* @mbg.generated
*/
int insertSelective(InputVATInvoice record);
int insertSelective(InputVatInvoice record);
/**
* This method was generated by MyBatis Generator.
......@@ -60,7 +60,7 @@ public interface InputVATInvoiceMapper extends MyVatMapper {
*
* @mbg.generated
*/
List<InputVATInvoice> selectByExampleWithRowbounds(InputVATInvoiceExample example, RowBounds rowBounds);
List<InputVatInvoice> selectByExampleWithRowbounds(InputVatTInvoiceExample example, RowBounds rowBounds);
/**
* This method was generated by MyBatis Generator.
......@@ -68,7 +68,7 @@ public interface InputVATInvoiceMapper extends MyVatMapper {
*
* @mbg.generated
*/
List<InputVATInvoice> selectByExample(InputVATInvoiceExample example);
List<InputVatInvoice> selectByExample(InputVatTInvoiceExample example);
/**
* This method was generated by MyBatis Generator.
......@@ -76,7 +76,7 @@ public interface InputVATInvoiceMapper extends MyVatMapper {
*
* @mbg.generated
*/
InputVATInvoice selectByPrimaryKey(String ID);
InputVatInvoice selectByPrimaryKey(String ID);
/**
* This method was generated by MyBatis Generator.
......@@ -84,7 +84,7 @@ public interface InputVATInvoiceMapper extends MyVatMapper {
*
* @mbg.generated
*/
int updateByExampleSelective(@Param("record") InputVATInvoice record, @Param("example") InputVATInvoiceExample example);
int updateByExampleSelective(@Param("record") InputVatInvoice record, @Param("example") InputVatTInvoiceExample example);
/**
* This method was generated by MyBatis Generator.
......@@ -92,7 +92,7 @@ public interface InputVATInvoiceMapper extends MyVatMapper {
*
* @mbg.generated
*/
int updateByExample(@Param("record") InputVATInvoice record, @Param("example") InputVATInvoiceExample example);
int updateByExample(@Param("record") InputVatInvoice record, @Param("example") InputVatTInvoiceExample example);
/**
* This method was generated by MyBatis Generator.
......@@ -100,7 +100,7 @@ public interface InputVATInvoiceMapper extends MyVatMapper {
*
* @mbg.generated
*/
int updateByPrimaryKeySelective(InputVATInvoice record);
int updateByPrimaryKeySelective(InputVatInvoice record);
/**
* This method was generated by MyBatis Generator.
......@@ -108,11 +108,11 @@ public interface InputVATInvoiceMapper extends MyVatMapper {
*
* @mbg.generated
*/
int updateByPrimaryKey(InputVATInvoice record);
int updateByPrimaryKey(InputVatInvoice record);
long getInputVATInvoiceCountByCondition(@Param("paras") InputInvoicePreviewQueryParam param);
List<InputVATInvoice> getInputVATInvoiceCountByConditionWithPaging(@Param("paras") InputInvoicePreviewQueryParam param,@Param("limitFrom") int limitFrom);
List<InputVatInvoice> getInputVATInvoiceCountByConditionWithPaging(@Param("paras") InputInvoicePreviewQueryParam param, @Param("limitFrom") int limitFrom);
List<InputVATInvoiceResultDto> getInputVATInvoiceResultDto(@Param("dbName")String dbName);
......
atms-dao/src/main/java/pwc/taxtech/atms/vat/dao/OutputVATInvoiceItemMapper.java
View file @ f74b9e30
......@@ -5,18 +5,18 @@ import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.session.RowBounds;
import pwc.taxtech.atms.MyVatMapper;
import pwc.taxtech.atms.vat.entity.OutputVATInvoiceItem;
import pwc.taxtech.atms.vat.entity.OutputVATInvoiceItemExample;
import pwc.taxtech.atms.vat.entity.OutputVatInvoiceItem;
import pwc.taxtech.atms.vat.entity.OutputVatInvoiceItemExample;
@Mapper
public interface OutputVATInvoiceItemMapper extends MyVatMapper {
public interface OutputVatInvoiceItemMapper extends MyVatMapper {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table OutputVATInvoiceItem
*
* @mbg.generated
*/
long countByExample(OutputVATInvoiceItemExample example);
long countByExample(OutputVatInvoiceItemExample example);
/**
* This method was generated by MyBatis Generator.
......@@ -24,7 +24,7 @@ public interface OutputVATInvoiceItemMapper extends MyVatMapper {
*
* @mbg.generated
*/
int deleteByExample(OutputVATInvoiceItemExample example);
int deleteByExample(OutputVatInvoiceItemExample example);
/**
* This method was generated by MyBatis Generator.
......@@ -40,7 +40,7 @@ public interface OutputVATInvoiceItemMapper extends MyVatMapper {
*
* @mbg.generated
*/
int insert(OutputVATInvoiceItem record);
int insert(OutputVatInvoiceItem record);
/**
* This method was generated by MyBatis Generator.
......@@ -48,7 +48,7 @@ public interface OutputVATInvoiceItemMapper extends MyVatMapper {
*
* @mbg.generated
*/
int insertSelective(OutputVATInvoiceItem record);
int insertSelective(OutputVatInvoiceItem record);
/**
* This method was generated by MyBatis Generator.
......@@ -56,7 +56,7 @@ public interface OutputVATInvoiceItemMapper extends MyVatMapper {
*
* @mbg.generated
*/
List<OutputVATInvoiceItem> selectByExampleWithRowbounds(OutputVATInvoiceItemExample example, RowBounds rowBounds);
List<OutputVatInvoiceItem> selectByExampleWithRowbounds(OutputVatInvoiceItemExample example, RowBounds rowBounds);
/**
* This method was generated by MyBatis Generator.
......@@ -64,7 +64,7 @@ public interface OutputVATInvoiceItemMapper extends MyVatMapper {
*
* @mbg.generated
*/
List<OutputVATInvoiceItem> selectByExample(OutputVATInvoiceItemExample example);
List<OutputVatInvoiceItem> selectByExample(OutputVatInvoiceItemExample example);
/**
* This method was generated by MyBatis Generator.
......@@ -72,7 +72,7 @@ public interface OutputVATInvoiceItemMapper extends MyVatMapper {
*
* @mbg.generated
*/
OutputVATInvoiceItem selectByPrimaryKey(String itemID);
OutputVatInvoiceItem selectByPrimaryKey(String itemID);
/**
* This method was generated by MyBatis Generator.
......@@ -80,7 +80,7 @@ public interface OutputVATInvoiceItemMapper extends MyVatMapper {
*
* @mbg.generated
*/
int updateByExampleSelective(@Param("record") OutputVATInvoiceItem record, @Param("example") OutputVATInvoiceItemExample example);
int updateByExampleSelective(@Param("record") OutputVatInvoiceItem record, @Param("example") OutputVatInvoiceItemExample example);
/**
* This method was generated by MyBatis Generator.
......@@ -88,7 +88,7 @@ public interface OutputVATInvoiceItemMapper extends MyVatMapper {
*
* @mbg.generated
*/
int updateByExample(@Param("record") OutputVATInvoiceItem record, @Param("example") OutputVATInvoiceItemExample example);
int updateByExample(@Param("record") OutputVatInvoiceItem record, @Param("example") OutputVatInvoiceItemExample example);
/**
* This method was generated by MyBatis Generator.
......@@ -96,7 +96,7 @@ public interface OutputVATInvoiceItemMapper extends MyVatMapper {
*
* @mbg.generated
*/
int updateByPrimaryKeySelective(OutputVATInvoiceItem record);
int updateByPrimaryKeySelective(OutputVatInvoiceItem record);
/**
* This method was generated by MyBatis Generator.
......@@ -104,5 +104,5 @@ public interface OutputVATInvoiceItemMapper extends MyVatMapper {
*
* @mbg.generated
*/
int updateByPrimaryKey(OutputVATInvoiceItem record);
int updateByPrimaryKey(OutputVatInvoiceItem record);
}
\ No newline at end of file
atms-dao/src/main/java/pwc/taxtech/atms/vat/dao/OutputVATInvoiceMapper.java
View file @ f74b9e30
......@@ -10,18 +10,18 @@ import pwc.taxtech.atms.vat.dpo.OutputInvoiceDataSourceDto;
import pwc.taxtech.atms.vat.dpo.OutputVATInvoiceDto;
import pwc.taxtech.atms.vat.dpo.OutputVATInvoiceInfoDto;
import pwc.taxtech.atms.vat.dpo.QueryOutputDto;
import pwc.taxtech.atms.vat.entity.OutputVATInvoice;
import pwc.taxtech.atms.vat.entity.OutputVATInvoiceExample;
import pwc.taxtech.atms.vat.entity.OutputVatInvoice;
import pwc.taxtech.atms.vat.entity.OutputVatInvoiceExample;
@Mapper
public interface OutputVATInvoiceMapper extends MyVatMapper {
public interface OutputVatInvoiceMapper extends MyVatMapper {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table OutputVATInvoice
*
* @mbg.generated
*/
long countByExample(OutputVATInvoiceExample example);
long countByExample(OutputVatInvoiceExample example);
/**
* This method was generated by MyBatis Generator.
......@@ -29,7 +29,7 @@ public interface OutputVATInvoiceMapper extends MyVatMapper {
*
* @mbg.generated
*/
int deleteByExample(OutputVATInvoiceExample example);
int deleteByExample(OutputVatInvoiceExample example);
/**
* This method was generated by MyBatis Generator.
......@@ -45,7 +45,7 @@ public interface OutputVATInvoiceMapper extends MyVatMapper {
*
* @mbg.generated
*/
int insert(OutputVATInvoice record);
int insert(OutputVatInvoice record);
/**
* This method was generated by MyBatis Generator.
......@@ -53,7 +53,7 @@ public interface OutputVATInvoiceMapper extends MyVatMapper {
*
* @mbg.generated
*/
int insertSelective(OutputVATInvoice record);
int insertSelective(OutputVatInvoice record);
/**
* This method was generated by MyBatis Generator.
......@@ -61,7 +61,7 @@ public interface OutputVATInvoiceMapper extends MyVatMapper {
*
* @mbg.generated
*/
List<OutputVATInvoice> selectByExampleWithRowbounds(OutputVATInvoiceExample example, RowBounds rowBounds);
List<OutputVatInvoice> selectByExampleWithRowbounds(OutputVatInvoiceExample example, RowBounds rowBounds);
/**
* This method was generated by MyBatis Generator.
......@@ -69,7 +69,7 @@ public interface OutputVATInvoiceMapper extends MyVatMapper {
*
* @mbg.generated
*/
List<OutputVATInvoice> selectByExample(OutputVATInvoiceExample example);
List<OutputVatInvoice> selectByExample(OutputVatInvoiceExample example);
/**
* This method was generated by MyBatis Generator.
......@@ -77,7 +77,7 @@ public interface OutputVATInvoiceMapper extends MyVatMapper {
*
* @mbg.generated
*/
OutputVATInvoice selectByPrimaryKey(String invoiceID);
OutputVatInvoice selectByPrimaryKey(String invoiceID);
/**
* This method was generated by MyBatis Generator.
......@@ -85,7 +85,7 @@ public interface OutputVATInvoiceMapper extends MyVatMapper {
*
* @mbg.generated
*/
int updateByExampleSelective(@Param("record") OutputVATInvoice record, @Param("example") OutputVATInvoiceExample example);
int updateByExampleSelective(@Param("record") OutputVatInvoice record, @Param("example") OutputVatInvoiceExample example);
/**
* This method was generated by MyBatis Generator.
......@@ -93,7 +93,7 @@ public interface OutputVATInvoiceMapper extends MyVatMapper {
*
* @mbg.generated
*/
int updateByExample(@Param("record") OutputVATInvoice record, @Param("example") OutputVATInvoiceExample example);
int updateByExample(@Param("record") OutputVatInvoice record, @Param("example") OutputVatInvoiceExample example);
/**
* This method was generated by MyBatis Generator.
......@@ -101,7 +101,7 @@ public interface OutputVATInvoiceMapper extends MyVatMapper {
*
* @mbg.generated
*/
int updateByPrimaryKeySelective(OutputVATInvoice record);
int updateByPrimaryKeySelective(OutputVatInvoice record);
/**
* This method was generated by MyBatis Generator.
......@@ -109,7 +109,7 @@ public interface OutputVATInvoiceMapper extends MyVatMapper {
*
* @mbg.generated
*/
int updateByPrimaryKey(OutputVATInvoice record);
int updateByPrimaryKey(OutputVatInvoice record);
List<OutputVATInvoiceInfoDto> selectOutputVATInvoiceInfoLeftJoinItem(@Param("queryDto")QueryOutputDto queryDto);
......
atms-dao/src/main/java/pwc/taxtech/atms/vat/dpo/InputVATInvoiceResultDto.java
View file @ f74b9e30
package pwc.taxtech.atms.vat.dpo;
import pwc.taxtech.atms.vat.entity.GoodsMapping;
import pwc.taxtech.atms.vat.entity.InputVATInvoice;
import pwc.taxtech.atms.vat.entity.InputVATInvoiceItem;
import pwc.taxtech.atms.vat.entity.InputVatInvoice;
import pwc.taxtech.atms.vat.entity.InputVatInvoiceItem;
public class InputVATInvoiceResultDto {
private String invoiceID;
private InputVATInvoice inputVATInvoice;
private InputVATInvoiceItem inputVATInvoiceItem;
private InputVatInvoice inputVATInvoice;
private InputVatInvoiceItem inputVATInvoiceItem;
private GoodsMapping goodsMapping;
public String getInvoiceID() {
......@@ -18,19 +18,19 @@ public class InputVATInvoiceResultDto {
this.invoiceID = invoiceID;
}
public InputVATInvoice getInputVATInvoice() {
public InputVatInvoice getInputVATInvoice() {
return inputVATInvoice;
}
public void setInputVATInvoice(InputVATInvoice inputVATInvoice) {
public void setInputVATInvoice(InputVatInvoice inputVATInvoice) {
this.inputVATInvoice = inputVATInvoice;
}
public InputVATInvoiceItem getInputVATInvoiceItem() {
public InputVatInvoiceItem getInputVATInvoiceItem() {
return inputVATInvoiceItem;
}
public void setInputVATInvoiceItem(InputVATInvoiceItem inputVATInvoiceItem) {
public void setInputVATInvoiceItem(InputVatInvoiceItem inputVATInvoiceItem) {
this.inputVATInvoiceItem = inputVATInvoiceItem;
}
......
atms-dao/src/main/java/pwc/taxtech/atms/vat/dpo/OutputVATInvoiceDto.java
View file @ f74b9e30
package pwc.taxtech.atms.vat.dpo;
import pwc.taxtech.atms.vat.entity.OutputVATInvoice;
import pwc.taxtech.atms.vat.entity.OutputVATInvoiceItem;
import pwc.taxtech.atms.vat.entity.OutputVatInvoice;
import pwc.taxtech.atms.vat.entity.OutputVatInvoiceItem;
public class OutputVATInvoiceDto {
private String invoiceID;
private OutputVATInvoice invoice;
private OutputVATInvoiceItem invoiceItem;
private OutputVatInvoice invoice;
private OutputVatInvoiceItem invoiceItem;
public String getInvoiceID() {
return invoiceID;
......@@ -16,19 +16,19 @@ public class OutputVATInvoiceDto {
this.invoiceID = invoiceID;
}
public OutputVATInvoice getInvoice() {
public OutputVatInvoice getInvoice() {
return invoice;
}
public void setInvoice(OutputVATInvoice invoice) {
public void setInvoice(OutputVatInvoice invoice) {
this.invoice = invoice;
}
public OutputVATInvoiceItem getInvoiceItem() {
public OutputVatInvoiceItem getInvoiceItem() {
return invoiceItem;
}
public void setInvoiceItem(OutputVATInvoiceItem invoiceItem) {
public void setInvoiceItem(OutputVatInvoiceItem invoiceItem) {
this.invoiceItem = invoiceItem;
}
}
atms-dao/src/main/java/pwc/taxtech/atms/vat/entity/InputVATInvoice.java
View file @ f74b9e30
......@@ -11,7 +11,7 @@ import java.util.Date;
*
* @mbg.generated do_not_delete_during_merge
*/
public class InputVATInvoice implements Serializable {
public class InputVatInvoice implements Serializable {
/**
*
* This field was generated by MyBatis Generator.
......
atms-dao/src/main/java/pwc/taxtech/atms/vat/entity/InputVATInvoiceItem.java
View file @ f74b9e30
......@@ -11,7 +11,7 @@ import java.util.Date;
*
* @mbg.generated do_not_delete_during_merge
*/
public class InputVATInvoiceItem implements Serializable {
public class InputVatInvoiceItem implements Serializable {
/**
*
* This field was generated by MyBatis Generator.
......
atms-dao/src/main/java/pwc/taxtech/atms/vat/entity/InputVATInvoiceItemExample.java
View file @ f74b9e30
......@@ -5,7 +5,7 @@ import java.util.ArrayList;
import java.util.Date;
import java.util.List;
public class InputVATInvoiceItemExample {
public class InputVatInvoiceItemExample {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table InputVATInvoiceItem
......@@ -36,7 +36,7 @@ public class InputVATInvoiceItemExample {
*
* @mbg.generated
*/
public InputVATInvoiceItemExample() {
public InputVatInvoiceItemExample() {
oredCriteria = new ArrayList<Criteria>();
}
......
atms-dao/src/main/java/pwc/taxtech/atms/vat/entity/InputVATInvoiceExample.java → atms-dao/src/main/java/pwc/taxtech/atms/vat/entity/InputVatTInvoiceExample.java
View file @ f74b9e30
......@@ -5,7 +5,7 @@ import java.util.ArrayList;
import java.util.Date;
import java.util.List;
public class InputVATInvoiceExample {
public class InputVatTInvoiceExample {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table InputVATInvoice
......@@ -36,7 +36,7 @@ public class InputVATInvoiceExample {
*
* @mbg.generated
*/
public InputVATInvoiceExample() {
public InputVatTInvoiceExample() {
oredCriteria = new ArrayList<Criteria>();
}
......
atms-dao/src/main/java/pwc/taxtech/atms/vat/entity/OutputVATInvoice.java
View file @ f74b9e30
......@@ -10,7 +10,7 @@ import java.util.Date;
*
* @mbg.generated do_not_delete_during_merge
*/
public class OutputVATInvoice implements Serializable {
public class OutputVatInvoice implements Serializable {
/**
*
* This field was generated by MyBatis Generator.
......
atms-dao/src/main/java/pwc/taxtech/atms/vat/entity/OutputVATInvoiceExample.java
View file @ f74b9e30
......@@ -4,7 +4,7 @@ import java.util.ArrayList;
import java.util.Date;
import java.util.List;
public class OutputVATInvoiceExample {
public class OutputVatInvoiceExample {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table OutputVATInvoice
......@@ -35,7 +35,7 @@ public class OutputVATInvoiceExample {
*
* @mbg.generated
*/
public OutputVATInvoiceExample() {
public OutputVatInvoiceExample() {
oredCriteria = new ArrayList<Criteria>();
}
......
atms-dao/src/main/java/pwc/taxtech/atms/vat/entity/OutputVATInvoiceItem.java
View file @ f74b9e30
......@@ -11,7 +11,7 @@ import java.util.Date;
*
* @mbg.generated do_not_delete_during_merge
*/
public class OutputVATInvoiceItem implements Serializable {
public class OutputVatInvoiceItem implements Serializable {
/**
*
* This field was generated by MyBatis Generator.
......
atms-dao/src/main/java/pwc/taxtech/atms/vat/entity/OutputVATInvoiceItemExample.java
View file @ f74b9e30
......@@ -5,7 +5,7 @@ import java.util.ArrayList;
import java.util.Date;
import java.util.List;
public class OutputVATInvoiceItemExample {
public class OutputVatInvoiceItemExample {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table OutputVATInvoiceItem
......@@ -36,7 +36,7 @@ public class OutputVATInvoiceItemExample {
*
* @mbg.generated
*/
public OutputVATInvoiceItemExample() {
public OutputVatInvoiceItemExample() {
oredCriteria = new ArrayList<Criteria>();
}
......
atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/InputVATInvoiceItemMapper.xml
View file @ f74b9e30
<?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.vat.dao.InputVATInvoiceItemMapper">
<resultMap id="BaseResultMap" type="pwc.taxtech.atms.vat.entity.InputVATInvoiceItem">
<mapper namespace="pwc.taxtech.atms.vat.dao.InputVatInvoiceItemMapper">
<resultMap id="BaseResultMap" type="pwc.taxtech.atms.vat.entity.InputVatInvoiceItem">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
......@@ -93,7 +93,7 @@
ID, InputVATInvoiceID, PeriodID, InvoiceCode, InvoiceNumber, Amount, TaxAmount, TaxRate,
ProductionName, CreatorID, CreateTime, ProductionCode
</sql>
<select id="selectByExample" parameterType="pwc.taxtech.atms.vat.entity.InputVATInvoiceItemExample" resultMap="BaseResultMap">
<select id="selectByExample" parameterType="pwc.taxtech.atms.vat.entity.InputVatInvoiceItemExample" resultMap="BaseResultMap">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
......@@ -129,7 +129,7 @@
delete from InputVATInvoiceItem
where ID = #{ID,jdbcType=VARCHAR}
</delete>
<delete id="deleteByExample" parameterType="pwc.taxtech.atms.vat.entity.InputVATInvoiceItemExample">
<delete id="deleteByExample" parameterType="pwc.taxtech.atms.vat.entity.InputVatInvoiceItemExample">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
......@@ -139,7 +139,7 @@
<include refid="Example_Where_Clause" />
</if>
</delete>
<insert id="insert" parameterType="pwc.taxtech.atms.vat.entity.InputVATInvoiceItem">
<insert id="insert" parameterType="pwc.taxtech.atms.vat.entity.InputVatInvoiceItem">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
......@@ -155,7 +155,7 @@
#{creatorID,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{productionCode,jdbcType=VARCHAR}
)
</insert>
<insert id="insertSelective" parameterType="pwc.taxtech.atms.vat.entity.InputVATInvoiceItem">
<insert id="insertSelective" parameterType="pwc.taxtech.atms.vat.entity.InputVatInvoiceItem">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
......@@ -238,7 +238,7 @@
</if>
</trim>
</insert>
<select id="countByExample" parameterType="pwc.taxtech.atms.vat.entity.InputVATInvoiceItemExample" resultType="java.lang.Long">
<select id="countByExample" parameterType="pwc.taxtech.atms.vat.entity.InputVatInvoiceItemExample" resultType="java.lang.Long">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
......@@ -318,7 +318,7 @@
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByPrimaryKeySelective" parameterType="pwc.taxtech.atms.vat.entity.InputVATInvoiceItem">
<update id="updateByPrimaryKeySelective" parameterType="pwc.taxtech.atms.vat.entity.InputVatInvoiceItem">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
......@@ -361,7 +361,7 @@
</set>
where ID = #{ID,jdbcType=VARCHAR}
</update>
<update id="updateByPrimaryKey" parameterType="pwc.taxtech.atms.vat.entity.InputVATInvoiceItem">
<update id="updateByPrimaryKey" parameterType="pwc.taxtech.atms.vat.entity.InputVatInvoiceItem">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
......@@ -380,7 +380,7 @@
ProductionCode = #{productionCode,jdbcType=VARCHAR}
where ID = #{ID,jdbcType=VARCHAR}
</update>
<select id="selectByExampleWithRowbounds" parameterType="pwc.taxtech.atms.vat.entity.InputVATInvoiceItemExample" resultMap="BaseResultMap">
<select id="selectByExampleWithRowbounds" parameterType="pwc.taxtech.atms.vat.entity.InputVatInvoiceItemExample" resultMap="BaseResultMap">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
......
atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/InputVATInvoiceMapper.xml
View file @ f74b9e30
<?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.vat.dao.InputVATInvoiceMapper">
<resultMap id="BaseResultMap" type="pwc.taxtech.atms.vat.entity.InputVATInvoice">
<mapper namespace="pwc.taxtech.atms.vat.dao.InputVatInvoiceMapper">
<resultMap id="BaseResultMap" type="pwc.taxtech.atms.vat.entity.InputVatInvoice">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
......@@ -98,7 +98,7 @@
InvoiceType, CertificationResult, CertificationDate, CreatorID, CreateTime, `Status`,
PartAccntedPeriod, AccntedPeriod
</sql>
<select id="selectByExample" parameterType="pwc.taxtech.atms.vat.entity.InputVATInvoiceExample" resultMap="BaseResultMap">
<select id="selectByExample" parameterType="pwc.taxtech.atms.vat.entity.InputVatTInvoiceExample" resultMap="BaseResultMap">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
......@@ -134,7 +134,7 @@
delete from InputVATInvoice
where ID = #{ID,jdbcType=VARCHAR}
</delete>
<delete id="deleteByExample" parameterType="pwc.taxtech.atms.vat.entity.InputVATInvoiceExample">
<delete id="deleteByExample" parameterType="pwc.taxtech.atms.vat.entity.InputVatTInvoiceExample">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
......@@ -144,7 +144,7 @@
<include refid="Example_Where_Clause" />
</if>
</delete>
<insert id="insert" parameterType="pwc.taxtech.atms.vat.entity.InputVATInvoice">
<insert id="insert" parameterType="pwc.taxtech.atms.vat.entity.InputVatInvoice">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
......@@ -162,7 +162,7 @@
#{creatorID,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{status,jdbcType=INTEGER},
#{partAccntedPeriod,jdbcType=INTEGER}, #{accntedPeriod,jdbcType=INTEGER})
</insert>
<insert id="insertSelective" parameterType="pwc.taxtech.atms.vat.entity.InputVATInvoice">
<insert id="insertSelective" parameterType="pwc.taxtech.atms.vat.entity.InputVatInvoice">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
......@@ -269,7 +269,7 @@
</if>
</trim>
</insert>
<select id="countByExample" parameterType="pwc.taxtech.atms.vat.entity.InputVATInvoiceExample" resultType="java.lang.Long">
<select id="countByExample" parameterType="pwc.taxtech.atms.vat.entity.InputVatTInvoiceExample" resultType="java.lang.Long">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
......@@ -365,7 +365,7 @@
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByPrimaryKeySelective" parameterType="pwc.taxtech.atms.vat.entity.InputVATInvoice">
<update id="updateByPrimaryKeySelective" parameterType="pwc.taxtech.atms.vat.entity.InputVatInvoice">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
......@@ -420,7 +420,7 @@
</set>
where ID = #{ID,jdbcType=VARCHAR}
</update>
<update id="updateByPrimaryKey" parameterType="pwc.taxtech.atms.vat.entity.InputVATInvoice">
<update id="updateByPrimaryKey" parameterType="pwc.taxtech.atms.vat.entity.InputVatInvoice">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
......@@ -443,7 +443,7 @@
AccntedPeriod = #{accntedPeriod,jdbcType=INTEGER}
where ID = #{ID,jdbcType=VARCHAR}
</update>
<select id="selectByExampleWithRowbounds" parameterType="pwc.taxtech.atms.vat.entity.InputVATInvoiceExample" resultMap="BaseResultMap">
<select id="selectByExampleWithRowbounds" parameterType="pwc.taxtech.atms.vat.entity.InputVatTInvoiceExample" resultMap="BaseResultMap">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
......
atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/OutputVATInvoiceItemMapper.xml
View file @ f74b9e30
<?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.vat.dao.OutputVATInvoiceItemMapper">
<resultMap id="BaseResultMap" type="pwc.taxtech.atms.vat.entity.OutputVATInvoiceItem">
<mapper namespace="pwc.taxtech.atms.vat.dao.OutputVatInvoiceItemMapper">
<resultMap id="BaseResultMap" type="pwc.taxtech.atms.vat.entity.OutputVatInvoiceItem">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
......@@ -99,7 +99,7 @@
Quantity, UnitPrice, Amount, TaxRate, TaxAmount, SeqNo, TaxClassCode, CreatorID,
CreateTime, PeriodID
</sql>
<select id="selectByExample" parameterType="pwc.taxtech.atms.vat.entity.OutputVATInvoiceItemExample" resultMap="BaseResultMap">
<select id="selectByExample" parameterType="pwc.taxtech.atms.vat.entity.OutputVatInvoiceItemExample" resultMap="BaseResultMap">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
......@@ -135,7 +135,7 @@
delete from OutputVATInvoiceItem
where ItemID = #{itemID,jdbcType=VARCHAR}
</delete>
<delete id="deleteByExample" parameterType="pwc.taxtech.atms.vat.entity.OutputVATInvoiceItemExample">
<delete id="deleteByExample" parameterType="pwc.taxtech.atms.vat.entity.OutputVatInvoiceItemExample">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
......@@ -145,7 +145,7 @@
<include refid="Example_Where_Clause" />
</if>
</delete>
<insert id="insert" parameterType="pwc.taxtech.atms.vat.entity.OutputVATInvoiceItem">
<insert id="insert" parameterType="pwc.taxtech.atms.vat.entity.OutputVatInvoiceItem">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
......@@ -163,7 +163,7 @@
#{seqNo,jdbcType=INTEGER}, #{taxClassCode,jdbcType=VARCHAR}, #{creatorID,jdbcType=VARCHAR},
#{createTime,jdbcType=TIMESTAMP}, #{periodID,jdbcType=INTEGER})
</insert>
<insert id="insertSelective" parameterType="pwc.taxtech.atms.vat.entity.OutputVATInvoiceItem">
<insert id="insertSelective" parameterType="pwc.taxtech.atms.vat.entity.OutputVatInvoiceItem">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
......@@ -276,7 +276,7 @@
</if>
</trim>
</insert>
<select id="countByExample" parameterType="pwc.taxtech.atms.vat.entity.OutputVATInvoiceItemExample" resultType="java.lang.Long">
<select id="countByExample" parameterType="pwc.taxtech.atms.vat.entity.OutputVatInvoiceItemExample" resultType="java.lang.Long">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
......@@ -376,7 +376,7 @@
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByPrimaryKeySelective" parameterType="pwc.taxtech.atms.vat.entity.OutputVATInvoiceItem">
<update id="updateByPrimaryKeySelective" parameterType="pwc.taxtech.atms.vat.entity.OutputVatInvoiceItem">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
......@@ -434,7 +434,7 @@
</set>
where ItemID = #{itemID,jdbcType=VARCHAR}
</update>
<update id="updateByPrimaryKey" parameterType="pwc.taxtech.atms.vat.entity.OutputVATInvoiceItem">
<update id="updateByPrimaryKey" parameterType="pwc.taxtech.atms.vat.entity.OutputVatInvoiceItem">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
......@@ -458,7 +458,7 @@
PeriodID = #{periodID,jdbcType=INTEGER}
where ItemID = #{itemID,jdbcType=VARCHAR}
</update>
<select id="selectByExampleWithRowbounds" parameterType="pwc.taxtech.atms.vat.entity.OutputVATInvoiceItemExample" resultMap="BaseResultMap">
<select id="selectByExampleWithRowbounds" parameterType="pwc.taxtech.atms.vat.entity.OutputVatInvoiceItemExample" resultMap="BaseResultMap">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
......
atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/OutputVATInvoiceMapper.xml
View file @ f74b9e30
<?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.vat.dao.OutputVATInvoiceMapper">
<resultMap id="BaseResultMap" type="pwc.taxtech.atms.vat.entity.OutputVATInvoice">
<mapper namespace="pwc.taxtech.atms.vat.dao.OutputVatInvoiceMapper">
<resultMap id="BaseResultMap" type="pwc.taxtech.atms.vat.entity.OutputVatInvoice">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
......@@ -98,7 +98,7 @@
PhoneNum, InvoiceDate, SeqNo, PeriodID, `Status`, CreatorID, CreateTime, PartAccntedPeriod,
AccntedPeriod
</sql>
<select id="selectByExample" parameterType="pwc.taxtech.atms.vat.entity.OutputVATInvoiceExample" resultMap="BaseResultMap">
<select id="selectByExample" parameterType="pwc.taxtech.atms.vat.entity.OutputVatInvoiceExample" resultMap="BaseResultMap">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
......@@ -134,7 +134,7 @@
delete from OutputVATInvoice
where InvoiceID = #{invoiceID,jdbcType=VARCHAR}
</delete>
<delete id="deleteByExample" parameterType="pwc.taxtech.atms.vat.entity.OutputVATInvoiceExample">
<delete id="deleteByExample" parameterType="pwc.taxtech.atms.vat.entity.OutputVatInvoiceExample">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
......@@ -144,7 +144,7 @@
<include refid="Example_Where_Clause" />
</if>
</delete>
<insert id="insert" parameterType="pwc.taxtech.atms.vat.entity.OutputVATInvoice">
<insert id="insert" parameterType="pwc.taxtech.atms.vat.entity.OutputVatInvoice">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
......@@ -162,7 +162,7 @@
#{creatorID,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{partAccntedPeriod,jdbcType=INTEGER},
#{accntedPeriod,jdbcType=INTEGER})
</insert>
<insert id="insertSelective" parameterType="pwc.taxtech.atms.vat.entity.OutputVATInvoice">
<insert id="insertSelective" parameterType="pwc.taxtech.atms.vat.entity.OutputVatInvoice">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
......@@ -269,7 +269,7 @@
</if>
</trim>
</insert>
<select id="countByExample" parameterType="pwc.taxtech.atms.vat.entity.OutputVATInvoiceExample" resultType="java.lang.Long">
<select id="countByExample" parameterType="pwc.taxtech.atms.vat.entity.OutputVatInvoiceExample" resultType="java.lang.Long">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
......@@ -365,7 +365,7 @@
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByPrimaryKeySelective" parameterType="pwc.taxtech.atms.vat.entity.OutputVATInvoice">
<update id="updateByPrimaryKeySelective" parameterType="pwc.taxtech.atms.vat.entity.OutputVatInvoice">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
......@@ -420,7 +420,7 @@
</set>
where InvoiceID = #{invoiceID,jdbcType=VARCHAR}
</update>
<update id="updateByPrimaryKey" parameterType="pwc.taxtech.atms.vat.entity.OutputVATInvoice">
<update id="updateByPrimaryKey" parameterType="pwc.taxtech.atms.vat.entity.OutputVatInvoice">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
......@@ -443,7 +443,7 @@
AccntedPeriod = #{accntedPeriod,jdbcType=INTEGER}
where InvoiceID = #{invoiceID,jdbcType=VARCHAR}
</update>
<select id="selectByExampleWithRowbounds" parameterType="pwc.taxtech.atms.vat.entity.OutputVATInvoiceExample" resultMap="BaseResultMap">
<select id="selectByExampleWithRowbounds" parameterType="pwc.taxtech.atms.vat.entity.OutputVatInvoiceExample" resultMap="BaseResultMap">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
......
atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/extends/InputVATInvoiceExtendsMapper.xml
View file @ f74b9e30
<?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.vat.dao.InputVATInvoiceMapper">
<mapper namespace="pwc.taxtech.atms.vat.dao.InputVatInvoiceMapper">
<select id="getInputVATInvoiceCountByCondition"
parameterType="pwc.taxtech.atms.dto.vatdto.InputInvoicePreviewQueryParam" resultType="java.lang.Long">
SELECT COUNT(1) FROM InputVATInvoice WHERE 1=1
......@@ -98,7 +98,7 @@
</select>
<resultMap id="inputVATInvoiceResultDto" type="pwc.taxtech.atms.dto.vatdto.InputVATInvoiceResultDto">
<id property="invoiceID" column="invoice_id"/>
<association property="inputVATInvoice" javaType="pwc.taxtech.atms.vat.entity.InputVATInvoice">
<association property="inputVATInvoice" javaType="pwc.taxtech.atms.vat.entity.InputVatInvoice">
<id column="ID" jdbcType="VARCHAR" property="ID"/>
<result column="PeriodID" jdbcType="INTEGER" property="periodID"/>
<result column="InvoiceCode" jdbcType="VARCHAR" property="invoiceCode"/>
......@@ -116,7 +116,7 @@
<result column="PartAccntedPeriod" jdbcType="INTEGER" property="partAccntedPeriod"/>
<result column="AccntedPeriod" jdbcType="INTEGER" property="accntedPeriod"/>
</association>
<association property="inputVATInvoiceItem" javaType="pwc.taxtech.atms.vat.entity.InputVATInvoiceItem">
<association property="inputVATInvoiceItem" javaType="pwc.taxtech.atms.vat.entity.InputVatInvoiceItem">
<id column="ID" jdbcType="VARCHAR" property="ID"/>
<result column="InputVATInvoiceID" jdbcType="VARCHAR" property="inputVATInvoiceID"/>
<result column="PeriodID" jdbcType="INTEGER" property="periodID"/>
......
atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/extends/OutputVATInvoiceExtendsMapper.xml
View file @ f74b9e30
<?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.vat.dao.OutputVATInvoiceMapper">
<mapper namespace="pwc.taxtech.atms.vat.dao.OutputVatInvoiceMapper">
<resultMap id="OutputVATInvoiceInfoDto" type="pwc.taxtech.atms.dto.vatdto.OutputVATInvoiceInfoDto">
<id column="InvoiceID" jdbcType="VARCHAR" property="invoiceID"/>
<result column="InvoiceType" jdbcType="INTEGER" property="invoiceType"/>
......@@ -67,7 +67,7 @@
</select>
<resultMap id="outputVATInvoiceDto" type="pwc.taxtech.atms.dto.vatdto.OutputVATInvoiceDto">
<id property="invoiceID" column="invoice_id"/>
<association property="invoice" javaType="pwc.taxtech.atms.vat.entity.OutputVATInvoice">
<association property="invoice" javaType="pwc.taxtech.atms.vat.entity.OutputVatInvoice">
<id column="InvoiceID" property="invoiceID"/>
<result column="InvoiceType" property="invoiceType"/>
<result column="ClassCode" property="classCode"/>
......@@ -85,7 +85,7 @@
<result column="PartAccntedPeriod" property="partAccntedPeriod"/>
<result column="AccntedPeriod" property="accntedPeriod"/>
</association>
<association property="invoiceItem" javaType="pwc.taxtech.atms.vat.entity.OutputVATInvoiceItem">
<association property="invoiceItem" javaType="pwc.taxtech.atms.vat.entity.OutputVatInvoiceItem">
<id column="ItemID" property="itemID"/>
<result column="InvoiceID" property="invoiceID"/>
<result column="CodeVersion" property="codeVersion"/>
......
atms-gen/config/hibernate.cfg.xml
View file @ f74b9e30
......@@ -20,7 +20,7 @@
<mapping class="pwc.taxtech.atms.vat.entity.CustBalanceStd"/>
<mapping class="pwc.taxtech.atms.vat.entity.CustBalanceStdManual"/>
<mapping class="pwc.taxtech.atms.vat.entity.CustomsInvoice"/>
<mapping class="pwc.taxtech.atms.vat.entity.EnterpriseAccount"/>
<mapping class="pwc.taxtech.drop.vat.EnterpriseAccount"/>
<mapping class="pwc.taxtech.atms.vat.entity.EntriesCheckDetailResult"/>
<mapping class="pwc.taxtech.atms.vat.entity.EntriesCheckResult"/>
<mapping class="pwc.taxtech.atms.vat.entity.FormulaCache"/>
......@@ -35,11 +35,11 @@
<mapping class="pwc.taxtech.atms.vat.entity.ModelCategoryResult"/>
<mapping class="pwc.taxtech.atms.vat.entity.ModelDetailLog"/>
<mapping class="pwc.taxtech.atms.vat.entity.ModelLog"/>
<mapping class="pwc.taxtech.atms.vat.entity.OperationLog"/>
<mapping class="pwc.taxtech.drop.vat.OperationLog"/>
<mapping class="pwc.taxtech.atms.vat.entity.OutputVatInvoice"/>
<mapping class="pwc.taxtech.atms.vat.entity.OutputVatInvoiceItem"/>
<mapping class="pwc.taxtech.atms.vat.entity.PeriodCellReference"/>
<mapping class="pwc.taxtech.atms.vat.entity.StandardAccount"/>
<mapping class="pwc.taxtech.drop.vat.StandardAccount"/>
<mapping class="pwc.taxtech.atms.vat.entity.ValidationInfo"/>
<mapping class="pwc.taxtech.atms.vat.entity.Voucher"/>
<mapping class="pwc.taxtech.atms.vat.entity.VoucherMain"/>
......
atms-gen/src/main/java/pwc/taxtech/Const.java
View file @ f74b9e30
......@@ -2,7 +2,7 @@ package pwc.taxtech;
public class Const {
// oracle
public static final String DEF_BIG_STRING = "blob";
public static final String DEF_BIG_STRING = "varchar2(500 char) default ' '";
public static final String DEF_DEFAULT_DATE = "date default sysdate";
public static final String DEF_DEFAULT_STRING = "' '";
public static final String DEF_DEFAULT_NUMBER = "0";
......
atms-gen/src/main/java/pwc/taxtech/drop/Model.java → atms-gen/src/main/java/pwc/taxtech/atms/entity/Model.java
View file @ f74b9e30
package pwc.taxtech.drop;
package pwc.taxtech.atms.entity;
import org.hibernate.annotations.ColumnDefault;
......
atms-gen/src/main/java/pwc/taxtech/drop/OperationLogRole.java → atms-gen/src/main/java/pwc/taxtech/atms/entity/OperationLogRole.java
View file @ f74b9e30
package pwc.taxtech.drop;
package pwc.taxtech.atms.entity;
import org.hibernate.annotations.ColumnDefault;
......
atms-gen/src/main/java/pwc/taxtech/atms/entity/OrganizationServiceTemplateGroup.java 0 → 100644
View file @ f74b9e30
package pwc.taxtech.atms.entity;
import org.hibernate.annotations.ColumnDefault;
import javax.persistence.Basic;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
import java.util.Objects;
import static pwc.taxtech.Const.*;
@Entity
@Table(name = "ORG_SERVICE_TEMPLATE_GROUP", schema = PROJECT_ADMIN, catalog = "")
public class OrganizationServiceTemplateGroup {
private Long id;
private String organizationId;
private String serviceTypeId;
private Long templateGroupId;
@Id
@Column(name = "ID", nullable = false)
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
@Basic
@Column(name = "ORGANIZATION_ID", nullable = false, length = 128)
@ColumnDefault(DEF_DEFAULT_STRING)
public String getOrganizationId() {
return organizationId;
}
public void setOrganizationId(String organizationId) {
this.organizationId = organizationId;
}
@Basic
@Column(name = "SERVICE_TYPE_ID", nullable = false, length = 128)
@ColumnDefault(DEF_DEFAULT_STRING)
public String getServiceTypeId() {
return serviceTypeId;
}
public void setServiceTypeId(String serviceTypeId) {
this.serviceTypeId = serviceTypeId;
}
@Basic
@Column(name = "TEMPLATE_GROUP_ID", nullable = false)
@ColumnDefault(DEF_DEFAULT_NUMBER)
public Long getTemplateGroupId() {
return templateGroupId;
}
public void setTemplateGroupId(Long templateGroupId) {
this.templateGroupId = templateGroupId;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
OrganizationServiceTemplateGroup that = (OrganizationServiceTemplateGroup) o;
return id == that.id &&
templateGroupId == that.templateGroupId &&
Objects.equals(organizationId, that.organizationId) &&
Objects.equals(serviceTypeId, that.serviceTypeId);
}
@Override
public int hashCode() {
return Objects.hash(id, organizationId, serviceTypeId, templateGroupId);
}
}
atms-gen/src/main/java/pwc/taxtech/atms/repository/EntriesCheckDetailRepository.java
View file @ f74b9e30
package pwc.taxtech.atms.repository;
import org.springframework.data.repository.CrudRepository;
import pwc.taxtech.atms.entity.EntriesCheckDetail;
import pwc.taxtech.drop.EntriesCheckDetail;
public interface EntriesCheckDetailRepository extends CrudRepository<EntriesCheckDetail, String> {
}
\ No newline at end of file
atms-gen/src/main/java/pwc/taxtech/atms/repository/ModelRepository.java
View file @ f74b9e30
package pwc.taxtech.atms.repository;
import org.springframework.data.repository.CrudRepository;
import pwc.taxtech.drop.Model;
import pwc.taxtech.atms.entity.Model;
public interface ModelRepository extends CrudRepository<Model, String> {
}
\ No newline at end of file
atms-gen/src/main/java/pwc/taxtech/atms/repository/OperationLogRepository.java
View file @ f74b9e30
package pwc.taxtech.atms.repository;
import org.springframework.data.repository.CrudRepository;
import pwc.taxtech.atms.entity.OperationLog;
import pwc.taxtech.drop.OperationLog;
public interface OperationLogRepository extends CrudRepository<OperationLog, String> {
}
\ No newline at end of file
atms-gen/src/main/java/pwc/taxtech/atms/repository/OperationLogRoleRepository.java
View file @ f74b9e30
package pwc.taxtech.atms.repository;
import org.springframework.data.repository.CrudRepository;
import pwc.taxtech.drop.OperationLogRole;
import pwc.taxtech.atms.entity.OperationLogRole;
public interface OperationLogRoleRepository extends CrudRepository<OperationLogRole, String> {
}
\ No newline at end of file
atms-gen/src/main/java/pwc/taxtech/atms/repository/WorkflowRepository.java
View file @ f74b9e30
package pwc.taxtech.atms.repository;
import org.springframework.data.repository.CrudRepository;
import pwc.taxtech.atms.entity.Workflow;
import pwc.taxtech.drop.Workflow;
public interface WorkflowRepository extends CrudRepository<Workflow, String> {
}
\ No newline at end of file
atms-gen/src/main/java/pwc/taxtech/atms/vat/repository/EnterpriseAccountRepository.java
View file @ f74b9e30
package pwc.taxtech.atms.vat.repository;
import org.springframework.data.repository.CrudRepository;
import pwc.taxtech.atms.vat.entity.EnterpriseAccount;
import pwc.taxtech.drop.vat.EnterpriseAccount;
public interface EnterpriseAccountRepository extends CrudRepository<EnterpriseAccount, String> {
}
\ No newline at end of file
atms-gen/src/main/java/pwc/taxtech/atms/vat/repository/OperationLogRepository.java
View file @ f74b9e30
package pwc.taxtech.atms.vat.repository;
import org.springframework.data.repository.CrudRepository;
import pwc.taxtech.atms.vat.entity.OperationLog;
import pwc.taxtech.drop.vat.OperationLog;
public interface OperationLogRepository extends CrudRepository<OperationLog, String> {
}
\ No newline at end of file
atms-gen/src/main/java/pwc/taxtech/atms/vat/repository/StandardAccountRepository.java
View file @ f74b9e30
package pwc.taxtech.atms.vat.repository;
import org.springframework.data.repository.CrudRepository;
import pwc.taxtech.atms.vat.entity.StandardAccount;
import pwc.taxtech.drop.vat.StandardAccount;
public interface StandardAccountRepository extends CrudRepository<StandardAccount, String> {
}
\ No newline at end of file
atms-gen/src/main/java/pwc/taxtech/atms/entity/EntriesCheckDetail.java → atms-gen/src/main/java/pwc/taxtech/drop/EntriesCheckDetail.java
View file @ f74b9e30
package pwc.taxtech.atms.entity;
package pwc.taxtech.drop;
import org.hibernate.annotations.ColumnDefault;
......
atms-gen/src/main/java/pwc/taxtech/atms/entity/OperationLog.java → atms-gen/src/main/java/pwc/taxtech/drop/OperationLog.java
View file @ f74b9e30
package pwc.taxtech.atms.entity;
package pwc.taxtech.drop;
import org.hibernate.annotations.ColumnDefault;
......
atms-gen/src/main/java/pwc/taxtech/atms/entity/Workflow.java → atms-gen/src/main/java/pwc/taxtech/drop/Workflow.java
View file @ f74b9e30
package pwc.taxtech.atms.entity;
package pwc.taxtech.drop;
import javax.persistence.Basic;
import javax.persistence.Column;
......
atms-gen/src/main/java/pwc/taxtech/drop/databases-invalid-sql 0 → 100644
View file @ f74b9e30
表名超长
organization_service_template_group -> org_service_template_group *
OutputInvoiceTriggerSyncHistory -> OutputInvoiceTriggerSyncHist
OutputReconciliationConfiguration -> OutputReconciliationConfig
OutputReconciliationEntityMapping -> OutputReconciliationMapping
OPERATION_LOG_MODEL_CONFIGURATION->OPTLOG_MODEL_CONFIGURATION
OUTPUT_INVOICE_SHIPMENT_HISTORY->OUTINV_SHIPMENT_HISTORY
OUTPUT_INVOICE_TRIGGER_SYNC_HIST->OUTINV_TRIGGER_SYNC_HIST
WORKFLOW_AUDIT_REPORT_LEVEL_ROLE->WF_AUDIT_REPORT_LEVEL_ROLE
WORKFLOW_AUDIT_REPORT_LEVEL_USER->WF_AUDIT_REPORT_LEVEL_USER
字段超长
InvoiceRuleSetting.
IsToSupportInvoiceOutForOtherOrgs ->IsInvoiceOutForOtherOrgs
InvoiceRuleSetting.
IsToSupportInvoiceOutForSelfOrgs -> IsInvoiceOutForSelfOrgs
OutputInvoiceEdited.
SubtotalforFinalPaymentSpecified -> SubforFinalPaymentSpecified
OutputInvoiceImported.
SubtotalforFinalPaymentSpecified -> SubforFinalPaymentSpecified
OutputReconciliationEntityMapping.
OutputReconciliationConfigurationID -> OutputReconciliationConfigID
ASSETS_LIST.
ACCOUNT_MONTH_DEPRECIATION_AMOUNT ->MONTH_DEPRECIATION_AMOUNT
ACCOUNT_TOTALEPRECIATION_AMOUNT -> TOTALEPRECIATION_AMOUNT
ACCOUNT_YEAR_DEPRECIATION_AMOUNT->AYEAR_DEPRECIATION_AMOUNT
INVOICE_RULE_SETTING.
IS_TO_APPLY_HEAD_COMPANY_SETTING->IS_APPLY_HEAD_COMPANY_SETTING
NORMAL_INVOICE_SPLIT_UPPER_LIMIT->NORMAL_SPLIT_UPPER_LIMIT
NORMAL_INVOICE_UPPER_LIMIT_AMOUNT->INVOICE_UPPER_LIMIT_AMOUNT
SPECIAL_INVOICE_SPLIT_UPPER_LIMIT -> SPECIAL_SPLIT_UPPER_LIMIT
SPECIAL_INVOICE_UPPER_LIMIT_AMOUNT->SPECIAL_UPPER_LIMIT_AMOUNT
INVOICE_RULE_SORT_SETTING.
DICTIONARY_INVOICE_SORT_FIELD_ID->DICT_INVOICE_SORT_FIELD_ID
OUTPUT_INVOICE_EDITED.
RESERVATION_TERMS_ACCEPTED_DATE->RESERVATION_ACCEPTED_DATE
OUTPUT_INVOICE_EDITED_REASON.
OUTPUT_INVOICE_UPDATE_REASON_ID->OUTINV_UPDATE_REASON_ID
OUTPUT_INVOICE_GD_ISSUED.
BUYER_ORGANIZATION_ENGLISH_NAME->BUYER_ORG_ENGLISH_NAME
OUTPUT_INVOICE_IMPORTED.
RESERVATION_TERMS_ACCEPTED_DATE->RESERVATION_ACCEPTED_DATE
OUTPUT_INVOICE_PRINTED_REASON.
OUTPUT_INVOICE_UPDATE_REASON_ID->OUTINV_UPDATE_REASON_ID
OUTPUT_RECONCILIATION_MAPPING.
OUTPUT_RECONCILIATION_CONFIG_ID->OUT_RECONCILIATION_CONFIG_ID
=======================================================
project
表名超长
period_tax_rule_setting_organization -> period_tax_rule_setting_org
字段超长
AssetsList.
TaxCurrentYearDepreciationAmount- > CurtYearDepreciateAmount
TaxToCurrentYearDepreciationAmount -> ToCurtYearDepreciateAmount
TaxToCurrentYearDepreciationPeriod -> ToCurtYearDepreciatePeriod
TaxToLastYearDepreciationPeriod -> ToLastYearDepreciatePeriod
period_tax_rule_setting_organization.
tax_rule_setting_organization_id -> setting_org_id
atms-gen/src/main/java/pwc/taxtech/atms/vat/entity/EnterpriseAccount.java → atms-gen/src/main/java/pwc/taxtech/drop/vat/EnterpriseAccount.java
View file @ f74b9e30
package pwc.taxtech.atms.vat.entity;
package pwc.taxtech.drop.vat;
import org.hibernate.annotations.ColumnDefault;
......
atms-gen/src/main/java/pwc/taxtech/atms/vat/entity/OperationLog.java → atms-gen/src/main/java/pwc/taxtech/drop/vat/OperationLog.java
View file @ f74b9e30
package pwc.taxtech.atms.vat.entity;
package pwc.taxtech.drop.vat;
import org.hibernate.annotations.ColumnDefault;
......
atms-gen/src/main/java/pwc/taxtech/atms/vat/entity/StandardAccount.java → atms-gen/src/main/java/pwc/taxtech/drop/vat/StandardAccount.java
View file @ f74b9e30
package pwc.taxtech.atms.vat.entity;
package pwc.taxtech.drop.vat;
import org.hibernate.annotations.ColumnDefault;
......
atms-gen/src/main/resources/application-oracle.yml
View file @ f74b9e30
......@@ -9,5 +9,5 @@ spring:
properties.hibernate:
default_schema: tax_admin
hibernate:
ddl-auto: update
ddl-auto: create
naming.physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
atms-gen/src/test/java/com/neo/GenGeneratorXml.java
View file @ f74b9e30
......@@ -243,7 +243,7 @@ public class GenGeneratorXml {
"\n" +
" <javaModelGenerator targetPackage=\"pwc.taxtech.atms" + (isAdmin ? "." : ".vat.") + "entity\" targetProject=\"../../src/main/java\">\n" +
" <property name=\"trimStrings\" value=\"true\"/>\n" +
" " + (isAdmin ? "<property name=\"rootClass\" value=\"pwc.taxtech.atms.entitiy.BaseEntity\"/>" : "") + "\n" +
" " + (isAdmin ? "<property name=\"rootClass\" value=\"pwc.taxtech.atms.entity.BaseEntity\"/>" : "") + "\n" +
" </javaModelGenerator>\n" +
"\n" +
" <sqlMapGenerator targetPackage=\"pwc.taxtech.atms" + (isAdmin ? "." : ".vat.") + "dao\" targetProject=\"../../src/main/resources\">\n" +
......
atms-gen/src/test/java/resources/databases-invalid-sql
View file @ f74b9e30
......@@ -42,25 +42,4 @@ RESERVATION_TERMS_ACCEPTED_DATE->RESERVATION_ACCEPTED_DATE
OUTPUT_INVOICE_PRINTED_REASON.
OUTPUT_INVOICE_UPDATE_REASON_ID->OUTINV_UPDATE_REASON_ID
OUTPUT_RECONCILIATION_MAPPING.
OUTPUT_RECONCILIATION_CONFIG_ID->OUT_RECONCILIATION_CONFIG_ID
=======================================================
project
表名超长
period_tax_rule_setting_organization -> period_tax_rule_setting_org
字段超长
AssetsList.
TaxCurrentYearDepreciationAmount- > CurtYearDepreciateAmount
TaxToCurrentYearDepreciationAmount -> ToCurtYearDepreciateAmount
TaxToCurrentYearDepreciationPeriod -> ToCurtYearDepreciatePeriod
TaxToLastYearDepreciationPeriod -> ToLastYearDepreciatePeriod
period_tax_rule_setting_organization.
tax_rule_setting_organization_id -> setting_org_id
OUTPUT_RECONCILIATION_CONFIG_ID->OUT_RECONCILIATION_CONFIG_ID
\ No newline at end of file
atms-gen/src/test/java/resources/oracle-init.sql deleted 100644 → 0
View file @ ef68702d
This source diff could not be displayed because it is too large. You can view the blob instead.
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