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
f80ba65d
Commit
f80ba65d
authored
Jan 05, 2024
by
huyuchen
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'MVP1.6.0' into develop
parents
c9ba39c0
648012a7
Show whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
23 additions
and
36 deletions
+23
-36
application.properties
...ifu-common-ldap/src/main/resources/application.properties
+2
-2
ldapConfig.properties
...yifu-common-ldap/src/main/resources/ldapConfig.properties
+3
-3
TStatisticsBonusServiceImpl.java
...yifu/salary/service/impl/TStatisticsBonusServiceImpl.java
+1
-1
TForecastLibraryMapper.java
...ud/plus/v1/yifu/social/mapper/TForecastLibraryMapper.java
+1
-1
TPaymentInfoMapper.java
.../cloud/plus/v1/yifu/social/mapper/TPaymentInfoMapper.java
+1
-1
TPaymentInfoServiceImpl.java
.../v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
+8
-21
application-dev.yml
...al/yifu-social-biz/src/main/resources/application-dev.yml
+1
-1
application-prd.yml
...al/yifu-social-biz/src/main/resources/application-prd.yml
+1
-1
application-test.yml
...l/yifu-social-biz/src/main/resources/application-test.yml
+1
-1
TForecastLibraryMapper.xml
...-biz/src/main/resources/mapper/TForecastLibraryMapper.xml
+2
-2
TPaymentInfoMapper.xml
...cial-biz/src/main/resources/mapper/TPaymentInfoMapper.xml
+2
-2
No files found.
yifu-common/yifu-common-ldap/src/main/resources/application.properties
View file @
f80ba65d
spring.ldap.urls
=
ldap://192.168.
0.240
:389
spring.ldap.urls
=
ldap://192.168.
1.65
:389
spring.ldap.username
=
cn=admin,dc=worfu,dc=com
spring.ldap.password
=
Y
ifu123456!
spring.ldap.password
=
y
ifu123456!
spring.ldap.base
=
dc=worfu,dc=com
\ No newline at end of file
yifu-common/yifu-common-ldap/src/main/resources/ldapConfig.properties
View file @
f80ba65d
ldap.url
=
192.168.
0.240
ldap.url
=
192.168.
1.65
ldap.port
=
389
ldap.userName
=
cn=admin,dc=worfu,dc=com
ldap.password
=
Yifu123ABC
!
ldap.password
=
yifu123456
!
ldap.dn
=
dc=worfu,dc=com
ldap.baseDn
=
ou=
\u7696\u
4FE1
\u
4EBA
\u
529B
\u
96C6
\u
56E2,ou=wanxin,dc=worfu,dc=com
\ No newline at end of file
ldap.baseDn
=
ou=
\u
5B89
\u
5FBD
\u7696\u
4FE1
\u
4EBA
\u
529B
\u
8D44
\u
6E90
\u
7BA1
\u7406\u6709\u9650\u
516C
\u
53F8,ou=wanxin,dc=worfu,dc=com
\ No newline at end of file
yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TStatisticsBonusServiceImpl.java
View file @
f80ba65d
...
...
@@ -288,7 +288,7 @@ public class TStatisticsBonusServiceImpl extends ServiceImpl<TStatisticsBonusMap
if
(
SalaryConstants
.
RELAY_SALARY_JAVA
.
equals
(
item
.
getJavaFiedName
()))
{
ySalary
=
ySalary
.
add
(
item
.
getSalaryMoney
());
}
if
(
item
.
getSettlementMonth
().
equals
(
DateUtil
.
get
Month
(
DateUtil
.
getCurrentDateTime
()
)))
{
if
(
item
.
getSettlementMonth
().
equals
(
DateUtil
.
get
YearAndMonth
(
LocalDateTime
.
now
(),
0
)))
{
//减除费用
if
(
SalaryConstants
.
COST_REDUCTION_JAVA
.
equals
(
item
.
getJavaFiedName
()))
{
costReductionList
.
add
(
item
.
getSalaryMoney
());
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/mapper/TForecastLibraryMapper.java
View file @
f80ba65d
...
...
@@ -83,7 +83,7 @@ public interface TForecastLibraryMapper extends BaseMapper<TForecastLibrary> {
**/
int
updatePushStatus
(
@Param
(
"idList"
)
List
<
String
>
idList
);
int
checkForecastChange
(
@Param
(
"idSet"
)
Set
<
String
>
idSet
);
List
<
String
>
checkForecastChange
(
@Param
(
"idSet"
)
Set
<
String
>
idSet
);
/**
* @param idSet
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/mapper/TPaymentInfoMapper.java
View file @
f80ba65d
...
...
@@ -208,7 +208,7 @@ public interface TPaymentInfoMapper extends BaseMapper<TPaymentInfo> {
* @Date: 2022/11/16 17:32
* @return: int
**/
int
checkPaymentChange
(
@Param
(
"idSet"
)
Set
<
String
>
idSet
);
List
<
String
>
checkPaymentChange
(
@Param
(
"idSet"
)
Set
<
String
>
idSet
);
/**
* @param idSet
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPaymentInfoServiceImpl.java
View file @
f80ba65d
...
...
@@ -3450,9 +3450,13 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
}
if
(!
idSet
.
isEmpty
())
{
// 查询是否允许划转缴费库、预估库 的 社保、公积金
boolean
flag
=
this
.
checkChange
(
idSet
);
if
(!
flag
)
{
return
R
.
failed
(
"社保公积金已被结算,请先退回并删除工资表!"
);
List
<
String
>
settleList
=
baseMapper
.
checkPaymentChange
(
idSet
);
if
(
settleList
.
isEmpty
())
{
settleList
=
tForecastLibraryMapper
.
checkForecastChange
(
idSet
);
}
if
(!
settleList
.
isEmpty
())
{
String
idStr
=
Common
.
ListToStr
(
settleList
,
","
);
return
R
.
failed
(
idStr
+
"的社保公积金已被结算,请先退回并删除工资表!"
);
}
// 1划转缴费率、预估库的项目(社保公积金)
...
...
@@ -3585,23 +3589,6 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
return
true
;
}
/**
* @param idSet
* @Description: 校验是否存在已结算薪资的数据
* @Author: hgw
* @Date: 2022/11/16 17:30
* @return: boolean
**/
private
boolean
checkChange
(
Set
<
String
>
idSet
)
{
int
settleCount
=
baseMapper
.
checkPaymentChange
(
idSet
);
if
(
settleCount
==
0
)
{
settleCount
=
tForecastLibraryMapper
.
checkForecastChange
(
idSet
);
return
settleCount
==
0
;
}
else
{
return
false
;
}
}
private
Map
<
String
,
TSettleDomainSelectVo
>
getSelectVoMap
()
{
R
<
TSettleDomainListVo
>
settleDomainR
=
archivesDaprUtil
.
selectAllSettleDomainSelectVos
();
Map
<
String
,
TSettleDomainSelectVo
>
mapSelectVo
=
null
;
...
...
yifu-social/yifu-social-biz/src/main/resources/application-dev.yml
View file @
f80ba65d
...
...
@@ -32,7 +32,7 @@ spring:
type
:
CLASS_BASED
tables
:
t_payment_info
:
actual-data-nodes
:
ds0.t_payment_info_20$->{17..2
3
}
actual-data-nodes
:
ds0.t_payment_info_20$->{17..2
4
}
key-generate-strategy
:
column
:
ID
key-generator-name
:
snowflake
...
...
yifu-social/yifu-social-biz/src/main/resources/application-prd.yml
View file @
f80ba65d
...
...
@@ -32,7 +32,7 @@ spring:
type
:
CLASS_BASED
tables
:
t_payment_info
:
actual-data-nodes
:
ds0.t_payment_info_20$->{17..2
3
}
actual-data-nodes
:
ds0.t_payment_info_20$->{17..2
4
}
key-generate-strategy
:
column
:
ID
key-generator-name
:
snowflake
...
...
yifu-social/yifu-social-biz/src/main/resources/application-test.yml
View file @
f80ba65d
...
...
@@ -32,7 +32,7 @@ spring:
type
:
CLASS_BASED
tables
:
t_payment_info
:
actual-data-nodes
:
ds0.t_payment_info_20$->{17..2
3
}
actual-data-nodes
:
ds0.t_payment_info_20$->{17..2
4
}
key-generate-strategy
:
column
:
ID
key-generator-name
:
snowflake
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TForecastLibraryMapper.xml
View file @
f80ba65d
...
...
@@ -710,8 +710,8 @@
</update>
<!-- 校验预估库库是否有已结算的数据,有,则不允许ekp费用划转 -->
<select
id=
"checkForecastChange"
resultType=
"java.lang.
Integer
"
>
select
count(1)
from t_forecast_library p
<select
id=
"checkForecastChange"
resultType=
"java.lang.
String
"
>
select
p.EMP_IDCARD
from t_forecast_library p
where (p.SALARY_SOCIAL_FLAG = '1' or p.SALARY_FUND_FLAG = '1') and p.id in
<foreach
item=
"item"
index=
"index"
collection=
"idSet"
open=
"("
separator=
","
close=
")"
>
#{item}
...
...
yifu-social/yifu-social-biz/src/main/resources/mapper/TPaymentInfoMapper.xml
View file @
f80ba65d
...
...
@@ -2433,8 +2433,8 @@
</update>
<!-- 校验缴费库是否有已结算的数据,有,则不允许ekp费用划转 -->
<select
id=
"checkPaymentChange"
resultType=
"java.lang.
Integer
"
>
select
count(1)
from t_payment_info p
<select
id=
"checkPaymentChange"
resultType=
"java.lang.
String
"
>
select
p.EMP_IDCARD
from t_payment_info p
where (p.SALARY_SOCIAL_FLAG = '1' or p.SALARY_FUND_FLAG = '1') and p.id in
<foreach
item=
"item"
index=
"index"
collection=
"idSet"
open=
"("
separator=
","
close=
")"
>
#{item}
...
...
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