用户信息审批添加审批时间字段 和 审核人调整

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

@@ -90,4 +90,7 @@ public interface EnrollmentRegistrationMapper extends BaseMapper<EnrollmentRegis
 
     List<WorkAttachmentInfoDTO> findDtosById(@Param("id")String id);
 
+
+
+    void updateApprovalTime(@Param("userId")String userId);
 }

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

@@ -211,6 +211,11 @@
         where user_id =#{userId} and del_flag = '0'
     </update>
 
+    <update id="updateApprovalTime">
+        UPDATE human_resources_enrollment_registration
+        SET approval_time = NOW()
+        WHERE user_id = #{userId} AND del_flag = '0'
+    </update>
     <select id="findDtos" resultType="com.jeeplus.sys.service.dto.WorkAttachmentInfoDTO">
         SELECT
             id,

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

@@ -992,13 +992,15 @@ public class EnrollmentRegistrationService extends ServiceImpl<EnrollmentRegistr
             String businessId = enrollmentUserInfoAudit.getId();
             String title = enrollmentUserInfoAudit.getName() + "发起了- [" + enrollmentUserInfoAudit.getName() + "员工信息完善]";
             //根据角色查用户信息
-            RoleDTO roleDTO = SpringUtil.getBean(IRoleApi.class).getRoleDTOByName2("实习信息审核员");
-            String assignee = getAssignee(roleDTO.getId());
+            //RoleDTO roleDTO = SpringUtil.getBean(IRoleApi.class).getRoleDTOByName2("实习信息审核员");
+            //String assignee = getAssignee(roleDTO.getId());
             String recordType = "";
-            Map<String, String> newMap = pingMap(procDefId, procDefKey, businessTable, businessId, title, assignee, recordType);
+            Map<String, String> newMap = pingMap(procDefId, procDefKey, businessTable, businessId, title,"", recordType);
+            newMap.put("userId",registrationData.getUserId());
             allMap.put("员工信息审批", newMap);
             SpringUtil.getBean(IFlowableApi.class).startForFenNew(allMap);
-
+            //更新提交审批的时间
+            mapper.updateApprovalTime(registrationData.getUserId());
             if (!"4".equals(registrationData.getStatus())) {
                 IWorkAttachmentApi workAttachmentApi = SpringUtil.getBean(IWorkAttachmentApi.class);
                 SpringUtil.getBean(IWorkAttachmentApi.class).deleteByAttachmentId(enrollmentUserInfoAudit.getId());

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

@@ -71,6 +71,9 @@ public class EnrollmentUserInfoAuditService extends ServiceImpl<EnrollmentUserIn
     @Resource
     private IFlowableApi flowTaskService;
 
+    @Resource
+    private EnrollmentRegistrationMapper enrollmentRegistrationMapper;
+
 
     public void updateInfoAgree(EnrollmentUserInfoAudit registration) throws ApiException {
         UserDTO userDTO = SpringUtil.getBean(IUserApi.class).getById(registration.getUserId());
@@ -105,6 +108,8 @@ public class EnrollmentUserInfoAuditService extends ServiceImpl<EnrollmentUserIn
         entity.setId(registration.getId()); // 目标记录ID
         String status = registration.getStatus();
         mapper.deleteById(registration.getId());
+        //更新提交审批的时间
+        enrollmentRegistrationMapper.updateApprovalTime(registration.getUserId());
         String userId = registration.getUserId();
         //删除旧数据
         eduInfoService.remove(
@@ -245,16 +250,14 @@ public class EnrollmentUserInfoAuditService extends ServiceImpl<EnrollmentUserIn
 
     public void updateInfoReject(EnrollmentUserInfoAudit registration) throws ApiException {
         UserDTO userDTO = SpringUtil.getBean(IUserApi.class).getById(registration.getUserId());
-        //审批不通过后，删除所有数据，重置状态，恢复审批前的数据
         EnrollmentUserInfoAudit enrollmentUserInfoAudit = new EnrollmentUserInfoAudit();
-        //mapper.deleteById(registration.getId());
         enrollmentUserInfoAudit.setId(registration.getId());
         enrollmentUserInfoAudit.setStatus("4");
         mapper.updateById(enrollmentUserInfoAudit);
-        //SpringUtil.getBean(IWorkAttachmentApi.class).deleteByAttachmentId(registration.getId());
         String userId = registration.getUserId();
         String status = "4";
         sendNotify(userDTO,registration.getProcessDefinitionId());
+        enrollmentRegistrationMapper.updateApprovalTime(registration.getUserId());
         //  修改数据状态
         eduInfoService.update(
                 new LambdaUpdateWrapper<EnrollmentEduInfo>()