Commit 282df9c1 authored by huyuchen's avatar huyuchen

Merge remote-tracking branch 'origin/master'

parents 78d323b8 99e50344
...@@ -47,7 +47,7 @@ public class AsyncConfig implements AsyncConfigurer { ...@@ -47,7 +47,7 @@ public class AsyncConfig implements AsyncConfigurer {
* <!-- 当线程数>=corePoolSize,且任务队列已满时。线程池会创建新线程来处理任务 --> * <!-- 当线程数>=corePoolSize,且任务队列已满时。线程池会创建新线程来处理任务 -->
* <!-- 当线程数=maxPoolSize,且任务队列已满时,线程池会拒绝处理任务而抛出异常,异常见下 * <!-- 当线程数=maxPoolSize,且任务队列已满时,线程池会拒绝处理任务而抛出异常,异常见下
*/ */
taskExecutor.setMaxPoolSize(50); taskExecutor.setMaxPoolSize(25);
/** /**
* <!-- 缓存队列(阻塞队列)当核心线程数达到最大时,新任务会放在队列中排队等待执行 --> * <!-- 缓存队列(阻塞队列)当核心线程数达到最大时,新任务会放在队列中排队等待执行 -->
*/ */
......
...@@ -723,7 +723,7 @@ public class ExcelUtil <T> implements Serializable { ...@@ -723,7 +723,7 @@ public class ExcelUtil <T> implements Serializable {
} else { } else {
return errorInfo(attr, "_必须为数字且最多两位小数", i); return errorInfo(attr, "_必须为数字且最多两位小数", i);
} }
} else if (attr.min() == 0) { }/* else if (attr.min() == 0) {
if (Common.isNumber(c)) { if (Common.isNumber(c)) {
if (attr.isFloat()){ if (attr.isFloat()){
if (Float.valueOf(c).compareTo(attr.min()) < CommonConstants.ZERO_INT) { if (Float.valueOf(c).compareTo(attr.min()) < CommonConstants.ZERO_INT) {
...@@ -731,7 +731,7 @@ public class ExcelUtil <T> implements Serializable { ...@@ -731,7 +731,7 @@ public class ExcelUtil <T> implements Serializable {
} }
} }
} }
} }*/
} }
return null; return null;
} }
......
...@@ -1201,11 +1201,14 @@ ...@@ -1201,11 +1201,14 @@
FROM FROM
t_insurance_detail t_insurance_detail
where 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=")"> <foreach item="item" index="index" collection="idCardList" open="(" separator="," close=")">
#{item} #{item}
</foreach> </foreach>
<if test="idList != null"> </if>
<if test="idList != null and idList.size > 0">
AND id not in AND id not in
<foreach item="item" index="index" collection="idList" open="(" separator="," close=")"> <foreach item="item" index="index" collection="idList" open="(" separator="," close=")">
#{item} #{item}
......
...@@ -83,6 +83,7 @@ public interface TSocialFundInfoMapper extends BaseMapper<TSocialFundInfo> { ...@@ -83,6 +83,7 @@ public interface TSocialFundInfoMapper extends BaseMapper<TSocialFundInfo> {
**/ **/
void updateFundInfo(@Param("infoVo") UpdateSocialFoundVo infoVo); void updateFundInfo(@Param("infoVo") UpdateSocialFoundVo infoVo);
int selectSocialFoundByContract(@Param("tSocialFundInfo") TSocialFundInfo tSocialFundInfo); String selectSocialByContract(@Param("tSocialFundInfo") TSocialFundInfo tSocialFundInfo);
String selectFundByContract(@Param("tSocialFundInfo") TSocialFundInfo tSocialFundInfo);
} }
...@@ -794,7 +794,14 @@ public class TSocialFundInfoServiceImpl extends ServiceImpl<TSocialFundInfoMappe ...@@ -794,7 +794,14 @@ public class TSocialFundInfoServiceImpl extends ServiceImpl<TSocialFundInfoMappe
@Override @Override
public int selectSocialFoundByContract(TSocialFundInfo sf) { 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
...@@ -1083,22 +1083,19 @@ ...@@ -1083,22 +1083,19 @@
</update> </update>
<!--获取count,合同使用--> <!--获取count,合同使用-->
<select id="selectSocialFoundByContract" resultType="java.lang.Integer"> <select id="selectSocialByContract" resultType="java.lang.String">
select count(1) from SELECT
(SELECT HANDLE_STATUS
a.EMP_IDCARD,a.HANDLE_STATUS social_status
FROM t_social_info a 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 where a.EMP_IDCARD = #{tSocialFundInfo.empIdcard} and a.SETTLE_DOMAIN = #{tSocialFundInfo.settleDomain} ORDER BY a.CREATE_TIME desc limit 1
left join </select>
(SELECT
a.EMP_IDCARD,a.HANDLE_STATUS fund_status <!--获取count,合同使用-->
<select id="selectFundByContract" resultType="java.lang.String">
SELECT
HANDLE_STATUS
FROM t_provident_fund a 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 where a.EMP_IDCARD = #{tSocialFundInfo.empIdcard} and a.SETTLE_DOMAIN = #{tSocialFundInfo.settleDomain} ORDER BY a.CREATE_TIME desc limit 1
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> </select>
</mapper> </mapper>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment