Skip to content

T
traffic-front
Commit e890c39b authored by neo's avatar neo
Browse files
Options

[dev] add project id form period standard acouunt

parent bc398078
Hide whitespace changes
Inline Side-by-side
Showing with 26 additions and 575 deletions
atms-api/src/main/java/pwc/taxtech/atms/common/util/SpringContextUtil.java
View file @ e890c39b
......@@ -26,7 +26,7 @@ public class SpringContextUtil implements ApplicationContextAware {
public static PeriodCellTemplateMapper periodCellTemplateMapper;
public static ProjectServiceTypeMapper projectServiceTypeMapper;
public static PeriodTemplateMapper periodTemplateMapper;
public static VatStandardAccountMapper vatStandardAccountMapper;
public static PeriodStandardAccountMapper periodStandardAccountMapper;
public static ProjectDao projectDao;
public static BalanceMapper balanceMapper;
public static DataSourceMapper dataSourceMapper;
......@@ -66,7 +66,7 @@ public class SpringContextUtil implements ApplicationContextAware {
periodCellTemplateMapper = webApplicationContext.getBean(PeriodCellTemplateMapper.class);
projectServiceTypeMapper = webApplicationContext.getBean(ProjectServiceTypeMapper.class);
periodTemplateMapper = webApplicationContext.getBean(PeriodTemplateMapper.class);
vatStandardAccountMapper = webApplicationContext.getBean(VatStandardAccountMapper.class);
periodStandardAccountMapper = webApplicationContext.getBean(PeriodStandardAccountMapper.class);
projectDao = webApplicationContext.getBean(ProjectDao.class);
balanceMapper = webApplicationContext.getBean(BalanceMapper.class);
dataSourceMapper = webApplicationContext.getBean(DataSourceMapper.class);
......
atms-api/src/main/java/pwc/taxtech/atms/service/impl/ProjectServiceImpl.java
View file @ e890c39b
......@@ -2,7 +2,6 @@ package pwc.taxtech.atms.service.impl;
import com.google.common.base.Predicate;
import com.google.common.collect.Lists;
import org.mybatis.spring.SqlSessionTemplate;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -15,7 +14,6 @@ import pwc.taxtech.atms.dao.ProjectClientMapper;
import pwc.taxtech.atms.dao.ProjectMapper;
import pwc.taxtech.atms.dao.ProjectServiceTypeMapper;
import pwc.taxtech.atms.dao.ServiceTypeMapper;
import pwc.taxtech.atms.dao.StandardAccountMapper;
import pwc.taxtech.atms.dao.TemplateGroupMapper;
import pwc.taxtech.atms.dpo.ProjectDisplayDto;
import pwc.taxtech.atms.dto.FieldsMapper;
......@@ -26,9 +24,7 @@ import pwc.taxtech.atms.dto.taxadmin.AddProjectResult;
import pwc.taxtech.atms.dto.taxadmin.ProjectYearParam;
import pwc.taxtech.atms.entity.*;
import pwc.taxtech.atms.entity.ProjectClientExample.Criteria;
import pwc.taxtech.atms.service.OperationLogService;
import pwc.taxtech.atms.service.ProjectService;
import pwc.taxtech.atms.vat.dao.VatStandardAccountMapper;
import java.util.ArrayList;
import java.util.Calendar;
......@@ -64,17 +60,6 @@ public class ProjectServiceImpl implements ProjectService {
@Autowired
private ProjectServiceTypeMapper projectServiceTypeMapper;
@Autowired
private OperationLogService operationLogService;
@Autowired
private SqlSessionTemplate dynamicSqlSessionTemplate;
@Autowired
private StandardAccountMapper standardAccountMapper;
@Autowired
private VatStandardAccountMapper vatStandardAccountMapper;
@Value("${jdbc_admin_db}")
private String adminDbName;
......
atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/VatAbstractService.java
View file @ e890c39b
......@@ -20,7 +20,7 @@ public class VatAbstractService {
@Autowired
public VatEnterpriseAccountMapper vatEnterpriseAccountMapper;
@Autowired
public VatStandardAccountMapper vatStandardAccountMapper;
public PeriodStandardAccountMapper periodStandardAccountMapper;
@Autowired
public InputVatInvoiceMapper inputVATInvoiceMapper;
@Autowired
......
atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/report/functions/FSJZ.java
View file @ e890c39b
......@@ -67,7 +67,8 @@ public class FSJZ extends FunctionBase implements FreeRefFunction {
if (accountType == 0) {
//标准账套
VatStandardAccount vatStandardAccount = SpringContextUtil.vatStandardAccountMapper.selectOneByAccountCode(accountCode);
VatStandardAccount vatStandardAccount = SpringContextUtil.periodStandardAccountMapper.selectOneByAccountCode(accountCode,
formulaContext.getProjectId());
if (vatStandardAccount == null) {
return NumberEval.ZERO;
}
......@@ -132,7 +133,7 @@ public class FSJZ extends FunctionBase implements FreeRefFunction {
}
//todo: sava data
//save datasource
Long dataSourceId = saveDataSource(ec, formulaDataSourceDtoList, FormulaDataSourceDetailType.BSPLFormulaDataSourceDto, val,period,formulaContext.getReportTemplateGroupId());
Long dataSourceId = saveDataSource(ec, formulaDataSourceDtoList, FormulaDataSourceDetailType.BSPLFormulaDataSourceDto, val, period, formulaContext.getReportTemplateGroupId());
//save formulablock
saveFormulaBlock(period, ec, formulaExpression, val, dataSourceId);
......@@ -196,7 +197,7 @@ public class FSJZ extends FunctionBase implements FreeRefFunction {
//todo: sava data
//save datasource
Long dataSourceId = saveDataSource(ec, dsList, FormulaDataSourceDetailType.BSPLFormulaDataSourceDto, val,
period,formulaContext.getReportTemplateGroupId());
period, formulaContext.getReportTemplateGroupId());
//save formulablock
saveFormulaBlock(period, ec, formulaExpression, val, dataSourceId);
return new NumberEval(val.doubleValue());
......
atms-dao/src/main/java/pwc/taxtech/atms/vat/dao/PeriodStandardAccountMapper.java
View file @ e890c39b
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.TrialBalanceDto;
import pwc.taxtech.atms.vat.entity.PeriodStandardAccount;
import pwc.taxtech.atms.vat.entity.PeriodStandardAccountExample;
import pwc.taxtech.atms.vat.entity.VatStandardAccount;
import java.util.List;
@Mapper
public interface PeriodStandardAccountMapper extends MyVatMapper {
......@@ -105,4 +108,9 @@ public interface PeriodStandardAccountMapper extends MyVatMapper {
* @mbg.generated
*/
int updateByPrimaryKey(PeriodStandardAccount record);
List<TrialBalanceDto> selectProjectStandardAccountLeftJoinBalanceStdManual(@Param("fromMonth") String fromMonth, @Param("toMonth") String toMonth,
@Param("projectId") String projectId);
VatStandardAccount selectOneByAccountCode(@Param("accountCode") String accountCode, @Param("projectId") String projectId);
}
\ No newline at end of file
atms-dao/src/main/java/pwc/taxtech/atms/vat/dao/VatStandardAccountMapper.java deleted 100644 → 0
View file @ bc398078
package pwc.taxtech.atms.vat.dao;
import java.util.List;
import java.util.Map;
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.TrialBalanceDto;
import pwc.taxtech.atms.vat.entity.VatStandardAccount;
import pwc.taxtech.atms.vat.entity.VatStandardAccountExample;
@Mapper
public interface VatStandardAccountMapper extends MyVatMapper {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table TAX_PROJECT. StandardAccount
*
* @mbg.generated
*/
long countByExample(VatStandardAccountExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table TAX_PROJECT. StandardAccount
*
* @mbg.generated
*/
int deleteByExample(VatStandardAccountExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table TAX_PROJECT. StandardAccount
*
* @mbg.generated
*/
int deleteByPrimaryKey(String id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table TAX_PROJECT. StandardAccount
*
* @mbg.generated
*/
int insert(VatStandardAccount record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table TAX_PROJECT. StandardAccount
*
* @mbg.generated
*/
int insertSelective(VatStandardAccount record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table TAX_PROJECT. StandardAccount
*
* @mbg.generated
*/
List<VatStandardAccount> selectByExampleWithRowbounds(VatStandardAccountExample example, RowBounds rowBounds);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table TAX_PROJECT. StandardAccount
*
* @mbg.generated
*/
List<VatStandardAccount> selectByExample(VatStandardAccountExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table TAX_PROJECT. StandardAccount
*
* @mbg.generated
*/
VatStandardAccount selectByPrimaryKey(String id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table TAX_PROJECT. StandardAccount
*
* @mbg.generated
*/
int updateByExampleSelective(@Param("record") VatStandardAccount record, @Param("example") VatStandardAccountExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table TAX_PROJECT. StandardAccount
*
* @mbg.generated
*/
int updateByExample(@Param("record") VatStandardAccount record, @Param("example") VatStandardAccountExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table TAX_PROJECT. StandardAccount
*
* @mbg.generated
*/
int updateByPrimaryKeySelective(VatStandardAccount record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table TAX_PROJECT. StandardAccount
*
* @mbg.generated
*/
int updateByPrimaryKey(VatStandardAccount record);
List<TrialBalanceDto> selectProjectStandardAccountLeftJoinBalanceStdManual(@Param("fromMonth") String fromMonth, @Param("toMonth") String toMonth);
VatStandardAccount selectOneByAccountCode(@Param("accountCode") String accountCode);
}
\ No newline at end of file
atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/VatStandardAccountMapper.xml deleted 100644 → 0
View file @ bc398078
<?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.VatStandardAccountMapper">
<resultMap id="BaseResultMap" type="pwc.taxtech.atms.vat.entity.VatStandardAccount">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
<id column="ID" jdbcType="VARCHAR" property="id" />
<result column="Code" jdbcType="VARCHAR" property="code" />
<result column="Name" jdbcType="VARCHAR" property="name" />
<result column="ParentCode" jdbcType="VARCHAR" property="parentCode" />
<result column="FullName" jdbcType="VARCHAR" property="fullName" />
<result column="AcctProp" jdbcType="INTEGER" property="acctProp" />
<result column="SubProp" jdbcType="INTEGER" property="subProp" />
<result column="AcctLevel" jdbcType="INTEGER" property="acctLevel" />
<result column="Direction" jdbcType="INTEGER" property="direction" />
<result column="IsLeaf" jdbcType="SMALLINT" property="isLeaf" />
<result column="RuleType" jdbcType="INTEGER" property="ruleType" />
<result column="IsActive" jdbcType="SMALLINT" property="isActive" />
<result column="EnglishName" jdbcType="VARCHAR" property="englishName" />
<result column="IndustryID" jdbcType="VARCHAR" property="industryID" />
</resultMap>
<sql id="Example_Where_Clause">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
<where>
<foreach collection="oredCriteria" item="criteria" separator="or">
<if test="criteria.valid">
<trim prefix="(" prefixOverrides="and" suffix=")">
<foreach collection="criteria.criteria" item="criterion">
<choose>
<when test="criterion.noValue">
and ${criterion.condition}
</when>
<when test="criterion.singleValue">
and ${criterion.condition} #{criterion.value}
</when>
<when test="criterion.betweenValue">
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
</when>
<when test="criterion.listValue">
and ${criterion.condition}
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
#{listItem}
</foreach>
</when>
</choose>
</foreach>
</trim>
</if>
</foreach>
</where>
</sql>
<sql id="Update_By_Example_Where_Clause">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
<where>
<foreach collection="example.oredCriteria" item="criteria" separator="or">
<if test="criteria.valid">
<trim prefix="(" prefixOverrides="and" suffix=")">
<foreach collection="criteria.criteria" item="criterion">
<choose>
<when test="criterion.noValue">
and ${criterion.condition}
</when>
<when test="criterion.singleValue">
and ${criterion.condition} #{criterion.value}
</when>
<when test="criterion.betweenValue">
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
</when>
<when test="criterion.listValue">
and ${criterion.condition}
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
#{listItem}
</foreach>
</when>
</choose>
</foreach>
</trim>
</if>
</foreach>
</where>
</sql>
<sql id="Base_Column_List">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
ID, Code, `Name`, ParentCode, FullName, AcctProp, SubProp, AcctLevel, Direction,
IsLeaf, RuleType, IsActive, EnglishName, IndustryID
</sql>
<select id="selectByExample" parameterType="pwc.taxtech.atms.vat.entity.VatStandardAccountExample" resultMap="BaseResultMap">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select
<if test="distinct">
distinct
</if>
<include refid="Base_Column_List" />
from StandardAccount
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
<if test="orderByClause != null">
order by ${orderByClause}
</if>
</select>
<select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select
<include refid="Base_Column_List" />
from StandardAccount
where ID = #{ID,jdbcType=VARCHAR}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.String">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
delete from StandardAccount
where ID = #{ID,jdbcType=VARCHAR}
</delete>
<delete id="deleteByExample" parameterType="pwc.taxtech.atms.vat.entity.VatStandardAccountExample">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
delete from StandardAccount
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</delete>
<insert id="insert" parameterType="pwc.taxtech.atms.vat.entity.VatStandardAccount">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
insert into StandardAccount (ID, Code, `Name`,
ParentCode, FullName, AcctProp,
SubProp, AcctLevel, Direction,
IsLeaf, RuleType, IsActive,
EnglishName, IndustryID)
values (#{ID,jdbcType=VARCHAR}, #{code,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR},
#{parentCode,jdbcType=VARCHAR}, #{fullName,jdbcType=VARCHAR}, #{acctProp,jdbcType=INTEGER},
#{subProp,jdbcType=INTEGER}, #{acctLevel,jdbcType=INTEGER}, #{direction,jdbcType=INTEGER},
#{isLeaf,jdbcType=SMALLINT}, #{ruleType,jdbcType=INTEGER}, #{isActive,jdbcType=SMALLINT},
#{englishName,jdbcType=VARCHAR}, #{industryID,jdbcType=VARCHAR})
</insert>
<insert id="insertSelective" parameterType="pwc.taxtech.atms.vat.entity.VatStandardAccount">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
insert into StandardAccount
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="ID != null">
ID,
</if>
<if test="code != null">
Code,
</if>
<if test="name != null">
`Name`,
</if>
<if test="parentCode != null">
ParentCode,
</if>
<if test="fullName != null">
FullName,
</if>
<if test="acctProp != null">
AcctProp,
</if>
<if test="subProp != null">
SubProp,
</if>
<if test="acctLevel != null">
AcctLevel,
</if>
<if test="direction != null">
Direction,
</if>
<if test="isLeaf != null">
IsLeaf,
</if>
<if test="ruleType != null">
RuleType,
</if>
<if test="isActive != null">
IsActive,
</if>
<if test="englishName != null">
EnglishName,
</if>
<if test="industryID != null">
IndustryID,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="ID != null">
#{ID,jdbcType=VARCHAR},
</if>
<if test="code != null">
#{code,jdbcType=VARCHAR},
</if>
<if test="name != null">
#{name,jdbcType=VARCHAR},
</if>
<if test="parentCode != null">
#{parentCode,jdbcType=VARCHAR},
</if>
<if test="fullName != null">
#{fullName,jdbcType=VARCHAR},
</if>
<if test="acctProp != null">
#{acctProp,jdbcType=INTEGER},
</if>
<if test="subProp != null">
#{subProp,jdbcType=INTEGER},
</if>
<if test="acctLevel != null">
#{acctLevel,jdbcType=INTEGER},
</if>
<if test="direction != null">
#{direction,jdbcType=INTEGER},
</if>
<if test="isLeaf != null">
#{isLeaf,jdbcType=SMALLINT},
</if>
<if test="ruleType != null">
#{ruleType,jdbcType=INTEGER},
</if>
<if test="isActive != null">
#{isActive,jdbcType=SMALLINT},
</if>
<if test="englishName != null">
#{englishName,jdbcType=VARCHAR},
</if>
<if test="industryID != null">
#{industryID,jdbcType=VARCHAR},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="pwc.taxtech.atms.vat.entity.VatStandardAccountExample" resultType="java.lang.Long">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select count(*) from StandardAccount
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</select>
<update id="updateByExampleSelective" parameterType="map">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update StandardAccount
<set>
<if test="record.ID != null">
ID = #{record.ID,jdbcType=VARCHAR},
</if>
<if test="record.code != null">
Code = #{record.code,jdbcType=VARCHAR},
</if>
<if test="record.name != null">
`Name` = #{record.name,jdbcType=VARCHAR},
</if>
<if test="record.parentCode != null">
ParentCode = #{record.parentCode,jdbcType=VARCHAR},
</if>
<if test="record.fullName != null">
FullName = #{record.fullName,jdbcType=VARCHAR},
</if>
<if test="record.acctProp != null">
AcctProp = #{record.acctProp,jdbcType=INTEGER},
</if>
<if test="record.subProp != null">
SubProp = #{record.subProp,jdbcType=INTEGER},
</if>
<if test="record.acctLevel != null">
AcctLevel = #{record.acctLevel,jdbcType=INTEGER},
</if>
<if test="record.direction != null">
Direction = #{record.direction,jdbcType=INTEGER},
</if>
<if test="record.isLeaf != null">
IsLeaf = #{record.isLeaf,jdbcType=SMALLINT},
</if>
<if test="record.ruleType != null">
RuleType = #{record.ruleType,jdbcType=INTEGER},
</if>
<if test="record.isActive != null">
IsActive = #{record.isActive,jdbcType=SMALLINT},
</if>
<if test="record.englishName != null">
EnglishName = #{record.englishName,jdbcType=VARCHAR},
</if>
<if test="record.industryID != null">
IndustryID = #{record.industryID,jdbcType=VARCHAR},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByExample" parameterType="map">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update StandardAccount
set ID = #{record.ID,jdbcType=VARCHAR},
Code = #{record.code,jdbcType=VARCHAR},
`Name` = #{record.name,jdbcType=VARCHAR},
ParentCode = #{record.parentCode,jdbcType=VARCHAR},
FullName = #{record.fullName,jdbcType=VARCHAR},
AcctProp = #{record.acctProp,jdbcType=INTEGER},
SubProp = #{record.subProp,jdbcType=INTEGER},
AcctLevel = #{record.acctLevel,jdbcType=INTEGER},
Direction = #{record.direction,jdbcType=INTEGER},
IsLeaf = #{record.isLeaf,jdbcType=SMALLINT},
RuleType = #{record.ruleType,jdbcType=INTEGER},
IsActive = #{record.isActive,jdbcType=SMALLINT},
EnglishName = #{record.englishName,jdbcType=VARCHAR},
IndustryID = #{record.industryID,jdbcType=VARCHAR}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByPrimaryKeySelective" parameterType="pwc.taxtech.atms.vat.entity.VatStandardAccount">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update StandardAccount
<set>
<if test="code != null">
Code = #{code,jdbcType=VARCHAR},
</if>
<if test="name != null">
`Name` = #{name,jdbcType=VARCHAR},
</if>
<if test="parentCode != null">
ParentCode = #{parentCode,jdbcType=VARCHAR},
</if>
<if test="fullName != null">
FullName = #{fullName,jdbcType=VARCHAR},
</if>
<if test="acctProp != null">
AcctProp = #{acctProp,jdbcType=INTEGER},
</if>
<if test="subProp != null">
SubProp = #{subProp,jdbcType=INTEGER},
</if>
<if test="acctLevel != null">
AcctLevel = #{acctLevel,jdbcType=INTEGER},
</if>
<if test="direction != null">
Direction = #{direction,jdbcType=INTEGER},
</if>
<if test="isLeaf != null">
IsLeaf = #{isLeaf,jdbcType=SMALLINT},
</if>
<if test="ruleType != null">
RuleType = #{ruleType,jdbcType=INTEGER},
</if>
<if test="isActive != null">
IsActive = #{isActive,jdbcType=SMALLINT},
</if>
<if test="englishName != null">
EnglishName = #{englishName,jdbcType=VARCHAR},
</if>
<if test="industryID != null">
IndustryID = #{industryID,jdbcType=VARCHAR},
</if>
</set>
where ID = #{ID,jdbcType=VARCHAR}
</update>
<update id="updateByPrimaryKey" parameterType="pwc.taxtech.atms.vat.entity.VatStandardAccount">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
update StandardAccount
set Code = #{code,jdbcType=VARCHAR},
`Name` = #{name,jdbcType=VARCHAR},
ParentCode = #{parentCode,jdbcType=VARCHAR},
FullName = #{fullName,jdbcType=VARCHAR},
AcctProp = #{acctProp,jdbcType=INTEGER},
SubProp = #{subProp,jdbcType=INTEGER},
AcctLevel = #{acctLevel,jdbcType=INTEGER},
Direction = #{direction,jdbcType=INTEGER},
IsLeaf = #{isLeaf,jdbcType=SMALLINT},
RuleType = #{ruleType,jdbcType=INTEGER},
IsActive = #{isActive,jdbcType=SMALLINT},
EnglishName = #{englishName,jdbcType=VARCHAR},
IndustryID = #{industryID,jdbcType=VARCHAR}
where ID = #{ID,jdbcType=VARCHAR}
</update>
<select id="selectByExampleWithRowbounds" parameterType="pwc.taxtech.atms.vat.entity.VatStandardAccountExample" resultMap="BaseResultMap">
<!--
WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify.
-->
select
<if test="distinct">
distinct
</if>
<include refid="Base_Column_List" />
from StandardAccount
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
<if test="orderByClause != null">
order by ${orderByClause}
</if>
</select>
</mapper>
\ No newline at end of file
atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/extends/VatStandardAccountExtendsMapper.xml → atms-dao/src/main/resources/pwc/taxtech/atms/vat/dao/extends/PeriodStandardAccountExtendsMapper.xml
View file @ e890c39b
<?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.VatStandardAccountMapper">
<mapper namespace="pwc.taxtech.atms.vat.dao.PeriodStandardAccountMapper">
<resultMap id="TrialBalanceDto" type="pwc.taxtech.atms.dto.vatdto.TrialBalanceDto">
<id column="BalanceId" jdbcType="VARCHAR" property="balanceId"/>
......@@ -52,13 +52,14 @@
A.ACCT_PROP,
A.DIRECTION
FROM
STANDARD_ACCOUNT A
PERIOD_STANDARD_ACCOUNT A
JOIN
BALANCE_STD_MANUAL B
PERIOD_BALANCE_STD_MANUAL B
ON
A.`CODE` = B.ACCT_CODE
WHERE
1=1
AND A.PROJECT_ID= #{projectId,jdbcType=VARCHAR}
<if test="fromMonth!=null">
AND B.PERIOD_ID &gt;= #{fromMonth,jdbcType=VARCHAR}
</if>
......@@ -73,9 +74,11 @@
SELECT
*
FROM
STANDARD_ACCOUNT A
PERIOD_STANDARD_ACCOUNT A
WHERE
A.CODE= #{accountCode,jdbcType=VARCHAR} LIMIT 1
A.CODE= #{accountCode,jdbcType=VARCHAR}
AND A.PROJECT_ID= #{projectId,jdbcType=VARCHAR}
LIMIT 1
</select>
</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