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
50d2ae0b
Commit
50d2ae0b
authored
Apr 13, 2026
by
hongguangwu
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop'
parents
dddcdfbc
6bc58350
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
11 additions
and
16 deletions
+11
-16
EmployeeRegistrationServiceImpl.java
.../v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
+0
-6
TEmployeeInsurancePreServiceImpl.java
...vice/insurance/impl/TEmployeeInsurancePreServiceImpl.java
+1
-1
TSalaryStandardController.java
.../v1/yifu/salary/controller/TSalaryStandardController.java
+1
-1
TSalaryZeroMapper.java
...u/cloud/plus/v1/yifu/salary/mapper/TSalaryZeroMapper.java
+1
-1
TSalaryStandardService.java
...d/plus/v1/yifu/salary/service/TSalaryStandardService.java
+1
-1
TSalaryZeroService.java
...cloud/plus/v1/yifu/salary/service/TSalaryZeroService.java
+1
-1
TSalaryStandardServiceImpl.java
.../yifu/salary/service/impl/TSalaryStandardServiceImpl.java
+3
-3
TSalaryZeroServiceImpl.java
...s/v1/yifu/salary/service/impl/TSalaryZeroServiceImpl.java
+2
-2
TSalaryZeroMapper.xml
...alary-biz/src/main/resources/mapper/TSalaryZeroMapper.xml
+1
-0
No files found.
yifu-csp/yifu-csp-biz/src/main/java/com/yifu/cloud/plus/v1/csp/service/impl/EmployeeRegistrationServiceImpl.java
View file @
50d2ae0b
...
...
@@ -1395,12 +1395,6 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
exitCheckVo
.
setEmpIdcard
(
registration
.
getEmpIdcard
());
exitCheckVo
.
setDeptName
(
registration
.
getDeptName
());
exitCheckVo
.
setDeptNo
(
registration
.
getDeptNo
());
if
(
CommonConstants
.
THREE_STRING
.
equals
(
registration
.
getProcessStatus
()))
{
exitCheckVo
.
setType
(
preVo
.
getServerItem
());
exitCheckVo
.
setErrorMsg
(
"已拒绝入职,不可操作!"
);
errorList
.
add
(
exitCheckVo
);
continue
;
}
if
(
preVo
.
getServerItem
().
contains
(
"商险"
)
&&
!
preVo
.
getEmployeeInsurancePreVos
().
isEmpty
())
{
//批量的商险是否已购买默认为否
if
(
Common
.
isEmpty
(
preVo
.
getInsuranceIsBuy
()))
{
...
...
yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TEmployeeInsurancePreServiceImpl.java
View file @
50d2ae0b
...
...
@@ -1045,7 +1045,7 @@ public class TEmployeeInsurancePreServiceImpl extends ServiceImpl<TEmployeeInsur
}
// 已完成状态不需要更新
if
(
CommonConstants
.
SIX_STRING
.
equals
(
insurancePre
.
getProcessStatus
()))
{
if
(
null
!=
insurancePre
&&
CommonConstants
.
SIX_STRING
.
equals
(
insurancePre
.
getProcessStatus
()))
{
return
false
;
}
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/controller/TSalaryStandardController.java
View file @
50d2ae0b
...
...
@@ -263,7 +263,7 @@ public class TSalaryStandardController {
// 生成收入
tSalaryStandardService
.
doIncome
(
tSalaryStandard
);
// 更新0申报为不可用
tSalaryStandardService
.
updateZero
(
tSalaryStandard
,
CommonConstants
.
TWO_INT
);
tSalaryStandardService
.
updateZero
(
tSalaryStandard
,
CommonConstants
.
TWO_INT
,
CommonConstants
.
ZERO_INT
);
return
R
.
ok
(
"提交成功!"
);
}
else
{
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/mapper/TSalaryZeroMapper.java
View file @
50d2ae0b
...
...
@@ -46,7 +46,7 @@ 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
int
updateDeleteFlagByIdList
(
@Param
(
"tableName"
)
String
tableName
,
@Param
(
"deleteFlag"
)
Integer
deleteFlag
,
@Param
(
"oldDeleteFlag"
)
Integer
oldDeleteFlag
,
@Param
(
"cardList"
)
List
<
String
>
cardList
,
@Param
(
"invoiceTitle"
)
String
invoiceTitle
,
@Param
(
"settleMonth"
)
String
settleMonth
);
// 导出获取数据总数
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/TSalaryStandardService.java
View file @
50d2ae0b
...
...
@@ -80,7 +80,7 @@ public interface TSalaryStandardService extends IService<TSalaryStandard> {
R
<
String
>
deleteSalaryById
(
String
id
);
// 更新0申报状态
void
updateZero
(
TSalaryStandard
tSalaryStandard
,
int
deleteFlag
);
void
updateZero
(
TSalaryStandard
tSalaryStandard
,
int
deleteFlag
,
int
oldDeleteFlag
);
/**
* @param id
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/TSalaryZeroService.java
View file @
50d2ae0b
...
...
@@ -53,7 +53,7 @@ public interface TSalaryZeroService extends IService<TSalaryZero> {
boolean
deleteTSalaryZeroByIdList
(
List
<
String
>
idList
);
// 批量更新状态(deleteFlag0,1,2:0:正常;1:已删除;2存在报账假删除)
int
updateDeleteFlagByIdList
(
String
invoiceTitle
,
String
settleMonth
,
String
year
,
Integer
deleteFlag
,
String
salaryId
);
int
updateDeleteFlagByIdList
(
String
invoiceTitle
,
String
settleMonth
,
String
year
,
Integer
deleteFlag
,
Integer
oldDeleteFlag
,
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/TSalaryStandardServiceImpl.java
View file @
50d2ae0b
...
...
@@ -414,7 +414,7 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
this
.
updateById
(
sf
);
// 更新0申报为可用
this
.
updateZero
(
sf
,
CommonConstants
.
ZERO_INT
);
this
.
updateZero
(
sf
,
CommonConstants
.
ZERO_INT
,
CommonConstants
.
TWO_INT
);
return
R
.
ok
(
"级联删除工资表成功"
);
}
...
...
@@ -423,11 +423,11 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
// 更新0申报状态
@Override
public
void
updateZero
(
TSalaryStandard
tSalaryStandard
,
int
deleteFlag
)
{
public
void
updateZero
(
TSalaryStandard
tSalaryStandard
,
int
deleteFlag
,
int
oldDeleteFlag
)
{
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
());
,
tSalaryStandard
.
getSettlementMonth
(),
year
,
deleteFlag
,
oldDeleteFlag
,
tSalaryStandard
.
getId
());
}
}
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryZeroServiceImpl.java
View file @
50d2ae0b
...
...
@@ -92,13 +92,13 @@ public class TSalaryZeroServiceImpl extends ServiceImpl<TSalaryZeroMapper, TSala
// 批量更新状态(deleteFlag0,1,2:0:正常;1:已删除;2存在报账假删除)
@Override
public
int
updateDeleteFlagByIdList
(
String
invoiceTitle
,
String
settleMonth
,
String
year
,
Integer
deleteFlag
,
String
salaryId
)
{
public
int
updateDeleteFlagByIdList
(
String
invoiceTitle
,
String
settleMonth
,
String
year
,
Integer
deleteFlag
,
Integer
oldDeleteFlag
,
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
,
cardList
,
invoiceTitle
,
settleMonth
);
return
baseMapper
.
updateDeleteFlagByIdList
(
tableName
,
deleteFlag
,
oldDeleteFlag
,
cardList
,
invoiceTitle
,
settleMonth
);
}
/**
...
...
yifu-salary/yifu-salary-biz/src/main/resources/mapper/TSalaryZeroMapper.xml
View file @
50d2ae0b
...
...
@@ -431,6 +431,7 @@
<foreach
item=
"item"
collection=
"cardList"
separator=
","
open=
"("
close=
")"
index=
""
>
#{item}
</foreach>
and delete_flag = #{oldDeleteFlag}
</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