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
da59b821
Commit
da59b821
authored
May 23, 2023
by
hongguangwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.5.4-派单委托备注(合同起缴日期等)
parent
97ebb8fb
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
5 deletions
+13
-5
TDispatchInfoExportVo.java
...u/cloud/plus/v1/yifu/social/vo/TDispatchInfoExportVo.java
+3
-3
TDispatchInfoMapper.xml
...ial-biz/src/main/resources/mapper/TDispatchInfoMapper.xml
+9
-1
TSocialFundInfoMapper.xml
...l-biz/src/main/resources/mapper/TSocialFundInfoMapper.xml
+1
-1
No files found.
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TDispatchInfoExportVo.java
View file @
da59b821
...
...
@@ -187,8 +187,8 @@ public class TDispatchInfoExportVo {
@ExcelProperty
(
"公积金停缴日期"
)
private
Date
fundReduceDate
;
@ExcelAttribute
(
name
=
"社保审核状态"
,
readConverterExp
=
"0=未提交,1=待审核,2=审核通过,3=审核不通过,4=已办结"
)
@Schema
(
description
=
"社保审核状态:1待审核2审核通过3审核不通过4已办结"
)
@ExcelAttribute
(
name
=
"社保审核状态"
,
readConverterExp
=
"0=未提交,1=待审核,2=审核通过,3=审核不通过,4=已办结
,5=待SSC审核
"
)
@Schema
(
description
=
"社保审核状态:1待审核2审核通过3审核不通过4已办结
5待SSC审核
"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"社保审核状态"
)
private
String
auditStatus
;
...
...
@@ -231,7 +231,7 @@ public class TDispatchInfoExportVo {
/**
* 审核状态(0待审核/1已审核)
*/
@ExcelAttribute
(
name
=
"公积金审核状态"
,
readConverterExp
=
"0=未提交,1=待审核,2=审核通过,3=审核不通过,4=已办结"
)
@ExcelAttribute
(
name
=
"公积金审核状态"
,
readConverterExp
=
"0=未提交,1=待审核,2=审核通过,3=审核不通过,4=已办结
,5=待SSC审核
"
)
@Schema
(
description
=
"公积金审核状态:(0待审核/1已审核)"
)
@HeadFontStyle
(
fontHeightInPoints
=
11
)
@ExcelProperty
(
"公积金审核状态"
)
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TDispatchInfoMapper.xml
View file @
da59b821
...
...
@@ -897,7 +897,15 @@
count(1)
from t_dispatch_info a
<where>
a.DELETE_FLAG = '0' and a.STATUS = '1'
a.DELETE_FLAG = '0'
<if
test=
"tDispatchInfo != null"
>
<if
test=
"tDispatchInfo.status != null and tDispatchInfo.status.trim() != ''"
>
AND a.STATUS = #{tDispatchInfo.status}
</if>
<if
test=
"tDispatchInfo.status == null or tDispatchInfo.status.trim() == ''"
>
AND a.STATUS = '1'
</if>
</if>
<include
refid=
"tDispatchInfoAudit_where"
/>
</where>
</select>
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TSocialFundInfoMapper.xml
View file @
da59b821
...
...
@@ -540,7 +540,7 @@
#{idStr}
</foreach>
</if>
<if
test=
"tSocialFundInfo.empTypeList != null "
>
<if
test=
"tSocialFundInfo.empTypeList != null
and tSocialFundInfo.empTypeList.length>0
"
>
AND a.EMP_TYPE IN
<foreach
collection=
"tSocialFundInfo.empTypeList"
item=
"item"
index=
"index"
open=
"("
separator=
","
close=
")"
>
#{item}
...
...
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