1、审批完成当前审批人显示问题

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/business/OaBusinessServiceImpl.java

@@ -318,31 +318,31 @@ public class OaBusinessServiceImpl implements OaBusinessService {
         bpmTaskService.approveTask(loginEmployee.getId(), agreeReqVO);
 
         Task nextTask = taskService.createTaskQuery().processInstanceId(currentTask.getProcessInstanceId()).singleResult();
-        OaBusinessDO oaBusinessDO = new OaBusinessDO();
+        LambdaUpdateWrapper<OaBusinessDO> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
         if (nextTask != null) {
             Long currentAuditEmployeeId = Long.valueOf(nextTask.getAssignee());
             EmployeeRespDTO currentAuditEmployee = employeeApi.getEmployeeById(currentAuditEmployeeId);
 
             // 如果审批人重复，实际未结束，再次更新为审核中
             taskService.setVariable(nextTask.getId(), BpmConstants.PROCESS_INSTANCE_VARIABLE_STATUS, DictDataConstants.OA_AUDIT_STATUS_AUDITING);
-            oaBusinessDO.setAuditStatus(DictDataConstants.OA_AUDIT_STATUS_AUDITING)
-                    .setCurrentAuditEmployeeId(currentAuditEmployeeId)
-                    .setCurrentAuditEmployeeName(currentAuditEmployee.getName())
-                    .setFinalAuditDate(LocalDateTime.now())
-                    .setId(oaBusiness.getId());
+            lambdaUpdateWrapper.set(OaBusinessDO::getAuditStatus, DictDataConstants.OA_AUDIT_STATUS_AUDITING)
+                    .set(OaBusinessDO::getCurrentAuditEmployeeId, currentAuditEmployeeId)
+                    .set(OaBusinessDO::getCurrentAuditEmployeeName, currentAuditEmployee.getName())
+                    .set(OaBusinessDO::getFinalAuditDate, LocalDateTime.now())
+                    .eq(OaBusinessDO::getId, oaBusiness.getId());
 
         } else {
-            oaBusinessDO.setAuditStatus(DictDataConstants.OA_AUDIT_STATUS_AUDITED)
-                    .setCurrentAuditEmployeeId(null)
-                    .setCurrentAuditEmployeeName(null)
-                    .setFinalAuditDate(LocalDateTime.now())
-                    .setId(oaBusiness.getId());
+            lambdaUpdateWrapper.set(OaBusinessDO::getAuditStatus, DictDataConstants.OA_AUDIT_STATUS_AUDITED)
+                    .set(OaBusinessDO::getCurrentAuditEmployeeId, null)
+                    .set(OaBusinessDO::getCurrentAuditEmployeeName, null)
+                    .set(OaBusinessDO::getFinalAuditDate, LocalDateTime.now())
+                    .eq(OaBusinessDO::getId, oaBusiness.getId());
         }
-        oaBusinessMapper.updateById(oaBusinessDO);
+        oaBusinessMapper.update(lambdaUpdateWrapper);
         // 复制业务单据信息到业务模块单据表
         if(Objects.isNull(nextTask)) {
             // 查询申请单
-            OaBusinessDO business = oaBusinessMapper.selectById(oaBusinessDO.getId());
+            OaBusinessDO business = oaBusinessMapper.selectById(oaBusiness.getId());
 
             // 转换为DTO
             AttendanceBusinessCreateReqDTO businessCreateReqDTO = BeanUtils.toBean(business, AttendanceBusinessCreateReqDTO.class);

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/conversion/OaConversionServiceImpl.java

@@ -343,31 +343,32 @@ public class OaConversionServiceImpl implements OaConversionService {
         bpmTaskService.approveTask(loginEmployee.getId(), agreeReqVO);
 
         Task nextTask = taskService.createTaskQuery().processInstanceId(currentTask.getProcessInstanceId()).singleResult();
-        OaConversionDO oaConversionDO = new OaConversionDO();
+        LambdaUpdateWrapper<OaConversionDO> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
         if (nextTask != null) {
             Long currentAuditEmployeeId = Long.valueOf(nextTask.getAssignee());
             EmployeeRespDTO currentAuditEmployee = employeeApi.getEmployeeById(currentAuditEmployeeId);
 
             // 如果审批人重复，实际未结束，再次更新为审核中
             taskService.setVariable(nextTask.getId(), BpmConstants.PROCESS_INSTANCE_VARIABLE_STATUS, DictDataConstants.OA_AUDIT_STATUS_AUDITING);
-            oaConversionDO.setAuditStatus(DictDataConstants.OA_AUDIT_STATUS_AUDITING)
-                    .setCurrentAuditEmployeeId(currentAuditEmployeeId)
-                    .setCurrentAuditEmployeeName(currentAuditEmployee.getName())
-                    .setFinalAuditDate(LocalDateTime.now())
-                    .setId(oaConversion.getId());
+            lambdaUpdateWrapper.set(OaConversionDO::getAuditStatus, DictDataConstants.OA_AUDIT_STATUS_AUDITING)
+                    .set(OaConversionDO::getCurrentAuditEmployeeId, currentAuditEmployeeId)
+                    .set(OaConversionDO::getCurrentAuditEmployeeName, currentAuditEmployee.getName())
+                    .set(OaConversionDO::getFinalAuditDate, LocalDateTime.now())
+                    .eq(OaConversionDO::getId, oaConversion.getId());
 
         } else {
-            oaConversionDO.setAuditStatus(DictDataConstants.OA_AUDIT_STATUS_AUDITED)
-                    .setCurrentAuditEmployeeId(null)
-                    .setCurrentAuditEmployeeName(null)
-                    .setFinalAuditDate(LocalDateTime.now())
-                    .setId(oaConversion.getId());
+            lambdaUpdateWrapper.set(OaConversionDO::getAuditStatus, DictDataConstants.OA_AUDIT_STATUS_AUDITED)
+                    .set(OaConversionDO::getCurrentAuditEmployeeId, null)
+                    .set(OaConversionDO::getCurrentAuditEmployeeName, null)
+                    .set(OaConversionDO::getFinalAuditDate, LocalDateTime.now())
+                    .eq(OaConversionDO::getId, oaConversion.getId());
         }
-        oaConversionMapper.updateById(oaConversionDO);
+        oaConversionMapper.update(lambdaUpdateWrapper);
+
         // 复制业务单据信息到业务模块单据表
         if(Objects.isNull(nextTask)) {
             // 查询申请单
-            OaConversionDO conversion = oaConversionMapper.selectById(oaConversionDO.getId());
+            OaConversionDO conversion = oaConversionMapper.selectById(oaConversion.getId());
 
             // 转换为DTO
             RelationsConversionCreateReqDTO conversionCreateReqDTO = BeanUtils.toBean(conversion, RelationsConversionCreateReqDTO.class);

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/expense/OaExpenseServiceImpl.java

@@ -365,29 +365,27 @@ public class OaExpenseServiceImpl implements OaExpenseService {
         bpmTaskService.approveTask(loginEmployee.getId(), agreeReqVO);
 
         Task nextTask = taskService.createTaskQuery().processInstanceId(currentTask.getProcessInstanceId()).singleResult();
-        OaExpenseDO oaExpenseDO = new OaExpenseDO();
+        LambdaUpdateWrapper<OaExpenseDO> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
         if (nextTask != null) {
             Long currentAuditEmployeeId = Long.valueOf(nextTask.getAssignee());
             EmployeeRespDTO currentAuditEmployee = employeeApi.getEmployeeById(currentAuditEmployeeId);
 
             // 如果审批人重复，实际未结束，再次更新为审核中
             taskService.setVariable(nextTask.getId(), BpmConstants.PROCESS_INSTANCE_VARIABLE_STATUS, DictDataConstants.OA_AUDIT_STATUS_AUDITING);
-            oaExpenseDO.setAuditStatus(DictDataConstants.OA_AUDIT_STATUS_AUDITING)
-                    .setCurrentAuditEmployeeId(currentAuditEmployeeId)
-                    .setCurrentAuditEmployeeName(currentAuditEmployee.getName())
-                    .setFinalAuditDate(LocalDateTime.now())
-                    .setId(oaExpense.getId());
+            lambdaUpdateWrapper.set(OaExpenseDO::getAuditStatus, DictDataConstants.OA_AUDIT_STATUS_AUDITING)
+                    .set(OaExpenseDO::getCurrentAuditEmployeeId, currentAuditEmployeeId)
+                    .set(OaExpenseDO::getCurrentAuditEmployeeName, currentAuditEmployee.getName())
+                    .set(OaExpenseDO::getFinalAuditDate, LocalDateTime.now())
+                    .eq(OaExpenseDO::getId, oaExpense.getId());
 
         } else {
-            oaExpenseDO.setAuditStatus(DictDataConstants.OA_AUDIT_STATUS_AUDITED)
-                    .setCurrentAuditEmployeeId(null)
-                    .setCurrentAuditEmployeeName(null)
-                    .setFinalAuditDate(LocalDateTime.now())
-                    .setId(oaExpense.getId());
-
-
+            lambdaUpdateWrapper.set(OaExpenseDO::getAuditStatus, DictDataConstants.OA_AUDIT_STATUS_AUDITED)
+                    .set(OaExpenseDO::getCurrentAuditEmployeeId, null)
+                    .set(OaExpenseDO::getCurrentAuditEmployeeName, null)
+                    .set(OaExpenseDO::getFinalAuditDate, LocalDateTime.now())
+                    .eq(OaExpenseDO::getId, oaExpense.getId());
         }
-        oaExpenseMapper.updateById(oaExpenseDO);
+        oaExpenseMapper.update(lambdaUpdateWrapper);
         // 复制业务单据信息到业务模块单据表
         if (Objects.isNull(nextTask)) {
             // 根据ID查询费用报销单

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/leave/OaLeaveServiceImpl.java

@@ -351,31 +351,31 @@ public class OaLeaveServiceImpl implements OaLeaveService {
         bpmTaskService.approveTask(loginEmployee.getId(), agreeReqVO);
 
         Task nextTask = taskService.createTaskQuery().processInstanceId(currentTask.getProcessInstanceId()).singleResult();
-        OaLeaveDO oaLeaveDO = new OaLeaveDO();
+        LambdaUpdateWrapper<OaLeaveDO> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
         if (nextTask != null) {
             Long currentAuditEmployeeId = Long.valueOf(nextTask.getAssignee());
             EmployeeRespDTO currentAuditEmployee = employeeApi.getEmployeeById(currentAuditEmployeeId);
 
             // 如果审批人重复，实际未结束，再次更新为审核中
             taskService.setVariable(nextTask.getId(), BpmConstants.PROCESS_INSTANCE_VARIABLE_STATUS, DictDataConstants.OA_AUDIT_STATUS_AUDITING);
-            oaLeaveDO.setAuditStatus(DictDataConstants.OA_AUDIT_STATUS_AUDITING)
-                    .setCurrentAuditEmployeeId(currentAuditEmployeeId)
-                    .setCurrentAuditEmployeeName(currentAuditEmployee.getName())
-                    .setFinalAuditDate(LocalDateTime.now())
-                    .setId(oaLeave.getId());
+            lambdaUpdateWrapper.set(OaLeaveDO::getAuditStatus, DictDataConstants.OA_AUDIT_STATUS_AUDITING)
+                    .set(OaLeaveDO::getCurrentAuditEmployeeId, currentAuditEmployeeId)
+                    .set(OaLeaveDO::getCurrentAuditEmployeeName, currentAuditEmployee.getName())
+                    .set(OaLeaveDO::getFinalAuditDate, LocalDateTime.now())
+                    .eq(OaLeaveDO::getId, oaLeave.getId());
 
         } else {
-            oaLeaveDO.setAuditStatus(DictDataConstants.OA_AUDIT_STATUS_AUDITED)
-                    .setCurrentAuditEmployeeId(null)
-                    .setCurrentAuditEmployeeName(null)
-                    .setFinalAuditDate(LocalDateTime.now())
-                    .setId(oaLeave.getId());
+            lambdaUpdateWrapper.set(OaLeaveDO::getAuditStatus, DictDataConstants.OA_AUDIT_STATUS_AUDITED)
+                    .set(OaLeaveDO::getCurrentAuditEmployeeId, null)
+                    .set(OaLeaveDO::getCurrentAuditEmployeeName, null)
+                    .set(OaLeaveDO::getFinalAuditDate, LocalDateTime.now())
+                    .eq(OaLeaveDO::getId, oaLeave.getId());
         }
-        oaLeaveMapper.updateById(oaLeaveDO);
+        oaLeaveMapper.update(lambdaUpdateWrapper);
         // 复制业务单据信息到业务模块单据表
         if(Objects.isNull(nextTask)) {
             // 查询申请单
-            OaLeaveDO leave = oaLeaveMapper.selectById(oaLeaveDO.getId());
+            OaLeaveDO leave = oaLeaveMapper.selectById(oaLeave.getId());
 
             // 转换为DTO
             AttendanceLeaveCreateReqDTO leaveCreateReqDTO = BeanUtils.toBean(leave, AttendanceLeaveCreateReqDTO.class);

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/out/OaOutServiceImpl.java

@@ -313,31 +313,31 @@ public class OaOutServiceImpl implements OaOutService {
         bpmTaskService.approveTask(loginEmployee.getId(), agreeReqVO);
 
         Task nextTask = taskService.createTaskQuery().processInstanceId(currentTask.getProcessInstanceId()).singleResult();
-        OaOutDO oaOutDO = new OaOutDO();
+        LambdaUpdateWrapper<OaOutDO> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
         if (nextTask != null) {
             Long currentAuditEmployeeId = Long.valueOf(nextTask.getAssignee());
             EmployeeRespDTO currentAuditEmployee = employeeApi.getEmployeeById(currentAuditEmployeeId);
 
             // 如果审批人重复，实际未结束，再次更新为审核中
             taskService.setVariable(nextTask.getId(), BpmConstants.PROCESS_INSTANCE_VARIABLE_STATUS, DictDataConstants.OA_AUDIT_STATUS_AUDITING);
-            oaOutDO.setAuditStatus(DictDataConstants.OA_AUDIT_STATUS_AUDITING)
-                    .setCurrentAuditEmployeeId(currentAuditEmployeeId)
-                    .setCurrentAuditEmployeeName(currentAuditEmployee.getName())
-                    .setFinalAuditDate(LocalDateTime.now())
-                    .setId(oaOut.getId());
+            lambdaUpdateWrapper.eq(OaOutDO::getId, oaOut.getId())
+                    .set(OaOutDO::getAuditStatus, DictDataConstants.OA_AUDIT_STATUS_AUDITING)
+                    .set(OaOutDO::getCurrentAuditEmployeeId, currentAuditEmployeeId)
+                    .set(OaOutDO::getCurrentAuditEmployeeName, currentAuditEmployee.getName())
+                    .set(OaOutDO::getFinalAuditDate, LocalDateTime.now());
 
         } else {
-            oaOutDO.setAuditStatus(DictDataConstants.OA_AUDIT_STATUS_AUDITED)
-                    .setCurrentAuditEmployeeId(null)
-                    .setCurrentAuditEmployeeName(null)
-                    .setFinalAuditDate(LocalDateTime.now())
-                    .setId(oaOut.getId());
+            lambdaUpdateWrapper.eq(OaOutDO::getId, oaOut.getId())
+                    .set(OaOutDO::getAuditStatus, DictDataConstants.OA_AUDIT_STATUS_AUDITED)
+                    .set(OaOutDO::getCurrentAuditEmployeeId, null)
+                    .set(OaOutDO::getCurrentAuditEmployeeName, null)
+                    .set(OaOutDO::getFinalAuditDate, LocalDateTime.now());
         }
-        oaOutMapper.updateById(oaOutDO);
+        oaOutMapper.update(null, lambdaUpdateWrapper);
         // 复制业务单据信息到业务模块单据表
         if(Objects.isNull(nextTask)) {
             // 查询申请单
-            OaOutDO out = oaOutMapper.selectById(oaOutDO.getId());
+            OaOutDO out = oaOutMapper.selectById(oaOut.getId());
 
             // 转换为DTO
             AttendanceOutCreateReqDTO outCreateReqDTO = BeanUtils.toBean(out, AttendanceOutCreateReqDTO.class);

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/purchase/OaPurchaseServiceImpl.java

@@ -339,27 +339,27 @@ public class OaPurchaseServiceImpl implements OaPurchaseService {
         bpmTaskService.approveTask(loginEmployee.getId(), agreeReqVO);
 
         Task nextTask = taskService.createTaskQuery().processInstanceId(currentTask.getProcessInstanceId()).singleResult();
-        OaPurchaseDO oaPurchaseDO = new OaPurchaseDO();
+        LambdaUpdateWrapper<OaPurchaseDO> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
         if (nextTask != null) {
             Long currentAuditEmployeeId = Long.valueOf(nextTask.getAssignee());
             EmployeeRespDTO currentAuditEmployee = employeeApi.getEmployeeById(currentAuditEmployeeId);
 
             // 如果审批人重复，实际未结束，再次更新为审核中
             taskService.setVariable(nextTask.getId(), BpmConstants.PROCESS_INSTANCE_VARIABLE_STATUS, DictDataConstants.OA_AUDIT_STATUS_AUDITING);
-            oaPurchaseDO.setAuditStatus(DictDataConstants.OA_AUDIT_STATUS_AUDITING)
-                    .setCurrentAuditEmployeeId(currentAuditEmployeeId)
-                    .setCurrentAuditEmployeeName(currentAuditEmployee.getName())
-                    .setFinalAuditDate(LocalDateTime.now())
-                    .setId(oaPurchase.getId());
+            lambdaUpdateWrapper.set(OaPurchaseDO::getAuditStatus, DictDataConstants.OA_AUDIT_STATUS_AUDITING)
+                    .set(OaPurchaseDO::getCurrentAuditEmployeeId, currentAuditEmployeeId)
+                    .set(OaPurchaseDO::getCurrentAuditEmployeeName, currentAuditEmployee.getName())
+                    .set(OaPurchaseDO::getFinalAuditDate, LocalDateTime.now())
+                    .eq(OaPurchaseDO::getId, oaPurchase.getId());
 
         } else {
-            oaPurchaseDO.setAuditStatus(DictDataConstants.OA_AUDIT_STATUS_AUDITED)
-                    .setCurrentAuditEmployeeId(null)
-                    .setCurrentAuditEmployeeName(null)
-                    .setFinalAuditDate(LocalDateTime.now())
-                    .setId(oaPurchase.getId());
+            lambdaUpdateWrapper.set(OaPurchaseDO::getAuditStatus, DictDataConstants.OA_AUDIT_STATUS_AUDITED)
+                    .set(OaPurchaseDO::getCurrentAuditEmployeeId, null)
+                    .set(OaPurchaseDO::getCurrentAuditEmployeeName, null)
+                    .set(OaPurchaseDO::getFinalAuditDate, LocalDateTime.now())
+                    .eq(OaPurchaseDO::getId, oaPurchase.getId());
         }
-        oaPurchaseMapper.updateById(oaPurchaseDO);
+        oaPurchaseMapper.update(null, lambdaUpdateWrapper);
 
         // 发送站内信
         Long assignId = -1L;

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/receive/OaReceiveServiceImpl.java

@@ -342,27 +342,26 @@ public class OaReceiveServiceImpl implements OaReceiveService {
         bpmTaskService.approveTask(loginEmployee.getId(), agreeReqVO);
 
         Task nextTask = taskService.createTaskQuery().processInstanceId(currentTask.getProcessInstanceId()).singleResult();
-        OaReceiveDO oaReceiveDO = new OaReceiveDO();
+        LambdaUpdateWrapper<OaReceiveDO> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
         if (nextTask != null) {
             Long currentAuditEmployeeId = Long.valueOf(nextTask.getAssignee());
             EmployeeRespDTO currentAuditEmployee = employeeApi.getEmployeeById(currentAuditEmployeeId);
 
             // 如果审批人重复，实际未结束，再次更新为审核中
             taskService.setVariable(nextTask.getId(), BpmConstants.PROCESS_INSTANCE_VARIABLE_STATUS, DictDataConstants.OA_AUDIT_STATUS_AUDITING);
-            oaReceiveDO.setAuditStatus(DictDataConstants.OA_AUDIT_STATUS_AUDITING)
-                    .setCurrentAuditEmployeeId(currentAuditEmployeeId)
-                    .setCurrentAuditEmployeeName(currentAuditEmployee.getName())
-                    .setFinalAuditDate(LocalDateTime.now())
-                    .setId(oaReceive.getId());
-
+            lambdaUpdateWrapper.set(OaReceiveDO::getAuditStatus, DictDataConstants.OA_AUDIT_STATUS_AUDITING)
+                    .set(OaReceiveDO::getCurrentAuditEmployeeId, currentAuditEmployeeId)
+                    .set(OaReceiveDO::getCurrentAuditEmployeeName, currentAuditEmployee.getName())
+                    .set(OaReceiveDO::getFinalAuditDate, LocalDateTime.now())
+                    .eq(OaReceiveDO::getId, oaReceive.getId());
         } else {
-            oaReceiveDO.setAuditStatus(DictDataConstants.OA_AUDIT_STATUS_AUDITED)
-                    .setCurrentAuditEmployeeId(null)
-                    .setCurrentAuditEmployeeName(null)
-                    .setFinalAuditDate(LocalDateTime.now())
-                    .setId(oaReceive.getId());
+            lambdaUpdateWrapper.set(OaReceiveDO::getAuditStatus, DictDataConstants.OA_AUDIT_STATUS_AUDITED)
+                    .set(OaReceiveDO::getCurrentAuditEmployeeId, null)
+                    .set(OaReceiveDO::getCurrentAuditEmployeeName, null)
+                    .set(OaReceiveDO::getFinalAuditDate, LocalDateTime.now())
+                    .eq(OaReceiveDO::getId, oaReceive.getId());
         }
-        oaReceiveMapper.updateById(oaReceiveDO);
+        oaReceiveMapper.update(null, lambdaUpdateWrapper);
 
         // 发送站内信
         Long assignId = -1L;

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/renew/OaRenewServiceImpl.java

@@ -358,31 +358,32 @@ public class OaRenewServiceImpl implements OaRenewService {
         bpmTaskService.approveTask(loginEmployee.getId(), agreeReqVO);
 
         Task nextTask = taskService.createTaskQuery().processInstanceId(currentTask.getProcessInstanceId()).singleResult();
-        OaRenewDO oaRenewDO = new OaRenewDO();
+        LambdaUpdateWrapper<OaRenewDO> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
         if (nextTask != null) {
             Long currentAuditEmployeeId = Long.valueOf(nextTask.getAssignee());
             EmployeeRespDTO currentAuditEmployee = employeeApi.getEmployeeById(currentAuditEmployeeId);
 
             // 如果审批人重复，实际未结束，再次更新为审核中
             taskService.setVariable(nextTask.getId(), BpmConstants.PROCESS_INSTANCE_VARIABLE_STATUS, DictDataConstants.OA_AUDIT_STATUS_AUDITING);
-            oaRenewDO.setAuditStatus(DictDataConstants.OA_AUDIT_STATUS_AUDITING)
-                    .setCurrentAuditEmployeeId(currentAuditEmployeeId)
-                    .setCurrentAuditEmployeeName(currentAuditEmployee.getName())
-                    .setFinalAuditDate(LocalDateTime.now())
-                    .setId(oaRenew.getId());
+            lambdaUpdateWrapper.set(OaRenewDO::getAuditStatus, DictDataConstants.OA_AUDIT_STATUS_AUDITING)
+                    .set(OaRenewDO::getCurrentAuditEmployeeId, currentAuditEmployeeId)
+                    .set(OaRenewDO::getCurrentAuditEmployeeName, currentAuditEmployee.getName())
+                    .set(OaRenewDO::getFinalAuditDate, LocalDateTime.now())
+                    .eq(OaRenewDO::getId, oaRenew.getId());
 
         } else {
-            oaRenewDO.setAuditStatus(DictDataConstants.OA_AUDIT_STATUS_AUDITED)
-                    .setCurrentAuditEmployeeId(null)
-                    .setCurrentAuditEmployeeName(null)
-                    .setFinalAuditDate(LocalDateTime.now())
-                    .setId(oaRenew.getId());
+            lambdaUpdateWrapper.set(OaRenewDO::getAuditStatus, DictDataConstants.OA_AUDIT_STATUS_AUDITED)
+                    .set(OaRenewDO::getCurrentAuditEmployeeId, null)
+                    .set(OaRenewDO::getCurrentAuditEmployeeName, null)
+                    .set(OaRenewDO::getFinalAuditDate, LocalDateTime.now())
+                    .eq(OaRenewDO::getId, oaRenew.getId());
         }
-        oaRenewMapper.updateById(oaRenewDO);
+        oaRenewMapper.update(lambdaUpdateWrapper);
+
         // 复制业务单据信息到业务模块单据表
         if(Objects.isNull(nextTask)) {
             // 查询申请单
-            OaRenewDO renew = oaRenewMapper.selectById(oaRenewDO.getId());
+            OaRenewDO renew = oaRenewMapper.selectById(oaRenew.getId());
 
             // 转换为DTO
             RelationsRenewCreateReqDTO renewCreateReqDTO = BeanUtils.toBean(renew, RelationsRenewCreateReqDTO.class);

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/stamp/OaStampServiceImpl.java

@@ -326,31 +326,30 @@ public class OaStampServiceImpl implements OaStampService {
         bpmTaskService.approveTask(loginEmployee.getId(), agreeReqVO);
 
         Task nextTask = taskService.createTaskQuery().processInstanceId(currentTask.getProcessInstanceId()).singleResult();
-        OaStampDO oaStampDO = new OaStampDO();
+        LambdaUpdateWrapper<OaStampDO> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
         if (nextTask != null) {
             Long currentAuditEmployeeId = Long.valueOf(nextTask.getAssignee());
             EmployeeRespDTO currentAuditEmployee = employeeApi.getEmployeeById(currentAuditEmployeeId);
 
             // 如果审批人重复，实际未结束，再次更新为审核中
             taskService.setVariable(nextTask.getId(), BpmConstants.PROCESS_INSTANCE_VARIABLE_STATUS, DictDataConstants.OA_AUDIT_STATUS_AUDITING);
-            oaStampDO.setAuditStatus(DictDataConstants.OA_AUDIT_STATUS_AUDITING)
-                    .setCurrentAuditEmployeeId(currentAuditEmployeeId)
-                    .setCurrentAuditEmployeeName(currentAuditEmployee.getName())
-                    .setFinalAuditDate(LocalDateTime.now())
-                    .setId(oaStamp.getId());
-
+            lambdaUpdateWrapper.set(OaStampDO::getAuditStatus, DictDataConstants.OA_AUDIT_STATUS_AUDITING)
+                    .set(OaStampDO::getCurrentAuditEmployeeId, currentAuditEmployeeId)
+                    .set(OaStampDO::getCurrentAuditEmployeeName, currentAuditEmployee.getName())
+                    .set(OaStampDO::getFinalAuditDate, LocalDateTime.now())
+                    .eq(OaStampDO::getId, oaStamp.getId());
         } else {
-            oaStampDO.setAuditStatus(DictDataConstants.OA_AUDIT_STATUS_AUDITED)
-                    .setCurrentAuditEmployeeId(null)
-                    .setCurrentAuditEmployeeName(null)
-                    .setFinalAuditDate(LocalDateTime.now())
-                    .setId(oaStamp.getId());
+            lambdaUpdateWrapper.set(OaStampDO::getAuditStatus, DictDataConstants.OA_AUDIT_STATUS_AUDITED)
+                    .set(OaStampDO::getCurrentAuditEmployeeId, null)
+                    .set(OaStampDO::getCurrentAuditEmployeeName, null)
+                    .set(OaStampDO::getFinalAuditDate, LocalDateTime.now())
+                    .eq(OaStampDO::getId, oaStamp.getId());
         }
-        oaStampMapper.updateById(oaStampDO);
+        oaStampMapper.update(lambdaUpdateWrapper);
         // 复制业务单据信息到业务模块单据表
         if(Objects.isNull(nextTask)) {
             // 查询申请单
-            OaStampDO stamp = oaStampMapper.selectById(oaStampDO.getId());
+            OaStampDO stamp = oaStampMapper.selectById(oaStamp.getId());
 
             // 转换
             OaStampInfoDO stampInfoDO = BeanUtils.toBean(stamp, OaStampInfoDO.class);

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/turnover/OaTurnoverServiceImpl.java

@@ -340,31 +340,31 @@ public class OaTurnoverServiceImpl implements OaTurnoverService {
         bpmTaskService.approveTask(loginEmployee.getId(), agreeReqVO);
 
         Task nextTask = taskService.createTaskQuery().processInstanceId(currentTask.getProcessInstanceId()).singleResult();
-        OaTurnoverDO oaTurnoverDO = new OaTurnoverDO();
+        LambdaUpdateWrapper<OaTurnoverDO> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
         if (nextTask != null) {
             Long currentAuditEmployeeId = Long.valueOf(nextTask.getAssignee());
             EmployeeRespDTO currentAuditEmployee = employeeApi.getEmployeeById(currentAuditEmployeeId);
 
             // 如果审批人重复，实际未结束，再次更新为审核中
             taskService.setVariable(nextTask.getId(), BpmConstants.PROCESS_INSTANCE_VARIABLE_STATUS, DictDataConstants.OA_AUDIT_STATUS_AUDITING);
-            oaTurnoverDO.setAuditStatus(DictDataConstants.OA_AUDIT_STATUS_AUDITING)
-                    .setCurrentAuditEmployeeId(currentAuditEmployeeId)
-                    .setCurrentAuditEmployeeName(currentAuditEmployee.getName())
-                    .setFinalAuditDate(LocalDateTime.now())
-                    .setId(oaTurnover.getId());
+            lambdaUpdateWrapper.eq(OaTurnoverDO::getId, oaTurnover.getId())
+                    .set(OaTurnoverDO::getAuditStatus, DictDataConstants.OA_AUDIT_STATUS_AUDITING)
+                    .set(OaTurnoverDO::getCurrentAuditEmployeeId, currentAuditEmployeeId)
+                    .set(OaTurnoverDO::getCurrentAuditEmployeeName, currentAuditEmployee.getName())
+                    .set(OaTurnoverDO::getFinalAuditDate, LocalDateTime.now());
 
         } else {
-            oaTurnoverDO.setAuditStatus(DictDataConstants.OA_AUDIT_STATUS_AUDITED)
-                    .setCurrentAuditEmployeeId(null)
-                    .setCurrentAuditEmployeeName(null)
-                    .setFinalAuditDate(LocalDateTime.now())
-                    .setId(oaTurnover.getId());
+            lambdaUpdateWrapper.eq(OaTurnoverDO::getId, oaTurnover.getId())
+                    .set(OaTurnoverDO::getAuditStatus, DictDataConstants.OA_AUDIT_STATUS_AUDITED)
+                    .set(OaTurnoverDO::getCurrentAuditEmployeeId, null)
+                    .set(OaTurnoverDO::getCurrentAuditEmployeeName, null)
+                    .set(OaTurnoverDO::getFinalAuditDate, LocalDateTime.now());
         }
-        oaTurnoverMapper.updateById(oaTurnoverDO);
+        oaTurnoverMapper.update(lambdaUpdateWrapper);
         // 复制业务单据信息到业务模块单据表
         if(Objects.isNull(nextTask)) {
             // 查询申请单
-            OaTurnoverDO turnover = oaTurnoverMapper.selectById(oaTurnoverDO.getId());
+            OaTurnoverDO turnover = oaTurnoverMapper.selectById(oaTurnover.getId());
 
             // 转换为DTO
             RelationsTurnoverCreateReqDTO turnoverCreateReqDTO = BeanUtils.toBean(turnover, RelationsTurnoverCreateReqDTO.class);

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/universal/OaUniversalServiceImpl.java

@@ -286,26 +286,26 @@ public class OaUniversalServiceImpl implements OaUniversalService {
         bpmTaskService.approveTask(loginEmployee.getId(), agreeReqVO);
 
         Task nextTask = taskService.createTaskQuery().processInstanceId(currentTask.getProcessInstanceId()).singleResult();
-        OaUniversalDO oaUniversalDO = new OaUniversalDO();
+        LambdaUpdateWrapper<OaUniversalDO> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
         if (nextTask != null) {
             // 如果审批人重复，实际未结束，再次更新为审核中
             taskService.setVariable(nextTask.getId(), BpmConstants.PROCESS_INSTANCE_VARIABLE_STATUS, DictDataConstants.OA_AUDIT_STATUS_AUDITING);
-            oaUniversalDO.setAuditStatus(DictDataConstants.OA_AUDIT_STATUS_AUDITING)
-                    .setCurrentAuditEmployeeId(Long.valueOf(nextTask.getAssignee()))
-                    .setFinalAuditDate(LocalDateTime.now())
-                    .setId(oaUniversal.getId());
+            lambdaUpdateWrapper.set(OaUniversalDO::getAuditStatus, DictDataConstants.OA_AUDIT_STATUS_AUDITING)
+                    .set(OaUniversalDO::getCurrentAuditEmployeeId, Long.valueOf(nextTask.getAssignee()))
+                    .set(OaUniversalDO::getFinalAuditDate, LocalDateTime.now())
+                    .eq(OaUniversalDO::getId, oaUniversal.getId());
 
         } else {
-            oaUniversalDO.setAuditStatus(DictDataConstants.OA_AUDIT_STATUS_AUDITED)
-                    .setCurrentAuditEmployeeId(null)
-                    .setFinalAuditDate(LocalDateTime.now())
-                    .setId(oaUniversal.getId());
+            lambdaUpdateWrapper.set(OaUniversalDO::getAuditStatus, DictDataConstants.OA_AUDIT_STATUS_AUDITED)
+                    .set(OaUniversalDO::getCurrentAuditEmployeeId, null)
+                    .set(OaUniversalDO::getFinalAuditDate, LocalDateTime.now())
+                    .eq(OaUniversalDO::getId, oaUniversal.getId());
 
             // 复制业务单据信息到业务模块单据表
             // 通用审批没有业务模块
 
         }
-        oaUniversalMapper.updateById(oaUniversalDO);
+        oaUniversalMapper.update(lambdaUpdateWrapper);
 
         // 发送站内信
         Long assignId = -1L;