Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
Y
yifu-mvp
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
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fangxinjiang
yifu-mvp
Commits
a4303810
You need to sign in or sign up before continuing.
Commit
a4303810
authored
Sep 01, 2022
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化lastMonth
parent
438bdd8f
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
7 additions
and
6 deletions
+7
-6
TStatisticsCurrentReportMapper.java
...v1/yifu/salary/mapper/TStatisticsCurrentReportMapper.java
+2
-1
TStatisticsCurrentReportService.java
.../yifu/salary/service/TStatisticsCurrentReportService.java
+1
-1
TStatisticsCurrentReportServiceImpl.java
...ary/service/impl/TStatisticsCurrentReportServiceImpl.java
+2
-2
TStatisticsTaxSalaryTwoServiceImpl.java
...lary/service/impl/TStatisticsTaxSalaryTwoServiceImpl.java
+1
-1
TStatisticsCurrentReportMapper.xml
.../main/resources/mapper/TStatisticsCurrentReportMapper.xml
+1
-1
No files found.
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/mapper/TStatisticsCurrentReportMapper.java
View file @
a4303810
...
...
@@ -39,7 +39,8 @@ public interface TStatisticsCurrentReportMapper extends BaseMapper<TStatisticsCu
IPage
<
TStatisticsCurrentReport
>
getTStatisticsCurrentReportPage
(
Page
<
TStatisticsCurrentReport
>
page
,
@Param
(
"tStatisticsCurrentReport"
)
TStatisticsCurrentReport
tStatisticsCurrentReport
);
int
insertStatisticsCurrentReport
(
@Param
(
"declareMonth"
)
String
declareMonth
,
@Param
(
"lastTwoMonth"
)
String
lastTwoMonth
,
@Param
(
"lastTwoYear"
)
String
lastTwoYear
);
,
@Param
(
"lastMonth"
)
String
lastMonth
,
@Param
(
"lastTwoMonth"
)
String
lastTwoMonth
,
@Param
(
"lastTwoYear"
)
String
lastTwoYear
);
/**
* @param yearMonth
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/TStatisticsCurrentReportService.java
View file @
a4303810
...
...
@@ -64,5 +64,5 @@ public interface TStatisticsCurrentReportService extends IService<TStatisticsCur
* @Date: 2022/2/23 15:10
* @return: com.yifu.cloud.v1.common.core.util.R<java.lang.String>
**/
R
<
String
>
doRefreshStatisticsCurrentReport
(
String
declareMonth
,
String
lastTwoMonth
);
R
<
String
>
doRefreshStatisticsCurrentReport
(
String
declareMonth
,
String
last
Month
,
String
last
TwoMonth
);
}
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TStatisticsCurrentReportServiceImpl.java
View file @
a4303810
...
...
@@ -159,7 +159,7 @@ public class TStatisticsCurrentReportServiceImpl extends ServiceImpl<TStatistics
}
@Override
public
R
<
String
>
doRefreshStatisticsCurrentReport
(
String
declareMonth
,
String
lastTwoMonth
)
{
public
R
<
String
>
doRefreshStatisticsCurrentReport
(
String
declareMonth
,
String
last
Month
,
String
last
TwoMonth
)
{
int
firstDelete
=
baseMapper
.
deleteByYearMonth
(
declareMonth
);
if
(
firstDelete
!=
-
2
)
{
String
mons
=
declareMonth
.
substring
(
4
,
6
);
...
...
@@ -167,7 +167,7 @@ public class TStatisticsCurrentReportServiceImpl extends ServiceImpl<TStatistics
if
(
"02"
.
equals
(
mons
))
{
lastTwoYear
=
"-"
;
}
baseMapper
.
insertStatisticsCurrentReport
(
declareMonth
,
lastTwoMonth
,
lastTwoYear
);
baseMapper
.
insertStatisticsCurrentReport
(
declareMonth
,
last
Month
,
last
TwoMonth
,
lastTwoYear
);
return
R
.
ok
(
"已生成完毕!"
);
}
else
{
return
R
.
failed
(
"删除本期申报失败!"
);
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TStatisticsTaxSalaryTwoServiceImpl.java
View file @
a4303810
...
...
@@ -66,7 +66,7 @@ public class TStatisticsTaxSalaryTwoServiceImpl extends ServiceImpl<TStatisticsT
R
<
String
>
taxR
=
this
.
doStatisticsTaxSalary
(
tableName
,
declareMonth
,
lastMonth
);
if
(
taxR
.
getCode
()
==
CommonConstants
.
SUCCESS
)
{
// 刷新对应结算月的 本期申报
tStatisticsCurrentReportService
.
doRefreshStatisticsCurrentReport
(
declareMonth
,
lastTwoMonth
);
tStatisticsCurrentReportService
.
doRefreshStatisticsCurrentReport
(
declareMonth
,
last
Month
,
last
TwoMonth
);
}
else
{
log
.
error
(
taxR
.
getMsg
());
}
...
...
yifu-salary/yifu-salary-biz/src/main/resources/mapper/TStatisticsCurrentReportMapper.xml
View file @
a4303810
...
...
@@ -239,7 +239,7 @@
s.UNIT_NAME,
s.SPECIAL_DEDU_MONEY,
s.sum_baby_money,
s.
IS_NEW_EMPLOYEE,
if (#{lastMonth} = s.CREATE_MONTH,1,0)
IS_NEW_EMPLOYEE,
s.CREATE_MONTH,
s.EMP_PHONE
from t_statistics_tax_salary s
...
...
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