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
0b74d35d
Commit
0b74d35d
authored
Nov 13, 2022
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
接口修改
parent
0816da27
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
343 additions
and
92 deletions
+343
-92
TDispatchInfoExportVo.java
...u/cloud/plus/v1/yifu/social/vo/TDispatchInfoExportVo.java
+337
-75
TDispatchInfoServiceImpl.java
...v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
+6
-6
TDispatchInfoMapper.xml
...ial-biz/src/main/resources/mapper/TDispatchInfoMapper.xml
+0
-11
No files found.
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TDispatchInfoExportVo.java
View file @
0b74d35d
This diff is collapsed.
Click to expand it.
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @
0b74d35d
...
...
@@ -3257,13 +3257,13 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
temp
.
append
(
DispatchConstants
.
DISPATCH_SOCIAL_ADD
);
temp
.
append
(
Common
.
isNullToString
(
socialTypeRemark
));
temp
.
append
(
DispatchConstants
.
DISPATCH_HANDLE_SUCCESS
);
initAuditInfo
(
auditInfo
,
(
temp
+
ServiceUtil
.
ifNullToEmpty
(
handleRemark
)),
CommonConstants
.
THREE_STRING
,
user
,
temp
.
toString
(),
remark
);
initAuditInfo
(
auditInfo
,
(
temp
+
ServiceUtil
.
ifNullToEmpty
(
handleRemark
)),
CommonConstants
.
THREE_STRING
,
user
,
temp
.
toString
()
.
concat
(
handleRemark
)
,
remark
);
}
else
{
temp
.
setLength
(
CommonConstants
.
ZERO_INT
);
temp
.
append
(
DispatchConstants
.
DISPATCH_SOCIAL_ADD
);
temp
.
append
(
Common
.
isNullToString
(
socialTypeRemark
));
temp
.
append
(
DispatchConstants
.
DISPATCH_HANDLE_FAIL
);
initAuditInfo
(
auditInfo
,
(
temp
+
ServiceUtil
.
ifNullToEmpty
(
handleRemark
)),
CommonConstants
.
FOUR_STRING
,
user
,
temp
.
toString
(),
remark
);
initAuditInfo
(
auditInfo
,
(
temp
+
ServiceUtil
.
ifNullToEmpty
(
handleRemark
)),
CommonConstants
.
FOUR_STRING
,
user
,
temp
.
toString
()
.
concat
(
handleRemark
)
,
remark
);
}
auditInfo
.
setSocialId
(
dis
.
getId
());
}
...
...
@@ -3326,9 +3326,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
}
dis
.
setFundHandleRemark
(
ServiceUtil
.
ifNullToEmpty
(
handleRemark
));
if
(
CommonConstants
.
ZERO_INT
==
flag
)
{
initAuditInfo
(
auditInfo
,
(
DispatchConstants
.
DISPATCH_FUND_ADD_SUCCESS
+
handleRemark
),
CommonConstants
.
THREE_STRING
,
user
,
DispatchConstants
.
DISPATCH_FUND_ADD_SUCCESS
,
remark
);
initAuditInfo
(
auditInfo
,
(
DispatchConstants
.
DISPATCH_FUND_ADD_SUCCESS
+
handleRemark
),
CommonConstants
.
THREE_STRING
,
user
,
(
DispatchConstants
.
DISPATCH_FUND_ADD_SUCCESS
+
handleRemark
)
,
remark
);
}
else
{
initAuditInfo
(
auditInfo
,
(
DispatchConstants
.
DISPATCH_FUND_ADD_FAIL
+
handleRemark
),
CommonConstants
.
FOUR_STRING
,
user
,
DispatchConstants
.
DISPATCH_FUND_ADD_FAIL
,
remark
);
initAuditInfo
(
auditInfo
,
(
DispatchConstants
.
DISPATCH_FUND_ADD_FAIL
+
handleRemark
),
CommonConstants
.
FOUR_STRING
,
user
,
(
DispatchConstants
.
DISPATCH_FUND_ADD_FAIL
+
handleRemark
)
,
remark
);
}
auditInfo
.
setProvidentId
(
dis
.
getId
());
}
else
{
...
...
@@ -3416,10 +3416,10 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
fundMapper
.
updateById
(
providentFund
);
dis
.
setFundHandleRemark
(
ServiceUtil
.
ifNullToEmpty
(
handleRemark
));
if
(
CommonConstants
.
ZERO_INT
==
flag
)
{
initAuditInfo
(
auditInfo
,
(
DispatchConstants
.
DISPATCH_FUND_REDUCE_SUCCESS
+
handleRemark
),
CommonConstants
.
SIX_STRING
,
user
,
DispatchConstants
.
DISPATCH_FUND_REDUCE_SUCCESS
,
remark
);
initAuditInfo
(
auditInfo
,
(
DispatchConstants
.
DISPATCH_FUND_REDUCE_SUCCESS
+
handleRemark
),
CommonConstants
.
SIX_STRING
,
user
,
(
DispatchConstants
.
DISPATCH_FUND_REDUCE_SUCCESS
+
handleRemark
)
,
remark
);
dis
.
setFundHandleStatus
(
CommonConstants
.
ONE_STRING
);
}
else
{
initAuditInfo
(
auditInfo
,
(
DispatchConstants
.
DISPATCH_FUND_REDUCE_FAIL
+
handleRemark
),
CommonConstants
.
FOUR_STRING
,
user
,
DispatchConstants
.
DISPATCH_FUND_REDUCE_FAIL
,
remark
);
initAuditInfo
(
auditInfo
,
(
DispatchConstants
.
DISPATCH_FUND_REDUCE_FAIL
+
handleRemark
),
CommonConstants
.
FOUR_STRING
,
user
,
(
DispatchConstants
.
DISPATCH_FUND_REDUCE_SUCCESS
+
handleRemark
)
,
remark
);
dis
.
setFundHandleStatus
(
CommonConstants
.
TWO_STRING
);
}
auditInfo
.
setProvidentId
(
dis
.
getId
());
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TDispatchInfoMapper.xml
View file @
0b74d35d
...
...
@@ -105,21 +105,15 @@
</resultMap>
<!-- 派单导出vo -->
<resultMap
id=
"exportMap"
type=
"com.yifu.cloud.plus.v1.yifu.social.vo.TDispatchInfoExportVo"
>
<id
property=
"id"
column=
"ID"
/>
<result
property=
"applyNo"
column=
"APPLY_NO"
/>
<result
property=
"empNo"
column=
"EMP_NO"
/>
<result
property=
"empName"
column=
"EMP_NAME"
/>
<result
property=
"empIdcard"
column=
"EMP_IDCARD"
/>
<result
property=
"empType"
column=
"EMP_TYPE"
/>
<result
property=
"typeSub"
column=
"TYPE_SUB"
/>
<result
property=
"belongUnitName"
column=
"BELONG_UNIT_NAME"
/>
<result
property=
"settleDomainName"
column=
"SETTLE_DOMAIN_NAME"
/>
<result
property=
"settleDomainCode"
column=
"SETTLE_DOMAIN_CODE"
/>
<result
property=
"type"
column=
"TYPE"
/>
<result
property=
"dispatchItem"
column=
"DISPATCH_ITEM"
/>
<result
property=
"socialHouseholdName"
column=
"SOCIAL_HOUSEHOLD_NAME"
/>
<result
property=
"providentHouseholdName"
column=
"PROVIDENT_HOUSEHOLD_NAME"
/>
<result
property=
"status"
column=
"STATUS"
/>
<result
property=
"socialHandleStatus"
column=
"SOCIAL_HANDLE_STATUS"
/>
<result
property=
"pensionHandle"
column=
"PENSION_HANDLE"
/>
<result
property=
"medicalHandle"
column=
"MEDICAL_HANDLE"
/>
...
...
@@ -571,18 +565,13 @@
<!-- 派单导出 -->
<select
id=
"exportDispatch"
resultMap=
"exportMap"
>
select
a.ID,
a.APPLY_NO,
a.EMP_NO,
a.EMP_NAME,
a.EMP_IDCARD,
a.EMP_TYPE,
a.TYPE_SUB,
a.BELONG_UNIT_NAME,
a.SETTLE_DOMAIN_NAME,
a.SETTLE_DOMAIN_CODE,
a.TYPE,
a.DISPATCH_ITEM,
a.SOCIAL_HOUSEHOLD_NAME,
a.PROVIDENT_HOUSEHOLD_NAME,
a.STATUS,
...
...
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