用户信息审批历史数据查询处理

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

@@ -370,13 +370,16 @@ public class EnrollmentRegistrationController {
 
     /**
      * 查询正在审批中的信息
-     * @param id
      * @return
      */
     @ApiOperation(value = "查询正在审批中的信息")
     @GetMapping("/findAuditInfoById")
-    public ResponseEntity<EnrollmentUserInfoAudit> findAuditInfoById(@RequestParam String id,@RequestParam String status) throws Exception{
-        EnrollmentUserInfoAudit dto = service.findAuditInfoById(id,status);
+    public ResponseEntity<EnrollmentUserInfoAudit> findAuditInfoById(EnrollmentUserInfoAudit info) throws Exception{
+        String flag = "1";
+        if(StringUtils.isBlank(info.getFlag())){
+            flag = "0";
+        }
+        EnrollmentUserInfoAudit dto = service.findAuditInfoById(info.getId(),info.getStatus(),flag);
         return ResponseEntity.ok(dto);
     }
 

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/domain/EnrollmentUserInfoAudit.java

@@ -43,6 +43,8 @@ public class EnrollmentUserInfoAudit extends BaseEntity {
     private String procInsId;
     private String registrationId;
     @TableField(exist = false)
+    private String flag;
+    @TableField(exist = false)
     private List<WorkAttachmentInfoDTO> idCardFront; //身份证正面
     @TableField(exist = false)
     private List<WorkAttachmentInfoDTO> idCardBack; //身份证反面

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

@@ -14,4 +14,6 @@ import org.apache.ibatis.annotations.Param;
 @InterceptorIgnore(tenantLine = "true")
 public interface EnrollmentUserInfoAuditMapper extends BaseMapper<EnrollmentUserInfoAudit> {
 
+
+    EnrollmentUserInfoAudit findAuditInfoById(@Param("id")String id);
 }

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

@@ -26,6 +26,9 @@
         a.id_card,
         a.home_address,
         a.permanent_address,
+        a.email,
+        a.process_definition_id,
+        a.proc_ins_id,
         a.registration_id
     </sql>
 
@@ -45,5 +48,14 @@
     </select>
 
 
+    <select id="findAuditInfoById" resultType="com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentUserInfoAudit">
+        SELECT
+        <include refid="Base_Column_List"></include>
+        FROM
+        human_resources_enrollment_user_info_audit a
+        WHERE
+           id = #{id}
+    </select>
+
 
 </mapper>

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

@@ -24,6 +24,7 @@ import com.jeeplus.flowable.feign.IFlowableApi;
 import com.jeeplus.human.enrollment.enrollmentRegistration.domain.*;
 import com.jeeplus.human.enrollment.enrollmentRegistration.mapper.EnrollmentRegistrationMapper;
 import com.jeeplus.human.enrollment.enrollmentRegistration.mapper.EnrollmentSocialSecurityCardMapper;
+import com.jeeplus.human.enrollment.enrollmentRegistration.mapper.EnrollmentUserInfoAuditMapper;
 import com.jeeplus.human.enrollment.enrollmentRegistration.mapper.EnrollmentWageCardMapper;
 import com.jeeplus.human.enrollment.enrollmentRegistration.service.dto.DingTalkUserDTO;
 import com.jeeplus.human.enrollment.enrollmentRegistration.service.dto.ExportDTO;
@@ -62,6 +63,9 @@ public class EnrollmentRegistrationService extends ServiceImpl<EnrollmentRegistr
 
     @Resource
     private EnrollmentRegistrationMapper mapper;
+    @Resource
+    private EnrollmentUserInfoAuditMapper userInfoAuditMapper;
+
 
     @Resource
     private EnrollmentWageCardService wageCardService;
@@ -758,8 +762,9 @@ public class EnrollmentRegistrationService extends ServiceImpl<EnrollmentRegistr
         return info;
     }
 
-    public EnrollmentUserInfoAudit findAuditInfoById(String id,String status) {
-        EnrollmentUserInfoAudit info = userInfoAuditService.getById(id);
+    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";
         }
@@ -771,9 +776,13 @@ public class EnrollmentRegistrationService extends ServiceImpl<EnrollmentRegistr
         }
 
         if (ObjectUtil.isNotEmpty(info)) {
+            String idCardId = info.getId();
             // 查询身份证正反面信息
-            List<WorkAttachmentInfoDTO> idCardFront = mapper.findDtos(info.getId(), "idCardFront");
-            List<WorkAttachmentInfoDTO> idCardBack = mapper.findDtos(info.getId(), "idCardBack");
+            if("1".equals(flag)){
+                idCardId = info.getIdCard();
+            }
+            List<WorkAttachmentInfoDTO> idCardFront = mapper.findDtos(idCardId, "idCardFront");
+            List<WorkAttachmentInfoDTO> idCardBack = mapper.findDtos(idCardId, "idCardBack");
             if (CollectionUtils.isNotEmpty(idCardFront)) {
                 info.setIdCardFront(idCardFront);
             }

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

@@ -534,4 +534,10 @@ public class EnrollmentUserInfoAuditService extends ServiceImpl<EnrollmentUserIn
     }
 
 
+
+    public EnrollmentUserInfoAudit findAuditInfoById(String id,String flag){
+        return  mapper.findAuditInfoById( id);
+    }
+
+
 }