人力资源调整

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

@@ -46,6 +46,16 @@ public class HumanApiFallBackFactory implements FallbackFactory<IHumanApi> {
             public List<String> getAllUserIdInSuccess() {
                 return null;
             }
+
+            @Override
+            public String getAllRegister() {
+                return null;
+            }
+
+            @Override
+            public void updatePracticeStatus(String id) {
+
+            }
         };
     }
 }

jeeplus-api/jeeplus-system-api/src/main/java/com/jeeplus/flowable/feign/IHumanApi.java

@@ -4,6 +4,7 @@ import com.jeeplus.common.constant.AppNameConstants;
 import com.jeeplus.flowable.factory.HumanApiFallBackFactory;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
@@ -47,4 +48,10 @@ public interface IHumanApi {
     //获取所有的入职登记表中的有效数据的id
     @GetMapping(value = "/enrollmentRegistration/getAllUserIdInSuccess")
     List<String> getAllUserIdInSuccess();
+    //获取实习日期结束,但实习状态为修改的数据
+    @GetMapping(value = "/register/getAllRegister")
+    String getAllRegister();
+    //修改实习状态
+    @PostMapping(value = "/register/updatePracticeStatus")
+    void updatePracticeStatus(@RequestParam(value = "id")String id);
 }

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

@@ -246,6 +246,11 @@ public class UserApiFallbackFactory implements FallbackFactory <IUserApi> {
                 return null;
             }
 
+            @Override
+            public UserDTO selectByMobile(String mobilePhone) {
+                return null;
+            }
+
         };
     }
 }

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

@@ -356,6 +356,8 @@ public interface IUserApi {
 
     @GetMapping(value = BASE_URL + "/getByMobile")
     UserDTO getByMobile(@RequestParam(value = "mobilePhone")String mobilePhone);
+    @GetMapping(value = BASE_URL + "/selectByMobile")
+    UserDTO selectByMobile(@RequestParam(value = "mobilePhone")String mobilePhone);
 }
 
 

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

@@ -92,7 +92,6 @@ public class EnrollmentRegistration extends BaseEntity {
     private String gsAccountHolderFront;
     @TableField(exist = false)
     private String gsAccountHolderOpposite;
-    @TableField(exist = false)
     private String isPc; //用来判断是否是从电脑端发起的入职流程
     @TableField(exist = false)
     private String wageCardId; //工资卡id

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

@@ -202,7 +202,10 @@ public class EnrollmentRegistrationService extends ServiceImpl<EnrollmentRegistr
         EnrollmentRegistration report = new EnrollmentRegistration();
 
         if (integer <=0 && mobilePhoneOnly <=0 ) {
-
+            //为空则表示移动端扫码登录
+            if (StringUtils.isBlank(reportData.getIsPc())) {
+                reportData.setIsPc("2");
+            }
             String id = SnowFlake.getId();
             BeanUtils.copyProperties(reportData, report);
             report.setId(id);
@@ -377,6 +380,18 @@ public class EnrollmentRegistrationService extends ServiceImpl<EnrollmentRegistr
                         keyMap.put("name", "评估员工,共有权限（评估）");
                         keyMap.put("tenantId", office.getTenantId());
                         roleIdList = SpringUtil.getBean(IRoleApi.class).getRoleDTOByNameAndTenantId(keyMap);
+                    }else if (office.getTenantId().equals("10006")) {
+                        officeName = "苏州分公司";
+                        networkAddress = "sz.xgccpm.com";
+                        keyMap.put("name", "审计员工,共有权限（苏州）");
+                        keyMap.put("tenantId", office.getTenantId());
+                        roleIdList = SpringUtil.getBean(IRoleApi.class).getRoleDTOByNameAndTenantId(keyMap);
+                    }else if (office.getTenantId().equals("10005")) {
+                        officeName = "兴光项目公司";
+                        networkAddress = "xm.xgccpm.com";
+                        keyMap.put("name", "项目公司综合管理部员工,共有权限（项目）");
+                        keyMap.put("tenantId", office.getTenantId());
+                        roleIdList = SpringUtil.getBean(IRoleApi.class).getRoleDTOByNameAndTenantId(keyMap);
                     }
                 } else {
                     TenantDTO tenantDTO = new TenantDTO();

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

@@ -118,6 +118,15 @@ public class RegisterController {
     }
 
     /**
+     * 定时任务修改
+     * @param id
+     */
+    @PostMapping("updatePracticeStatus")
+    public void updatePracticeStatus(String id){
+        service.adminUpdatePracticeStatus(id);
+    }
+
+    /**
      * 保存实习人员登记信息
      * @param registration
      * @return
@@ -194,6 +203,16 @@ public class RegisterController {
     }
 
     /**
+     * 获取所有的实习人员信息
+     * @return
+     */
+    @GetMapping("getAllRegister")
+    public String getAllRegister(){
+        List<Registration> listInfos = service.getAllRegister();
+        return JSON.toJSONString(listInfos);
+    }
+
+    /**
      * 下载实习用户信息
      * @param response
      * @param id

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/practice/register/mapper/InterRegistrationMapper.java

@@ -51,4 +51,11 @@ public interface InterRegistrationMapper extends BaseMapper<Registration> {
      * @param id
      */
     void deleteByIdOnPhysic(@Param("id")String id);
+
+    //获取全部的入职人员信息
+    @InterceptorIgnore(tenantLine = "true")
+    List<Registration> getAllRegister();
+    //定时任务修改实习状态
+    @InterceptorIgnore(tenantLine = "true")
+    void adminUpdatePracticeStatus(@Param("id")String id);
 }

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/practice/register/mapper/xml/InterRegistrationMapper.xml

@@ -61,6 +61,7 @@
         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.practice_office = so.id
+        left join sys_office so1 on so.parent_id = so1.id
         ${ew.customSqlSegment}
         ORDER BY a.create_time DESC
     </select>
@@ -132,4 +133,14 @@
         left join sys_user su on a.user_id = su.id
         where a.practice_status = '1' and su.del_flag = '0'
     </select>
+
+    <select id="getAllRegister" resultType="com.jeeplus.human.practice.register.domain.Registration">
+        select
+        <include refid="Base_Column_List"></include>
+        from human_resources_practice_registration a
+        where a.practice_complete_day &lt; CURDATE() and a.del_flag = '0' and a.practice_status = '0'
+    </select>
+    <update id="adminUpdatePracticeStatus">
+        update human_resources_practice_registration set practice_status = '1' where id = #{id}
+    </update>
 </mapper>

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

@@ -125,6 +125,9 @@ public class RegistrationService extends ServiceImpl<InterRegistrationMapper, Re
         if (StringUtils.isNotBlank(projectReportData.getPracticeOffice())) {
             queryWrapper.eq("a.practice_office",projectReportData.getPracticeOffice());
         }
+        if (StringUtils.isNotBlank(projectReportData.getCompanyId())) {
+            queryWrapper.eq("so1.id",projectReportData.getCompanyId());
+        }
 
         if (projectReportData.getCreateDates() != null && projectReportData.getCreateDates().length > 1) {
             // 添加条件
@@ -639,6 +642,11 @@ public class RegistrationService extends ServiceImpl<InterRegistrationMapper, Re
                 dto.setTenantDTO(tenantDTO);
             }
             dto.setRoleDTOList(roleIdList);
+            //判断是否是中审证券部门的
+            if (report.getPracticeStatus().equals("0") &&!officeDTO.getTenantId().equals("10004") && !officeDTO.getName().contains("证券")){
+                dto.setLoginFlag("1");
+            }
+
             SpringUtil.getBean ( IUserApi.class ).saveOrUpdate(dto);
         }
 
@@ -994,4 +1002,20 @@ public class RegistrationService extends ServiceImpl<InterRegistrationMapper, Re
 
         return data;
     }
+
+    /**
+     * 获取所有的实习人员信息
+     * @return
+     */
+    public List<Registration> getAllRegister() {
+        return mapper.getAllRegister();
+    }
+
+    /**
+     * 定时任务修改实习状态
+     * @param id
+     */
+    public void adminUpdatePracticeStatus(String id) {
+        mapper.adminUpdatePracticeStatus(id);
+    }
 }

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

@@ -66,4 +66,6 @@ public class RegistrationDto extends BaseDTO {
 
     @TableField(exist = false)
     private String departmentName;
+    //实习单位id
+    private String companyId;
 }

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

@@ -291,4 +291,9 @@ public class UserApiImpl implements IUserApi {
         return userService.getByMobile(mobilePhone);
     }
 
+    @Override
+    public UserDTO selectByMobile(String mobilePhone) {
+        return userService.selectByMobile(mobilePhone);
+    }
+
 }

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

@@ -292,4 +292,6 @@ public interface UserMapper extends BaseMapper <User> {
     void updateUserById(UserDTO dto);
     @InterceptorIgnore(tenantLine = "true")
     UserDTO getByMobile(@Param("mobilePhone")String mobilePhone);
+    @InterceptorIgnore(tenantLine = "true")
+    UserDTO selectByMobile(@Param("mobilePhone")String mobilePhone);
 }

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

@@ -678,4 +678,10 @@ select a.id, a.company_id as "companyDTO.id", a.office_id as "officeDTO.id", a.l
 		from sys_user a
 		where a.mobile = #{mobilePhone} and a.del_flag = '0'
     </select>
+
+    <select id="selectByMobile" resultType="com.jeeplus.sys.service.dto.UserDTO">
+        select a.id
+		from sys_user a
+		where a.mobile = #{mobilePhone} and a.del_flag = '0'
+    </select>
 </mapper>

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

@@ -790,4 +790,8 @@ public class UserService extends ServiceImpl <UserMapper, User> {
     public UserDTO getByMobile(String mobilePhone) {
         return userMapper.getByMobile(mobilePhone);
     }
+
+    public UserDTO selectByMobile(String mobilePhone) {
+        return userMapper.selectByMobile(mobilePhone);
+    }
 }

jeeplus-modules/jeeplus-xxl-job-executor-sample/src/main/java/com/xxl/job/executor/service/jobhandler/SampleXxlJob.java

@@ -80,6 +80,27 @@ public class SampleXxlJob {
 
     }
 
+    //根据实习结束时间修改实习状态并禁止登录
+    @XxlJob("updateStatus")
+    public void updateStatus(){
+        String json = SpringUtil.getBean ( HumanFeignApi.class ).getAllRegister();
+        List<RegistrationInfo> infos = JSON.parseObject(json, new TypeReference<List<RegistrationInfo>>() {});
+        if (CollectionUtil.isNotEmpty(infos)){
+            for (RegistrationInfo info : infos) {
+                //修改实习状态
+                SpringUtil.getBean ( HumanFeignApi.class ).updatePracticeStatus(info.getId());
+                //用户禁止登录
+                UserDTO dto = SpringUtil.getBean(IUserApi.class).selectByMobile(info.getMobilePhone());
+                if (dto != null){
+                    dto.setLoginFlag("0");
+                    SpringUtil.getBean(IUserApi.class).updateUser(dto);
+                }
+
+            }
+        }
+
+    }
+
     /**
      * 5、正式工冻结账号发送短信（Bean模式）
      */