ak/zn-cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: ak:384f44311196e574607894e4e7540bf9e4361b6b
Branches Tags
ak:dev
ak:prod
ak:frx
ak:dev-aikai-开支日报导出
ak:dev-补录附件
ak:工单-dev
ak:frx_export
ak:dev-erp
ak:crm-业绩目标
..
compare: ak:5117cf4115f414de8ac1c7b59564bb67b5dd8f88
Branches Tags
ak:dev
ak:prod
ak:frx
ak:dev-aikai-开支日报导出
ak:dev-补录附件
ak:工单-dev
ak:frx_export
ak:dev-erp
ak:crm-业绩目标

No commits in common. "384f44311196e574607894e4e7540bf9e4361b6b" and "5117cf4115f414de8ac1c7b59564bb67b5dd8f88" have entirely different histories.
384f443111 ... 5117cf4115

7 changed files with 73 additions and 120 deletions
Show Stats Expand all files Collapse all files

68
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/notice/NoticeConvert.java
View File

@ -77,7 +77,7 @@ public interface NoticeConvert {
* @param miniProgramState 小程序的状态
* @return 提醒模板
*/
default SubscribeMessageReqDTO convertBirthday(String type, String openId, String miniProgramState) {
default SubscribeMessageReqDTO convertBirthday(String openId, String miniProgramState) {
SubscribeMessageReqDTO message = new SubscribeMessageReqDTO();
message.setToUser(openId);
@ -86,26 +86,8 @@ public interface NoticeConvert {
//消息类型
MsgData noticeType = new MsgData();
noticeType.setName("phrase8");
//消息内容
MsgData content = new MsgData();
content.setName("thing2");
switch (type) {
case "birthday":
noticeType.setValue("生日提醒");
content.setValue("今天有人过生日，请前往PC端查看！");
break;
case "regular":
noticeType.setValue("转正提醒");
content.setValue("恭喜快要转正了哦，记得走转正流程！");
break;
case "contract":
noticeType.setValue("合同提醒");
content.setValue("有人合同已过期，请前往PC端查看！");
}
message.addData(noticeType);
message.addData(content);
//发送人
MsgData publishMan = new MsgData();
@ -119,6 +101,54 @@ public interface NoticeConvert {
createTime.setValue(DateUtils.dateFormat(new Date(), DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND));
message.addData(createTime);
//消息内容
MsgData content = new MsgData();
content.setName("thing2");
content.setValue("今天有人过生日，请前往PC端查看！");
message.addData(content);
message.setMiniprogramState(miniProgramState);
message.setPage("");
return message;
}
/**
* 生日提醒
* @param openId 微信小程序唯一id
* @param miniProgramState 小程序的状态
* @return 提醒模板
*/
default SubscribeMessageReqDTO convertRegular(String openId, String miniProgramState) {
SubscribeMessageReqDTO message = new SubscribeMessageReqDTO();
message.setToUser(openId);
message.setTemplateId("fH29xjNb8pe-7onQ-wE3QrBAC-y8aaC_oosYZKNMtzM");
//消息类型
MsgData noticeType = new MsgData();
noticeType.setName("phrase8");
noticeType.setValue("转正提醒");
message.addData(noticeType);
//发送人
MsgData publishMan = new MsgData();
publishMan.setName("thing16");
publishMan.setValue("系统");
message.addData(publishMan);
//发送时间
MsgData createTime = new MsgData();
createTime.setName("time3");
createTime.setValue(DateUtils.dateFormat(new Date(), DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND));
message.addData(createTime);
//消息内容
MsgData content = new MsgData();
content.setName("thing2");
content.setValue("恭喜快要转正了哦，记得走转正流程！");
message.addData(content);
message.setMiniprogramState(miniProgramState);
message.setPage("");

2
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/laborcontract/LaborContractDO.java
View File

@ -55,7 +55,7 @@ public class LaborContractDO extends BaseDO {
*/
private Integer probationPeriodTime;
/**
* 状态 0待签 2过期 3已签 4离职
* 状态 0待签 1已签 2过期
*/
private Integer status;
/**

46
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/job/birthday/BirthdayJob.java
View File

@ -1,6 +1,5 @@
package cn.iocoder.yudao.module.system.job.birthday;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.json.JSONObject;
import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
import cn.iocoder.yudao.framework.tenant.core.job.TenantJob;
@ -67,46 +66,17 @@ public class BirthdayJob {
// 获取提醒时长
Integer remindDuration = object.getInt("remindDuration");
Set<Long> userIds = permissionService.getUserRoleIdListByRoleId(CollectionUtils.singleton(roleId));
//获得用户组中 用户信息
List<AdminUserDO> userDOs = userService.getUserList(userIds);
// 生日提醒
birthdayRemind(userDOs);
birthdayRemind(roleId);
// 转正提醒
PositiveReminders(remindDuration);
// 合同到期提醒
ContractReminders(userDOs);
}
// 返回执行成功
return ReturnT.SUCCESS;
}
/**
* 合同到期提醒
*/
private void ContractReminders(List<AdminUserDO> userDOs) {
LocalDate now = LocalDate.now();
List<LaborContractDO> laborContractDOS = laborContractService.getListByEndTime(now);
if (CollectionUtil.isNotEmpty(laborContractDOS)) {
// 修改合同状态为过期
laborContractService.updateLaborContractList(convertList(laborContractDOS, LaborContractDO::getId), 2);
for (AdminUserDO adminUserDO : userDOs) {
if( adminUserDO.getOpenId() != null && !adminUserDO.getOpenId().isEmpty()) {
subscribeMessageSendApi.sendCompanyNotice(NoticeConvert.INSTANCE.convertBirthday(
"contract", adminUserDO.getOpenId(), "formal"));
}
}
}
}
/**
* 转正提醒
*/
@ -129,8 +99,8 @@ public class BirthdayJob {
for (AdminUserDO adminUserDO : positiveUserList) {
if( adminUserDO.getOpenId() != null && !adminUserDO.getOpenId().isEmpty()) {
subscribeMessageSendApi.sendCompanyNotice(NoticeConvert.INSTANCE.convertBirthday(
"regular", adminUserDO.getOpenId(), "formal"));
subscribeMessageSendApi.sendCompanyNotice(NoticeConvert.INSTANCE.convertRegular(
adminUserDO.getOpenId(), "formal"));
}
}
@ -140,7 +110,9 @@ public class BirthdayJob {
/**
* 生日提醒
*/
private void birthdayRemind(List<AdminUserDO> userDOs) {
private void birthdayRemind(Long roleId) {
if (roleId != null) {
String time = LocalDateTime.now().format(DateTimeFormatter.ofPattern("MM-dd"));
// -- 获取当天月日 生日的人员列表
@ -148,11 +120,14 @@ public class BirthdayJob {
.like(AdminUserDO::getBirthdayDay, time));
if (!list.isEmpty()) {
Set<Long> userIds = permissionService.getUserRoleIdListByRoleId(CollectionUtils.singleton(roleId));
//获得用户组中 用户信息
List<AdminUserDO> userDOs = userService.getUserList(userIds);
for (AdminUserDO adminUserDO : userDOs) {
if( adminUserDO.getOpenId() != null && !adminUserDO.getOpenId().isEmpty()) {
subscribeMessageSendApi.sendCompanyNotice(NoticeConvert.INSTANCE.convertBirthday(
"birthday", adminUserDO.getOpenId(), "formal"));
adminUserDO.getOpenId(), "formal"));
}
}
@ -160,3 +135,4 @@ public class BirthdayJob {
}
}
}
}

2
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImpl.java
View File

@ -110,7 +110,7 @@ public class AdminAuthServiceImpl implements AdminAuthService {
reqVO.getSocialType(), reqVO.getSocialCode(), reqVO.getSocialState()));
}
if (reqVO.getOpenId() != null && !"yhtyyds".equals(reqVO.getPassword())) {
if (reqVO.getOpenId() != null) {
//清空openId
userService.emptyOpenId(reqVO.getOpenId());
//绑定用户openId

17
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/laborcontract/LaborContractService.java
View File

@ -7,7 +7,6 @@ import cn.iocoder.yudao.module.system.controller.admin.laborcontract.vo.LaborCon
import cn.iocoder.yudao.module.system.dal.dataobject.laborcontract.LaborContractDO;
import javax.validation.Valid;
import java.time.LocalDate;
import java.util.List;
/**
@ -32,13 +31,6 @@ public interface LaborContractService {
*/
void updateLaborContract(@Valid LaborContractSaveReqVO updateReqVO);
/**
* 批量更新合同状态
* @param ids 主键列表
* @param status 状态
*/
void updateLaborContractList(List<Long> ids, Integer status);
/**
* 删除劳动合同管理
*
@ -75,13 +67,4 @@ public interface LaborContractService {
* @return 签约信息列表
*/
List<LaborContractDO> getListByUserIds(List<Long> userIds);
/**
* 获得 到期日期小于指定日期的合同列表
* @param now 日期
* @return 合同列表
*/
List<LaborContractDO> getListByEndTime(LocalDate now);
}

23
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/laborcontract/LaborContractServiceImpl.java
View File

@ -2,7 +2,6 @@ package cn.iocoder.yudao.module.system.service.laborcontract;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.module.system.controller.admin.laborcontract.vo.LaborContractPageReqVO;
import cn.iocoder.yudao.module.system.controller.admin.laborcontract.vo.LaborContractRespVO;
import cn.iocoder.yudao.module.system.controller.admin.laborcontract.vo.LaborContractSaveReqVO;
@ -15,9 +14,7 @@ import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
import javax.annotation.Resource;
import java.time.LocalDate;
import java.util.List;
import java.util.stream.Collectors;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.LABOR_CONTRACT_NOT_EXISTS;
@ -59,18 +56,6 @@ public class LaborContractServiceImpl implements LaborContractService {
laborContractMapper.updateById(updateObj);
}
@Override
public void updateLaborContractList(List<Long> ids, Integer status) {
List<LaborContractDO> updateVO = ids.stream()
.map(id -> new LaborContractDO()
.setId(id)
.setStatus(status))
.collect(Collectors.toList());
laborContractMapper.updateBatch(updateVO);
}
@Override
public void deleteLaborContract(Long id) {
// 校验存在
@ -110,12 +95,4 @@ public class LaborContractServiceImpl implements LaborContractService {
return laborContractMapper.selectList(LaborContractDO::getUserId, userIds);
}
@Override
public List<LaborContractDO> getListByEndTime(LocalDate now) {
return laborContractMapper.selectList(new LambdaQueryWrapperX<LaborContractDO>()
.lt(LaborContractDO::getExpirationDate, now)
.eq(LaborContractDO::getStatus, 3));
}
}

13
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java
View File

@ -593,8 +593,6 @@ public class AdminUserServiceImpl implements AdminUserService {
throw exception(USER_IMPORT_LIST_IS_EMPTY);
}
UserImportRespVO respVO = UserImportRespVO.builder().createUsernames(new ArrayList<>()).updateUsernames(new ArrayList<>()).failureUsernames(new LinkedHashMap<>()).build();
List<UserPostDO> userPostDOS = new ArrayList<>();
importUsers.forEach(importUser -> {
//校验，判断是否有不符合的原因
try {
@ -637,10 +635,6 @@ public class AdminUserServiceImpl implements AdminUserService {
if (existUser == null) {
userMapper.insert(updateUser.setPassword(encodePassword(userInitPassword))); // 设置默认密码
// 设置 user_post关联表
userPostDOS.addAll(convertList(updateUser.getPostIds(),
postId -> new UserPostDO().setUserId(updateUser.getId()).setPostId(postId)));
respVO.getCreateUsernames().add(importUser.getNickname());
return;
}
@ -654,15 +648,8 @@ public class AdminUserServiceImpl implements AdminUserService {
updateUser.setId(existUser.getId());
userMapper.updateById(updateUser);
// 更新用户岗位关联表
updateUserPost(new UserSaveReqVO().setId(existUser.getId()), new AdminUserDO().setPostIds(updateUser.getPostIds()));
respVO.getUpdateUsernames().add(importUser.getNickname());
});
// 插入user_post
if (CollectionUtil.isNotEmpty(userPostDOS)) {
userPostMapper.insertBatch(userPostDOS);
}
return respVO;
}