Merge branch 'dev_mysql' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_mysql

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

@@ -148,6 +148,33 @@ public class DateUtils {
         return strtodate;
     }
 
+    /**
+     * 将短时间格式字符串转换为时间 yyyy/MM/dd
+     *
+     * @param strDate
+     * @return
+     */
+    public static Date strToDate2(String strDate) {
+        SimpleDateFormat formatter = new SimpleDateFormat("yyyy/MM/dd");
+        ParsePosition pos = new ParsePosition(0);
+        Date strtodate = formatter.parse(strDate, pos);
+        return strtodate;
+    }
+
+    /**
+     * 将yy/MM/dd字符串转换为时间 yyyy/MM/dd
+     *
+     * @param strDate
+     * @return
+     */
+    public static Date strToDate3(String strDate) {
+        strDate = "20"+strDate;
+        SimpleDateFormat formatter = new SimpleDateFormat("yyyy/MM/dd");
+        ParsePosition pos = new ParsePosition(0);
+        Date strtodate = formatter.parse(strDate, pos);
+        return strtodate;
+    }
+
     /**
      * 得到现在时间
      *

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

@@ -5,7 +5,10 @@ public enum EnumImportType {
     ProfitLoss(1),
     BalanceSheet(2),
     RedLetterInfoTable(3),
-    AdjustmentTable(4)
+    AdjustmentTable(4),
+    CashFlow(5),
+    CoupaPurchasingReport(6),
+    InvoiceData(7)
     ;
 
     private Integer code;

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

@@ -112,6 +112,38 @@ public class DataImportController extends BaseController {
         }
     }
 
+    @ResponseBody
+    @RequestMapping(value = "CFExcelFile", method = RequestMethod.POST)
+    public OperationResultDto importCFExcelFile(@RequestParam MultipartFile file,@RequestParam String periodDate,@RequestParam Integer importType) {
+        try {
+            if (null == file) {
+                return OperationResultDto.error(ErrorMessage.NoFile);
+            }
+            return dataImportService.importCFExcelFile(file, periodDate,importType);
+        } catch (ServiceException e) {
+            return OperationResultDto.error(e.getMessage());
+        } catch (Exception e) {
+            logger.error("importATExcelFile error.", e);
+            return OperationResultDto.error(ErrorMessage.SystemError);
+        }
+    }
+
+    @ResponseBody
+    @RequestMapping(value = "CPRExcelFile", method = RequestMethod.POST)
+    public OperationResultDto importCPRExcelFile(@RequestParam MultipartFile file,@RequestParam String periodDate,@RequestParam Integer importType) {
+        try {
+            if (null == file) {
+                return OperationResultDto.error(ErrorMessage.NoFile);
+            }
+            return dataImportService.importCPRExcelFile(file, periodDate,importType);
+        } catch (ServiceException e) {
+            return OperationResultDto.error(e.getMessage());
+        } catch (Exception e) {
+            logger.error("importATExcelFile error.", e);
+            return OperationResultDto.error(ErrorMessage.SystemError);
+        }
+    }
+
     @ResponseBody
     @RequestMapping(value = "displayImportLog", method = RequestMethod.GET)
     public List<DataImportLogDto> displayImportLog(@RequestParam Integer type) {

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

@@ -41,12 +41,28 @@
             <property name="rootInterface" value="pwc.taxtech.atms.MyVatMapper" />
         </javaClientGenerator>
 
+        <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"/>
+        </table>
+
+        <table tableName="cash_flow" domainObjectName="CashFlow">
+            <property name="useActualColumnNames" value="false"/>
+            <property name="ignoreQualifiersAtRuntime" value="true"/>
+        </table>
+
         <table tableName="red_letter_info_table" domainObjectName="RedLetterInfoTable">
             <property name="useActualColumnNames" value="false"/>
             <property name="ignoreQualifiersAtRuntime" value="true"/>
         </table>
 
-        <!--<table tableName="adjustment_table" domainObjectName="AdjustmentTable">
+        <table tableName="adjustment_table" domainObjectName="AdjustmentTable">
             <property name="useActualColumnNames" value="false"/>
             <property name="ignoreQualifiersAtRuntime" value="true"/>
         </table>

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

@@ -6,10 +6,8 @@ import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.session.RowBounds;
 import pwc.taxtech.atms.MyVatMapper;
 import pwc.taxtech.atms.vat.dpo.CashFlowCondition;
-import pwc.taxtech.atms.vat.dpo.ProfitLossStatementCondition;
 import pwc.taxtech.atms.vat.entity.CashFlow;
 import pwc.taxtech.atms.vat.entity.CashFlowExample;
-import pwc.taxtech.atms.vat.entity.ProfitLossStatement;
 
 @Mapper
 public interface CashFlowMapper extends MyVatMapper {
@@ -110,4 +108,6 @@ public interface CashFlowMapper extends MyVatMapper {
     int updateByPrimaryKey(CashFlow record);
 
     List<CashFlow> selectByCondition(@Param("cfCondition") CashFlowCondition condition);
+
+    int insertBatch(List<CashFlow> cfs);
 }
\ No newline at end of file

atms-dao/src/main/java/pwc/taxtech/atms/vat/dao/CoupaPurchasingReportMapper.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.CoupaPurchasingReport;
+import pwc.taxtech.atms.vat.entity.CoupaPurchasingReportExample;
+
+@Mapper
+public interface CoupaPurchasingReportMapper extends MyVatMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table coupa_purchasing_report
+     *
+     * @mbg.generated
+     */
+    long countByExample(CoupaPurchasingReportExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table coupa_purchasing_report
+     *
+     * @mbg.generated
+     */
+    int deleteByExample(CoupaPurchasingReportExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table coupa_purchasing_report
+     *
+     * @mbg.generated
+     */
+    int deleteByPrimaryKey(Long id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table coupa_purchasing_report
+     *
+     * @mbg.generated
+     */
+    int insert(CoupaPurchasingReport record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table coupa_purchasing_report
+     *
+     * @mbg.generated
+     */
+    int insertSelective(CoupaPurchasingReport record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table coupa_purchasing_report
+     *
+     * @mbg.generated
+     */
+    List<CoupaPurchasingReport> selectByExampleWithRowbounds(CoupaPurchasingReportExample example, RowBounds rowBounds);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table coupa_purchasing_report
+     *
+     * @mbg.generated
+     */
+    List<CoupaPurchasingReport> selectByExample(CoupaPurchasingReportExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table coupa_purchasing_report
+     *
+     * @mbg.generated
+     */
+    CoupaPurchasingReport selectByPrimaryKey(Long id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table coupa_purchasing_report
+     *
+     * @mbg.generated
+     */
+    int updateByExampleSelective(@Param("record") CoupaPurchasingReport record, @Param("example") CoupaPurchasingReportExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table coupa_purchasing_report
+     *
+     * @mbg.generated
+     */
+    int updateByExample(@Param("record") CoupaPurchasingReport record, @Param("example") CoupaPurchasingReportExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table coupa_purchasing_report
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKeySelective(CoupaPurchasingReport record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table coupa_purchasing_report
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKey(CoupaPurchasingReport record);
+
+    int insertBatch(List<CoupaPurchasingReport> cprs);
+}
\ No newline at end of file

atms-dao/src/main/java/pwc/taxtech/atms/vat/dao/InvoiceDataMapper.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.InvoiceData;
+import pwc.taxtech.atms.vat.entity.InvoiceDataExample;
+
+@Mapper
+public interface InvoiceDataMapper extends MyVatMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table invoice_data
+     *
+     * @mbg.generated
+     */
+    long countByExample(InvoiceDataExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table invoice_data
+     *
+     * @mbg.generated
+     */
+    int deleteByExample(InvoiceDataExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table invoice_data
+     *
+     * @mbg.generated
+     */
+    int deleteByPrimaryKey(Long id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table invoice_data
+     *
+     * @mbg.generated
+     */
+    int insert(InvoiceData record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table invoice_data
+     *
+     * @mbg.generated
+     */
+    int insertSelective(InvoiceData record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table invoice_data
+     *
+     * @mbg.generated
+     */
+    List<InvoiceData> selectByExampleWithRowbounds(InvoiceDataExample example, RowBounds rowBounds);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table invoice_data
+     *
+     * @mbg.generated
+     */
+    List<InvoiceData> selectByExample(InvoiceDataExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table invoice_data
+     *
+     * @mbg.generated
+     */
+    InvoiceData selectByPrimaryKey(Long id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table invoice_data
+     *
+     * @mbg.generated
+     */
+    int updateByExampleSelective(@Param("record") InvoiceData record, @Param("example") InvoiceDataExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table invoice_data
+     *
+     * @mbg.generated
+     */
+    int updateByExample(@Param("record") InvoiceData record, @Param("example") InvoiceDataExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table invoice_data
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKeySelective(InvoiceData record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table invoice_data
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKey(InvoiceData record);
+}
\ No newline at end of file

atms-dao/src/main/java/pwc/taxtech/atms/vat/entity/CashFlow.java

@@ -24,6 +24,17 @@ public class CashFlow extends BaseEntity implements Serializable {
      */
     private Long id;
 
+    /**
+     * Database Column Remarks:
+     *   机构id
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cash_flow.organization_id
+     *
+     * @mbg.generated
+     */
+    private String organizationId;
+
     /**
      * Database Column Remarks:
      *   数据日期
@@ -46,6 +57,17 @@ public class CashFlow extends BaseEntity implements Serializable {
      */
     private String source;
 
+    /**
+     * Database Column Remarks:
+     *   税务系统期间 yyyyMM
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cash_flow.tms_period
+     *
+     * @mbg.generated
+     */
+    private Integer tmsPeriod;
+
     /**
      * Database Column Remarks:
      *   期间 YYYY-MM
@@ -95,7 +117,7 @@ public class CashFlow extends BaseEntity implements Serializable {
      *   账套币种
      *
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column cash_flow.edger_currency_code
+     * This field corresponds to the database column cash_flow.ledger_currency_code
      *
      * @mbg.generated
      */
@@ -240,6 +262,30 @@ public class CashFlow extends BaseEntity implements Serializable {
         this.id = id;
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column cash_flow.organization_id
+     *
+     * @return the value of cash_flow.organization_id
+     *
+     * @mbg.generated
+     */
+    public String getOrganizationId() {
+        return organizationId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column cash_flow.organization_id
+     *
+     * @param organizationId the value for cash_flow.organization_id
+     *
+     * @mbg.generated
+     */
+    public void setOrganizationId(String organizationId) {
+        this.organizationId = organizationId == null ? null : organizationId.trim();
+    }
+
     /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column cash_flow.date
@@ -288,6 +334,30 @@ public class CashFlow extends BaseEntity implements Serializable {
         this.source = source == null ? null : source.trim();
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column cash_flow.tms_period
+     *
+     * @return the value of cash_flow.tms_period
+     *
+     * @mbg.generated
+     */
+    public Integer getTmsPeriod() {
+        return tmsPeriod;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column cash_flow.tms_period
+     *
+     * @param tmsPeriod the value for cash_flow.tms_period
+     *
+     * @mbg.generated
+     */
+    public void setTmsPeriod(Integer tmsPeriod) {
+        this.tmsPeriod = tmsPeriod;
+    }
+
     /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column cash_flow.period
@@ -386,9 +456,9 @@ public class CashFlow extends BaseEntity implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column cash_flow.edger_currency_code
+     * This method returns the value of the database column cash_flow.ledger_currency_code
      *
-     * @return the value of cash_flow.edger_currency_code
+     * @return the value of cash_flow.ledger_currency_code
      *
      * @mbg.generated
      */
@@ -398,9 +468,9 @@ public class CashFlow extends BaseEntity implements Serializable {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column cash_flow.edger_currency_code
+     * This method sets the value of the database column cash_flow.ledger_currency_code
      *
-     * @param ledgerCurrencyCode the value for cash_flow.edger_currency_code
+     * @param ledgerCurrencyCode the value for cash_flow.ledger_currency_code
      *
      * @mbg.generated
      */
@@ -661,8 +731,10 @@ public class CashFlow extends BaseEntity implements Serializable {
         sb.append(" [");
         sb.append("Hash = ").append(hashCode());
         sb.append(", id=").append(id);
+        sb.append(", organizationId=").append(organizationId);
         sb.append(", date=").append(date);
         sb.append(", source=").append(source);
+        sb.append(", tmsPeriod=").append(tmsPeriod);
         sb.append(", period=").append(period);
         sb.append(", status=").append(status);
         sb.append(", ledgerId=").append(ledgerId);

atms-dao/src/main/java/pwc/taxtech/atms/vat/entity/CashFlowExample.java

@@ -256,6 +256,76 @@ public class CashFlowExample {
             return (Criteria) this;
         }
 
+        public Criteria andOrganizationIdIsNull() {
+            addCriterion("organization_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrganizationIdIsNotNull() {
+            addCriterion("organization_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrganizationIdEqualTo(String value) {
+            addCriterion("organization_id =", value, "organizationId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrganizationIdNotEqualTo(String value) {
+            addCriterion("organization_id <>", value, "organizationId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrganizationIdGreaterThan(String value) {
+            addCriterion("organization_id >", value, "organizationId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrganizationIdGreaterThanOrEqualTo(String value) {
+            addCriterion("organization_id >=", value, "organizationId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrganizationIdLessThan(String value) {
+            addCriterion("organization_id <", value, "organizationId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrganizationIdLessThanOrEqualTo(String value) {
+            addCriterion("organization_id <=", value, "organizationId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrganizationIdLike(String value) {
+            addCriterion("organization_id like", value, "organizationId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrganizationIdNotLike(String value) {
+            addCriterion("organization_id not like", value, "organizationId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrganizationIdIn(List<String> values) {
+            addCriterion("organization_id in", values, "organizationId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrganizationIdNotIn(List<String> values) {
+            addCriterion("organization_id not in", values, "organizationId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrganizationIdBetween(String value1, String value2) {
+            addCriterion("organization_id between", value1, value2, "organizationId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrganizationIdNotBetween(String value1, String value2) {
+            addCriterion("organization_id not between", value1, value2, "organizationId");
+            return (Criteria) this;
+        }
+
         public Criteria andDateIsNull() {
             addCriterion("`date` is null");
             return (Criteria) this;
@@ -386,6 +456,66 @@ public class CashFlowExample {
             return (Criteria) this;
         }
 
+        public Criteria andTmsPeriodIsNull() {
+            addCriterion("tms_period is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTmsPeriodIsNotNull() {
+            addCriterion("tms_period is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTmsPeriodEqualTo(Integer value) {
+            addCriterion("tms_period =", value, "tmsPeriod");
+            return (Criteria) this;
+        }
+
+        public Criteria andTmsPeriodNotEqualTo(Integer value) {
+            addCriterion("tms_period <>", value, "tmsPeriod");
+            return (Criteria) this;
+        }
+
+        public Criteria andTmsPeriodGreaterThan(Integer value) {
+            addCriterion("tms_period >", value, "tmsPeriod");
+            return (Criteria) this;
+        }
+
+        public Criteria andTmsPeriodGreaterThanOrEqualTo(Integer value) {
+            addCriterion("tms_period >=", value, "tmsPeriod");
+            return (Criteria) this;
+        }
+
+        public Criteria andTmsPeriodLessThan(Integer value) {
+            addCriterion("tms_period <", value, "tmsPeriod");
+            return (Criteria) this;
+        }
+
+        public Criteria andTmsPeriodLessThanOrEqualTo(Integer value) {
+            addCriterion("tms_period <=", value, "tmsPeriod");
+            return (Criteria) this;
+        }
+
+        public Criteria andTmsPeriodIn(List<Integer> values) {
+            addCriterion("tms_period in", values, "tmsPeriod");
+            return (Criteria) this;
+        }
+
+        public Criteria andTmsPeriodNotIn(List<Integer> values) {
+            addCriterion("tms_period not in", values, "tmsPeriod");
+            return (Criteria) this;
+        }
+
+        public Criteria andTmsPeriodBetween(Integer value1, Integer value2) {
+            addCriterion("tms_period between", value1, value2, "tmsPeriod");
+            return (Criteria) this;
+        }
+
+        public Criteria andTmsPeriodNotBetween(Integer value1, Integer value2) {
+            addCriterion("tms_period not between", value1, value2, "tmsPeriod");
+            return (Criteria) this;
+        }
+
         public Criteria andPeriodIsNull() {
             addCriterion("period is null");
             return (Criteria) this;
@@ -657,72 +787,72 @@ public class CashFlowExample {
         }
 
         public Criteria andLedgerCurrencyCodeIsNull() {
-            addCriterion("edger_currency_code is null");
+            addCriterion("ledger_currency_code is null");
             return (Criteria) this;
         }
 
         public Criteria andLedgerCurrencyCodeIsNotNull() {
-            addCriterion("edger_currency_code is not null");
+            addCriterion("ledger_currency_code is not null");
             return (Criteria) this;
         }
 
         public Criteria andLedgerCurrencyCodeEqualTo(String value) {
-            addCriterion("edger_currency_code =", value, "ledgerCurrencyCode");
+            addCriterion("ledger_currency_code =", value, "ledgerCurrencyCode");
             return (Criteria) this;
         }
 
         public Criteria andLedgerCurrencyCodeNotEqualTo(String value) {
-            addCriterion("edger_currency_code <>", value, "ledgerCurrencyCode");
+            addCriterion("ledger_currency_code <>", value, "ledgerCurrencyCode");
             return (Criteria) this;
         }
 
         public Criteria andLedgerCurrencyCodeGreaterThan(String value) {
-            addCriterion("edger_currency_code >", value, "ledgerCurrencyCode");
+            addCriterion("ledger_currency_code >", value, "ledgerCurrencyCode");
             return (Criteria) this;
         }
 
         public Criteria andLedgerCurrencyCodeGreaterThanOrEqualTo(String value) {
-            addCriterion("edger_currency_code >=", value, "ledgerCurrencyCode");
+            addCriterion("ledger_currency_code >=", value, "ledgerCurrencyCode");
             return (Criteria) this;
         }
 
         public Criteria andLedgerCurrencyCodeLessThan(String value) {
-            addCriterion("edger_currency_code <", value, "ledgerCurrencyCode");
+            addCriterion("ledger_currency_code <", value, "ledgerCurrencyCode");
             return (Criteria) this;
         }
 
         public Criteria andLedgerCurrencyCodeLessThanOrEqualTo(String value) {
-            addCriterion("edger_currency_code <=", value, "ledgerCurrencyCode");
+            addCriterion("ledger_currency_code <=", value, "ledgerCurrencyCode");
             return (Criteria) this;
         }
 
         public Criteria andLedgerCurrencyCodeLike(String value) {
-            addCriterion("edger_currency_code like", value, "ledgerCurrencyCode");
+            addCriterion("ledger_currency_code like", value, "ledgerCurrencyCode");
             return (Criteria) this;
         }
 
         public Criteria andLedgerCurrencyCodeNotLike(String value) {
-            addCriterion("edger_currency_code not like", value, "ledgerCurrencyCode");
+            addCriterion("ledger_currency_code not like", value, "ledgerCurrencyCode");
             return (Criteria) this;
         }
 
         public Criteria andLedgerCurrencyCodeIn(List<String> values) {
-            addCriterion("edger_currency_code in", values, "ledgerCurrencyCode");
+            addCriterion("ledger_currency_code in", values, "ledgerCurrencyCode");
             return (Criteria) this;
         }
 
         public Criteria andLedgerCurrencyCodeNotIn(List<String> values) {
-            addCriterion("edger_currency_code not in", values, "ledgerCurrencyCode");
+            addCriterion("ledger_currency_code not in", values, "ledgerCurrencyCode");
             return (Criteria) this;
         }
 
         public Criteria andLedgerCurrencyCodeBetween(String value1, String value2) {
-            addCriterion("edger_currency_code between", value1, value2, "ledgerCurrencyCode");
+            addCriterion("ledger_currency_code between", value1, value2, "ledgerCurrencyCode");
             return (Criteria) this;
         }
 
         public Criteria andLedgerCurrencyCodeNotBetween(String value1, String value2) {
-            addCriterion("edger_currency_code not between", value1, value2, "ledgerCurrencyCode");
+            addCriterion("ledger_currency_code not between", value1, value2, "ledgerCurrencyCode");
             return (Criteria) this;
         }
 

atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/CashFlowMapper.xml

@@ -7,8 +7,10 @@
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="organization_id" jdbcType="VARCHAR" property="organizationId" />
     <result column="date" jdbcType="TIMESTAMP" property="date" />
     <result column="source" jdbcType="VARCHAR" property="source" />
+    <result column="tms_period" jdbcType="INTEGER" property="tmsPeriod" />
     <result column="period" jdbcType="INTEGER" property="period" />
     <result column="status" jdbcType="VARCHAR" property="status" />
     <result column="ledger_id" jdbcType="VARCHAR" property="ledgerId" />
@@ -96,9 +98,9 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    id, `date`, `source`, period, `status`, ledger_id, ledger_name, ledger_currency_code, 
-    entity_code, entity_name, category, frequency, item_name, item_name2, period_amt, 
-    ytd_amt, create_time, update_time
+    id, organization_id, `date`, `source`, tms_period, period, `status`, ledger_id, ledger_name, 
+    ledger_currency_code, entity_code, entity_name, category, frequency, item_name, item_name2, 
+    period_amt, ytd_amt, create_time, update_time
   </sql>
   <select id="selectByExample" parameterType="pwc.taxtech.atms.vat.entity.CashFlowExample" resultMap="BaseResultMap">
     <!--
@@ -151,20 +153,20 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    insert into cash_flow (id, `date`, `source`, 
-      period, `status`, ledger_id, 
-      ledger_name, ledger_currency_code, entity_code, 
-      entity_name, category, frequency, 
-      item_name, item_name2, period_amt, 
-      ytd_amt, create_time, update_time
-      )
-    values (#{id,jdbcType=BIGINT}, #{date,jdbcType=TIMESTAMP}, #{source,jdbcType=VARCHAR}, 
-      #{period,jdbcType=INTEGER}, #{status,jdbcType=VARCHAR}, #{ledgerId,jdbcType=VARCHAR}, 
-      #{ledgerName,jdbcType=VARCHAR}, #{ledgerCurrencyCode,jdbcType=VARCHAR}, #{entityCode,jdbcType=VARCHAR}, 
-      #{entityName,jdbcType=VARCHAR}, #{category,jdbcType=VARCHAR}, #{frequency,jdbcType=VARCHAR}, 
-      #{itemName,jdbcType=VARCHAR}, #{itemName2,jdbcType=VARCHAR}, #{periodAmt,jdbcType=DECIMAL}, 
-      #{ytdAmt,jdbcType=DECIMAL}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
-      )
+    insert into cash_flow (id, organization_id, `date`, 
+      `source`, tms_period, period, 
+      `status`, ledger_id, ledger_name, 
+      ledger_currency_code, entity_code, entity_name, 
+      category, frequency, item_name, 
+      item_name2, period_amt, ytd_amt, 
+      create_time, update_time)
+    values (#{id,jdbcType=BIGINT}, #{organizationId,jdbcType=VARCHAR}, #{date,jdbcType=TIMESTAMP}, 
+      #{source,jdbcType=VARCHAR}, #{tmsPeriod,jdbcType=INTEGER}, #{period,jdbcType=INTEGER}, 
+      #{status,jdbcType=VARCHAR}, #{ledgerId,jdbcType=VARCHAR}, #{ledgerName,jdbcType=VARCHAR}, 
+      #{ledgerCurrencyCode,jdbcType=VARCHAR}, #{entityCode,jdbcType=VARCHAR}, #{entityName,jdbcType=VARCHAR}, 
+      #{category,jdbcType=VARCHAR}, #{frequency,jdbcType=VARCHAR}, #{itemName,jdbcType=VARCHAR}, 
+      #{itemName2,jdbcType=VARCHAR}, #{periodAmt,jdbcType=DECIMAL}, #{ytdAmt,jdbcType=DECIMAL}, 
+      #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="pwc.taxtech.atms.vat.entity.CashFlow">
     <!--
@@ -176,12 +178,18 @@
       <if test="id != null">
         id,
       </if>
+      <if test="organizationId != null">
+        organization_id,
+      </if>
       <if test="date != null">
         `date`,
       </if>
       <if test="source != null">
         `source`,
       </if>
+      <if test="tmsPeriod != null">
+        tms_period,
+      </if>
       <if test="period != null">
         period,
       </if>
@@ -232,12 +240,18 @@
       <if test="id != null">
         #{id,jdbcType=BIGINT},
       </if>
+      <if test="organizationId != null">
+        #{organizationId,jdbcType=VARCHAR},
+      </if>
       <if test="date != null">
         #{date,jdbcType=TIMESTAMP},
       </if>
       <if test="source != null">
         #{source,jdbcType=VARCHAR},
       </if>
+      <if test="tmsPeriod != null">
+        #{tmsPeriod,jdbcType=INTEGER},
+      </if>
       <if test="period != null">
         #{period,jdbcType=INTEGER},
       </if>
@@ -305,12 +319,18 @@
       <if test="record.id != null">
         id = #{record.id,jdbcType=BIGINT},
       </if>
+      <if test="record.organizationId != null">
+        organization_id = #{record.organizationId,jdbcType=VARCHAR},
+      </if>
       <if test="record.date != null">
         `date` = #{record.date,jdbcType=TIMESTAMP},
       </if>
       <if test="record.source != null">
         `source` = #{record.source,jdbcType=VARCHAR},
       </if>
+      <if test="record.tmsPeriod != null">
+        tms_period = #{record.tmsPeriod,jdbcType=INTEGER},
+      </if>
       <if test="record.period != null">
         period = #{record.period,jdbcType=INTEGER},
       </if>
@@ -368,8 +388,10 @@
     -->
     update cash_flow
     set id = #{record.id,jdbcType=BIGINT},
+      organization_id = #{record.organizationId,jdbcType=VARCHAR},
       `date` = #{record.date,jdbcType=TIMESTAMP},
       `source` = #{record.source,jdbcType=VARCHAR},
+      tms_period = #{record.tmsPeriod,jdbcType=INTEGER},
       period = #{record.period,jdbcType=INTEGER},
       `status` = #{record.status,jdbcType=VARCHAR},
       ledger_id = #{record.ledgerId,jdbcType=VARCHAR},
@@ -396,12 +418,18 @@
     -->
     update cash_flow
     <set>
+      <if test="organizationId != null">
+        organization_id = #{organizationId,jdbcType=VARCHAR},
+      </if>
       <if test="date != null">
         `date` = #{date,jdbcType=TIMESTAMP},
       </if>
       <if test="source != null">
         `source` = #{source,jdbcType=VARCHAR},
       </if>
+      <if test="tmsPeriod != null">
+        tms_period = #{tmsPeriod,jdbcType=INTEGER},
+      </if>
       <if test="period != null">
         period = #{period,jdbcType=INTEGER},
       </if>
@@ -456,8 +484,10 @@
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     update cash_flow
-    set `date` = #{date,jdbcType=TIMESTAMP},
+    set organization_id = #{organizationId,jdbcType=VARCHAR},
+      `date` = #{date,jdbcType=TIMESTAMP},
       `source` = #{source,jdbcType=VARCHAR},
+      tms_period = #{tmsPeriod,jdbcType=INTEGER},
       period = #{period,jdbcType=INTEGER},
       `status` = #{status,jdbcType=VARCHAR},
       ledger_id = #{ledgerId,jdbcType=VARCHAR},

atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/extends/CashFlowExtendsMapper.xml

@@ -35,4 +35,95 @@
     where
     <include refid="QueryCondition"/>
   </select>
+
+  <insert id="insertBatch" parameterType="java.util.List">
+    insert into cash_flow
+    (<include refid="Base_Column_List"/>)
+    values
+    <foreach collection="list" item="item" index="index" separator=",">
+      <trim prefix="(" suffix=")" suffixOverrides=",">
+        <choose>
+          <when test="item.id != null">#{item.id,jdbcType=BIGINT},</when>
+          <otherwise>0,</otherwise>
+        </choose>
+        <choose>
+          <when test="item.organizationId != null">#{item.organizationId,jdbcType=VARCHAR},</when>
+          <otherwise>'',</otherwise>
+        </choose>
+        <choose>
+          <when test="item.date != null">#{item.date,jdbcType=TIMESTAMP},</when>
+          <otherwise>CURRENT_TIMESTAMP,</otherwise>
+        </choose>
+        <choose>
+          <when test="item.source != null">#{item.source,jdbcType=VARCHAR},</when>
+          <otherwise>'',</otherwise>
+        </choose>
+        <choose>
+          <when test="item.tmsPeriod != null">#{item.tmsPeriod,jdbcType=INTEGER},</when>
+          <otherwise>0,</otherwise>
+        </choose>
+        <choose>
+          <when test="item.period != null">#{item.period,jdbcType=INTEGER},</when>
+          <otherwise>0,</otherwise>
+        </choose>
+        <choose>
+          <when test="item.status != null">#{item.status,jdbcType=VARCHAR},</when>
+          <otherwise>'',</otherwise>
+        </choose>
+        <choose>
+          <when test="item.ledgerId != null">#{item.ledgerId,jdbcType=VARCHAR},</when>
+          <otherwise>'',</otherwise>
+        </choose>
+        <choose>
+          <when test="item.ledgerName != null">#{item.ledgerName,jdbcType=VARCHAR},</when>
+          <otherwise>'',</otherwise>
+        </choose>
+        <choose>
+          <when test="item.ledgerCurrencyCode != null">#{item.ledgerCurrencyCode,jdbcType=VARCHAR},</when>
+          <otherwise>'',</otherwise>
+        </choose>
+        <choose>
+          <when test="item.entityCode != null">#{item.entityCode,jdbcType=VARCHAR},</when>
+          <otherwise>'',</otherwise>
+        </choose>
+        <choose>
+          <when test="item.entityName != null">#{item.entityName,jdbcType=VARCHAR},</when>
+          <otherwise>'',</otherwise>
+        </choose>
+        <choose>
+          <when test="item.category != null">#{item.category,jdbcType=VARCHAR},</when>
+          <otherwise>'',</otherwise>
+        </choose>
+        <choose>
+          <when test="item.frequency != null">#{item.frequency,jdbcType=VARCHAR},</when>
+          <otherwise>'',</otherwise>
+        </choose>
+        <choose>
+          <when test="item.itemName != null">#{item.itemName,jdbcType=VARCHAR},</when>
+          <otherwise>'',</otherwise>
+        </choose>
+        <choose>
+          <when test="item.itemName2 != null">#{item.itemName2,jdbcType=VARCHAR},</when>
+          <otherwise>'',</otherwise>
+        </choose>
+        <choose>
+          <when test="item.periodAmt != null">#{item.periodAmt,jdbcType=DECIMAL},</when>
+          <otherwise>0,</otherwise>
+        </choose>
+        <choose>
+          <when test="item.ytdAmt != null">#{item.ytdAmt,jdbcType=DECIMAL},</when>
+          <otherwise>0,</otherwise>
+        </choose>
+        <choose>
+          <when test="item.createTime != null">#{item.createTime,jdbcType=TIMESTAMP},</when>
+          <otherwise>CURRENT_TIMESTAMP,</otherwise>
+        </choose>
+        <choose>
+          <when test="item.updateTime != null">#{item.updateTime,jdbcType=TIMESTAMP},</when>
+          <otherwise>CURRENT_TIMESTAMP,</otherwise>
+        </choose>
+      </trim>
+    </foreach>;
+    SELECT 1 FROM DUAL;
+  </insert>
 </mapper>
\ No newline at end of file

atms-web/src/main/webapp/Scripts/module-part2.js

@@ -1181,7 +1181,7 @@ var dataImpModule = angular.module('app.dataImp', ['ui.grid', 'ui.router','ui.gr
             });
 
             $stateProvider.state({
-                name: 'directMethodCashFlowImportDistribution',
+                name: 'cashFlowImportDistribution',
                 url: "/importDistribution/cashFlow",
                 dsr: true,
                 views: {
@@ -1191,7 +1191,7 @@ var dataImpModule = angular.module('app.dataImp', ['ui.grid', 'ui.router','ui.gr
                                 $scope.state = $state;
                                 appTranslation.load([appTranslation.appPart]);
                             }],
-                        template: '<data-import-direct-method-cash-flow></data-import-direct-method-cash-flow>'
+                        template: '<data-import-cash-flow></data-import-cash-flow>'
                     }
                 },
                 resolve: scriptDependencyProvider.createDependenciesMap(scriptDependencyProvider.dataImp),
@@ -1234,4 +1234,40 @@ var dataImpModule = angular.module('app.dataImp', ['ui.grid', 'ui.router','ui.gr
                 sticky: true
             });
 
+            $stateProvider.state({
+                name: 'invoiceDataImportDistribution',
+                url: "/importDistribution/invoiceData",
+                dsr: true,
+                views: {
+                    'importContent': {
+                        controller: ['$scope', '$state','appTranslation',
+                            function ($scope, $state, appTranslation) {
+                                $scope.state = $state;
+                                appTranslation.load([appTranslation.appPart]);
+                            }],
+                        template: '<data-import-invoice-data></data-import-invoice-data>'
+                    }
+                },
+                resolve: scriptDependencyProvider.createDependenciesMap(scriptDependencyProvider.dataImp),
+                sticky: true
+            });
+
+            $stateProvider.state({
+                name: 'citJournalAdjustImportDistribution',
+                url: "/importDistribution/citJournalAdjust",
+                dsr: true,
+                views: {
+                    'importContent': {
+                        controller: ['$scope', '$state','appTranslation',
+                            function ($scope, $state, appTranslation) {
+                                $scope.state = $state;
+                                appTranslation.load([appTranslation.appPart]);
+                            }],
+                        template: '<data-import-cit-journal-adjust></data-import-cit-journal-adjust>'
+                    }
+                },
+                resolve: scriptDependencyProvider.createDependenciesMap(scriptDependencyProvider.dataImp),
+                sticky: true
+            });
+
         }]);
\ No newline at end of file

atms-web/src/main/webapp/app/common/controls/import/import-direct-method-cash-flow/import-direct-method-cash-flow.less → atms-web/src/main/webapp/app/common/controls/import/import-cit-journal-adjust/import-cit-journal-adjust.less

 @import "~/app-resources/less/theme.less";
 
-.import-direct-method-cash-flow {
+.import-cit-journal-adjust {
     /*background-color: @color-white;*/
     padding-left: 20px;
     /*min-height: 800px;*/