Merge remote-tracking branch 'origin/master'

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

@@ -25,6 +25,11 @@ public class PostApiFallbackFactory implements FallbackFactory <IPostApi> {
             public PostDTO getPostDTOByName(String name) {
                 return null;
             }
+
+            @Override
+            public String getPostDTOByNameJSON(String name) {
+                return null;
+            }
         };
     }
 }

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

@@ -106,6 +106,11 @@ public class UserApiFallbackFactory implements FallbackFactory <IUserApi> {
             }
 
             @Override
+            public List<String> findIdListFlowAbleByPostId(String postId) {
+                return null;
+            }
+
+            @Override
             public List <UserDTO> findListByRoleId(String roleId) {
                 return Lists.newArrayList ( );
             }

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

@@ -17,4 +17,11 @@ public interface IPostApi {
     @GetMapping(value = "/feign/sys/dict/getPostDTOByName")
     PostDTO getPostDTOByName(@RequestParam(value = "name") String name);
 
+    /**
+     * 获取角色
+     *
+     * @return
+     */
+    @GetMapping(value = "/feign/sys/dict/getPostDTOByNameJSON")
+    String getPostDTOByNameJSON(@RequestParam(value = "name") String name);
 }

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

@@ -153,6 +153,15 @@ public interface IUserApi {
     List <UserDTO> findListFlowAbleByPostId(@RequestParam("postId") String postId);
 
     /**
+     * 根据岗位id获取用户列表
+     *
+     * @param postId
+     * @return
+     */
+    @GetMapping(value = BASE_URL + "/findIdListFlowAbleByPostId")
+    List <String> findIdListFlowAbleByPostId(@RequestParam("postId") String postId);
+
+    /**
      * 根据角色id获取用户列表
      *
      * @param roleId

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

@@ -50,7 +50,7 @@ public class DepartService extends ServiceImpl<DepartMapper, DepartRegistration>
             queryWrapper.eq("a.department",projectReportData.getDepartment());
         }
         if (StringUtils.isNotBlank(projectReportData.getMobile())) {
-            queryWrapper.eq("su.mobile",projectReportData.getMobile());
+            queryWrapper.like("su.mobile",projectReportData.getMobile());
         }
         if (StringUtils.isNotBlank(projectReportData.getName())) {
             queryWrapper.like("a.name",projectReportData.getName());

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

@@ -8,6 +8,7 @@ import com.jeeplus.human.depart.handover.service.HandoverService;
 import com.jeeplus.human.enrollment.enrollmentRegistration.domain.*;
 import com.jeeplus.human.enrollment.enrollmentRegistration.service.*;
 import com.jeeplus.human.enrollment.enrollmentRegistration.utils.HunamFreemarkerUtil;
+import com.jeeplus.human.practice.register.domain.Registration;
 import com.jeeplus.logging.annotation.ApiLog;
 import com.jeeplus.logging.constant.enums.LogTypeEnum;
 import freemarker.template.Configuration;
@@ -200,6 +201,18 @@ public class EnrollmentRegistrationController {
     }
 
     /**
+     * 保存入职人员登记信息
+     * @param registration
+     * @return
+     */
+    @ApiLog(value = "修改入职人员登记信息", type = LogTypeEnum.SAVE)
+    @PostMapping("updateInfo")
+    public ResponseEntity updateInfo(@Valid @RequestBody Registration registration) throws Exception {
+        service.updateRegistration(registration);
+        return ResponseUtil.newInstance().ok("操作成功");
+    }
+
+    /**
      * 保存社保信息
      * @param securityCard
      * @return

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

@@ -58,5 +58,6 @@ public class EnrollmentRegistration extends BaseEntity {
     @TableField(exist = false)
     private String socialSecurityPictureOppositeUrl;       //社保卡照片反面URL
     private String onJobStatus;       //在职状态
-
+    @TableField(exist = false)
+    private String departmentName;       //所属部门名称
 }

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

@@ -59,10 +59,12 @@
         select
         <include refid="Base_Column_List"></include>,
         d.ID_ AS task_id,
-        su.name as projectManagerName
+        su.name as projectManagerName,
+        so.name as departmentName
         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
         ${ew.customSqlSegment}
         ORDER BY a.create_time DESC
     </select>

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

@@ -15,6 +15,7 @@ import com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentSoci
 import com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentWageCard;
 import com.jeeplus.human.enrollment.enrollmentRegistration.mapper.EnrollmentRegistrationMapper;
 import com.jeeplus.human.enrollment.enrollmentRegistration.mapper.EnrollmentSocialSecurityCardMapper;
+import com.jeeplus.human.practice.register.domain.Registration;
 import com.jeeplus.sys.feign.IOfficeApi;
 import com.jeeplus.sys.feign.IPostApi;
 import com.jeeplus.sys.feign.IRoleApi;
@@ -63,11 +64,14 @@ public class EnrollmentRegistrationService extends ServiceImpl<EnrollmentRegistr
         QueryWrapper<EnrollmentRegistration> queryWrapper = QueryWrapperGenerator.buildQueryCondition (projectReportData,EnrollmentRegistration.class);
         queryWrapper.eq("a.del_flag","0");
         if (StringUtils.isNotBlank(projectReportData.getMobilePhone())) {
-            queryWrapper.eq("a.mobile_phone",projectReportData.getMobilePhone());
+            queryWrapper.like("a.mobile_phone",projectReportData.getMobilePhone());
         }
         if (StringUtils.isNotBlank(projectReportData.getName())) {
             queryWrapper.like("a.name",projectReportData.getName());
         }
+        if (StringUtils.isNotBlank(projectReportData.getDepartment())) {
+            queryWrapper.eq("a.department",projectReportData.getDepartment());
+        }
         IPage<EnrollmentRegistration> list = mapper.findList(page, queryWrapper);
         return list;
 
@@ -210,8 +214,14 @@ public class EnrollmentRegistrationService extends ServiceImpl<EnrollmentRegistr
 
         //生成一个系统账号
         // 生成id
-        String amountId = UUID.randomUUID().toString().replace("-", "");
-        report.setUserId(amountId);
+        String amountId = "";
+        if (StringUtils.isBlank(report.getUserId())) {
+            amountId = UUID.randomUUID().toString().replace("-", "");
+            report.setUserId(amountId);
+        } else {
+            amountId = report.getUserId();
+        }
+
 
         if (StringUtils.isNotBlank(report.getType()) && !userDTO.isAdmin()){
             if (report.getType().equals("5")){
@@ -447,4 +457,16 @@ public class EnrollmentRegistrationService extends ServiceImpl<EnrollmentRegistr
     public List<EnrollmentRegistration> getFormalUserInfo() {
         return mapper.getFormalUserInfo();
     }
+
+    public void updateRegistration(Registration reportData) {
+        //获取当前登录人信息
+        UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken ( ));
+
+        EnrollmentRegistration report = new EnrollmentRegistration();
+        BeanUtils.copyProperties(reportData, report);
+        report.setUpdateById(userDTO.getId());
+        report.setUpdateTime(new Date());
+
+        mapper.updateById(report);
+    }
 }

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

@@ -99,6 +99,18 @@ public class RegisterController {
     }
 
     /**
+     * 保存实习人员登记信息
+     * @param registration
+     * @return
+     */
+    @ApiLog(value = "修改实习人员登记信息", type = LogTypeEnum.SAVE)
+    @PostMapping("updateInfo")
+    public ResponseEntity updateInfo(@Valid @RequestBody Registration registration) throws Exception {
+        service.updateRegistration(registration);
+        return ResponseUtil.newInstance().ok("操作成功");
+    }
+
+    /**
      * 查询
      * @param id
      * @return

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

@@ -469,4 +469,53 @@ public class RegistrationService extends ServiceImpl<InterRegistrationMapper, Re
         List<Registration> registrations = mapper.getTimeOutReimburseRegisters();
         return registrations;
     }
+
+    public void updateRegistration(Registration reportData) {
+
+        //获取当前登录人信息
+        UserDTO userDTO = SpringUtil.getBean ( IUserApi.class ).getByToken(TokenProvider.getCurrentToken ( ));
+
+        Registration report = new Registration();
+        BeanUtils.copyProperties(reportData, report);
+        report.setUpdateById(userDTO.getId());
+        report.setUpdateTime(new Date());
+
+        //先删除家庭成员信息，在重新添加
+        familyMembersMapper.deleteByRegisterId(report.getId());
+        List<RegistrationFamilyMembers> familyMembers = reportData.getFamilyMembers();
+        if (CollectionUtils.isNotEmpty(familyMembers)){
+            familyMembers.forEach(fa->{
+                // 生成id
+                String amountId = UUID.randomUUID().toString().replace("-", "");
+                fa.setId(amountId);
+                fa.setCreateById(userDTO.getId());
+                fa.setCreateTime(new Date());
+                fa.setUpdateById(userDTO.getId());
+                fa.setUpdateTime(new Date());
+                fa.setDelFlag(0);
+                fa.setRegistrationId(report.getId());
+
+                familyMembersMapper.insert(fa);
+            });
+        }
+        //先删除实习经历信息
+        experienceMapper.deleteByRegisterId(report.getId());
+        List<RegistrationExperience> experiences = reportData.getExperiences();
+        if (CollectionUtils.isNotEmpty(experiences)){
+            experiences.forEach(fa->{
+                // 生成id
+                String amountId = UUID.randomUUID().toString().replace("-", "");
+                fa.setId(amountId);
+                fa.setCreateById(userDTO.getId());
+                fa.setCreateTime(new Date());
+                fa.setUpdateById(userDTO.getId());
+                fa.setUpdateTime(new Date());
+                fa.setDelFlag(0);
+                fa.setRegistrationId(report.getId());
+
+                experienceMapper.insert(fa);
+            });
+        }
+        mapper.updateById(report);
+    }
 }

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/practice/reimburseRegister/service/ReimburseRegisterService.java

@@ -210,6 +210,7 @@ public class ReimburseRegisterService extends ServiceImpl<ReimburseRegisterMappe
                         //设置实习结束日期
                         //查询实习工作日志的最后一天  根据创建人去查，
                         String endTime = workLogService.getLastWorkDay(report.getCreateById());
+                        //修改实习状态前先查询是否
                         registrationService.updatePracticeStatus(report.getCreateById(),endTime);
 
                         //系统账号冻结

jeeplus-modules/jeeplus-system/src/main/java/com/jeeplus/sys/controller/UserController.java

@@ -27,6 +27,7 @@ import com.jeeplus.core.query.QueryWrapperGenerator;
 import com.jeeplus.logging.annotation.ApiLog;
 import com.jeeplus.sys.domain.Office;
 import com.jeeplus.sys.domain.User;
+import com.jeeplus.sys.domain.vo.UserVO;
 import com.jeeplus.sys.feign.IUserApi;
 import com.jeeplus.sys.service.OfficeService;
 import com.jeeplus.sys.service.UserService;
@@ -855,6 +856,31 @@ public class UserController {
     }
 
     /**
+     * 手机端-修改密码
+     *
+     * @return
+     */
+    @DemoMode
+    @ApiLog("手机端-修改密码")
+    @PostMapping("/savePwdByPhone")
+    public ResponseEntity savePwdByPhone(@Valid @RequestBody UserVO userVO) {
+        UserDTO userDTO = userService.get(userVO.getUserId());
+        if ( StrUtil.isNotBlank ( userVO.getOldPassword() ) && StrUtil.isNotBlank ( userVO.getNewPassword() ) ) {
+            if ( SecurityUtils.validatePassword ( userVO.getOldPassword(), userDTO.getPassword ( ) ) ) {
+                User user = new User ( userDTO.getId ( ) );
+                user.setPassword ( SecurityUtils.encryptPassword ( userVO.getNewPassword() ) );
+                user.setUpPassword("1");
+                userService.updateById ( user );
+                UserUtils.deleteCache ( userDTO );
+                return ResponseEntity.ok ( "修改密码成功！" );
+            } else {
+                return ResponseEntity.badRequest ( ).body ( "修改密码失败，旧密码错误！" );
+            }
+        }
+        return ResponseEntity.badRequest ( ).body ( "参数错误！" );
+    }
+
+    /**
      * 获取菜单
      *
      * @return

jeeplus-modules/jeeplus-system/src/main/java/com/jeeplus/sys/domain/vo/UserVO.java

@@ -0,0 +1,15 @@
+package com.jeeplus.sys.domain.vo;
+
+import lombok.Data;
+
+/**
+ * @author 王强
+ * @version 1.0
+ * @date 2023-12-05 15:23
+ */
+@Data
+public class UserVO {
+    private String oldPassword;
+    private String newPassword;
+    private String userId;
+}

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

@@ -1,5 +1,6 @@
 package com.jeeplus.sys.feign;
 
+import com.alibaba.fastjson.JSON;
 import com.jeeplus.sys.domain.Post;
 import com.jeeplus.sys.service.PostService;
 import com.jeeplus.sys.service.dto.PostDTO;
@@ -20,4 +21,10 @@ public class PostApiImpl implements IPostApi {
         return postService.getPostDTOByName(name);
         // return PostWrapper.INSTANCE.toDTO ( postService.lambdaQuery ( ).eq ( Post::getTenantId, TenantUtils.getTenantId ( ) ).eq ( Post::getName, name ).one ( ) );
     }
+
+    @Override
+    public String getPostDTOByNameJSON(String name) {
+        return JSON.toJSONString(postService.getPostDTOByName(name));
+
+    }
 }

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

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jeeplus.common.SecurityUtils;
 import com.jeeplus.common.TokenProvider;
+import com.jeeplus.common.utils.RequestUtils;
 import com.jeeplus.sys.domain.User;
 import com.jeeplus.sys.service.UserService;
 import com.jeeplus.sys.service.dto.CertDTO;
@@ -20,6 +21,7 @@ import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -67,9 +69,7 @@ public class UserApiImpl implements IUserApi {
 
     @Override
     public void deleteById(String id) {
-        UserDTO dto = new UserDTO();
-        dto.setId(id);
-        userService.deleteUser(dto);
+        userService.updateDelFlagById(id);
     }
 
 
@@ -128,6 +128,16 @@ public class UserApiImpl implements IUserApi {
     }
 
     @Override
+    public List<String> findIdListFlowAbleByPostId(String postId) {
+        List<UserDTO> listFlowAbleByPostId = userService.findListFlowAbleByPostId(postId);
+        List<String> ids = new ArrayList<>();
+        listFlowAbleByPostId.forEach(li->{
+            ids.add(li.getId());
+        });
+        return ids;
+    }
+
+    @Override
     public List <UserDTO> findListByRoleId(String roleId) {
         return userService.findListByRoleId ( roleId );
     }

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

@@ -245,4 +245,11 @@ public interface UserMapper extends BaseMapper <User> {
     IPage<UserDTO> findCertList(Page<UserDTO> page, @Param(Constants.WRAPPER)QueryWrapper<UserDTO> queryWrapper);
 
     void updateEmail(@Param("id") String id, @Param("userEmail") String userEmail);
+
+    @InterceptorIgnore(tenantLine = "true")
+    UserDTO getByIdNoTenantId(String id);
+
+    @InterceptorIgnore(tenantLine = "true")
+    void updateDelFlagById(@Param("id") String id);
+
 }

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

@@ -559,9 +559,15 @@ select a.id, a.company_id as "companyDTO.id", a.office_id as "officeDTO.id", a.l
         <include refid="userJoins"/>
         ${ew.customSqlSegment}
     </select>
+    <select id="getByIdNoTenantId" resultType="com.jeeplus.sys.service.dto.UserDTO">
+
+    </select>
 
     <update id="updateEmail">
         update sys_user set email=#{userEmail} where id=#{id}
     </update>
+    <update id="updateDelFlagById">
+        update sys_user set del_flag = '1',login_flag = '0' where id=#{id}
+    </update>
 
 </mapper>

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

@@ -17,6 +17,7 @@ import com.jeeplus.common.TokenProvider;
 import com.jeeplus.common.constant.CacheNames;
 import com.jeeplus.common.constant.CommonConstants;
 import com.jeeplus.common.redis.RedisUtils;
+import com.jeeplus.common.utils.RequestUtils;
 import com.jeeplus.sys.domain.Cert;
 import com.jeeplus.sys.domain.Office;
 import com.jeeplus.sys.domain.SysConfig;
@@ -201,7 +202,16 @@ public class UserService extends ServiceImpl <UserMapper, User> {
             }
 
             queryWrapper.eq ( "a.del_flag", CommonConstants.NOT_DELETED );
-            queryWrapper.eq ( "a.tenant_id", tenantId );
+
+            String domain = RequestUtils.getHeader ( "domain" );
+            if (domain.contains("ydddl")){
+                tenantId = "";
+            }
+
+            if (StringUtils.isNotBlank(tenantId)){
+                queryWrapper.eq ( "a.tenant_id", tenantId );
+            }
+
             userDTO = baseMapper.get ( queryWrapper );
             RedisUtils.getInstance ( ).set ( CacheNames.USER_CACHE_LOGIN_NAME, tenantId + ":" + loginName, userDTO );
         }
@@ -648,4 +658,21 @@ public class UserService extends ServiceImpl <UserMapper, User> {
         Integer integer = userMapper.selectCount(queryWrapper);
         return integer;
     }
+
+    /**
+     * 根据id获取用户过滤掉tenantId
+     * @param id
+     * @return
+     */
+    public UserDTO getByIdNoTenantId(String id) {
+        return userMapper.getByIdNoTenantId(id);
+    }
+
+    /**
+     * 根据id修改用户的del_flag及登录的login_flag
+     * @param id
+     */
+    public void updateDelFlagById(String id) {
+        userMapper.updateDelFlagById(id);
+    }
 }

jeeplus-modules/jeeplus-xxl-job-executor-sample/src/main/java/com/jeeplus/domain/PostDTOXXL.java

@@ -0,0 +1,65 @@
+/**
+ * Copyright © 2021-2026 <a href="http://www.jeeplus.org/">JeePlus</a> All rights reserved.
+ */
+package com.jeeplus.domain;
+
+import com.jeeplus.core.service.dto.BaseDTO;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.validation.constraints.NotEmpty;
+
+/**
+ * 岗位Entity
+ *
+ * @author 刘高峰
+ * @version 2021-08-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class PostDTOXXL extends BaseDTO {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 岗位名称
+     */
+    @NotEmpty
+    private String name;
+
+    /**
+     * 岗位编码
+     */
+    @NotEmpty
+    private String code;
+
+    /**
+     * 岗位类型
+     */
+    @NotEmpty
+    private String type;
+
+    /**
+     * 岗位状态
+     */
+    private String status;
+
+    /**
+     * 备注
+     */
+    private String remarks;
+
+    /**
+     * 岗位排序
+     */
+    private Integer sort;        // 岗位排序
+
+    public PostDTOXXL() {
+        super ( );
+    }
+
+    public PostDTOXXL(String id) {
+        super ( id );
+    }
+
+}

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

@@ -3,14 +3,13 @@ package com.xxl.job.executor.service.jobhandler;
 import cn.hutool.extra.spring.SpringUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.TypeReference;
-import com.jeeplus.domain.EnrollmentRegistrationInfo;
-import com.jeeplus.domain.MyNoticeList;
-import com.jeeplus.domain.ProgramProjectListInfo;
-import com.jeeplus.domain.RegistrationInfo;
+import com.jeeplus.domain.*;
 import com.jeeplus.flowable.feign.IAssessApi;
 import com.jeeplus.flowable.feign.IFlowableApi;
+import com.jeeplus.sys.feign.IPostApi;
 import com.jeeplus.sys.feign.ITenantApi;
 import com.jeeplus.sys.feign.IUserApi;
+import com.jeeplus.sys.service.dto.PostDTO;
 import com.jeeplus.sys.service.dto.UserDTO;
 import com.xxl.job.core.context.XxlJobHelper;
 import com.xxl.job.core.handler.annotation.XxlJob;
@@ -111,10 +110,17 @@ public class SampleXxlJob {
             titleStr = "实习生-"+ info.getName()+"已超过3天未发起日志填写。";
 
 
-            Set<String> noticeUserSet = new HashSet<String>();
+//            Set<String> noticeUserSet = new HashSet<String>();
 
-            noticeUserSet.add("1603618333764468738");
-            List<String> noticeUserList = new ArrayList<String>(noticeUserSet);
+//            noticeUserSet.add("1603618333764468738");
+
+            //根据岗位获取人员信息
+            String postInfo = SpringUtil.getBean(IPostApi.class).getPostDTOByNameJSON("考勤统计人");
+            PostDTOXXL dtoxxl = JSON.parseObject(postInfo, new TypeReference<PostDTOXXL>() {});
+
+            List<String> ids = SpringUtil.getBean(IUserApi.class).findIdListFlowAbleByPostId(dtoxxl.getId());
+
+            List<String> noticeUserList = new ArrayList<String>(ids);
             if(noticeUserList.size()>0){
                 MyNoticeList myNotice = new MyNoticeList();
                 myNotice.setCreateById("1");