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
1770a94c
Commit
1770a94c
authored
Jul 20, 2022
by
fangxinjiang
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/develop' into develop
parents
fb7adeac
04526494
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
585 additions
and
20 deletions
+585
-20
TEmployeeInfo.java
...ifu/cloud/plus/v1/yifu/archives/entity/TEmployeeInfo.java
+3
-3
TEmployeeProject.java
.../cloud/plus/v1/yifu/archives/entity/TEmployeeProject.java
+2
-2
TEmployeeContractInfoMapper.xml
...src/main/resources/mapper/TEmployeeContractInfoMapper.xml
+1
-2
TEmployeeProjectMapper.xml
...-biz/src/main/resources/mapper/TEmployeeProjectMapper.xml
+1
-2
pom.xml
yifu-social/yifu-social-biz/pom.xml
+5
-0
TPreDispatchInfoController.java
...v1/yifu/social/controller/TPreDispatchInfoController.java
+52
-0
TPreDispatchInfoService.java
.../plus/v1/yifu/social/service/TPreDispatchInfoService.java
+16
-0
TPreDispatchInfoServiceImpl.java
...yifu/social/service/impl/TPreDispatchInfoServiceImpl.java
+505
-11
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmployeeInfo.java
View file @
1770a94c
...
...
@@ -248,10 +248,10 @@ public class TEmployeeInfo extends BaseEntity {
private
String
remark
;
/**
* 人员档案来源(字典:4人员档案新建、5项目档案新建、1社保/公积金、3商险、2薪酬)
* 1=社保、公积金派单,2=人员发薪,3=商险派单,4=档案新建,5=批量导入
* 人员档案来源(字典:4人员档案新建、5项目档案新建、1社保/公积金、3商险、2薪酬
、6电子签
)
* 1=社保、公积金派单,2=人员发薪,3=商险派单,4=档案新建,5=批量导入
,6=电子签
*/
@Schema
(
description
=
"人员档案来源(字典:1=社保、公积金派单,2=人员发薪,3=商险派单,4=档案新建,5=批量导入)"
)
@Schema
(
description
=
"人员档案来源(字典:1=社保、公积金派单,2=人员发薪,3=商险派单,4=档案新建,5=批量导入
、6电子签
)"
)
private
String
fileSource
;
/**
...
...
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmployeeProject.java
View file @
1770a94c
...
...
@@ -232,9 +232,9 @@ public class TEmployeeProject extends BaseEntity {
private
String
tryPeriod
;
/**
* 项目档案来源(字典:4人员档案新建、5项目档案新建、1社保/公积金、3商险、2薪酬)
* 项目档案来源(字典:4人员档案新建、5项目档案新建、1社保/公积金、3商险、2薪酬
、6批量导入、7电子签
)
*/
@Schema
(
description
=
"项目档案来源(字典:4人员档案新建、5项目档案新建、1社保/公积金、3商险、2薪酬)"
)
@Schema
(
description
=
"项目档案来源(字典:4人员档案新建、5项目档案新建、1社保/公积金、3商险、2薪酬
、6批量导入、7电子签
)"
)
private
String
projectSource
;
/**
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeContractInfoMapper.xml
View file @
1770a94c
...
...
@@ -31,7 +31,6 @@
<result
property=
"empIdcard"
column=
"EMP_IDCARD"
/>
<result
property=
"contractName"
column=
"CONTRACT_NAME"
/>
<result
property=
"contractType"
column=
"CONTRACT_TYPE"
/>
<result
property=
"contractStart"
column=
"CONTRACT_START"
/>
<result
property=
"contractEnd"
column=
"CONTRACT_END"
/>
<result
property=
"subjectDepart"
column=
"SUBJECT_DEPART"
/>
<result
property=
"subjectUnit"
column=
"SUBJECT_UNIT"
/>
...
...
@@ -65,8 +64,8 @@
<result
property=
"warnEmailUserId"
column=
"WARN_EMAIL_USER_ID"
/>
<result
property=
"fddFlag"
column=
"FDD_FLAG"
/>
<result
property=
"isSign"
column=
"IS_SIGN"
/>
<result
property=
"createBy"
column=
"CREATE_BY"
/>
<result
property=
"createName"
column=
"CREATE_NAME"
/>
<result
property=
"createBy"
column=
"CREATE_BY"
/>
<result
property=
"createTime"
column=
"CREATE_TIME"
/>
<result
property=
"updateBy"
column=
"UPDATE_BY"
/>
<result
property=
"updateTime"
column=
"UPDATE_TIME"
/>
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeProjectMapper.xml
View file @
1770a94c
...
...
@@ -667,8 +667,7 @@
FROM
t_employee_project
WHERE
DELETE_FLAG = '0'
and id not like '%abc'
id not like '%abc'
and
EMP_NO LIKE CONCAT(
(
...
...
yifu-social/yifu-social-biz/pom.xml
View file @
1770a94c
...
...
@@ -53,6 +53,11 @@
<artifactId>
yifu-archives-api
</artifactId>
<version>
1.0.0
</version>
</dependency>
<dependency>
<groupId>
com.yifu.cloud.plus.v1
</groupId>
<artifactId>
yifu-insurances-api
</artifactId>
<version>
1.0.0
</version>
</dependency>
<!--必备:swagger-->
<dependency>
<groupId>
com.yifu.cloud.plus.v1
</groupId>
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TPreDispatchInfoController.java
View file @
1770a94c
...
...
@@ -20,8 +20,14 @@ package com.yifu.cloud.plus.v1.yifu.social.controller;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.core.toolkit.Wrappers
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.ExcelUtil
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser
;
import
com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog
;
import
com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils
;
import
com.yifu.cloud.plus.v1.yifu.social.constants.PreDispatchConstants
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TPreDispatchInfo
;
import
com.yifu.cloud.plus.v1.yifu.social.service.TPreDispatchInfoService
;
import
org.springframework.security.access.prepost.PreAuthorize
;
...
...
@@ -32,6 +38,8 @@ import lombok.RequiredArgsConstructor;
import
org.springframework.http.HttpHeaders
;
import
org.springframework.web.bind.annotation.*
;
import
java.net.URLDecoder
;
import
java.util.ArrayList
;
import
java.util.List
;
...
...
@@ -185,4 +193,48 @@ public class TPreDispatchInfoController {
public
R
<
Boolean
>
dispatchById
(
@RequestParam
(
value
=
"id"
,
required
=
true
)
String
id
)
{
return
tPreDispatchInfoService
.
dispatchById
(
id
);
}
/**
* 预派单批量新增派增
*
* @param jsonString
* @param houseId 社保户ID
* @param departId 结算主体ID
* @return
* @Author fxj
* @Date 2019-09-29
**/
@Operation
(
summary
=
"预派单批量新增派增"
,
description
=
"预派单批量新增派增"
)
@SysLog
(
"预派单批量新增派增"
)
@PostMapping
(
"/analysisJsonStringImportAdd"
)
@PreAuthorize
(
"@pms.hasPermission('social:tpredispatchinfo_importAddList')"
)
public
R
analysisJsonStringImportAdd
(
@RequestBody
String
jsonString
,
@RequestParam
(
value
=
"houseId"
,
required
=
true
)
String
houseId
,
@RequestParam
(
value
=
"departId"
,
required
=
true
)
String
departId
)
{
YifuUser
user
=
SecurityUtils
.
getUser
();
if
(
null
==
user
||
null
==
user
.
getId
())
{
return
R
.
failed
(
CommonConstants
.
USER_FAIL
);
}
ExcelUtil
<
TPreDispatchInfo
>
util1
=
null
;
try
{
jsonString
=
URLDecoder
.
decode
(
jsonString
,
CommonConstants
.
UTF8
).
replace
(
"="
,
""
);
util1
=
new
ExcelUtil
<>(
TPreDispatchInfo
.
class
);
util1
.
getJsonStringToList
(
jsonString
,
null
);
List
<
TPreDispatchInfo
>
listInfo
=
util1
.
getEntityList
();
//用于返回错误信息
List
<
ErrorMessage
>
errorInfo
=
new
ArrayList
<>();
if
(
null
!=
util1
.
getErrorInfo
()
&&
!
util1
.
getErrorInfo
().
isEmpty
())
{
return
R
.
failed
(
util1
.
getErrorInfo
(),
PreDispatchConstants
.
DATA_CHECK
);
}
else
{
if
(
null
!=
listInfo
&&
!
listInfo
.
isEmpty
())
{
errorInfo
=
tPreDispatchInfoService
.
batchSavePreDisPatchAdd
(
listInfo
,
user
,
houseId
,
departId
);
}
else
{
return
R
.
failed
(
CommonConstants
.
DATA_CAN_NOT_EMPTY
);
}
return
R
.
ok
(
errorInfo
,
""
);
}
}
catch
(
Exception
e
)
{
return
R
.
failed
(
PreDispatchConstants
.
DATA_IMPORT_ANALYSIS_ERROR
);
}
}
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/TPreDispatchInfoService.java
View file @
1770a94c
...
...
@@ -20,9 +20,13 @@ package com.yifu.cloud.plus.v1.yifu.social.service;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.ErrorMessage
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser
;
import
com.yifu.cloud.plus.v1.yifu.social.entity.TPreDispatchInfo
;
import
java.util.List
;
/**
* 预派单记录
*
...
...
@@ -83,4 +87,16 @@ public interface TPreDispatchInfoService extends IService<TPreDispatchInfo> {
* @return
**/
R
update
(
TPreDispatchInfo
tPreDispatchInfo
);
/**
* 预派单批量新增派增
* @Author huyc
* @Date 2022-07-18
* @param listInfo
* @param user
* @param houseId
* @param departId
* @return
**/
List
<
ErrorMessage
>
batchSavePreDisPatchAdd
(
List
<
TPreDispatchInfo
>
listInfo
,
YifuUser
user
,
String
houseId
,
String
departId
);
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPreDispatchInfoServiceImpl.java
View file @
1770a94c
This diff is collapsed.
Click to expand it.
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