Commit 1a9dea92 authored by fangxinjiang's avatar fangxinjiang

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

parent 374a30a6
...@@ -837,62 +837,65 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe ...@@ -837,62 +837,65 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.Boolean> * @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.lang.Boolean>
**/ **/
public R<String> backSalaryByApplyNo(String applyNo) { public R<String> backSalaryByApplyNo(String applyNo) {
List<TSalaryStandard> salaryList = this.list(Wrappers.<TSalaryStandard>query().lambda().eq(TSalaryStandard::getApplyNo,applyNo)); if (Common.isNotNull(applyNo)){
if (salaryList != null && !salaryList.isEmpty()) {
TSalaryStandard ss = salaryList.get(0); List<TSalaryStandard> salaryList = this.list(Wrappers.<TSalaryStandard>query().lambda().eq(TSalaryStandard::getApplyNo,applyNo));
if (ss.getStatus() != SalaryConstants.STATUS[6]) { if (salaryList != null && !salaryList.isEmpty()) {
// 通知EKP TSalaryStandard ss = salaryList.get(0);
EkpSalaryBackParam param = new EkpSalaryBackParam(); if (ss.getStatus() != SalaryConstants.STATUS[6]) {
param.setFd_3b3c293745e7b4(ss.getDeptName()); // 通知EKP
param.setFd_3b3c2935c13056(ss.getDeptNo()); EkpSalaryBackParam param = new EkpSalaryBackParam();
param.setFd_3b3c293811c0ee(ss.getApplyNo()); param.setFd_3b3c293745e7b4(ss.getDeptName());
YifuUser user = SecurityUtils.getUser(); param.setFd_3b3c2935c13056(ss.getDeptNo());
if (user != null) { param.setFd_3b3c293811c0ee(ss.getApplyNo());
param.setFd_3b422d73d73e02(user.getUsername()); YifuUser user = SecurityUtils.getUser();
} else {
param.setFd_3b422d73d73e02("");
}
String sendBack = ekpSalaryUtil.backStandardToEKP(param);
if (Common.isEmpty(sendBack) || sendBack.length() != 32) {
sendBack = ekpSalaryUtil.backStandardToEKP(param);
}
if (Common.isNotNull(sendBack) && sendBack.length() == 32) {
// 更新薪资为确认不通过
ss.setStatus(SalaryConstants.STATUS[6]);
ss.setSendMonth(null);
ss.setSendTime(null);
ss.setBackTime(new Date());
ss.setBackEkpId(sendBack);
this.updateById(ss);
// 更新报账表
salaryAccountService.backSalaryBySalaryId(ss.getId());
TIncome income = new TIncome();
income.setApplyNo(applyNo);
// 删除收入对应编号的明细
HttpDaprUtil.invokeMethodPost(socialProperties.getAppUrl(), socialProperties.getAppId()
, "/tincome/inner/deleteIncomeAndDetailByApplyNo", income
, Object.class, SecurityConstants.FROM_IN);
// 添加流程进展明细
if (user != null) { if (user != null) {
ss.setRemark(" "); param.setFd_3b422d73d73e02(user.getUsername());
this.saveRecordLog(ss, user, CommonConstants.ZERO_STRING, "从EKP退表"); } else {
param.setFd_3b422d73d73e02("");
}
String sendBack = ekpSalaryUtil.backStandardToEKP(param);
if (Common.isEmpty(sendBack) || sendBack.length() != 32) {
sendBack = ekpSalaryUtil.backStandardToEKP(param);
}
if (Common.isNotNull(sendBack) && sendBack.length() == 32) {
// 更新薪资为确认不通过
ss.setStatus(SalaryConstants.STATUS[6]);
ss.setSendMonth(null);
ss.setSendTime(null);
ss.setBackTime(new Date());
ss.setBackEkpId(sendBack);
this.updateById(ss);
// 更新报账表
salaryAccountService.backSalaryBySalaryId(ss.getId());
TIncome income = new TIncome();
income.setApplyNo(applyNo);
// 删除收入对应编号的明细
HttpDaprUtil.invokeMethodPost(socialProperties.getAppUrl(), socialProperties.getAppId()
, "/tincome/inner/deleteIncomeAndDetailByApplyNo", income
, Object.class, SecurityConstants.FROM_IN);
// 添加流程进展明细
if (user != null) {
ss.setRemark(" ");
this.saveRecordLog(ss, user, CommonConstants.ZERO_STRING, "从EKP退表");
}
return R.ok();
} else {
TSendEkpError error = new TSendEkpError();
error.setCreateTime(new Date());
error.setCreateDay(DateUtil.getThisDay());
error.setType(CommonConstants.SEVEN_STRING);
error.setCreateUserName(ss.getCreateName());
error.setLinkId(ss.getId());
error.setTitle(sendBack == null ? SalaryConstants.EKP_NO_RETURN : sendBack);
error.setNums(CommonConstants.ONE_INT);
HttpDaprUtil.invokeMethodPost(socialProperties.getAppUrl(), socialProperties.getAppId()
, "/tsendekperror/inner/saveError", error, Boolean.class, SecurityConstants.FROM_IN);
return R.failed("连续两次请求EKP,均未接收到EKP删除成功的返回信息,不予退回");
} }
return R.ok();
} else { } else {
TSendEkpError error = new TSendEkpError(); return R.failed("工资表已退回,请不要重复操作");
error.setCreateTime(new Date());
error.setCreateDay(DateUtil.getThisDay());
error.setType(CommonConstants.SEVEN_STRING);
error.setCreateUserName(ss.getCreateName());
error.setLinkId(ss.getId());
error.setTitle(sendBack == null ? SalaryConstants.EKP_NO_RETURN : sendBack);
error.setNums(CommonConstants.ONE_INT);
HttpDaprUtil.invokeMethodPost(socialProperties.getAppUrl(), socialProperties.getAppId()
, "/tsendekperror/inner/saveError", error, Boolean.class, SecurityConstants.FROM_IN);
return R.failed("连续两次请求EKP,均未接收到EKP删除成功的返回信息,不予退回");
} }
} else {
return R.failed("工资表已退回,请不要重复操作");
} }
} }
return R.failed("未找到工资表"); return R.failed("未找到工资表");
......
...@@ -39,4 +39,6 @@ public interface TProvidentFundMapper extends BaseMapper<TProvidentFund> { ...@@ -39,4 +39,6 @@ public interface TProvidentFundMapper extends BaseMapper<TProvidentFund> {
IPage<TProvidentFund> getTProvidentFundPage(Page<TProvidentFund> page, @Param("tProvidentFund") TProvidentFund tProvidentFund); IPage<TProvidentFund> getTProvidentFundPage(Page<TProvidentFund> page, @Param("tProvidentFund") TProvidentFund tProvidentFund);
int updateFundInfoById( @Param("tProvidentFund")TProvidentFund providentFund); int updateFundInfoById( @Param("tProvidentFund")TProvidentFund providentFund);
int updateByIdOfAudit(@Param("tProvidentFund")TProvidentFund providentFund);
} }
...@@ -3406,7 +3406,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -3406,7 +3406,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
sf.setFundReduceDate(null); sf.setFundReduceDate(null);
} }
} }
fundMapper.updateById(providentFund); fundMapper.updateByIdOfAudit(providentFund);
} }
} }
......
...@@ -306,4 +306,17 @@ ...@@ -306,4 +306,17 @@
</trim> </trim>
WHERE id=#{tProvidentFund.id} WHERE id=#{tProvidentFund.id}
</update> </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> </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