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
d044cc47
Commit
d044cc47
authored
Jan 16, 2025
by
huyuchen
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.5' into MVP1.7.5
parents
1b2f07d8
fa4f5213
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
8 additions
and
9 deletions
+8
-9
TInsuranceUnpurchasePersonMapper.java
.../yifu/salary/mapper/TInsuranceUnpurchasePersonMapper.java
+1
-1
TInsuranceUnpurchasePersonService.java
...ifu/salary/service/TInsuranceUnpurchasePersonService.java
+1
-1
TInsuranceUnpurchasePersonSalaryServiceImpl.java
...ice/impl/TInsuranceUnpurchasePersonSalaryServiceImpl.java
+1
-1
TInsuranceUnpurchasePersonServiceImpl.java
...y/service/impl/TInsuranceUnpurchasePersonServiceImpl.java
+2
-2
TSalaryStandardServiceImpl.java
.../yifu/salary/service/impl/TSalaryStandardServiceImpl.java
+1
-2
TInsuranceUnpurchasePersonMapper.xml
...ain/resources/mapper/TInsuranceUnpurchasePersonMapper.xml
+1
-1
TInsuranceUnpurchasePersonSalaryMapper.xml
...sources/mapper/TInsuranceUnpurchasePersonSalaryMapper.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 @
d044cc47
...
...
@@ -49,7 +49,7 @@ public interface TInsuranceUnpurchasePersonMapper extends BaseMapper<TInsuranceU
*/
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
();
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/TInsuranceUnpurchasePersonService.java
View file @
d044cc47
...
...
@@ -29,7 +29,7 @@ public interface TInsuranceUnpurchasePersonService extends IService<TInsuranceUn
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
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TInsuranceUnpurchasePersonSalaryServiceImpl.java
View file @
d044cc47
...
...
@@ -39,8 +39,8 @@ public class TInsuranceUnpurchasePersonSalaryServiceImpl extends ServiceImpl<TIn
**/
@Override
public
void
deletePersonSalaryBySalaryId
(
String
salaryId
)
{
baseMapper
.
deletePersonSalaryBySalaryId
(
salaryId
);
baseMapper
.
updatePersonSalaryNumBySalaryId
(
salaryId
);
baseMapper
.
deletePersonSalaryBySalaryId
(
salaryId
);
}
}
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TInsuranceUnpurchasePersonServiceImpl.java
View file @
d044cc47
...
...
@@ -117,8 +117,8 @@ public class TInsuranceUnpurchasePersonServiceImpl extends ServiceImpl<TInsuranc
}
@Override
public
List
<
TInsuranceUnpurchasePerson
>
getBuyList
(
String
dept
Id
,
List
<
String
>
idCardList
)
{
return
baseMapper
.
getBuyList
(
dept
Id
,
idCardList
);
public
List
<
TInsuranceUnpurchasePerson
>
getBuyList
(
String
dept
No
,
List
<
String
>
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 @
d044cc47
...
...
@@ -1130,7 +1130,7 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
idCardList
.
add
(
a
.
getEmpIdCard
());
}
// 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
<>();
TInsuranceUnpurchasePerson
buyPerson
;
for
(
TInsuranceUnpurchasePerson
buys
:
buyList
)
{
...
...
@@ -1231,7 +1231,6 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
updatePerSonList
.
add
(
updatePerSon
);
TInsuranceUnpurchasePersonSalary
updatePerSonSalary
=
new
TInsuranceUnpurchasePersonSalary
();
updatePerSonSalary
.
setId
(
buyPerson
.
getId
());
updatePerSonSalary
.
setSalaryId
(
s
.
getId
());
updatePerSonSalary
.
setApplyNo
(
s
.
getApplyNo
());
updatePerSonSalary
.
setParentId
(
buyPerson
.
getId
());
...
...
yifu-salary/yifu-salary-biz/src/main/resources/mapper/TInsuranceUnpurchasePersonMapper.xml
View file @
d044cc47
...
...
@@ -198,7 +198,7 @@
SOCIAL_STATUS,
SALARY_NUM
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=
")"
>
#{idStr}
</foreach>
...
...
yifu-salary/yifu-salary-biz/src/main/resources/mapper/TInsuranceUnpurchasePersonSalaryMapper.xml
View file @
d044cc47
...
...
@@ -70,7 +70,7 @@
update t_insurance_unpurchase_person a
left join t_insurance_unpurchase_person_salary b on a.id=b.PARENT_ID
set a.SALARY_NUM = (if(a.SALARY_NUM is null or a.SALARY_NUM = 0,1,a.SALARY_NUM) - 1)
where b.SALARY_ID = #{salaryId}
where
b.DELETE_FLAG = 0 and
b.SALARY_ID = #{salaryId}
</update>
</mapper>
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