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
3a81dd3b
Commit
3a81dd3b
authored
Aug 31, 2022
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
劳务费稿酬生成修改
parent
6097c0b7
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
31 additions
and
3 deletions
+31
-3
TStatisticsLaborServiceImpl.java
...yifu/salary/service/impl/TStatisticsLaborServiceImpl.java
+16
-2
TStatisticsRemunerationServiceImpl.java
...lary/service/impl/TStatisticsRemunerationServiceImpl.java
+15
-1
No files found.
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TStatisticsLaborServiceImpl.java
View file @
3a81dd3b
...
@@ -32,12 +32,15 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
...
@@ -32,12 +32,15 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.*
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.*
;
import
com.yifu.cloud.plus.v1.yifu.salary.entity.TStatisticsDeclarer
;
import
com.yifu.cloud.plus.v1.yifu.salary.entity.TStatisticsLabor
;
import
com.yifu.cloud.plus.v1.yifu.salary.entity.TStatisticsLabor
;
import
com.yifu.cloud.plus.v1.yifu.salary.mapper.TStatisticsDeclarerMapper
;
import
com.yifu.cloud.plus.v1.yifu.salary.mapper.TStatisticsLaborMapper
;
import
com.yifu.cloud.plus.v1.yifu.salary.mapper.TStatisticsLaborMapper
;
import
com.yifu.cloud.plus.v1.yifu.salary.service.TStatisticsLaborService
;
import
com.yifu.cloud.plus.v1.yifu.salary.service.TStatisticsLaborService
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.TStatisticsLaborSearchVo
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.TStatisticsLaborSearchVo
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.TStatisticsLaborVo
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.TStatisticsLaborVo
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TPreDispatchInfo
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TPreDispatchInfo
;
import
lombok.RequiredArgsConstructor
;
import
lombok.extern.log4j.Log4j2
;
import
lombok.extern.log4j.Log4j2
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
...
@@ -58,7 +61,11 @@ import java.util.stream.Collectors;
...
@@ -58,7 +61,11 @@ import java.util.stream.Collectors;
*/
*/
@Log4j2
@Log4j2
@Service
@Service
@RequiredArgsConstructor
public
class
TStatisticsLaborServiceImpl
extends
ServiceImpl
<
TStatisticsLaborMapper
,
TStatisticsLabor
>
implements
TStatisticsLaborService
{
public
class
TStatisticsLaborServiceImpl
extends
ServiceImpl
<
TStatisticsLaborMapper
,
TStatisticsLabor
>
implements
TStatisticsLaborService
{
private
final
TStatisticsDeclarerMapper
declarerMapper
;
/**
/**
* 本期劳务费申报表简单分页查询
* 本期劳务费申报表简单分页查询
*
*
...
@@ -275,8 +282,15 @@ public class TStatisticsLaborServiceImpl extends ServiceImpl<TStatisticsLaborMap
...
@@ -275,8 +282,15 @@ public class TStatisticsLaborServiceImpl extends ServiceImpl<TStatisticsLaborMap
}
}
String
lastMonth
=
DateUtil
.
addMonthByYearMonth
(-
1
,
declareMonth
);
//上月
String
lastMonth
=
DateUtil
.
addMonthByYearMonth
(-
1
,
declareMonth
);
//上月
List
<
TStatisticsLabor
>
stdvoList
=
baseMapper
.
doStatisticsLabor
(
declareMonth
,
lastMonth
);
List
<
TStatisticsLabor
>
stdvoList
=
baseMapper
.
doStatisticsLabor
(
declareMonth
,
lastMonth
);
for
(
TStatisticsLabor
declarer
:
stdvoList
)
{
for
(
TStatisticsLabor
labor
:
stdvoList
)
{
this
.
save
(
declarer
);
TStatisticsDeclarer
declarer
=
declarerMapper
.
selectOne
(
Wrappers
.<
TStatisticsDeclarer
>
query
().
lambda
()
.
eq
(
TStatisticsDeclarer:
:
getDeclareMonth
,
declareMonth
)
.
eq
(
TStatisticsDeclarer:
:
getEmpIdcard
,
labor
.
getEmpIdcard
())
.
eq
(
TStatisticsDeclarer:
:
getDeclareUnit
,
labor
.
getDeclareUnit
())
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
if
(
Common
.
isNotNull
(
declarer
)
&&
CommonConstants
.
ZERO_STRING
.
equals
(
declarer
.
getIsDeclare
()))
{
this
.
save
(
labor
);
}
}
}
return
R
.
ok
();
return
R
.
ok
();
}
}
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TStatisticsRemunerationServiceImpl.java
View file @
3a81dd3b
...
@@ -30,11 +30,14 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
...
@@ -30,11 +30,14 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.DateUtil
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.DateUtil
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.ExcelUtil
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.ExcelUtil
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.salary.entity.TStatisticsDeclarer
;
import
com.yifu.cloud.plus.v1.yifu.salary.entity.TStatisticsLabor
;
import
com.yifu.cloud.plus.v1.yifu.salary.entity.TStatisticsLabor
;
import
com.yifu.cloud.plus.v1.yifu.salary.entity.TStatisticsRemuneration
;
import
com.yifu.cloud.plus.v1.yifu.salary.entity.TStatisticsRemuneration
;
import
com.yifu.cloud.plus.v1.yifu.salary.mapper.TStatisticsDeclarerMapper
;
import
com.yifu.cloud.plus.v1.yifu.salary.mapper.TStatisticsRemunerationMapper
;
import
com.yifu.cloud.plus.v1.yifu.salary.mapper.TStatisticsRemunerationMapper
;
import
com.yifu.cloud.plus.v1.yifu.salary.service.TStatisticsRemunerationService
;
import
com.yifu.cloud.plus.v1.yifu.salary.service.TStatisticsRemunerationService
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.TStatisticsRemunerationSearchVo
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.TStatisticsRemunerationSearchVo
;
import
lombok.RequiredArgsConstructor
;
import
lombok.extern.log4j.Log4j2
;
import
lombok.extern.log4j.Log4j2
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
...
@@ -54,7 +57,11 @@ import java.util.stream.Collectors;
...
@@ -54,7 +57,11 @@ import java.util.stream.Collectors;
*/
*/
@Log4j2
@Log4j2
@Service
@Service
@RequiredArgsConstructor
public
class
TStatisticsRemunerationServiceImpl
extends
ServiceImpl
<
TStatisticsRemunerationMapper
,
TStatisticsRemuneration
>
implements
TStatisticsRemunerationService
{
public
class
TStatisticsRemunerationServiceImpl
extends
ServiceImpl
<
TStatisticsRemunerationMapper
,
TStatisticsRemuneration
>
implements
TStatisticsRemunerationService
{
private
final
TStatisticsDeclarerMapper
declarerMapper
;
/**
/**
* 本期稿酬申报表简单分页查询
* 本期稿酬申报表简单分页查询
*
*
...
@@ -178,8 +185,15 @@ public class TStatisticsRemunerationServiceImpl extends ServiceImpl<TStatisticsR
...
@@ -178,8 +185,15 @@ public class TStatisticsRemunerationServiceImpl extends ServiceImpl<TStatisticsR
String
lastMonth
=
DateUtil
.
addMonthByYearMonth
(-
1
,
declareMonth
);
//上月
String
lastMonth
=
DateUtil
.
addMonthByYearMonth
(-
1
,
declareMonth
);
//上月
List
<
TStatisticsRemuneration
>
stdvoList
=
baseMapper
.
doStatisticsRemuneration
(
declareMonth
,
lastMonth
);
List
<
TStatisticsRemuneration
>
stdvoList
=
baseMapper
.
doStatisticsRemuneration
(
declareMonth
,
lastMonth
);
for
(
TStatisticsRemuneration
remuneration
:
stdvoList
)
{
for
(
TStatisticsRemuneration
remuneration
:
stdvoList
)
{
TStatisticsDeclarer
declarer
=
declarerMapper
.
selectOne
(
Wrappers
.<
TStatisticsDeclarer
>
query
().
lambda
()
.
eq
(
TStatisticsDeclarer:
:
getDeclareMonth
,
declareMonth
)
.
eq
(
TStatisticsDeclarer:
:
getEmpIdcard
,
remuneration
.
getEmpIdcard
())
.
eq
(
TStatisticsDeclarer:
:
getDeclareUnit
,
remuneration
.
getDeclareUnit
())
.
last
(
CommonConstants
.
LAST_ONE_SQL
));
if
(
Common
.
isNotNull
(
declarer
)
&&
CommonConstants
.
ZERO_STRING
.
equals
(
declarer
.
getIsDeclare
()))
{
this
.
save
(
remuneration
);
this
.
save
(
remuneration
);
}
}
}
return
R
.
ok
();
return
R
.
ok
();
}
}
...
...
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