Commit 6fd5e6bb authored by hongguangwu's avatar hongguangwu

MVP1.7.5-薪资提交校验

parent 93c30ba3
...@@ -198,7 +198,7 @@ public class TSalaryStandardController { ...@@ -198,7 +198,7 @@ public class TSalaryStandardController {
YifuUser user = SecurityUtils.getUser(); YifuUser user = SecurityUtils.getUser();
if (user != null) { if (user != null) {
// 2025-1-14 10:59:37 提交前拦截: // 2025-1-14 10:59:37 提交前拦截:
return tSalaryStandardService.judegRisk(s, user); return tSalaryStandardService.judgeRisk(s, user);
} else { } else {
return R.failed("请登录!"); return R.failed("请登录!");
} }
......
...@@ -152,6 +152,6 @@ public interface TSalaryStandardService extends IService<TSalaryStandard> { ...@@ -152,6 +152,6 @@ public interface TSalaryStandardService extends IService<TSalaryStandard> {
* @Date: 2025/1/14 11:01 * @Date: 2025/1/14 11:01
* @return: java.lang.String * @return: java.lang.String
**/ **/
R<List<SalaryRiskVo>> judegRisk(TSalaryStandard s, YifuUser user); R<List<SalaryRiskVo>> judgeRisk(TSalaryStandard s, YifuUser user);
} }
...@@ -1099,7 +1099,7 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe ...@@ -1099,7 +1099,7 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
* @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.util.List < com.yifu.cloud.plus.v1.yifu.salary.vo.SalaryRiskVo>> * @return: com.yifu.cloud.plus.v1.yifu.common.core.util.R<java.util.List < com.yifu.cloud.plus.v1.yifu.salary.vo.SalaryRiskVo>>
**/ **/
@Override @Override
public R<List<SalaryRiskVo>> judegRisk(TSalaryStandard s, YifuUser user) { public R<List<SalaryRiskVo>> judgeRisk(TSalaryStandard s, YifuUser user) {
// 1 判断项目信息:是否含风险、含商险服务项 // 1 判断项目信息:是否含风险、含商险服务项
R<TSettleDomainSelectVo> sdr = HttpDaprUtil.invokeMethodPost(archivesProperties.getAppUrl(), archivesProperties.getAppId() R<TSettleDomainSelectVo> sdr = HttpDaprUtil.invokeMethodPost(archivesProperties.getAppUrl(), archivesProperties.getAppId()
...@@ -1119,7 +1119,7 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe ...@@ -1119,7 +1119,7 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
, "/insuranceDetail/inner/getRiskByIdCard", accountList , "/insuranceDetail/inner/getRiskByIdCard", accountList
, SalaryRiskListVo.class, SecurityConstants.FROM_IN); , SalaryRiskListVo.class, SecurityConstants.FROM_IN);
if (riskListVoR == null || riskListVoR.getCode() == CommonConstants.FAIL) { if (riskListVoR == null || riskListVoR.getCode() == CommonConstants.FAIL) {
return R.failed("校验商险返回未空,请联系管理员"); return R.failed("校验商险返回为空,请稍后重试,多次失败请联系管理员");
} else { } else {
SalaryRiskListVo vo = riskListVoR.getData(); SalaryRiskListVo vo = riskListVoR.getData();
// 未购买商险列表 // 未购买商险列表
...@@ -1184,15 +1184,14 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe ...@@ -1184,15 +1184,14 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
return new R<>(CommonConstants.TWO_INT, "校验商险不通过!", returnList); return new R<>(CommonConstants.TWO_INT, "校验商险不通过!", returnList);
} }
} else { } else {
return R.ok(); return R.ok(null, "均已购买商险");
} }
} }
} else { } else {
return R.ok(); return R.ok(null, "没有报账明细,无需拦截");
} }
} else { } else {
return R.ok(); return R.ok(null, "项目不含风险 或 无商险");
} }
} else { } else {
return R.failed("获取项目信息失败,请联管理员!"); return R.failed("获取项目信息失败,请联管理员!");
......
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