modify

atms-api/pom.xml

@@ -415,13 +415,6 @@
             <artifactId>jxls-core</artifactId>
             <version>1.0.6</version>
         </dependency>
-        <!-- https://mvnrepository.com/artifact/org.projectlombok/lombok -->
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <version>1.18.0</version>
-            <scope>provided</scope>
-        </dependency>
 
     </dependencies>
 

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

+package pwc.taxtech.atms.constant.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class RevenueConfEnum {
+
+    /**
+     * 账载收入类型
+     */
+    public enum AccountType {
+        Zero(0, "0值"),
+        Account(1, "科目"),
+        Manual(2, "手工录入");
+        private Integer code;
+        private String name;
+        public static final Map<Integer, String> MAPPING = new HashMap<>();
+
+        AccountType(Integer code, String name) {
+            this.code = code;
+            this.name = name;
+        }
+
+        public Integer getCode() {
+            return code;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        static {
+            for (RevenueConfEnum.AccountType accountType : RevenueConfEnum.AccountType.values()) {
+                MAPPING.put(accountType.getCode(), accountType.getName());
+            }
+        }
+    }
+
+    /**
+     * 账载收入类型
+     */
+    public enum TaxBase {
+        Account(1, "账载"),
+        Invoice(2, "开票收入"),
+        Manual(3, "手工录入"),
+        Period_Dr(4, "借方发生额"),
+        Period_Cr(5, "贷方发生额");
+        private Integer code;
+        private String name;
+        public static final Map<Integer, String> MAPPING = new HashMap<>();
+
+        TaxBase(Integer code, String name) {
+            this.code = code;
+            this.name = name;
+        }
+
+        public Integer getCode() {
+            return code;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        static {
+            for (RevenueConfEnum.TaxBase taxBase : RevenueConfEnum.TaxBase.values()) {
+                MAPPING.put(taxBase.getCode(), taxBase.getName());
+            }
+        }
+    }
+
+    /**
+     * 计税方法
+     */
+    public enum TaxType {
+        Common(0, "一般计税"),
+        Simple(1, "简易计税"),
+        Tax_Exemption(2, "免抵退税"),
+        Free(3, "免税");
+        private Integer code;
+        private String name;
+        public static final Map<Integer, String> MAPPING = new HashMap<>();
+
+        TaxType(Integer code, String name) {
+            this.code = code;
+            this.name = name;
+        }
+
+        public Integer getCode() {
+            return code;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        static {
+            for (RevenueConfEnum.TaxType taxType : RevenueConfEnum.TaxType.values()) {
+                MAPPING.put(taxType.getCode(), taxType.getName());
+            }
+        }
+    }
+
+    /**
+     * 收入类型
+     */
+    public enum RevenueType {
+        Service(0, "货物及加工修理修配劳务"),
+        Assets(1, "服务、不动产和无形资产");
+        private Integer code;
+        private String name;
+        public static final Map<Integer, String> MAPPING = new HashMap<>();
+
+        RevenueType(Integer code, String name) {
+            this.code = code;
+            this.name = name;
+        }
+
+        public Integer getCode() {
+            return code;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        static {
+            for (RevenueConfEnum.RevenueType revenueType : RevenueConfEnum.RevenueType.values()) {
+                MAPPING.put(revenueType.getCode(), revenueType.getName());
+            }
+        }
+    }
+
+    /**
+     * 状态
+     */
+    public enum Status {
+        Enable(0, "启用"),
+        Disable(1, "停用");
+        private Integer code;
+        private String name;
+        public static final Map<Integer, String> MAPPING = new HashMap<>();
+
+        Status(Integer code, String name) {
+            this.code = code;
+            this.name = name;
+        }
+
+        public Integer getCode() {
+            return code;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        static {
+            for (RevenueConfEnum.Status status : RevenueConfEnum.Status.values()) {
+                MAPPING.put(status.getCode(), status.getName());
+            }
+        }
+    }
+
+}

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

 package pwc.taxtech.atms.dto.vatdto.excelheader;
 
-import lombok.Getter;
-import lombok.Setter;
-
-@Getter
-@Setter
 public class CashFlowHeader {
     private String companyNameCn;
     private String companyNameEn;
@@ -13,4 +8,60 @@ public class CashFlowHeader {
     private String ledgerName;
     private String ledgerCurrencyCode;
     private String status;
+
+    public String getCompanyNameCn() {
+        return this.companyNameCn;
+    }
+
+    public void setCompanyNameCn(String companyNameCn) {
+        this.companyNameCn = companyNameCn;
+    }
+
+    public String getCompanyNameEn() {
+        return this.companyNameEn;
+    }
+
+    public void setCompanyNameEn(String companyNameEn) {
+        this.companyNameEn = companyNameEn;
+    }
+
+    public Integer getPeriodStart() {
+        return this.periodStart;
+    }
+
+    public void setPeriodStart(Integer periodStart) {
+        this.periodStart = periodStart;
+    }
+
+    public Integer getPeriodEnd() {
+        return this.periodEnd;
+    }
+
+    public void setPeriodEnd(Integer periodEnd) {
+        this.periodEnd = periodEnd;
+    }
+
+    public String getLedgerName() {
+        return this.ledgerName;
+    }
+
+    public void setLedgerName(String ledgerName) {
+        this.ledgerName = ledgerName;
+    }
+
+    public String getLedgerCurrencyCode() {
+        return this.ledgerCurrencyCode;
+    }
+
+    public void setLedgerCurrencyCode(String ledgerCurrencyCode) {
+        this.ledgerCurrencyCode = ledgerCurrencyCode;
+    }
+
+    public String getStatus() {
+        return this.status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
 }

atms-api/src/main/resources/job.properties

@@ -6,7 +6,7 @@
 org.quartz.jobStore.useProperties=true
 org.quartz.jobStore.tablePrefix = QRTZ_
 org.quartz.jobStore.isClustered = true
-org.quartz.jobStore.clusterCheckinInterval = 5000
+org.quartz.jobStore.clusterCheckinInterval = 60000
 org.quartz.jobStore.misfireThreshold = 60000
 org.quartz.jobStore.txIsolationLevelReadCommitted = true
 

atms-dao/etc/generator-mysql/vatGeneratorConfig.xml

@@ -41,12 +41,22 @@
             <property name="rootInterface" value="pwc.taxtech.atms.MyVatMapper" />
         </javaClientGenerator>
 
-        <table tableName="invoice_data" domainObjectName="InvoiceData">
+        <table tableName="revenue_config" domainObjectName="RevenueConfig">
             <property name="useActualColumnNames" value="false"/>
             <property name="ignoreQualifiersAtRuntime" value="true"/>
-            <columnOverride column="count_type" javaType="java.lang.Integer" jdbcType="TINYINT"/>
+            <columnOverride column="account_type" javaType="java.lang.Integer" jdbcType="TINYINT"/>
+            <columnOverride column="tax_base" javaType="java.lang.Integer" jdbcType="TINYINT"/>
+            <columnOverride column="revenue_type" javaType="java.lang.Integer" jdbcType="TINYINT"/>
+            <columnOverride column="tax_type" javaType="java.lang.Integer" jdbcType="TINYINT"/>
+            <columnOverride column="status" javaType="java.lang.Integer" jdbcType="TINYINT"/>
         </table>
 
+        <!--<table tableName="invoice_data" domainObjectName="InvoiceData">-->
+            <!--<property name="useActualColumnNames" value="false"/>-->
+            <!--<property name="ignoreQualifiersAtRuntime" value="true"/>-->
+            <!--<columnOverride column="count_type" javaType="java.lang.Integer" jdbcType="TINYINT"/>-->
+        <!--</table>-->
+
         <!--<table tableName="coupa_purchasing_report" domainObjectName="CoupaPurchasingReport">
             <property name="useActualColumnNames" value="false"/>
             <property name="ignoreQualifiersAtRuntime" value="true"/>

atms-dao/src/main/java/pwc/taxtech/atms/vat/dao/RevenueConfigMapper.java

+package pwc.taxtech.atms.vat.dao;
+
+import java.util.List;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.session.RowBounds;
+import pwc.taxtech.atms.MyVatMapper;
+import pwc.taxtech.atms.vat.entity.RevenueConfig;
+import pwc.taxtech.atms.vat.entity.RevenueConfigExample;
+
+@Mapper
+public interface RevenueConfigMapper extends MyVatMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table revenue_config
+     *
+     * @mbg.generated
+     */
+    long countByExample(RevenueConfigExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table revenue_config
+     *
+     * @mbg.generated
+     */
+    int deleteByExample(RevenueConfigExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table revenue_config
+     *
+     * @mbg.generated
+     */
+    int deleteByPrimaryKey(Long id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table revenue_config
+     *
+     * @mbg.generated
+     */
+    int insert(RevenueConfig record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table revenue_config
+     *
+     * @mbg.generated
+     */
+    int insertSelective(RevenueConfig record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table revenue_config
+     *
+     * @mbg.generated
+     */
+    List<RevenueConfig> selectByExampleWithRowbounds(RevenueConfigExample example, RowBounds rowBounds);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table revenue_config
+     *
+     * @mbg.generated
+     */
+    List<RevenueConfig> selectByExample(RevenueConfigExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table revenue_config
+     *
+     * @mbg.generated
+     */
+    RevenueConfig selectByPrimaryKey(Long id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table revenue_config
+     *
+     * @mbg.generated
+     */
+    int updateByExampleSelective(@Param("record") RevenueConfig record, @Param("example") RevenueConfigExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table revenue_config
+     *
+     * @mbg.generated
+     */
+    int updateByExample(@Param("record") RevenueConfig record, @Param("example") RevenueConfigExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table revenue_config
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKeySelective(RevenueConfig record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table revenue_config
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKey(RevenueConfig record);
+}
\ No newline at end of file