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
c69027a0
Commit
c69027a0
authored
Jul 14, 2022
by
huyuchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
户配置代码提交
parent
1d5b4a20
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
49 additions
and
117 deletions
+49
-117
FddContractAttachInfo.java
...d/plus/v1/yifu/archives/entity/FddContractAttachInfo.java
+0
-30
FddContractInfo.java
...u/cloud/plus/v1/yifu/archives/entity/FddContractInfo.java
+0
-31
FddPersonAccount.java
.../cloud/plus/v1/yifu/archives/entity/FddPersonAccount.java
+0
-31
FddController.java
...cloud/plus/v1/yifu/archives/controller/FddController.java
+5
-5
FddPersonAccountController.java
.../yifu/archives/controller/FddPersonAccountController.java
+1
-1
FddPersonAccountService.java
...lus/v1/yifu/archives/service/FddPersonAccountService.java
+7
-0
FddPersonAccountServiceImpl.java
...fu/archives/service/impl/FddPersonAccountServiceImpl.java
+19
-18
TEmployeeProjectServiceImpl.java
...fu/archives/service/impl/TEmployeeProjectServiceImpl.java
+16
-0
FddPersonAccountMapper.xml
...-biz/src/main/resources/mapper/FddPersonAccountMapper.xml
+1
-1
No files found.
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/FddContractAttachInfo.java
View file @
c69027a0
...
...
@@ -180,36 +180,6 @@ public class FddContractAttachInfo extends BaseEntity {
@Schema
(
description
=
"结算主体编码"
)
private
String
departNo
;
/**
* 创建者
*/
@Schema
(
description
=
"创建者"
)
private
String
createBy
;
/**
* 更新人
*/
@Schema
(
description
=
"更新人"
)
private
String
updateBy
;
/**
* 创建时间
*/
@Schema
(
description
=
"创建时间"
)
private
LocalDateTime
createTime
;
/**
* 更新时间
*/
@Schema
(
description
=
"更新时间"
)
private
LocalDateTime
updateTime
;
/**
* 创建人姓名
*/
@Schema
(
description
=
"创建人姓名"
)
private
String
createName
;
/**
* 结算主体名称
*/
...
...
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/FddContractInfo.java
View file @
c69027a0
...
...
@@ -141,35 +141,4 @@ public class FddContractInfo extends BaseEntity {
@Schema
(
description
=
"合同模板id"
)
private
String
fddTemplateId
;
/**
* 创建者
*/
@Schema
(
description
=
"创建者"
)
private
String
createBy
;
/**
* 更新人
*/
@Schema
(
description
=
"更新人"
)
private
String
updateBy
;
/**
* 创建时间
*/
@Schema
(
description
=
"创建时间"
)
private
LocalDateTime
createTime
;
/**
* 更新时间
*/
@Schema
(
description
=
"更新时间"
)
private
LocalDateTime
updateTime
;
/**
* 创建人姓名
*/
@Schema
(
description
=
"创建人姓名"
)
private
String
createName
;
}
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/FddPersonAccount.java
View file @
c69027a0
...
...
@@ -99,35 +99,4 @@ public class FddPersonAccount extends BaseEntity {
@Schema
(
description
=
"实名短信发送:0未发送 1已发送"
)
private
String
realMessageFlag
;
/**
* 创建者
*/
@Schema
(
description
=
"创建者"
)
private
String
createBy
;
/**
* 更新人
*/
@Schema
(
description
=
"更新人"
)
private
String
updateBy
;
/**
* 创建时间
*/
@Schema
(
description
=
"创建时间"
)
private
LocalDateTime
createTime
;
/**
* 更新时间
*/
@Schema
(
description
=
"更新时间"
)
private
LocalDateTime
updateTime
;
/**
* 创建人姓名
*/
@Schema
(
description
=
"创建人姓名"
)
private
String
createName
;
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/FddController.java
View file @
c69027a0
...
...
@@ -83,7 +83,7 @@ public class FddController {
fddPersonAccountService
.
updateById
(
fddPersonAccount
);
}
}
return
R
.
ok
(
);
return
R
.
ok
(
null
,
"成功"
);
}
/**
...
...
@@ -127,7 +127,7 @@ public class FddController {
fddPersonAccount
.
setCompanyInfoId
(
companyInfo
.
getId
());
}
fddPersonAccountService
.
updateById
(
fddPersonAccount
);
return
R
.
ok
(
);
return
R
.
ok
(
null
,
"成功"
);
}
}
}
...
...
@@ -186,7 +186,7 @@ public class FddController {
}
});
}
return
R
.
ok
(
);
return
R
.
ok
(
null
,
"成功"
);
}
}
}
else
if
(
StringUtils
.
equals
(
fddEvent
,
"reviseTask"
))
{
...
...
@@ -218,7 +218,7 @@ public class FddController {
e
.
printStackTrace
();
}
});
return
R
.
ok
(
);
return
R
.
ok
(
null
,
"成功"
);
}
}
}
else
if
(
StringUtils
.
equals
(
fddEvent
,
"sign"
))
{
...
...
@@ -260,7 +260,7 @@ public class FddController {
employeeContractInfoService
.
updateById
(
ec
);
}
}
return
R
.
ok
();
return
R
.
ok
(
null
,
"成功"
);
}
else
if
(
StringUtils
.
equals
(
fddEvent
,
"notifyUrlVerify"
))
{
return
R
.
ok
(
null
,
"success"
);
}
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/FddPersonAccountController.java
View file @
c69027a0
...
...
@@ -84,7 +84,7 @@ public class FddPersonAccountController {
@PostMapping
@PreAuthorize
(
"@pms.hasPermission('demo_fddpersonaccount_add')"
)
public
R
saveAuth
(
@RequestBody
FddPersonAccount
fddPersonAccount
)
{
return
R
.
ok
(
fddPersonAccountService
.
save
(
fddPersonAccount
)
);
return
fddPersonAccountService
.
saveInfo
(
fddPersonAccount
);
}
/**
...
...
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/FddPersonAccountService.java
View file @
c69027a0
...
...
@@ -78,5 +78,12 @@ public interface FddPersonAccountService extends IService<FddPersonAccount> {
* @return R
*/
R
<
List
<
FddCompanyInfo
>>
getAllDepart
(
String
id
);
/**
* 新增员工
* @param fddPersonAccount
* @return R
*/
R
saveInfo
(
FddPersonAccount
fddPersonAccount
);
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/FddPersonAccountServiceImpl.java
View file @
c69027a0
...
...
@@ -86,27 +86,11 @@ public class FddPersonAccountServiceImpl extends ServiceImpl<FddPersonAccountMap
@Override
public
R
<
String
>
getPersonUnionIdUrl
(
FddPersonAccount
fddPersonAccount
)
throws
ApiException
{
long
mobileCount
=
this
.
count
(
Wrappers
.<
FddPersonAccount
>
query
().
lambda
().
eq
(
FddPersonAccount:
:
getMoblie
,
fddPersonAccount
.
getMoblie
())
.
eq
(
FddPersonAccount:
:
getSystemFlag
,
CommonConstants
.
ZERO_STRING
));
if
(
mobileCount
>
CommonConstants
.
ZERO_INT
){
return
R
.
failed
(
"手机号已存在"
);
}
long
idCardCount
=
this
.
count
(
Wrappers
.<
FddPersonAccount
>
query
().
lambda
().
eq
(
FddPersonAccount:
:
getIdCard
,
fddPersonAccount
.
getIdCard
())
.
eq
(
FddPersonAccount:
:
getSystemFlag
,
CommonConstants
.
ZERO_STRING
));
if
(
idCardCount
>
CommonConstants
.
ZERO_INT
){
return
R
.
failed
(
"身份证号已存在"
);
}
FddPersonAccount
entity
=
new
FddPersonAccount
();
entity
.
setIdCard
(
fddPersonAccount
.
getIdCard
());
entity
.
setName
(
fddPersonAccount
.
getName
());
entity
.
setMoblie
(
fddPersonAccount
.
getMoblie
());
entity
.
setSystemFlag
(
CommonConstants
.
ZERO_STRING
);
this
.
save
(
entity
);
//发送请求
GetPersonUnionIdUrlReq
req
=
new
GetPersonUnionIdUrlReq
();
req
.
setToken
(
fddUtil
.
getToken
());
req
.
setClientId
(
entity
.
getId
());
req
.
setClientId
(
fddPersonAccount
.
getId
());
req
.
setAuthScheme
(
CommonConstants
.
ZERO_INT
);
NoticeReq
notice
=
new
NoticeReq
();
//短信发送实名认证链接
...
...
@@ -131,7 +115,8 @@ public class FddPersonAccountServiceImpl extends ServiceImpl<FddPersonAccountMap
reqLogService
.
saveLog
(
Thread
.
currentThread
().
getStackTrace
()[
1
].
getClassName
(),
Thread
.
currentThread
().
getStackTrace
()[
1
].
getMethodName
(),
req
,
rsp
);
//校验参数
if
(
StringUtils
.
equals
(
rsp
.
getCode
(),
FddUtil
.
SUCCESS
))
{
entity
.
setRealMessageFlag
(
CommonConstants
.
ONE_STRING
);
fddPersonAccount
.
setRealMessageFlag
(
CommonConstants
.
ONE_STRING
);
baseMapper
.
updateById
(
fddPersonAccount
);
return
new
R
<>(
rsp
.
getData
().
getNextUrl
());
}
else
{
return
R
.
failed
(
rsp
.
getMsg
());
...
...
@@ -285,4 +270,20 @@ public class FddPersonAccountServiceImpl extends ServiceImpl<FddPersonAccountMap
return
new
R
<>(
fddCompanyInfoList
);
}
@Override
public
R
saveInfo
(
FddPersonAccount
fddPersonAccount
)
{
long
mobileCount
=
this
.
count
(
Wrappers
.<
FddPersonAccount
>
query
().
lambda
().
eq
(
FddPersonAccount:
:
getMoblie
,
fddPersonAccount
.
getMoblie
())
.
eq
(
FddPersonAccount:
:
getSystemFlag
,
CommonConstants
.
ZERO_STRING
));
if
(
mobileCount
>
CommonConstants
.
ZERO_INT
){
return
R
.
failed
(
"手机号已存在"
);
}
long
idCardCount
=
this
.
count
(
Wrappers
.<
FddPersonAccount
>
query
().
lambda
().
eq
(
FddPersonAccount:
:
getIdCard
,
fddPersonAccount
.
getIdCard
())
.
eq
(
FddPersonAccount:
:
getSystemFlag
,
CommonConstants
.
ZERO_STRING
));
if
(
idCardCount
>
CommonConstants
.
ZERO_INT
){
return
R
.
failed
(
"身份证号已存在"
);
}
baseMapper
.
insert
(
fddPersonAccount
);
return
R
.
ok
();
}
}
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeProjectServiceImpl.java
View file @
c69027a0
...
...
@@ -206,6 +206,22 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
}
TEmployeeInfo
tEmployeeInfoCompare
=
tEmployeeInfoMapper
.
selectById
(
tEmployeeInfo
.
getId
());
//获取项目和单位信息
TSettleDomain
tSettleDomain
=
tSettleDomainService
.
getOne
(
Wrappers
.<
TSettleDomain
>
query
().
lambda
()
.
eq
(
TSettleDomain:
:
getDepartNo
,
tEmployeeProject
.
getDeptNo
()).
eq
(
TSettleDomain:
:
getDeleteFlag
,
CommonConstants
.
STATUS_NORMAL
)
.
eq
(
TSettleDomain:
:
getStopFlag
,
CommonConstants
.
STATUS_NORMAL
));
if
(
Common
.
isNotNull
(
tSettleDomain
))
{
tEmployeeProject
.
setDeptId
(
tSettleDomain
.
getId
());
tEmployeeProject
.
setBusinessPrimaryType
(
tSettleDomain
.
getBusinessPrimaryType
());
tEmployeeProject
.
setBusinessSecondType
(
tSettleDomain
.
getBusinessSecondType
());
tEmployeeProject
.
setBusinessThirdType
(
tSettleDomain
.
getBusinessThirdType
());
TCustomerInfo
tCustomerInfo
=
tCustomerInfoMapper
.
selectById
(
tSettleDomain
.
getCustomerId
());
if
(
Common
.
isNotNull
(
tCustomerInfo
))
{
tEmployeeProject
.
setUnitId
(
tCustomerInfo
.
getId
());
tEmployeeProject
.
setUnitNo
(
tCustomerInfo
.
getCustomerCode
());
}
}
String
empNO
=
getEmpNo
(
tEmployeeProject
.
getDeptNo
());
tEmployeeProject
.
setEmpNo
(
empNO
);
tEmployeeProject
.
setEmpId
(
tEmployeeInfo
.
getId
());
...
...
yifu-archives/yifu-archives-biz/src/main/resources/mapper/FddPersonAccountMapper.xml
View file @
c69027a0
...
...
@@ -119,6 +119,6 @@
1=1
<include
refid=
"fddPersonAccount_where"
/>
</where>
GROUP BY a.
NAME
GROUP BY a.
ID_CARD ORDER BY a.CREATE_TIME desc
</select>
</mapper>
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