入职登记功能调整

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

@@ -113,4 +113,11 @@ public class EnrollmentRegistration extends BaseEntity {
     @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     @Excel(name = "进所日期",exportFormat = "yyyy-MM-dd",importFormat = "yyyy-MM-dd")
     private Date inDate;  //进所日期
+    @TableField(exist = false)
+    private String loginFlag; //是否允许登录
+    @TableField(exist = false)
+    private String confirmNewPassword; //确认密码
+    @TableField(exist = false)
+    private String newPassword; //新密码
+
 }

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

@@ -70,11 +70,13 @@
         <include refid="Base_Column_List"></include>,
         d.ID_ AS task_id,
         su.name as projectManagerName,
-        so.name as departmentName
+        so.name as departmentName,
+        u.login_flag as loginFlag
         from human_resources_enrollment_registration a
         LEFT JOIN act_ru_task d ON a.proc_ins_id = d.PROC_INST_ID_
         left join sys_user su on a.project_manager = su.id
         left join sys_office so on a.department = so.id
+        left join sys_user u ON a.user_id = u.id
         ${ew.customSqlSegment}
         ORDER BY a.create_time DESC
     </select>

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

@@ -28,6 +28,7 @@ import com.jeeplus.human.enrollment.enrollmentRegistration.utils.DingTalkUtils;
 import com.jeeplus.human.enrollment.enrollmentRegistration.utils.SnowFlake;
 import com.jeeplus.sys.feign.*;
 import com.jeeplus.sys.service.dto.*;
+import com.jeeplus.sys.utils.UserUtils;
 import com.taobao.api.ApiException;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -734,6 +735,22 @@ public class EnrollmentRegistrationService extends ServiceImpl<EnrollmentRegistr
             }
             //钉钉逻辑
         }
+
+        //修改密码
+        String newPassword = report.getNewPassword();
+        String confirmNewPassword = report.getConfirmNewPassword();
+        UserDTO userDTO1 =  SpringUtil.getBean(IUserApi.class).getById(reportData.getUserId());
+        if(StringUtils.isNotBlank(newPassword) && StringUtils.isNotBlank(confirmNewPassword)){
+            if (newPassword.equals(confirmNewPassword)){
+                userDTO1.setId(reportData.getUserId());
+                userDTO1.setPassword(SecurityUtils.encryptPassword(newPassword));
+                userDTO1.setUpPassword("0");
+                SpringUtil.getBean(IUserApi.class).saveOrUpdate(userDTO1);
+                UserUtils.deleteCache(userDTO1);
+            }
+        }
+
+
         mapper.updateById(report);
 
         if (StringUtils.isNotBlank(report.getSocialSecurityNumber())) {

jeeplus-modules/jeeplus-system/src/main/java/com/jeeplus/sys/mapper/UserMapper.java

@@ -263,6 +263,8 @@ public interface UserMapper extends BaseMapper <User> {
 
     void updateEmail(@Param("id") String id, @Param("userEmail") String userEmail);
 
+    void updateLoginFlag(@Param("id") String id, @Param("loginFlag") String loginFlag);
+
     @InterceptorIgnore(tenantLine = "true")
     UserDTO getByIdNoTenantId(String id);
 

jeeplus-modules/jeeplus-system/src/main/java/com/jeeplus/sys/mapper/xml/UserMapper.xml

@@ -584,6 +584,11 @@ select a.id, a.company_id as "companyDTO.id", a.office_id as "officeDTO.id", a.l
     <update id="updateEmail">
         update sys_user set email=#{userEmail} where id=#{id}
     </update>
+
+    <update id="updateLoginFlag">
+        update sys_user set login_flag=#{loginFlag} where id=#{id}
+    </update>
+
     <update id="updateDelFlagById">
         update sys_user set del_flag = '1',login_flag = '0' where id=#{id}
     </update>

jeeplus-modules/jeeplus-system/src/main/java/com/jeeplus/sys/service/UserService.java

@@ -741,6 +741,17 @@ public class UserService extends ServiceImpl<UserMapper, User> {
         userMapper.updateEmail(id, userEmail);
     }
 
+    /**
+     * 修改用户是否允许登录状态
+     *
+     * @param id
+     * @param loginFlag
+     * @return
+     */
+    public void updateLoginFlag(String id, String loginFlag) {
+        userMapper.updateLoginFlag(id, loginFlag);
+    }
+
     public Integer selectCountByMobile(String mobile) {
         QueryWrapper<User> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("mobile", mobile);