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
9dd66fa8
Commit
9dd66fa8
authored
Dec 14, 2022
by
fangxinjiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MVP1.2:合同审核添加创建人条件
parent
9482b66c
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
58 additions
and
31 deletions
+58
-31
TEmployeeProjectServiceImpl.java
...fu/archives/service/impl/TEmployeeProjectServiceImpl.java
+7
-5
ChecksConstants.java
...om/yifu/cloud/plus/v1/check/constant/ChecksConstants.java
+3
-1
ChecksUtil.java
...n/java/com/yifu/cloud/plus/v1/check/utils/ChecksUtil.java
+29
-6
messages_zh_CN.properties
...on-core/src/main/resources/i18n/messages_zh_CN.properties
+2
-0
daprConfig.properties
...yifu-common-dapr/src/main/resources/daprConfig.properties
+13
-15
TSalaryStandardMapper.xml
...y-biz/src/main/resources/mapper/TSalaryStandardMapper.xml
+4
-4
No files found.
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeProjectServiceImpl.java
View file @
9dd66fa8
...
@@ -396,14 +396,15 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
...
@@ -396,14 +396,15 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
.
eq
(
TEmployeeContractInfo:
:
getEmpIdcard
,
tEmployeeProject
.
getEmpIdcard
())
.
eq
(
TEmployeeContractInfo:
:
getEmpIdcard
,
tEmployeeProject
.
getEmpIdcard
())
.
eq
(
TEmployeeContractInfo:
:
getIsObsolete
,
CommonConstants
.
ZERO_STRING
)
.
eq
(
TEmployeeContractInfo:
:
getIsObsolete
,
CommonConstants
.
ZERO_STRING
)
.
eq
(
TEmployeeContractInfo:
:
getDeleteFlag
,
CommonConstants
.
ZERO_STRING
)
.
eq
(
TEmployeeContractInfo:
:
getDeleteFlag
,
CommonConstants
.
ZERO_STRING
)
.
and
(
obj
->
obj
.
eq
(
TEmployeeContractInfo:
:
getInUse
,
CommonConstants
.
ZERO_STRING
))
.
eq
(
TEmployeeContractInfo:
:
getDeptNo
,
tEmployeeProject
.
getDeptNo
())
.
and
(
obj
->
obj
.
eq
(
TEmployeeContractInfo:
:
getInUse
,
CommonConstants
.
ZERO_STRING
)
.
or
()
.
or
()
.
eq
(
TEmployeeContractInfo:
:
getAuditStatus
,
CommonConstants
.
ZERO_STRING
)
.
eq
(
TEmployeeContractInfo:
:
getAuditStatus
,
CommonConstants
.
ZERO_STRING
)
.
or
()
.
or
()
.
eq
(
TEmployeeContractInfo:
:
getAuditStatus
,
CommonConstants
.
ONE_STRING
)
.
eq
(
TEmployeeContractInfo:
:
getAuditStatus
,
CommonConstants
.
ONE_STRING
)
)
);
);
if
(
contractCount
>
CommonConstants
.
ZERO_INT
){
if
(
contractCount
>
CommonConstants
.
ZERO_INT
){
return
R
.
failed
(
ErrorCodes
.
ARCHIVES_PROJECT_CHANGE_CONTRACT_EXIST
);
return
R
.
failed
(
MsgUtils
.
getMessage
(
ErrorCodes
.
ARCHIVES_PROJECT_CHANGE_CONTRACT_EXIST
)
);
}
}
tEmployeeProject
.
setProjectStatus
(
CommonConstants
.
dingleDigitIntArray
[
1
]);
tEmployeeProject
.
setProjectStatus
(
CommonConstants
.
dingleDigitIntArray
[
1
]);
tEmployeeProject
.
setLeaveTime
(
LocalDateTime
.
now
());
tEmployeeProject
.
setLeaveTime
(
LocalDateTime
.
now
());
...
@@ -582,11 +583,12 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
...
@@ -582,11 +583,12 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
.
eq
(
TEmployeeContractInfo:
:
getEmpIdcard
,
tEmployeeProject
.
getEmpIdcard
())
.
eq
(
TEmployeeContractInfo:
:
getEmpIdcard
,
tEmployeeProject
.
getEmpIdcard
())
.
eq
(
TEmployeeContractInfo:
:
getIsObsolete
,
CommonConstants
.
ZERO_STRING
)
.
eq
(
TEmployeeContractInfo:
:
getIsObsolete
,
CommonConstants
.
ZERO_STRING
)
.
eq
(
TEmployeeContractInfo:
:
getDeleteFlag
,
CommonConstants
.
ZERO_STRING
)
.
eq
(
TEmployeeContractInfo:
:
getDeleteFlag
,
CommonConstants
.
ZERO_STRING
)
.
and
(
obj
->
obj
.
eq
(
TEmployeeContractInfo:
:
getInUse
,
CommonConstants
.
ZERO_STRING
))
.
eq
(
TEmployeeContractInfo:
:
getDeptNo
,
tEmployeeProject
.
getDeptNo
())
.
and
(
obj
->
obj
.
eq
(
TEmployeeContractInfo:
:
getInUse
,
CommonConstants
.
ZERO_STRING
)
.
or
()
.
or
()
.
eq
(
TEmployeeContractInfo:
:
getAuditStatus
,
CommonConstants
.
ZERO_STRING
)
.
eq
(
TEmployeeContractInfo:
:
getAuditStatus
,
CommonConstants
.
ZERO_STRING
)
.
or
()
.
or
()
.
eq
(
TEmployeeContractInfo:
:
getAuditStatus
,
CommonConstants
.
ONE_STRING
)
.
eq
(
TEmployeeContractInfo:
:
getAuditStatus
,
CommonConstants
.
ONE_STRING
)
)
);
);
if
(
contractCount
>
CommonConstants
.
ZERO_INT
){
if
(
contractCount
>
CommonConstants
.
ZERO_INT
){
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
errorMessage
+
errorMessageList
.
add
(
new
ErrorMessage
(
excel
.
getRowIndex
(),
errorMessage
+
...
...
yifu-check/yifu-check-api/src/main/java/com/yifu/cloud/plus/v1/check/constant/ChecksConstants.java
View file @
9dd66fa8
...
@@ -8,7 +8,9 @@ package com.yifu.cloud.plus.v1.check.constant;
...
@@ -8,7 +8,9 @@ package com.yifu.cloud.plus.v1.check.constant;
*/
*/
public
interface
ChecksConstants
{
public
interface
ChecksConstants
{
String
NACOS_CHECK_CONFIG_ERROR
=
"nacos中checks.yaml的配置canCheck未开启!"
;
String
NACOS_CHECK_CONFIG_ERROR
=
"校验服务验证开关关闭!"
;
String
CHECK_CONFIG_ACCESS
=
"校验服务验证关闭,自动放行!"
;
String
CODE
=
"code"
;
String
CODE
=
"code"
;
...
...
yifu-check/yifu-check-api/src/main/java/com/yifu/cloud/plus/v1/check/utils/ChecksUtil.java
View file @
9dd66fa8
...
@@ -13,6 +13,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
...
@@ -13,6 +13,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
com.yifu.cloud.plus.v1.yifu.common.core.util.R
;
import
java.util.HashMap
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
/**
/**
...
@@ -39,8 +40,10 @@ public class ChecksUtil {
...
@@ -39,8 +40,10 @@ public class ChecksUtil {
// 1.调用身份信息校验api
// 1.调用身份信息校验api
checkIdCardMethod
(
checkIdCard
);
checkIdCardMethod
(
checkIdCard
);
}
else
{
}
else
{
checkIdCard
.
setIsTrue
(
CommonConstants
.
ZERO_INT
);
//checkIdCard.setIsTrue(CommonConstants.ZERO_INT);
checkIdCard
.
setReason
(
ChecksConstants
.
NACOS_CHECK_CONFIG_ERROR
);
//checkIdCard.setReason(ChecksConstants.NACOS_CHECK_CONFIG_ERROR);
checkIdCard
.
setIsTrue
(
CommonConstants
.
ONE_INT
);
checkIdCard
.
setReason
(
ChecksConstants
.
CHECK_CONFIG_ACCESS
);
}
}
}
}
/**
/**
...
@@ -52,10 +55,23 @@ public class ChecksUtil {
...
@@ -52,10 +55,23 @@ public class ChecksUtil {
public
static
R
<
Map
<
String
,
TCheckMobile
>>
checkMobile
(
String
mobiles
,
boolean
canCheck
)
{
public
static
R
<
Map
<
String
,
TCheckMobile
>>
checkMobile
(
String
mobiles
,
boolean
canCheck
)
{
Map
<
String
,
TCheckMobile
>
checkMobiles
=
new
HashMap
<>();
Map
<
String
,
TCheckMobile
>
checkMobiles
=
new
HashMap
<>();
if
(
canCheck
)
{
if
(
canCheck
)
{
// 1.调用
身份
信息校验api
// 1.调用
手机
信息校验api
return
checkMobileMethod
(
mobiles
,
checkMobiles
);
return
checkMobileMethod
(
mobiles
,
checkMobiles
);
}
else
{
}
else
{
return
R
.
failed
(
ChecksConstants
.
NACOS_CHECK_CONFIG_ERROR
);
TCheckMobile
checkMobile
;
List
<
String
>
mobileList
=
Common
.
initStrToList
(
mobiles
,
CommonConstants
.
COMMA_STRING
);
Map
<
String
,
TCheckMobile
>
resMap
=
new
HashMap
<>();
if
(
Common
.
isNotNull
(
mobileList
)){
for
(
String
m:
mobileList
){
checkMobile
=
new
TCheckMobile
();
checkMobile
.
setMobile
(
m
);
checkMobile
.
setStatus
(
CommonConstants
.
ONE_STRING
);
checkMobile
.
setType
(
CommonConstants
.
ONE_STRING
);
checkMobile
.
setMessage
(
ChecksConstants
.
CHECK_CONFIG_ACCESS
);
resMap
.
put
(
m
,
checkMobile
);
}
}
return
R
.
ok
(
resMap
);
}
}
}
}
/**
/**
...
@@ -67,10 +83,17 @@ public class ChecksUtil {
...
@@ -67,10 +83,17 @@ public class ChecksUtil {
**/
**/
public
static
R
<
TCheckBankNo
>
checkBankNoTwo
(
String
name
,
String
cardNo
,
boolean
canCheck
)
{
public
static
R
<
TCheckBankNo
>
checkBankNoTwo
(
String
name
,
String
cardNo
,
boolean
canCheck
)
{
if
(
canCheck
)
{
if
(
canCheck
)
{
// 1.调用
身份
信息校验api
// 1.调用
银行卡
信息校验api
return
checkBankNoTwoMethod
(
name
,
cardNo
);
return
checkBankNoTwoMethod
(
name
,
cardNo
);
}
else
{
}
else
{
return
R
.
failed
(
ChecksConstants
.
NACOS_CHECK_CONFIG_ERROR
);
TCheckBankNo
checkBankNo
=
new
TCheckBankNo
();
checkBankNo
.
setBankNo
(
cardNo
);
checkBankNo
.
setName
(
name
);
checkBankNo
.
setMessage
(
ChecksConstants
.
CHECK_CONFIG_ACCESS
);
checkBankNo
.
setResult
(
"01"
);
checkBankNo
.
setType
(
CommonConstants
.
ONE_STRING
);
checkBankNo
.
setRemark
(
ChecksConstants
.
CHECK_CONFIG_ACCESS
);
return
R
.
ok
(
checkBankNo
);
}
}
}
}
...
...
yifu-common/yifu-common-core/src/main/resources/i18n/messages_zh_CN.properties
View file @
9dd66fa8
...
@@ -97,6 +97,8 @@ archives.project.emp.not.exist=\u8BE5\u4EBA\u5458\u65E0\u5BF9\u5E94\u7684\u9879\
...
@@ -97,6 +97,8 @@ archives.project.emp.not.exist=\u8BE5\u4EBA\u5458\u65E0\u5BF9\u5E94\u7684\u9879\
archives.project.change.not.exist
=
\u
4EBA
\u5458\u5728\u
8BE5
\u9879\u
76EE
\u
4E0B
\u
5B58
\u5728\u
8FDB
\u
884C
\u
4E2D/
\u
672A
\u
5B8C
\u
7ED3
\u7684\u
670D
\u
52A1
archives.project.change.not.exist
=
\u
4EBA
\u5458\u5728\u
8BE5
\u9879\u
76EE
\u
4E0B
\u
5B58
\u5728\u
8FDB
\u
884C
\u
4E2D/
\u
672A
\u
5B8C
\u
7ED3
\u7684\u
670D
\u
52A1
archives.project.change.contract.exist
=
\u
4EBA
\u5458\u5728\u
8BE5
\u9879\u
76EE
\u
4E0B
\u
5B58
\u5728\u
5B58
\u5728\u5728\u7528\u6216\u
5F85
\u
5BA1
\u6838\u3001\u
5F85
\u
63D0
\u
4EA4
\u7684\u5408\u
540C
\u
FF0C
\u
4E0D
\u5141\u
8BB8
\u
51CF
\u9879
archives.project.emp.lose.fee.not.empty
=
\u
4E0D
\u
826F
\u
8BB0
\u
5F55
\u
8D39
\u7528\u
635F
\u5931\u
548C
\u5176\u
4ED6
\u
635F
\u5931\u
4E0D
\u
53EF
\u
540C
\u
65F6
\u
4E3A
\u
7A7A
archives.project.emp.lose.fee.not.empty
=
\u
4E0D
\u
826F
\u
8BB0
\u
5F55
\u
8D39
\u7528\u
635F
\u5931\u
548C
\u5176\u
4ED6
\u
635F
\u5931\u
4E0D
\u
53EF
\u
540C
\u
65F6
\u
4E3A
\u
7A7A
qt.project.change.not.exist
=
\u
4EBA
\u5458\u5728\u
539F
\u9879\u
76EE
\u
4E2D
\u
5B58
\u5728\u5728\u9014\u7684\u
670D
\u
52A1
\u
FF0C
\u
8BF7
\u5148\u
7EC8
\u
6B62
\u
540E
\u
FF0C
\u
518D
\u
8FDB
\u
884C
\u5212\u
8F6C
qt.project.change.not.exist
=
\u
4EBA
\u5458\u5728\u
539F
\u9879\u
76EE
\u
4E2D
\u
5B58
\u5728\u5728\u9014\u7684\u
670D
\u
52A1
\u
FF0C
\u
8BF7
\u5148\u
7EC8
\u
6B62
\u
540E
\u
FF0C
\u
518D
\u
8FDB
\u
884C
\u5212\u
8F6C
...
...
yifu-common/yifu-common-dapr/src/main/resources/daprConfig.properties
View file @
9dd66fa8
#\u6D4B\u8BD5\u73AF\u5883-\u7BA1\u7406\u540E\u53F0
dapr.upms.appUrl
=
http://localhost:3500/v1.0/invoke/
dapr.upms.appUrl
=
http://yifu-upms.qas-mvp.svc.cluster.local:3500/v1.0/invoke/
dapr.upms.appId
=
yifu-upms
dapr.upms.appId
=
yifu-upms
#\u6D4B\u8BD5\u73AF\u5883-\u6821\u9A8C\u670D\u52A1
dapr.check.appUrl
=
http://yifu-check.qas-mvp.svc.cluster.local:3500/v1.0/invoke/
#\u6D4B\u8BD5\u73AF\u5883
#dapr.check.appUrl=http://yifu-check.qas-mvp.svc.cluster.local:3500/v1.0/invoke/
#\u672C\u5730
#\u672C\u5730
#dapr.check.appUrl=http://localhost:3502
/v1.0/invoke/
dapr.check.appUrl
=
http://localhost:3507
/v1.0/invoke/
dapr.check.appId
=
yifu-check
dapr.check.appId
=
yifu-check
#\u6D4B\u8BD5\u73AF\u5883-\u6863\u6848\u670D\u52A1
dapr.archives.appUrl
=
http://yifu-archives.qas-mvp.svc.cluster.local:3500/v1.0/invoke/
#\u672C\u5730
dapr.archives.appUrl
=
http://localhost:3508/v1.0/invoke/
dapr.archives.appId
=
yifu-archives
dapr.archives.appId
=
yifu-archives
dapr.insurances.appUrl
=
http://yifu-auth.qas-mvp.svc.cluster.local:3500/v1.0/invoke/
dapr.insurances.appId
=
yifu-insurances
#\u6D4B\u8BD5\u73AF\u5883-\u85AA\u8D44\u670D\u52A1
dapr.social.appUrl
=
http://localhost:3510/v1.0/invoke/
dapr.salary.appUrl
=
http://yifu-salary.qas-mvp.svc.cluster.local:3500/v1.0/invoke/
dapr.social.appId
=
yifu-social
dapr.salary.appId
=
yifu-salary
#\u6D4B\u8BD5\u73AF\u5883-\u793E\u4FDD\u670D\u52A1
#\u672C\u5730
dapr.social.appUrl
=
http://yifu-social.qas-mvp.svc.cluster.local:3500/v1.0/invoke/
dapr.mail.appUrl
=
http://localhost:3524/v1.0/invoke/
dapr.social.appId
=
yifu-social
dapr.mail.appId
=
yifu-mail
\ No newline at end of file
yifu-salary/yifu-salary-biz/src/main/resources/mapper/TSalaryStandardMapper.xml
View file @
9dd66fa8
...
@@ -250,11 +250,11 @@
...
@@ -250,11 +250,11 @@
<if
test=
"tSalaryStandard.createName != null and tSalaryStandard.createName.trim() != ''"
>
<if
test=
"tSalaryStandard.createName != null and tSalaryStandard.createName.trim() != ''"
>
AND a.CREATE_NAME = #{tSalaryStandard.createName}
AND a.CREATE_NAME = #{tSalaryStandard.createName}
</if>
</if>
<if
test=
"t
DispatchInfo
.createTimeStart != null"
>
<if
test=
"t
SalaryStandard
.createTimeStart != null"
>
AND a.CREATE_TIME
<![CDATA[ >= ]]>
#{t
DispatchInfo
.createTimeStart}
AND a.CREATE_TIME
<![CDATA[ >= ]]>
#{t
SalaryStandard
.createTimeStart}
</if>
</if>
<if
test=
"t
DispatchInfo
.createTimeEnd != null"
>
<if
test=
"t
SalaryStandard
.createTimeEnd != null"
>
AND a.CREATE_TIME
<![CDATA[ <= ]]>
#{t
DispatchInfo
.createTimeEnd}
AND a.CREATE_TIME
<![CDATA[ <= ]]>
#{t
SalaryStandard
.createTimeEnd}
</if>
</if>
<if
test=
"tSalaryStandard.updateBy != null and tSalaryStandard.updateBy.trim() != ''"
>
<if
test=
"tSalaryStandard.updateBy != null and tSalaryStandard.updateBy.trim() != ''"
>
AND a.UPDATE_BY = #{tSalaryStandard.updateBy}
AND a.UPDATE_BY = #{tSalaryStandard.updateBy}
...
...
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