Skip to content

T
traffic-front
Commit d16cb20f authored by neo's avatar neo
Browse files
Options

[bugfix] fixed some bugs

parent 60fc2bda
Hide whitespace changes
Inline Side-by-side
Showing with 57 additions and 1380 deletions
atms-api/src/main/java/pwc/taxtech/atms/vat/dao/InputVatInvoiceDao.java
View file @ d16cb20f
......@@ -4,7 +4,7 @@ import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import pwc.taxtech.atms.vat.entity.InputVatInvoice;
import pwc.taxtech.atms.vat.entity.InputVatTInvoiceExample;
import pwc.taxtech.atms.vat.entity.InputVatInvoiceExample;
import java.util.List;
......@@ -14,9 +14,9 @@ public class InputVatInvoiceDao {
InputVatInvoiceMapper inputVATInvoiceMapper;
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();
InputVatInvoiceExample example = new InputVatInvoiceExample();
InputVatInvoiceExample.Criteria criteria = example.createCriteria();
InputVatInvoiceExample.Criteria criteria1 = example.createCriteria();
if (period != null) {
......@@ -28,11 +28,10 @@ public class InputVatInvoiceDao {
criteria1.andInvoiceTypeEqualTo(invoiceType);
}
if(StringUtils.isNotBlank(notPass)){
if (StringUtils.isNotBlank(notPass)) {
criteria.andCertificationResultEqualTo(notPass);
criteria1.andCertificationResultEqualTo(notPass);
}
else if(StringUtils.isNotBlank(checkPass)&&StringUtils.isNotBlank(scanPass)){
} else if (StringUtils.isNotBlank(checkPass) && StringUtils.isNotBlank(scanPass)) {
criteria.andCertificationResultEqualTo(checkPass);
criteria.andCertificationResultEqualTo(scanPass);
example.or(criteria1);
......
atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/InputInvoiceDataImportServiceImpl.java
View file @ d16cb20f
......@@ -14,7 +14,7 @@ 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.InputVatTInvoiceExample;
import pwc.taxtech.atms.vat.entity.InputVatInvoiceExample;
import pwc.taxtech.atms.vat.entity.InputVatInvoiceItem;
import pwc.taxtech.atms.vat.entity.InputVatInvoiceItemExample;
......@@ -60,7 +60,7 @@ public class InputInvoiceDataImportServiceImpl extends VatAbstractService {
public List<InputVATInvoiceDto> getInputInvoiceList(Integer period) {
InputVatTInvoiceExample inputVATInvoiceExample = new InputVatTInvoiceExample();
InputVatInvoiceExample inputVATInvoiceExample = new InputVatInvoiceExample();
inputVATInvoiceExample.createCriteria().andPeriodIdEqualTo(period.intValue());
List<InputVatInvoice> inputVatEntity = inputVATInvoiceMapper.selectByExample(inputVATInvoiceExample);
inputVatEntity.sort(Comparator.comparing(InputVatInvoice::getInvoiceNumber));
......@@ -93,7 +93,7 @@ public class InputInvoiceDataImportServiceImpl extends VatAbstractService {
int period = inputInvoiceItemDtoList.get(0).getPeriodId();
inputInvoiceItemDtoList.forEach(item -> {
//导入之前需要将汇总表的主键更新到明细表中,如果找不到汇总信息，则设置为空
InputVatTInvoiceExample example = new InputVatTInvoiceExample();
InputVatInvoiceExample example = new InputVatInvoiceExample();
example.createCriteria().andInvoiceCodeEqualTo(item.getInvoiceCode()).andInvoiceNumberEqualTo(item.getInvoiceNumber());
InputVatInvoice invoiceTotal = inputVATInvoiceMapper.selectByExample(example).stream().findFirst().get();
......
atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/ReportServiceImpl.java
View file @ d16cb20f
......@@ -24,6 +24,8 @@ import pwc.taxtech.atms.dto.vatdto.ReportCellDataSourceDto;
import pwc.taxtech.atms.dto.vatdto.ReportDataDto;
import pwc.taxtech.atms.dto.vatdto.VatEnterpriseAccountResultDto;
import pwc.taxtech.atms.entity.*;
import pwc.taxtech.atms.entity.EnterpriseAccount;
import pwc.taxtech.atms.entity.EnterpriseAccountExample;
import pwc.taxtech.atms.exception.NotSupportedException;
import pwc.taxtech.atms.service.impl.CellConfigTranslater;
import pwc.taxtech.atms.vat.dpo.DataSourceCellDataDto;
......
atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/VatAbstractService.java
View file @ d16cb20f
......@@ -5,6 +5,7 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import pwc.taxtech.atms.common.ftp.FtpService;
import pwc.taxtech.atms.dao.*;
import pwc.taxtech.atms.dao.EnterpriseAccountMapper;
import pwc.taxtech.atms.dao.ProjectDao;
import pwc.taxtech.atms.service.impl.DistributedIdService;
import pwc.taxtech.atms.vat.dao.*;
......
atms-dao/src/main/java/pwc/taxtech/atms/dpo/AnalyticsModelDetail.java
View file @ d16cb20f
package pwc.taxtech.atms.dpo;
public class AnalyticsModelDetail {
private String modelID;
private String modelId;
private String code;
private String name;
private int type;
private String industry;
private String entityName;
/**
* 机构ID
* 机构Id
*/
private String entityID;
private String entityId;
public String getModelID() {
return modelID;
public String getModelId() {
return modelId;
}
public void setModelID(String modelID) {
this.modelID = modelID;
public void setModelId(String modelId) {
this.modelId = modelId;
}
public String getCode() {
......@@ -60,11 +60,11 @@ public class AnalyticsModelDetail {
this.industry = industry;
}
public String getEntityID() {
return entityID;
public String getEntityId() {
return entityId;
}
public void setEntityID(String entityID) {
this.entityID = entityID;
public void setEntityId(String entityId) {
this.entityId = entityId;
}
}
atms-dao/src/main/java/pwc/taxtech/atms/dpo/CellTemplatePerGroupDto.java
View file @ d16cb20f
package pwc.taxtech.atms.dpo;
public class CellTemplatePerGroupDto {
private String cellTemplateID ;
private String reportTemplateID ;
private String reportTemplateGroupID ;
private String cellTemplateId ;
private String reportTemplateId ;
private String reportTemplateGroupId ;
private int rowIndex ;
private int columnIndex ;
private String reportCode ;
......@@ -11,28 +11,28 @@ public class CellTemplatePerGroupDto {
private String columnName ;
private Integer resultType ;
public String getCellTemplateID() {
return cellTemplateID;
public String getCellTemplateId() {
return cellTemplateId;
}
public void setCellTemplateID(String cellTemplateID) {
this.cellTemplateID = cellTemplateID;
public void setCellTemplateId(String cellTemplateId) {
this.cellTemplateId = cellTemplateId;
}
public String getReportTemplateID() {
return reportTemplateID;
public String getReportTemplateId() {
return reportTemplateId;
}
public void setReportTemplateID(String reportTemplateID) {
this.reportTemplateID = reportTemplateID;
public void setReportTemplateId(String reportTemplateId) {
this.reportTemplateId = reportTemplateId;
}
public String getReportTemplateGroupID() {
return reportTemplateGroupID;
public String getReportTemplateGroupId() {
return reportTemplateGroupId;
}
public void setReportTemplateGroupID(String reportTemplateGroupID) {
this.reportTemplateGroupID = reportTemplateGroupID;
public void setReportTemplateGroupId(String reportTemplateGroupId) {
this.reportTemplateGroupId = reportTemplateGroupId;
}
public int getRowIndex() {
......
atms-dao/src/main/java/pwc/taxtech/atms/vat/dao/PeriodTemplateMapper.java
View file @ d16cb20f
......@@ -5,7 +5,7 @@ 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.dpo.CellTemplatePerGroupDto;
import pwc.taxtech.atms.dpo.CellTemplatePerGroupDto;
import pwc.taxtech.atms.vat.entity.PeriodTemplate;
import pwc.taxtech.atms.vat.entity.PeriodTemplateExample;
......
atms-dao/src/main/java/pwc/taxtech/atms/vat/dpo/DataSourceExtendDto.java
View file @ d16cb20f
......@@ -7,11 +7,11 @@ import java.util.List;
public class DataSourceExtendDto extends DataSource {
private Integer operationType;
private Long cellTemplateID;
private Long cellDataID;
private Long cellTemplateId;
private Long cellDataId;
private List<String> items;
private DataSource dataSource;
private Long reportTemplateID;
private Long reportTemplateId;
private Integer dataSourceType;
public DataSource getDataSource() {
......@@ -28,20 +28,20 @@ public class DataSourceExtendDto extends DataSource {
this.operationType = operationType;
}
public Long getCellTemplateID() {
return cellTemplateID;
public Long getCellTemplateId() {
return cellTemplateId;
}
public void setCellTemplateID(Long cellTemplateID) {
this.cellTemplateID = cellTemplateID;
public void setCellTemplateId(Long cellTemplateId) {
this.cellTemplateId = cellTemplateId;
}
public Long getCellDataID() {
return cellDataID;
public Long getCellDataId() {
return cellDataId;
}
public void setCellDataID(Long cellDataID) {
this.cellDataID = cellDataID;
public void setCellDataId(Long cellDataId) {
this.cellDataId = cellDataId;
}
public List<String> getItems() {
......@@ -56,12 +56,12 @@ public class DataSourceExtendDto extends DataSource {
this.dataSource = dataSource;
}
public Long getReportTemplateID() {
return reportTemplateID;
public Long getReportTemplateId() {
return reportTemplateId;
}
public void setReportTemplateID(Long reportTemplateID) {
this.reportTemplateID = reportTemplateID;
public void setReportTemplateId(Long reportTemplateId) {
this.reportTemplateId = reportTemplateId;
}
public Integer getDataSourceType() {
......
atms-dao/src/main/java/pwc/taxtech/atms/vat/entity/InputVatTInvoiceExample.java deleted 100644 → 0
View file @ 60fc2bda
package pwc.taxtech.atms.vat.entity;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
public class InputVatTInvoiceExample {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table InputVATInvoice
*
* @mbg.generated
*/
protected String orderByClause;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table InputVATInvoice
*
* @mbg.generated
*/
protected boolean distinct;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table InputVATInvoice
*
* @mbg.generated
*/
protected List<Criteria> oredCriteria;
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table InputVATInvoice
*
* @mbg.generated
*/
public InputVatTInvoiceExample() {
oredCriteria = new ArrayList<Criteria>();
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table InputVATInvoice
*
* @mbg.generated
*/
public void setOrderByClause(String orderByClause) {
this.orderByClause = orderByClause;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table InputVATInvoice
*
* @mbg.generated
*/
public String getOrderByClause() {
return orderByClause;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table InputVATInvoice
*
* @mbg.generated
*/
public void setDistinct(boolean distinct) {
this.distinct = distinct;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table InputVATInvoice
*
* @mbg.generated
*/
public boolean isDistinct() {
return distinct;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table InputVATInvoice
*
* @mbg.generated
*/
public List<Criteria> getOredCriteria() {
return oredCriteria;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table InputVATInvoice
*
* @mbg.generated
*/
public void or(Criteria criteria) {
oredCriteria.add(criteria);
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table InputVATInvoice
*
* @mbg.generated
*/
public Criteria or() {
Criteria criteria = createCriteriaInternal();
oredCriteria.add(criteria);
return criteria;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table InputVATInvoice
*
* @mbg.generated
*/
public Criteria createCriteria() {
Criteria criteria = createCriteriaInternal();
if (oredCriteria.size() == 0) {
oredCriteria.add(criteria);
}
return criteria;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table InputVATInvoice
*
* @mbg.generated
*/
protected Criteria createCriteriaInternal() {
Criteria criteria = new Criteria();
return criteria;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table InputVATInvoice
*
* @mbg.generated
*/
public void clear() {
oredCriteria.clear();
orderByClause = null;
distinct = false;
}
/**
* This class was generated by MyBatis Generator.
* This class corresponds to the database table InputVATInvoice
*
* @mbg.generated
*/
protected abstract static class GeneratedCriteria {
protected List<Criterion> criteria;
protected GeneratedCriteria() {
super();
criteria = new ArrayList<Criterion>();
}
public boolean isValid() {
return criteria.size() > 0;
}
public List<Criterion> getAllCriteria() {
return criteria;
}
public List<Criterion> getCriteria() {
return criteria;
}
protected void addCriterion(String condition) {
if (condition == null) {
throw new RuntimeException("Value for condition cannot be null");
}
criteria.add(new Criterion(condition));
}
protected void addCriterion(String condition, Object value, String property) {
if (value == null) {
throw new RuntimeException("Value for " + property + " cannot be null");
}
criteria.add(new Criterion(condition, value));
}
protected void addCriterion(String condition, Object value1, Object value2, String property) {
if (value1 == null || value2 == null) {
throw new RuntimeException("Between values for " + property + " cannot be null");
}
criteria.add(new Criterion(condition, value1, value2));
}
public Criteria andIDIsNull() {
addCriterion("id is null");
return (Criteria) this;
}
public Criteria andIDIsNotNull() {
addCriterion("id is not null");
return (Criteria) this;
}
public Criteria andIDEqualTo(String value) {
addCriterion("id =", value, "id");
return (Criteria) this;
}
public Criteria andIDNotEqualTo(String value) {
addCriterion("id <>", value, "id");
return (Criteria) this;
}
public Criteria andIDGreaterThan(String value) {
addCriterion("id >", value, "id");
return (Criteria) this;
}
public Criteria andIDGreaterThanOrEqualTo(String value) {
addCriterion("id >=", value, "id");
return (Criteria) this;
}
public Criteria andIDLessThan(String value) {
addCriterion("id <", value, "id");
return (Criteria) this;
}
public Criteria andIDLessThanOrEqualTo(String value) {
addCriterion("id <=", value, "id");
return (Criteria) this;
}
public Criteria andIDLike(String value) {
addCriterion("id like", value, "id");
return (Criteria) this;
}
public Criteria andIDNotLike(String value) {
addCriterion("id not like", value, "id");
return (Criteria) this;
}
public Criteria andIDIn(List<String> values) {
addCriterion("id in", values, "id");
return (Criteria) this;
}
public Criteria andIDNotIn(List<String> values) {
addCriterion("id not in", values, "id");
return (Criteria) this;
}
public Criteria andIDBetween(String value1, String value2) {
addCriterion("id between", value1, value2, "id");
return (Criteria) this;
}
public Criteria andIDNotBetween(String value1, String value2) {
addCriterion("id not between", value1, value2, "id");
return (Criteria) this;
}
public Criteria andPeriodIDIsNull() {
addCriterion("PeriodID is null");
return (Criteria) this;
}
public Criteria andPeriodIDIsNotNull() {
addCriterion("PeriodID is not null");
return (Criteria) this;
}
public Criteria andPeriodIDEqualTo(Integer value) {
addCriterion("PeriodID =", value, "periodID");
return (Criteria) this;
}
public Criteria andPeriodIDNotEqualTo(Integer value) {
addCriterion("PeriodID <>", value, "periodID");
return (Criteria) this;
}
public Criteria andPeriodIDGreaterThan(Integer value) {
addCriterion("PeriodID >", value, "periodID");
return (Criteria) this;
}
public Criteria andPeriodIDGreaterThanOrEqualTo(Integer value) {
addCriterion("PeriodID >=", value, "periodID");
return (Criteria) this;
}
public Criteria andPeriodIDLessThan(Integer value) {
addCriterion("PeriodID <", value, "periodID");
return (Criteria) this;
}
public Criteria andPeriodIDLessThanOrEqualTo(Integer value) {
addCriterion("PeriodID <=", value, "periodID");
return (Criteria) this;
}
public Criteria andPeriodIDIn(List<Integer> values) {
addCriterion("PeriodID in", values, "periodID");
return (Criteria) this;
}
public Criteria andPeriodIDNotIn(List<Integer> values) {
addCriterion("PeriodID not in", values, "periodID");
return (Criteria) this;
}
public Criteria andPeriodIDBetween(Integer value1, Integer value2) {
addCriterion("PeriodID between", value1, value2, "periodID");
return (Criteria) this;
}
public Criteria andPeriodIDNotBetween(Integer value1, Integer value2) {
addCriterion("PeriodID not between", value1, value2, "periodID");
return (Criteria) this;
}
public Criteria andInvoiceCodeIsNull() {
addCriterion("InvoiceCode is null");
return (Criteria) this;
}
public Criteria andInvoiceCodeIsNotNull() {
addCriterion("InvoiceCode is not null");
return (Criteria) this;
}
public Criteria andInvoiceCodeEqualTo(String value) {
addCriterion("InvoiceCode =", value, "invoiceCode");
return (Criteria) this;
}
public Criteria andInvoiceCodeNotEqualTo(String value) {
addCriterion("InvoiceCode <>", value, "invoiceCode");
return (Criteria) this;
}
public Criteria andInvoiceCodeGreaterThan(String value) {
addCriterion("InvoiceCode >", value, "invoiceCode");
return (Criteria) this;
}
public Criteria andInvoiceCodeGreaterThanOrEqualTo(String value) {
addCriterion("InvoiceCode >=", value, "invoiceCode");
return (Criteria) this;
}
public Criteria andInvoiceCodeLessThan(String value) {
addCriterion("InvoiceCode <", value, "invoiceCode");
return (Criteria) this;
}
public Criteria andInvoiceCodeLessThanOrEqualTo(String value) {
addCriterion("InvoiceCode <=", value, "invoiceCode");
return (Criteria) this;
}
public Criteria andInvoiceCodeLike(String value) {
addCriterion("InvoiceCode like", value, "invoiceCode");
return (Criteria) this;
}
public Criteria andInvoiceCodeNotLike(String value) {
addCriterion("InvoiceCode not like", value, "invoiceCode");
return (Criteria) this;
}
public Criteria andInvoiceCodeIn(List<String> values) {
addCriterion("InvoiceCode in", values, "invoiceCode");
return (Criteria) this;
}
public Criteria andInvoiceCodeNotIn(List<String> values) {
addCriterion("InvoiceCode not in", values, "invoiceCode");
return (Criteria) this;
}
public Criteria andInvoiceCodeBetween(String value1, String value2) {
addCriterion("InvoiceCode between", value1, value2, "invoiceCode");
return (Criteria) this;
}
public Criteria andInvoiceCodeNotBetween(String value1, String value2) {
addCriterion("InvoiceCode not between", value1, value2, "invoiceCode");
return (Criteria) this;
}
public Criteria andInvoiceNumberIsNull() {
addCriterion("InvoiceNumber is null");
return (Criteria) this;
}
public Criteria andInvoiceNumberIsNotNull() {
addCriterion("InvoiceNumber is not null");
return (Criteria) this;
}
public Criteria andInvoiceNumberEqualTo(String value) {
addCriterion("InvoiceNumber =", value, "invoiceNumber");
return (Criteria) this;
}
public Criteria andInvoiceNumberNotEqualTo(String value) {
addCriterion("InvoiceNumber <>", value, "invoiceNumber");
return (Criteria) this;
}
public Criteria andInvoiceNumberGreaterThan(String value) {
addCriterion("InvoiceNumber >", value, "invoiceNumber");
return (Criteria) this;
}
public Criteria andInvoiceNumberGreaterThanOrEqualTo(String value) {
addCriterion("InvoiceNumber >=", value, "invoiceNumber");
return (Criteria) this;
}
public Criteria andInvoiceNumberLessThan(String value) {
addCriterion("InvoiceNumber <", value, "invoiceNumber");
return (Criteria) this;
}
public Criteria andInvoiceNumberLessThanOrEqualTo(String value) {
addCriterion("InvoiceNumber <=", value, "invoiceNumber");
return (Criteria) this;
}
public Criteria andInvoiceNumberLike(String value) {
addCriterion("InvoiceNumber like", value, "invoiceNumber");
return (Criteria) this;
}
public Criteria andInvoiceNumberNotLike(String value) {
addCriterion("InvoiceNumber not like", value, "invoiceNumber");
return (Criteria) this;
}
public Criteria andInvoiceNumberIn(List<String> values) {
addCriterion("InvoiceNumber in", values, "invoiceNumber");
return (Criteria) this;
}
public Criteria andInvoiceNumberNotIn(List<String> values) {
addCriterion("InvoiceNumber not in", values, "invoiceNumber");
return (Criteria) this;
}
public Criteria andInvoiceNumberBetween(String value1, String value2) {
addCriterion("InvoiceNumber between", value1, value2, "invoiceNumber");
return (Criteria) this;
}
public Criteria andInvoiceNumberNotBetween(String value1, String value2) {
addCriterion("InvoiceNumber not between", value1, value2, "invoiceNumber");
return (Criteria) this;
}
public Criteria andInvoiceDateIsNull() {
addCriterion("InvoiceDate is null");
return (Criteria) this;
}
public Criteria andInvoiceDateIsNotNull() {
addCriterion("InvoiceDate is not null");
return (Criteria) this;
}
public Criteria andInvoiceDateEqualTo(Date value) {
addCriterion("InvoiceDate =", value, "invoiceDate");
return (Criteria) this;
}
public Criteria andInvoiceDateNotEqualTo(Date value) {
addCriterion("InvoiceDate <>", value, "invoiceDate");
return (Criteria) this;
}
public Criteria andInvoiceDateGreaterThan(Date value) {
addCriterion("InvoiceDate >", value, "invoiceDate");
return (Criteria) this;
}
public Criteria andInvoiceDateGreaterThanOrEqualTo(Date value) {
addCriterion("InvoiceDate >=", value, "invoiceDate");
return (Criteria) this;
}
public Criteria andInvoiceDateLessThan(Date value) {
addCriterion("InvoiceDate <", value, "invoiceDate");
return (Criteria) this;
}
public Criteria andInvoiceDateLessThanOrEqualTo(Date value) {
addCriterion("InvoiceDate <=", value, "invoiceDate");
return (Criteria) this;
}
public Criteria andInvoiceDateIn(List<Date> values) {
addCriterion("InvoiceDate in", values, "invoiceDate");
return (Criteria) this;
}
public Criteria andInvoiceDateNotIn(List<Date> values) {
addCriterion("InvoiceDate not in", values, "invoiceDate");
return (Criteria) this;
}
public Criteria andInvoiceDateBetween(Date value1, Date value2) {
addCriterion("InvoiceDate between", value1, value2, "invoiceDate");
return (Criteria) this;
}
public Criteria andInvoiceDateNotBetween(Date value1, Date value2) {
addCriterion("InvoiceDate not between", value1, value2, "invoiceDate");
return (Criteria) this;
}
public Criteria andSellerTaxNumberIsNull() {
addCriterion("SellerTaxNumber is null");
return (Criteria) this;
}
public Criteria andSellerTaxNumberIsNotNull() {
addCriterion("SellerTaxNumber is not null");
return (Criteria) this;
}
public Criteria andSellerTaxNumberEqualTo(String value) {
addCriterion("SellerTaxNumber =", value, "sellerTaxNumber");
return (Criteria) this;
}
public Criteria andSellerTaxNumberNotEqualTo(String value) {
addCriterion("SellerTaxNumber <>", value, "sellerTaxNumber");
return (Criteria) this;
}
public Criteria andSellerTaxNumberGreaterThan(String value) {
addCriterion("SellerTaxNumber >", value, "sellerTaxNumber");
return (Criteria) this;
}
public Criteria andSellerTaxNumberGreaterThanOrEqualTo(String value) {
addCriterion("SellerTaxNumber >=", value, "sellerTaxNumber");
return (Criteria) this;
}
public Criteria andSellerTaxNumberLessThan(String value) {
addCriterion("SellerTaxNumber <", value, "sellerTaxNumber");
return (Criteria) this;
}
public Criteria andSellerTaxNumberLessThanOrEqualTo(String value) {
addCriterion("SellerTaxNumber <=", value, "sellerTaxNumber");
return (Criteria) this;
}
public Criteria andSellerTaxNumberLike(String value) {
addCriterion("SellerTaxNumber like", value, "sellerTaxNumber");
return (Criteria) this;
}
public Criteria andSellerTaxNumberNotLike(String value) {
addCriterion("SellerTaxNumber not like", value, "sellerTaxNumber");
return (Criteria) this;
}
public Criteria andSellerTaxNumberIn(List<String> values) {
addCriterion("SellerTaxNumber in", values, "sellerTaxNumber");
return (Criteria) this;
}
public Criteria andSellerTaxNumberNotIn(List<String> values) {
addCriterion("SellerTaxNumber not in", values, "sellerTaxNumber");
return (Criteria) this;
}
public Criteria andSellerTaxNumberBetween(String value1, String value2) {
addCriterion("SellerTaxNumber between", value1, value2, "sellerTaxNumber");
return (Criteria) this;
}
public Criteria andSellerTaxNumberNotBetween(String value1, String value2) {
addCriterion("SellerTaxNumber not between", value1, value2, "sellerTaxNumber");
return (Criteria) this;
}
public Criteria andAmountIsNull() {
addCriterion("Amount is null");
return (Criteria) this;
}
public Criteria andAmountIsNotNull() {
addCriterion("Amount is not null");
return (Criteria) this;
}
public Criteria andAmountEqualTo(BigDecimal value) {
addCriterion("Amount =", value, "amount");
return (Criteria) this;
}
public Criteria andAmountNotEqualTo(BigDecimal value) {
addCriterion("Amount <>", value, "amount");
return (Criteria) this;
}
public Criteria andAmountGreaterThan(BigDecimal value) {
addCriterion("Amount >", value, "amount");
return (Criteria) this;
}
public Criteria andAmountGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("Amount >=", value, "amount");
return (Criteria) this;
}
public Criteria andAmountLessThan(BigDecimal value) {
addCriterion("Amount <", value, "amount");
return (Criteria) this;
}
public Criteria andAmountLessThanOrEqualTo(BigDecimal value) {
addCriterion("Amount <=", value, "amount");
return (Criteria) this;
}
public Criteria andAmountIn(List<BigDecimal> values) {
addCriterion("Amount in", values, "amount");
return (Criteria) this;
}
public Criteria andAmountNotIn(List<BigDecimal> values) {
addCriterion("Amount not in", values, "amount");
return (Criteria) this;
}
public Criteria andAmountBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("Amount between", value1, value2, "amount");
return (Criteria) this;
}
public Criteria andAmountNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("Amount not between", value1, value2, "amount");
return (Criteria) this;
}
public Criteria andTaxAmountIsNull() {
addCriterion("TaxAmount is null");
return (Criteria) this;
}
public Criteria andTaxAmountIsNotNull() {
addCriterion("TaxAmount is not null");
return (Criteria) this;
}
public Criteria andTaxAmountEqualTo(BigDecimal value) {
addCriterion("TaxAmount =", value, "taxAmount");
return (Criteria) this;
}
public Criteria andTaxAmountNotEqualTo(BigDecimal value) {
addCriterion("TaxAmount <>", value, "taxAmount");
return (Criteria) this;
}
public Criteria andTaxAmountGreaterThan(BigDecimal value) {
addCriterion("TaxAmount >", value, "taxAmount");
return (Criteria) this;
}
public Criteria andTaxAmountGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("TaxAmount >=", value, "taxAmount");
return (Criteria) this;
}
public Criteria andTaxAmountLessThan(BigDecimal value) {
addCriterion("TaxAmount <", value, "taxAmount");
return (Criteria) this;
}
public Criteria andTaxAmountLessThanOrEqualTo(BigDecimal value) {
addCriterion("TaxAmount <=", value, "taxAmount");
return (Criteria) this;
}
public Criteria andTaxAmountIn(List<BigDecimal> values) {
addCriterion("TaxAmount in", values, "taxAmount");
return (Criteria) this;
}
public Criteria andTaxAmountNotIn(List<BigDecimal> values) {
addCriterion("TaxAmount not in", values, "taxAmount");
return (Criteria) this;
}
public Criteria andTaxAmountBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("TaxAmount between", value1, value2, "taxAmount");
return (Criteria) this;
}
public Criteria andTaxAmountNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("TaxAmount not between", value1, value2, "taxAmount");
return (Criteria) this;
}
public Criteria andInvoiceTypeIsNull() {
addCriterion("InvoiceType is null");
return (Criteria) this;
}
public Criteria andInvoiceTypeIsNotNull() {
addCriterion("InvoiceType is not null");
return (Criteria) this;
}
public Criteria andInvoiceTypeEqualTo(Integer value) {
addCriterion("InvoiceType =", value, "invoiceType");
return (Criteria) this;
}
public Criteria andInvoiceTypeNotEqualTo(Integer value) {
addCriterion("InvoiceType <>", value, "invoiceType");
return (Criteria) this;
}
public Criteria andInvoiceTypeGreaterThan(Integer value) {
addCriterion("InvoiceType >", value, "invoiceType");
return (Criteria) this;
}
public Criteria andInvoiceTypeGreaterThanOrEqualTo(Integer value) {
addCriterion("InvoiceType >=", value, "invoiceType");
return (Criteria) this;
}
public Criteria andInvoiceTypeLessThan(Integer value) {
addCriterion("InvoiceType <", value, "invoiceType");
return (Criteria) this;
}
public Criteria andInvoiceTypeLessThanOrEqualTo(Integer value) {
addCriterion("InvoiceType <=", value, "invoiceType");
return (Criteria) this;
}
public Criteria andInvoiceTypeIn(List<Integer> values) {
addCriterion("InvoiceType in", values, "invoiceType");
return (Criteria) this;
}
public Criteria andInvoiceTypeNotIn(List<Integer> values) {
addCriterion("InvoiceType not in", values, "invoiceType");
return (Criteria) this;
}
public Criteria andInvoiceTypeBetween(Integer value1, Integer value2) {
addCriterion("InvoiceType between", value1, value2, "invoiceType");
return (Criteria) this;
}
public Criteria andInvoiceTypeNotBetween(Integer value1, Integer value2) {
addCriterion("InvoiceType not between", value1, value2, "invoiceType");
return (Criteria) this;
}
public Criteria andCertificationResultIsNull() {
addCriterion("CertificationResult is null");
return (Criteria) this;
}
public Criteria andCertificationResultIsNotNull() {
addCriterion("CertificationResult is not null");
return (Criteria) this;
}
public Criteria andCertificationResultEqualTo(String value) {
addCriterion("CertificationResult =", value, "certificationResult");
return (Criteria) this;
}
public Criteria andCertificationResultNotEqualTo(String value) {
addCriterion("CertificationResult <>", value, "certificationResult");
return (Criteria) this;
}
public Criteria andCertificationResultGreaterThan(String value) {
addCriterion("CertificationResult >", value, "certificationResult");
return (Criteria) this;
}
public Criteria andCertificationResultGreaterThanOrEqualTo(String value) {
addCriterion("CertificationResult >=", value, "certificationResult");
return (Criteria) this;
}
public Criteria andCertificationResultLessThan(String value) {
addCriterion("CertificationResult <", value, "certificationResult");
return (Criteria) this;
}
public Criteria andCertificationResultLessThanOrEqualTo(String value) {
addCriterion("CertificationResult <=", value, "certificationResult");
return (Criteria) this;
}
public Criteria andCertificationResultLike(String value) {
addCriterion("CertificationResult like", value, "certificationResult");
return (Criteria) this;
}
public Criteria andCertificationResultNotLike(String value) {
addCriterion("CertificationResult not like", value, "certificationResult");
return (Criteria) this;
}
public Criteria andCertificationResultIn(List<String> values) {
addCriterion("CertificationResult in", values, "certificationResult");
return (Criteria) this;
}
public Criteria andCertificationResultNotIn(List<String> values) {
addCriterion("CertificationResult not in", values, "certificationResult");
return (Criteria) this;
}
public Criteria andCertificationResultBetween(String value1, String value2) {
addCriterion("CertificationResult between", value1, value2, "certificationResult");
return (Criteria) this;
}
public Criteria andCertificationResultNotBetween(String value1, String value2) {
addCriterion("CertificationResult not between", value1, value2, "certificationResult");
return (Criteria) this;
}
public Criteria andCertificationDateIsNull() {
addCriterion("CertificationDate is null");
return (Criteria) this;
}
public Criteria andCertificationDateIsNotNull() {
addCriterion("CertificationDate is not null");
return (Criteria) this;
}
public Criteria andCertificationDateEqualTo(Date value) {
addCriterion("CertificationDate =", value, "certificationDate");
return (Criteria) this;
}
public Criteria andCertificationDateNotEqualTo(Date value) {
addCriterion("CertificationDate <>", value, "certificationDate");
return (Criteria) this;
}
public Criteria andCertificationDateGreaterThan(Date value) {
addCriterion("CertificationDate >", value, "certificationDate");
return (Criteria) this;
}
public Criteria andCertificationDateGreaterThanOrEqualTo(Date value) {
addCriterion("CertificationDate >=", value, "certificationDate");
return (Criteria) this;
}
public Criteria andCertificationDateLessThan(Date value) {
addCriterion("CertificationDate <", value, "certificationDate");
return (Criteria) this;
}
public Criteria andCertificationDateLessThanOrEqualTo(Date value) {
addCriterion("CertificationDate <=", value, "certificationDate");
return (Criteria) this;
}
public Criteria andCertificationDateIn(List<Date> values) {
addCriterion("CertificationDate in", values, "certificationDate");
return (Criteria) this;
}
public Criteria andCertificationDateNotIn(List<Date> values) {
addCriterion("CertificationDate not in", values, "certificationDate");
return (Criteria) this;
}
public Criteria andCertificationDateBetween(Date value1, Date value2) {
addCriterion("CertificationDate between", value1, value2, "certificationDate");
return (Criteria) this;
}
public Criteria andCertificationDateNotBetween(Date value1, Date value2) {
addCriterion("CertificationDate not between", value1, value2, "certificationDate");
return (Criteria) this;
}
public Criteria andCreatorIDIsNull() {
addCriterion("CreatorID is null");
return (Criteria) this;
}
public Criteria andCreatorIDIsNotNull() {
addCriterion("CreatorID is not null");
return (Criteria) this;
}
public Criteria andCreatorIDEqualTo(String value) {
addCriterion("CreatorID =", value, "creatorID");
return (Criteria) this;
}
public Criteria andCreatorIDNotEqualTo(String value) {
addCriterion("CreatorID <>", value, "creatorID");
return (Criteria) this;
}
public Criteria andCreatorIDGreaterThan(String value) {
addCriterion("CreatorID >", value, "creatorID");
return (Criteria) this;
}
public Criteria andCreatorIDGreaterThanOrEqualTo(String value) {
addCriterion("CreatorID >=", value, "creatorID");
return (Criteria) this;
}
public Criteria andCreatorIDLessThan(String value) {
addCriterion("CreatorID <", value, "creatorID");
return (Criteria) this;
}
public Criteria andCreatorIDLessThanOrEqualTo(String value) {
addCriterion("CreatorID <=", value, "creatorID");
return (Criteria) this;
}
public Criteria andCreatorIDLike(String value) {
addCriterion("CreatorID like", value, "creatorID");
return (Criteria) this;
}
public Criteria andCreatorIDNotLike(String value) {
addCriterion("CreatorID not like", value, "creatorID");
return (Criteria) this;
}
public Criteria andCreatorIDIn(List<String> values) {
addCriterion("CreatorID in", values, "creatorID");
return (Criteria) this;
}
public Criteria andCreatorIDNotIn(List<String> values) {
addCriterion("CreatorID not in", values, "creatorID");
return (Criteria) this;
}
public Criteria andCreatorIDBetween(String value1, String value2) {
addCriterion("CreatorID between", value1, value2, "creatorID");
return (Criteria) this;
}
public Criteria andCreatorIDNotBetween(String value1, String value2) {
addCriterion("CreatorID not between", value1, value2, "creatorID");
return (Criteria) this;
}
public Criteria andCreateTimeIsNull() {
addCriterion("CreateTime is null");
return (Criteria) this;
}
public Criteria andCreateTimeIsNotNull() {
addCriterion("CreateTime is not null");
return (Criteria) this;
}
public Criteria andCreateTimeEqualTo(Date value) {
addCriterion("CreateTime =", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeNotEqualTo(Date value) {
addCriterion("CreateTime <>", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeGreaterThan(Date value) {
addCriterion("CreateTime >", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
addCriterion("CreateTime >=", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeLessThan(Date value) {
addCriterion("CreateTime <", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
addCriterion("CreateTime <=", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeIn(List<Date> values) {
addCriterion("CreateTime in", values, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeNotIn(List<Date> values) {
addCriterion("CreateTime not in", values, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeBetween(Date value1, Date value2) {
addCriterion("CreateTime between", value1, value2, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
addCriterion("CreateTime not between", value1, value2, "createTime");
return (Criteria) this;
}
public Criteria andStatusIsNull() {
addCriterion("`Status` is null");
return (Criteria) this;
}
public Criteria andStatusIsNotNull() {
addCriterion("`Status` is not null");
return (Criteria) this;
}
public Criteria andStatusEqualTo(Integer value) {
addCriterion("`Status` =", value, "status");
return (Criteria) this;
}
public Criteria andStatusNotEqualTo(Integer value) {
addCriterion("`Status` <>", value, "status");
return (Criteria) this;
}
public Criteria andStatusGreaterThan(Integer value) {
addCriterion("`Status` >", value, "status");
return (Criteria) this;
}
public Criteria andStatusGreaterThanOrEqualTo(Integer value) {
addCriterion("`Status` >=", value, "status");
return (Criteria) this;
}
public Criteria andStatusLessThan(Integer value) {
addCriterion("`Status` <", value, "status");
return (Criteria) this;
}
public Criteria andStatusLessThanOrEqualTo(Integer value) {
addCriterion("`Status` <=", value, "status");
return (Criteria) this;
}
public Criteria andStatusIn(List<Integer> values) {
addCriterion("`Status` in", values, "status");
return (Criteria) this;
}
public Criteria andStatusNotIn(List<Integer> values) {
addCriterion("`Status` not in", values, "status");
return (Criteria) this;
}
public Criteria andStatusBetween(Integer value1, Integer value2) {
addCriterion("`Status` between", value1, value2, "status");
return (Criteria) this;
}
public Criteria andStatusNotBetween(Integer value1, Integer value2) {
addCriterion("`Status` not between", value1, value2, "status");
return (Criteria) this;
}
public Criteria andPartAccntedPeriodIsNull() {
addCriterion("PartAccntedPeriod is null");
return (Criteria) this;
}
public Criteria andPartAccntedPeriodIsNotNull() {
addCriterion("PartAccntedPeriod is not null");
return (Criteria) this;
}
public Criteria andPartAccntedPeriodEqualTo(Integer value) {
addCriterion("PartAccntedPeriod =", value, "partAccntedPeriod");
return (Criteria) this;
}
public Criteria andPartAccntedPeriodNotEqualTo(Integer value) {
addCriterion("PartAccntedPeriod <>", value, "partAccntedPeriod");
return (Criteria) this;
}
public Criteria andPartAccntedPeriodGreaterThan(Integer value) {
addCriterion("PartAccntedPeriod >", value, "partAccntedPeriod");
return (Criteria) this;
}
public Criteria andPartAccntedPeriodGreaterThanOrEqualTo(Integer value) {
addCriterion("PartAccntedPeriod >=", value, "partAccntedPeriod");
return (Criteria) this;
}
public Criteria andPartAccntedPeriodLessThan(Integer value) {
addCriterion("PartAccntedPeriod <", value, "partAccntedPeriod");
return (Criteria) this;
}
public Criteria andPartAccntedPeriodLessThanOrEqualTo(Integer value) {
addCriterion("PartAccntedPeriod <=", value, "partAccntedPeriod");
return (Criteria) this;
}
public Criteria andPartAccntedPeriodIn(List<Integer> values) {
addCriterion("PartAccntedPeriod in", values, "partAccntedPeriod");
return (Criteria) this;
}
public Criteria andPartAccntedPeriodNotIn(List<Integer> values) {
addCriterion("PartAccntedPeriod not in", values, "partAccntedPeriod");
return (Criteria) this;
}
public Criteria andPartAccntedPeriodBetween(Integer value1, Integer value2) {
addCriterion("PartAccntedPeriod between", value1, value2, "partAccntedPeriod");
return (Criteria) this;
}
public Criteria andPartAccntedPeriodNotBetween(Integer value1, Integer value2) {
addCriterion("PartAccntedPeriod not between", value1, value2, "partAccntedPeriod");
return (Criteria) this;
}
public Criteria andAccntedPeriodIsNull() {
addCriterion("AccntedPeriod is null");
return (Criteria) this;
}
public Criteria andAccntedPeriodIsNotNull() {
addCriterion("AccntedPeriod is not null");
return (Criteria) this;
}
public Criteria andAccntedPeriodEqualTo(Integer value) {
addCriterion("AccntedPeriod =", value, "accntedPeriod");
return (Criteria) this;
}
public Criteria andAccntedPeriodNotEqualTo(Integer value) {
addCriterion("AccntedPeriod <>", value, "accntedPeriod");
return (Criteria) this;
}
public Criteria andAccntedPeriodGreaterThan(Integer value) {
addCriterion("AccntedPeriod >", value, "accntedPeriod");
return (Criteria) this;
}
public Criteria andAccntedPeriodGreaterThanOrEqualTo(Integer value) {
addCriterion("AccntedPeriod >=", value, "accntedPeriod");
return (Criteria) this;
}
public Criteria andAccntedPeriodLessThan(Integer value) {
addCriterion("AccntedPeriod <", value, "accntedPeriod");
return (Criteria) this;
}
public Criteria andAccntedPeriodLessThanOrEqualTo(Integer value) {
addCriterion("AccntedPeriod <=", value, "accntedPeriod");
return (Criteria) this;
}
public Criteria andAccntedPeriodIn(List<Integer> values) {
addCriterion("AccntedPeriod in", values, "accntedPeriod");
return (Criteria) this;
}
public Criteria andAccntedPeriodNotIn(List<Integer> values) {
addCriterion("AccntedPeriod not in", values, "accntedPeriod");
return (Criteria) this;
}
public Criteria andAccntedPeriodBetween(Integer value1, Integer value2) {
addCriterion("AccntedPeriod between", value1, value2, "accntedPeriod");
return (Criteria) this;
}
public Criteria andAccntedPeriodNotBetween(Integer value1, Integer value2) {
addCriterion("AccntedPeriod not between", value1, value2, "accntedPeriod");
return (Criteria) this;
}
}
/**
* This class was generated by MyBatis Generator.
* This class corresponds to the database table InputVATInvoice
*
* @mbg.generated do_not_delete_during_merge
*/
public static class Criteria extends GeneratedCriteria {
protected Criteria() {
super();
}
}
/**
* This class was generated by MyBatis Generator.
* This class corresponds to the database table InputVATInvoice
*
* @mbg.generated
*/
public static class Criterion {
private String condition;
private Object value;
private Object secondValue;
private boolean noValue;
private boolean singleValue;
private boolean betweenValue;
private boolean listValue;
private String typeHandler;
public String getCondition() {
return condition;
}
public Object getValue() {
return value;
}
public Object getSecondValue() {
return secondValue;
}
public boolean isNoValue() {
return noValue;
}
public boolean isSingleValue() {
return singleValue;
}
public boolean isBetweenValue() {
return betweenValue;
}
public boolean isListValue() {
return listValue;
}
public String getTypeHandler() {
return typeHandler;
}
protected Criterion(String condition) {
super();
this.condition = condition;
this.typeHandler = null;
this.noValue = true;
}
protected Criterion(String condition, Object value, String typeHandler) {
super();
this.condition = condition;
this.value = value;
this.typeHandler = typeHandler;
if (value instanceof List<?>) {
this.listValue = true;
} else {
this.singleValue = true;
}
}
protected Criterion(String condition, Object value) {
this(condition, value, null);
}
protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
super();
this.condition = condition;
this.value = value;
this.secondValue = secondValue;
this.typeHandler = typeHandler;
this.betweenValue = true;
}
protected Criterion(String condition, Object value, Object secondValue) {
this(condition, value, secondValue, null);
}
}
}
\ No newline at end of file
atms-gen/src/main/java/pwc/taxtech/atms/entity/TemplateGroup.java
View file @ d16cb20f
......@@ -24,7 +24,7 @@ public class TemplateGroup {
private Long copyFrom;
private Date updateTime;
private Date createTime;
private Integer isSystemType;
private Boolean isSystemType;
private String createBy;
private String updateBy;
......@@ -127,11 +127,11 @@ public class TemplateGroup {
@Basic
@Column(name = "IS_SYSTEM_TYPE", nullable = false)
@ColumnDefault(DEF_DEFAULT_NUMBER)
public Integer getIsSystemType() {
public Boolean getIsSystemType() {
return isSystemType;
}
public void setIsSystemType(Integer isSystemType) {
public void setIsSystemType(Boolean isSystemType) {
this.isSystemType = isSystemType;
}
......
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