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
ce53a2e9
Commit
ce53a2e9
authored
Jan 17, 2025
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/MVP1.7.5' into MVP1.7.5
parents
d4b75b36
c0d7d920
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
120 additions
and
31 deletions
+120
-31
TInsuranceUnpurchaseApplyMapper.java
...1/yifu/salary/mapper/TInsuranceUnpurchaseApplyMapper.java
+4
-0
TInsuranceUnpurchaseApplyServiceImpl.java
...ry/service/impl/TInsuranceUnpurchaseApplyServiceImpl.java
+61
-28
TInsuranceUnpurchaseApplyMapper.xml
...main/resources/mapper/TInsuranceUnpurchaseApplyMapper.xml
+29
-1
TInsuranceUnpurchasePersonMapper.xml
...ain/resources/mapper/TInsuranceUnpurchasePersonMapper.xml
+26
-2
No files found.
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/mapper/TInsuranceUnpurchaseApplyMapper.java
View file @
ce53a2e9
...
...
@@ -45,6 +45,10 @@ public interface TInsuranceUnpurchaseApplyMapper extends BaseMapper<TInsuranceUn
String
getMaxInusuranceDetailCode
();
long
selectSocialCount
(
@Param
(
"deptNo"
)
String
deptNo
,
@Param
(
"cardNo"
)
String
cardNo
,
@Param
(
"id"
)
String
id
);
long
selectArchCount
(
@Param
(
"deptNo"
)
String
deptNo
,
@Param
(
"cardNo"
)
String
cardNo
,
@Param
(
"id"
)
String
id
);
/**
* 待审核分页查询
* @param page 分页信息
...
...
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TInsuranceUnpurchaseApplyServiceImpl.java
View file @
ce53a2e9
This diff is collapsed.
Click to expand it.
yifu-salary/yifu-salary-biz/src/main/resources/mapper/TInsuranceUnpurchaseApplyMapper.xml
View file @
ce53a2e9
...
...
@@ -118,6 +118,34 @@
</where>
</select>
<select
id=
"selectSocialCount"
resultType=
"java.lang.Long"
>
SELECT
count(1)
FROM t_insurance_unpurchase_apply a
inner join t_insurance_unpurchase_person b
on a.id = b.PARNET_ID
where
1=1 and a.DELETE_FLAG = '0' and a.reason_type = '1' and a.status in ('2','3')
<if
test=
"id != null "
>
AND a.id != #{id}
</if>
and a.DEPT_NO = #{deptNo} and b.EMP_IDCARD_NO = #{cardNo}
</select>
<select
id=
"selectArchCount"
resultType=
"java.lang.Long"
>
SELECT
count(1)
FROM t_insurance_unpurchase_apply a
inner join t_insurance_unpurchase_person b
on a.id = b.PARNET_ID
where
1=1 and a.DELETE_FLAG = '0' and a.reason_type = '2' and a.status in ('2','3') and b.SALARY_NUM = 0
<if
test=
"id != null "
>
AND a.id != #{id}
</if>
and a.DEPT_NO = #{deptNo} and b.EMP_IDCARD_NO = #{cardNo}
</select>
<!-- tInsuranceUnpurchaseApply简单分页查询 -->
<select
id=
"getTInsuranceUnpurchaseApplyExportList"
resultMap=
"tInsuranceUnpurchaseApplyExportMap"
>
SELECT
...
...
@@ -126,7 +154,7 @@
a.DEPT_NO,
a.CREATE_NAME,
a.CREATE_USER_DEPT_NAME,
a.CREATE_TIME,
a.CREATE_TIME
_ZC as CREATE_TIME
,
a.AUDIT_USER,
if(a.REASON_TYPE = '1','已购买社保','人员已离职') REASON_TYPE,
CASE WHEN a.STATUS=0 THEN "草稿"
...
...
yifu-salary/yifu-salary-biz/src/main/resources/mapper/TInsuranceUnpurchasePersonMapper.xml
View file @
ce53a2e9
...
...
@@ -130,7 +130,31 @@
<!--tInsuranceUnpurchasePerson简单分页查询-->
<select
id=
"getTInsuranceUnpurchasePersonPage"
resultMap=
"tInsuranceUnpurchasePersonMap"
>
SELECT
<include
refid=
"Base_Column_List"
/>
a.ID,
a.PARNET_ID,
a.EMP_NAME,
a.EMP_IDCARD_NO,
a.POST,
a.APPLY_NO_DETAIL,
a.DEPT_ID,
a.DEPT_NO,
a.DEPT_NAME,
a.CREATE_USER_DEPT_ID,
a.CREATE_USER_DEPT_NAME,
a.REASON_TYPE,
a.REASON_INFO,
a.APPLY_NO,
if(a.REASON_TYPE = '2','',a.SOCIAL_STATUS) SOCIAL_STATUS,
a.SALARY_NUM,
a.CREATE_BY,
a.CREATE_NAME,
a.CREATE_TIME,
a.UPDATE_BY,
a.UPDATE_TIME,
a.HAS_CONTAIN_RISKS,
a.NEW_LINE,
a.DIVISION,
a.INSURANCE_FLAG
FROM t_insurance_unpurchase_person a
<where>
1=1 and STATUS = '3'
...
...
@@ -162,7 +186,7 @@
EMP_NAME,
EMP_IDCARD_NO,
if(a.REASON_TYPE = '1','已购买社保','人员已离职') REASON_TYPE,
if(a.
SOCIAL_STATUS='0','在保','不在保'
) SOCIAL_STATUS,
if(a.
REASON_TYPE = '2','',if(a.SOCIAL_STATUS='0','在保','不在保')
) SOCIAL_STATUS,
SALARY_NUM,
CREATE_NAME,
CREATE_TIME
...
...
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