diff --git a/yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsuranceDetailMapper.xml b/yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsuranceDetailMapper.xml index fe3d0ad80c4398c886337250980402b90bfd47ef..2e03965ed14ba3411e86994705439c7770167cff 100644 --- a/yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsuranceDetailMapper.xml +++ b/yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsuranceDetailMapper.xml @@ -1478,7 +1478,7 @@ FROM t_insurance_detail d where DELETE_FLAG = 0 and (d.BUY_HANDLE_STATUS in (1,2) or (d.BUY_HANDLE_STATUS = 3 and d.IS_EFFECT = 0 - and d.POLICY_EFFECT <![CDATA[ <= ]]> NOW() and d.POLICY_END >= NOW() + and d.POLICY_EFFECT <![CDATA[ <= ]]> DATE_ADD(NOW(),INTERVAL 1 DAY) and d.POLICY_END >= NOW() )) <if test="idCardList != null and idCardList.size > 0"> diff --git a/yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/controller/TSalaryStandardController.java b/yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/controller/TSalaryStandardController.java index f3e0fcef4e6068636632dc5f7a26ec2d9895da39..35aa57adeaee3f46d398164cb00aa4e95f032dd2 100644 --- a/yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/controller/TSalaryStandardController.java +++ b/yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/controller/TSalaryStandardController.java @@ -197,6 +197,12 @@ public class TSalaryStandardController { if (Common.isNotNull(s.getIsCheckRisk()) && CommonConstants.ONE_INT == s.getIsCheckRisk()) { return R.ok(); } + if (!CommonConstants.ZERO_STRING.equals(s.getFormType())) { + s.setIsCheckRisk(CommonConstants.ONE_INT); + s.setCheckRiskRemark("éžå·¥èµ„类型,放开é™åˆ¶"); + this.updateById(s); + return R.ok(); + } YifuUser user = SecurityUtils.getUser(); if (user != null) { // 2025-1-14 10:59:37 æ交å‰æ‹¦æˆªï¼š @@ -225,7 +231,8 @@ public class TSalaryStandardController { || s.getStatus() == SalaryConstants.STATUS[5] || s.getStatus() == SalaryConstants.STATUS[6] || s.getStatus() == SalaryConstants.STATUS[7]) { - if (Common.isEmpty(s.getIsCheckRisk()) || CommonConstants.ZERO_INT == s.getIsCheckRisk()) { + if (CommonConstants.ZERO_STRING.equals(s.getFormType()) + && (Common.isEmpty(s.getIsCheckRisk()) || CommonConstants.ZERO_INT == s.getIsCheckRisk())) { return R.failed("è¯·å…ˆæ ¡éªŒå•†é™©ä¿¡æ¯ï¼"); }