Merge branch 'dev_neo' into 'dev'

Dev neo

See merge request root/atms!48

atms-api/src/main/java/pwc/taxtech/atms/common/util/FormulaUtil.java

+package pwc.taxtech.atms.common.util;
+
+import org.apache.poi.ss.formula.OperationEvaluationContext;
+import org.apache.poi.ss.formula.eval.EvaluationException;
+import org.apache.poi.ss.formula.eval.OperandResolver;
+import org.apache.poi.ss.formula.eval.ValueEval;
+
+public class FormulaUtil {
+    public static String resolverString(ValueEval[] args, OperationEvaluationContext ec, int index)
+            throws EvaluationException {
+        return OperandResolver.coerceValueToString(OperandResolver.getSingleValue(args[index], ec.getRowIndex(),
+                ec.getColumnIndex()));
+    }
+
+    public static Integer resolverInteger(ValueEval[] args, OperationEvaluationContext ec, int index)
+            throws EvaluationException {
+        return OperandResolver.coerceValueToInt(OperandResolver.getSingleValue(args[index], ec.getRowIndex(),
+                ec.getColumnIndex()));
+    }
+
+    public static Boolean resolverBoolean(ValueEval[] args, OperationEvaluationContext ec, int index)
+            throws EvaluationException {
+        return OperandResolver.coerceValueToBoolean(OperandResolver.getSingleValue(args[index], ec.getRowIndex(),
+                ec.getColumnIndex()), false);
+    }
+
+
+    public static Double resolverDouble(ValueEval[] args, OperationEvaluationContext ec, int index)
+            throws EvaluationException {
+        return OperandResolver.coerceValueToDouble(OperandResolver.getSingleValue(args[index], ec.getRowIndex(),
+                ec.getColumnIndex()));
+    }
+}

atms-api/src/main/java/pwc/taxtech/atms/utils/NPOIHelper.java → atms-api/src/main/java/pwc/taxtech/atms/common/util/NPOIHelper.java

-package pwc.taxtech.atms.utils;
+package pwc.taxtech.atms.common.util;
 
 import org.apache.poi.hssf.usermodel.HSSFDateUtil;
 import org.apache.poi.openxml4j.exceptions.InvalidFormatException;

atms-api/src/main/java/pwc/taxtech/atms/constant/DataSourceName.java

+package pwc.taxtech.atms.constant;
+
+public class DataSourceName {
+    public static final String KeyValueDataSource = "KeyValueDataSource";
+    public static final String InputInvoiceDataSource = "IncomeDataSource";
+    public static final String InputDetailInvoiceDataSource = "IncomeDetailDataSource";
+    public static final String OutputInvoiceDataSource = "OutputInvoiceDataSource";
+    public static final String VoucherDataSource = "VoucherDataSource";
+    public static final String ReportDataSource = "ReportDataSource";
+    public static final String ConditionDataSource = "ConditionDataSource";
+    public static final String MinConditionDataSource = "MinConditionDataSource";
+    public static final String MaxConditionDataSource = "MaxConditionDataSource";
+    public static final String SAPDataSource = "SAPDataSource";
+    public static final String LandSellDataSource = "LandSellDataSource";
+    public static final String UnbilledDataSource = "UnbilledDataSource";
+}

atms-api/src/main/java/pwc/taxtech/atms/constant/enums/FormulaDataSourceType.java

@@ -56,17 +56,8 @@ public enum FormulaDataSourceType {
     TrialBalanceSource(11),
     //QMYESource(12),
     ModelSource(13),
-    // FSESource(14),
-    RuleSource(15),
-    //凭证筛选
-    VoucherFilter(16),
-    //发票筛选
-    InvoiceFilter(17),
-    //模型数据源
-    ModelDatasource(18),
-    // 用于存放特殊逻辑中获取的数据源数值与备注等信息，如未开票视同销售等
-    Special(19),
     TrialBalance(20);
+    // FSESource(14),
 
     private Integer code;
 

atms-api/src/main/java/pwc/taxtech/atms/controller/TBDataImportController.java

@@ -27,7 +27,7 @@ import pwc.taxtech.atms.dto.vatdto.VatEnterpriseAccountDto;
 import pwc.taxtech.atms.service.ICitTBDataImportService;
 import pwc.taxtech.atms.service.IdentityService;
 import pwc.taxtech.atms.service.impl.DataImportServiceImpl;
-import pwc.taxtech.atms.utils.NPOIHelper;
+import pwc.taxtech.atms.common.util.NPOIHelper;
 import pwc.taxtech.atms.vat.dao.DataImportModel;
 import pwc.taxtech.atms.vat.service.TBDataImportService;
 import pwc.taxtech.atms.vat.service.impl.FileUploadAdapter;

atms-api/src/main/java/pwc/taxtech/atms/dao/CitTBDataImportMapper.java

@@ -18,6 +18,6 @@ public interface CitTBDataImportMapper extends MyMapper {
             "</script>")
     Integer deleteByPeriod(@Param("period") Integer period, @Param("tbName") String tbName);
 
-    @Delete("<script>DELETE FROM #{tbName} <if test=\"period != null\"> WHERE Period =#{period} </if></script>")
+    @Delete("<script>DELETE FROM #{tbName} <if test=\"period != null\"> WHERE CurrentPeriodBo =#{period} </if></script>")
     Integer deleteByNameAndPeriod(@Param("tbName") String tbName,@Param("period") Integer period);
 }

atms-api/src/main/java/pwc/taxtech/atms/dao/DataImportMapper.java

@@ -9,7 +9,7 @@ import pwc.taxtech.atms.MyMapper;
 
 @Mapper
 public interface DataImportMapper extends MyMapper {
-    @Delete("DELETE FROM #{tbName} WHERE Period =#{period}")
+    @Delete("DELETE FROM #{tbName} WHERE CurrentPeriodBo =#{period}")
     Integer deleteByNameAndPeriod(@Param("tbName") String tbName, @Param("period") Integer period);
 
 

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

+package pwc.taxtech.atms.dto.vatdto;
+
+import lombok.Getter;
+import org.apache.poi.ss.formula.OperationEvaluationContext;
+import org.apache.poi.ss.formula.eval.EvaluationException;
+import org.apache.poi.ss.formula.eval.ValueEval;
+
+import static pwc.taxtech.atms.common.util.FormulaUtil.resolverInteger;
+import static pwc.taxtech.atms.common.util.FormulaUtil.resolverString;
+
+@Getter
+public class BBParasBo {
+    private String reportCode;
+    private Integer columnIndex;
+    private Integer rowIndex;
+    private Integer period;
+    private Integer year;
+
+    public  BBParasBo(ValueEval[] args, OperationEvaluationContext ec) throws EvaluationException {
+        reportCode = resolverString(args, ec, 0);
+        columnIndex = resolverInteger(args, ec, 1);
+        rowIndex = resolverInteger(args, ec, 3);
+        period = resolverInteger(args, ec, 4);
+        year = resolverInteger(args, ec, 5);
+    }
+
+    public void disCount(){
+        rowIndex--;
+        columnIndex--;
+    }
+
+}

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

 package pwc.taxtech.atms.dto.vatdto;
 
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
 public class CellTemplatePerGroupDto {
     private String cellTemplateID ;
-
     private String reportTemplateID ;
-
     private String reportTemplateGroupID ;
-
     private String formula ;
-
     private int rowIndex ;
-
     private int columnIndex ;
-
     private String reportCode ;
-
     private String rowName ;
-
     private String columnName ;
-
     private Integer resultType ;
-
-    public String getCellTemplateID() {
-        return cellTemplateID;
-    }
-
-    public void setCellTemplateID(String cellTemplateID) {
-        this.cellTemplateID = cellTemplateID;
-    }
-
-    public String getReportTemplateID() {
-        return reportTemplateID;
-    }
-
-    public void setReportTemplateID(String reportTemplateID) {
-        this.reportTemplateID = reportTemplateID;
-    }
-
-    public String getReportTemplateGroupID() {
-        return reportTemplateGroupID;
-    }
-
-    public void setReportTemplateGroupID(String reportTemplateGroupID) {
-        this.reportTemplateGroupID = reportTemplateGroupID;
-    }
-
-    public String getFormula() {
-        return formula;
-    }
-
-    public void setFormula(String formula) {
-        this.formula = formula;
-    }
-
-    public int getRowIndex() {
-        return rowIndex;
-    }
-
-    public void setRowIndex(int rowIndex) {
-        this.rowIndex = rowIndex;
-    }
-
-    public int getColumnIndex() {
-        return columnIndex;
-    }
-
-    public void setColumnIndex(int columnIndex) {
-        this.columnIndex = columnIndex;
-    }
-
-    public String getReportCode() {
-        return reportCode;
-    }
-
-    public void setReportCode(String reportCode) {
-        this.reportCode = reportCode;
-    }
-
-    public String getRowName() {
-        return rowName;
-    }
-
-    public void setRowName(String rowName) {
-        this.rowName = rowName;
-    }
-
-    public String getColumnName() {
-        return columnName;
-    }
-
-    public void setColumnName(String columnName) {
-        this.columnName = columnName;
-    }
-
-    public Integer getResultType() {
-        return resultType;
-    }
-
-    public void setResultType(Integer resultType) {
-        this.resultType = resultType;
-    }
 }

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

+package pwc.taxtech.atms.dto.vatdto;
+
+import pwc.taxtech.atms.vat.service.impl.report.functions.FormulaAgent;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class CloseableFormulaDataSource implements AutoCloseable{
+  private   List<FormulaDataSourceDto> dataSourceList = new ArrayList<>();
+  private FormulaAgent agent;
+
+    public CloseableFormulaDataSource(FormulaAgent agent) {
+        this.agent = agent;
+    }
+
+    public void addDS(FormulaDataSourceDto ds){
+        dataSourceList.add(ds);
+    }
+
+    public void addDS(List<FormulaDataSourceDto> dss){
+        dataSourceList.addAll(dss);
+    }
+
+    public void clean(){
+        dataSourceList.clear();
+    }
+
+    @Override
+    public void close() throws Exception {
+        if(!dataSourceList.isEmpty()){
+//            agent.save(dataSourceList);//TODO: save datasources;
+        }
+    }
+}

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

+package pwc.taxtech.atms.dto.vatdto;
+
+import lombok.Getter;
+
+@Getter
+public class CurrentPeriodBo {
+    int curYear = 0;
+    int curPeriod;
+
+    public CurrentPeriodBo(int period) {
+        this.curPeriod = period;
+    }
+
+    public CurrentPeriodBo fixedCurYear(int curYear) {
+        this.curYear =+ curYear;
+        return this;
+    }
+
+   public static CurrentPeriodBo getPeriod(int parameterPeriod,int periodContent) {
+        int yearOffset = 0;
+        if (parameterPeriod == -99) {
+            return new CurrentPeriodBo(parameterPeriod);
+        } else if (parameterPeriod <= -1) {
+            Integer period = parameterPeriod +periodContent;
+            while (period <= 0) {
+                yearOffset--;
+                period += 12;
+                //throw new NotImplementedException();
+            }
+
+            return new CurrentPeriodBo(period).fixedCurYear(yearOffset);
+        } else if (parameterPeriod == 0) {
+            return new CurrentPeriodBo(periodContent);
+        } else {
+            return new CurrentPeriodBo(parameterPeriod);
+        }
+    }
+}

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

 package pwc.taxtech.atms.dto.vatdto;
 
+import lombok.Getter;
+import lombok.Setter;
+
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
+@Getter
+@Setter
 public class DataSourceDto {
     private static String _DataSourcePrefix = "DS[";
     private static String _DataSourceSuffix = "]";
@@ -12,177 +17,32 @@ public class DataSourceDto {
         this.internalCode = _DataSourcePrefix + hashCode() + _DataSourceSuffix;
     }
 
-    private String id;
+    String id;
 
-    private String internalCode;
-    private String name;
+    String internalCode;
+    String name;
 
     // 1: Formula, 2: Voucher, 3: OutputInvoice, 4: InputInvoice, 5: CustomInvoice, 6: KeyIn, 7: RelatedModel, 8: SapDaily
-    private Integer dataSourceType;
-    private BigDecimal amount;
-    private String description;
+    Integer dataSourceType;
+    BigDecimal amount;
+    String description;
 
     // 1: +, 2: -, 3: *, 4: /
-    private Integer operationType;
+    Integer operationType;
 
     // 1: Number, 2: Percentage, 3: Boolean, 4: String
-    private Integer resultType;
-
-    private Integer type;
-    private String keyValueDataID;
-    private String creator;
-    private Date createTime;
-    private String updater;
-    private Date updateTime;
-
-    private String cellDataID;
-    private List<String> items;
-
-    private String projectID;
-
-    private String serviceTypeID;
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getInternalCode() {
-        return internalCode;
-    }
-
-    public void setInternalCode(String internalCode) {
-        this.internalCode = internalCode;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public Integer getDataSourceType() {
-        return dataSourceType;
-    }
-
-    public void setDataSourceType(Integer dataSourceType) {
-        this.dataSourceType = dataSourceType;
-    }
-
-    public BigDecimal getAmount() {
-        return amount;
-    }
-
-    public void setAmount(BigDecimal amount) {
-        this.amount = amount;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public Integer getOperationType() {
-        return operationType;
-    }
-
-    public void setOperationType(Integer operationType) {
-        this.operationType = operationType;
-    }
-
-    public Integer getResultType() {
-        return resultType;
-    }
-
-    public void setResultType(Integer resultType) {
-        this.resultType = resultType;
-    }
+    Integer resultType;
 
-    public Integer getType() {
-        return type;
-    }
-
-    public void setType(Integer type) {
-        this.type = type;
-    }
-
-    public String getKeyValueDataID() {
-        return keyValueDataID;
-    }
+    Integer type;
+    String keyValueDataID;
+    String creator;
+    Date createTime;
+    String updater;
+    Date updateTime;
 
-    public void setKeyValueDataID(String keyValueDataID) {
-        this.keyValueDataID = keyValueDataID;
-    }
-
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator) {
-        this.creator = creator;
-    }
+    String cellDataID;
+    List<String> items;
 
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public String getUpdater() {
-        return updater;
-    }
-
-    public void setUpdater(String updater) {
-        this.updater = updater;
-    }
-
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    public String getCellDataID() {
-        return cellDataID;
-    }
-
-    public void setCellDataID(String cellDataID) {
-        this.cellDataID = cellDataID;
-    }
-
-    public List<String> getItems() {
-        return items;
-    }
-
-    public void setItems(List<String> items) {
-        this.items = items;
-    }
-
-    public String getProjectID() {
-        return projectID;
-    }
-
-    public void setProjectID(String projectID) {
-        this.projectID = projectID;
-    }
-
-    public String getServiceTypeID() {
-        return serviceTypeID;
-    }
-
-    public void setServiceTypeID(String serviceTypeID) {
-        this.serviceTypeID = serviceTypeID;
-    }
+    String projectID;
+    String serviceTypeID;
 }

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

 package pwc.taxtech.atms.dto.vatdto;
 
-public class FormulaDataSourceDto extends DataSourceDto{
+import pwc.taxtech.atms.constant.enums.CellDataSourceType;
 
-    private Integer type;
+public class FormulaDataSourceDto extends DataSourceDto {
+    Integer type;
+
+    public FormulaDataSourceDto() {
+        super();
+        this.type = CellDataSourceType.Formula.getCode();
+    }
 }

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

+package pwc.taxtech.atms.dto.vatdto;
+
+import pwc.taxtech.atms.constant.Constant;
+import pwc.taxtech.atms.constant.DataSourceName;
+import pwc.taxtech.atms.constant.enums.FormulaDataSourceType;
+
+public class ReportCellDataSourceDto extends FormulaDataSourceDto {
+    Integer year;
+    Integer period;
+    Integer columnIndex;
+    String columnName;
+    Integer rowIndex;
+    String rowName;
+    String reportTemplateID;
+    String reportName;
+    String cellDataID;
+    String cellTemplateID;
+    Boolean isOnlyManualInput;
+
+    public ReportCellDataSourceDto() {
+        super();
+        this.type = FormulaDataSourceType.Report.getCode();
+    }
+
+    public static ReportCellDataSourceDto nullDataSource(BBParasBo bbParasBo,CurrentPeriodBo currentPeriodBo) {
+        ReportCellDataSourceDto nulDataSource = new ReportCellDataSourceDto();
+        nulDataSource.name = DataSourceName.ReportDataSource;
+        nulDataSource.reportTemplateID = bbParasBo.getReportCode();
+        nulDataSource.year = currentPeriodBo.curYear;
+        nulDataSource.period = currentPeriodBo.getCurYear();
+        nulDataSource.columnIndex = bbParasBo.getColumnIndex() - 1;
+        nulDataSource.rowIndex = bbParasBo.getRowIndex() - 1;
+        nulDataSource.isOnlyManualInput = false;
+        return nulDataSource;
+    }
+
+    public void fixedWithGroup(CellTemplatePerGroupDto dto){
+        cellTemplateID = dto.getCellTemplateID();
+        rowName = dto.getRowName();
+        columnName = dto.getColumnName();
+        reportTemplateID = dto.getReportTemplateID();
+        resultType = dto.getResultType();
+    }
+}

atms-api/src/main/java/pwc/taxtech/atms/entitiy/PeriodInfo.java

@@ -32,7 +32,7 @@ public class PeriodInfo implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column PeriodInfo.Period
+     * This field corresponds to the database column PeriodInfo.CurrentPeriodBo
      *
      * @mbg.generated
      */
@@ -161,9 +161,9 @@ public class PeriodInfo implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column PeriodInfo.Period
+     * This method returns the value of the database column PeriodInfo.CurrentPeriodBo
      *
-     * @return the value of PeriodInfo.Period
+     * @return the value of PeriodInfo.CurrentPeriodBo
      *
      * @mbg.generated
      */
@@ -173,9 +173,9 @@ public class PeriodInfo implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column PeriodInfo.Period
+     * This method sets the value of the database column PeriodInfo.CurrentPeriodBo
      *
-     * @param period the value for PeriodInfo.Period
+     * @param period the value for PeriodInfo.CurrentPeriodBo
      *
      * @mbg.generated
      */

atms-api/src/main/java/pwc/taxtech/atms/entitiy/PeriodInfoExample.java

@@ -336,62 +336,62 @@ public class PeriodInfoExample {
         }
 
         public Criteria andPeriodIsNull() {
-            addCriterion("Period is null");
+            addCriterion("CurrentPeriodBo is null");
             return (Criteria) this;
         }
 
         public Criteria andPeriodIsNotNull() {
-            addCriterion("Period is not null");
+            addCriterion("CurrentPeriodBo is not null");
             return (Criteria) this;
         }
 
         public Criteria andPeriodEqualTo(Integer value) {
-            addCriterion("Period =", value, "period");
+            addCriterion("CurrentPeriodBo =", value, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodNotEqualTo(Integer value) {
-            addCriterion("Period <>", value, "period");
+            addCriterion("CurrentPeriodBo <>", value, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodGreaterThan(Integer value) {
-            addCriterion("Period >", value, "period");
+            addCriterion("CurrentPeriodBo >", value, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodGreaterThanOrEqualTo(Integer value) {
-            addCriterion("Period >=", value, "period");
+            addCriterion("CurrentPeriodBo >=", value, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodLessThan(Integer value) {
-            addCriterion("Period <", value, "period");
+            addCriterion("CurrentPeriodBo <", value, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodLessThanOrEqualTo(Integer value) {
-            addCriterion("Period <=", value, "period");
+            addCriterion("CurrentPeriodBo <=", value, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodIn(List<Integer> values) {
-            addCriterion("Period in", values, "period");
+            addCriterion("CurrentPeriodBo in", values, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodNotIn(List<Integer> values) {
-            addCriterion("Period not in", values, "period");
+            addCriterion("CurrentPeriodBo not in", values, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodBetween(Integer value1, Integer value2) {
-            addCriterion("Period between", value1, value2, "period");
+            addCriterion("CurrentPeriodBo between", value1, value2, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodNotBetween(Integer value1, Integer value2) {
-            addCriterion("Period not between", value1, value2, "period");
+            addCriterion("CurrentPeriodBo not between", value1, value2, "period");
             return (Criteria) this;
         }
 

atms-api/src/main/java/pwc/taxtech/atms/vat/dao/JournalEntryImportMapper.java

@@ -17,7 +17,7 @@ public interface JournalEntryImportMapper extends MyVatMapper {
             "    `VID`, " +
             "    `Date`, " +
             "    `Group`, " +
-            "    `Period`, " +
+            "    `CurrentPeriodBo`, " +
             "    `CustomerCode`, " +
             "    `CustomerName`, " +
             "    `Summary`, " +
@@ -43,8 +43,8 @@ public interface JournalEntryImportMapper extends MyVatMapper {
             "    Voucher " +
             "WHERE " +
             "    1 = 1 " +
-            " AND `ImportType` = #{importType} AND `Period` = #{period} " +
-            " ORDER BY `Period`,`Group`,`VID`,`ItemID`" +
+            " AND `ImportType` = #{importType} AND `CurrentPeriodBo` = #{period} " +
+            " ORDER BY `CurrentPeriodBo`,`Group`,`VID`,`ItemID`" +
             " LIMIT #{start},#{size}" +
             "</script>")
     List<Voucher> pageQuery(@Param("importType") int code, @Param("period") int periodId, @Param("start") int start ,
@@ -57,7 +57,7 @@ public interface JournalEntryImportMapper extends MyVatMapper {
             "    Voucher " +
             "WHERE " +
             "    1 = 1" +
-            " AND `ImportType` = #{importType} AND `Period` = #{period}" +
+            " AND `ImportType` = #{importType} AND `CurrentPeriodBo` = #{period}" +
             "</script>")
     Integer pageQueryCount(@Param("importType") int code, @Param("period") int periodId);
 
@@ -68,8 +68,8 @@ public interface JournalEntryImportMapper extends MyVatMapper {
             "    Voucher " +
             "WHERE " +
             "    1 = 1" +
-            " AND `ImportType` = #{importType} AND `Period` = #{period}" +
-            " GROUP BY `VID` ,`Group`,`Period`" +
+            " AND `ImportType` = #{importType} AND `CurrentPeriodBo` = #{period}" +
+            " GROUP BY `VID` ,`Group`,`CurrentPeriodBo`" +
             "</script>")
     Integer pageVIDCount(@Param("importType") int code, @Param("period") int periodId);
 }

atms-api/src/main/java/pwc/taxtech/atms/vat/dao/ValidationInfoMapper.java

@@ -137,7 +137,7 @@ public interface ValidationInfoMapper extends MyVatMapper {
     @Select("SELECT  " +
             "    vv.VID, " +
             "    vv.Group, " +
-            "    vv.Period, " +
+            "    vv.CurrentPeriodBo, " +
             "    vv.CustomerCode, " +
             "    vv.Summary, " +
             "    vv.AcctCode, " +
@@ -149,15 +149,15 @@ public interface ValidationInfoMapper extends MyVatMapper {
             "        JOIN " +
             "    (SELECT  " +
             "        v.VID, " +
-            "            v.Period, " +
+            "            v.CurrentPeriodBo, " +
             "            v.Group, " +
             "            MAX(v.Date) AS `Date`, " +
             "            SUM(v.Debit) AS Debit, " +
             "            SUM(v.Credit) AS Credit " +
             "    FROM " +
             "        Voucher v " +
-            "    GROUP BY v.VID , v.Period , v.Group " +
-            "    HAVING Debit != Credit) q ON vv.VID = q.VID AND vv.Period = q.Period " +
+            "    GROUP BY v.VID , v.CurrentPeriodBo , v.Group " +
+            "    HAVING Debit != Credit) q ON vv.VID = q.VID AND vv.CurrentPeriodBo = q.CurrentPeriodBo " +
             "        AND vv.Group = q.Group " +
             "")
     List<VoucherBalanceDto>getSingleVoucherCheck();

atms-api/src/main/java/pwc/taxtech/atms/vat/entity/AccountRemap.java

@@ -24,7 +24,7 @@ public class AccountRemap implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column AccountRemap.Period
+     * This field corresponds to the database column AccountRemap.CurrentPeriodBo
      *
      * @mbg.generated
      */
@@ -172,9 +172,9 @@ public class AccountRemap implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column AccountRemap.Period
+     * This method returns the value of the database column AccountRemap.CurrentPeriodBo
      *
-     * @return the value of AccountRemap.Period
+     * @return the value of AccountRemap.CurrentPeriodBo
      *
      * @mbg.generated
      */
@@ -184,9 +184,9 @@ public class AccountRemap implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column AccountRemap.Period
+     * This method sets the value of the database column AccountRemap.CurrentPeriodBo
      *
-     * @param period the value for AccountRemap.Period
+     * @param period the value for AccountRemap.CurrentPeriodBo
      *
      * @mbg.generated
      */

atms-api/src/main/java/pwc/taxtech/atms/vat/entity/AccountRemapExample.java

@@ -267,62 +267,62 @@ public class AccountRemapExample {
         }
 
         public Criteria andPeriodIsNull() {
-            addCriterion("Period is null");
+            addCriterion("CurrentPeriodBo is null");
             return (Criteria) this;
         }
 
         public Criteria andPeriodIsNotNull() {
-            addCriterion("Period is not null");
+            addCriterion("CurrentPeriodBo is not null");
             return (Criteria) this;
         }
 
         public Criteria andPeriodEqualTo(Integer value) {
-            addCriterion("Period =", value, "period");
+            addCriterion("CurrentPeriodBo =", value, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodNotEqualTo(Integer value) {
-            addCriterion("Period <>", value, "period");
+            addCriterion("CurrentPeriodBo <>", value, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodGreaterThan(Integer value) {
-            addCriterion("Period >", value, "period");
+            addCriterion("CurrentPeriodBo >", value, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodGreaterThanOrEqualTo(Integer value) {
-            addCriterion("Period >=", value, "period");
+            addCriterion("CurrentPeriodBo >=", value, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodLessThan(Integer value) {
-            addCriterion("Period <", value, "period");
+            addCriterion("CurrentPeriodBo <", value, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodLessThanOrEqualTo(Integer value) {
-            addCriterion("Period <=", value, "period");
+            addCriterion("CurrentPeriodBo <=", value, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodIn(List<Integer> values) {
-            addCriterion("Period in", values, "period");
+            addCriterion("CurrentPeriodBo in", values, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodNotIn(List<Integer> values) {
-            addCriterion("Period not in", values, "period");
+            addCriterion("CurrentPeriodBo not in", values, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodBetween(Integer value1, Integer value2) {
-            addCriterion("Period between", value1, value2, "period");
+            addCriterion("CurrentPeriodBo between", value1, value2, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodNotBetween(Integer value1, Integer value2) {
-            addCriterion("Period not between", value1, value2, "period");
+            addCriterion("CurrentPeriodBo not between", value1, value2, "period");
             return (Criteria) this;
         }
 

atms-api/src/main/java/pwc/taxtech/atms/vat/entity/AccountRemapSum.java

@@ -24,7 +24,7 @@ public class AccountRemapSum implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column AccountRemapSum.Period
+     * This field corresponds to the database column AccountRemapSum.CurrentPeriodBo
      *
      * @mbg.generated
      */
@@ -136,9 +136,9 @@ public class AccountRemapSum implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column AccountRemapSum.Period
+     * This method returns the value of the database column AccountRemapSum.CurrentPeriodBo
      *
-     * @return the value of AccountRemapSum.Period
+     * @return the value of AccountRemapSum.CurrentPeriodBo
      *
      * @mbg.generated
      */
@@ -148,9 +148,9 @@ public class AccountRemapSum implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column AccountRemapSum.Period
+     * This method sets the value of the database column AccountRemapSum.CurrentPeriodBo
      *
-     * @param period the value for AccountRemapSum.Period
+     * @param period the value for AccountRemapSum.CurrentPeriodBo
      *
      * @mbg.generated
      */

atms-api/src/main/java/pwc/taxtech/atms/vat/entity/AccountRemapSumExample.java

@@ -267,62 +267,62 @@ public class AccountRemapSumExample {
         }
 
         public Criteria andPeriodIsNull() {
-            addCriterion("Period is null");
+            addCriterion("CurrentPeriodBo is null");
             return (Criteria) this;
         }
 
         public Criteria andPeriodIsNotNull() {
-            addCriterion("Period is not null");
+            addCriterion("CurrentPeriodBo is not null");
             return (Criteria) this;
         }
 
         public Criteria andPeriodEqualTo(Integer value) {
-            addCriterion("Period =", value, "period");
+            addCriterion("CurrentPeriodBo =", value, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodNotEqualTo(Integer value) {
-            addCriterion("Period <>", value, "period");
+            addCriterion("CurrentPeriodBo <>", value, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodGreaterThan(Integer value) {
-            addCriterion("Period >", value, "period");
+            addCriterion("CurrentPeriodBo >", value, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodGreaterThanOrEqualTo(Integer value) {
-            addCriterion("Period >=", value, "period");
+            addCriterion("CurrentPeriodBo >=", value, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodLessThan(Integer value) {
-            addCriterion("Period <", value, "period");
+            addCriterion("CurrentPeriodBo <", value, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodLessThanOrEqualTo(Integer value) {
-            addCriterion("Period <=", value, "period");
+            addCriterion("CurrentPeriodBo <=", value, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodIn(List<Integer> values) {
-            addCriterion("Period in", values, "period");
+            addCriterion("CurrentPeriodBo in", values, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodNotIn(List<Integer> values) {
-            addCriterion("Period not in", values, "period");
+            addCriterion("CurrentPeriodBo not in", values, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodBetween(Integer value1, Integer value2) {
-            addCriterion("Period between", value1, value2, "period");
+            addCriterion("CurrentPeriodBo between", value1, value2, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodNotBetween(Integer value1, Integer value2) {
-            addCriterion("Period not between", value1, value2, "period");
+            addCriterion("CurrentPeriodBo not between", value1, value2, "period");
             return (Criteria) this;
         }
 

atms-api/src/main/java/pwc/taxtech/atms/vat/entity/EntriesCheckDetailResult.java

@@ -87,7 +87,7 @@ public class EntriesCheckDetailResult implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column EntriesCheckDetailResult.Period
+     * This field corresponds to the database column EntriesCheckDetailResult.CurrentPeriodBo
      *
      * @mbg.generated
      */
@@ -421,9 +421,9 @@ public class EntriesCheckDetailResult implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column EntriesCheckDetailResult.Period
+     * This method returns the value of the database column EntriesCheckDetailResult.CurrentPeriodBo
      *
-     * @return the value of EntriesCheckDetailResult.Period
+     * @return the value of EntriesCheckDetailResult.CurrentPeriodBo
      *
      * @mbg.generated
      */
@@ -433,9 +433,9 @@ public class EntriesCheckDetailResult implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column EntriesCheckDetailResult.Period
+     * This method sets the value of the database column EntriesCheckDetailResult.CurrentPeriodBo
      *
-     * @param period the value for EntriesCheckDetailResult.Period
+     * @param period the value for EntriesCheckDetailResult.CurrentPeriodBo
      *
      * @mbg.generated
      */

atms-api/src/main/java/pwc/taxtech/atms/vat/entity/EntriesCheckDetailResultExample.java

@@ -754,62 +754,62 @@ public class EntriesCheckDetailResultExample {
         }
 
         public Criteria andPeriodIsNull() {
-            addCriterion("Period is null");
+            addCriterion("CurrentPeriodBo is null");
             return (Criteria) this;
         }
 
         public Criteria andPeriodIsNotNull() {
-            addCriterion("Period is not null");
+            addCriterion("CurrentPeriodBo is not null");
             return (Criteria) this;
         }
 
         public Criteria andPeriodEqualTo(Integer value) {
-            addCriterion("Period =", value, "period");
+            addCriterion("CurrentPeriodBo =", value, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodNotEqualTo(Integer value) {
-            addCriterion("Period <>", value, "period");
+            addCriterion("CurrentPeriodBo <>", value, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodGreaterThan(Integer value) {
-            addCriterion("Period >", value, "period");
+            addCriterion("CurrentPeriodBo >", value, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodGreaterThanOrEqualTo(Integer value) {
-            addCriterion("Period >=", value, "period");
+            addCriterion("CurrentPeriodBo >=", value, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodLessThan(Integer value) {
-            addCriterion("Period <", value, "period");
+            addCriterion("CurrentPeriodBo <", value, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodLessThanOrEqualTo(Integer value) {
-            addCriterion("Period <=", value, "period");
+            addCriterion("CurrentPeriodBo <=", value, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodIn(List<Integer> values) {
-            addCriterion("Period in", values, "period");
+            addCriterion("CurrentPeriodBo in", values, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodNotIn(List<Integer> values) {
-            addCriterion("Period not in", values, "period");
+            addCriterion("CurrentPeriodBo not in", values, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodBetween(Integer value1, Integer value2) {
-            addCriterion("Period between", value1, value2, "period");
+            addCriterion("CurrentPeriodBo between", value1, value2, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodNotBetween(Integer value1, Integer value2) {
-            addCriterion("Period not between", value1, value2, "period");
+            addCriterion("CurrentPeriodBo not between", value1, value2, "period");
             return (Criteria) this;
         }
 

atms-api/src/main/java/pwc/taxtech/atms/vat/entity/EntriesCheckResult.java

@@ -258,7 +258,7 @@ public class EntriesCheckResult implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column EntriesCheckResult.Period
+     * This field corresponds to the database column EntriesCheckResult.CurrentPeriodBo
      *
      * @mbg.generated
      */
@@ -940,9 +940,9 @@ public class EntriesCheckResult implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column EntriesCheckResult.Period
+     * This method returns the value of the database column EntriesCheckResult.CurrentPeriodBo
      *
-     * @return the value of EntriesCheckResult.Period
+     * @return the value of EntriesCheckResult.CurrentPeriodBo
      *
      * @mbg.generated
      */
@@ -952,9 +952,9 @@ public class EntriesCheckResult implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column EntriesCheckResult.Period
+     * This method sets the value of the database column EntriesCheckResult.CurrentPeriodBo
      *
-     * @param period the value for EntriesCheckResult.Period
+     * @param period the value for EntriesCheckResult.CurrentPeriodBo
      *
      * @mbg.generated
      */

atms-api/src/main/java/pwc/taxtech/atms/vat/entity/EntriesCheckResultExample.java

@@ -1887,62 +1887,62 @@ public class EntriesCheckResultExample {
         }
 
         public Criteria andPeriodIsNull() {
-            addCriterion("Period is null");
+            addCriterion("CurrentPeriodBo is null");
             return (Criteria) this;
         }
 
         public Criteria andPeriodIsNotNull() {
-            addCriterion("Period is not null");
+            addCriterion("CurrentPeriodBo is not null");
             return (Criteria) this;
         }
 
         public Criteria andPeriodEqualTo(Integer value) {
-            addCriterion("Period =", value, "period");
+            addCriterion("CurrentPeriodBo =", value, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodNotEqualTo(Integer value) {
-            addCriterion("Period <>", value, "period");
+            addCriterion("CurrentPeriodBo <>", value, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodGreaterThan(Integer value) {
-            addCriterion("Period >", value, "period");
+            addCriterion("CurrentPeriodBo >", value, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodGreaterThanOrEqualTo(Integer value) {
-            addCriterion("Period >=", value, "period");
+            addCriterion("CurrentPeriodBo >=", value, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodLessThan(Integer value) {
-            addCriterion("Period <", value, "period");
+            addCriterion("CurrentPeriodBo <", value, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodLessThanOrEqualTo(Integer value) {
-            addCriterion("Period <=", value, "period");
+            addCriterion("CurrentPeriodBo <=", value, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodIn(List<Integer> values) {
-            addCriterion("Period in", values, "period");
+            addCriterion("CurrentPeriodBo in", values, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodNotIn(List<Integer> values) {
-            addCriterion("Period not in", values, "period");
+            addCriterion("CurrentPeriodBo not in", values, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodBetween(Integer value1, Integer value2) {
-            addCriterion("Period between", value1, value2, "period");
+            addCriterion("CurrentPeriodBo between", value1, value2, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodNotBetween(Integer value1, Integer value2) {
-            addCriterion("Period not between", value1, value2, "period");
+            addCriterion("CurrentPeriodBo not between", value1, value2, "period");
             return (Criteria) this;
         }
 

atms-api/src/main/java/pwc/taxtech/atms/vat/entity/FormulaCacheExample.java

@@ -266,62 +266,62 @@ public class FormulaCacheExample {
         }
 
         public Criteria andPeriodIsNull() {
-            addCriterion("Period is null");
+            addCriterion("CurrentPeriodBo is null");
             return (Criteria) this;
         }
 
         public Criteria andPeriodIsNotNull() {
-            addCriterion("Period is not null");
+            addCriterion("CurrentPeriodBo is not null");
             return (Criteria) this;
         }
 
         public Criteria andPeriodEqualTo(Integer value) {
-            addCriterion("Period =", value, "period");
+            addCriterion("CurrentPeriodBo =", value, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodNotEqualTo(Integer value) {
-            addCriterion("Period <>", value, "period");
+            addCriterion("CurrentPeriodBo <>", value, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodGreaterThan(Integer value) {
-            addCriterion("Period >", value, "period");
+            addCriterion("CurrentPeriodBo >", value, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodGreaterThanOrEqualTo(Integer value) {
-            addCriterion("Period >=", value, "period");
+            addCriterion("CurrentPeriodBo >=", value, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodLessThan(Integer value) {
-            addCriterion("Period <", value, "period");
+            addCriterion("CurrentPeriodBo <", value, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodLessThanOrEqualTo(Integer value) {
-            addCriterion("Period <=", value, "period");
+            addCriterion("CurrentPeriodBo <=", value, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodIn(List<Integer> values) {
-            addCriterion("Period in", values, "period");
+            addCriterion("CurrentPeriodBo in", values, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodNotIn(List<Integer> values) {
-            addCriterion("Period not in", values, "period");
+            addCriterion("CurrentPeriodBo not in", values, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodBetween(Integer value1, Integer value2) {
-            addCriterion("Period between", value1, value2, "period");
+            addCriterion("CurrentPeriodBo between", value1, value2, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodNotBetween(Integer value1, Integer value2) {
-            addCriterion("Period not between", value1, value2, "period");
+            addCriterion("CurrentPeriodBo not between", value1, value2, "period");
             return (Criteria) this;
         }
 

atms-api/src/main/java/pwc/taxtech/atms/vat/entity/FormulaCacheKey.java

@@ -22,7 +22,7 @@ public class FormulaCacheKey implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column FormulaCache.Period
+     * This field corresponds to the database column FormulaCache.CurrentPeriodBo
      *
      * @mbg.generated
      */
@@ -62,9 +62,9 @@ public class FormulaCacheKey implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column FormulaCache.Period
+     * This method returns the value of the database column FormulaCache.CurrentPeriodBo
      *
-     * @return the value of FormulaCache.Period
+     * @return the value of FormulaCache.CurrentPeriodBo
      *
      * @mbg.generated
      */
@@ -74,9 +74,9 @@ public class FormulaCacheKey implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column FormulaCache.Period
+     * This method sets the value of the database column FormulaCache.CurrentPeriodBo
      *
-     * @param period the value for FormulaCache.Period
+     * @param period the value for FormulaCache.CurrentPeriodBo
      *
      * @mbg.generated
      */

atms-api/src/main/java/pwc/taxtech/atms/vat/entity/IndexAnalysisDetailResult.java

@@ -41,7 +41,7 @@ public class IndexAnalysisDetailResult implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column IndexAnalysisDetailResult.Period
+     * This field corresponds to the database column IndexAnalysisDetailResult.CurrentPeriodBo
      *
      * @mbg.generated
      */
@@ -237,9 +237,9 @@ public class IndexAnalysisDetailResult implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column IndexAnalysisDetailResult.Period
+     * This method returns the value of the database column IndexAnalysisDetailResult.CurrentPeriodBo
      *
-     * @return the value of IndexAnalysisDetailResult.Period
+     * @return the value of IndexAnalysisDetailResult.CurrentPeriodBo
      *
      * @mbg.generated
      */
@@ -249,9 +249,9 @@ public class IndexAnalysisDetailResult implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column IndexAnalysisDetailResult.Period
+     * This method sets the value of the database column IndexAnalysisDetailResult.CurrentPeriodBo
      *
-     * @param period the value for IndexAnalysisDetailResult.Period
+     * @param period the value for IndexAnalysisDetailResult.CurrentPeriodBo
      *
      * @mbg.generated
      */

atms-api/src/main/java/pwc/taxtech/atms/vat/entity/IndexAnalysisDetailResultExample.java

@@ -396,62 +396,62 @@ public class IndexAnalysisDetailResultExample {
         }
 
         public Criteria andPeriodIsNull() {
-            addCriterion("Period is null");
+            addCriterion("CurrentPeriodBo is null");
             return (Criteria) this;
         }
 
         public Criteria andPeriodIsNotNull() {
-            addCriterion("Period is not null");
+            addCriterion("CurrentPeriodBo is not null");
             return (Criteria) this;
         }
 
         public Criteria andPeriodEqualTo(Integer value) {
-            addCriterion("Period =", value, "period");
+            addCriterion("CurrentPeriodBo =", value, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodNotEqualTo(Integer value) {
-            addCriterion("Period <>", value, "period");
+            addCriterion("CurrentPeriodBo <>", value, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodGreaterThan(Integer value) {
-            addCriterion("Period >", value, "period");
+            addCriterion("CurrentPeriodBo >", value, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodGreaterThanOrEqualTo(Integer value) {
-            addCriterion("Period >=", value, "period");
+            addCriterion("CurrentPeriodBo >=", value, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodLessThan(Integer value) {
-            addCriterion("Period <", value, "period");
+            addCriterion("CurrentPeriodBo <", value, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodLessThanOrEqualTo(Integer value) {
-            addCriterion("Period <=", value, "period");
+            addCriterion("CurrentPeriodBo <=", value, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodIn(List<Integer> values) {
-            addCriterion("Period in", values, "period");
+            addCriterion("CurrentPeriodBo in", values, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodNotIn(List<Integer> values) {
-            addCriterion("Period not in", values, "period");
+            addCriterion("CurrentPeriodBo not in", values, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodBetween(Integer value1, Integer value2) {
-            addCriterion("Period between", value1, value2, "period");
+            addCriterion("CurrentPeriodBo between", value1, value2, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodNotBetween(Integer value1, Integer value2) {
-            addCriterion("Period not between", value1, value2, "period");
+            addCriterion("CurrentPeriodBo not between", value1, value2, "period");
             return (Criteria) this;
         }
 

atms-api/src/main/java/pwc/taxtech/atms/vat/entity/InvoiceMapping.java

@@ -50,7 +50,7 @@ public class InvoiceMapping implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column InvoiceMapping.Period
+     * This field corresponds to the database column InvoiceMapping.CurrentPeriodBo
      *
      * @mbg.generated
      */
@@ -180,9 +180,9 @@ public class InvoiceMapping implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column InvoiceMapping.Period
+     * This method returns the value of the database column InvoiceMapping.CurrentPeriodBo
      *
-     * @return the value of InvoiceMapping.Period
+     * @return the value of InvoiceMapping.CurrentPeriodBo
      *
      * @mbg.generated
      */
@@ -192,9 +192,9 @@ public class InvoiceMapping implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column InvoiceMapping.Period
+     * This method sets the value of the database column InvoiceMapping.CurrentPeriodBo
      *
-     * @param period the value for InvoiceMapping.Period
+     * @param period the value for InvoiceMapping.CurrentPeriodBo
      *
      * @mbg.generated
      */

atms-api/src/main/java/pwc/taxtech/atms/vat/entity/InvoiceMappingExample.java

@@ -476,62 +476,62 @@ public class InvoiceMappingExample {
         }
 
         public Criteria andPeriodIsNull() {
-            addCriterion("Period is null");
+            addCriterion("CurrentPeriodBo is null");
             return (Criteria) this;
         }
 
         public Criteria andPeriodIsNotNull() {
-            addCriterion("Period is not null");
+            addCriterion("CurrentPeriodBo is not null");
             return (Criteria) this;
         }
 
         public Criteria andPeriodEqualTo(Integer value) {
-            addCriterion("Period =", value, "period");
+            addCriterion("CurrentPeriodBo =", value, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodNotEqualTo(Integer value) {
-            addCriterion("Period <>", value, "period");
+            addCriterion("CurrentPeriodBo <>", value, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodGreaterThan(Integer value) {
-            addCriterion("Period >", value, "period");
+            addCriterion("CurrentPeriodBo >", value, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodGreaterThanOrEqualTo(Integer value) {
-            addCriterion("Period >=", value, "period");
+            addCriterion("CurrentPeriodBo >=", value, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodLessThan(Integer value) {
-            addCriterion("Period <", value, "period");
+            addCriterion("CurrentPeriodBo <", value, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodLessThanOrEqualTo(Integer value) {
-            addCriterion("Period <=", value, "period");
+            addCriterion("CurrentPeriodBo <=", value, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodIn(List<Integer> values) {
-            addCriterion("Period in", values, "period");
+            addCriterion("CurrentPeriodBo in", values, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodNotIn(List<Integer> values) {
-            addCriterion("Period not in", values, "period");
+            addCriterion("CurrentPeriodBo not in", values, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodBetween(Integer value1, Integer value2) {
-            addCriterion("Period between", value1, value2, "period");
+            addCriterion("CurrentPeriodBo between", value1, value2, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodNotBetween(Integer value1, Integer value2) {
-            addCriterion("Period not between", value1, value2, "period");
+            addCriterion("CurrentPeriodBo not between", value1, value2, "period");
             return (Criteria) this;
         }
 

atms-api/src/main/java/pwc/taxtech/atms/vat/entity/ModelDetailLog.java

@@ -86,7 +86,7 @@ public class ModelDetailLog implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column ModelDetailLog.Period
+     * This field corresponds to the database column ModelDetailLog.CurrentPeriodBo
      *
      * @mbg.generated
      */
@@ -312,9 +312,9 @@ public class ModelDetailLog implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column ModelDetailLog.Period
+     * This method returns the value of the database column ModelDetailLog.CurrentPeriodBo
      *
-     * @return the value of ModelDetailLog.Period
+     * @return the value of ModelDetailLog.CurrentPeriodBo
      *
      * @mbg.generated
      */
@@ -324,9 +324,9 @@ public class ModelDetailLog implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column ModelDetailLog.Period
+     * This method sets the value of the database column ModelDetailLog.CurrentPeriodBo
      *
-     * @param period the value for ModelDetailLog.Period
+     * @param period the value for ModelDetailLog.CurrentPeriodBo
      *
      * @mbg.generated
      */

atms-api/src/main/java/pwc/taxtech/atms/vat/entity/ModelDetailLogExample.java

@@ -736,62 +736,62 @@ public class ModelDetailLogExample {
         }
 
         public Criteria andPeriodIsNull() {
-            addCriterion("Period is null");
+            addCriterion("CurrentPeriodBo is null");
             return (Criteria) this;
         }
 
         public Criteria andPeriodIsNotNull() {
-            addCriterion("Period is not null");
+            addCriterion("CurrentPeriodBo is not null");
             return (Criteria) this;
         }
 
         public Criteria andPeriodEqualTo(Integer value) {
-            addCriterion("Period =", value, "period");
+            addCriterion("CurrentPeriodBo =", value, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodNotEqualTo(Integer value) {
-            addCriterion("Period <>", value, "period");
+            addCriterion("CurrentPeriodBo <>", value, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodGreaterThan(Integer value) {
-            addCriterion("Period >", value, "period");
+            addCriterion("CurrentPeriodBo >", value, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodGreaterThanOrEqualTo(Integer value) {
-            addCriterion("Period >=", value, "period");
+            addCriterion("CurrentPeriodBo >=", value, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodLessThan(Integer value) {
-            addCriterion("Period <", value, "period");
+            addCriterion("CurrentPeriodBo <", value, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodLessThanOrEqualTo(Integer value) {
-            addCriterion("Period <=", value, "period");
+            addCriterion("CurrentPeriodBo <=", value, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodIn(List<Integer> values) {
-            addCriterion("Period in", values, "period");
+            addCriterion("CurrentPeriodBo in", values, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodNotIn(List<Integer> values) {
-            addCriterion("Period not in", values, "period");
+            addCriterion("CurrentPeriodBo not in", values, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodBetween(Integer value1, Integer value2) {
-            addCriterion("Period between", value1, value2, "period");
+            addCriterion("CurrentPeriodBo between", value1, value2, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodNotBetween(Integer value1, Integer value2) {
-            addCriterion("Period not between", value1, value2, "period");
+            addCriterion("CurrentPeriodBo not between", value1, value2, "period");
             return (Criteria) this;
         }
 

atms-api/src/main/java/pwc/taxtech/atms/vat/entity/PeriodCellReferenceExample.java

@@ -265,62 +265,62 @@ public class PeriodCellReferenceExample {
         }
 
         public Criteria andPeriodIsNull() {
-            addCriterion("Period is null");
+            addCriterion("CurrentPeriodBo is null");
             return (Criteria) this;
         }
 
         public Criteria andPeriodIsNotNull() {
-            addCriterion("Period is not null");
+            addCriterion("CurrentPeriodBo is not null");
             return (Criteria) this;
         }
 
         public Criteria andPeriodEqualTo(Integer value) {
-            addCriterion("Period =", value, "period");
+            addCriterion("CurrentPeriodBo =", value, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodNotEqualTo(Integer value) {
-            addCriterion("Period <>", value, "period");
+            addCriterion("CurrentPeriodBo <>", value, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodGreaterThan(Integer value) {
-            addCriterion("Period >", value, "period");
+            addCriterion("CurrentPeriodBo >", value, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodGreaterThanOrEqualTo(Integer value) {
-            addCriterion("Period >=", value, "period");
+            addCriterion("CurrentPeriodBo >=", value, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodLessThan(Integer value) {
-            addCriterion("Period <", value, "period");
+            addCriterion("CurrentPeriodBo <", value, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodLessThanOrEqualTo(Integer value) {
-            addCriterion("Period <=", value, "period");
+            addCriterion("CurrentPeriodBo <=", value, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodIn(List<Integer> values) {
-            addCriterion("Period in", values, "period");
+            addCriterion("CurrentPeriodBo in", values, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodNotIn(List<Integer> values) {
-            addCriterion("Period not in", values, "period");
+            addCriterion("CurrentPeriodBo not in", values, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodBetween(Integer value1, Integer value2) {
-            addCriterion("Period between", value1, value2, "period");
+            addCriterion("CurrentPeriodBo between", value1, value2, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodNotBetween(Integer value1, Integer value2) {
-            addCriterion("Period not between", value1, value2, "period");
+            addCriterion("CurrentPeriodBo not between", value1, value2, "period");
             return (Criteria) this;
         }
 

atms-api/src/main/java/pwc/taxtech/atms/vat/entity/PeriodCellReferenceKey.java

@@ -22,7 +22,7 @@ public class PeriodCellReferenceKey implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column PeriodCellReference.Period
+     * This field corresponds to the database column PeriodCellReference.CurrentPeriodBo
      *
      * @mbg.generated
      */
@@ -62,9 +62,9 @@ public class PeriodCellReferenceKey implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column PeriodCellReference.Period
+     * This method returns the value of the database column PeriodCellReference.CurrentPeriodBo
      *
-     * @return the value of PeriodCellReference.Period
+     * @return the value of PeriodCellReference.CurrentPeriodBo
      *
      * @mbg.generated
      */
@@ -74,9 +74,9 @@ public class PeriodCellReferenceKey implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column PeriodCellReference.Period
+     * This method sets the value of the database column PeriodCellReference.CurrentPeriodBo
      *
-     * @param period the value for PeriodCellReference.Period
+     * @param period the value for PeriodCellReference.CurrentPeriodBo
      *
      * @mbg.generated
      */

atms-api/src/main/java/pwc/taxtech/atms/vat/entity/PeriodCellTemplateConfigKey.java

@@ -22,7 +22,7 @@ public class PeriodCellTemplateConfigKey implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column PeriodCellTemplateConfig.Period
+     * This field corresponds to the database column PeriodCellTemplateConfig.CurrentPeriodBo
      *
      * @mbg.generated
      */
@@ -62,9 +62,9 @@ public class PeriodCellTemplateConfigKey implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column PeriodCellTemplateConfig.Period
+     * This method returns the value of the database column PeriodCellTemplateConfig.CurrentPeriodBo
      *
-     * @return the value of PeriodCellTemplateConfig.Period
+     * @return the value of PeriodCellTemplateConfig.CurrentPeriodBo
      *
      * @mbg.generated
      */
@@ -74,9 +74,9 @@ public class PeriodCellTemplateConfigKey implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column PeriodCellTemplateConfig.Period
+     * This method sets the value of the database column PeriodCellTemplateConfig.CurrentPeriodBo
      *
-     * @param period the value for PeriodCellTemplateConfig.Period
+     * @param period the value for PeriodCellTemplateConfig.CurrentPeriodBo
      *
      * @mbg.generated
      */

atms-api/src/main/java/pwc/taxtech/atms/vat/entity/PeriodCellTemplateKey.java

@@ -22,7 +22,7 @@ public class PeriodCellTemplateKey implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column PeriodCellTemplate.Period
+     * This field corresponds to the database column PeriodCellTemplate.CurrentPeriodBo
      *
      * @mbg.generated
      */
@@ -62,9 +62,9 @@ public class PeriodCellTemplateKey implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column PeriodCellTemplate.Period
+     * This method returns the value of the database column PeriodCellTemplate.CurrentPeriodBo
      *
-     * @return the value of PeriodCellTemplate.Period
+     * @return the value of PeriodCellTemplate.CurrentPeriodBo
      *
      * @mbg.generated
      */
@@ -74,9 +74,9 @@ public class PeriodCellTemplateKey implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column PeriodCellTemplate.Period
+     * This method sets the value of the database column PeriodCellTemplate.CurrentPeriodBo
      *
-     * @param period the value for PeriodCellTemplate.Period
+     * @param period the value for PeriodCellTemplate.CurrentPeriodBo
      *
      * @mbg.generated
      */

atms-api/src/main/java/pwc/taxtech/atms/vat/entity/PeriodFormulaBlockKey.java

@@ -22,7 +22,7 @@ public class PeriodFormulaBlockKey implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column PeriodFormulaBlock.Period
+     * This field corresponds to the database column PeriodFormulaBlock.CurrentPeriodBo
      *
      * @mbg.generated
      */
@@ -62,9 +62,9 @@ public class PeriodFormulaBlockKey implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column PeriodFormulaBlock.Period
+     * This method returns the value of the database column PeriodFormulaBlock.CurrentPeriodBo
      *
-     * @return the value of PeriodFormulaBlock.Period
+     * @return the value of PeriodFormulaBlock.CurrentPeriodBo
      *
      * @mbg.generated
      */
@@ -74,9 +74,9 @@ public class PeriodFormulaBlockKey implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column PeriodFormulaBlock.Period
+     * This method sets the value of the database column PeriodFormulaBlock.CurrentPeriodBo
      *
-     * @param period the value for PeriodFormulaBlock.Period
+     * @param period the value for PeriodFormulaBlock.CurrentPeriodBo
      *
      * @mbg.generated
      */

atms-api/src/main/java/pwc/taxtech/atms/vat/entity/PeriodTaxPayerReportRuleKey.java

@@ -22,7 +22,7 @@ public class PeriodTaxPayerReportRuleKey implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column PeriodTaxPayerReportRule.Period
+     * This field corresponds to the database column PeriodTaxPayerReportRule.CurrentPeriodBo
      *
      * @mbg.generated
      */
@@ -62,9 +62,9 @@ public class PeriodTaxPayerReportRuleKey implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column PeriodTaxPayerReportRule.Period
+     * This method returns the value of the database column PeriodTaxPayerReportRule.CurrentPeriodBo
      *
-     * @return the value of PeriodTaxPayerReportRule.Period
+     * @return the value of PeriodTaxPayerReportRule.CurrentPeriodBo
      *
      * @mbg.generated
      */
@@ -74,9 +74,9 @@ public class PeriodTaxPayerReportRuleKey implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column PeriodTaxPayerReportRule.Period
+     * This method sets the value of the database column PeriodTaxPayerReportRule.CurrentPeriodBo
      *
-     * @param period the value for PeriodTaxPayerReportRule.Period
+     * @param period the value for PeriodTaxPayerReportRule.CurrentPeriodBo
      *
      * @mbg.generated
      */

atms-api/src/main/java/pwc/taxtech/atms/vat/entity/PeriodTaxRuleSettingKey.java

@@ -22,7 +22,7 @@ public class PeriodTaxRuleSettingKey implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column PeriodTaxRuleSetting.Period
+     * This field corresponds to the database column PeriodTaxRuleSetting.CurrentPeriodBo
      *
      * @mbg.generated
      */
@@ -62,9 +62,9 @@ public class PeriodTaxRuleSettingKey implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column PeriodTaxRuleSetting.Period
+     * This method returns the value of the database column PeriodTaxRuleSetting.CurrentPeriodBo
      *
-     * @return the value of PeriodTaxRuleSetting.Period
+     * @return the value of PeriodTaxRuleSetting.CurrentPeriodBo
      *
      * @mbg.generated
      */
@@ -74,9 +74,9 @@ public class PeriodTaxRuleSettingKey implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column PeriodTaxRuleSetting.Period
+     * This method sets the value of the database column PeriodTaxRuleSetting.CurrentPeriodBo
      *
-     * @param period the value for PeriodTaxRuleSetting.Period
+     * @param period the value for PeriodTaxRuleSetting.CurrentPeriodBo
      *
      * @mbg.generated
      */

atms-api/src/main/java/pwc/taxtech/atms/vat/entity/PeriodTaxRuleSettingOrganizationKey.java

@@ -22,7 +22,7 @@ public class PeriodTaxRuleSettingOrganizationKey implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column PeriodTaxRuleSettingOrganization.Period
+     * This field corresponds to the database column PeriodTaxRuleSettingOrganization.CurrentPeriodBo
      *
      * @mbg.generated
      */
@@ -62,9 +62,9 @@ public class PeriodTaxRuleSettingOrganizationKey implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column PeriodTaxRuleSettingOrganization.Period
+     * This method returns the value of the database column PeriodTaxRuleSettingOrganization.CurrentPeriodBo
      *
-     * @return the value of PeriodTaxRuleSettingOrganization.Period
+     * @return the value of PeriodTaxRuleSettingOrganization.CurrentPeriodBo
      *
      * @mbg.generated
      */
@@ -74,9 +74,9 @@ public class PeriodTaxRuleSettingOrganizationKey implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column PeriodTaxRuleSettingOrganization.Period
+     * This method sets the value of the database column PeriodTaxRuleSettingOrganization.CurrentPeriodBo
      *
-     * @param period the value for PeriodTaxRuleSettingOrganization.Period
+     * @param period the value for PeriodTaxRuleSettingOrganization.CurrentPeriodBo
      *
      * @mbg.generated
      */

atms-api/src/main/java/pwc/taxtech/atms/vat/entity/PeriodTemplateKey.java

@@ -22,7 +22,7 @@ public class PeriodTemplateKey implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column PeriodTemplate.Period
+     * This field corresponds to the database column PeriodTemplate.CurrentPeriodBo
      *
      * @mbg.generated
      */
@@ -62,9 +62,9 @@ public class PeriodTemplateKey implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column PeriodTemplate.Period
+     * This method returns the value of the database column PeriodTemplate.CurrentPeriodBo
      *
-     * @return the value of PeriodTemplate.Period
+     * @return the value of PeriodTemplate.CurrentPeriodBo
      *
      * @mbg.generated
      */
@@ -74,9 +74,9 @@ public class PeriodTemplateKey implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column PeriodTemplate.Period
+     * This method sets the value of the database column PeriodTemplate.CurrentPeriodBo
      *
-     * @param period the value for PeriodTemplate.Period
+     * @param period the value for PeriodTemplate.CurrentPeriodBo
      *
      * @mbg.generated
      */

atms-api/src/main/java/pwc/taxtech/atms/vat/entity/VatOperationLog.java

@@ -131,7 +131,7 @@ public class VatOperationLog implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column OperationLog.Period
+     * This field corresponds to the database column OperationLog.CurrentPeriodBo
      *
      * @mbg.generated
      */
@@ -468,9 +468,9 @@ public class VatOperationLog implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column OperationLog.Period
+     * This method returns the value of the database column OperationLog.CurrentPeriodBo
      *
-     * @return the value of OperationLog.Period
+     * @return the value of OperationLog.CurrentPeriodBo
      *
      * @mbg.generated
      */
@@ -480,9 +480,9 @@ public class VatOperationLog implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column OperationLog.Period
+     * This method sets the value of the database column OperationLog.CurrentPeriodBo
      *
-     * @param period the value for OperationLog.Period
+     * @param period the value for OperationLog.CurrentPeriodBo
      *
      * @mbg.generated
      */

atms-api/src/main/java/pwc/taxtech/atms/vat/entity/VatOperationLogExample.java

@@ -1066,62 +1066,62 @@ public class VatOperationLogExample {
         }
 
         public Criteria andPeriodIsNull() {
-            addCriterion("Period is null");
+            addCriterion("CurrentPeriodBo is null");
             return (Criteria) this;
         }
 
         public Criteria andPeriodIsNotNull() {
-            addCriterion("Period is not null");
+            addCriterion("CurrentPeriodBo is not null");
             return (Criteria) this;
         }
 
         public Criteria andPeriodEqualTo(Integer value) {
-            addCriterion("Period =", value, "period");
+            addCriterion("CurrentPeriodBo =", value, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodNotEqualTo(Integer value) {
-            addCriterion("Period <>", value, "period");
+            addCriterion("CurrentPeriodBo <>", value, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodGreaterThan(Integer value) {
-            addCriterion("Period >", value, "period");
+            addCriterion("CurrentPeriodBo >", value, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodGreaterThanOrEqualTo(Integer value) {
-            addCriterion("Period >=", value, "period");
+            addCriterion("CurrentPeriodBo >=", value, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodLessThan(Integer value) {
-            addCriterion("Period <", value, "period");
+            addCriterion("CurrentPeriodBo <", value, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodLessThanOrEqualTo(Integer value) {
-            addCriterion("Period <=", value, "period");
+            addCriterion("CurrentPeriodBo <=", value, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodIn(List<Integer> values) {
-            addCriterion("Period in", values, "period");
+            addCriterion("CurrentPeriodBo in", values, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodNotIn(List<Integer> values) {
-            addCriterion("Period not in", values, "period");
+            addCriterion("CurrentPeriodBo not in", values, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodBetween(Integer value1, Integer value2) {
-            addCriterion("Period between", value1, value2, "period");
+            addCriterion("CurrentPeriodBo between", value1, value2, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodNotBetween(Integer value1, Integer value2) {
-            addCriterion("Period not between", value1, value2, "period");
+            addCriterion("CurrentPeriodBo not between", value1, value2, "period");
             return (Criteria) this;
         }
 

atms-api/src/main/java/pwc/taxtech/atms/vat/entity/Voucher.java

@@ -51,7 +51,7 @@ public class Voucher implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column Voucher.Period
+     * This field corresponds to the database column Voucher.CurrentPeriodBo
      *
      * @mbg.generated
      */
@@ -352,9 +352,9 @@ public class Voucher implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column Voucher.Period
+     * This method returns the value of the database column Voucher.CurrentPeriodBo
      *
-     * @return the value of Voucher.Period
+     * @return the value of Voucher.CurrentPeriodBo
      *
      * @mbg.generated
      */
@@ -364,9 +364,9 @@ public class Voucher implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column Voucher.Period
+     * This method sets the value of the database column Voucher.CurrentPeriodBo
      *
-     * @param period the value for Voucher.Period
+     * @param period the value for Voucher.CurrentPeriodBo
      *
      * @mbg.generated
      */

atms-api/src/main/java/pwc/taxtech/atms/vat/entity/VoucherExample.java

@@ -494,62 +494,62 @@ public class VoucherExample {
         }
 
         public Criteria andPeriodIsNull() {
-            addCriterion("Period is null");
+            addCriterion("CurrentPeriodBo is null");
             return (Criteria) this;
         }
 
         public Criteria andPeriodIsNotNull() {
-            addCriterion("Period is not null");
+            addCriterion("CurrentPeriodBo is not null");
             return (Criteria) this;
         }
 
         public Criteria andPeriodEqualTo(Integer value) {
-            addCriterion("Period =", value, "period");
+            addCriterion("CurrentPeriodBo =", value, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodNotEqualTo(Integer value) {
-            addCriterion("Period <>", value, "period");
+            addCriterion("CurrentPeriodBo <>", value, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodGreaterThan(Integer value) {
-            addCriterion("Period >", value, "period");
+            addCriterion("CurrentPeriodBo >", value, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodGreaterThanOrEqualTo(Integer value) {
-            addCriterion("Period >=", value, "period");
+            addCriterion("CurrentPeriodBo >=", value, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodLessThan(Integer value) {
-            addCriterion("Period <", value, "period");
+            addCriterion("CurrentPeriodBo <", value, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodLessThanOrEqualTo(Integer value) {
-            addCriterion("Period <=", value, "period");
+            addCriterion("CurrentPeriodBo <=", value, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodIn(List<Integer> values) {
-            addCriterion("Period in", values, "period");
+            addCriterion("CurrentPeriodBo in", values, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodNotIn(List<Integer> values) {
-            addCriterion("Period not in", values, "period");
+            addCriterion("CurrentPeriodBo not in", values, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodBetween(Integer value1, Integer value2) {
-            addCriterion("Period between", value1, value2, "period");
+            addCriterion("CurrentPeriodBo between", value1, value2, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodNotBetween(Integer value1, Integer value2) {
-            addCriterion("Period not between", value1, value2, "period");
+            addCriterion("CurrentPeriodBo not between", value1, value2, "period");
             return (Criteria) this;
         }
 

atms-api/src/main/java/pwc/taxtech/atms/vat/entity/VoucherMain.java

@@ -24,7 +24,7 @@ public class VoucherMain implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column VoucherMain.Period
+     * This field corresponds to the database column VoucherMain.CurrentPeriodBo
      *
      * @mbg.generated
      */
@@ -145,9 +145,9 @@ public class VoucherMain implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column VoucherMain.Period
+     * This method returns the value of the database column VoucherMain.CurrentPeriodBo
      *
-     * @return the value of VoucherMain.Period
+     * @return the value of VoucherMain.CurrentPeriodBo
      *
      * @mbg.generated
      */
@@ -157,9 +157,9 @@ public class VoucherMain implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column VoucherMain.Period
+     * This method sets the value of the database column VoucherMain.CurrentPeriodBo
      *
-     * @param period the value for VoucherMain.Period
+     * @param period the value for VoucherMain.CurrentPeriodBo
      *
      * @mbg.generated
      */

atms-api/src/main/java/pwc/taxtech/atms/vat/entity/VoucherMainExample.java

@@ -267,62 +267,62 @@ public class VoucherMainExample {
         }
 
         public Criteria andPeriodIsNull() {
-            addCriterion("Period is null");
+            addCriterion("CurrentPeriodBo is null");
             return (Criteria) this;
         }
 
         public Criteria andPeriodIsNotNull() {
-            addCriterion("Period is not null");
+            addCriterion("CurrentPeriodBo is not null");
             return (Criteria) this;
         }
 
         public Criteria andPeriodEqualTo(Integer value) {
-            addCriterion("Period =", value, "period");
+            addCriterion("CurrentPeriodBo =", value, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodNotEqualTo(Integer value) {
-            addCriterion("Period <>", value, "period");
+            addCriterion("CurrentPeriodBo <>", value, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodGreaterThan(Integer value) {
-            addCriterion("Period >", value, "period");
+            addCriterion("CurrentPeriodBo >", value, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodGreaterThanOrEqualTo(Integer value) {
-            addCriterion("Period >=", value, "period");
+            addCriterion("CurrentPeriodBo >=", value, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodLessThan(Integer value) {
-            addCriterion("Period <", value, "period");
+            addCriterion("CurrentPeriodBo <", value, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodLessThanOrEqualTo(Integer value) {
-            addCriterion("Period <=", value, "period");
+            addCriterion("CurrentPeriodBo <=", value, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodIn(List<Integer> values) {
-            addCriterion("Period in", values, "period");
+            addCriterion("CurrentPeriodBo in", values, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodNotIn(List<Integer> values) {
-            addCriterion("Period not in", values, "period");
+            addCriterion("CurrentPeriodBo not in", values, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodBetween(Integer value1, Integer value2) {
-            addCriterion("Period between", value1, value2, "period");
+            addCriterion("CurrentPeriodBo between", value1, value2, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodNotBetween(Integer value1, Integer value2) {
-            addCriterion("Period not between", value1, value2, "period");
+            addCriterion("CurrentPeriodBo not between", value1, value2, "period");
             return (Criteria) this;
         }
 

atms-api/src/main/java/pwc/taxtech/atms/vat/entity/VoucherMapping.java

@@ -41,7 +41,7 @@ public class VoucherMapping implements Serializable {
     /**
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column VoucherMapping.Period
+     * This field corresponds to the database column VoucherMapping.CurrentPeriodBo
      *
      * @mbg.generated
      */
@@ -165,9 +165,9 @@ public class VoucherMapping implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column VoucherMapping.Period
+     * This method returns the value of the database column VoucherMapping.CurrentPeriodBo
      *
-     * @return the value of VoucherMapping.Period
+     * @return the value of VoucherMapping.CurrentPeriodBo
      *
      * @mbg.generated
      */
@@ -177,9 +177,9 @@ public class VoucherMapping implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column VoucherMapping.Period
+     * This method sets the value of the database column VoucherMapping.CurrentPeriodBo
      *
-     * @param period the value for VoucherMapping.Period
+     * @param period the value for VoucherMapping.CurrentPeriodBo
      *
      * @mbg.generated
      */

atms-api/src/main/java/pwc/taxtech/atms/vat/entity/VoucherMappingExample.java

@@ -406,62 +406,62 @@ public class VoucherMappingExample {
         }
 
         public Criteria andPeriodIsNull() {
-            addCriterion("Period is null");
+            addCriterion("CurrentPeriodBo is null");
             return (Criteria) this;
         }
 
         public Criteria andPeriodIsNotNull() {
-            addCriterion("Period is not null");
+            addCriterion("CurrentPeriodBo is not null");
             return (Criteria) this;
         }
 
         public Criteria andPeriodEqualTo(Integer value) {
-            addCriterion("Period =", value, "period");
+            addCriterion("CurrentPeriodBo =", value, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodNotEqualTo(Integer value) {
-            addCriterion("Period <>", value, "period");
+            addCriterion("CurrentPeriodBo <>", value, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodGreaterThan(Integer value) {
-            addCriterion("Period >", value, "period");
+            addCriterion("CurrentPeriodBo >", value, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodGreaterThanOrEqualTo(Integer value) {
-            addCriterion("Period >=", value, "period");
+            addCriterion("CurrentPeriodBo >=", value, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodLessThan(Integer value) {
-            addCriterion("Period <", value, "period");
+            addCriterion("CurrentPeriodBo <", value, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodLessThanOrEqualTo(Integer value) {
-            addCriterion("Period <=", value, "period");
+            addCriterion("CurrentPeriodBo <=", value, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodIn(List<Integer> values) {
-            addCriterion("Period in", values, "period");
+            addCriterion("CurrentPeriodBo in", values, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodNotIn(List<Integer> values) {
-            addCriterion("Period not in", values, "period");
+            addCriterion("CurrentPeriodBo not in", values, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodBetween(Integer value1, Integer value2) {
-            addCriterion("Period between", value1, value2, "period");
+            addCriterion("CurrentPeriodBo between", value1, value2, "period");
             return (Criteria) this;
         }
 
         public Criteria andPeriodNotBetween(Integer value1, Integer value2) {
-            addCriterion("Period not between", value1, value2, "period");
+            addCriterion("CurrentPeriodBo not between", value1, value2, "period");
             return (Criteria) this;
         }
 

atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/ReportFormulaFactory.java

@@ -3,23 +3,29 @@ package pwc.taxtech.atms.vat.service.impl;
 import org.apache.poi.ss.formula.OperationEvaluationContext;
 import org.apache.poi.ss.formula.eval.EvaluationException;
 import org.apache.poi.ss.formula.eval.OperandResolver;
+import org.apache.poi.ss.formula.eval.StringEval;
+import org.apache.poi.ss.formula.eval.StringValueEval;
 import org.apache.poi.ss.formula.eval.ValueEval;
 import org.apache.poi.ss.formula.functions.FreeRefFunction;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import pwc.taxtech.atms.constant.enums.EnumServiceType;
 import pwc.taxtech.atms.dto.GroupId;
+import pwc.taxtech.atms.dto.vatdto.BBParasBo;
 import pwc.taxtech.atms.dto.vatdto.CellTemplatePerGroupDto;
+import pwc.taxtech.atms.dto.vatdto.CloseableFormulaDataSource;
+import pwc.taxtech.atms.dto.vatdto.CurrentPeriodBo;
+import pwc.taxtech.atms.dto.vatdto.ReportCellDataSourceDto;
 import pwc.taxtech.atms.entitiy.ProjectServiceType;
 import pwc.taxtech.atms.entitiy.ProjectServiceTypeExample;
 import pwc.taxtech.atms.vat.service.impl.report.functions.FormulaAgent;
 import pwc.taxtech.atms.vat.service.impl.report.functions.FormulaContext;
 
-import java.util.Comparator;
 import java.util.List;
 
 public class ReportFormulaFactory {
     static final Logger LOGGER = LoggerFactory.getLogger(ReportFormulaFactory.class);
+    final static ValueEval defaultEval = new StringEval("0");
 
     public static abstract class ReportBaseFormula implements FreeRefFunction {
         final FormulaContext context;
@@ -30,66 +36,6 @@ public class ReportFormulaFactory {
             this.agent = context.getFormulaAgent();
         }
 
-        static String resolverString(ValueEval[] args, OperationEvaluationContext ec, int index)
-                throws EvaluationException {
-            return OperandResolver.coerceValueToString(OperandResolver.getSingleValue(args[index], ec.getRowIndex(),
-                    ec.getColumnIndex()));
-        }
-
-        static Integer resolverInteger(ValueEval[] args, OperationEvaluationContext ec, int index)
-                throws EvaluationException {
-            return OperandResolver.coerceValueToInt(OperandResolver.getSingleValue(args[index], ec.getRowIndex(),
-                    ec.getColumnIndex()));
-        }
-
-        static Boolean resolverBoolean(ValueEval[] args, OperationEvaluationContext ec, int index)
-                throws EvaluationException {
-            return OperandResolver.coerceValueToBoolean(OperandResolver.getSingleValue(args[index], ec.getRowIndex(),
-                    ec.getColumnIndex()), false);
-        }
-
-
-        static Double resolverDouble(ValueEval[] args, OperationEvaluationContext ec, int index)
-                throws EvaluationException {
-            return OperandResolver.coerceValueToDouble(OperandResolver.getSingleValue(args[index], ec.getRowIndex(),
-                    ec.getColumnIndex()));
-        }
-
-
-        static class Period {
-            int yearOffset = 0;
-            int period;
-
-            public Period(int period) {
-                this.period = period;
-            }
-
-            public Period set(int yearOffset) {
-                this.yearOffset = yearOffset;
-                return this;
-            }
-        }
-
-        Period getPeriod(int parameterPeriod) {
-            int yearOffset = 0;
-            if (parameterPeriod == -99) {
-                return new Period(parameterPeriod);
-            } else if (parameterPeriod <= -1) {
-                Integer period = parameterPeriod + context.getPeriod();
-                while (period <= 0) {
-                    yearOffset--;
-                    period += 12;
-                    //throw new NotImplementedException();
-                }
-
-                return new Period(period).set(yearOffset);
-            } else if (parameterPeriod == 0) {
-                return new Period(context.getPeriod());
-            } else {
-                return new Period(parameterPeriod);
-            }
-        }
-
         public int getYear(int parameterYear) {
             if (parameterYear <= -1) {
                 return parameterYear + context.getYear();
@@ -103,31 +49,19 @@ public class ReportFormulaFactory {
     }
 
     public static class BB extends ReportBaseFormula {
-        String reportCode;
-        Integer columnIndex;
-        Integer rowIndex;
-        Integer period;
-        Integer year;
-
         protected BB(FormulaContext context) {
             super(context);
         }
 
-        void resolverArgs(ValueEval[] args, OperationEvaluationContext ec) throws EvaluationException {
-            reportCode = resolverString(args, ec, 0);
-            columnIndex = resolverInteger(args, ec, 1);
-            rowIndex = resolverInteger(args, ec, 3);
-            period = resolverInteger(args, ec, 4);
-            year = resolverInteger(args, ec, 5);
-        }
-
-
         @Override
         public ValueEval evaluate(ValueEval[] args, OperationEvaluationContext ec) {
-            try {
-                resolverArgs(args, ec);
-                Period curPeriod = getPeriod(period.intValue());
-                curPeriod.set(curPeriod.yearOffset + getYear(year));
+            try (CloseableFormulaDataSource closeDataSource = new CloseableFormulaDataSource(context.getFormulaAgent())) {
+                BBParasBo bo = new BBParasBo(args, ec);
+                CurrentPeriodBo curPeriod = CurrentPeriodBo.getPeriod(bo.getPeriod().intValue(), context.getPeriod());
+                curPeriod.fixedCurYear(getYear(curPeriod.getCurYear()));
+
+                ReportCellDataSourceDto nullCellDto = ReportCellDataSourceDto.nullDataSource(bo, curPeriod);
+                closeDataSource.addDS(nullCellDto);
 
                 ProjectServiceTypeExample pst = new ProjectServiceTypeExample();
                 pst.createCriteria().andTemplateGroupIDEqualTo(Long.valueOf(context.getReportTemplateGroupID()))
@@ -146,11 +80,40 @@ public class ReportFormulaFactory {
                     }
                 }
 
+                CellTemplatePerGroupDto cellTemplateData = cellTemplates.stream().filter(dto ->
+                        dto.getRowIndex() == bo.getColumnIndex() - 1 &&dto.getColumnIndex()==bo.getColumnIndex()-1)
+                        .findFirst().get();
+
+                if (cellTemplateData == null) {
+                    LOGGER.warn("tcell template data is empty");
+                    return defaultEval;
+                }
+
+                nullCellDto.fixedWithGroup(cellTemplateData);
+                    // todo: fix datasource name by templateList(neo)
+                if(curPeriod.getCurPeriod()==-99){
+                    closeDataSource.clean();
+                    ValueEval returnEval=null;
+                    if(context.getPeriod()<=1){
+                        return  defaultEval;
+                    }
+
+                    for(int p =1;p< context.getPeriod();p++){
+//                        returnEval=And(returnEval,BB)//TODO: to impl add vormular
+                    }
+
+                    return returnEval;
+                }
+
+                bo.disCount();
+
 
 
             } catch (EvaluationException e) {
                 LOGGER.warn("resole args some exception", e);
                 e.printStackTrace();
+            } catch (Exception e) {
+                e.printStackTrace();
             }
 
             return null;

atms-api/src/main/resources/conf/conf_profile_dev.properties

@@ -14,7 +14,7 @@ web.url=http://localhost:8080
 jwt.base64Secret=TXppQjFlZFBSbnJzMHc0Tg==
 jwt.powerToken=xxxx
 
-ftp.host=cnshaappulv004.asia.pwcinternal.com
+ftp.host=cnshaappulv003.asia.pwcinternal.com
 ftp.port=21
 ftp.user=ftpuser
 ftp.pwd=12345678