Skip to content

T
traffic-front
Commit 4434e342 authored by gary's avatar gary
Browse files
Options

1、添加现金流量表手工和最新

parent 91d8c821
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 522 additions and 10 deletions
atms-api/src/main/java/pwc/taxtech/atms/service/impl/DataImportService.java
View file @ 4434e342
......@@ -72,7 +72,9 @@ public class DataImportService extends BaseService {
@Resource
private AdjustmentTableMapper adjustmentTableMapper;
@Resource
private CashFlowMapper cashFlowMapper;
private CashFlowManualMapper cashFlowManualMapper;
@Resource
private CashFlowFinalMapper cashFlowFinalMapper;
@Resource
private CoupaPurchasingReportMapper coupaPurchasingReportMapper;
@Resource
......@@ -630,12 +632,12 @@ public class DataImportService extends BaseService {
// 根据orgId period删除记录
CashFlowExample cashFlowExample = new CashFlowExample();
cashFlowExample.createCriteria().andOrganizationIdEqualTo(orgId).andPeriodEqualTo(period);
cashFlowMapper.deleteByExample(cashFlowExample);
if (cashFlowMapper.countByExample(cashFlowExample) > 0) {
cashFlowMapper.deleteByExample(cashFlowExample);
cashFlowManualMapper.deleteByExample(cashFlowExample);
if (cashFlowFinalMapper.countByExample(cashFlowExample) > 0) {
cashFlowFinalMapper.deleteByExample(cashFlowExample);
}
}
cashFlowMapper.insertBatch(cfs);
cashFlowManualMapper.insertBatch(cfs);
dataImportLog.setRecordSize(cfs.size());
dataImportLog.setImportResult(true);
dataImportLogs.add(dataImportLog);
......@@ -838,9 +840,6 @@ public class DataImportService extends BaseService {
InvoiceDataExample invoiceDataExample = new InvoiceDataExample();
invoiceDataExample.createCriteria().andOrganizationIdEqualTo(orgId).andPeriodEqualTo(period);
invoiceDataMapper.deleteByExample(invoiceDataExample);
if (invoiceDataMapper.countByExample(invoiceDataExample) > 0) {
invoiceDataMapper.deleteByExample(invoiceDataExample);
}
}
invoiceDataMapper.insertBatch(iDatas);
dataImportLog.setRecordSize(iDatas.size());
......@@ -1698,8 +1697,7 @@ public class DataImportService extends BaseService {
OrganizationExample example = new OrganizationExample();
example.createCriteria().andIdIn(dataExtractParam.getOrgIds());
List<String> codes = organizationMapper.selectByExample(example).stream().map(Organization::getCode).collect(Collectors.toList());
// HttpUtil.post();
Integer tmsPeriod = DateUtils.strToPeriod(dataExtractParam.getPeriod());
// data_import_log 日志记录为 EnumImportType.ExtractFinancialData
return OperationResultDto.success();
......
atms-api/src/main/resources/orgImport/company_info.json 0 → 100644
View file @ 4434e342
This diff is collapsed.
atms-dao/src/main/java/pwc/taxtech/atms/vat/dao/CashFlowFinalMapper.java 0 → 100644
View file @ 4434e342
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.dpo.CashFlowCondition;
import pwc.taxtech.atms.vat.entity.CashFlow;
import pwc.taxtech.atms.vat.entity.CashFlowExample;
@Mapper
public interface CashFlowFinalMapper extends MyVatMapper {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table cash_flow_final
*
* @mbg.generated
*/
long countByExample(CashFlowExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table cash_flow_final
*
* @mbg.generated
*/
int deleteByExample(CashFlowExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table cash_flow_final
*
* @mbg.generated
*/
int deleteByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table cash_flow_final
*
* @mbg.generated
*/
int insert(CashFlow record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table cash_flow_final
*
* @mbg.generated
*/
int insertSelective(CashFlow record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table cash_flow_final
*
* @mbg.generated
*/
List<CashFlow> selectByExampleWithRowbounds(CashFlowExample example, RowBounds rowBounds);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table cash_flow_final
*
* @mbg.generated
*/
List<CashFlow> selectByExample(CashFlowExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table cash_flow_final
*
* @mbg.generated
*/
CashFlow selectByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table cash_flow_final
*
* @mbg.generated
*/
int updateByExampleSelective(@Param("record") CashFlow record, @Param("example") CashFlowExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table cash_flow_final
*
* @mbg.generated
*/
int updateByExample(@Param("record") CashFlow record, @Param("example") CashFlowExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table cash_flow_final
*
* @mbg.generated
*/
int updateByPrimaryKeySelective(CashFlow record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table cash_flow_final
*
* @mbg.generated
*/
int updateByPrimaryKey(CashFlow record);
List<CashFlow> selectByCondition(@Param("cfCondition") CashFlowCondition condition);
Integer selectCountByCondition(@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/CashFlowManualMapper.java 0 → 100644
View file @ 4434e342
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.dpo.CashFlowCondition;
import pwc.taxtech.atms.vat.entity.CashFlow;
import pwc.taxtech.atms.vat.entity.CashFlowExample;
@Mapper
public interface CashFlowManualMapper extends MyVatMapper {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table cash_flow_manual
*
* @mbg.generated
*/
long countByExample(CashFlowExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table cash_flow_manual
*
* @mbg.generated
*/
int deleteByExample(CashFlowExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table cash_flow_manual
*
* @mbg.generated
*/
int deleteByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table cash_flow_manual
*
* @mbg.generated
*/
int insert(CashFlow record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table cash_flow_manual
*
* @mbg.generated
*/
int insertSelective(CashFlow record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table cash_flow_manual
*
* @mbg.generated
*/
List<CashFlow> selectByExampleWithRowbounds(CashFlowExample example, RowBounds rowBounds);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table cash_flow_manual
*
* @mbg.generated
*/
List<CashFlow> selectByExample(CashFlowExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table cash_flow_manual
*
* @mbg.generated
*/
CashFlow selectByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table cash_flow_manual
*
* @mbg.generated
*/
int updateByExampleSelective(@Param("record") CashFlow record, @Param("example") CashFlowExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table cash_flow_manual
*
* @mbg.generated
*/
int updateByExample(@Param("record") CashFlow record, @Param("example") CashFlowExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table cash_flow_manual
*
* @mbg.generated
*/
int updateByPrimaryKeySelective(CashFlow record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table cash_flow_manual
*
* @mbg.generated
*/
int updateByPrimaryKey(CashFlow record);
List<CashFlow> selectByCondition(@Param("cfCondition") CashFlowCondition condition);
Integer selectCountByCondition(@Param("cfCondition") CashFlowCondition condition);
int insertBatch(List<CashFlow> cfs);
}
\ No newline at end of file
atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/extends/CashFlowFinalExtendsMapper.xml 0 → 100644
View file @ 4434e342
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="pwc.taxtech.atms.vat.dao.CashFlowMapper">
<sql id="QueryCondition">
1 = 1
<if test="@com.github.pagehelper.util.StringUtil@isNotEmpty(cfCondition.orgId)">
AND entity_code= #{cfCondition.orgId,jdbcType=VARCHAR}
</if>
<if test="cfCondition.periodStart!=null">
AND tms_period &gt;= #{cfCondition.periodStart,jdbcType=INTEGER}
</if>
<if test="cfCondition.periodEnd!=null">
AND tms_period &lt;= #{cfCondition.periodEnd,jdbcType=INTEGER}
</if>
</sql>
<!--<sql id="Base_Column_List">-->
<!--&lt;!&ndash;-->
<!--WARNING - @mbg.generated-->
<!--This element is automatically generated by MyBatis Generator, do not modify.-->
<!--&ndash;&gt;-->
<!--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-->
<!--</sql>-->
<select id="selectByCondition" parameterType="pwc.taxtech.atms.vat.dpo.CashFlowCondition" resultMap="BaseResultMap">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select
<include refid="Base_Column_List" />
from cash_flow_final
where
<include refid="QueryCondition"/>
</select>
<select id="selectCountByCondition" parameterType="pwc.taxtech.atms.vat.dpo.CashFlowCondition" resultType="Integer">
select
count(*)
from cash_flow_final
where
<include refid="QueryCondition"/>
</select>
<insert id="insertBatch" parameterType="java.util.List">
insert into cash_flow_final
(<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.projectId != null">#{item.projectId,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-dao/src/main/resources/pwc/taxtech/atms/vat/dao/extends/CashFlowManualExtendsMapper.xml 0 → 100644
View file @ 4434e342
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="pwc.taxtech.atms.vat.dao.CashFlowMapper">
<sql id="QueryCondition">
1 = 1
<if test="@com.github.pagehelper.util.StringUtil@isNotEmpty(cfCondition.orgId)">
AND entity_code= #{cfCondition.orgId,jdbcType=VARCHAR}
</if>
<if test="cfCondition.periodStart!=null">
AND tms_period &gt;= #{cfCondition.periodStart,jdbcType=INTEGER}
</if>
<if test="cfCondition.periodEnd!=null">
AND tms_period &lt;= #{cfCondition.periodEnd,jdbcType=INTEGER}
</if>
</sql>
<!--<sql id="Base_Column_List">-->
<!--&lt;!&ndash;-->
<!--WARNING - @mbg.generated-->
<!--This element is automatically generated by MyBatis Generator, do not modify.-->
<!--&ndash;&gt;-->
<!--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-->
<!--</sql>-->
<select id="selectByCondition" parameterType="pwc.taxtech.atms.vat.dpo.CashFlowCondition" resultMap="BaseResultMap">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select
<include refid="Base_Column_List" />
from cash_flow_manual
where
<include refid="QueryCondition"/>
</select>
<select id="selectCountByCondition" parameterType="pwc.taxtech.atms.vat.dpo.CashFlowCondition" resultType="Integer">
select
count(*)
from cash_flow_manual
where
<include refid="QueryCondition"/>
</select>
<insert id="insertBatch" parameterType="java.util.List">
insert into cash_flow_manual
(<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.projectId != null">#{item.projectId,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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment