Browse Source

fix:审核时,需要判断是否已经审核

ly 10 months ago
parent
commit
1b782a7a38

+ 11 - 0
src/main/java/cn/ezhizao/project/business/housingFund/controller/BizHousingFundConfirmController.java

@@ -284,6 +284,17 @@ public class BizHousingFundConfirmController extends BaseController {
         boolean bool = true;
         detail.setVerifierId(SecurityUtils.getUserId());
         if (detail.getStatus().equals(3)) {
+            if(null == detail.getId()){
+                List<BizHousingFundConfirmDetail> confirmDetailList = housingFundConfirmDetailService.query()
+                        .eq("social_security_confirm_id",detail.getHousingFundConfirmId())
+                        .eq("year",detail.getYear())
+                        .eq("month", detail.getMonth())
+                        .eq("deleted",0)
+                        .eq("status",3).list();
+                if(!confirmDetailList.isEmpty()) {
+                    return error("审核失败,数据已被审核请刷新");
+                }
+            }
             BizHousingFundConfirm housingFundConfirm = housingFundConfirmService.getById(detail.getHousingFundConfirmId());
             QueryWrapper<BizHousingFundDeclare> qw = new QueryWrapper<>();
             qw.eq("work_order_id", housingFundConfirm.getWorkOrderId());

+ 10 - 7
src/main/java/cn/ezhizao/project/business/socialSecurity/controller/SocialSecurityConfirmController.java

@@ -437,13 +437,16 @@ public class SocialSecurityConfirmController extends BaseController {
         try {
             lock.lock();
             detail.setVerifierId(SecurityUtils.getUserId());
-            List<BizSocialSecurityConfirmDetail> confirmDetailList = socialSecurityConfirmDetailService.query()
-                    .eq("social_security_confirm_id",detail.getSocialSecurityConfirmId())
-                    .eq("year",detail.getYear())
-                    .eq("month", detail.getMonth())
-                    .eq("status",3).list();
-            if(!confirmDetailList.isEmpty()) {
-                return error("审核失败,数据已被审核请刷新");
+            if(null == detail.getId()){
+                List<BizSocialSecurityConfirmDetail> confirmDetailList = socialSecurityConfirmDetailService.query()
+                        .eq("social_security_confirm_id",detail.getSocialSecurityConfirmId())
+                        .eq("year",detail.getYear())
+                        .eq("month", detail.getMonth())
+                        .eq("deleted",0)
+                        .eq("status",3).list();
+                if(!confirmDetailList.isEmpty()) {
+                    return error("审核失败,数据已被审核请刷新");
+                }
             }
             if (detail.getStatus().equals(3)) {
                 BizSocialSecurityConfirm bizSocialSecurityConfirm = socialSecurityConfirmService.getById(detail.getSocialSecurityConfirmId());