员工入职系统账号生成问题调整

jeeplus-api/jeeplus-system-api/src/main/java/com/jeeplus/flowable/factory/FlowableApiFallbackFactory.java

@@ -10,6 +10,7 @@ import org.springframework.cloud.openfeign.FallbackFactory;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 import java.util.List;
 import java.util.Map;

jeeplus-api/jeeplus-system-api/src/main/java/com/jeeplus/sys/factory/RoleApiFallbackFactory.java

@@ -27,6 +27,11 @@ public class RoleApiFallbackFactory implements FallbackFactory <IRoleApi> {
             }
 
             @Override
+            public RoleDTO getRoleDTOByNameAndTenantId(String name, String tenantId) {
+                return null;
+            }
+
+            @Override
             public RoleDTO getRoleDTOByName2(String name) {
                 return null;
             }

jeeplus-api/jeeplus-system-api/src/main/java/com/jeeplus/sys/factory/UserApiFallbackFactory.java

@@ -31,6 +31,11 @@ public class UserApiFallbackFactory implements FallbackFactory <IUserApi> {
         throwable.printStackTrace ( );
         return new IUserApi ( ) {
             @Override
+            public Integer selectCountByMobile(String mobile) {
+                return null;
+            }
+
+            @Override
             public Map<String, Object> sendRandomCodes(String mobile, String randomCode) throws IOException {
                 return null;
             }

jeeplus-api/jeeplus-system-api/src/main/java/com/jeeplus/sys/feign/IRoleApi.java

@@ -22,6 +22,13 @@ public interface IRoleApi {
      *
      * @return
      */
+    @GetMapping(value = "/feign/sys/role/getRoleDTOByNameAndTenantId")
+    RoleDTO getRoleDTOByNameAndTenantId(@RequestParam(value = "name") String name,@RequestParam(value = "tenantId") String tenantId);
+    /**
+     * 获取角色
+     *
+     * @return
+     */
     @GetMapping(value = "/sys/role/getRoleDTOByName2")
     RoleDTO getRoleDTOByName2(@RequestParam(value = "name") String name);
     /**

jeeplus-api/jeeplus-system-api/src/main/java/com/jeeplus/sys/feign/IUserApi.java

@@ -22,6 +22,12 @@ public interface IUserApi {
     String BASE_URL = "/feign/sys/user";
 
     /**
+     * 根据联系电话查询用户
+     * @return
+     */
+    @RequestMapping(value = BASE_URL + "/selectCountByMobile", method = RequestMethod.POST)
+    Integer selectCountByMobile(@RequestParam(value = "mobile")String mobile);
+    /**
      * 发送短信
      * @param mobile
      * @param randomCode

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/depart/registration/service/DepartService.java

@@ -46,6 +46,15 @@ public class DepartService extends ServiceImpl<DepartMapper, DepartRegistration>
     public IPage<DepartRegistration> findList(Page<DepartRegistration> page, DepartRegistration projectReportData) throws Exception{
         QueryWrapper<DepartRegistration> queryWrapper = QueryWrapperGenerator.buildQueryCondition (projectReportData,DepartRegistration.class);
         queryWrapper.eq("a.del_flag","0");
+        if (StringUtils.isNotBlank(projectReportData.getDepartment())) {
+            queryWrapper.eq("a.department",projectReportData.getDepartment());
+        }
+        if (StringUtils.isNotBlank(projectReportData.getMobile())) {
+            queryWrapper.eq("su.mobile",projectReportData.getMobile());
+        }
+        if (StringUtils.isNotBlank(projectReportData.getName())) {
+            queryWrapper.like("a.name",projectReportData.getName());
+        }
         IPage<DepartRegistration> list = mapper.findList(page, queryWrapper);
         list.getRecords().forEach(item -> {
             // 入库 修改申请

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

@@ -19,10 +19,7 @@ import com.jeeplus.sys.feign.IOfficeApi;
 import com.jeeplus.sys.feign.IPostApi;
 import com.jeeplus.sys.feign.IRoleApi;
 import com.jeeplus.sys.feign.IUserApi;
-import com.jeeplus.sys.service.dto.OfficeDTO;
-import com.jeeplus.sys.service.dto.PostDTO;
-import com.jeeplus.sys.service.dto.RoleDTO;
-import com.jeeplus.sys.service.dto.UserDTO;
+import com.jeeplus.sys.service.dto.*;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
@@ -154,23 +151,38 @@ public class EnrollmentRegistrationService extends ServiceImpl<EnrollmentRegistr
                 OfficeDTO officeDTO = new OfficeDTO();
                 officeDTO.setId(report.getDepartment());
                 //设置角色
-                RoleDTO roleInfo = SpringUtil.getBean(IRoleApi.class).getRoleDTOByName("兴光会计员工");
+                OfficeDTO office = SpringUtil.getBean(IOfficeApi.class).getOfficeById(report.getDepartment());
+
+                String name = "兴光会计员工";
+                RoleDTO roleInfo = SpringUtil.getBean(IRoleApi.class).getRoleDTOByNameAndTenantId(name,office.getTenantId());
                 List <RoleDTO> roleIdList = new ArrayList<>();
                 roleIdList.add(roleInfo);
                 dto.setRoleDTOList(roleIdList);
                 dto.setOfficeDTO(officeDTO);
+
+                String officeName = "";
+                if (null != office) {
+                    TenantDTO tenantDTO = new TenantDTO();
+                    tenantDTO.setId(office.getTenantId());
+                    dto.setTenantDTO(tenantDTO);
+                    if (office.getTenantId().equals("10003")){
+                        officeName = "兴光会计";
+                    }else if (office.getTenantId().equals("10004")) {
+                        officeName = "中审";
+                    }
+                } else {
+                    TenantDTO tenantDTO = new TenantDTO();
+                    tenantDTO.setId("10002");
+                    dto.setTenantDTO(tenantDTO);
+                    officeName = "综合管理公司";
+                }
+
                 SpringUtil.getBean ( IUserApi.class ).saveOrUpdate(dto);
 
 
                 report.setOnJobStatus("正式");
                 //发送短信通知 (未实现)
-                String officeName = "";
-                OfficeDTO office = SpringUtil.getBean(IOfficeApi.class).getOfficeById(report.getDepartment());
-                if (office.getTenantDTO().getId().equals("10003")){
-                    officeName = "兴光会计";
-                }else if (office.getTenantDTO().getId().equals("10004")) {
-                    officeName = "中审";
-                }
+
                 PostDTO postDTO = SpringUtil.getBean(IPostApi.class).getPostDTOByName("门卡管理员");
                 List<UserDTO> listByPostId = SpringUtil.getBean(IUserApi.class).findListFlowAbleByPostId(postDTO.getId());
 
@@ -316,16 +328,15 @@ public class EnrollmentRegistrationService extends ServiceImpl<EnrollmentRegistr
     public Integer findIdCardOnly(String idCard) throws Exception {
         QueryWrapper<EnrollmentRegistration> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("id_card", idCard);
+        queryWrapper.eq("del_flag", 0);
         // 删除基础信息表
         Integer integer = mapper.selectCount(queryWrapper);
         return integer;
     }
 
     public Integer findMobilePhoneOnly(String mobilePhone) throws Exception {
-        QueryWrapper<EnrollmentRegistration> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("mobile_phone", mobilePhone);
         // 删除基础信息表
-        Integer integer = mapper.selectCount(queryWrapper);
+        Integer integer = SpringUtil.getBean(IUserApi.class).selectCountByMobile(mobilePhone);
         return integer;
     }
 

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/practice/register/controller/RegisterController.java

@@ -42,6 +42,18 @@ public class RegisterController {
     private EnrollmentRegistrationService enrollmentRegistrationService;
 
     /**
+     * 查询
+     * @param idCard
+     * @return
+     */
+    @ApiOperation(value = "查询身份证号码唯一性")
+    @GetMapping("/findIdCardOnly")
+    public ResponseEntity<Integer> findIdCardOnly(@RequestParam String idCard) throws Exception{
+        Integer idCardOnly = service.findIdCardOnly(idCard);
+        return ResponseEntity.ok(idCardOnly);
+    }
+
+    /**
      * 查询财务项目信息列表
      * @param projectReportData
      * @param page

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/practice/register/service/RegistrationService.java

@@ -12,6 +12,7 @@ import com.jeeplus.common.SecurityUtils;
 import com.jeeplus.common.TokenProvider;
 import com.jeeplus.core.query.QueryWrapperGenerator;
 import com.jeeplus.flowable.feign.IFlowableApi;
+import com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentRegistration;
 import com.jeeplus.human.practice.register.domain.Registration;
 import com.jeeplus.human.practice.register.domain.RegistrationExperience;
 import com.jeeplus.human.practice.register.domain.RegistrationFamilyMembers;
@@ -21,10 +22,7 @@ import com.jeeplus.human.practice.register.mapper.RegistrationExperienceMapper;
 import com.jeeplus.human.practice.register.service.dto.RegistrationDto;
 import com.jeeplus.sys.domain.WorkAttachmentInfo;
 import com.jeeplus.sys.feign.*;
-import com.jeeplus.sys.service.dto.OfficeDTO;
-import com.jeeplus.sys.service.dto.PostDTO;
-import com.jeeplus.sys.service.dto.RoleDTO;
-import com.jeeplus.sys.service.dto.UserDTO;
+import com.jeeplus.sys.service.dto.*;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
@@ -53,6 +51,15 @@ public class RegistrationService extends ServiceImpl<InterRegistrationMapper, Re
     @Resource
     private RegistrationExperienceMapper experienceMapper;
 
+    public Integer findIdCardOnly(String idCard) throws Exception {
+        QueryWrapper<Registration> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("id_card", idCard);
+        queryWrapper.eq("del_flag", 0);
+        // 删除基础信息表
+        Integer integer = mapper.selectCount(queryWrapper);
+        return integer;
+    }
+
     public void updateStatusById(RegistrationDto dto) {
         mapper.updateStatusById(dto.getId(), dto.getType());
     }
@@ -154,21 +161,41 @@ public class RegistrationService extends ServiceImpl<InterRegistrationMapper, Re
                 OfficeDTO officeDTO = new OfficeDTO();
                 officeDTO.setId(report.getPracticeOffice());
                 dto.setOfficeDTO(officeDTO);
+
+                OfficeDTO office = SpringUtil.getBean(IOfficeApi.class).getOfficeById(report.getPracticeOffice());
                 // 获取实习生角色id
-                RoleDTO roleInfo = SpringUtil.getBean(IRoleApi.class).getRoleDTOByName("实习生");
+                RoleDTO roleInfo = SpringUtil.getBean(IRoleApi.class).getRoleDTOByNameAndTenantId("实习生",office.getTenantId());
                 List <RoleDTO> roleIdList = new ArrayList<>();
                 roleIdList.add(roleInfo);
                 dto.setRoleDTOList(roleIdList);
-                SpringUtil.getBean ( IUserApi.class ).saveOrUpdate(dto);
+
+
                 //发送短信通知
                 String officeName = "";
-                OfficeDTO office = SpringUtil.getBean(IOfficeApi.class).getOfficeById(report.getPracticeOffice());
-                if (office.getTenantId().equals("10003")){
-                    officeName = "兴光会计";
-                }else if (office.getTenantId().equals("10004")) {
-                    officeName = "中审";
+                if (null != office) {
+                    TenantDTO tenantDTO = new TenantDTO();
+                    tenantDTO.setId(office.getTenantId());
+                    dto.setTenantDTO(tenantDTO);
+                    if (office.getTenantId().equals("10003")){
+                        officeName = "兴光会计";
+                    }else if (office.getTenantId().equals("10004")) {
+                        officeName = "中审";
+                    }
+                } else {
+                    TenantDTO tenantDTO = new TenantDTO();
+                    tenantDTO.setId("10002");
+                    dto.setTenantDTO(tenantDTO);
+                    officeName = "综合管理公司";
                 }
 
+
+
+                SpringUtil.getBean ( IUserApi.class ).saveOrUpdate(dto);
+
+
+//                OfficeDTO office = SpringUtil.getBean(IOfficeApi.class).getOfficeById(report.getPracticeOffice());
+
+
                 String randomCode = report.getName() + "你好!你好!欢迎来" + officeName + "实习，实习期间请及时在公司系统:" + "www.baidu.com"
                         + "中填写实习日志，系统初始账号密码为，系统初始账号密码为：" + report.getName() +
                         "/123456，请尽快登陆系统并修改初始密码！";

jeeplus-modules/jeeplus-system/src/main/java/com/jeeplus/sys/feign/RoleApiImpl.java

@@ -21,6 +21,11 @@ public class RoleApiImpl implements IRoleApi {
     }
 
     @Override
+    public RoleDTO getRoleDTOByNameAndTenantId(String name, String tenantId) {
+        return roleService.getRoleDTOByNameAndTenantId(name,tenantId);
+    }
+
+    @Override
     public RoleDTO getRoleDTOByName2(String name) {
         return roleService.getRoleByName2(name);
     }

jeeplus-modules/jeeplus-system/src/main/java/com/jeeplus/sys/feign/UserApiImpl.java

@@ -32,6 +32,12 @@ public class UserApiImpl implements IUserApi {
     private UserService userService;
 
     @Override
+    public Integer selectCountByMobile(String mobile) {
+        Integer num = userService.selectCountByMobile(mobile);
+        return num;
+    }
+
+    @Override
     public Map<String, Object> sendRandomCodes(String mobile, String randomCode) throws IOException {
         return UserUtils.sendRandomCodes(mobile, randomCode);
     }

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

@@ -4,6 +4,7 @@
 package com.jeeplus.sys.mapper;
 
 import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jeeplus.sys.domain.Role;
 import com.jeeplus.sys.service.dto.RoleDTO;
@@ -64,4 +65,7 @@ public interface RoleMapper extends BaseMapper <Role> {
      */
     @InterceptorIgnore(tenantLine = "true")
     RoleDTO getRoleByName2(@Param("name") String name);
+
+    @InterceptorIgnore(tenantLine = "true")
+    Role getRoleDTOByNameAndTenantId(@Param("name")String name,@Param("tenantId")String tenantId);
 }

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

@@ -29,6 +29,10 @@
     <select id="getRoleByName2" resultType="com.jeeplus.sys.service.dto.RoleDTO">
         select id from sys_role where name = #{name}
     </select>
+    <select id="getRoleDTOByNameAndTenantId" resultType="com.jeeplus.sys.domain.Role">
+        SELECT id, name, en_name, is_sys AS sysData, useable, remarks, create_time, create_by_id, update_time,
+        update_by_id, del_flag, tenant_id FROM sys_role WHERE del_flag = 0 AND name = #{name} and tenant_id = #{tenantId}
+    </select>
 
     <!--维护角色与菜单权限关系-->
     <delete id="deleteRoleMenu">

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

@@ -4,6 +4,8 @@
 package com.jeeplus.sys.service;
 
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.collect.Lists;
 import com.jeeplus.common.constant.CacheNames;
@@ -12,6 +14,7 @@ import com.jeeplus.sys.mapper.RoleMapper;
 import com.jeeplus.sys.service.dto.RoleDTO;
 import com.jeeplus.sys.service.dto.UserDTO;
 import com.jeeplus.sys.service.mapstruct.RoleWrapper;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.stereotype.Service;
@@ -167,4 +170,17 @@ public class RoleService extends ServiceImpl <RoleMapper, Role> {
         RoleDTO roleDTO = baseMapper.getRoleByName2(name);
         return roleDTO;
     }
+
+    /**
+     * 根据没名称与tenantId查询角色信息
+     * @param name
+     * @param tenantId
+     * @return
+     */
+    public RoleDTO getRoleDTOByNameAndTenantId(String name, String tenantId) {
+        Role role = baseMapper.getRoleDTOByNameAndTenantId(name,tenantId);
+        RoleDTO roleDTO = new RoleDTO();
+        BeanUtils.copyProperties(role, roleDTO);
+        return roleDTO;
+    }
 }

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

@@ -639,4 +639,13 @@ public class UserService extends ServiceImpl <UserMapper, User> {
     public void updateEmail(String id, String userEmail) {
         userMapper.updateEmail(id,userEmail);
     }
+
+    public Integer selectCountByMobile(String mobile) {
+        QueryWrapper<User> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("mobile", mobile);
+        queryWrapper.eq("del_flag", 0);
+        // 删除基础信息表
+        Integer integer = userMapper.selectCount(queryWrapper);
+        return integer;
+    }
 }