Commit ab99eea9 authored by neo's avatar neo

[dev] replace periodModiieReportCell mapp entity example

parent 741e5827
...@@ -4,8 +4,8 @@ import com.fasterxml.jackson.annotation.JsonProperty; ...@@ -4,8 +4,8 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import pwc.taxtech.atms.dto.CellTemplateConfigDto; 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.PeriodCellTemplateConfig;
import pwc.taxtech.atms.vat.entity.PeriodModifiedReportCell;
import java.util.List; import java.util.List;
...@@ -58,7 +58,7 @@ public class CellCalcInfoDto { ...@@ -58,7 +58,7 @@ public class CellCalcInfoDto {
private Boolean isModified; private Boolean isModified;
//用户直接修改单元格的信息 //用户直接修改单元格的信息
private ModifiedReportCell modifiedReportCell; private PeriodModifiedReportCell modifiedReportCell;
private List<CellVoucherDatasourceDto> dataVoucherList; private List<CellVoucherDatasourceDto> dataVoucherList;
......
...@@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; ...@@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import pwc.taxtech.atms.dto.CellTemplateConfigDto; import pwc.taxtech.atms.dto.CellTemplateConfigDto;
import pwc.taxtech.atms.vat.entity.ModifiedReportCell; import pwc.taxtech.atms.vat.entity.PeriodModifiedReportCell;
import java.util.List; import java.util.List;
...@@ -55,7 +55,7 @@ public class CellDataDto { ...@@ -55,7 +55,7 @@ public class CellDataDto {
private Boolean isModified; private Boolean isModified;
//用户直接修改单元格的信息 //用户直接修改单元格的信息
private ModifiedReportCell modifiedReportCell; private PeriodModifiedReportCell modifiedReportCell;
private List<CellVoucherDatasourceDto> dataVoucherList; private List<CellVoucherDatasourceDto> dataVoucherList;
......
...@@ -620,9 +620,9 @@ public class ReportServiceImpl extends VatAbstractService implements ReportServi ...@@ -620,9 +620,9 @@ public class ReportServiceImpl extends VatAbstractService implements ReportServi
cellDataDtoList.add(cellDataDto); cellDataDtoList.add(cellDataDto);
}); });
ModifiedReportCellExample modifiedReportCellExample = new ModifiedReportCellExample(); PeriodModifiedReportCellExample modifiedReportCellExample = new PeriodModifiedReportCellExample();
modifiedReportCellExample.createCriteria().andReportIdEqualTo(reportId); modifiedReportCellExample.createCriteria().andReportIdEqualTo(reportId);
List<ModifiedReportCell> modifiedReportCellList = modifiedReportCellMapper.selectByExample(modifiedReportCellExample); List<PeriodModifiedReportCell> modifiedReportCellList = periodModifiedReportCellMapper.selectByExample(modifiedReportCellExample);
modifiedReportCellList.forEach(mrc -> { modifiedReportCellList.forEach(mrc -> {
Optional<CellDataDto> cdd = cellDataDtoList.stream() Optional<CellDataDto> cdd = cellDataDtoList.stream()
.filter(cellDataDto -> cellDataDto.getReportId().equals(mrc.getReportId()) .filter(cellDataDto -> cellDataDto.getReportId().equals(mrc.getReportId())
......
...@@ -84,7 +84,7 @@ public class VatAbstractService { ...@@ -84,7 +84,7 @@ public class VatAbstractService {
@Autowired @Autowired
public PeriodCellDataMapper periodCellDataMapper; public PeriodCellDataMapper periodCellDataMapper;
@Autowired @Autowired
public ModifiedReportCellMapper modifiedReportCellMapper; public PeriodModifiedReportCellMapper periodModifiedReportCellMapper;
@Autowired @Autowired
public PeriodCellCommentMapper periodCellCommentMapper; public PeriodCellCommentMapper periodCellCommentMapper;
@Autowired @Autowired
......
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
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