Merge branch 'dev_oracle_neo' into 'dev_oracle'

Dev oracle neo

See merge request root/atms!136

atms-api/src/main/java/pwc/taxtech/atms/dto/vatdto/CellCalcInfoDto.java

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

-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

 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/resources/pwc/taxtech/atms/vat/dao/extends/PeriodCellTemplateExtendsMapper.xml

@@ -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

@@ -4,7 +4,7 @@
 
     <update id="updateReportId">
         UPDATE
-        PERIOD_PERIOD_FORMULA_BLOCK
+        PERIOD_FORMULA_BLOCK
         SET
         REPORT_ID= #{reportId,jdbcType=BIGINT}
         WHERE