Commit dcca8f44 authored by zhaji's avatar zhaji

Merge branch 'develop' into feature-zhaji

parents 211481e8 42fa4c4a
...@@ -1693,11 +1693,15 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap ...@@ -1693,11 +1693,15 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
} }
if (Common.isNotNull(library.getId())) { if (Common.isNotNull(library.getId())) {
baseMapper.updateById(library); baseMapper.updateById(library);
isSaveAndUpdate = true;
} else { } else {
library.setCreateTime(LocalDateTime.now()); if (BigDecimal.ZERO.compareTo(BigDecimalUtils.isNullToZero(library.getUnitSocialSum())) != CommonConstants.ZERO_INT
baseMapper.insert(library); || BigDecimal.ZERO.compareTo(BigDecimalUtils.isNullToZero(library.getUnitFundSum())) != CommonConstants.ZERO_INT) {
library.setCreateTime(LocalDateTime.now());
baseMapper.insert(library);
isSaveAndUpdate = true;
}
} }
isSaveAndUpdate = true;
} }
if (isSaveAndUpdate) { if (isSaveAndUpdate) {
return R.ok(null, "执行成功!"); return R.ok(null, "执行成功!");
...@@ -1810,7 +1814,7 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap ...@@ -1810,7 +1814,7 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
//起缴月份在要生成的月份前不处理 || 截止月份在要生成的月份后不处理 //起缴月份在要生成的月份前不处理 || 截止月份在要生成的月份后不处理
if (Integer.parseInt(payMonth) < DateUtil.formatDateInt(minStartDate) if (Integer.parseInt(payMonth) < DateUtil.formatDateInt(minStartDate)
|| (Common.isNotNull(tSocialInfo.getSocialReduceDate()) || (Common.isNotNull(tSocialInfo.getSocialReduceDate())
&& Integer.parseInt(payMonth) > DateUtil.formatDateInt(tSocialInfo.getSocialReduceDate()))) { && Integer.parseInt(payMonth) >= DateUtil.formatDateInt(tSocialInfo.getSocialReduceDate()))) {
continue; continue;
} }
flag = CommonConstants.ZERO_STRING.equals(tSocialInfo.getCanOverpay()) && (null == tSocialInfo.getOverpayNumber() || null == tSocialInfo.getHaveThisMonth() || null == minStartDate); flag = CommonConstants.ZERO_STRING.equals(tSocialInfo.getCanOverpay()) && (null == tSocialInfo.getOverpayNumber() || null == tSocialInfo.getHaveThisMonth() || null == minStartDate);
......
...@@ -876,15 +876,16 @@ ...@@ -876,15 +876,16 @@
1=1 1=1
<include refid="tSocialFundInfo_where"/> <include refid="tSocialFundInfo_where"/>
</where> </where>
order by a.CREATE_TIME desc
</select> </select>
<!--获取在用社保--> <!--获取在用社保 #a.SOCIAL_ADD_STATUS != '4' and a.SOCIAL_REDUCE_STATUS != '2' -->
<select id="getSocialList" resultMap="tSocialFundInfoMap"> <select id="getSocialList" resultMap="tSocialFundInfoMap">
SELECT SELECT
<include refid="Other_Base_Column_List"/> <include refid="Other_Base_Column_List"/>
FROM t_social_fund_info a FROM t_social_fund_info a
<where> <where>
a.SOCIAL_ADD_STATUS != '4' and a.SOCIAL_REDUCE_STATUS != '2' 1=1
<if test="empIdCard != null"> <if test="empIdCard != null">
and a.EMP_IDCARD = #{empIdCard} and a.EMP_IDCARD = #{empIdCard}
</if> </if>
...@@ -896,13 +897,13 @@ ...@@ -896,13 +897,13 @@
</if> </if>
</where> </where>
</select> </select>
<!--获取在用公积金--> <!--获取在用公积金 a.FUND_ADD_STATUS != '4' and a.FUND_REDUCE_STATUS != '2' -->
<select id="getFundList" resultMap="tSocialFundInfoMap"> <select id="getFundList" resultMap="tSocialFundInfoMap">
SELECT SELECT
<include refid="Other_Base_Column_List"/> <include refid="Other_Base_Column_List"/>
FROM t_social_fund_info a FROM t_social_fund_info a
<where> <where>
a.FUND_ADD_STATUS != '4' and a.FUND_REDUCE_STATUS != '2' 1=1
<if test="empIdCard != null"> <if test="empIdCard != null">
and a.EMP_IDCARD = #{empIdCard} and a.EMP_IDCARD = #{empIdCard}
</if> </if>
......
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