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
282df9c1
Commit
282df9c1
authored
Dec 02, 2022
by
huyuchen
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/master'
parents
78d323b8
99e50344
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
31 additions
and
23 deletions
+31
-23
AsyncConfig.java
...fu/cloud/plus/v1/yifu/common/core/config/AsyncConfig.java
+1
-1
ExcelUtil.java
...m/yifu/cloud/plus/v1/yifu/common/core/util/ExcelUtil.java
+2
-2
TInsuranceDetailMapper.xml
...in/resources/mapper/insurances/TInsuranceDetailMapper.xml
+5
-2
TSocialFundInfoMapper.java
...oud/plus/v1/yifu/social/mapper/TSocialFundInfoMapper.java
+2
-1
TSocialFundInfoServiceImpl.java
.../yifu/social/service/impl/TSocialFundInfoServiceImpl.java
+8
-1
TSocialFundInfoMapper.xml
...l-biz/src/main/resources/mapper/TSocialFundInfoMapper.xml
+13
-16
No files found.
yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/config/AsyncConfig.java
View file @
282df9c1
...
...
@@ -47,7 +47,7 @@ public class AsyncConfig implements AsyncConfigurer {
* <!-- 当线程数>=corePoolSize,且任务队列已满时。线程池会创建新线程来处理任务 -->
* <!-- 当线程数=maxPoolSize,且任务队列已满时,线程池会拒绝处理任务而抛出异常,异常见下
*/
taskExecutor
.
setMaxPoolSize
(
50
);
taskExecutor
.
setMaxPoolSize
(
25
);
/**
* <!-- 缓存队列(阻塞队列)当核心线程数达到最大时,新任务会放在队列中排队等待执行 -->
*/
...
...
yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/util/ExcelUtil.java
View file @
282df9c1
...
...
@@ -723,7 +723,7 @@ public class ExcelUtil <T> implements Serializable {
}
else
{
return
errorInfo
(
attr
,
"_必须为数字且最多两位小数"
,
i
);
}
}
else
if
(
attr
.
min
()
==
0
)
{
}
/*
else if (attr.min() == 0) {
if (Common.isNumber(c)) {
if (attr.isFloat()){
if (Float.valueOf(c).compareTo(attr.min()) < CommonConstants.ZERO_INT) {
...
...
@@ -731,7 +731,7 @@ public class ExcelUtil <T> implements Serializable {
}
}
}
}
}
*/
}
return
null
;
}
...
...
yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsuranceDetailMapper.xml
View file @
282df9c1
...
...
@@ -1201,11 +1201,14 @@
FROM
t_insurance_detail
where
DELETE_FLAG = 0 AND EMP_IDCARD_NO in
DELETE_FLAG = 0
<if
test=
"idCardList != null and idCardList.size > 0"
>
AND EMP_IDCARD_NO in
<foreach
item=
"item"
index=
"index"
collection=
"idCardList"
open=
"("
separator=
","
close=
")"
>
#{item}
</foreach>
<if
test=
"idList != null"
>
</if>
<if
test=
"idList != null and idList.size > 0"
>
AND id not in
<foreach
item=
"item"
index=
"index"
collection=
"idList"
open=
"("
separator=
","
close=
")"
>
#{item}
...
...
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/mapper/TSocialFundInfoMapper.java
View file @
282df9c1
...
...
@@ -83,6 +83,7 @@ public interface TSocialFundInfoMapper extends BaseMapper<TSocialFundInfo> {
**/
void
updateFundInfo
(
@Param
(
"infoVo"
)
UpdateSocialFoundVo
infoVo
);
int
selectSocialFoundByContract
(
@Param
(
"tSocialFundInfo"
)
TSocialFundInfo
tSocialFundInfo
);
String
selectSocialByContract
(
@Param
(
"tSocialFundInfo"
)
TSocialFundInfo
tSocialFundInfo
);
String
selectFundByContract
(
@Param
(
"tSocialFundInfo"
)
TSocialFundInfo
tSocialFundInfo
);
}
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TSocialFundInfoServiceImpl.java
View file @
282df9c1
...
...
@@ -794,7 +794,14 @@ public class TSocialFundInfoServiceImpl extends ServiceImpl<TSocialFundInfoMappe
@Override
public
int
selectSocialFoundByContract
(
TSocialFundInfo
sf
)
{
return
baseMapper
.
selectSocialFoundByContract
(
sf
);
String
socials
=
baseMapper
.
selectSocialByContract
(
sf
);
String
funds
=
baseMapper
.
selectFundByContract
(
sf
);
if
((
Common
.
isEmpty
(
socials
)
&&
Common
.
isNotNull
(
funds
)
&&
CommonConstants
.
THREE_STRING
.
equals
(
funds
))
||
(
Common
.
isEmpty
(
funds
)
&&
Common
.
isNotNull
(
socials
)
&&
CommonConstants
.
THREE_STRING
.
equals
(
socials
))
||
(
Common
.
isNotNull
(
socials
)
&&
Common
.
isNotNull
(
funds
)
&&
CommonConstants
.
THREE_STRING
.
equals
(
socials
)
&&
CommonConstants
.
THREE_STRING
.
equals
(
funds
)))
{
return
CommonConstants
.
ONE_INT
;
}
return
CommonConstants
.
ZERO_INT
;
}
}
\ No newline at end of file
yifu-social/yifu-social-biz/src/main/resources/mapper/TSocialFundInfoMapper.xml
View file @
282df9c1
...
...
@@ -1083,22 +1083,19 @@
</update>
<!--获取count,合同使用-->
<select
id=
"selectSocialFoundByContract"
resultType=
"java.lang.Integer"
>
select count(1) from
(SELECT
a.EMP_IDCARD,a.HANDLE_STATUS social_status
FROM t_social_info a
where a.EMP_IDCARD = #{tSocialFundInfo.empIdcard} and a.SETTLE_DOMAIN = #{tSocialFundInfo.settleDomain} ORDER BY a.CREATE_TIME desc limit 1) a
left join
(SELECT
a.EMP_IDCARD,a.HANDLE_STATUS fund_status
FROM t_provident_fund a
where a.EMP_IDCARD = #{tSocialFundInfo.empIdcard} and a.SETTLE_DOMAIN = #{tSocialFundInfo.settleDomain} ORDER BY a.CREATE_TIME desc limit 1) b
on a.EMP_IDCARD=b.EMP_IDCARD
where
(a.social_status='3' and b.fund_status='3' )
or (a.social_status='3' and b.fund_status is null )
or (a.social_status is null and b.fund_status ='3' )
<select
id=
"selectSocialByContract"
resultType=
"java.lang.String"
>
SELECT
HANDLE_STATUS
FROM t_social_info a
where a.EMP_IDCARD = #{tSocialFundInfo.empIdcard} and a.SETTLE_DOMAIN = #{tSocialFundInfo.settleDomain} ORDER BY a.CREATE_TIME desc limit 1
</select>
<!--获取count,合同使用-->
<select
id=
"selectFundByContract"
resultType=
"java.lang.String"
>
SELECT
HANDLE_STATUS
FROM t_provident_fund a
where a.EMP_IDCARD = #{tSocialFundInfo.empIdcard} and a.SETTLE_DOMAIN = #{tSocialFundInfo.settleDomain} ORDER BY a.CREATE_TIME desc limit 1
</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