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
a2842082
Commit
a2842082
authored
Jul 03, 2023
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化修改
parent
27c8779e
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
25 additions
and
2 deletions
+25
-2
TPreDispatchInfo.java
...fu/cloud/plus/v1/yifu/social/entity/TPreDispatchInfo.java
+9
-0
TPreDispatchReduceVo.java
...fu/cloud/plus/v1/yifu/social/vo/TPreDispatchReduceVo.java
+9
-0
TPreDispatchInfoServiceImpl.java
...yifu/social/service/impl/TPreDispatchInfoServiceImpl.java
+2
-0
TPreDispatchInfoMapper.xml
...-biz/src/main/resources/mapper/TPreDispatchInfoMapper.xml
+5
-2
No files found.
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TPreDispatchInfo.java
View file @
a2842082
...
...
@@ -16,6 +16,7 @@
*/
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
social
.
entity
;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.baomidou.mybatisplus.annotation.TableId
;
...
...
@@ -548,6 +549,14 @@ public class TPreDispatchInfo extends BaseEntity {
@ExcelAttribute
(
name
=
"员工类型"
)
private
String
empTypeAdd
;
/**
* 0 是 1 否
*/
@ExcelAttribute
(
name
=
"是否同步终止合同、减项、减档"
,
maxLength
=
1
,
readConverterExp
=
"0=是,1=否"
)
@Schema
(
description
=
"是否同步终止合同、减项、减档"
,
name
=
"changeContractAndEmployee"
)
@ExcelProperty
(
"是否同步终止合同、减项、减档"
)
private
String
changeContractAndEmployee
;
/**
* 所属单位ID
*/
...
...
yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TPreDispatchReduceVo.java
View file @
a2842082
...
...
@@ -16,6 +16,7 @@
*/
package
com
.
yifu
.
cloud
.
plus
.
v1
.
yifu
.
social
.
vo
;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
com.baomidou.mybatisplus.annotation.TableField
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute
;
import
io.swagger.v3.oas.annotations.media.Schema
;
...
...
@@ -697,6 +698,14 @@ public class TPreDispatchReduceVo {
@ExcelAttribute
(
name
=
"是否派单"
)
private
String
dispatchFlag
;
/**
* 0 是 1 否
*/
@ExcelAttribute
(
name
=
"是否同步终止合同、减项、减档"
,
maxLength
=
1
,
readConverterExp
=
"0=是,1=否"
)
@Schema
(
description
=
"是否同步终止合同、减项、减档"
,
name
=
"changeContractAndEmployee"
)
@ExcelProperty
(
"是否同步终止合同、减项、减档"
)
private
String
changeContractAndEmployee
;
/**
* 取消原因:不派单时填写
*/
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPreDispatchInfoServiceImpl.java
View file @
a2842082
...
...
@@ -431,6 +431,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
dispatchReduceVo
.
setFundReduceDate
(
DateUtil
.
getFirstDay
(
preInfo
.
getFundEndReduce
()));
}
dispatchReduceVo
.
setRowIndex
(
CommonConstants
.
ONE_INT
);
dispatchReduceVo
.
setChangeContractAndEmployee
(
preInfo
.
getChangeContractAndEmployee
());
List
<
TDispatchReduceVo
>
dispatchImportList
=
new
ArrayList
<>();
dispatchImportList
.
add
(
dispatchReduceVo
);
dispatchInfoService
.
batchReduceDispatch
(
dispatchImportList
,
errorMessageList
,
user
,
null
);
...
...
@@ -616,6 +617,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
dispatchReduceVo
.
setRowIndex
(
i
);
// 处理派减派单时间
dispatchReduce
(
dispatchReduceVo
,
pre
);
dispatchReduceVo
.
setChangeContractAndEmployee
(
pre
.
getChangeContractAndEmployee
());
List
<
TDispatchReduceVo
>
dispatchImportList
=
new
ArrayList
<>();
dispatchImportList
.
add
(
dispatchReduceVo
);
dispatchInfoService
.
batchReduceDispatch
(
dispatchImportList
,
errorMessageList
,
user
,
null
);
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TPreDispatchInfoMapper.xml
View file @
a2842082
...
...
@@ -600,8 +600,11 @@
<if
test=
"contractTypeAdd != null"
>
contract_type_add = #{contractTypeAdd},
</if>
<if
test=
"contractStartAdd != null"
>
contract_start_add = #{contractStartAdd},
<if
test=
"contractTypeAdd != null"
>
contract_type_add = #{contractTypeAdd},
</if>
<if
test=
"changeContractAndEmployee != null"
>
CHANGE_CONTRACT_AND_EMPLOYEE = #{changeContractAndEmployee},
</if>
<if
test=
"contractEndAdd != null"
>
contract_end_add = #{contractEndAdd},
...
...
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