From 38c4fda5cef22119aa615e610ce5238fd85a2bbb Mon Sep 17 00:00:00 2001 From: furongxin <419481438@qq.com> Date: Tue, 24 Sep 2024 11:12:55 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BA=86=E5=8A=B3?= =?UTF-8?q?=E5=8A=A8=E5=90=88=E5=90=8C=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E9=80=BB=E8=BE=91=EF=BC=8C=E6=94=AF=E6=8C=81=E5=A4=9A=E9=83=A8?= =?UTF-8?q?=E9=97=A8ID=E6=9F=A5=E8=AF=A2=E4=B8=8E=E6=8E=92=E5=BA=8F?= =?UTF-8?q?=E3=80=82=E8=B0=83=E6=95=B4=E4=BA=86LaborContractPageReqVO?= =?UTF-8?q?=E4=BB=A5=E6=94=AF=E6=8C=81=E5=A4=9A=E9=83=A8=E9=97=A8ID?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=EF=BC=8C=E6=9B=B4=E6=94=B9=E4=BA=86AdminUser?= =?UTF-8?q?Mapper=E4=B8=AD=E7=9A=84=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91?= =?UTF-8?q?=EF=BC=8C=E4=BB=A5=E4=BD=BF=E7=94=A8IN=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E7=AC=A6=E5=A4=84=E7=90=86=E5=A4=9A=E9=83=A8=E9=97=A8ID?= =?UTF-8?q?=E3=80=82=E5=90=8C=E6=97=B6=EF=BC=8C=E5=AE=9E=E7=8E=B0=E4=BA=86?= =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E7=94=A8=E6=88=B7ID=E7=9A=84=E5=8D=87?= =?UTF-8?q?=E5=BA=8F=E6=8E=92=E5=88=97=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 在获取部门数据时，若提供了部门ID，则会获取该部门及其所有子部门，以支持更复杂的查询需求。 本次更新确保了劳动合同分页查询功能更加灵活和高效。 --- .../laborcontract/vo/LaborContractPageReqVO.java | 4 ++++ .../system/dal/mysql/user/AdminUserMapper.java | 3 ++- .../laborcontract/LaborContractServiceImpl.java | 13 +++++++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/laborcontract/vo/LaborContractPageReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/laborcontract/vo/LaborContractPageReqVO.java index a9be2932..b399fe49 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/laborcontract/vo/LaborContractPageReqVO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/laborcontract/vo/LaborContractPageReqVO.java @@ -8,6 +8,7 @@ import lombok.ToString; import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDate; +import java.util.List; import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @@ -23,6 +24,9 @@ public class LaborContractPageReqVO extends PageParam { @Schema(description = "部门id", example = "128") private Long deptId; + @Schema(description = "部门id", example = "128") + private List deptIds; + @Schema(description = "签约日期") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDate[] signingDate; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/user/AdminUserMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/user/AdminUserMapper.java index 1df19a5d..9feeb1e3 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/user/AdminUserMapper.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/user/AdminUserMapper.java @@ -152,7 +152,7 @@ public interface AdminUserMapper extends BaseMapperX { " AND lc.create_time = max.max_create_time) a on a.user_id = t.id"); queryWrapper.eq(AdminUserDO::getUserType, 1); queryWrapper.likeIfPresent(AdminUserDO::getNickname, pageReqVO.getUserName()); - queryWrapper.eqIfPresent(AdminUserDO::getDeptId, pageReqVO.getDeptId()); + queryWrapper.inIfPresent(AdminUserDO::getDeptId, pageReqVO.getDeptIds()); if (Objects.nonNull(pageReqVO.getSigningDate())) { queryWrapper.between("a.signing_date", pageReqVO.getSigningDate()[0], pageReqVO.getSigningDate()[1]); } @@ -162,6 +162,7 @@ public interface AdminUserMapper extends BaseMapperX { queryWrapper.eq(Objects.nonNull(pageReqVO.getStatus()),"a.status", pageReqVO.getStatus()); queryWrapper.groupBy(AdminUserDO::getId); queryWrapper.orderByAsc("a.status"); + queryWrapper.orderByAsc(AdminUserDO::getId); return selectJoinPage(mpPage, LaborContractRespVO.class, queryWrapper); } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/laborcontract/LaborContractServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/laborcontract/LaborContractServiceImpl.java index 199df81f..9dd84289 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/laborcontract/LaborContractServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/laborcontract/LaborContractServiceImpl.java @@ -7,9 +7,11 @@ 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; +import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO; import cn.iocoder.yudao.module.system.dal.dataobject.laborcontract.LaborContractDO; import cn.iocoder.yudao.module.system.dal.mysql.laborcontract.LaborContractMapper; import cn.iocoder.yudao.module.system.dal.mysql.user.AdminUserMapper; +import cn.iocoder.yudao.module.system.service.dept.DeptService; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springframework.stereotype.Service; @@ -21,6 +23,7 @@ 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.framework.common.util.collection.CollectionUtils.convertList; import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.LABOR_CONTRACT_NOT_EXISTS; /** @@ -38,6 +41,9 @@ public class LaborContractServiceImpl implements LaborContractService { @Resource private AdminUserMapper userMapper; + @Resource + private DeptService deptService; + @Override public Long createLaborContract(LaborContractSaveReqVO createReqVO) { // 插入 @@ -94,6 +100,13 @@ public class LaborContractServiceImpl implements LaborContractService { @Override public PageResult getLaborContractPage(LaborContractPageReqVO pageReqVO) { + if (pageReqVO.getDeptId() != null) { + + // 获取所有子级部门 + List deptDOS = deptService.getChildDept(pageReqVO.getDeptId()); + pageReqVO.setDeptIds(convertList(deptDOS, DeptDO::getId)); + } + Page page = new Page<>(pageReqVO.getPageNo(), pageReqVO.getPageSize()); IPage pageList = userMapper.selectContractPage(page, pageReqVO); From ecfd6098b2e4942f533d56a0ea24e9e255f09005 Mon Sep 17 00:00:00 2001 From: furongxin <419481438@qq.com> Date: Tue, 24 Sep 2024 11:56:57 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=BD=AC=E6=AD=A3?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E4=BB=BB=E5=8A=A1=E5=88=A4=E6=96=AD=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E5=8F=8A=E5=85=B3=E8=81=94=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bpm/service/task/BpmTaskServiceImpl.java | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskServiceImpl.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskServiceImpl.java index 9f25b6c4..3d58ccce 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskServiceImpl.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskServiceImpl.java @@ -17,6 +17,7 @@ import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.instance.BpmProcessI import cn.iocoder.yudao.module.bpm.controller.admin.task.vo.task.*; import cn.iocoder.yudao.module.bpm.convert.task.BpmTaskConvert; import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOAEntryDO; +import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOARegularDO; import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOASalaryDO; import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOASealDO; import cn.iocoder.yudao.module.bpm.dal.dataobject.task.BpmProcessInstanceExtDO; @@ -28,6 +29,7 @@ import cn.iocoder.yudao.module.bpm.service.definition.BpmModelService; import cn.iocoder.yudao.module.bpm.service.definition.BpmProcessDefinitionService; import cn.iocoder.yudao.module.bpm.service.message.BpmMessageService; import cn.iocoder.yudao.module.bpm.service.oa.BpmOAEntryService; +import cn.iocoder.yudao.module.bpm.service.oa.BpmOARegularService; import cn.iocoder.yudao.module.bpm.service.oa.BpmOASalaryService; import cn.iocoder.yudao.module.bpm.service.oa.BpmOASealService; import cn.iocoder.yudao.module.system.api.dept.DeptApi; @@ -117,6 +119,9 @@ public class BpmTaskServiceImpl implements BpmTaskService { @Resource private BpmOASalaryService bpmOASalaryService; + @Resource + private BpmOARegularService bpmOARegularService; + @Override public PageResult getCCTaskPage(Long userId, BpmTaskDonePageReqVO pageVO) { // 查询被抄送的Task @@ -555,7 +560,17 @@ public class BpmTaskServiceImpl implements BpmTaskService { if (salaryDO != null) { DeptRespDTO dto = deptApi.getDept(salaryDO.getCompanyDeptId()).getCheckedData(); - paramMap.put("company_dept_flag", dto.getFlag()); //配置工厂idflag + paramMap.put("company_dept_flag", dto.getFlag()); //配置工厂编号flag + } + } + + // 判断 转正流程时 + if (instance.getProcessDefinitionId().contains("oa_regular")) { + BpmOARegularDO regularDO = bpmOARegularService.getByProcessInstanceId(instance.getProcessInstanceId()); + if (regularDO != null) { + + DeptRespDTO dto = deptApi.getDept(regularDO.getDeptId()).getCheckedData(); + paramMap.put("regular_dept_flag", dto.getFlag()); //配置转正部门flag } } From 48a671de70be60a730b3ec032685a3b97b14a762 Mon Sep 17 00:00:00 2001 From: furongxin <419481438@qq.com> Date: Tue, 24 Sep 2024 15:05:44 +0800 Subject: [PATCH 03/11] =?UTF-8?q?```=E9=87=87=E8=B4=AD=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=9B=B4=E6=96=B0=E9=80=BB=E8=BE=91=E5=B7=B2?= =?UTF-8?q?=E4=BB=8E=E8=AF=B7=E5=81=87=E6=B5=81=E7=A8=8B=E7=BB=93=E6=9D=9F?= =?UTF-8?q?=E5=90=8E=E7=9A=84=E6=93=8D=E4=BD=9C=E4=B8=AD=E7=A7=BB=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 已更新请假流程，以纠正关于采购申请状态更改的逻辑。此更改避免了在请假流程结束时错误地更新采购申请状态。 ``` --- .../yudao/module/bpm/service/oa/BpmOAGoOutServiceImpl.java | 1 - 1 file changed, 1 deletion(-) diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAGoOutServiceImpl.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAGoOutServiceImpl.java index c241e274..9af9f160 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAGoOutServiceImpl.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAGoOutServiceImpl.java @@ -97,7 +97,6 @@ public class BpmOAGoOutServiceImpl extends BpmOABaseService implements BpmOAGoOu // -- 自己取消 // -- 审核拒绝 - //所有关联的采购申请改为 未支付状态 if (BpmProcessInstanceResultEnum.REJECT.getResult().equals(result) || BpmProcessInstanceResultEnum.CANCEL.getResult().equals(result) || BpmProcessInstanceResultEnum.BACK.getResult().equals(result)) { From 7cad618be52572db8b7f112cda0b8f839261f750 Mon Sep 17 00:00:00 2001 From: furongxin <419481438@qq.com> Date: Tue, 24 Sep 2024 15:23:01 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E7=BC=96=E5=88=B6=E4=BF=AE=E6=94=B9=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 在AdminUserApi和AdminUserService接口中，以及对应的实现类AdminUserApiImpl和AdminUserServiceImpl中，添加了新的方法updateUserStaffing，允许修改用户的编制状态。该功能通过用户ID和新的编制状态值进行操作。 --- .../yudao/module/system/api/user/AdminUserApi.java | 7 +++++++ .../yudao/module/system/api/user/AdminUserApiImpl.java | 6 ++++++ .../module/system/service/user/AdminUserService.java | 8 ++++++++ .../module/system/service/user/AdminUserServiceImpl.java | 6 ++++++ 4 files changed, 27 insertions(+) diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApi.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApi.java index 4b7f6d74..d36ee377 100644 --- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApi.java +++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApi.java @@ -84,6 +84,13 @@ public interface AdminUserApi { void updateFieldworkType(@RequestParam("userId") Long userId, @RequestParam("fieldworkFlag") Integer fieldworkFlag); + @PostMapping(PREFIX + "/updateUserStaffing") + @Operation(summary = "修改用户信息") + @Parameter(name = "userId", description = "用户id", example = "1024", required = true) + @Parameter(name = "userStaffing", description = "用户编制", example = "1", required = true) + void updateUserStaffing(@RequestParam("userId") Long userId, + @RequestParam("userStaffing") Integer userStaffing); + @GetMapping(PREFIX + "/getUserIdsByUserNature") @Operation(summary = "获取所有用户性质为外勤的用户") @Parameter(name = "userNature", description = "用户性质", example = "3", required = true) diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApiImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApiImpl.java index 8ebf04bc..5f090bfb 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApiImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApiImpl.java @@ -96,6 +96,12 @@ public class AdminUserApiImpl implements AdminUserApi { userService.updateFieldworkType(userId, fieldworkFlag); } + @Override + public void updateUserStaffing(Long userId, Integer userStaffing) { + + userService.updateUserStaffing(userId, userStaffing); + } + @Override public CommonResult> getUserIdsByUserNature(Integer userNature) { diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserService.java index bd2a30dd..9dbd3527 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserService.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserService.java @@ -102,6 +102,14 @@ public interface AdminUserService { */ void updateFieldwork(Long id, Integer fieldworkFlag); + /** + * 修改用户编制 + * + * @param id 用户编号 + * @param userStaffing 编制 + */ + void updateUserStaffing(Long id, Integer userStaffing); + /** * 修改外勤打卡状态 * 用于临时开启外勤打卡 diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java index 009b8538..2928a9ef 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java @@ -278,6 +278,12 @@ public class AdminUserServiceImpl implements AdminUserService { userMapper.updateById(updateObj); } + @Override + public void updateUserStaffing(Long id, Integer userStaffing) { + + userMapper.updateById(new AdminUserDO().setId(id).setUserStaffing(userStaffing)); + } + @Override public void updateFieldworkType(Long id, Integer fieldworkFlag) { // 更新状态 From f6eaab85bf602a74882e3bafc1469195a3d804f0 Mon Sep 17 00:00:00 2001 From: furongxin <419481438@qq.com> Date: Tue, 24 Sep 2024 15:23:14 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=AE=9E=E4=BE=8B?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E7=9B=91=E5=90=AC=E5=99=A8=E5=92=8C=E8=BD=AC?= =?UTF-8?q?=E6=AD=A3=E7=94=B3=E8=AF=B7=E6=9C=8D=E5=8A=A1=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 更改内容： - 扩展了BpmOARegularResultListener中的onEvent方法，使其使用流程实例ID作为参数。 - 在BpmOARegularService接口中，updateRegularResult方法现在接收额外的流程实例ID参数。 - 在BpmOARegularServiceImpl中，updateRegularResult方法被更新以使用新的流程实例ID参数，并且在审批通过时，会根据流程实例的开始用户ID更新用户编制状态为在职状态。 这些更改增强了在流程实例结果处理期间的用户状态管理，并确保在审核转正申请时考虑了完整的上下文。 --- .../bpm/service/oa/BpmOARegularService.java | 2 +- .../service/oa/BpmOARegularServiceImpl.java | 36 ++++++++++++++++++- .../listener/BpmOARegularResultListener.java | 2 +- .../service/user/AdminUserServiceImpl.java | 2 -- 4 files changed, 37 insertions(+), 5 deletions(-) diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOARegularService.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOARegularService.java index 375afa6b..f3e3c3c6 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOARegularService.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOARegularService.java @@ -28,7 +28,7 @@ public interface BpmOARegularService { * @param id 编号 * @param result 结果 */ - void updateRegularResult(Long id, Integer result); + void updateRegularResult(String processInstanceId, Long id, Integer result); /** * 获得转正申请 diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOARegularServiceImpl.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOARegularServiceImpl.java index 9c25d532..dbaf8160 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOARegularServiceImpl.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOARegularServiceImpl.java @@ -1,21 +1,37 @@ package cn.iocoder.yudao.module.bpm.service.oa; +import cn.hutool.core.util.StrUtil; +import cn.iocoder.yudao.framework.common.pojo.CommonResult; +import cn.iocoder.yudao.framework.common.util.json.JsonUtils; import cn.iocoder.yudao.module.bpm.api.task.BpmProcessInstanceApi; import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO; +import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.procure.BpmOAProcureListEditReqVO; import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.regular.BpmOARegularCreateReqVO; import cn.iocoder.yudao.framework.common.pojo.UploadUserFile; +import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.reimbursement.Reimbursement; import cn.iocoder.yudao.module.bpm.convert.oa.BpmOARegularConvert; +import cn.iocoder.yudao.module.bpm.dal.dataobject.financialpayment.FinancialPaymentDO; +import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOAImprestDO; +import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOAProcureDO; import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOARegularDO; +import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOAReimbursementDO; +import cn.iocoder.yudao.module.bpm.dal.dataobject.task.BpmProcessInstanceExtDO; import cn.iocoder.yudao.module.bpm.dal.mysql.oa.BpmOARegularMapper; import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceResultEnum; import cn.iocoder.yudao.module.bpm.service.task.BpmHistoryProcessInstanceService; +import cn.iocoder.yudao.module.bpm.service.task.BpmProcessInstanceService; +import cn.iocoder.yudao.module.system.api.user.AdminUserApi; +import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO; +import org.flowable.engine.runtime.ProcessInstance; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; import javax.annotation.Resource; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; import static cn.iocoder.yudao.module.bpm.enums.ErrorCodeConstants.OA_REGULAR_NOT_EXISTS; @@ -44,6 +60,12 @@ public class BpmOARegularServiceImpl extends BpmOABaseService implements BpmOARe @Resource private BpmHistoryProcessInstanceService historyProcessInstanceService; + @Resource + private BpmProcessInstanceService bpmProcessInstanceService; + + @Resource + private AdminUserApi userApi; + @Override public Long createRegular(Long userId, BpmOARegularCreateReqVO createReqVO) { @@ -76,9 +98,21 @@ public class BpmOARegularServiceImpl extends BpmOABaseService implements BpmOARe } @Override - public void updateRegularResult(Long id, Integer result) { + public void updateRegularResult(String processInstanceId, Long id, Integer result) { validateLeaveExists(id); + //审核通过 （最后节点） + if (BpmProcessInstanceResultEnum.APPROVE.getResult().equals(result)) { + + ProcessInstance instance = bpmProcessInstanceService.getProcessInstance(processInstanceId); + + if (instance.isEnded()) { + + // 同步修改用户编制状态为在职状态 + userApi.updateUserStaffing(Long.valueOf(instance.getStartUserId()), 7); + } + } + regularMapper.updateById(new BpmOARegularDO().setId(id).setResult(result)); } diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/listener/BpmOARegularResultListener.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/listener/BpmOARegularResultListener.java index 85da3c7a..0e00ac6e 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/listener/BpmOARegularResultListener.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/listener/BpmOARegularResultListener.java @@ -27,6 +27,6 @@ public class BpmOARegularResultListener extends BpmProcessInstanceResultEventLis @Override protected void onEvent(BpmProcessInstanceResultEvent event) { - regularService.updateRegularResult(Long.parseLong(event.getBusinessKey()), event.getResult()); + regularService.updateRegularResult(event.getId(), Long.parseLong(event.getBusinessKey()), event.getResult()); } } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java index 2928a9ef..4046deb4 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java @@ -18,8 +18,6 @@ import cn.iocoder.yudao.framework.common.util.string.StrUtils; import cn.iocoder.yudao.framework.datapermission.core.annotation.DataPermission; import cn.iocoder.yudao.framework.datapermission.core.util.DataPermissionUtils; import cn.iocoder.yudao.framework.mybatis.core.util.MyBatisUtils; -import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder; -import cn.iocoder.yudao.framework.web.core.util.WebFrameworkUtils; import cn.iocoder.yudao.module.infra.api.file.FileApi; import cn.iocoder.yudao.module.system.controller.admin.user.dto.UserPageDTO; import cn.iocoder.yudao.module.system.controller.admin.user.vo.factoryUser.FactoryUserPageReqVO; From a4dfe1a5a17786cc155995ec06704d7801e5ce3f Mon Sep 17 00:00:00 2001 From: furongxin <419481438@qq.com> Date: Wed, 25 Sep 2024 18:38:59 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E4=BC=98=E5=8C=96=EF=BC=9A=E5=9C=A8=E9=83=A8?= =?UTF-8?q?=E9=97=A8=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3=E4=B8=AD=E7=A6=81?= =?UTF-8?q?=E7=94=A8=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 此次提交禁用了以下接口的数据权限管理，以确保在处理部门数据时不会进行额外的数据权限验证： - 在`DeptApiImpl`中的`deleteDept`和`getDeptByFactoryId`方法上禁用数据权限。 - 在`DeptController`中，新增的`getVirtuallyDeptList`方法和已有的`all-list`方法上禁用数据权限。 - 在`DeptServiceImpl`中的`getDeptByFactoryId`方法上禁用数据权限。这些更改确保了在执行相关操作时，能够直接获取和修改数据，避免了数据权限管理的干扰。 --- .../yudao/module/system/api/dept/DeptApiImpl.java | 2 ++ .../system/controller/admin/dept/DeptController.java | 9 +++++++++ .../module/system/service/dept/DeptServiceImpl.java | 1 + 3 files changed, 12 insertions(+) diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/dept/DeptApiImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/dept/DeptApiImpl.java index 02b7904c..9ecd4202 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/dept/DeptApiImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/dept/DeptApiImpl.java @@ -82,6 +82,7 @@ public class DeptApiImpl implements DeptApi { } @Override + @DataPermission(enable = false) public void deleteDept(Long factoryId) { DeptDO deptDO = deptService.getDeptByFactoryId(factoryId); @@ -92,6 +93,7 @@ public class DeptApiImpl implements DeptApi { } @Override + @DataPermission(enable = false) public CommonResult getDeptByFactoryId(Long factoryId) { DeptDO deptDO = deptService.getDeptByFactoryId(factoryId); diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/DeptController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/DeptController.java index 2f1c3685..4262dd1d 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/DeptController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/DeptController.java @@ -128,6 +128,15 @@ public class DeptController { return success(BeanUtils.toBean(list, DeptSimpleRespVO.class)); } + @GetMapping(value = { "/virtually-list"}) + @Operation(summary = "获取部门精简信息列表", description = "只包含被开启的部门，主要用于前端的下拉选项") + public CommonResult> getVirtuallyDeptList() { + List list = deptService.getDeptList( + new DeptListReqVO().setStatus(CommonStatusEnum.ENABLE.getStatus())); + + return success(BeanUtils.toBean(list, DeptSimpleRespVO.class)); + } + @GetMapping(value = {"/all-list"}) @Operation(summary = "获取部门精简信息列表", description = "只包含被开启的部门，主要用于前端的下拉选项") @DataPermission(enable = false) diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java index 790a7fb0..ccbc738d 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java @@ -311,6 +311,7 @@ public class DeptServiceImpl implements DeptService { } @Override + @DataPermission(enable = false) public DeptDO getDeptByFactoryId(Long factoryId) { return deptMapper.selectOne(DeptDO::getFactoryId, factoryId); From 9c30d82029b3a80fcf7f86719da43098aa84d116 Mon Sep 17 00:00:00 2001 From: furongxin <419481438@qq.com> Date: Wed, 25 Sep 2024 18:39:06 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9D=83=E9=99=90=E6=A0=A1=E9=AA=8C=E4=BB=A5=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E5=BD=93=E5=89=8D=E7=99=BB=E5=BD=95=E7=94=A8=E6=88=B7=E7=9A=84?= =?UTF-8?q?=E5=85=A5=E8=81=8C=E5=92=8C=E8=BD=AC=E6=AD=A3=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/laborcontract/LaborContractController.java | 1 - 1 file changed, 1 deletion(-) diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/laborcontract/LaborContractController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/laborcontract/LaborContractController.java index b228fe48..5da17d0b 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/laborcontract/LaborContractController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/laborcontract/LaborContractController.java @@ -108,7 +108,6 @@ public class LaborContractController { @GetMapping("/getSigningDate") @Operation(summary = "获得当前登录用户的入职时间和转正时间") - @PreAuthorize("@ss.hasPermission('system:labor-contract:query')") public CommonResult getSigningDate() { LaborContractDO contractDO = laborContractService.getSigningDate(getLoginUserId()); From e362850576628538a49622a92cb88621bc483380 Mon Sep 17 00:00:00 2001 From: furongxin <419481438@qq.com> Date: Wed, 25 Sep 2024 18:39:41 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96=EF=BC=9A=E5=AE=9E=E7=8E=B0?= =?UTF-8?q?=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2=E5=92=8C=E4=B8=AA=E4=BA=BA?= =?UTF-8?q?=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 本次提交实现了工作日志模块的分页查询功能，允许用户高效地查询与其相关的上一个或下一个日志实例。通过新增`getMyNextOrUp`方法及相应的SQL映射，支持基于用户个性化需求的日志实例检索。同时，对`getNextOrUp`方法进行了默认实现调整，以支持更灵活的日志数据检索需求。这些改进提升了用户在工作日志模块的交互体验，并增强了系统的整体性能。 --- .../dal/mysql/worklog/LogInstanceMapper.java | 72 ++++++++++++++++++- .../worklog/LogInstanceServiceImpl.java | 29 ++++++-- .../mapper/worklog/LogInstanceMapper.xml | 67 ++++++++--------- 3 files changed, 128 insertions(+), 40 deletions(-) diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/worklog/LogInstanceMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/worklog/LogInstanceMapper.java index 1e8f913f..966f338e 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/worklog/LogInstanceMapper.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/worklog/LogInstanceMapper.java @@ -15,6 +15,7 @@ import cn.iocoder.yudao.module.system.dal.dataobject.worklog.LogInstanceDO; import cn.iocoder.yudao.module.system.dal.dataobject.worklog.LogReadDo; import cn.iocoder.yudao.module.system.service.worklog.dto.LogReadUserRespDTO; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -107,9 +108,76 @@ public interface LogInstanceMapper extends BaseMapperX { * @param type * @return */ - LogInstanceRespVO getNextOrUp(@Param("reqVO") LogInstancePageReqVO dto, + LogInstanceRespVO getMyNextOrUp(@Param("reqVO") LogInstancePageReqVO dto, @Param("id") Long id, @Param("userId") Long userId, @Param("type") Integer type, - @Param("pagingType") Integer pagingType, @Param("userIds") List userIds); + + default IPage getNextOrUp(@Param("reqVO") LogInstancePageReqVO reqVO, + @Param("id") Long id, + @Param("userId") Long userId, + @Param("type") Integer type, + @Param("userIds") List userIds){ + + String sql = ""; + + MPJLambdaWrapperX queryWrapper = new MPJLambdaWrapperX<>(); + queryWrapper.selectAs(LogInstanceDO::getId, LogInstanceRespVO::getId); + queryWrapper.selectAs(LogInstanceDO::getName, LogInstanceRespVO::getName); + queryWrapper.innerJoin(UserPostDO.class, "userPost", UserPostDO::getUserId, LogInstanceDO::getStartUserId); + queryWrapper.innerJoin(DeptDO.class, "dept", DeptDO::getId, LogInstanceDO::getDeptId); + queryWrapper.innerJoin(PostDO.class, "post", PostDO::getId, UserPostDO::getPostId); + if (type == 1) { + sql = " (t.time > tt.time) or\n" + + " (t.time = tt.time and tt.sort > post.sort) or\n" + + " (t.time = tt.time and tt.sort = post.sort and tt.create_time < t.create_time)"; + + queryWrapper.orderByAsc(LogInstanceDO::getTime); + queryWrapper.orderByDesc(PostDO::getSort); + queryWrapper.orderByAsc(LogInstanceDO::getCreateTime); + } + if (type == 0) { + sql = " (t.time < tt.time) or\n" + + " (t.time = tt.time and tt.sort < post.sort) or\n" + + " (t.time = tt.time and tt.sort = post.sort and tt.create_time > t.create_time)"; + + queryWrapper.orderByDesc(LogInstanceDO::getTime); + queryWrapper.orderByAsc(PostDO::getSort); + queryWrapper.orderByDesc(LogInstanceDO::getCreateTime); + } + queryWrapper.innerJoin("(\n" + + "SELECT \n" + + " a.id,\n" + + " a.name,\n" + + " a.time,\n" + + " d.sort,\n" + + " a.create_time\n" + + "FROM \n" + + " work_log_instance_ext a\n" + + " INNER JOIN system_user_post b ON (b.user_id = a.start_user_id) \n" + + " INNER JOIN system_dept c ON (c.id = a.dept_id) \n" + + " INNER JOIN system_post d ON (d.id = b.post_id) \n" + + "WHERE \n" + + " a.id = " + id + "\n" + + " AND a.deleted = 0 \n" + + " AND b.deleted = 0 \n" + + " AND c.deleted = 0 \n" + + " AND d.deleted = 0\n" + + ") tt on \n" + sql); + queryWrapper.eqIfPresent(LogInstanceDO::getDeptId, reqVO.getDeptId()); + queryWrapper.eqIfPresent(LogInstanceDO::getFormId, reqVO.getFormId()); + queryWrapper.eqIfPresent(LogInstanceDO::getStartUserId, reqVO.getStartUserId()); + queryWrapper.betweenIfPresent(LogInstanceDO::getTime, reqVO.getCreateTime()); + queryWrapper.inIfPresent(LogInstanceDO::getStartUserId, userIds); + queryWrapper.ne(LogInstanceDO::getStartUserId, userId); + + if (reqVO.getIsProduce() != null && reqVO.getIsProduce() == 1) { + queryWrapper.like(DeptDO::getFlag, "166"); + } + if (reqVO.getIsProduce() != null && reqVO.getIsProduce() == 2) { + queryWrapper.notLike(DeptDO::getFlag, "166"); + } + + return selectJoinPage(new Page<>(1, 1), LogInstanceRespVO.class, queryWrapper); + } } \ No newline at end of file diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogInstanceServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogInstanceServiceImpl.java index ebde0cd3..873fc912 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogInstanceServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogInstanceServiceImpl.java @@ -1,5 +1,6 @@ package cn.iocoder.yudao.module.system.service.worklog; +import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.json.JSONObject; import cn.iocoder.yudao.framework.common.pojo.PageResult; @@ -256,14 +257,14 @@ public class LogInstanceServiceImpl implements LogInstanceService { if (!records.isEmpty()) { //模版ids过滤 - List workFormIds = records.stream().map(LogInstanceRespVO::getFormId).collect(Collectors.toList()); + Set workFormIds = records.stream().map(LogInstanceRespVO::getFormId).collect(Collectors.toSet()); // 查询模版列表 List formList = logFormService.getFormList(workFormIds); Map formMap = formList.stream().collect(Collectors.toMap(LogFormDO::getId, item -> item)); //查询用户信息列表 - List userIds = records.stream().map(LogInstanceRespVO::getStartUserId).collect(Collectors.toList()); + Set userIds = records.stream().map(LogInstanceRespVO::getStartUserId).collect(Collectors.toSet()); Map userMap = adminUserService.getUserMap(userIds); //遍历 @@ -400,10 +401,26 @@ public class LogInstanceServiceImpl implements LogInstanceService { //以及岗位为总监或副总监的用户 leaderUserIds = adminUserService.getUserByBoss(); } - LogInstanceRespVO upLogInstance = logInstanceMapper.getNextOrUp(dto, id, getLoginUserId(), 1, pagingType, leaderUserIds); - LogInstanceRespVO nextLogInstance = logInstanceMapper.getNextOrUp(dto, id, getLoginUserId(), 0, pagingType, leaderUserIds); - vo.setUpLogInstance(upLogInstance); - vo.setNextLogInstance(nextLogInstance); + if (pagingType == 0) { + IPage upLogInstances = logInstanceMapper.getNextOrUp(dto, id, getLoginUserId(), 1, leaderUserIds); + IPage nextLogInstances = logInstanceMapper.getNextOrUp(dto, id, getLoginUserId(), 0, leaderUserIds); + + if (CollectionUtil.isNotEmpty(upLogInstances.getRecords())) { + vo.setUpLogInstance(upLogInstances.getRecords().get(0)); + } + if (CollectionUtil.isNotEmpty(nextLogInstances.getRecords())) { + vo.setNextLogInstance(nextLogInstances.getRecords().get(0)); + } + } + + if (pagingType == 1) { + LogInstanceRespVO upLogInstance = logInstanceMapper.getMyNextOrUp(dto, id, getLoginUserId(), 1, leaderUserIds); + LogInstanceRespVO nextLogInstance = logInstanceMapper.getMyNextOrUp(dto, id, getLoginUserId(), 0, leaderUserIds); + + vo.setUpLogInstance(upLogInstance); + vo.setNextLogInstance(nextLogInstance); + } + //获取日志详情 return vo; } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/worklog/LogInstanceMapper.xml b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/worklog/LogInstanceMapper.xml index d6c4932b..bbb92770 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/worklog/LogInstanceMapper.xml +++ b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/worklog/LogInstanceMapper.xml @@ -94,61 +94,66 @@ or result.data_scope = 1 ) - @@ -156,13 +161,11 @@