Skip to content

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

Merge branch 'dev_oracle_neo' into 'dev_oracle' 

Dev oracle neo

See merge request root/atms!136
parents 2fe7e9f1 e2447c96
Show whitespace changes
Inline Side-by-side
Showing with 23 additions and 2052 deletions
atms-api/src/main/java/pwc/taxtech/atms/dto/vatdto/CellCalcInfoDto.java
View file @ 9e2a6a9a
......@@ -4,8 +4,8 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Getter;
import lombok.Setter;
import pwc.taxtech.atms.dto.CellTemplateConfigDto;
import pwc.taxtech.atms.vat.entity.ModifiedReportCell;
import pwc.taxtech.atms.vat.entity.PeriodCellTemplateConfig;
import pwc.taxtech.atms.vat.entity.PeriodModifiedReportCell;
import java.util.List;
......@@ -58,7 +58,7 @@ public class CellCalcInfoDto {
private Boolean isModified;
//用户直接修改单元格的信息
private ModifiedReportCell modifiedReportCell;
private PeriodModifiedReportCell modifiedReportCell;
private List<CellVoucherDatasourceDto> dataVoucherList;
......
atms-api/src/main/java/pwc/taxtech/atms/dto/vatdto/CellDataDto.java
View file @ 9e2a6a9a
......@@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Getter;
import lombok.Setter;
import pwc.taxtech.atms.dto.CellTemplateConfigDto;
import pwc.taxtech.atms.vat.entity.ModifiedReportCell;
import pwc.taxtech.atms.vat.entity.PeriodModifiedReportCell;
import java.util.List;
......@@ -55,7 +55,7 @@ public class CellDataDto {
private Boolean isModified;
//用户直接修改单元格的信息
private ModifiedReportCell modifiedReportCell;
private PeriodModifiedReportCell modifiedReportCell;
private List<CellVoucherDatasourceDto> dataVoucherList;
......
atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/ReportGeneratorImpl.java
View file @ 9e2a6a9a
......@@ -69,7 +69,7 @@ public class ReportGeneratorImpl extends VatAbstractService implements ReportGen
int period = periodParam != null ? periodParam : 0;
Project project = projectMapper.selectByPrimaryKey(projectId);
if(templateIds.isEmpty())templateIds.add(Long.MAX_VALUE);
if (templateIds.isEmpty()) templateIds.add(Long.MAX_VALUE);
PeriodTemplateExample periodTemplateExample = new PeriodTemplateExample();
periodTemplateExample.createCriteria().andProjectIdEqualTo(projectId).andPeriodEqualTo(period).andIdIn(templateIds);
......@@ -81,7 +81,7 @@ public class ReportGeneratorImpl extends VatAbstractService implements ReportGen
Long templateGroupId = periodTemplateList.size() > 0 ? periodTemplateList.get(0).getTemplateGroupId() : 0;
PeriodCellTemplateExample periodCellTemplateExample = new PeriodCellTemplateExample();
if(periodTemplateIdList.isEmpty())periodTemplateIdList.add(Long.MAX_VALUE);
if (periodTemplateIdList.isEmpty()) periodTemplateIdList.add(Long.MAX_VALUE);
periodCellTemplateExample.createCriteria().andProjectIdEqualTo(projectId).andReportTemplateIdIn(periodTemplateIdList).andPeriodEqualTo(period);
List<PeriodCellTemplate> periodCellTemplateList = periodCellTemplateMapper.selectByExample(periodCellTemplateExample);
......@@ -401,6 +401,7 @@ public class ReportGeneratorImpl extends VatAbstractService implements ReportGen
cellData.setUpdateBy("Admin");
cellData.setUpdateTime(createTime);
cellData.setProjectId(projectId);
cellData.setPeriod(period);
periodCellDataMapper.insertSelective(cellData);
//after insert celldata, insert the celldatasource for link celldata and datasource
......@@ -506,7 +507,7 @@ public class ReportGeneratorImpl extends VatAbstractService implements ReportGen
workbook.addToolPack(udfToolpack);
}
public List<CellCalcInfoDto> getCellCalcInfo(List<Long> templateIdList, Integer periodParam,String projectId) {
public List<CellCalcInfoDto> getCellCalcInfo(List<Long> templateIdList, Integer periodParam, String projectId) {
//already finished by 20180711
int period = 0;
if (periodParam != null) {
......@@ -516,7 +517,7 @@ public class ReportGeneratorImpl extends VatAbstractService implements ReportGen
List<PeriodCellTemplateConfigExtendDto> periodCellTemplateConfigExtendDtos =
periodCellTemplateConfigMapper.getPeriodCellTemplateConfigExtendDtos(templateIdList, period);
fixedPCTParsedFormula(periodCellTemplateConfigExtendDtos,projectId);
fixedPCTParsedFormula(periodCellTemplateConfigExtendDtos, projectId, period);
List<CellCalcInfoDto> cellCalcInfoDtos = new ArrayList<>();
periodCellTemplateConfigExtendDtos.stream().collect(Collectors.groupingBy(a ->
new CellTemplateConfigGroupDto(a.getColumnIndex(), a.getRowIndex()
......@@ -548,7 +549,7 @@ public class ReportGeneratorImpl extends VatAbstractService implements ReportGen
return cellCalcInfoDtos;
}
private void fixedPCTParsedFormula(List<PeriodCellTemplateConfigExtendDto> periodCellTemplateConfigExtendDtos,String projectId) {
private void fixedPCTParsedFormula(List<PeriodCellTemplateConfigExtendDto> periodCellTemplateConfigExtendDtos, String projectId, int period) {
Map<String, List<PCTEntity>> formulaMapToPCT = new HashMap<>();
Map<PeriodCellTemplateConfig, List<String>> configMapToPCTs = new HashMap<>();
Set<PCTEntity> parameter = new HashSet<>();
......@@ -595,7 +596,7 @@ public class ReportGeneratorImpl extends VatAbstractService implements ReportGen
});
if (!parameter.isEmpty()) {
List<PCTEntity> pctResults = periodCellDataMapper.queryByPCTs(parameter,projectId);
List<PCTEntity> pctResults = periodCellDataMapper.queryByPCTs(parameter, projectId);
Map<PCTEntity, BigDecimal> pctCache = new HashMap<>();
pctResults.forEach(m -> {
BigDecimal data = null;
......
atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/ReportServiceImpl.java
View file @ 9e2a6a9a
......@@ -620,9 +620,9 @@ public class ReportServiceImpl extends VatAbstractService implements ReportServi
cellDataDtoList.add(cellDataDto);
});
ModifiedReportCellExample modifiedReportCellExample = new ModifiedReportCellExample();
PeriodModifiedReportCellExample modifiedReportCellExample = new PeriodModifiedReportCellExample();
modifiedReportCellExample.createCriteria().andReportIdEqualTo(reportId);
List<ModifiedReportCell> modifiedReportCellList = modifiedReportCellMapper.selectByExample(modifiedReportCellExample);
List<PeriodModifiedReportCell> modifiedReportCellList = periodModifiedReportCellMapper.selectByExample(modifiedReportCellExample);
modifiedReportCellList.forEach(mrc -> {
Optional<CellDataDto> cdd = cellDataDtoList.stream()
.filter(cellDataDto -> cellDataDto.getReportId().equals(mrc.getReportId())
......
atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/VatAbstractService.java
View file @ 9e2a6a9a
......@@ -84,7 +84,7 @@ public class VatAbstractService {
@Autowired
public PeriodCellDataMapper periodCellDataMapper;
@Autowired
public ModifiedReportCellMapper modifiedReportCellMapper;
public PeriodModifiedReportCellMapper periodModifiedReportCellMapper;
@Autowired
public PeriodCellCommentMapper periodCellCommentMapper;
@Autowired
......
atms-dao/src/main/java/pwc/taxtech/atms/vat/dao/ModifiedReportCellMapper.java deleted 100644 → 0
View file @ 2fe7e9f1
package pwc.taxtech.atms.vat.dao;
import java.util.List;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.session.RowBounds;
import pwc.taxtech.atms.MyVatMapper;
import pwc.taxtech.atms.vat.entity.ModifiedReportCell;
import pwc.taxtech.atms.vat.entity.ModifiedReportCellExample;
@Mapper
public interface ModifiedReportCellMapper extends MyVatMapper {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table TAX_PROJECT.MODIFIED_REPORT_CELL
*
* @mbg.generated
*/
long countByExample(ModifiedReportCellExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table TAX_PROJECT.MODIFIED_REPORT_CELL
*
* @mbg.generated
*/
int deleteByExample(ModifiedReportCellExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table TAX_PROJECT.MODIFIED_REPORT_CELL
*
* @mbg.generated
*/
int deleteByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table TAX_PROJECT.MODIFIED_REPORT_CELL
*
* @mbg.generated
*/
int insert(ModifiedReportCell record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table TAX_PROJECT.MODIFIED_REPORT_CELL
*
* @mbg.generated
*/
int insertSelective(ModifiedReportCell record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table TAX_PROJECT.MODIFIED_REPORT_CELL
*
* @mbg.generated
*/
List<ModifiedReportCell> selectByExampleWithRowbounds(ModifiedReportCellExample example, RowBounds rowBounds);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table TAX_PROJECT.MODIFIED_REPORT_CELL
*
* @mbg.generated
*/
List<ModifiedReportCell> selectByExample(ModifiedReportCellExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table TAX_PROJECT.MODIFIED_REPORT_CELL
*
* @mbg.generated
*/
ModifiedReportCell selectByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table TAX_PROJECT.MODIFIED_REPORT_CELL
*
* @mbg.generated
*/
int updateByExampleSelective(@Param("record") ModifiedReportCell record, @Param("example") ModifiedReportCellExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table TAX_PROJECT.MODIFIED_REPORT_CELL
*
* @mbg.generated
*/
int updateByExample(@Param("record") ModifiedReportCell record, @Param("example") ModifiedReportCellExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table TAX_PROJECT.MODIFIED_REPORT_CELL
*
* @mbg.generated
*/
int updateByPrimaryKeySelective(ModifiedReportCell record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table TAX_PROJECT.MODIFIED_REPORT_CELL
*
* @mbg.generated
*/
int updateByPrimaryKey(ModifiedReportCell record);
}
\ No newline at end of file
atms-dao/src/main/java/pwc/taxtech/atms/vat/dao/PeriodCellDataMapper.java
View file @ 9e2a6a9a
package pwc.taxtech.atms.vat.dao;
import java.util.List;
import java.util.Set;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
......@@ -12,6 +9,9 @@ import pwc.taxtech.atms.vat.entity.PCTEntity;
import pwc.taxtech.atms.vat.entity.PeriodCellData;
import pwc.taxtech.atms.vat.entity.PeriodCellDataExample;
import java.util.List;
import java.util.Set;
@Mapper
public interface PeriodCellDataMapper extends MyVatMapper {
/**
......@@ -117,13 +117,13 @@ public interface PeriodCellDataMapper extends MyVatMapper {
" PERIOD_CELL_DATA C, " +
" PERIOD_REPORT R " +
"WHERE " +
" C.REPORT_ID = R.ID AND " +
" and C.PROJECT_ID = #{projectId} " +
" C.REPORT_ID = R.ID" +
" AND C.PROJECT_ID = #{projectId} AND " +
" " +
" <foreach item=\"item\" index=\"index\" collection=\"list\"" +
" open=\"(\" separator=\"OR\" close=\")\">" +
" ( R.PERIOD=#{item.period} AND C.CELL_TEMPLATE_ID=#{item.cellTemplateId} )" +
" </foreach>" +
"</script>")
List<PCTEntity> queryByPCTs(@Param("list") Set<PCTEntity> parameter,@Param("projectId") String projectId);
List<PCTEntity> queryByPCTs(@Param("list") Set<PCTEntity> parameter, @Param("projectId") String projectId);
}
\ No newline at end of file
atms-dao/src/main/java/pwc/taxtech/atms/vat/entity/ModifiedReportCell.java deleted 100644 → 0
View file @ 2fe7e9f1
package pwc.taxtech.atms.vat.entity;
import java.io.Serializable;
import java.util.Date;
/**
*
* This class was generated by MyBatis Generator.
* This class corresponds to the database table TAX_PROJECT.MODIFIED_REPORT_CELL
*
* @mbg.generated do_not_delete_during_merge
*/
public class ModifiedReportCell implements Serializable {
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column TAX_PROJECT.MODIFIED_REPORT_CELL.ID
*
* @mbg.generated
*/
private Long id;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column TAX_PROJECT.MODIFIED_REPORT_CELL.REPORT_ID
*
* @mbg.generated
*/
private Long reportId;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column TAX_PROJECT.MODIFIED_REPORT_CELL.ROW
*
* @mbg.generated
*/
private Integer row;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column TAX_PROJECT.MODIFIED_REPORT_CELL.COL
*
* @mbg.generated
*/
private Integer col;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column TAX_PROJECT.MODIFIED_REPORT_CELL.ORIGINAL_VALUE
*
* @mbg.generated
*/
private String originalValue;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column TAX_PROJECT.MODIFIED_REPORT_CELL.VALUE
*
* @mbg.generated
*/
private String value;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column TAX_PROJECT.MODIFIED_REPORT_CELL.RELATED_CELL_DATA_ID
*
* @mbg.generated
*/
private Long relatedCellDataId;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column TAX_PROJECT.MODIFIED_REPORT_CELL.COMMENT
*
* @mbg.generated
*/
private String comment;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column TAX_PROJECT.MODIFIED_REPORT_CELL.CREATE_TIME
*
* @mbg.generated
*/
private Date createTime;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column TAX_PROJECT.MODIFIED_REPORT_CELL.UPDATE_TIME
*
* @mbg.generated
*/
private Date updateTime;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column TAX_PROJECT.MODIFIED_REPORT_CELL.CREATE_BY
*
* @mbg.generated
*/
private String createBy;
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column TAX_PROJECT.MODIFIED_REPORT_CELL.UPDATE_BY
*
* @mbg.generated
*/
private String updateBy;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table TAX_PROJECT.MODIFIED_REPORT_CELL
*
* @mbg.generated
*/
private static final long serialVersionUID = 1L;
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column TAX_PROJECT.MODIFIED_REPORT_CELL.ID
*
* @return the value of TAX_PROJECT.MODIFIED_REPORT_CELL.ID
*
* @mbg.generated
*/
public Long getId() {
return id;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column TAX_PROJECT.MODIFIED_REPORT_CELL.ID
*
* @param id the value for TAX_PROJECT.MODIFIED_REPORT_CELL.ID
*
* @mbg.generated
*/
public void setId(Long id) {
this.id = id;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column TAX_PROJECT.MODIFIED_REPORT_CELL.REPORT_ID
*
* @return the value of TAX_PROJECT.MODIFIED_REPORT_CELL.REPORT_ID
*
* @mbg.generated
*/
public Long getReportId() {
return reportId;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column TAX_PROJECT.MODIFIED_REPORT_CELL.REPORT_ID
*
* @param reportId the value for TAX_PROJECT.MODIFIED_REPORT_CELL.REPORT_ID
*
* @mbg.generated
*/
public void setReportId(Long reportId) {
this.reportId = reportId;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column TAX_PROJECT.MODIFIED_REPORT_CELL.ROW
*
* @return the value of TAX_PROJECT.MODIFIED_REPORT_CELL.ROW
*
* @mbg.generated
*/
public Integer getRow() {
return row;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column TAX_PROJECT.MODIFIED_REPORT_CELL.ROW
*
* @param row the value for TAX_PROJECT.MODIFIED_REPORT_CELL.ROW
*
* @mbg.generated
*/
public void setRow(Integer row) {
this.row = row;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column TAX_PROJECT.MODIFIED_REPORT_CELL.COL
*
* @return the value of TAX_PROJECT.MODIFIED_REPORT_CELL.COL
*
* @mbg.generated
*/
public Integer getCol() {
return col;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column TAX_PROJECT.MODIFIED_REPORT_CELL.COL
*
* @param col the value for TAX_PROJECT.MODIFIED_REPORT_CELL.COL
*
* @mbg.generated
*/
public void setCol(Integer col) {
this.col = col;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column TAX_PROJECT.MODIFIED_REPORT_CELL.ORIGINAL_VALUE
*
* @return the value of TAX_PROJECT.MODIFIED_REPORT_CELL.ORIGINAL_VALUE
*
* @mbg.generated
*/
public String getOriginalValue() {
return originalValue;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column TAX_PROJECT.MODIFIED_REPORT_CELL.ORIGINAL_VALUE
*
* @param originalValue the value for TAX_PROJECT.MODIFIED_REPORT_CELL.ORIGINAL_VALUE
*
* @mbg.generated
*/
public void setOriginalValue(String originalValue) {
this.originalValue = originalValue == null ? null : originalValue.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column TAX_PROJECT.MODIFIED_REPORT_CELL.VALUE
*
* @return the value of TAX_PROJECT.MODIFIED_REPORT_CELL.VALUE
*
* @mbg.generated
*/
public String getValue() {
return value;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column TAX_PROJECT.MODIFIED_REPORT_CELL.VALUE
*
* @param value the value for TAX_PROJECT.MODIFIED_REPORT_CELL.VALUE
*
* @mbg.generated
*/
public void setValue(String value) {
this.value = value == null ? null : value.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column TAX_PROJECT.MODIFIED_REPORT_CELL.RELATED_CELL_DATA_ID
*
* @return the value of TAX_PROJECT.MODIFIED_REPORT_CELL.RELATED_CELL_DATA_ID
*
* @mbg.generated
*/
public Long getRelatedCellDataId() {
return relatedCellDataId;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column TAX_PROJECT.MODIFIED_REPORT_CELL.RELATED_CELL_DATA_ID
*
* @param relatedCellDataId the value for TAX_PROJECT.MODIFIED_REPORT_CELL.RELATED_CELL_DATA_ID
*
* @mbg.generated
*/
public void setRelatedCellDataId(Long relatedCellDataId) {
this.relatedCellDataId = relatedCellDataId;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column TAX_PROJECT.MODIFIED_REPORT_CELL.COMMENT
*
* @return the value of TAX_PROJECT.MODIFIED_REPORT_CELL.COMMENT
*
* @mbg.generated
*/
public String getComment() {
return comment;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column TAX_PROJECT.MODIFIED_REPORT_CELL.COMMENT
*
* @param comment the value for TAX_PROJECT.MODIFIED_REPORT_CELL.COMMENT
*
* @mbg.generated
*/
public void setComment(String comment) {
this.comment = comment == null ? null : comment.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column TAX_PROJECT.MODIFIED_REPORT_CELL.CREATE_TIME
*
* @return the value of TAX_PROJECT.MODIFIED_REPORT_CELL.CREATE_TIME
*
* @mbg.generated
*/
public Date getCreateTime() {
return createTime;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column TAX_PROJECT.MODIFIED_REPORT_CELL.CREATE_TIME
*
* @param createTime the value for TAX_PROJECT.MODIFIED_REPORT_CELL.CREATE_TIME
*
* @mbg.generated
*/
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column TAX_PROJECT.MODIFIED_REPORT_CELL.UPDATE_TIME
*
* @return the value of TAX_PROJECT.MODIFIED_REPORT_CELL.UPDATE_TIME
*
* @mbg.generated
*/
public Date getUpdateTime() {
return updateTime;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column TAX_PROJECT.MODIFIED_REPORT_CELL.UPDATE_TIME
*
* @param updateTime the value for TAX_PROJECT.MODIFIED_REPORT_CELL.UPDATE_TIME
*
* @mbg.generated
*/
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column TAX_PROJECT.MODIFIED_REPORT_CELL.CREATE_BY
*
* @return the value of TAX_PROJECT.MODIFIED_REPORT_CELL.CREATE_BY
*
* @mbg.generated
*/
public String getCreateBy() {
return createBy;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column TAX_PROJECT.MODIFIED_REPORT_CELL.CREATE_BY
*
* @param createBy the value for TAX_PROJECT.MODIFIED_REPORT_CELL.CREATE_BY
*
* @mbg.generated
*/
public void setCreateBy(String createBy) {
this.createBy = createBy == null ? null : createBy.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column TAX_PROJECT.MODIFIED_REPORT_CELL.UPDATE_BY
*
* @return the value of TAX_PROJECT.MODIFIED_REPORT_CELL.UPDATE_BY
*
* @mbg.generated
*/
public String getUpdateBy() {
return updateBy;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column TAX_PROJECT.MODIFIED_REPORT_CELL.UPDATE_BY
*
* @param updateBy the value for TAX_PROJECT.MODIFIED_REPORT_CELL.UPDATE_BY
*
* @mbg.generated
*/
public void setUpdateBy(String updateBy) {
this.updateBy = updateBy == null ? null : updateBy.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table TAX_PROJECT.MODIFIED_REPORT_CELL
*
* @mbg.generated
*/
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName());
sb.append(" [");
sb.append("Hash = ").append(hashCode());
sb.append(", id=").append(id);
sb.append(", reportId=").append(reportId);
sb.append(", row=").append(row);
sb.append(", col=").append(col);
sb.append(", originalValue=").append(originalValue);
sb.append(", value=").append(value);
sb.append(", relatedCellDataId=").append(relatedCellDataId);
sb.append(", comment=").append(comment);
sb.append(", createTime=").append(createTime);
sb.append(", updateTime=").append(updateTime);
sb.append(", createBy=").append(createBy);
sb.append(", updateBy=").append(updateBy);
sb.append("]");
return sb.toString();
}
}
\ No newline at end of file
atms-dao/src/main/java/pwc/taxtech/atms/vat/entity/ModifiedReportCellExample.java deleted 100644 → 0
View file @ 2fe7e9f1
package pwc.taxtech.atms.vat.entity;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
public class ModifiedReportCellExample {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table TAX_PROJECT.MODIFIED_REPORT_CELL
*
* @mbg.generated
*/
protected String orderByClause;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table TAX_PROJECT.MODIFIED_REPORT_CELL
*
* @mbg.generated
*/
protected boolean distinct;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database table TAX_PROJECT.MODIFIED_REPORT_CELL
*
* @mbg.generated
*/
protected List<Criteria> oredCriteria;
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table TAX_PROJECT.MODIFIED_REPORT_CELL
*
* @mbg.generated
*/
public ModifiedReportCellExample() {
oredCriteria = new ArrayList<Criteria>();
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table TAX_PROJECT.MODIFIED_REPORT_CELL
*
* @mbg.generated
*/
public void setOrderByClause(String orderByClause) {
this.orderByClause = orderByClause;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table TAX_PROJECT.MODIFIED_REPORT_CELL
*
* @mbg.generated
*/
public String getOrderByClause() {
return orderByClause;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table TAX_PROJECT.MODIFIED_REPORT_CELL
*
* @mbg.generated
*/
public void setDistinct(boolean distinct) {
this.distinct = distinct;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table TAX_PROJECT.MODIFIED_REPORT_CELL
*
* @mbg.generated
*/
public boolean isDistinct() {
return distinct;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table TAX_PROJECT.MODIFIED_REPORT_CELL
*
* @mbg.generated
*/
public List<Criteria> getOredCriteria() {
return oredCriteria;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table TAX_PROJECT.MODIFIED_REPORT_CELL
*
* @mbg.generated
*/
public void or(Criteria criteria) {
oredCriteria.add(criteria);
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table TAX_PROJECT.MODIFIED_REPORT_CELL
*
* @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 TAX_PROJECT.MODIFIED_REPORT_CELL
*
* @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 TAX_PROJECT.MODIFIED_REPORT_CELL
*
* @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 TAX_PROJECT.MODIFIED_REPORT_CELL
*
* @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 TAX_PROJECT.MODIFIED_REPORT_CELL
*
* @mbg.generated
*/
protected abstract static class GeneratedCriteria {
protected List<Criterion> criteria;
protected GeneratedCriteria() {
super();
criteria = new ArrayList<Criterion>();
}
public boolean isValid() {
return criteria.size() > 0;
}
public List<Criterion> getAllCriteria() {
return criteria;
}
public List<Criterion> getCriteria() {
return criteria;
}
protected void addCriterion(String condition) {
if (condition == null) {
throw new RuntimeException("Value for condition cannot be null");
}
criteria.add(new Criterion(condition));
}
protected void addCriterion(String condition, Object value, String property) {
if (value == null) {
throw new RuntimeException("Value for " + property + " cannot be null");
}
criteria.add(new Criterion(condition, value));
}
protected void addCriterion(String condition, Object value1, Object value2, String property) {
if (value1 == null || value2 == null) {
throw new RuntimeException("Between values for " + property + " cannot be null");
}
criteria.add(new Criterion(condition, value1, value2));
}
public Criteria andIdIsNull() {
addCriterion("ID is null");
return (Criteria) this;
}
public Criteria andIdIsNotNull() {
addCriterion("ID is not null");
return (Criteria) this;
}
public Criteria andIdEqualTo(Long value) {
addCriterion("ID =", value, "id");
return (Criteria) this;
}
public Criteria andIdNotEqualTo(Long value) {
addCriterion("ID <>", value, "id");
return (Criteria) this;
}
public Criteria andIdGreaterThan(Long value) {
addCriterion("ID >", value, "id");
return (Criteria) this;
}
public Criteria andIdGreaterThanOrEqualTo(Long value) {
addCriterion("ID >=", value, "id");
return (Criteria) this;
}
public Criteria andIdLessThan(Long value) {
addCriterion("ID <", value, "id");
return (Criteria) this;
}
public Criteria andIdLessThanOrEqualTo(Long value) {
addCriterion("ID <=", value, "id");
return (Criteria) this;
}
public Criteria andIdIn(List<Long> values) {
addCriterion("ID in", values, "id");
return (Criteria) this;
}
public Criteria andIdNotIn(List<Long> values) {
addCriterion("ID not in", values, "id");
return (Criteria) this;
}
public Criteria andIdBetween(Long value1, Long value2) {
addCriterion("ID between", value1, value2, "id");
return (Criteria) this;
}
public Criteria andIdNotBetween(Long value1, Long value2) {
addCriterion("ID not between", value1, value2, "id");
return (Criteria) this;
}
public Criteria andReportIdIsNull() {
addCriterion("REPORT_ID is null");
return (Criteria) this;
}
public Criteria andReportIdIsNotNull() {
addCriterion("REPORT_ID is not null");
return (Criteria) this;
}
public Criteria andReportIdEqualTo(Long value) {
addCriterion("REPORT_ID =", value, "reportId");
return (Criteria) this;
}
public Criteria andReportIdNotEqualTo(Long value) {
addCriterion("REPORT_ID <>", value, "reportId");
return (Criteria) this;
}
public Criteria andReportIdGreaterThan(Long value) {
addCriterion("REPORT_ID >", value, "reportId");
return (Criteria) this;
}
public Criteria andReportIdGreaterThanOrEqualTo(Long value) {
addCriterion("REPORT_ID >=", value, "reportId");
return (Criteria) this;
}
public Criteria andReportIdLessThan(Long value) {
addCriterion("REPORT_ID <", value, "reportId");
return (Criteria) this;
}
public Criteria andReportIdLessThanOrEqualTo(Long value) {
addCriterion("REPORT_ID <=", value, "reportId");
return (Criteria) this;
}
public Criteria andReportIdIn(List<Long> values) {
addCriterion("REPORT_ID in", values, "reportId");
return (Criteria) this;
}
public Criteria andReportIdNotIn(List<Long> values) {
addCriterion("REPORT_ID not in", values, "reportId");
return (Criteria) this;
}
public Criteria andReportIdBetween(Long value1, Long value2) {
addCriterion("REPORT_ID between", value1, value2, "reportId");
return (Criteria) this;
}
public Criteria andReportIdNotBetween(Long value1, Long value2) {
addCriterion("REPORT_ID not between", value1, value2, "reportId");
return (Criteria) this;
}
public Criteria andRowIsNull() {
addCriterion("\"ROW\" is null");
return (Criteria) this;
}
public Criteria andRowIsNotNull() {
addCriterion("\"ROW\" is not null");
return (Criteria) this;
}
public Criteria andRowEqualTo(Integer value) {
addCriterion("\"ROW\" =", value, "row");
return (Criteria) this;
}
public Criteria andRowNotEqualTo(Integer value) {
addCriterion("\"ROW\" <>", value, "row");
return (Criteria) this;
}
public Criteria andRowGreaterThan(Integer value) {
addCriterion("\"ROW\" >", value, "row");
return (Criteria) this;
}
public Criteria andRowGreaterThanOrEqualTo(Integer value) {
addCriterion("\"ROW\" >=", value, "row");
return (Criteria) this;
}
public Criteria andRowLessThan(Integer value) {
addCriterion("\"ROW\" <", value, "row");
return (Criteria) this;
}
public Criteria andRowLessThanOrEqualTo(Integer value) {
addCriterion("\"ROW\" <=", value, "row");
return (Criteria) this;
}
public Criteria andRowIn(List<Integer> values) {
addCriterion("\"ROW\" in", values, "row");
return (Criteria) this;
}
public Criteria andRowNotIn(List<Integer> values) {
addCriterion("\"ROW\" not in", values, "row");
return (Criteria) this;
}
public Criteria andRowBetween(Integer value1, Integer value2) {
addCriterion("\"ROW\" between", value1, value2, "row");
return (Criteria) this;
}
public Criteria andRowNotBetween(Integer value1, Integer value2) {
addCriterion("\"ROW\" not between", value1, value2, "row");
return (Criteria) this;
}
public Criteria andColIsNull() {
addCriterion("COL is null");
return (Criteria) this;
}
public Criteria andColIsNotNull() {
addCriterion("COL is not null");
return (Criteria) this;
}
public Criteria andColEqualTo(Integer value) {
addCriterion("COL =", value, "col");
return (Criteria) this;
}
public Criteria andColNotEqualTo(Integer value) {
addCriterion("COL <>", value, "col");
return (Criteria) this;
}
public Criteria andColGreaterThan(Integer value) {
addCriterion("COL >", value, "col");
return (Criteria) this;
}
public Criteria andColGreaterThanOrEqualTo(Integer value) {
addCriterion("COL >=", value, "col");
return (Criteria) this;
}
public Criteria andColLessThan(Integer value) {
addCriterion("COL <", value, "col");
return (Criteria) this;
}
public Criteria andColLessThanOrEqualTo(Integer value) {
addCriterion("COL <=", value, "col");
return (Criteria) this;
}
public Criteria andColIn(List<Integer> values) {
addCriterion("COL in", values, "col");
return (Criteria) this;
}
public Criteria andColNotIn(List<Integer> values) {
addCriterion("COL not in", values, "col");
return (Criteria) this;
}
public Criteria andColBetween(Integer value1, Integer value2) {
addCriterion("COL between", value1, value2, "col");
return (Criteria) this;
}
public Criteria andColNotBetween(Integer value1, Integer value2) {
addCriterion("COL not between", value1, value2, "col");
return (Criteria) this;
}
public Criteria andOriginalValueIsNull() {
addCriterion("ORIGINAL_VALUE is null");
return (Criteria) this;
}
public Criteria andOriginalValueIsNotNull() {
addCriterion("ORIGINAL_VALUE is not null");
return (Criteria) this;
}
public Criteria andOriginalValueEqualTo(String value) {
addCriterion("ORIGINAL_VALUE =", value, "originalValue");
return (Criteria) this;
}
public Criteria andOriginalValueNotEqualTo(String value) {
addCriterion("ORIGINAL_VALUE <>", value, "originalValue");
return (Criteria) this;
}
public Criteria andOriginalValueGreaterThan(String value) {
addCriterion("ORIGINAL_VALUE >", value, "originalValue");
return (Criteria) this;
}
public Criteria andOriginalValueGreaterThanOrEqualTo(String value) {
addCriterion("ORIGINAL_VALUE >=", value, "originalValue");
return (Criteria) this;
}
public Criteria andOriginalValueLessThan(String value) {
addCriterion("ORIGINAL_VALUE <", value, "originalValue");
return (Criteria) this;
}
public Criteria andOriginalValueLessThanOrEqualTo(String value) {
addCriterion("ORIGINAL_VALUE <=", value, "originalValue");
return (Criteria) this;
}
public Criteria andOriginalValueLike(String value) {
addCriterion("ORIGINAL_VALUE like", value, "originalValue");
return (Criteria) this;
}
public Criteria andOriginalValueNotLike(String value) {
addCriterion("ORIGINAL_VALUE not like", value, "originalValue");
return (Criteria) this;
}
public Criteria andOriginalValueIn(List<String> values) {
addCriterion("ORIGINAL_VALUE in", values, "originalValue");
return (Criteria) this;
}
public Criteria andOriginalValueNotIn(List<String> values) {
addCriterion("ORIGINAL_VALUE not in", values, "originalValue");
return (Criteria) this;
}
public Criteria andOriginalValueBetween(String value1, String value2) {
addCriterion("ORIGINAL_VALUE between", value1, value2, "originalValue");
return (Criteria) this;
}
public Criteria andOriginalValueNotBetween(String value1, String value2) {
addCriterion("ORIGINAL_VALUE not between", value1, value2, "originalValue");
return (Criteria) this;
}
public Criteria andValueIsNull() {
addCriterion("\"VALUE\" is null");
return (Criteria) this;
}
public Criteria andValueIsNotNull() {
addCriterion("\"VALUE\" is not null");
return (Criteria) this;
}
public Criteria andValueEqualTo(String value) {
addCriterion("\"VALUE\" =", value, "value");
return (Criteria) this;
}
public Criteria andValueNotEqualTo(String value) {
addCriterion("\"VALUE\" <>", value, "value");
return (Criteria) this;
}
public Criteria andValueGreaterThan(String value) {
addCriterion("\"VALUE\" >", value, "value");
return (Criteria) this;
}
public Criteria andValueGreaterThanOrEqualTo(String value) {
addCriterion("\"VALUE\" >=", value, "value");
return (Criteria) this;
}
public Criteria andValueLessThan(String value) {
addCriterion("\"VALUE\" <", value, "value");
return (Criteria) this;
}
public Criteria andValueLessThanOrEqualTo(String value) {
addCriterion("\"VALUE\" <=", value, "value");
return (Criteria) this;
}
public Criteria andValueLike(String value) {
addCriterion("\"VALUE\" like", value, "value");
return (Criteria) this;
}
public Criteria andValueNotLike(String value) {
addCriterion("\"VALUE\" not like", value, "value");
return (Criteria) this;
}
public Criteria andValueIn(List<String> values) {
addCriterion("\"VALUE\" in", values, "value");
return (Criteria) this;
}
public Criteria andValueNotIn(List<String> values) {
addCriterion("\"VALUE\" not in", values, "value");
return (Criteria) this;
}
public Criteria andValueBetween(String value1, String value2) {
addCriterion("\"VALUE\" between", value1, value2, "value");
return (Criteria) this;
}
public Criteria andValueNotBetween(String value1, String value2) {
addCriterion("\"VALUE\" not between", value1, value2, "value");
return (Criteria) this;
}
public Criteria andRelatedCellDataIdIsNull() {
addCriterion("RELATED_CELL_DATA_ID is null");
return (Criteria) this;
}
public Criteria andRelatedCellDataIdIsNotNull() {
addCriterion("RELATED_CELL_DATA_ID is not null");
return (Criteria) this;
}
public Criteria andRelatedCellDataIdEqualTo(Long value) {
addCriterion("RELATED_CELL_DATA_ID =", value, "relatedCellDataId");
return (Criteria) this;
}
public Criteria andRelatedCellDataIdNotEqualTo(Long value) {
addCriterion("RELATED_CELL_DATA_ID <>", value, "relatedCellDataId");
return (Criteria) this;
}
public Criteria andRelatedCellDataIdGreaterThan(Long value) {
addCriterion("RELATED_CELL_DATA_ID >", value, "relatedCellDataId");
return (Criteria) this;
}
public Criteria andRelatedCellDataIdGreaterThanOrEqualTo(Long value) {
addCriterion("RELATED_CELL_DATA_ID >=", value, "relatedCellDataId");
return (Criteria) this;
}
public Criteria andRelatedCellDataIdLessThan(Long value) {
addCriterion("RELATED_CELL_DATA_ID <", value, "relatedCellDataId");
return (Criteria) this;
}
public Criteria andRelatedCellDataIdLessThanOrEqualTo(Long value) {
addCriterion("RELATED_CELL_DATA_ID <=", value, "relatedCellDataId");
return (Criteria) this;
}
public Criteria andRelatedCellDataIdIn(List<Long> values) {
addCriterion("RELATED_CELL_DATA_ID in", values, "relatedCellDataId");
return (Criteria) this;
}
public Criteria andRelatedCellDataIdNotIn(List<Long> values) {
addCriterion("RELATED_CELL_DATA_ID not in", values, "relatedCellDataId");
return (Criteria) this;
}
public Criteria andRelatedCellDataIdBetween(Long value1, Long value2) {
addCriterion("RELATED_CELL_DATA_ID between", value1, value2, "relatedCellDataId");
return (Criteria) this;
}
public Criteria andRelatedCellDataIdNotBetween(Long value1, Long value2) {
addCriterion("RELATED_CELL_DATA_ID not between", value1, value2, "relatedCellDataId");
return (Criteria) this;
}
public Criteria andCommentIsNull() {
addCriterion("\"COMMENT\" is null");
return (Criteria) this;
}
public Criteria andCommentIsNotNull() {
addCriterion("\"COMMENT\" is not null");
return (Criteria) this;
}
public Criteria andCommentEqualTo(String value) {
addCriterion("\"COMMENT\" =", value, "comment");
return (Criteria) this;
}
public Criteria andCommentNotEqualTo(String value) {
addCriterion("\"COMMENT\" <>", value, "comment");
return (Criteria) this;
}
public Criteria andCommentGreaterThan(String value) {
addCriterion("\"COMMENT\" >", value, "comment");
return (Criteria) this;
}
public Criteria andCommentGreaterThanOrEqualTo(String value) {
addCriterion("\"COMMENT\" >=", value, "comment");
return (Criteria) this;
}
public Criteria andCommentLessThan(String value) {
addCriterion("\"COMMENT\" <", value, "comment");
return (Criteria) this;
}
public Criteria andCommentLessThanOrEqualTo(String value) {
addCriterion("\"COMMENT\" <=", value, "comment");
return (Criteria) this;
}
public Criteria andCommentLike(String value) {
addCriterion("\"COMMENT\" like", value, "comment");
return (Criteria) this;
}
public Criteria andCommentNotLike(String value) {
addCriterion("\"COMMENT\" not like", value, "comment");
return (Criteria) this;
}
public Criteria andCommentIn(List<String> values) {
addCriterion("\"COMMENT\" in", values, "comment");
return (Criteria) this;
}
public Criteria andCommentNotIn(List<String> values) {
addCriterion("\"COMMENT\" not in", values, "comment");
return (Criteria) this;
}
public Criteria andCommentBetween(String value1, String value2) {
addCriterion("\"COMMENT\" between", value1, value2, "comment");
return (Criteria) this;
}
public Criteria andCommentNotBetween(String value1, String value2) {
addCriterion("\"COMMENT\" not between", value1, value2, "comment");
return (Criteria) this;
}
public Criteria andCreateTimeIsNull() {
addCriterion("CREATE_TIME is null");
return (Criteria) this;
}
public Criteria andCreateTimeIsNotNull() {
addCriterion("CREATE_TIME is not null");
return (Criteria) this;
}
public Criteria andCreateTimeEqualTo(Date value) {
addCriterion("CREATE_TIME =", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeNotEqualTo(Date value) {
addCriterion("CREATE_TIME <>", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeGreaterThan(Date value) {
addCriterion("CREATE_TIME >", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
addCriterion("CREATE_TIME >=", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeLessThan(Date value) {
addCriterion("CREATE_TIME <", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
addCriterion("CREATE_TIME <=", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeIn(List<Date> values) {
addCriterion("CREATE_TIME in", values, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeNotIn(List<Date> values) {
addCriterion("CREATE_TIME not in", values, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeBetween(Date value1, Date value2) {
addCriterion("CREATE_TIME between", value1, value2, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
addCriterion("CREATE_TIME not between", value1, value2, "createTime");
return (Criteria) this;
}
public Criteria andUpdateTimeIsNull() {
addCriterion("UPDATE_TIME is null");
return (Criteria) this;
}
public Criteria andUpdateTimeIsNotNull() {
addCriterion("UPDATE_TIME is not null");
return (Criteria) this;
}
public Criteria andUpdateTimeEqualTo(Date value) {
addCriterion("UPDATE_TIME =", value, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeNotEqualTo(Date value) {
addCriterion("UPDATE_TIME <>", value, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeGreaterThan(Date value) {
addCriterion("UPDATE_TIME >", value, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) {
addCriterion("UPDATE_TIME >=", value, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeLessThan(Date value) {
addCriterion("UPDATE_TIME <", value, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeLessThanOrEqualTo(Date value) {
addCriterion("UPDATE_TIME <=", value, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeIn(List<Date> values) {
addCriterion("UPDATE_TIME in", values, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeNotIn(List<Date> values) {
addCriterion("UPDATE_TIME not in", values, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeBetween(Date value1, Date value2) {
addCriterion("UPDATE_TIME between", value1, value2, "updateTime");
return (Criteria) this;
}
public Criteria andUpdateTimeNotBetween(Date value1, Date value2) {
addCriterion("UPDATE_TIME not between", value1, value2, "updateTime");
return (Criteria) this;
}
public Criteria andCreateByIsNull() {
addCriterion("CREATE_BY is null");
return (Criteria) this;
}
public Criteria andCreateByIsNotNull() {
addCriterion("CREATE_BY is not null");
return (Criteria) this;
}
public Criteria andCreateByEqualTo(String value) {
addCriterion("CREATE_BY =", value, "createBy");
return (Criteria) this;
}
public Criteria andCreateByNotEqualTo(String value) {
addCriterion("CREATE_BY <>", value, "createBy");
return (Criteria) this;
}
public Criteria andCreateByGreaterThan(String value) {
addCriterion("CREATE_BY >", value, "createBy");
return (Criteria) this;
}
public Criteria andCreateByGreaterThanOrEqualTo(String value) {
addCriterion("CREATE_BY >=", value, "createBy");
return (Criteria) this;
}
public Criteria andCreateByLessThan(String value) {
addCriterion("CREATE_BY <", value, "createBy");
return (Criteria) this;
}
public Criteria andCreateByLessThanOrEqualTo(String value) {
addCriterion("CREATE_BY <=", value, "createBy");
return (Criteria) this;
}
public Criteria andCreateByLike(String value) {
addCriterion("CREATE_BY like", value, "createBy");
return (Criteria) this;
}
public Criteria andCreateByNotLike(String value) {
addCriterion("CREATE_BY not like", value, "createBy");
return (Criteria) this;
}
public Criteria andCreateByIn(List<String> values) {
addCriterion("CREATE_BY in", values, "createBy");
return (Criteria) this;
}
public Criteria andCreateByNotIn(List<String> values) {
addCriterion("CREATE_BY not in", values, "createBy");
return (Criteria) this;
}
public Criteria andCreateByBetween(String value1, String value2) {
addCriterion("CREATE_BY between", value1, value2, "createBy");
return (Criteria) this;
}
public Criteria andCreateByNotBetween(String value1, String value2) {
addCriterion("CREATE_BY not between", value1, value2, "createBy");
return (Criteria) this;
}
public Criteria andUpdateByIsNull() {
addCriterion("UPDATE_BY is null");
return (Criteria) this;
}
public Criteria andUpdateByIsNotNull() {
addCriterion("UPDATE_BY is not null");
return (Criteria) this;
}
public Criteria andUpdateByEqualTo(String value) {
addCriterion("UPDATE_BY =", value, "updateBy");
return (Criteria) this;
}
public Criteria andUpdateByNotEqualTo(String value) {
addCriterion("UPDATE_BY <>", value, "updateBy");
return (Criteria) this;
}
public Criteria andUpdateByGreaterThan(String value) {
addCriterion("UPDATE_BY >", value, "updateBy");
return (Criteria) this;
}
public Criteria andUpdateByGreaterThanOrEqualTo(String value) {
addCriterion("UPDATE_BY >=", value, "updateBy");
return (Criteria) this;
}
public Criteria andUpdateByLessThan(String value) {
addCriterion("UPDATE_BY <", value, "updateBy");
return (Criteria) this;
}
public Criteria andUpdateByLessThanOrEqualTo(String value) {
addCriterion("UPDATE_BY <=", value, "updateBy");
return (Criteria) this;
}
public Criteria andUpdateByLike(String value) {
addCriterion("UPDATE_BY like", value, "updateBy");
return (Criteria) this;
}
public Criteria andUpdateByNotLike(String value) {
addCriterion("UPDATE_BY not like", value, "updateBy");
return (Criteria) this;
}
public Criteria andUpdateByIn(List<String> values) {
addCriterion("UPDATE_BY in", values, "updateBy");
return (Criteria) this;
}
public Criteria andUpdateByNotIn(List<String> values) {
addCriterion("UPDATE_BY not in", values, "updateBy");
return (Criteria) this;
}
public Criteria andUpdateByBetween(String value1, String value2) {
addCriterion("UPDATE_BY between", value1, value2, "updateBy");
return (Criteria) this;
}
public Criteria andUpdateByNotBetween(String value1, String value2) {
addCriterion("UPDATE_BY not between", value1, value2, "updateBy");
return (Criteria) this;
}
}
/**
* This class was generated by MyBatis Generator.
* This class corresponds to the database table TAX_PROJECT.MODIFIED_REPORT_CELL
*
* @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 TAX_PROJECT.MODIFIED_REPORT_CELL
*
* @mbg.generated
*/
public static class Criterion {
private String condition;
private Object value;
private Object secondValue;
private boolean noValue;
private boolean singleValue;
private boolean betweenValue;
private boolean listValue;
private String typeHandler;
public String getCondition() {
return condition;
}
public Object getValue() {
return value;
}
public Object getSecondValue() {
return secondValue;
}
public boolean isNoValue() {
return noValue;
}
public boolean isSingleValue() {
return singleValue;
}
public boolean isBetweenValue() {
return betweenValue;
}
public boolean isListValue() {
return listValue;
}
public String getTypeHandler() {
return typeHandler;
}
protected Criterion(String condition) {
super();
this.condition = condition;
this.typeHandler = null;
this.noValue = true;
}
protected Criterion(String condition, Object value, String typeHandler) {
super();
this.condition = condition;
this.value = value;
this.typeHandler = typeHandler;
if (value instanceof List<?>) {
this.listValue = true;
} else {
this.singleValue = true;
}
}
protected Criterion(String condition, Object value) {
this(condition, value, null);
}
protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
super();
this.condition = condition;
this.value = value;
this.secondValue = secondValue;
this.typeHandler = typeHandler;
this.betweenValue = true;
}
protected Criterion(String condition, Object value, Object secondValue) {
this(condition, value, secondValue, null);
}
}
}
\ No newline at end of file
atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/ModifiedReportCellMapper.xml deleted 100644 → 0
View file @ 2fe7e9f1
<?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.ModifiedReportCellMapper">
<resultMap id="BaseResultMap" type="pwc.taxtech.atms.vat.entity.ModifiedReportCell">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
<id column="ID" jdbcType="DECIMAL" property="id" />
<result column="REPORT_ID" jdbcType="DECIMAL" property="reportId" />
<result column="ROW" jdbcType="DECIMAL" property="row" />
<result column="COL" jdbcType="DECIMAL" property="col" />
<result column="ORIGINAL_VALUE" jdbcType="VARCHAR" property="originalValue" />
<result column="VALUE" jdbcType="VARCHAR" property="value" />
<result column="RELATED_CELL_DATA_ID" jdbcType="DECIMAL" property="relatedCellDataId" />
<result column="COMMENT" jdbcType="VARCHAR" property="comment" />
<result column="CREATE_TIME" jdbcType="TIMESTAMP" property="createTime" />
<result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
<result column="CREATE_BY" jdbcType="VARCHAR" property="createBy" />
<result column="UPDATE_BY" jdbcType="VARCHAR" property="updateBy" />
</resultMap>
<sql id="Example_Where_Clause">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
<where>
<foreach collection="oredCriteria" item="criteria" separator="or">
<if test="criteria.valid">
<trim prefix="(" prefixOverrides="and" suffix=")">
<foreach collection="criteria.criteria" item="criterion">
<choose>
<when test="criterion.noValue">
and ${criterion.condition}
</when>
<when test="criterion.singleValue">
and ${criterion.condition} #{criterion.value}
</when>
<when test="criterion.betweenValue">
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
</when>
<when test="criterion.listValue">
and ${criterion.condition}
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
#{listItem}
</foreach>
</when>
</choose>
</foreach>
</trim>
</if>
</foreach>
</where>
</sql>
<sql id="Update_By_Example_Where_Clause">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
<where>
<foreach collection="example.oredCriteria" item="criteria" separator="or">
<if test="criteria.valid">
<trim prefix="(" prefixOverrides="and" suffix=")">
<foreach collection="criteria.criteria" item="criterion">
<choose>
<when test="criterion.noValue">
and ${criterion.condition}
</when>
<when test="criterion.singleValue">
and ${criterion.condition} #{criterion.value}
</when>
<when test="criterion.betweenValue">
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
</when>
<when test="criterion.listValue">
and ${criterion.condition}
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
#{listItem}
</foreach>
</when>
</choose>
</foreach>
</trim>
</if>
</foreach>
</where>
</sql>
<sql id="Base_Column_List">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
ID, REPORT_ID, "ROW", COL, ORIGINAL_VALUE, "VALUE", RELATED_CELL_DATA_ID, "COMMENT",
CREATE_TIME, UPDATE_TIME, CREATE_BY, UPDATE_BY
</sql>
<select id="selectByExample" parameterType="pwc.taxtech.atms.vat.entity.ModifiedReportCellExample" resultMap="BaseResultMap">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select
<if test="distinct">
distinct
</if>
<include refid="Base_Column_List" />
from MODIFIED_REPORT_CELL
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
<if test="orderByClause != null">
order by ${orderByClause}
</if>
</select>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select
<include refid="Base_Column_List" />
from MODIFIED_REPORT_CELL
where ID = #{id,jdbcType=DECIMAL}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
delete from MODIFIED_REPORT_CELL
where ID = #{id,jdbcType=DECIMAL}
</delete>
<delete id="deleteByExample" parameterType="pwc.taxtech.atms.vat.entity.ModifiedReportCellExample">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
delete from MODIFIED_REPORT_CELL
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</delete>
<insert id="insert" parameterType="pwc.taxtech.atms.vat.entity.ModifiedReportCell">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
insert into MODIFIED_REPORT_CELL (ID, REPORT_ID, "ROW",
COL, ORIGINAL_VALUE, "VALUE",
RELATED_CELL_DATA_ID, "COMMENT", CREATE_TIME,
UPDATE_TIME, CREATE_BY, UPDATE_BY
)
values (#{id,jdbcType=DECIMAL}, #{reportId,jdbcType=DECIMAL}, #{row,jdbcType=DECIMAL},
#{col,jdbcType=DECIMAL}, #{originalValue,jdbcType=VARCHAR}, #{value,jdbcType=VARCHAR},
#{relatedCellDataId,jdbcType=DECIMAL}, #{comment,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP},
#{updateTime,jdbcType=TIMESTAMP}, #{createBy,jdbcType=VARCHAR}, #{updateBy,jdbcType=VARCHAR}
)
</insert>
<insert id="insertSelective" parameterType="pwc.taxtech.atms.vat.entity.ModifiedReportCell">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
insert into MODIFIED_REPORT_CELL
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
ID,
</if>
<if test="reportId != null">
REPORT_ID,
</if>
<if test="row != null">
"ROW",
</if>
<if test="col != null">
COL,
</if>
<if test="originalValue != null">
ORIGINAL_VALUE,
</if>
<if test="value != null">
"VALUE",
</if>
<if test="relatedCellDataId != null">
RELATED_CELL_DATA_ID,
</if>
<if test="comment != null">
"COMMENT",
</if>
<if test="createTime != null">
CREATE_TIME,
</if>
<if test="updateTime != null">
UPDATE_TIME,
</if>
<if test="createBy != null">
CREATE_BY,
</if>
<if test="updateBy != null">
UPDATE_BY,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
#{id,jdbcType=DECIMAL},
</if>
<if test="reportId != null">
#{reportId,jdbcType=DECIMAL},
</if>
<if test="row != null">
#{row,jdbcType=DECIMAL},
</if>
<if test="col != null">
#{col,jdbcType=DECIMAL},
</if>
<if test="originalValue != null">
#{originalValue,jdbcType=VARCHAR},
</if>
<if test="value != null">
#{value,jdbcType=VARCHAR},
</if>
<if test="relatedCellDataId != null">
#{relatedCellDataId,jdbcType=DECIMAL},
</if>
<if test="comment != null">
#{comment,jdbcType=VARCHAR},
</if>
<if test="createTime != null">
#{createTime,jdbcType=TIMESTAMP},
</if>
<if test="updateTime != null">
#{updateTime,jdbcType=TIMESTAMP},
</if>
<if test="createBy != null">
#{createBy,jdbcType=VARCHAR},
</if>
<if test="updateBy != null">
#{updateBy,jdbcType=VARCHAR},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="pwc.taxtech.atms.vat.entity.ModifiedReportCellExample" resultType="java.lang.Long">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select count(*) from MODIFIED_REPORT_CELL
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</select>
<update id="updateByExampleSelective" parameterType="map">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update MODIFIED_REPORT_CELL
<set>
<if test="record.id != null">
ID = #{record.id,jdbcType=DECIMAL},
</if>
<if test="record.reportId != null">
REPORT_ID = #{record.reportId,jdbcType=DECIMAL},
</if>
<if test="record.row != null">
"ROW" = #{record.row,jdbcType=DECIMAL},
</if>
<if test="record.col != null">
COL = #{record.col,jdbcType=DECIMAL},
</if>
<if test="record.originalValue != null">
ORIGINAL_VALUE = #{record.originalValue,jdbcType=VARCHAR},
</if>
<if test="record.value != null">
"VALUE" = #{record.value,jdbcType=VARCHAR},
</if>
<if test="record.relatedCellDataId != null">
RELATED_CELL_DATA_ID = #{record.relatedCellDataId,jdbcType=DECIMAL},
</if>
<if test="record.comment != null">
"COMMENT" = #{record.comment,jdbcType=VARCHAR},
</if>
<if test="record.createTime != null">
CREATE_TIME = #{record.createTime,jdbcType=TIMESTAMP},
</if>
<if test="record.updateTime != null">
UPDATE_TIME = #{record.updateTime,jdbcType=TIMESTAMP},
</if>
<if test="record.createBy != null">
CREATE_BY = #{record.createBy,jdbcType=VARCHAR},
</if>
<if test="record.updateBy != null">
UPDATE_BY = #{record.updateBy,jdbcType=VARCHAR},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByExample" parameterType="map">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update MODIFIED_REPORT_CELL
set ID = #{record.id,jdbcType=DECIMAL},
REPORT_ID = #{record.reportId,jdbcType=DECIMAL},
"ROW" = #{record.row,jdbcType=DECIMAL},
COL = #{record.col,jdbcType=DECIMAL},
ORIGINAL_VALUE = #{record.originalValue,jdbcType=VARCHAR},
"VALUE" = #{record.value,jdbcType=VARCHAR},
RELATED_CELL_DATA_ID = #{record.relatedCellDataId,jdbcType=DECIMAL},
"COMMENT" = #{record.comment,jdbcType=VARCHAR},
CREATE_TIME = #{record.createTime,jdbcType=TIMESTAMP},
UPDATE_TIME = #{record.updateTime,jdbcType=TIMESTAMP},
CREATE_BY = #{record.createBy,jdbcType=VARCHAR},
UPDATE_BY = #{record.updateBy,jdbcType=VARCHAR}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByPrimaryKeySelective" parameterType="pwc.taxtech.atms.vat.entity.ModifiedReportCell">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update MODIFIED_REPORT_CELL
<set>
<if test="reportId != null">
REPORT_ID = #{reportId,jdbcType=DECIMAL},
</if>
<if test="row != null">
"ROW" = #{row,jdbcType=DECIMAL},
</if>
<if test="col != null">
COL = #{col,jdbcType=DECIMAL},
</if>
<if test="originalValue != null">
ORIGINAL_VALUE = #{originalValue,jdbcType=VARCHAR},
</if>
<if test="value != null">
"VALUE" = #{value,jdbcType=VARCHAR},
</if>
<if test="relatedCellDataId != null">
RELATED_CELL_DATA_ID = #{relatedCellDataId,jdbcType=DECIMAL},
</if>
<if test="comment != null">
"COMMENT" = #{comment,jdbcType=VARCHAR},
</if>
<if test="createTime != null">
CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
</if>
<if test="updateTime != null">
UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
</if>
<if test="createBy != null">
CREATE_BY = #{createBy,jdbcType=VARCHAR},
</if>
<if test="updateBy != null">
UPDATE_BY = #{updateBy,jdbcType=VARCHAR},
</if>
</set>
where ID = #{id,jdbcType=DECIMAL}
</update>
<update id="updateByPrimaryKey" parameterType="pwc.taxtech.atms.vat.entity.ModifiedReportCell">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update MODIFIED_REPORT_CELL
set REPORT_ID = #{reportId,jdbcType=DECIMAL},
"ROW" = #{row,jdbcType=DECIMAL},
COL = #{col,jdbcType=DECIMAL},
ORIGINAL_VALUE = #{originalValue,jdbcType=VARCHAR},
"VALUE" = #{value,jdbcType=VARCHAR},
RELATED_CELL_DATA_ID = #{relatedCellDataId,jdbcType=DECIMAL},
"COMMENT" = #{comment,jdbcType=VARCHAR},
CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
CREATE_BY = #{createBy,jdbcType=VARCHAR},
UPDATE_BY = #{updateBy,jdbcType=VARCHAR}
where ID = #{id,jdbcType=DECIMAL}
</update>
<select id="selectByExampleWithRowbounds" parameterType="pwc.taxtech.atms.vat.entity.ModifiedReportCellExample" resultMap="BaseResultMap">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select
<if test="distinct">
distinct
</if>
<include refid="Base_Column_List" />
from MODIFIED_REPORT_CELL
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
<if test="orderByClause != null">
order by ${orderByClause}
</if>
</select>
</mapper>
\ No newline at end of file
atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/extends/PeriodCellTemplateExtendsMapper.xml
View file @ 9e2a6a9a
......@@ -91,7 +91,7 @@
A.REPORT_TEMPLATE_ID = B.TEMPLATE_ID
WHERE
B.CODE = #{code,jdbcType=VARCHAR}
AND B.TEMPLATE_GROUP_ID = #{templateGroupID,jdbcType=INTEGER}
AND B.TEMPLATE_GROUP_ID = #{templateGroupId,jdbcType=INTEGER}
AND B.PERIOD = #{period,jdbcType=INTEGER}
AND A.COLUMN_INDEX = #{columnIndex,jdbcType=INTEGER}
AND A.ROW_INDEX = #{rowIndex,jdbcType=INTEGER}
......
atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/extends/PeriodFormulaBlockExtendsMapper.xml
View file @ 9e2a6a9a
......@@ -4,7 +4,7 @@
<update id="updateReportId">
UPDATE
PERIOD_PERIOD_FORMULA_BLOCK
PERIOD_FORMULA_BLOCK
SET
REPORT_ID= #{reportId,jdbcType=BIGINT}
WHERE
......
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