Commit 1a9dea92 authored by fangxinjiang's avatar fangxinjiang

退表编码空BUG处理 & 社保审核 社保公积金更新SQL 优化

parent 374a30a6
......@@ -837,6 +837,8 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.Boolean>
**/
public R<String> backSalaryByApplyNo(String applyNo) {
if (Common.isNotNull(applyNo)){
List<TSalaryStandard> salaryList = this.list(Wrappers.<TSalaryStandard>query().lambda().eq(TSalaryStandard::getApplyNo,applyNo));
if (salaryList != null && !salaryList.isEmpty()) {
TSalaryStandard ss = salaryList.get(0);
......@@ -895,6 +897,7 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
return R.failed("工资表已退回,请不要重复操作");
}
}
}
return R.failed("未找到工资表");
}
......
......@@ -39,4 +39,6 @@ public interface TProvidentFundMapper extends BaseMapper<TProvidentFund> {
IPage<TProvidentFund> getTProvidentFundPage(Page<TProvidentFund> page, @Param("tProvidentFund") TProvidentFund tProvidentFund);
int updateFundInfoById( @Param("tProvidentFund")TProvidentFund providentFund);
int updateByIdOfAudit(@Param("tProvidentFund")TProvidentFund providentFund);
}
......@@ -3406,7 +3406,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
sf.setFundReduceDate(null);
}
}
fundMapper.updateById(providentFund);
fundMapper.updateByIdOfAudit(providentFund);
}
}
......
......@@ -306,4 +306,17 @@
</trim>
WHERE id=#{tProvidentFund.id}
</update>
<update id="updateByIdOfAudit">
update t_provident_fund
<trim prefix="set" suffixOverrides=",">
<if test="tProvidentFund.reduceCan != null">REDUCE_CAN=#{tProvidentFund.reduceCan},</if>
<if test="tProvidentFund.auditTime != null">AUDIT_TIME=#{tProvidentFund.auditTime},</if>
<if test="tProvidentFund.auditUser != null">AUDIT_USER=#{tProvidentFund.auditUser},</if>
<if test="tProvidentFund.auditUserName != null">AUDIT_USER_NAME=#{tProvidentFund.auditUserName},</if>
<if test="tProvidentFund.auditStatus != null">AUDIT_STATUS=#{tProvidentFund.auditStatus},</if>
<if test="tProvidentFund.deleteFlag != null">DELETE_FLAG=#{tProvidentFund.deleteFlag},</if>
</trim>
WHERE id=#{tProvidentFund.id}
</update>
</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