Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
T
traffic-front
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wangxiaoming
traffic-front
Commits
80831640
Commit
80831640
authored
Jul 24, 2018
by
neo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[bugfix] change CurrentPeriodBo to Period
parent
b31caae1
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
59 additions
and
59 deletions
+59
-59
CitTBDataImportMapper.java
...main/java/pwc/taxtech/atms/dao/CitTBDataImportMapper.java
+1
-1
DataImportMapper.java
.../src/main/java/pwc/taxtech/atms/dao/DataImportMapper.java
+1
-1
JournalEntryImportMapper.java
...va/pwc/taxtech/atms/vat/dao/JournalEntryImportMapper.java
+5
-5
PeriodCellReferenceExample.java
...c/taxtech/atms/vat/entity/PeriodCellReferenceExample.java
+12
-12
PeriodCellReferenceKey.java
...a/pwc/taxtech/atms/vat/entity/PeriodCellReferenceKey.java
+5
-5
PeriodCellTemplateConfigKey.java
.../taxtech/atms/vat/entity/PeriodCellTemplateConfigKey.java
+5
-5
PeriodCellTemplateKey.java
...va/pwc/taxtech/atms/vat/entity/PeriodCellTemplateKey.java
+5
-5
PeriodFormulaBlockKey.java
...va/pwc/taxtech/atms/vat/entity/PeriodFormulaBlockKey.java
+5
-5
PeriodTaxPayerReportRuleKey.java
.../taxtech/atms/vat/entity/PeriodTaxPayerReportRuleKey.java
+5
-5
PeriodTaxRuleSettingKey.java
.../pwc/taxtech/atms/vat/entity/PeriodTaxRuleSettingKey.java
+5
-5
PeriodTaxRuleSettingOrganizationKey.java
.../atms/vat/entity/PeriodTaxRuleSettingOrganizationKey.java
+5
-5
PeriodTemplateKey.java
...n/java/pwc/taxtech/atms/vat/entity/PeriodTemplateKey.java
+5
-5
VoucherServiceImpl.java
...pwc/taxtech/atms/vat/service/impl/VoucherServiceImpl.java
+0
-0
No files found.
atms-api/src/main/java/pwc/taxtech/atms/dao/CitTBDataImportMapper.java
View file @
80831640
...
...
@@ -18,6 +18,6 @@ public interface CitTBDataImportMapper extends MyMapper {
"</script>"
)
Integer
deleteByPeriod
(
@Param
(
"period"
)
Integer
period
,
@Param
(
"tbName"
)
String
tbName
);
@Delete
(
"<script>DELETE FROM #{tbName} <if test=\"period != null\"> WHERE
CurrentPeriodBo
=#{period} </if></script>"
)
@Delete
(
"<script>DELETE FROM #{tbName} <if test=\"period != null\"> WHERE
Period
=#{period} </if></script>"
)
Integer
deleteByNameAndPeriod
(
@Param
(
"tbName"
)
String
tbName
,
@Param
(
"period"
)
Integer
period
);
}
atms-api/src/main/java/pwc/taxtech/atms/dao/DataImportMapper.java
View file @
80831640
...
...
@@ -9,7 +9,7 @@ import pwc.taxtech.atms.MyMapper;
@Mapper
public
interface
DataImportMapper
extends
MyMapper
{
@Delete
(
"DELETE FROM #{tbName} WHERE
CurrentPeriodBo
=#{period}"
)
@Delete
(
"DELETE FROM #{tbName} WHERE
Period
=#{period}"
)
Integer
deleteByNameAndPeriod
(
@Param
(
"tbName"
)
String
tbName
,
@Param
(
"period"
)
Integer
period
);
...
...
atms-api/src/main/java/pwc/taxtech/atms/vat/dao/JournalEntryImportMapper.java
View file @
80831640
...
...
@@ -42,8 +42,8 @@ public interface JournalEntryImportMapper extends MyVatMapper {
" Voucher "
+
"WHERE "
+
" 1 = 1 "
+
" AND `ImportType` = #{importType} AND `
CurrentPeriodBo
` = #{period} "
+
" ORDER BY `
CurrentPeriodBo
`,`Group`,`VID`,`ItemID`"
+
" AND `ImportType` = #{importType} AND `
Period
` = #{period} "
+
" ORDER BY `
Period
`,`Group`,`VID`,`ItemID`"
+
" LIMIT #{start},#{size}"
+
"</script>"
)
List
<
Voucher
>
pageQuery
(
@Param
(
"importType"
)
int
code
,
@Param
(
"period"
)
int
periodId
,
@Param
(
"start"
)
int
start
,
...
...
@@ -56,7 +56,7 @@ public interface JournalEntryImportMapper extends MyVatMapper {
" Voucher "
+
"WHERE "
+
" 1 = 1"
+
" AND `ImportType` = #{importType} AND `
CurrentPeriodBo
` = #{period}"
+
" AND `ImportType` = #{importType} AND `
Period
` = #{period}"
+
"</script>"
)
Integer
pageQueryCount
(
@Param
(
"importType"
)
int
code
,
@Param
(
"period"
)
int
periodId
);
...
...
@@ -67,8 +67,8 @@ public interface JournalEntryImportMapper extends MyVatMapper {
" Voucher "
+
"WHERE "
+
" 1 = 1"
+
" AND `ImportType` = #{importType} AND `
CurrentPeriodBo
` = #{period}"
+
" GROUP BY `VID` ,`Group`,`
CurrentPeriodBo
`"
+
" AND `ImportType` = #{importType} AND `
Period
` = #{period}"
+
" GROUP BY `VID` ,`Group`,`
Period
`"
+
"</script>"
)
Integer
pageVIDCount
(
@Param
(
"importType"
)
int
code
,
@Param
(
"period"
)
int
periodId
);
}
atms-api/src/main/java/pwc/taxtech/atms/vat/entity/PeriodCellReferenceExample.java
View file @
80831640
...
...
@@ -265,62 +265,62 @@ public class PeriodCellReferenceExample {
}
public
Criteria
andPeriodIsNull
()
{
addCriterion
(
"
CurrentPeriodBo
is null"
);
addCriterion
(
"
Period
is null"
);
return
(
Criteria
)
this
;
}
public
Criteria
andPeriodIsNotNull
()
{
addCriterion
(
"
CurrentPeriodBo
is not null"
);
addCriterion
(
"
Period
is not null"
);
return
(
Criteria
)
this
;
}
public
Criteria
andPeriodEqualTo
(
Integer
value
)
{
addCriterion
(
"
CurrentPeriodBo
="
,
value
,
"period"
);
addCriterion
(
"
Period
="
,
value
,
"period"
);
return
(
Criteria
)
this
;
}
public
Criteria
andPeriodNotEqualTo
(
Integer
value
)
{
addCriterion
(
"
CurrentPeriodBo
<>"
,
value
,
"period"
);
addCriterion
(
"
Period
<>"
,
value
,
"period"
);
return
(
Criteria
)
this
;
}
public
Criteria
andPeriodGreaterThan
(
Integer
value
)
{
addCriterion
(
"
CurrentPeriodBo
>"
,
value
,
"period"
);
addCriterion
(
"
Period
>"
,
value
,
"period"
);
return
(
Criteria
)
this
;
}
public
Criteria
andPeriodGreaterThanOrEqualTo
(
Integer
value
)
{
addCriterion
(
"
CurrentPeriodBo
>="
,
value
,
"period"
);
addCriterion
(
"
Period
>="
,
value
,
"period"
);
return
(
Criteria
)
this
;
}
public
Criteria
andPeriodLessThan
(
Integer
value
)
{
addCriterion
(
"
CurrentPeriodBo
<"
,
value
,
"period"
);
addCriterion
(
"
Period
<"
,
value
,
"period"
);
return
(
Criteria
)
this
;
}
public
Criteria
andPeriodLessThanOrEqualTo
(
Integer
value
)
{
addCriterion
(
"
CurrentPeriodBo
<="
,
value
,
"period"
);
addCriterion
(
"
Period
<="
,
value
,
"period"
);
return
(
Criteria
)
this
;
}
public
Criteria
andPeriodIn
(
List
<
Integer
>
values
)
{
addCriterion
(
"
CurrentPeriodBo
in"
,
values
,
"period"
);
addCriterion
(
"
Period
in"
,
values
,
"period"
);
return
(
Criteria
)
this
;
}
public
Criteria
andPeriodNotIn
(
List
<
Integer
>
values
)
{
addCriterion
(
"
CurrentPeriodBo
not in"
,
values
,
"period"
);
addCriterion
(
"
Period
not in"
,
values
,
"period"
);
return
(
Criteria
)
this
;
}
public
Criteria
andPeriodBetween
(
Integer
value1
,
Integer
value2
)
{
addCriterion
(
"
CurrentPeriodBo
between"
,
value1
,
value2
,
"period"
);
addCriterion
(
"
Period
between"
,
value1
,
value2
,
"period"
);
return
(
Criteria
)
this
;
}
public
Criteria
andPeriodNotBetween
(
Integer
value1
,
Integer
value2
)
{
addCriterion
(
"
CurrentPeriodBo
not between"
,
value1
,
value2
,
"period"
);
addCriterion
(
"
Period
not between"
,
value1
,
value2
,
"period"
);
return
(
Criteria
)
this
;
}
...
...
atms-api/src/main/java/pwc/taxtech/atms/vat/entity/PeriodCellReferenceKey.java
View file @
80831640
...
...
@@ -22,7 +22,7 @@ public class PeriodCellReferenceKey implements Serializable {
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column PeriodCellReference.
CurrentPeriodBo
* This field corresponds to the database column PeriodCellReference.
Period
*
* @mbg.generated
*/
...
...
@@ -62,9 +62,9 @@ public class PeriodCellReferenceKey implements Serializable {
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column PeriodCellReference.
CurrentPeriodBo
* This method returns the value of the database column PeriodCellReference.
Period
*
* @return the value of PeriodCellReference.
CurrentPeriodBo
* @return the value of PeriodCellReference.
Period
*
* @mbg.generated
*/
...
...
@@ -74,9 +74,9 @@ public class PeriodCellReferenceKey implements Serializable {
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column PeriodCellReference.
CurrentPeriodBo
* This method sets the value of the database column PeriodCellReference.
Period
*
* @param period the value for PeriodCellReference.
CurrentPeriodBo
* @param period the value for PeriodCellReference.
Period
*
* @mbg.generated
*/
...
...
atms-api/src/main/java/pwc/taxtech/atms/vat/entity/PeriodCellTemplateConfigKey.java
View file @
80831640
...
...
@@ -22,7 +22,7 @@ public class PeriodCellTemplateConfigKey implements Serializable {
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column PeriodCellTemplateConfig.
CurrentPeriodBo
* This field corresponds to the database column PeriodCellTemplateConfig.
Period
*
* @mbg.generated
*/
...
...
@@ -62,9 +62,9 @@ public class PeriodCellTemplateConfigKey implements Serializable {
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column PeriodCellTemplateConfig.
CurrentPeriodBo
* This method returns the value of the database column PeriodCellTemplateConfig.
Period
*
* @return the value of PeriodCellTemplateConfig.
CurrentPeriodBo
* @return the value of PeriodCellTemplateConfig.
Period
*
* @mbg.generated
*/
...
...
@@ -74,9 +74,9 @@ public class PeriodCellTemplateConfigKey implements Serializable {
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column PeriodCellTemplateConfig.
CurrentPeriodBo
* This method sets the value of the database column PeriodCellTemplateConfig.
Period
*
* @param period the value for PeriodCellTemplateConfig.
CurrentPeriodBo
* @param period the value for PeriodCellTemplateConfig.
Period
*
* @mbg.generated
*/
...
...
atms-api/src/main/java/pwc/taxtech/atms/vat/entity/PeriodCellTemplateKey.java
View file @
80831640
...
...
@@ -22,7 +22,7 @@ public class PeriodCellTemplateKey implements Serializable {
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column PeriodCellTemplate.
CurrentPeriodBo
* This field corresponds to the database column PeriodCellTemplate.
Period
*
* @mbg.generated
*/
...
...
@@ -62,9 +62,9 @@ public class PeriodCellTemplateKey implements Serializable {
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column PeriodCellTemplate.
CurrentPeriodBo
* This method returns the value of the database column PeriodCellTemplate.
Period
*
* @return the value of PeriodCellTemplate.
CurrentPeriodBo
* @return the value of PeriodCellTemplate.
Period
*
* @mbg.generated
*/
...
...
@@ -74,9 +74,9 @@ public class PeriodCellTemplateKey implements Serializable {
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column PeriodCellTemplate.
CurrentPeriodBo
* This method sets the value of the database column PeriodCellTemplate.
Period
*
* @param period the value for PeriodCellTemplate.
CurrentPeriodBo
* @param period the value for PeriodCellTemplate.
Period
*
* @mbg.generated
*/
...
...
atms-api/src/main/java/pwc/taxtech/atms/vat/entity/PeriodFormulaBlockKey.java
View file @
80831640
...
...
@@ -22,7 +22,7 @@ public class PeriodFormulaBlockKey implements Serializable {
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column PeriodFormulaBlock.
CurrentPeriodBo
* This field corresponds to the database column PeriodFormulaBlock.
Period
*
* @mbg.generated
*/
...
...
@@ -62,9 +62,9 @@ public class PeriodFormulaBlockKey implements Serializable {
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column PeriodFormulaBlock.
CurrentPeriodBo
* This method returns the value of the database column PeriodFormulaBlock.
Period
*
* @return the value of PeriodFormulaBlock.
CurrentPeriodBo
* @return the value of PeriodFormulaBlock.
Period
*
* @mbg.generated
*/
...
...
@@ -74,9 +74,9 @@ public class PeriodFormulaBlockKey implements Serializable {
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column PeriodFormulaBlock.
CurrentPeriodBo
* This method sets the value of the database column PeriodFormulaBlock.
Period
*
* @param period the value for PeriodFormulaBlock.
CurrentPeriodBo
* @param period the value for PeriodFormulaBlock.
Period
*
* @mbg.generated
*/
...
...
atms-api/src/main/java/pwc/taxtech/atms/vat/entity/PeriodTaxPayerReportRuleKey.java
View file @
80831640
...
...
@@ -22,7 +22,7 @@ public class PeriodTaxPayerReportRuleKey implements Serializable {
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column PeriodTaxPayerReportRule.
CurrentPeriodBo
* This field corresponds to the database column PeriodTaxPayerReportRule.
Period
*
* @mbg.generated
*/
...
...
@@ -62,9 +62,9 @@ public class PeriodTaxPayerReportRuleKey implements Serializable {
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column PeriodTaxPayerReportRule.
CurrentPeriodBo
* This method returns the value of the database column PeriodTaxPayerReportRule.
Period
*
* @return the value of PeriodTaxPayerReportRule.
CurrentPeriodBo
* @return the value of PeriodTaxPayerReportRule.
Period
*
* @mbg.generated
*/
...
...
@@ -74,9 +74,9 @@ public class PeriodTaxPayerReportRuleKey implements Serializable {
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column PeriodTaxPayerReportRule.
CurrentPeriodBo
* This method sets the value of the database column PeriodTaxPayerReportRule.
Period
*
* @param period the value for PeriodTaxPayerReportRule.
CurrentPeriodBo
* @param period the value for PeriodTaxPayerReportRule.
Period
*
* @mbg.generated
*/
...
...
atms-api/src/main/java/pwc/taxtech/atms/vat/entity/PeriodTaxRuleSettingKey.java
View file @
80831640
...
...
@@ -22,7 +22,7 @@ public class PeriodTaxRuleSettingKey implements Serializable {
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column PeriodTaxRuleSetting.
CurrentPeriodBo
* This field corresponds to the database column PeriodTaxRuleSetting.
Period
*
* @mbg.generated
*/
...
...
@@ -62,9 +62,9 @@ public class PeriodTaxRuleSettingKey implements Serializable {
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column PeriodTaxRuleSetting.
CurrentPeriodBo
* This method returns the value of the database column PeriodTaxRuleSetting.
Period
*
* @return the value of PeriodTaxRuleSetting.
CurrentPeriodBo
* @return the value of PeriodTaxRuleSetting.
Period
*
* @mbg.generated
*/
...
...
@@ -74,9 +74,9 @@ public class PeriodTaxRuleSettingKey implements Serializable {
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column PeriodTaxRuleSetting.
CurrentPeriodBo
* This method sets the value of the database column PeriodTaxRuleSetting.
Period
*
* @param period the value for PeriodTaxRuleSetting.
CurrentPeriodBo
* @param period the value for PeriodTaxRuleSetting.
Period
*
* @mbg.generated
*/
...
...
atms-api/src/main/java/pwc/taxtech/atms/vat/entity/PeriodTaxRuleSettingOrganizationKey.java
View file @
80831640
...
...
@@ -22,7 +22,7 @@ public class PeriodTaxRuleSettingOrganizationKey implements Serializable {
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column PeriodTaxRuleSettingOrganization.
CurrentPeriodBo
* This field corresponds to the database column PeriodTaxRuleSettingOrganization.
Period
*
* @mbg.generated
*/
...
...
@@ -62,9 +62,9 @@ public class PeriodTaxRuleSettingOrganizationKey implements Serializable {
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column PeriodTaxRuleSettingOrganization.
CurrentPeriodBo
* This method returns the value of the database column PeriodTaxRuleSettingOrganization.
Period
*
* @return the value of PeriodTaxRuleSettingOrganization.
CurrentPeriodBo
* @return the value of PeriodTaxRuleSettingOrganization.
Period
*
* @mbg.generated
*/
...
...
@@ -74,9 +74,9 @@ public class PeriodTaxRuleSettingOrganizationKey implements Serializable {
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column PeriodTaxRuleSettingOrganization.
CurrentPeriodBo
* This method sets the value of the database column PeriodTaxRuleSettingOrganization.
Period
*
* @param period the value for PeriodTaxRuleSettingOrganization.
CurrentPeriodBo
* @param period the value for PeriodTaxRuleSettingOrganization.
Period
*
* @mbg.generated
*/
...
...
atms-api/src/main/java/pwc/taxtech/atms/vat/entity/PeriodTemplateKey.java
View file @
80831640
...
...
@@ -22,7 +22,7 @@ public class PeriodTemplateKey implements Serializable {
/**
*
* This field was generated by MyBatis Generator.
* This field corresponds to the database column PeriodTemplate.
CurrentPeriodBo
* This field corresponds to the database column PeriodTemplate.
Period
*
* @mbg.generated
*/
...
...
@@ -62,9 +62,9 @@ public class PeriodTemplateKey implements Serializable {
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column PeriodTemplate.
CurrentPeriodBo
* This method returns the value of the database column PeriodTemplate.
Period
*
* @return the value of PeriodTemplate.
CurrentPeriodBo
* @return the value of PeriodTemplate.
Period
*
* @mbg.generated
*/
...
...
@@ -74,9 +74,9 @@ public class PeriodTemplateKey implements Serializable {
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column PeriodTemplate.
CurrentPeriodBo
* This method sets the value of the database column PeriodTemplate.
Period
*
* @param period the value for PeriodTemplate.
CurrentPeriodBo
* @param period the value for PeriodTemplate.
Period
*
* @mbg.generated
*/
...
...
atms-api/src/main/java/pwc/taxtech/atms/vat/service/impl/VoucherServiceImpl.java
View file @
80831640
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment