用户信息调整-暂存，身份证回显

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/controller/EnrollmentCertificateInfoController.java

@@ -70,4 +70,15 @@ public class EnrollmentCertificateInfoController {
         EnrollmentCertificateInfo res = service.findById(info.getId());
         return ResponseEntity.ok (res);
     }
+
+    /**
+     * 资质证书用户端列表
+     * @return
+     */
+    @ApiLog(value = "资质证书用户端列表", type = LogTypeEnum.SAVE)
+    @GetMapping("findAuditList")
+    public ResponseEntity<List<EnrollmentCertificateInfo>> findAuditList(EnrollmentCertificateInfo info) throws Exception {
+        List<EnrollmentCertificateInfo> list = service.findByUserId(info.getUserId(),"1");
+        return ResponseEntity.ok (list);
+    }
 }

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/controller/EnrollmentEduInfoController.java

@@ -96,4 +96,16 @@ public class EnrollmentEduInfoController {
         EnrollmentEduInfo res = eduInfoService.findById(eduInfo.getId());
         return ResponseEntity.ok (res);
     }
+
+
+    /**
+     * 教育经历用户端列表
+     * @return
+     */
+    @ApiLog(value = "教育经历用户端列表", type = LogTypeEnum.SAVE)
+    @GetMapping("findAuditList")
+    public ResponseEntity<List<EnrollmentEduInfo>> findAuditList(EnrollmentEduInfo eduInfo) throws Exception {
+        List<EnrollmentEduInfo> list = eduInfoService.findByUserId(eduInfo.getUserId(),"1");
+        return ResponseEntity.ok (list);
+    }
 }

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/controller/EnrollmentFamilyInfoController.java

@@ -1,6 +1,7 @@
 package com.jeeplus.human.enrollment.enrollmentRegistration.controller;
 
 import com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentFamilyInfo;
+import com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentPerformanceInfo;
 import com.jeeplus.human.enrollment.enrollmentRegistration.service.EnrollmentFamilyInfoService;
 import com.jeeplus.logging.annotation.ApiLog;
 import com.jeeplus.logging.constant.enums.LogTypeEnum;
@@ -61,13 +62,26 @@ public class EnrollmentFamilyInfoController {
     }
 
     /**
-     * 根据id查询语言能力
+     * 根据id查询家庭成员信息
      * @return
      */
-    @ApiLog(value = "根据id查询语言能力信息", type = LogTypeEnum.SAVE)
+    @ApiLog(value = "根据id查询家庭成员信息", type = LogTypeEnum.SAVE)
     @GetMapping("findById")
     public ResponseEntity<EnrollmentFamilyInfo> findById(EnrollmentFamilyInfo info) throws Exception {
         EnrollmentFamilyInfo res = service.findById(info.getId());
         return ResponseEntity.ok (res);
     }
+
+
+
+    /**
+     * 家庭成员用户端列表
+     * @return
+     */
+    @ApiLog(value = "家庭成员用户端列表", type = LogTypeEnum.SAVE)
+    @GetMapping("findAuditList")
+    public ResponseEntity<List<EnrollmentFamilyInfo>> findAuditList(EnrollmentFamilyInfo info) throws Exception {
+        List<EnrollmentFamilyInfo> list = service.findByUserId(info.getUserId(),"1");
+        return ResponseEntity.ok (list);
+    }
 }

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/controller/EnrollmentLanguageInfoController.java

@@ -1,6 +1,7 @@
 package com.jeeplus.human.enrollment.enrollmentRegistration.controller;
 
 import com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentLanguageInfo;
+import com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentSkillInfo;
 import com.jeeplus.human.enrollment.enrollmentRegistration.service.EnrollmentLanguageInfoService;
 import com.jeeplus.logging.annotation.ApiLog;
 import com.jeeplus.logging.constant.enums.LogTypeEnum;
@@ -70,4 +71,15 @@ public class EnrollmentLanguageInfoController {
         EnrollmentLanguageInfo res = service.findById(info.getId());
         return ResponseEntity.ok (res);
     }
+
+    /**
+     * 语言能力用户端列表
+     * @return
+     */
+    @ApiLog(value = "语言能力用户端列表", type = LogTypeEnum.SAVE)
+    @GetMapping("findAuditList")
+    public ResponseEntity<List<EnrollmentLanguageInfo>> findAuditList(EnrollmentLanguageInfo info) throws Exception {
+        List<EnrollmentLanguageInfo> list = service.findByUserId(info.getUserId(),"1");
+        return ResponseEntity.ok (list);
+    }
 }

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/controller/EnrollmentPerformanceInfoController.java

@@ -1,5 +1,6 @@
 package com.jeeplus.human.enrollment.enrollmentRegistration.controller;
 
+import com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentLanguageInfo;
 import com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentPerformanceInfo;
 import com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentSocietyInfo;
 import com.jeeplus.human.enrollment.enrollmentRegistration.service.EnrollmentPerformanceInfoService;
@@ -68,4 +69,16 @@ public class EnrollmentPerformanceInfoController {
         EnrollmentPerformanceInfo res = service.findById(info.getId());
         return ResponseEntity.ok (res);
     }
+
+
+    /**
+     * 工作业绩用户端列表
+     * @return
+     */
+    @ApiLog(value = "工作业绩用户端列表", type = LogTypeEnum.SAVE)
+    @GetMapping("findAuditList")
+    public ResponseEntity<List<EnrollmentPerformanceInfo>> findAuditList(EnrollmentPerformanceInfo info) throws Exception {
+        List<EnrollmentPerformanceInfo> list = service.findByUserId(info.getUserId(),"1");
+        return ResponseEntity.ok (list);
+    }
 }

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/controller/EnrollmentRegistrationController.java

@@ -248,6 +248,18 @@ public class EnrollmentRegistrationController {
     }
 
     /**
+     * 用户暂存信息
+     * @param registration
+     * @return
+     */
+    @ApiLog(value = "用户暂存信息", type = LogTypeEnum.SAVE)
+    @PostMapping("updateInfoTemporary")
+    public ResponseEntity updateInfoTemporary(@Valid @RequestBody EnrollmentRegistration registration) throws Exception {
+        service.updateInfoTemporary(registration);
+        return ResponseUtil.newInstance().ok("操作成功");
+    }
+
+    /**
      * 用户信息通过审批
      * @param registration
      * @return
@@ -363,8 +375,8 @@ public class EnrollmentRegistrationController {
      */
     @ApiOperation(value = "查询正在审批中的信息")
     @GetMapping("/findAuditInfoById")
-    public ResponseEntity<EnrollmentUserInfoAudit> findAuditInfoById(@RequestParam String id) throws Exception{
-        EnrollmentUserInfoAudit dto = service.findAuditInfoById(id);
+    public ResponseEntity<EnrollmentUserInfoAudit> findAuditInfoById(@RequestParam String id,@RequestParam String status) throws Exception{
+        EnrollmentUserInfoAudit dto = service.findAuditInfoById(id,status);
         return ResponseEntity.ok(dto);
     }
 
@@ -581,8 +593,8 @@ public class EnrollmentRegistrationController {
      */
     @ApiOperation(value = "查询身份证号码唯一性")
     @GetMapping("/findIdCardOnly")
-    public ResponseEntity<Integer> findIdCardOnly(@RequestParam String idCard, @RequestParam String id) throws Exception{
-        Integer idCardOnly = service.findIdCardOnly(idCard,id);
+    public ResponseEntity<Integer> findIdCardOnly(@RequestParam String idCard, @RequestParam String userId) throws Exception{
+        Integer idCardOnly = service.findIdCardOnly(idCard,userId);
         return ResponseEntity.ok(idCardOnly);
     }
 
@@ -767,7 +779,17 @@ public class EnrollmentRegistrationController {
             List<String> idList = Arrays.asList(userIds.split(","));
             service.downloadAttachmentByUserIds(idList,dto.getAttachmentType(),response);
         }
+    }
 
+    /**
+     * 修改信息状态
+     * @return
+     */
+    @ApiLog(value = "修改信息状态", type = LogTypeEnum.SAVE)
+    @PostMapping("updateInfoStatus")
+    public ResponseEntity updateInfoStatus(@Valid @RequestBody EnrollmentRegistration info) throws Exception {
+        service.updateInfoStatus(info);
+        return ResponseEntity.ok ("操作成功");
     }
 
 }

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/controller/EnrollmentRewardInfoController.java

@@ -2,6 +2,7 @@ package com.jeeplus.human.enrollment.enrollmentRegistration.controller;
 
 import com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentLanguageInfo;
 import com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentRewardInfo;
+import com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentSkillInfo;
 import com.jeeplus.human.enrollment.enrollmentRegistration.service.EnrollmentLanguageInfoService;
 import com.jeeplus.human.enrollment.enrollmentRegistration.service.EnrollmentRewardInfoService;
 import com.jeeplus.logging.annotation.ApiLog;
@@ -66,10 +67,21 @@ public class EnrollmentRewardInfoController {
      * 根据id查询奖项信息
      * @return
      */
-    @ApiLog(value = "根据id查询奖项信息信息", type = LogTypeEnum.SAVE)
+    @ApiLog(value = "根据id查询奖项信息", type = LogTypeEnum.SAVE)
     @GetMapping("findById")
     public ResponseEntity<EnrollmentRewardInfo> findById(EnrollmentRewardInfo info) throws Exception {
         EnrollmentRewardInfo res = service.findById(info.getId());
         return ResponseEntity.ok (res);
     }
+
+    /**
+     * 奖项信息用户端列表
+     * @return
+     */
+    @ApiLog(value = "奖项信息用户端列表", type = LogTypeEnum.SAVE)
+    @GetMapping("findAuditList")
+    public ResponseEntity<List<EnrollmentRewardInfo>> findAuditList(EnrollmentRewardInfo info) throws Exception {
+        List<EnrollmentRewardInfo> list = service.findByUserId(info.getUserId(),"1");
+        return ResponseEntity.ok (list);
+    }
 }

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/controller/EnrollmentSkillInfoController.java

@@ -2,6 +2,7 @@ package com.jeeplus.human.enrollment.enrollmentRegistration.controller;
 
 import com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentCertificateInfo;
 import com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentSkillInfo;
+import com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentWorkInfo;
 import com.jeeplus.human.enrollment.enrollmentRegistration.service.EnrollmentCertificateInfoService;
 import com.jeeplus.human.enrollment.enrollmentRegistration.service.EnrollmentSkillInfoService;
 import com.jeeplus.logging.annotation.ApiLog;
@@ -72,4 +73,15 @@ public class EnrollmentSkillInfoController {
         EnrollmentSkillInfo res = service.findById(info.getId());
         return ResponseEntity.ok (res);
     }
+
+    /**
+     * 专业技能用户端列表
+     * @return
+     */
+    @ApiLog(value = "专业技能用户端列表", type = LogTypeEnum.SAVE)
+    @GetMapping("findAuditList")
+    public ResponseEntity<List<EnrollmentSkillInfo>> findAuditList(EnrollmentSkillInfo info) throws Exception {
+        List<EnrollmentSkillInfo> list = service.findByUserId(info.getUserId(),"1");
+        return ResponseEntity.ok (list);
+    }
 }

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/controller/EnrollmentSocietyInfoController.java

@@ -1,5 +1,6 @@
 package com.jeeplus.human.enrollment.enrollmentRegistration.controller;
 
+import com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentFamilyInfo;
 import com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentSocietyInfo;
 import com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentSocietyInfo;
 import com.jeeplus.human.enrollment.enrollmentRegistration.service.EnrollmentSocietyInfoService;
@@ -68,4 +69,16 @@ public class EnrollmentSocietyInfoController {
         EnrollmentSocietyInfo res = service.findById(info.getId());
         return ResponseEntity.ok (res);
     }
+
+
+    /**
+     * 社会及行业职务用户端列表
+     * @return
+     */
+    @ApiLog(value = "社会及行业职务用户端列表", type = LogTypeEnum.SAVE)
+    @GetMapping("findAuditList")
+    public ResponseEntity<List<EnrollmentSocietyInfo>> findAuditList(EnrollmentSocietyInfo info) throws Exception {
+        List<EnrollmentSocietyInfo> list = service.findByUserId(info.getUserId(),"1");
+        return ResponseEntity.ok (list);
+    }
 }

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/controller/EnrollmentTrainingInfoController.java

@@ -2,6 +2,7 @@ package com.jeeplus.human.enrollment.enrollmentRegistration.controller;
 
 import com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentEduInfo;
 import com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentTrainingInfo;
+import com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentWorkInfo;
 import com.jeeplus.human.enrollment.enrollmentRegistration.service.EnrollmentEduInfoService;
 import com.jeeplus.human.enrollment.enrollmentRegistration.service.EnrollmentTrainingInfoService;
 import com.jeeplus.logging.annotation.ApiLog;
@@ -72,4 +73,15 @@ public class EnrollmentTrainingInfoController {
         EnrollmentTrainingInfo res = service.findById(info.getId());
         return ResponseEntity.ok (res);
     }
+
+    /**
+     * 培训经历用户端列表
+     * @return
+     */
+    @ApiLog(value = "培训经历用户端列表", type = LogTypeEnum.SAVE)
+    @GetMapping("findAuditList")
+    public ResponseEntity<List<EnrollmentTrainingInfo>> findAuditList(EnrollmentTrainingInfo info) throws Exception {
+        List<EnrollmentTrainingInfo> list = service.findByUserId(info.getUserId(),"1");
+        return ResponseEntity.ok (list);
+    }
 }

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/controller/EnrollmentWorkInfoController.java

@@ -1,5 +1,6 @@
 package com.jeeplus.human.enrollment.enrollmentRegistration.controller;
 
+import com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentCertificateInfo;
 import com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentEduInfo;
 import com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentWorkInfo;
 import com.jeeplus.human.enrollment.enrollmentRegistration.service.EnrollmentEduInfoService;
@@ -72,4 +73,15 @@ public class EnrollmentWorkInfoController {
         EnrollmentWorkInfo res = service.findById(info.getId());
         return ResponseEntity.ok (res);
     }
+
+    /**
+     * 工作经历用户端列表
+     * @return
+     */
+    @ApiLog(value = "工作经历用户端列表", type = LogTypeEnum.SAVE)
+    @GetMapping("findAuditList")
+    public ResponseEntity<List<EnrollmentWorkInfo>> findAuditList(EnrollmentWorkInfo info) throws Exception {
+        List<EnrollmentWorkInfo> list = service.findByUserId(info.getUserId(),"1");
+        return ResponseEntity.ok (list);
+    }
 }

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/mapper/xml/EnrollmentCertificateInfoMapper.xml

@@ -18,7 +18,8 @@
         a.enroll_cert_no,
         a.profession,
         a.user_id,
-        a.remarks
+        a.remarks,
+        a.status
     </sql>
 
     <select id="getByRegistrationId"

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/mapper/xml/EnrollmentEduInfoMapper.xml

@@ -24,7 +24,8 @@
         a.speciality_desc,
         a.enrollment_registration_id,
         a.user_id,
-        a.remarks
+        a.remarks,
+        a.status
     </sql>
 
     <select id="getByRegistrationId"

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/mapper/xml/EnrollmentFamilyInfoMapper.xml

@@ -18,7 +18,9 @@
         a.contact_number,
         a.enrollment_registration_id,
         a.user_id,
-        a.remarks
+        a.remarks,
+        a.status
+
     </sql>
 
     <select id="getByRegistrationId"

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/mapper/xml/EnrollmentLanguageInfoMapper.xml

@@ -17,7 +17,9 @@
         a.speaking_ability,
         a.enrollment_registration_id,
         a.user_id,
-        a.remarks
+        a.remarks,
+        a.status
+
     </sql>
 
     <select id="getByRegistrationId"

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/mapper/xml/EnrollmentPerformanceInfoMapper.xml

@@ -16,7 +16,8 @@
         a.position,
         a.participate_content,
         a.user_id,
-        a.remarks
+        a.remarks,
+        a.status
     </sql>
 
     <select id="getByRegistrationId"

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/mapper/xml/EnrollmentRewardInfoMapper.xml

@@ -14,7 +14,9 @@
         a.reward_date,
         a.description,
         a.user_id,
-        a.remarks
+        a.remarks,
+        a.status
+
     </sql>
 
     <select id="getByRegistrationId"

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/mapper/xml/EnrollmentSkillInfoMapper.xml

@@ -15,7 +15,10 @@
         a.usage_time,
         a.enrollment_registration_id,
         a.user_id,
-        a.remarks
+        a.obtain_date,
+        a.remarks,
+        a.status
+
     </sql>
 
     <select id="getByRegistrationId"

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/mapper/xml/EnrollmentSocietyInfoMapper.xml

@@ -15,7 +15,9 @@
         a.end_date,
         a.enrollment_registration_id,
         a.user_id,
-        a.remarks
+        a.remarks,
+        a.status
+
     </sql>
 
     <select id="getByRegistrationId"

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/mapper/xml/EnrollmentTrainingInfoMapper.xml

@@ -14,7 +14,8 @@
         a.training_result,
         a.enrollment_registration_id,
         a.user_id,
-        a.remarks
+        a.remarks,
+        a.status
     </sql>
 
     <select id="getByRegistrationId"

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/mapper/xml/EnrollmentWorkInfoMapper.xml

@@ -17,7 +17,8 @@
         a.is_current_company_experience,
         a.enrollment_registration_id,
         a.user_id,
-        a.remarks
+        a.remarks,
+        a.status
     </sql>
 
     <select id="getByRegistrationId"

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

@@ -68,11 +68,24 @@ public class EnrollmentCertificateInfoService extends ServiceImpl<EnrollmentCert
         if(StringUtils.isNotBlank(status)){
             if("5".equals(status)){
                 queryWrapper.and(wrapper ->
-                        wrapper.eq("status", "5").or().isNull("status").or().eq("status", "")
+                        wrapper.eq("status", "5")
+                                .or().isNull("status")
+                                .or().eq("status", "")
+                                .or().eq("status", "6")
                 );
-            }else{
+            } else if("1".equals(status)) {
                 queryWrapper.and(wrapper ->
-                        wrapper.eq("status", "2").or().eq("status", "4")
+                        wrapper.eq("status", "5")
+                                .or().isNull("status")
+                                .or().eq("status", "")
+                                .or().eq("status", "1")
+                );
+            } else{
+                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

@@ -68,11 +68,28 @@ public class EnrollmentEduInfoService extends ServiceImpl<EnrollmentEduInfoMappe
         if(StringUtils.isNotBlank(status)){
             if("5".equals(status)){
                 queryWrapper.and(wrapper ->
-                        wrapper.eq("status", "5").or().isNull("status").or().eq("status", "")
+                        wrapper.eq("status", "5")
+                                .or().isNull("status")
+                                .or().eq("status", "")
+                                .or().eq("status", "6")
+                );
+            } else if("1".equals(status)) {
+                queryWrapper.and(wrapper ->
+                        wrapper.eq("status", "5")
+                                .or().isNull("status")
+                                .or().eq("status", "")
+                                .or().eq("status", "1")
+                );
+            } else if("2".equals(status)) {
+                queryWrapper.and(wrapper ->
+                        wrapper.eq("status", "2")
+                                .or().eq("status", "4")
                 );
             }else{
                 queryWrapper.and(wrapper ->
-                        wrapper.eq("status", "2").or().eq("status", "4")
+                        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/EnrollmentFamilyInfoService.java

@@ -50,11 +50,28 @@ public class EnrollmentFamilyInfoService extends ServiceImpl<EnrollmentFamilyInf
         if(StringUtils.isNotBlank(status)){
             if("5".equals(status)){
                 queryWrapper.and(wrapper ->
-                        wrapper.eq("status", "5").or().isNull("status").or().eq("status", "")
+                        wrapper.eq("status", "5")
+                                .or().isNull("status")
+                                .or().eq("status", "")
+                                .or().eq("status", "6")
+                );
+            } else if("1".equals(status)) {
+                queryWrapper.and(wrapper ->
+                        wrapper.eq("status", "5")
+                                .or().isNull("status")
+                                .or().eq("status", "")
+                                .or().eq("status", "1")
+                );
+            } else if("2".equals(status)) {
+                queryWrapper.and(wrapper ->
+                        wrapper.eq("status", "2")
+                                .or().eq("status", "4")
                 );
             }else{
                 queryWrapper.and(wrapper ->
-                        wrapper.eq("status", "2").or().eq("status", "4")
+                        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/EnrollmentLanguageInfoService.java

@@ -68,11 +68,28 @@ public class EnrollmentLanguageInfoService extends ServiceImpl<EnrollmentLanguag
         if(com.jeeplus.utils.StringUtils.isNotBlank(status)){
             if("5".equals(status)){
                 queryWrapper.and(wrapper ->
-                        wrapper.eq("status", "5").or().isNull("status").or().eq("status", "")
+                        wrapper.eq("status", "5")
+                                .or().isNull("status")
+                                .or().eq("status", "")
+                                .or().eq("status", "6")
+                );
+            } else if("1".equals(status)) {
+                queryWrapper.and(wrapper ->
+                        wrapper.eq("status", "5")
+                                .or().isNull("status")
+                                .or().eq("status", "")
+                                .or().eq("status", "1")
+                );
+            } else if("2".equals(status)) {
+                queryWrapper.and(wrapper ->
+                        wrapper.eq("status", "2")
+                                .or().eq("status", "4")
                 );
             }else{
                 queryWrapper.and(wrapper ->
-                        wrapper.eq("status", "2").or().eq("status", "4")
+                        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/EnrollmentPerformanceInfoService.java

@@ -45,11 +45,28 @@ public class EnrollmentPerformanceInfoService extends ServiceImpl<EnrollmentPerf
         if(com.jeeplus.utils.StringUtils.isNotBlank(status)){
             if("5".equals(status)){
                 queryWrapper.and(wrapper ->
-                        wrapper.eq("status", "5").or().isNull("status").or().eq("status", "")
+                        wrapper.eq("status", "5")
+                                .or().isNull("status")
+                                .or().eq("status", "")
+                                .or().eq("status", "6")
+                );
+            }else if("1".equals(status)) {
+                queryWrapper.and(wrapper ->
+                        wrapper.eq("status", "5")
+                                .or().isNull("status")
+                                .or().eq("status", "")
+                                .or().eq("status", "1")
+                );
+            }else if("2".equals(status)) {
+                queryWrapper.and(wrapper ->
+                        wrapper.eq("status", "2")
+                                .or().eq("status", "4")
                 );
             }else{
                 queryWrapper.and(wrapper ->
-                        wrapper.eq("status", "2").or().eq("status", "4")
+                        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/EnrollmentRegistrationService.java

@@ -3,6 +3,7 @@ package com.jeeplus.human.enrollment.enrollmentRegistration.service;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.util.IdcardUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.extra.spring.SpringUtil;
 import com.alibaba.fastjson.JSON;
@@ -742,8 +743,17 @@ public class EnrollmentRegistrationService extends ServiceImpl<EnrollmentRegistr
         return info;
     }
 
-    public EnrollmentUserInfoAudit findAuditInfoById(String id) {
+    public EnrollmentUserInfoAudit findAuditInfoById(String id,String status) {
         EnrollmentUserInfoAudit info = userInfoAuditService.getById(id);
+        if("1".equals(status)){
+            status = "4";
+        }
+        //根据身份证动态计算年龄
+        String idCard = info.getIdCard();
+        if (StringUtils.isNotBlank(idCard)) {
+            int age = IdcardUtil.getAgeByIdCard(idCard);
+            info.setAge(String.valueOf(age)); // 转成字符串
+        }
 
         if (ObjectUtil.isNotEmpty(info)) {
             // 查询身份证正反面信息
@@ -757,35 +767,35 @@ public class EnrollmentRegistrationService extends ServiceImpl<EnrollmentRegistr
             }
             String userId = info.getUserId();
             //查询教育经历数据
-            List<EnrollmentEduInfo> eduInfoList = eduInfoService.findByUserId(userId, "2");
+            List<EnrollmentEduInfo> eduInfoList = eduInfoService.findByUserId(userId, status);
             info.setEduInfoList(eduInfoList);
 
             //查询工作经历数据
-            List<EnrollmentWorkInfo> workInfos = workInfoService.findByUserId(userId, "2");
+            List<EnrollmentWorkInfo> workInfos = workInfoService.findByUserId(userId, status);
             info.setWorkInfoList(workInfos);
 
             //查询培训经历数据
-            List<EnrollmentTrainingInfo> trainingInfos = trainingInfoService.findByUserId(userId, "2");
+            List<EnrollmentTrainingInfo> trainingInfos = trainingInfoService.findByUserId(userId, status);
             info.setTrainingInfoList(trainingInfos);
 
             //查询资质证书数据
-            List<EnrollmentCertificateInfo> certificateInfoList = certificateInfoService.findByUserId(userId, "2");
+            List<EnrollmentCertificateInfo> certificateInfoList = certificateInfoService.findByUserId(userId, status);
             info.setCertificateInfoList(certificateInfoList);
 
             //查询专业技能数据
-            List<EnrollmentSkillInfo> skillInfoList = skillInfoService.findByUserId(userId, "2");
+            List<EnrollmentSkillInfo> skillInfoList = skillInfoService.findByUserId(userId, status);
             info.setSkillInfoList(skillInfoList);
 
             //查询语言能力数据
-            List<EnrollmentLanguageInfo> languageInfoList = languageInfoService.findByUserId(userId, "2");
+            List<EnrollmentLanguageInfo> languageInfoList = languageInfoService.findByUserId(userId, status);
             info.setLanguageInfoList(languageInfoList);
 
             //查询家庭成员数据
-            List<EnrollmentFamilyInfo> familyInfoList = familyInfoService.findByUserId(userId, "2");
+            List<EnrollmentFamilyInfo> familyInfoList = familyInfoService.findByUserId(userId, status);
             info.setFamilyInfoList(familyInfoList);
 
             //查询奖项信息
-            List<EnrollmentRewardInfo> rewardInfoList = rewardInfoService.findByUserId(userId, "2");
+            List<EnrollmentRewardInfo> rewardInfoList = rewardInfoService.findByUserId(userId, status);
             info.setRewardInfoList(rewardInfoList);
 
             //查询劳动合同
@@ -793,11 +803,11 @@ public class EnrollmentRegistrationService extends ServiceImpl<EnrollmentRegistr
             info.setLaborContractInfoList(laborContractInfoList);
 
             //查询社会及行业职务
-            List<EnrollmentSocietyInfo> societyInfoList = societyInfoService.findByUserId(userId, "2");
+            List<EnrollmentSocietyInfo> societyInfoList = societyInfoService.findByUserId(userId, status);
             info.setSocietyInfoList(societyInfoList);
 
             //工作业绩
-            List<EnrollmentPerformanceInfo> performanceInfoList = performanceInfoService.findByUserId(userId, "2");
+            List<EnrollmentPerformanceInfo> performanceInfoList = performanceInfoService.findByUserId(userId, status);
             info.setPerformanceInfoList(performanceInfoList);
         }
         return info;
@@ -815,6 +825,12 @@ public class EnrollmentRegistrationService extends ServiceImpl<EnrollmentRegistr
     public EnrollmentRegistration findInfoByUserId(String id) throws Exception {
         // 查询基础信息表
         EnrollmentRegistration info = mapper.getInfoByUserId(id);
+        //根据身份证动态计算年龄
+        String idCard = info.getIdCard();
+        if (StringUtils.isNotBlank(idCard)) {
+            int age = IdcardUtil.getAgeByIdCard(idCard);
+            info.setAge(String.valueOf(age)); // 转成字符串
+        }
         //根据用户查询岗位和角色信息
         if (ObjectUtil.isNotEmpty(info)) {
             UserDTO userDTO = SpringUtil.getBean(IUserApi.class).getById(info.getUserId());
@@ -847,35 +863,35 @@ public class EnrollmentRegistrationService extends ServiceImpl<EnrollmentRegistr
 
             String userId = info.getUserId();
             //查询教育经历数据
-            List<EnrollmentEduInfo> eduInfoList = eduInfoService.findByUserId(userId, "5");
+            List<EnrollmentEduInfo> eduInfoList = eduInfoService.findByUserId(userId, "1");
             info.setEduInfoList(eduInfoList);
 
             //查询工作经历数据
-            List<EnrollmentWorkInfo> workInfos = workInfoService.findByUserId(userId, "5");
+            List<EnrollmentWorkInfo> workInfos = workInfoService.findByUserId(userId, "1");
             info.setWorkInfoList(workInfos);
 
             //查询培训经历数据
-            List<EnrollmentTrainingInfo> trainingInfos = trainingInfoService.findByUserId(userId, "5");
+            List<EnrollmentTrainingInfo> trainingInfos = trainingInfoService.findByUserId(userId, "1");
             info.setTrainingInfoList(trainingInfos);
 
             //查询资质证书数据
-            List<EnrollmentCertificateInfo> certificateInfoList = certificateInfoService.findByUserId(userId, "5");
+            List<EnrollmentCertificateInfo> certificateInfoList = certificateInfoService.findByUserId(userId, "1");
             info.setCertificateInfoList(certificateInfoList);
 
             //查询专业技能数据
-            List<EnrollmentSkillInfo> skillInfoList = skillInfoService.findByUserId(userId, "5");
+            List<EnrollmentSkillInfo> skillInfoList = skillInfoService.findByUserId(userId, "1");
             info.setSkillInfoList(skillInfoList);
 
             //查询语言能力数据
-            List<EnrollmentLanguageInfo> languageInfoList = languageInfoService.findByUserId(userId, "5");
+            List<EnrollmentLanguageInfo> languageInfoList = languageInfoService.findByUserId(userId, "1");
             info.setLanguageInfoList(languageInfoList);
 
             //查询家庭成员数据
-            List<EnrollmentFamilyInfo> familyInfoList = familyInfoService.findByUserId(userId, "5");
+            List<EnrollmentFamilyInfo> familyInfoList = familyInfoService.findByUserId(userId, "1");
             info.setFamilyInfoList(familyInfoList);
 
             //查询奖项信息
-            List<EnrollmentRewardInfo> rewardInfoList = rewardInfoService.findByUserId(userId, "5");
+            List<EnrollmentRewardInfo> rewardInfoList = rewardInfoService.findByUserId(userId, "1");
             info.setRewardInfoList(rewardInfoList);
 
             //查询劳动合同
@@ -883,11 +899,11 @@ public class EnrollmentRegistrationService extends ServiceImpl<EnrollmentRegistr
             info.setLaborContractInfoList(laborContractInfoList);
 
             //查询社会及行业职务
-            List<EnrollmentSocietyInfo> societyInfoList = societyInfoService.findByUserId(userId, "5");
+            List<EnrollmentSocietyInfo> societyInfoList = societyInfoService.findByUserId(userId, "1");
             info.setSocietyInfoList(societyInfoList);
 
             //工作业绩
-            List<EnrollmentPerformanceInfo> performanceInfoList = performanceInfoService.findByUserId(userId, "5");
+            List<EnrollmentPerformanceInfo> performanceInfoList = performanceInfoService.findByUserId(userId, "1");
             info.setPerformanceInfoList(performanceInfoList);
         }
 
@@ -933,14 +949,13 @@ public class EnrollmentRegistrationService extends ServiceImpl<EnrollmentRegistr
         return "操作成功";
     }
 
-    public Integer findIdCardOnly(String idCard, String id) throws Exception {
+    public Integer findIdCardOnly(String idCard, String userId) throws Exception {
         QueryWrapper<EnrollmentRegistration> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("id_card", idCard);
         queryWrapper.eq("del_flag", 0);
-        if (StringUtils.isNotBlank(id)) {
-            queryWrapper.ne("id", id);
+        if (StringUtils.isNotBlank(userId)) {
+            queryWrapper.ne("user_id", userId);
         }
-
         // 删除基础信息表
         Integer integer = mapper.selectCount(queryWrapper);
         return integer;
@@ -1005,7 +1020,7 @@ public class EnrollmentRegistrationService extends ServiceImpl<EnrollmentRegistr
             String id = UUID.randomUUID().toString().replace("-", "");
             BeanUtils.copyProperties(registrationData, enrollmentUserInfoAudit);
             enrollmentUserInfoAudit.setStatus("2");
-            if (!"4".equals(registrationData.getStatus())) {
+            if (!"4".equals(registrationData.getStatus()) && !"1".equals(registrationData.getStatus())) {
                 enrollmentUserInfoAudit.setId(id);
                 enrollmentUserInfoAudit.setRegistrationId(registrationData.getId());
             } else {
@@ -1039,6 +1054,10 @@ public class EnrollmentRegistrationService extends ServiceImpl<EnrollmentRegistr
                 saveAttachments(enrollmentUserInfoAudit.getIdCardBack(), "idCardBack", enrollmentUserInfoAudit.getId(), userDTO, workAttachmentApi);
                 saveEnrollmentDetailInfo(registrationData);
             } 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");
             }
         } catch (Exception e) {
@@ -1046,6 +1065,39 @@ public class EnrollmentRegistrationService extends ServiceImpl<EnrollmentRegistr
         }
     }
 
+
+    /**
+     * 用户暂存信息
+     *
+     * @param registrationData
+     */
+    public void updateInfoTemporary(EnrollmentRegistration registrationData) {
+        try {
+            UserDTO userDTO = SpringUtil.getBean(IUserApi.class).getByToken(TokenProvider.getCurrentToken());
+            EnrollmentUserInfoAudit enrollmentUserInfoAudit = new EnrollmentUserInfoAudit();
+            String id = UUID.randomUUID().toString().replace("-", "");
+            BeanUtils.copyProperties(registrationData, enrollmentUserInfoAudit);
+            enrollmentUserInfoAudit.setStatus("1");
+            if (!"4".equals(registrationData.getStatus()) && !"1".equals(registrationData.getStatus())) {
+                enrollmentUserInfoAudit.setId(id);
+                enrollmentUserInfoAudit.setRegistrationId(registrationData.getId());
+            } else {
+                enrollmentUserInfoAudit.setId(registrationData.getId());
+                enrollmentUserInfoAudit.setRegistrationId(registrationData.getRegistrationId());
+            }
+            userInfoAuditService.saveOrUpdate(enrollmentUserInfoAudit);
+            //更新提交审批的时间
+            mapper.updateApprovalTime(registrationData.getUserId());
+                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);
+
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
     public void saveEnrollmentDetailInfo(EnrollmentRegistration dto) {
         // 教育经历
         List<EnrollmentEduInfo> eduList = dto.getEduInfoList();
@@ -1174,7 +1226,6 @@ public class EnrollmentRegistrationService extends ServiceImpl<EnrollmentRegistr
         // 培训经历
         List<EnrollmentTrainingInfo> trainingList = dto.getTrainingInfoList();
         if (CollectionUtils.isNotEmpty(trainingList)) {
-            trainingList.forEach(item -> item.setStatus("2"));
             trainingList.forEach(item -> {
                 item.setStatus(status);
                 trainingInfoService.saveOrUpdate(item);
@@ -1776,6 +1827,81 @@ public class EnrollmentRegistrationService extends ServiceImpl<EnrollmentRegistr
         }
     }
 
+    public void updateInfoStatus(EnrollmentRegistration info) {
+        try {
+            String type = info.getType();
+            switch (type){
+                case "1":
+                    EnrollmentEduInfo enrollmentEduInfo = new EnrollmentEduInfo();
+                    enrollmentEduInfo.setId(info.getId());
+                    enrollmentEduInfo.setStatus(info.getStatus());
+                    eduInfoService.updateById(enrollmentEduInfo);
+                    break;
+                case "2":
+                    EnrollmentWorkInfo workInfo = new EnrollmentWorkInfo();
+                    workInfo.setId(info.getId());
+                    workInfo.setStatus(info.getStatus());
+                    workInfoService.updateById(workInfo);
+                    break;
+                case "3":
+                    EnrollmentTrainingInfo trainingInfo = new EnrollmentTrainingInfo();
+                    trainingInfo.setId(info.getId());
+                    trainingInfo.setStatus(info.getStatus());
+                    trainingInfoService.updateById(trainingInfo);
+                    break;
+                case "4":
+                    EnrollmentCertificateInfo certificateInfo = new EnrollmentCertificateInfo();
+                    certificateInfo.setId(info.getId());
+                    certificateInfo.setStatus(info.getStatus());
+                    certificateInfoService.updateById(certificateInfo);
+                    break;
+                case "5":
+                    EnrollmentSkillInfo skillInfo = new EnrollmentSkillInfo();
+                    skillInfo.setId(info.getId());
+                    skillInfo.setStatus(info.getStatus());
+                    skillInfoService.updateById(skillInfo);
+                    break;
+                case "6":
+                    EnrollmentLanguageInfo enrollmentLanguageInfo = new EnrollmentLanguageInfo();
+                    enrollmentLanguageInfo.setId(info.getId());
+                    enrollmentLanguageInfo.setStatus(info.getStatus());
+                    languageInfoService.updateById(enrollmentLanguageInfo);
+                    break;
+                case "7":
+                    EnrollmentFamilyInfo enrollmentFamilyInfo = new EnrollmentFamilyInfo();
+                    enrollmentFamilyInfo.setId(info.getId());
+                    enrollmentFamilyInfo.setStatus(info.getStatus());
+                    familyInfoService.updateById(enrollmentFamilyInfo);
+                    break;
+                case "8":
+                    EnrollmentRewardInfo enrollmentRewardInfo = new EnrollmentRewardInfo();
+                    enrollmentRewardInfo.setId(info.getId());
+                    enrollmentRewardInfo.setStatus(info.getStatus());
+                    rewardInfoService.updateById(enrollmentRewardInfo);
+                    break;
+                case "9":
+                    EnrollmentSocietyInfo enrollmentSocietyInfo = new EnrollmentSocietyInfo();
+                    enrollmentSocietyInfo.setId(info.getId());
+                    enrollmentSocietyInfo.setStatus(info.getStatus());
+                    societyInfoService.updateById(enrollmentSocietyInfo);
+                    break;
+                case "10":
+                    EnrollmentPerformanceInfo enrollmentPerformanceInfo = new EnrollmentPerformanceInfo();
+                    enrollmentPerformanceInfo.setId(info.getId());
+                    enrollmentPerformanceInfo.setStatus(info.getStatus());
+                    performanceInfoService.updateById(enrollmentPerformanceInfo);
+                    break;
+                default:
+
+                    break;
+            }
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+
+
 
     /**
      * 批量下载附件压缩包

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

@@ -68,11 +68,28 @@ public class EnrollmentRewardInfoService extends ServiceImpl<EnrollmentRewardInf
         if(com.jeeplus.utils.StringUtils.isNotBlank(status)){
             if("5".equals(status)){
                 queryWrapper.and(wrapper ->
-                        wrapper.eq("status", "5").or().isNull("status").or().eq("status", "")
+                        wrapper.eq("status", "5")
+                                .or().isNull("status")
+                                .or().eq("status", "")
+                                .or().eq("status", "6")
+                );
+            }else if("1".equals(status)) {
+                queryWrapper.and(wrapper ->
+                        wrapper.eq("status", "5")
+                                .or().isNull("status")
+                                .or().eq("status", "")
+                                .or().eq("status", "1")
+                );
+            }else if("2".equals(status)) {
+                queryWrapper.and(wrapper ->
+                        wrapper.eq("status", "2")
+                                .or().eq("status", "4")
                 );
             }else{
                 queryWrapper.and(wrapper ->
-                        wrapper.eq("status", "2").or().eq("status", "4")
+                        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/EnrollmentSkillInfoService.java

@@ -68,11 +68,28 @@ public class EnrollmentSkillInfoService extends ServiceImpl<EnrollmentSkillInfoM
         if(com.jeeplus.utils.StringUtils.isNotBlank(status)){
             if("5".equals(status)){
                 queryWrapper.and(wrapper ->
-                        wrapper.eq("status", "5").or().isNull("status").or().eq("status", "")
+                        wrapper.eq("status", "5")
+                                .or().isNull("status")
+                                .or().eq("status", "")
+                                .or().eq("status", "6")
+                );
+            }else if("1".equals(status)) {
+                queryWrapper.and(wrapper ->
+                        wrapper.eq("status", "5")
+                                .or().isNull("status")
+                                .or().eq("status", "")
+                                .or().eq("status", "1")
+                );
+            }else if("2".equals(status)) {
+                queryWrapper.and(wrapper ->
+                        wrapper.eq("status", "2")
+                                .or().eq("status", "4")
                 );
             }else{
                 queryWrapper.and(wrapper ->
-                        wrapper.eq("status", "2").or().eq("status", "4")
+                        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/EnrollmentSocietyInfoService.java

@@ -45,11 +45,28 @@ public class EnrollmentSocietyInfoService extends ServiceImpl<EnrollmentSocietyI
         if(com.jeeplus.utils.StringUtils.isNotBlank(status)){
             if("5".equals(status)){
                 queryWrapper.and(wrapper ->
-                        wrapper.eq("status", "5").or().isNull("status").or().eq("status", "")
+                        wrapper.eq("status", "5")
+                                .or().isNull("status")
+                                .or().eq("status", "")
+                                .or().eq("status", "6")
+                );
+            }else if("1".equals(status)) {
+                queryWrapper.and(wrapper ->
+                        wrapper.eq("status", "5")
+                                .or().isNull("status")
+                                .or().eq("status", "")
+                                .or().eq("status", "1")
+                );
+            }else if("2".equals(status)) {
+                queryWrapper.and(wrapper ->
+                        wrapper.eq("status", "2")
+                                .or().eq("status", "4")
                 );
             }else{
                 queryWrapper.and(wrapper ->
-                        wrapper.eq("status", "2").or().eq("status", "4")
+                        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/EnrollmentTrainingInfoService.java

@@ -66,11 +66,28 @@ public class EnrollmentTrainingInfoService extends ServiceImpl<EnrollmentTrainin
         if(com.jeeplus.utils.StringUtils.isNotBlank(status)){
             if("5".equals(status)){
                 queryWrapper.and(wrapper ->
-                        wrapper.eq("status", "5").or().isNull("status").or().eq("status", "")
+                        wrapper.eq("status", "5")
+                                .or().isNull("status")
+                                .or().eq("status", "")
+                                .or().eq("status", "6")
+                );
+            }else if("1".equals(status)) {
+                queryWrapper.and(wrapper ->
+                        wrapper.eq("status", "5")
+                                .or().isNull("status")
+                                .or().eq("status", "")
+                                .or().eq("status", "1")
+                );
+            }else if("2".equals(status)) {
+                queryWrapper.and(wrapper ->
+                        wrapper.eq("status", "2")
+                                .or().eq("status", "4")
                 );
             }else{
                 queryWrapper.and(wrapper ->
-                        wrapper.eq("status", "2").or().eq("status", "4")
+                        wrapper.eq("status", "2")
+                                .or().eq("status", "4")
+                                .or().eq("status", "1")
                 );
             }
         }
@@ -137,7 +154,7 @@ public class EnrollmentTrainingInfoService extends ServiceImpl<EnrollmentTrainin
 
     public void update(EnrollmentTrainingInfo info){
         UserDTO userDTO = SpringUtil.getBean(IUserApi.class).getByToken(TokenProvider.getCurrentToken());
-        mapper.updateById(info);
+            mapper.updateById(info);
         // 保存附件
         if (ObjectUtil.isNotEmpty(info.getFiles())) {
             SpringUtil.getBean ( IWorkAttachmentApi.class ).deleteByAttachmentId(info.getId());
@@ -163,7 +180,6 @@ public class EnrollmentTrainingInfoService extends ServiceImpl<EnrollmentTrainin
                 sort.getAndIncrement();
             });
         }
-
     }
 
     public void saveOrUpdateWorkAttachment(EnrollmentTrainingInfo info){

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

@@ -123,6 +123,8 @@ public class EnrollmentUserInfoAuditService extends ServiceImpl<EnrollmentUserIn
                         .eq("user_id", userId)
                         .and(wrapper ->
                                 wrapper.eq("status", "5")
+                                        .or().eq("status", "1")
+                                        .or().eq("status", "6")
                                         .or().isNull("status")
                                         .or().eq("status", "")
                         )
@@ -133,6 +135,8 @@ public class EnrollmentUserInfoAuditService extends ServiceImpl<EnrollmentUserIn
                         .eq("user_id", userId)
                         .and(wrapper ->
                                 wrapper.eq("status", "5")
+                                        .or().eq("status", "1")
+                                        .or().eq("status", "6")
                                         .or().isNull("status")
                                         .or().eq("status", "")
                         )
@@ -143,6 +147,8 @@ public class EnrollmentUserInfoAuditService extends ServiceImpl<EnrollmentUserIn
                         .eq("user_id", userId)
                         .and(wrapper ->
                                 wrapper.eq("status", "5")
+                                        .or().eq("status", "1")
+                                        .or().eq("status", "6")
                                         .or().isNull("status")
                                         .or().eq("status", "")
                         )
@@ -153,6 +159,8 @@ public class EnrollmentUserInfoAuditService extends ServiceImpl<EnrollmentUserIn
                         .eq("user_id", userId)
                         .and(wrapper ->
                                 wrapper.eq("status", "5")
+                                        .or().eq("status", "1")
+                                        .or().eq("status", "6")
                                         .or().isNull("status")
                                         .or().eq("status", "")
                         )
@@ -163,6 +171,8 @@ public class EnrollmentUserInfoAuditService extends ServiceImpl<EnrollmentUserIn
                         .eq("user_id", userId)
                         .and(wrapper ->
                                 wrapper.eq("status", "5")
+                                        .or().eq("status", "1")
+                                        .or().eq("status", "6")
                                         .or().isNull("status")
                                         .or().eq("status", "")
                         )
@@ -173,6 +183,8 @@ public class EnrollmentUserInfoAuditService extends ServiceImpl<EnrollmentUserIn
                         .eq("user_id", userId)
                         .and(wrapper ->
                                 wrapper.eq("status", "5")
+                                        .or().eq("status", "1")
+                                        .or().eq("status", "6")
                                         .or().isNull("status")
                                         .or().eq("status", "")
                         )
@@ -183,6 +195,8 @@ public class EnrollmentUserInfoAuditService extends ServiceImpl<EnrollmentUserIn
                         .eq("user_id", userId)
                         .and(wrapper ->
                                 wrapper.eq("status", "5")
+                                        .or().eq("status", "1")
+                                        .or().eq("status", "6")
                                         .or().isNull("status")
                                         .or().eq("status", "")
                         )
@@ -193,6 +207,8 @@ public class EnrollmentUserInfoAuditService extends ServiceImpl<EnrollmentUserIn
                         .eq("user_id", userId)
                         .and(wrapper ->
                                 wrapper.eq("status", "5")
+                                        .or().eq("status", "1")
+                                        .or().eq("status", "6")
                                         .or().isNull("status")
                                         .or().eq("status", "")
                         )
@@ -203,6 +219,8 @@ public class EnrollmentUserInfoAuditService extends ServiceImpl<EnrollmentUserIn
                         .eq("user_id", userId)
                         .and(wrapper ->
                                 wrapper.eq("status", "5")
+                                        .or().eq("status", "1")
+                                        .or().eq("status", "6")
                                         .or().isNull("status")
                                         .or().eq("status", "")
                         )
@@ -213,6 +231,8 @@ public class EnrollmentUserInfoAuditService extends ServiceImpl<EnrollmentUserIn
                         .eq("user_id", userId)
                         .and(wrapper ->
                                 wrapper.eq("status", "5")
+                                        .or().eq("status", "1")
+                                        .or().eq("status", "6")
                                         .or().isNull("status")
                                         .or().eq("status", "")
                         )
@@ -300,6 +320,88 @@ public class EnrollmentUserInfoAuditService extends ServiceImpl<EnrollmentUserIn
         String status = "4";
         sendNotify(userDTO,registration.getProcessDefinitionId());
         enrollmentRegistrationMapper.updateApprovalTime(registration.getUserId());
+        eduInfoService.remove(
+                new QueryWrapper<EnrollmentEduInfo>()
+                        .eq("user_id", userId)
+                        .and(wrapper ->
+                                wrapper.or().eq("status", "1")
+                        )
+        );
+
+        workInfoService.remove(
+                new QueryWrapper<EnrollmentWorkInfo>()
+                        .eq("user_id", userId)
+                        .and(wrapper ->
+                                wrapper.eq("status", "1")
+
+                        )
+        );
+
+        trainingInfoService.remove(
+                new QueryWrapper<EnrollmentTrainingInfo>()
+                        .eq("user_id", userId)
+                        .and(wrapper ->
+                                wrapper.eq("status", "1")
+                        )
+        );
+
+        certificateInfoService.remove(
+                new QueryWrapper<EnrollmentCertificateInfo>()
+                        .eq("user_id", userId)
+                        .and(wrapper ->
+                                wrapper.eq("status", "1")
+                        )
+        );
+
+        skillInfoService.remove(
+                new QueryWrapper<EnrollmentSkillInfo>()
+                        .eq("user_id", userId)
+                        .and(wrapper ->
+                                wrapper.eq("status", "1")
+                        )
+        );
+
+        languageInfoService.remove(
+                new QueryWrapper<EnrollmentLanguageInfo>()
+                        .eq("user_id", userId)
+                        .and(wrapper ->
+                                wrapper.eq("status", "1")
+                        )
+        );
+
+        familyInfoService.remove(
+                new QueryWrapper<EnrollmentFamilyInfo>()
+                        .eq("user_id", userId)
+                        .and(wrapper ->
+                                wrapper.eq("status", "1")
+                        )
+        );
+
+        rewardInfoService.remove(
+                new QueryWrapper<EnrollmentRewardInfo>()
+                        .eq("user_id", userId)
+                        .and(wrapper ->
+                                wrapper.eq("status", "1")
+                        )
+        );
+
+        societyInfoService.remove(
+                new QueryWrapper<EnrollmentSocietyInfo>()
+                        .eq("user_id", userId)
+                        .and(wrapper ->
+                                wrapper.eq("status", "1")
+
+                        )
+        );
+
+        performanceInfoService.remove(
+                new QueryWrapper<EnrollmentPerformanceInfo>()
+                        .eq("user_id", userId)
+                        .and(wrapper ->
+                                wrapper.eq("status", "1")
+
+                        )
+        );
         //  修改数据状态
         eduInfoService.update(
                 new LambdaUpdateWrapper<EnrollmentEduInfo>()

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

@@ -42,11 +42,28 @@ public class EnrollmentWorkInfoService extends ServiceImpl<EnrollmentWorkInfoMap
         if(com.jeeplus.utils.StringUtils.isNotBlank(status)){
             if("5".equals(status)){
                 queryWrapper.and(wrapper ->
-                        wrapper.eq("status", "5").or().isNull("status").or().eq("status", "")
+                        wrapper.eq("status", "5")
+                                .or().isNull("status")
+                                .or().eq("status", "")
+                                .or().eq("status", "6")
+                );
+            }else if("1".equals(status)) {
+                queryWrapper.and(wrapper ->
+                        wrapper.eq("status", "5")
+                                .or().isNull("status")
+                                .or().eq("status", "")
+                                .or().eq("status", "1")
+                );
+            }else if("2".equals(status)) {
+                queryWrapper.and(wrapper ->
+                                wrapper.eq("status", "2")
+                                        .or().eq("status", "4")
                 );
             }else{
                 queryWrapper.and(wrapper ->
-                        wrapper.eq("status", "2").or().eq("status", "4")
+                        wrapper.eq("status", "2")
+                                .or().eq("status", "4")
+                                .or().eq("status", "1")
                 );
             }
         }

jeeplus-modules/jeeplus-public-modules/src/main/java/com/jeeplus/pubmodules/oss/controller/OssFileController.java

@@ -163,6 +163,13 @@ public class OssFileController {
         return ResponseEntity.ok(fileDetailDTO);
     }
 
+    @GetMapping("/getSFZSizeByUrl")
+    @ApiOperation(value = "根据文件路径获取身份证图片信息")
+    public ResponseEntity<FileDetailDTO> getSFZSizeByUrl(@RequestParam("url") String url) {
+        FileDetailDTO fileDetailDTO = ossService.getSFZSizeByUrl(url);
+        return ResponseEntity.ok(fileDetailDTO);
+    }
+
     /**
      * 上传文件
      * @return

jeeplus-modules/jeeplus-public-modules/src/main/java/com/jeeplus/pubmodules/oss/service/OssService.java

@@ -239,6 +239,26 @@ public class OssService extends ServiceImpl<OssServiceMapper, WorkAttachment> {
         return fileDetailDTO;
     }
 
+
+    /**
+     * 根据文件路径获取文件信息
+     * @param url
+     * @return
+     */
+    public FileDetailDTO getSFZSizeByUrl(String url){
+        FileDetailDTO fileDetailDTO = new FileDetailDTO();
+        fileDetailDTO.setUrl(getThumbnailTemporaryWithWatermarkDimLookUrl(aliyunUrl + url));
+        Long fileSizeBytes = ossClientService.getSimplifiedObjectMeta(aliyunUrl + url);
+        if(null != fileSizeBytes){
+            Double fileSize = (double)fileSizeBytes;
+            fileDetailDTO.setSize(String.format("%.2f", fileSize));
+        }else{
+            fileDetailDTO.setSize("0");
+        }
+        return fileDetailDTO;
+    }
+
+
     /**
      * 阿里云获取临时文件查看url
      * @param url