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
870bfa4a
You need to sign in or sign up before continuing.
Commit
870bfa4a
authored
Jan 16, 2025
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.7.5-薪资提交校验
parent
d549434f
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
6 additions
and
6 deletions
+6
-6
TInsuranceUnpurchasePersonMapper.java
.../yifu/salary/mapper/TInsuranceUnpurchasePersonMapper.java
+1
-1
TInsuranceUnpurchasePersonService.java
...ifu/salary/service/TInsuranceUnpurchasePersonService.java
+1
-1
TInsuranceUnpurchasePersonServiceImpl.java
...y/service/impl/TInsuranceUnpurchasePersonServiceImpl.java
+2
-2
TSalaryStandardServiceImpl.java
.../yifu/salary/service/impl/TSalaryStandardServiceImpl.java
+1
-1
TInsuranceUnpurchasePersonMapper.xml
...ain/resources/mapper/TInsuranceUnpurchasePersonMapper.xml
+1
-1
No files found.
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/mapper/TInsuranceUnpurchasePersonMapper.java
View file @
870bfa4a
...
@@ -49,7 +49,7 @@ public interface TInsuranceUnpurchasePersonMapper extends BaseMapper<TInsuranceU
...
@@ -49,7 +49,7 @@ public interface TInsuranceUnpurchasePersonMapper extends BaseMapper<TInsuranceU
*/
*/
List
<
TInsuranceUnpurchasePersonAddVo
>
getTInsuranceUnpurchasePersonList
(
@Param
(
"id"
)
String
id
);
List
<
TInsuranceUnpurchasePersonAddVo
>
getTInsuranceUnpurchasePersonList
(
@Param
(
"id"
)
String
id
);
List
<
TInsuranceUnpurchasePerson
>
getBuyList
(
@Param
(
"dept
Id"
)
String
deptId
,
@Param
(
"idCardList"
)
List
<
String
>
idCardList
);
List
<
TInsuranceUnpurchasePerson
>
getBuyList
(
@Param
(
"dept
No"
)
String
deptNo
,
@Param
(
"idCardList"
)
List
<
String
>
idCardList
);
List
<
String
>
getSocialBuyList
();
List
<
String
>
getSocialBuyList
();
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/TInsuranceUnpurchasePersonService.java
View file @
870bfa4a
...
@@ -29,7 +29,7 @@ public interface TInsuranceUnpurchasePersonService extends IService<TInsuranceUn
...
@@ -29,7 +29,7 @@ public interface TInsuranceUnpurchasePersonService extends IService<TInsuranceUn
List
<
TInsuranceUnpurchasePersonAddVo
>
getTInsuranceUnpurchasePersonList
(
String
id
);
List
<
TInsuranceUnpurchasePersonAddVo
>
getTInsuranceUnpurchasePersonList
(
String
id
);
List
<
TInsuranceUnpurchasePerson
>
getBuyList
(
String
dept
Id
,
List
<
String
>
idCardList
);
List
<
TInsuranceUnpurchasePerson
>
getBuyList
(
String
dept
No
,
List
<
String
>
idCardList
);
/**
/**
* @param id 明细id
* @param id 明细id
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TInsuranceUnpurchasePersonServiceImpl.java
View file @
870bfa4a
...
@@ -107,8 +107,8 @@ public class TInsuranceUnpurchasePersonServiceImpl extends ServiceImpl<TInsuranc
...
@@ -107,8 +107,8 @@ public class TInsuranceUnpurchasePersonServiceImpl extends ServiceImpl<TInsuranc
}
}
@Override
@Override
public
List
<
TInsuranceUnpurchasePerson
>
getBuyList
(
String
dept
Id
,
List
<
String
>
idCardList
)
{
public
List
<
TInsuranceUnpurchasePerson
>
getBuyList
(
String
dept
No
,
List
<
String
>
idCardList
)
{
return
baseMapper
.
getBuyList
(
dept
Id
,
idCardList
);
return
baseMapper
.
getBuyList
(
dept
No
,
idCardList
);
}
}
/**
/**
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryStandardServiceImpl.java
View file @
870bfa4a
...
@@ -1130,7 +1130,7 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
...
@@ -1130,7 +1130,7 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
idCardList
.
add
(
a
.
getEmpIdCard
());
idCardList
.
add
(
a
.
getEmpIdCard
());
}
}
// 3 判断不购买申请明细
// 3 判断不购买申请明细
List
<
TInsuranceUnpurchasePerson
>
buyList
=
tInsuranceUnpurchasePersonService
.
getBuyList
(
s
.
getDept
Id
(),
idCardList
);
List
<
TInsuranceUnpurchasePerson
>
buyList
=
tInsuranceUnpurchasePersonService
.
getBuyList
(
s
.
getDept
No
(),
idCardList
);
Map
<
String
,
TInsuranceUnpurchasePerson
>
buyMap
=
new
HashMap
<>();
Map
<
String
,
TInsuranceUnpurchasePerson
>
buyMap
=
new
HashMap
<>();
TInsuranceUnpurchasePerson
buyPerson
;
TInsuranceUnpurchasePerson
buyPerson
;
for
(
TInsuranceUnpurchasePerson
buys
:
buyList
)
{
for
(
TInsuranceUnpurchasePerson
buys
:
buyList
)
{
...
...
yifu-salary/yifu-salary-biz/src/main/resources/mapper/TInsuranceUnpurchasePersonMapper.xml
View file @
870bfa4a
...
@@ -198,7 +198,7 @@
...
@@ -198,7 +198,7 @@
SOCIAL_STATUS,
SOCIAL_STATUS,
SALARY_NUM
SALARY_NUM
FROM t_insurance_unpurchase_person a
FROM t_insurance_unpurchase_person a
where STATUS = '3' AND (REASON_TYPE = '1' or (REASON_TYPE = '2' AND SALARY_NUM = 0) ) AND DEPT_
ID = #{deptId
} AND EMP_IDCARD_NO in
where STATUS = '3' AND (REASON_TYPE = '1' or (REASON_TYPE = '2' AND SALARY_NUM = 0) ) AND DEPT_
NO = #{deptNo
} AND EMP_IDCARD_NO in
<foreach
item=
"idStr"
index=
"index"
collection=
"idCardList"
open=
"("
separator=
","
close=
")"
>
<foreach
item=
"idStr"
index=
"index"
collection=
"idCardList"
open=
"("
separator=
","
close=
")"
>
#{idStr}
#{idStr}
</foreach>
</foreach>
...
...
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