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
7d21ff8d
Commit
7d21ff8d
authored
Mar 24, 2026
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.21' into MVP1.7.21
parents
2f194677
263b0d4b
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
55 additions
and
9 deletions
+55
-9
TPreEmpMainServiceImpl.java
...v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
+9
-0
TSalaryStandardController.java
.../v1/yifu/salary/controller/TSalaryStandardController.java
+2
-0
TSalaryAccountMapper.java
...loud/plus/v1/yifu/salary/mapper/TSalaryAccountMapper.java
+2
-0
TSalaryZeroMapper.java
...u/cloud/plus/v1/yifu/salary/mapper/TSalaryZeroMapper.java
+2
-1
TSalaryAccountService.java
...ud/plus/v1/yifu/salary/service/TSalaryAccountService.java
+3
-0
TSalaryStandardService.java
...d/plus/v1/yifu/salary/service/TSalaryStandardService.java
+3
-0
TSalaryZeroService.java
...cloud/plus/v1/yifu/salary/service/TSalaryZeroService.java
+4
-3
TSalaryAccountServiceImpl.java
...1/yifu/salary/service/impl/TSalaryAccountServiceImpl.java
+5
-0
TSalaryStandardServiceImpl.java
.../yifu/salary/service/impl/TSalaryStandardServiceImpl.java
+15
-0
TSalaryZeroServiceImpl.java
...s/v1/yifu/salary/service/impl/TSalaryZeroServiceImpl.java
+3
-3
TSalaryAccountMapper.xml
...ry-biz/src/main/resources/mapper/TSalaryAccountMapper.xml
+4
-0
TSalaryZeroMapper.xml
...alary-biz/src/main/resources/mapper/TSalaryZeroMapper.xml
+3
-2
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
View file @
7d21ff8d
...
...
@@ -2020,6 +2020,9 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
Integer
oldDeptSocialStatus
=
project
.
getSocialStatus
();
Integer
oldDeptFundStatus
=
project
.
getFundStatus
();
Integer
oldDeptInsuranceStatus
=
project
.
getInsuranceStatus
();
Integer
oldDeptSocialProvince
=
project
.
getSocialProvince
();
Integer
oldDeptSocialCity
=
project
.
getSocialCity
();
Integer
oldDeptSocialTown
=
project
.
getSocialTown
();
if
(
Common
.
isEmpty
(
tPreEmployeeProject
.
getWorkingHours
()))
{
tPreEmployeeProject
.
setWorkingHours
(
""
);
...
...
@@ -2054,6 +2057,12 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
if
(
Common
.
isNotNull
(
oldDeptInsuranceStatus
)
&&
oldDeptInsuranceStatus
!=
0
)
{
project
.
setInsuranceStatus
(
oldDeptInsuranceStatus
);
}
// 2026-03-24 段说要不更新社保省市县
if
(
Common
.
isNotNull
(
oldDeptSocialProvince
))
{
project
.
setSocialProvince
(
oldDeptSocialProvince
);
project
.
setSocialCity
(
oldDeptSocialCity
);
project
.
setSocialTown
(
oldDeptSocialTown
);
}
tEmployeeProjectService
.
updateById
(
project
);
}
else
{
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/controller/TSalaryStandardController.java
View file @
7d21ff8d
...
...
@@ -262,6 +262,8 @@ public class TSalaryStandardController {
tSalaryStandard
=
tSalaryStandardService
.
getById
(
tSalaryStandard
.
getId
());
// 生成收入
tSalaryStandardService
.
doIncome
(
tSalaryStandard
);
// 更新0申报为不可用
tSalaryStandardService
.
updateZero
(
tSalaryStandard
,
CommonConstants
.
TWO_INT
);
return
R
.
ok
(
"提交成功!"
);
}
else
{
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/mapper/TSalaryAccountMapper.java
View file @
7d21ff8d
...
...
@@ -183,6 +183,8 @@ public interface TSalaryAccountMapper extends BaseMapper<TSalaryAccount> {
List
<
TSalaryAccount
>
getAccountListBySalaryId
(
@Param
(
"searchVo"
)
TSalaryAccountSearchVo
searchVo
);
List
<
String
>
getCardListBySalaryId
(
@Param
(
"salaryId"
)
String
salaryId
);
List
<
String
>
getAccountListByKey
(
@Param
(
"invoiceTitle"
)
String
invoiceTitle
,
@Param
(
"settleMonth"
)
String
settleMonth
,
@Param
(
"cardList"
)
List
<
String
>
cardList
);
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/mapper/TSalaryZeroMapper.java
View file @
7d21ff8d
...
...
@@ -46,7 +46,8 @@ public interface TSalaryZeroMapper extends BaseMapper<TSalaryZero> {
IPage
<
TSalaryZero
>
getTSalaryZeroPage
(
Page
<
TSalaryZero
>
page
,
@Param
(
"tableName"
)
String
tableName
,
@Param
(
"tSalaryZero"
)
TSalaryZeroSearchVo
searchVo
);
// 批量更新状态(deleteFlag0,1,2:0:正常;1:已删除;2存在报账假删除)
int
updateDeleteFlagByIdList
(
@Param
(
"tableName"
)
String
tableName
,
@Param
(
"deleteFlag"
)
Integer
deleteFlag
,
@Param
(
"idList"
)
List
<
String
>
idList
);
int
updateDeleteFlagByIdList
(
@Param
(
"tableName"
)
String
tableName
,
@Param
(
"deleteFlag"
)
Integer
deleteFlag
,
@Param
(
"cardList"
)
List
<
String
>
cardList
,
@Param
(
"invoiceTitle"
)
String
invoiceTitle
,
@Param
(
"settleMonth"
)
String
settleMonth
);
// 导出获取数据总数
long
getTSalaryZeroCount
(
@Param
(
"tableName"
)
String
tableName
,
@Param
(
"tSalaryZero"
)
TSalaryZeroSearchVo
searchVo
);
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/TSalaryAccountService.java
View file @
7d21ff8d
...
...
@@ -98,6 +98,9 @@ public interface TSalaryAccountService extends IService<TSalaryAccount> {
**/
List
<
TSalaryAccount
>
getAccountListBySalaryId
(
TSalaryAccountSearchVo
searchVo
);
// 根据薪资ID获取报账身份证,0申报使用
List
<
String
>
getCardListBySalaryId
(
String
salaryId
);
// 根据抬头、结算月、身份证list获取是否存在
Map
<
String
,
Integer
>
getAccountMapByKey
(
String
invoiceTitle
,
String
settleMonth
,
List
<
String
>
keyList
);
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/TSalaryStandardService.java
View file @
7d21ff8d
...
...
@@ -79,6 +79,9 @@ public interface TSalaryStandardService extends IService<TSalaryStandard> {
**/
R
<
String
>
deleteSalaryById
(
String
id
);
// 更新0申报状态
void
updateZero
(
TSalaryStandard
tSalaryStandard
,
int
deleteFlag
);
/**
* @param id
* @Description: 推送至ekp
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/TSalaryZeroService.java
View file @
7d21ff8d
...
...
@@ -17,13 +17,14 @@
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
salary
.
service
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryZero
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryZero
;
import
com.yifu.cloud.plus.v1.yifu.salary.vo.TSalaryZeroSearchVo
;
import
javax.servlet.http.HttpServletResponse
;
import
java.io.InputStream
;
import
java.util.List
;
...
...
@@ -52,7 +53,7 @@ public interface TSalaryZeroService extends IService<TSalaryZero> {
boolean
deleteTSalaryZeroByIdList
(
List
<
String
>
idList
);
// 批量更新状态(deleteFlag0,1,2:0:正常;1:已删除;2存在报账假删除)
int
updateDeleteFlagByIdList
(
String
year
,
Integer
deleteFlag
,
List
<
String
>
idList
);
int
updateDeleteFlagByIdList
(
String
invoiceTitle
,
String
settleMonth
,
String
year
,
Integer
deleteFlag
,
String
salaryId
);
R
<
List
<
ErrorMessage
>>
importSalaryZero
(
InputStream
inputStream
,
String
settleMonth
,
String
invoiceTitle
);
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryAccountServiceImpl.java
View file @
7d21ff8d
...
...
@@ -753,6 +753,11 @@ public class TSalaryAccountServiceImpl extends ServiceImpl<TSalaryAccountMapper,
return
baseMapper
.
getAccountListBySalaryId
(
searchVo
);
}
@Override
public
List
<
String
>
getCardListBySalaryId
(
String
salaryId
)
{
return
baseMapper
.
getCardListBySalaryId
(
salaryId
);
}
@Override
public
Map
<
String
,
Integer
>
getAccountMapByKey
(
String
invoiceTitle
,
String
settleMonth
,
List
<
String
>
cardList
)
{
Map
<
String
,
Integer
>
map
=
new
HashMap
<>();
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryStandardServiceImpl.java
View file @
7d21ff8d
...
...
@@ -101,6 +101,7 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
private
final
TInsuranceUnpurchasePersonService
tInsuranceUnpurchasePersonService
;
private
final
TInsuranceUnpurchasePersonSalaryService
tInsuranceUnpurchasePersonSalaryService
;
private
final
TSalaryZeroService
tSalaryZeroService
;
/**
...
...
@@ -411,11 +412,25 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
sf
.
setDeleteDate
(
new
Date
());
sf
.
setDeleteFlag
(
SalaryConstants
.
DELETED
);
this
.
updateById
(
sf
);
// 更新0申报为可用
this
.
updateZero
(
sf
,
CommonConstants
.
ZERO_INT
);
return
R
.
ok
(
"级联删除工资表成功"
);
}
return
R
.
failed
(
"id 不可为空"
);
}
// 更新0申报状态
@Override
public
void
updateZero
(
TSalaryStandard
tSalaryStandard
,
int
deleteFlag
)
{
if
(
Common
.
isNotNull
(
tSalaryStandard
.
getSettlementMonth
())
&&
tSalaryStandard
.
getSettlementMonth
().
length
()
>
4
)
{
String
year
=
tSalaryStandard
.
getSettlementMonth
().
substring
(
0
,
4
);
tSalaryZeroService
.
updateDeleteFlagByIdList
(
tSalaryStandard
.
getInvoiceTitle
()
,
tSalaryStandard
.
getSettlementMonth
(),
year
,
deleteFlag
,
tSalaryStandard
.
getId
());
}
}
/**
* @Description: 推送
* @Author: hgw
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryZeroServiceImpl.java
View file @
7d21ff8d
...
...
@@ -89,12 +89,13 @@ public class TSalaryZeroServiceImpl extends ServiceImpl<TSalaryZeroMapper, TSala
// 批量更新状态(deleteFlag0,1,2:0:正常;1:已删除;2存在报账假删除)
@Override
public
int
updateDeleteFlagByIdList
(
String
year
,
Integer
deleteFlag
,
List
<
String
>
idList
)
{
public
int
updateDeleteFlagByIdList
(
String
invoiceTitle
,
String
settleMonth
,
String
year
,
Integer
deleteFlag
,
String
salaryId
)
{
List
<
String
>
cardList
=
salaryAccountService
.
getCardListBySalaryId
(
salaryId
);
String
tableName
=
getSalaryTableName
(
year
);
if
(
Common
.
isEmpty
(
tableName
))
{
return
CommonConstants
.
ZERO_INT
;
}
return
baseMapper
.
updateDeleteFlagByIdList
(
tableName
,
deleteFlag
,
idList
);
return
baseMapper
.
updateDeleteFlagByIdList
(
tableName
,
deleteFlag
,
cardList
,
invoiceTitle
,
settleMonth
);
}
/**
...
...
@@ -171,7 +172,6 @@ public class TSalaryZeroServiceImpl extends ServiceImpl<TSalaryZeroMapper, TSala
*/
@Override
public
IPage
<
TSalaryZero
>
getTSalaryZeroPage
(
Page
<
TSalaryZero
>
page
,
TSalaryZeroSearchVo
searchVo
)
{
// baseMapper.createSalaryZeroYear(tableName);
if
(
Common
.
isNotNull
(
searchVo
.
getYear
()))
{
String
tableName
=
getSalaryTableName
(
searchVo
.
getYear
());
if
(
Common
.
isEmpty
(
tableName
))
{
...
...
yifu-salary/yifu-salary-biz/src/main/resources/mapper/TSalaryAccountMapper.xml
View file @
7d21ff8d
...
...
@@ -1158,6 +1158,10 @@
GROUP BY a.id ORDER BY a.ROW_INDEX ASC
</select>
<select
id=
"getCardListBySalaryId"
resultType=
"java.lang.String"
>
SELECT distinct a.EMP_IDCARD FROM t_salary_account a where a.SALARY_FORM_ID = #{salaryId}
</select>
<select
id=
"getAccountListByKey"
resultType=
"java.lang.String"
>
SELECT
a.EMP_IDCARD
...
...
yifu-salary/yifu-salary-biz/src/main/resources/mapper/TSalaryZeroMapper.xml
View file @
7d21ff8d
...
...
@@ -383,8 +383,9 @@
<!-- 批量更新状态(deleteFlag0,1,2:0:正常;1:已删除;2存在报账假删除) -->
<update
id=
"updateDeleteFlagByIdList"
>
update ${tableName} set delete_flag = #{deleteFlag} where id in
<foreach
item=
"item"
collection=
"idList"
separator=
","
open=
"("
close=
")"
index=
""
>
update ${tableName} set delete_flag = #{deleteFlag}
where INVOICE_TITLE = #{invoiceTitle} and SETTLE_MONTH = #{settleMonth} and EMP_IDCARD in
<foreach
item=
"item"
collection=
"cardList"
separator=
","
open=
"("
close=
")"
index=
""
>
#{item}
</foreach>
</update>
...
...
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