用户信息审批出现重复数据问题处理

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/service/EnrollmentCertificateInfoService.java

@@ -67,25 +67,30 @@ public class EnrollmentCertificateInfoService extends ServiceImpl<EnrollmentCert
         }
         if(StringUtils.isNotBlank(status)){
             if("5".equals(status)){
-                queryWrapper.and(wrapper ->
+                queryWrapper
+                        .and(wrapper ->
                         wrapper.eq("status", "5")
                                 .or().isNull("status")
                                 .or().eq("status", "")
                                 .or().eq("status", "6")
                 );
             } else if("1".equals(status)) {
-                queryWrapper.and(wrapper ->
+                queryWrapper
+                        .and(wrapper ->
                         wrapper.eq("status", "5")
                                 .or().isNull("status")
                                 .or().eq("status", "")
                                 .or().eq("status", "1")
+                                .or().eq("status", "4")
                 );
             } else if("2".equals(status)) {
-                queryWrapper.and(wrapper ->
+                queryWrapper
+                        .and(wrapper ->
                         wrapper.eq("status", "2")
                 );
             }else{
-                queryWrapper.and(wrapper ->
+                queryWrapper
+                        .and(wrapper ->
                         wrapper.eq("status", "2")
                                 .or().eq("status", "4")
                                 .or().eq("status", "1")

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/service/EnrollmentEduInfoService.java

@@ -79,6 +79,7 @@ public class EnrollmentEduInfoService extends ServiceImpl<EnrollmentEduInfoMappe
                                 .or().isNull("status")
                                 .or().eq("status", "")
                                 .or().eq("status", "1")
+                                .or().eq("status", "4")
                 );
             } else if("2".equals(status)) {
                 queryWrapper.and(wrapper ->

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/service/EnrollmentFamilyInfoService.java

@@ -61,6 +61,7 @@ public class EnrollmentFamilyInfoService extends ServiceImpl<EnrollmentFamilyInf
                                 .or().isNull("status")
                                 .or().eq("status", "")
                                 .or().eq("status", "1")
+                                .or().eq("status", "4")
                 );
             } else if("2".equals(status)) {
                 queryWrapper.and(wrapper ->

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/service/EnrollmentLanguageInfoService.java

@@ -79,6 +79,7 @@ public class EnrollmentLanguageInfoService extends ServiceImpl<EnrollmentLanguag
                                 .or().isNull("status")
                                 .or().eq("status", "")
                                 .or().eq("status", "1")
+                                .or().eq("status", "4")
                 );
             } else if("2".equals(status)) {
                 queryWrapper.and(wrapper ->

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/service/EnrollmentPerformanceInfoService.java

@@ -56,6 +56,7 @@ public class EnrollmentPerformanceInfoService extends ServiceImpl<EnrollmentPerf
                                 .or().isNull("status")
                                 .or().eq("status", "")
                                 .or().eq("status", "1")
+                                .or().eq("status", "4")
                 );
             }else if("2".equals(status)) {
                 queryWrapper.and(wrapper ->

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/service/EnrollmentRegistrationService.java

@@ -765,9 +765,9 @@ public class EnrollmentRegistrationService extends ServiceImpl<EnrollmentRegistr
     public EnrollmentUserInfoAudit findAuditInfoById(String id,String status,String flag) {
         //EnrollmentUserInfoAudit info = userInfoAuditService.getById(id);
         EnrollmentUserInfoAudit info = userInfoAuditService.findAuditInfoById(id, flag);
-        if("1".equals(status)){
-            status = "4";
-        }
+        //if("1".equals(status)){
+        //    status = "4";
+        //}
         //根据身份证动态计算年龄
         String idCard = info.getIdCard();
         if (StringUtils.isNotBlank(idCard)) {
@@ -1071,18 +1071,19 @@ public class EnrollmentRegistrationService extends ServiceImpl<EnrollmentRegistr
             SpringUtil.getBean(IFlowableApi.class).startForFenNew(allMap);
             //更新提交审批的时间
             mapper.updateApprovalTime(registrationData.getUserId());
-            if (!"4".equals(registrationData.getStatus())) {
+            if (!"4".equals(registrationData.getStatus()) ) {
                 IWorkAttachmentApi workAttachmentApi = SpringUtil.getBean(IWorkAttachmentApi.class);
                 SpringUtil.getBean(IWorkAttachmentApi.class).deleteByAttachmentId(enrollmentUserInfoAudit.getId());
                 saveAttachments(enrollmentUserInfoAudit.getIdCardFront(), "idCardFront", enrollmentUserInfoAudit.getId(), userDTO, workAttachmentApi);
                 saveAttachments(enrollmentUserInfoAudit.getIdCardBack(), "idCardBack", enrollmentUserInfoAudit.getId(), userDTO, workAttachmentApi);
-                saveEnrollmentDetailInfo(registrationData);
+                //saveEnrollmentDetailInfo(registrationData);
+                updateEnrollmentDetailInfo(registrationData,"2","approval");
             } else {
                 IWorkAttachmentApi workAttachmentApi = SpringUtil.getBean(IWorkAttachmentApi.class);
                 SpringUtil.getBean(IWorkAttachmentApi.class).deleteByAttachmentId(enrollmentUserInfoAudit.getId());
                 saveAttachments(enrollmentUserInfoAudit.getIdCardFront(), "idCardFront", enrollmentUserInfoAudit.getId(), userDTO, workAttachmentApi);
                 saveAttachments(enrollmentUserInfoAudit.getIdCardBack(), "idCardBack", enrollmentUserInfoAudit.getId(), userDTO, workAttachmentApi);
-                updateEnrollmentDetailInfo(registrationData,"2");
+                updateEnrollmentDetailInfo(registrationData,"2","approval");
             }
         } catch (Exception e) {
             throw new RuntimeException(e);
@@ -1227,105 +1228,106 @@ public class EnrollmentRegistrationService extends ServiceImpl<EnrollmentRegistr
         }
     }
 
-    public void updateEnrollmentDetailInfo(EnrollmentRegistration dto,String status) {
-        // 教育经历
-        List<EnrollmentEduInfo> eduList = dto.getEduInfoList();
-        if (CollectionUtils.isNotEmpty(eduList)) {
-            eduList.forEach(item -> {
-                item.setStatus(status);
-                eduInfoService.saveOrUpdate(item);
-                eduInfoService.saveOrUpdateEduWorkAttachment(item);
-            });
-        }
+    public void updateEnrollmentDetailInfo(EnrollmentRegistration dto,String status,String flag) {
 
-        // 工作经历
-        List<EnrollmentWorkInfo> workList = dto.getWorkInfoList();
-        if (CollectionUtils.isNotEmpty(workList)) {
-            workList.forEach(item -> {
-                item.setStatus(status);
-                workInfoService.saveOrUpdate(item);
-            });
-        }
+            // 教育经历
+            List<EnrollmentEduInfo> eduList = dto.getEduInfoList();
+            if (CollectionUtils.isNotEmpty(eduList)) {
+                eduList.forEach(item -> {
+                    item.setStatus(status);
+                    eduInfoService.saveOrUpdate(item);
+                    eduInfoService.saveOrUpdateEduWorkAttachment(item);
+                });
+            }
 
-        // 培训经历
-        List<EnrollmentTrainingInfo> trainingList = dto.getTrainingInfoList();
-        if (CollectionUtils.isNotEmpty(trainingList)) {
-            trainingList.forEach(item -> {
-                item.setStatus(status);
-                trainingInfoService.saveOrUpdate(item);
-                trainingInfoService.saveOrUpdateWorkAttachment(item);
-            });
-        }
+            // 工作经历
+            List<EnrollmentWorkInfo> workList = dto.getWorkInfoList();
+            if (CollectionUtils.isNotEmpty(workList)) {
+                workList.forEach(item -> {
+                    item.setStatus(status);
+                    workInfoService.saveOrUpdate(item);
+                });
+            }
 
-        // 资质证书
-        List<EnrollmentCertificateInfo> certificateList = dto.getCertificateInfoList();
-        if (CollectionUtils.isNotEmpty(certificateList)) {
-            certificateList.forEach(item -> {
-                item.setStatus(status);
-                certificateInfoService.saveOrUpdate(item);
-                certificateInfoService.saveOrUpdateWorkAttachment(item);
-            });
-        }
+            // 培训经历
+            List<EnrollmentTrainingInfo> trainingList = dto.getTrainingInfoList();
+            if (CollectionUtils.isNotEmpty(trainingList)) {
+                trainingList.forEach(item -> {
+                    item.setStatus(status);
+                    trainingInfoService.saveOrUpdate(item);
+                    trainingInfoService.saveOrUpdateWorkAttachment(item);
+                });
+            }
 
-        // 专业技能
-        List<EnrollmentSkillInfo> skillList = dto.getSkillInfoList();
-        if (CollectionUtils.isNotEmpty(skillList)) {
-            skillList.forEach(item -> {
-                item.setStatus(status);
-                skillInfoService.saveOrUpdate(item);
-                skillInfoService.saveOrUpdateWorkAttachment(item);
-            });
-        }
+            // 资质证书
+            List<EnrollmentCertificateInfo> certificateList = dto.getCertificateInfoList();
+            if (CollectionUtils.isNotEmpty(certificateList)) {
+                certificateList.forEach(item -> {
+                    item.setStatus(status);
+                    certificateInfoService.saveOrUpdate(item);
+                    certificateInfoService.saveOrUpdateWorkAttachment(item);
+                });
+            }
 
-        // 语言能力
-        List<EnrollmentLanguageInfo> languageList = dto.getLanguageInfoList();
-        if (CollectionUtils.isNotEmpty(languageList)) {
-            languageList.forEach(item -> {
-                item.setStatus(status);
-                languageInfoService.saveOrUpdate(item);
-                languageInfoService.saveOrUpdateWorkAttachment(item);
-            });
+            // 专业技能
+            List<EnrollmentSkillInfo> skillList = dto.getSkillInfoList();
+            if (CollectionUtils.isNotEmpty(skillList)) {
+                skillList.forEach(item -> {
+                    item.setStatus(status);
+                    skillInfoService.saveOrUpdate(item);
+                    skillInfoService.saveOrUpdateWorkAttachment(item);
+                });
+            }
 
-        }
+            // 语言能力
+            List<EnrollmentLanguageInfo> languageList = dto.getLanguageInfoList();
+            if (CollectionUtils.isNotEmpty(languageList)) {
+                languageList.forEach(item -> {
+                    item.setStatus(status);
+                    languageInfoService.saveOrUpdate(item);
+                    languageInfoService.saveOrUpdateWorkAttachment(item);
+                });
 
-        // 家庭成员
-        List<EnrollmentFamilyInfo> familyList = dto.getFamilyInfoList();
-        if (CollectionUtils.isNotEmpty(familyList)) {
-            familyList.forEach(item -> {
-                item.setStatus(status);
-                familyInfoService.saveOrUpdate(item);
-            });
-        }
+            }
 
-        // 奖项信息
-        List<EnrollmentRewardInfo> rewardList = dto.getRewardInfoList();
-        if (CollectionUtils.isNotEmpty(rewardList)) {
-            rewardList.forEach(item -> {
-                item.setStatus(status);
-                rewardInfoService.saveOrUpdate(item);
-                rewardInfoService.saveOrUpdateWorkAttachment(item);
-            });
+            // 家庭成员
+            List<EnrollmentFamilyInfo> familyList = dto.getFamilyInfoList();
+            if (CollectionUtils.isNotEmpty(familyList)) {
+                familyList.forEach(item -> {
+                    item.setStatus(status);
+                    familyInfoService.saveOrUpdate(item);
+                });
+            }
 
-        }
+            // 奖项信息
+            List<EnrollmentRewardInfo> rewardList = dto.getRewardInfoList();
+            if (CollectionUtils.isNotEmpty(rewardList)) {
+                rewardList.forEach(item -> {
+                    item.setStatus(status);
+                    rewardInfoService.saveOrUpdate(item);
+                    rewardInfoService.saveOrUpdateWorkAttachment(item);
+                });
 
-        // 社会及行业职务
-        List<EnrollmentSocietyInfo> societyInfoList = dto.getSocietyInfoList();
-        if (CollectionUtils.isNotEmpty(societyInfoList)) {
-            societyInfoList.forEach(item -> {
-                item.setStatus(status);
-                societyInfoService.saveOrUpdate(item);
-            });
-        }
+            }
 
-        // 工作业绩
-        List<EnrollmentPerformanceInfo> performanceInfoList = dto.getPerformanceInfoList();
-        if (CollectionUtils.isNotEmpty(performanceInfoList)) {
-            performanceInfoList.forEach(item -> {
-                item.setStatus(status);
-                performanceInfoService.saveOrUpdate(item);
-            });
+            // 社会及行业职务
+            List<EnrollmentSocietyInfo> societyInfoList = dto.getSocietyInfoList();
+            if (CollectionUtils.isNotEmpty(societyInfoList)) {
+                societyInfoList.forEach(item -> {
+                    item.setStatus(status);
+                    societyInfoService.saveOrUpdate(item);
+                });
+            }
 
-        }
+            // 工作业绩
+            List<EnrollmentPerformanceInfo> performanceInfoList = dto.getPerformanceInfoList();
+            if (CollectionUtils.isNotEmpty(performanceInfoList)) {
+                performanceInfoList.forEach(item -> {
+                    item.setStatus(status);
+                    performanceInfoService.saveOrUpdate(item);
+                });
+
+            }
     }
 
 
@@ -1821,7 +1823,7 @@ public class EnrollmentRegistrationService extends ServiceImpl<EnrollmentRegistr
         return enrollmentRegistrations;
     }
 
-    public void updateStatusByIdUserInfo(EnrollmentRegistration registrationData) {
+    public void updateStatusByIdUserInfo(EnrollmentRegistration registrationData,String flag) {
         try {
             EnrollmentUserInfoAudit enrollmentUserInfoAudit = new EnrollmentUserInfoAudit();
             enrollmentUserInfoAudit.setStatus("4");
@@ -1832,7 +1834,7 @@ public class EnrollmentRegistrationService extends ServiceImpl<EnrollmentRegistr
             userInfoAuditService.saveOrUpdate(enrollmentUserInfoAudit);
             //更新提交审批的时间
             mapper.updateApprovalTime(registrationData.getUserId());
-            updateEnrollmentDetailInfo(registrationData,"4");
+            updateEnrollmentDetailInfo(registrationData,"4",flag);
         } catch (Exception e) {
             throw new RuntimeException(e);
         }

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/service/EnrollmentRewardInfoService.java

@@ -79,6 +79,7 @@ public class EnrollmentRewardInfoService extends ServiceImpl<EnrollmentRewardInf
                                 .or().isNull("status")
                                 .or().eq("status", "")
                                 .or().eq("status", "1")
+                                .or().eq("status", "4")
                 );
             }else if("2".equals(status)) {
                 queryWrapper.and(wrapper ->

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/service/EnrollmentSkillInfoService.java

@@ -79,6 +79,7 @@ public class EnrollmentSkillInfoService extends ServiceImpl<EnrollmentSkillInfoM
                                 .or().isNull("status")
                                 .or().eq("status", "")
                                 .or().eq("status", "1")
+                                .or().eq("status", "4")
                 );
             }else if("2".equals(status)) {
                 queryWrapper.and(wrapper ->

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/service/EnrollmentSocietyInfoService.java

@@ -56,6 +56,7 @@ public class EnrollmentSocietyInfoService extends ServiceImpl<EnrollmentSocietyI
                                 .or().isNull("status")
                                 .or().eq("status", "")
                                 .or().eq("status", "1")
+                                .or().eq("status", "4")
                 );
             }else if("2".equals(status)) {
                 queryWrapper.and(wrapper ->

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/service/EnrollmentTrainingInfoService.java

@@ -77,6 +77,7 @@ public class EnrollmentTrainingInfoService extends ServiceImpl<EnrollmentTrainin
                                 .or().isNull("status")
                                 .or().eq("status", "")
                                 .or().eq("status", "1")
+                                .or().eq("status", "4")
                 );
             }else if("2".equals(status)) {
                 queryWrapper.and(wrapper ->

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/service/EnrollmentUserInfoAuditService.java

@@ -530,7 +530,7 @@ public class EnrollmentUserInfoAuditService extends ServiceImpl<EnrollmentUserIn
 
 
     public void updateStatusByIdUserInfo(EnrollmentRegistration registration){
-        enrollmentRegistrationService.updateStatusByIdUserInfo(registration);
+        enrollmentRegistrationService.updateStatusByIdUserInfo(registration,"revoke");
     }
 
 

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/service/EnrollmentWorkInfoService.java

@@ -53,6 +53,7 @@ public class EnrollmentWorkInfoService extends ServiceImpl<EnrollmentWorkInfoMap
                                 .or().isNull("status")
                                 .or().eq("status", "")
                                 .or().eq("status", "1")
+                                .or().eq("status", "4")
                 );
             }else if("2".equals(status)) {
                 queryWrapper.and(wrapper ->