From 15f00340a93bcf9007427cf6d4e5195a534235f4 Mon Sep 17 00:00:00 2001 From: Yangk Date: Thu, 8 Jan 2026 15:16:56 +0800 Subject: [PATCH 1/5] =?UTF-8?q?feat(erp):=20=E6=B7=BB=E5=8A=A0=E5=94=AE?= =?UTF-8?q?=E5=90=8E=E6=B5=81=E7=A8=8B=E8=87=AA=E5=8A=A8=E6=8A=84=E9=80=81?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86=E5=8A=9F=E8=83=BD=E5=B9=B6?= =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=B7=A5=E6=97=B6=E8=A1=A8=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ErpAfterSalesServiceImpl.java | 20 +++++++++++++++++++ .../impl/ErpTimesheetInfoServiceImpl.java | 2 ++ 2 files changed, 22 insertions(+) diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpAfterSalesServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpAfterSalesServiceImpl.java index 86f79ab2..dcf3fe65 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpAfterSalesServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpAfterSalesServiceImpl.java @@ -39,11 +39,17 @@ import org.springframework.transaction.annotation.Transactional; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import org.springframework.context.event.EventListener; import org.dromara.workflow.api.event.ProcessEvent; +import org.dromara.workflow.api.event.ProcessTaskEvent; +import org.dromara.common.core.utils.StreamUtils; +import org.dromara.system.api.RemoteUserService; +import org.dromara.system.api.domain.vo.RemoteUserVo; +import org.dromara.workflow.api.domain.RemoteFlowCopy; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Collection; +import java.util.Collections; /** * 项目售后信息Service业务层处理 @@ -64,6 +70,9 @@ public class ErpAfterSalesServiceImpl implements IErpAfterSalesService { @DubboReference() private RemoteCodeRuleService remoteCodeRuleService; + @DubboReference + private RemoteUserService remoteUserService; + private final IErpAfterSalesLaborCostsService laborCostsService; private final IErpAfterSalesMaterialCostsService materialCostsService; @@ -313,6 +322,17 @@ public class ErpAfterSalesServiceImpl implements IErpAfterSalesService { bo.setVariables(new HashMap<>()); } bo.getVariables().put("ignore", true); + + // 预设抄送用户变量：查询"项目管理"角色下的用户ID + Long projectMgrRoleId = 1985260184236380162L; + List copyUsers = remoteUserService.selectUsersByRoleIds( + Collections.singletonList(projectMgrRoleId)); + if (CollUtil.isNotEmpty(copyUsers)) { + String copyUserIds = StreamUtils.join(copyUsers, user -> String.valueOf(user.getUserId())); + bo.getVariables().put("afterSalesCopyUsers", copyUserIds); + log.info("【售后抄送】预设抄送用户变量: {}", copyUserIds); + } + RemoteStartProcess startProcess = new RemoteStartProcess(); startProcess.setBusinessId(bo.getAfterSalesId().toString()); startProcess.setFlowCode(bo.getFlowCode()); diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpTimesheetInfoServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpTimesheetInfoServiceImpl.java index 38c82fac..0d371eb1 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpTimesheetInfoServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpTimesheetInfoServiceImpl.java @@ -344,6 +344,8 @@ public class ErpTimesheetInfoServiceImpl implements IErpTimesheetInfoService { completeTask.setTaskId(result.getTaskId()); // 审批意见，提交时默认为 "提交申请" completeTask.setMessage("提交申请"); + // 消息类型 1=站内信 + completeTask.setMessageType(Collections.singletonList("1")); completeTask.setVariables(variables); boolean completeFlag = remoteWorkflowService.completeTask(completeTask); if (!completeFlag) { From df273b38a0f8ad3bde5f7577ec743a63d4746658 Mon Sep 17 00:00:00 2001 From: Yangk Date: Fri, 9 Jan 2026 15:17:38 +0800 Subject: [PATCH 2/5] =?UTF-8?q?refactor(erp/AfterSales):=20=E7=A7=BB?= =?UTF-8?q?=E9=99=A4=E5=94=AE=E5=90=8E=E6=B5=81=E7=A8=8B=E4=B8=AD=E9=A2=84?= =?UTF-8?q?=E8=AE=BE=E6=8A=84=E9=80=81=E7=94=A8=E6=88=B7=E5=8F=98=E9=87=8F?= =?UTF-8?q?=E7=9A=84=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/CrmBusinessTripApplyServiceImpl.java | 1 + .../oa/erp/service/impl/ErpAfterSalesServiceImpl.java | 10 ---------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmBusinessTripApplyServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmBusinessTripApplyServiceImpl.java index 243b341a..3b11bc2c 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmBusinessTripApplyServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmBusinessTripApplyServiceImpl.java @@ -36,6 +36,7 @@ import org.springframework.transaction.annotation.Transactional; import org.dromara.common.tenant.helper.TenantHelper; import cn.hutool.core.convert.Convert; + /** * 出差申请Service业务层处理 * diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpAfterSalesServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpAfterSalesServiceImpl.java index dcf3fe65..ca364149 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpAfterSalesServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpAfterSalesServiceImpl.java @@ -323,16 +323,6 @@ public class ErpAfterSalesServiceImpl implements IErpAfterSalesService { } bo.getVariables().put("ignore", true); - // 预设抄送用户变量：查询"项目管理"角色下的用户ID - Long projectMgrRoleId = 1985260184236380162L; - List copyUsers = remoteUserService.selectUsersByRoleIds( - Collections.singletonList(projectMgrRoleId)); - if (CollUtil.isNotEmpty(copyUsers)) { - String copyUserIds = StreamUtils.join(copyUsers, user -> String.valueOf(user.getUserId())); - bo.getVariables().put("afterSalesCopyUsers", copyUserIds); - log.info("【售后抄送】预设抄送用户变量: {}", copyUserIds); - } - RemoteStartProcess startProcess = new RemoteStartProcess(); startProcess.setBusinessId(bo.getAfterSalesId().toString()); startProcess.setFlowCode(bo.getFlowCode()); From 3c279c4a18423dea8aea006ce47c0a7f61fbd06f Mon Sep 17 00:00:00 2001 From: Yangk Date: Mon, 12 Jan 2026 15:48:34 +0800 Subject: [PATCH 3/5] =?UTF-8?q?feat(erp/AfterSales):=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=94=AE=E5=90=8E=E9=97=AE=E9=A2=98=E9=99=84=E4=BB=B6ID?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/dromara/oa/erp/domain/vo/ErpAfterSalesVo.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpAfterSalesVo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpAfterSalesVo.java index 84b484e5..4deebf84 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpAfterSalesVo.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpAfterSalesVo.java @@ -178,6 +178,11 @@ public class ErpAfterSalesVo implements Serializable { @ExcelProperty(value = "备注") private String remark; + /** + * 售后问题附件ID + */ + private String ossId; + /** * 子表数据回显 */ From 4874c0ed022e3f8ccde8a32c367c79f68ed61fbd Mon Sep 17 00:00:00 2001 From: Yangk Date: Mon, 12 Jan 2026 17:55:53 +0800 Subject: [PATCH 4/5] =?UTF-8?q?feat(AfterSales,=20TimesheetInfo,=20Busines?= =?UTF-8?q?sTrip):=20=E6=B7=BB=E5=8A=A0=E5=AF=BC=E5=87=BA=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E6=94=AF=E6=8C=81=E6=8C=89ID=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E8=BF=87=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dromara/oa/crm/domain/bo/CrmBusinessTripApplyBo.java | 4 ++++ .../service/impl/CrmBusinessTripApplyServiceImpl.java | 4 +++- .../org/dromara/oa/erp/domain/bo/ErpAfterSalesBo.java | 7 ++++++- .../org/dromara/oa/erp/domain/bo/ErpTimesheetInfoBo.java | 5 +++++ .../oa/erp/service/impl/ErpAfterSalesServiceImpl.java | 4 ++++ .../oa/erp/service/impl/ErpTimesheetInfoServiceImpl.java | 9 +++++++-- 6 files changed, 29 insertions(+), 4 deletions(-) diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/domain/bo/CrmBusinessTripApplyBo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/domain/bo/CrmBusinessTripApplyBo.java index f70e4ea0..590196ea 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/domain/bo/CrmBusinessTripApplyBo.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/domain/bo/CrmBusinessTripApplyBo.java @@ -162,5 +162,9 @@ public class CrmBusinessTripApplyBo extends BaseEntity { */ private RemoteFlowInstanceBizExt bizExt; + /** + * 导出时指定的ID列表（逗号分隔） + */ + private String tripIds; } diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmBusinessTripApplyServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmBusinessTripApplyServiceImpl.java index 3b11bc2c..ca86424d 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmBusinessTripApplyServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmBusinessTripApplyServiceImpl.java @@ -36,7 +36,6 @@ import org.springframework.transaction.annotation.Transactional; import org.dromara.common.tenant.helper.TenantHelper; import cn.hutool.core.convert.Convert; - /** * 出差申请Service业务层处理 * @@ -108,6 +107,9 @@ public class CrmBusinessTripApplyServiceImpl implements ICrmBusinessTripApplySer .selectAs(ErpProjectInfo::getProjectCode, CrmBusinessTripApplyVo::getProjectCode) .leftJoin(ErpProjectInfo.class, ErpProjectInfo::getProjectId, CrmBusinessTripApply::getProjectId) .eq(CrmBusinessTripApply::getDelFlag, "0") + // 按指定ID列表过滤（用于导出选中数据） + .in(StringUtils.isNotBlank(bo.getTripIds()), CrmBusinessTripApply::getTripId, + StringUtils.isNotBlank(bo.getTripIds()) ? List.of(bo.getTripIds().split(",")) : null) .eq(StringUtils.isNotBlank(bo.getApplyCode()), CrmBusinessTripApply::getApplyCode, bo.getApplyCode()) .eq(StringUtils.isNotBlank(bo.getTripType()), CrmBusinessTripApply::getTripType, bo.getTripType()) .eq(bo.getApplicantId() != null, CrmBusinessTripApply::getApplicantId, bo.getApplicantId()) diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpAfterSalesBo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpAfterSalesBo.java index 565caa9f..938bc571 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpAfterSalesBo.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpAfterSalesBo.java @@ -106,7 +106,8 @@ public class ErpAfterSalesBo extends BaseEntity { /** * 客户干系人ID（关联客户联系人表） */ -// @NotBlank(message = "客户干系人ID（关联客户联系人表）不能为空", groups = { AddGroup.class, EditGroup.class }) + // @NotBlank(message = "客户干系人ID（关联客户联系人表）不能为空", groups = { AddGroup.class, + // EditGroup.class }) private String stakeholderId; /** @@ -195,5 +196,9 @@ public class ErpAfterSalesBo extends BaseEntity { */ private RemoteFlowInstanceBizExt bizExt; + /** + * 导出时指定的ID列表（逗号分隔） + */ + private String afterSalesIds; } diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpTimesheetInfoBo.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpTimesheetInfoBo.java index 0243988e..e80912e2 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpTimesheetInfoBo.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpTimesheetInfoBo.java @@ -92,6 +92,11 @@ public class ErpTimesheetInfoBo extends BaseEntity { */ private String remark; + /** + * 导出时指定的ID列表（逗号分隔） + */ + private String timesheetIds; + /** * 子表：部门工作明细 */ diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpAfterSalesServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpAfterSalesServiceImpl.java index ca364149..a1b9d4ef 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpAfterSalesServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpAfterSalesServiceImpl.java @@ -138,6 +138,10 @@ public class ErpAfterSalesServiceImpl implements IErpAfterSalesService { MPJLambdaWrapper lqw = JoinWrappers.lambda(ErpAfterSales.class) .selectAll(ErpAfterSales.class) .eq(ErpAfterSales::getDelFlag, "0") + // 按指定ID列表过滤（用于导出选中数据） + .in(StringUtils.isNotBlank(bo.getAfterSalesIds()), ErpAfterSales::getAfterSalesId, + StringUtils.isNotBlank(bo.getAfterSalesIds()) ? List.of(bo.getAfterSalesIds().split(",")) + : null) .eq(StringUtils.isNotBlank(bo.getAfterSalesCode()), ErpAfterSales::getAfterSalesCode, bo.getAfterSalesCode()) .eq(StringUtils.isNotBlank(bo.getAfterSalesSubject()), ErpAfterSales::getAfterSalesSubject, diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpTimesheetInfoServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpTimesheetInfoServiceImpl.java index 0d371eb1..db6211a4 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpTimesheetInfoServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpTimesheetInfoServiceImpl.java @@ -127,12 +127,17 @@ public class ErpTimesheetInfoServiceImpl implements IErpTimesheetInfoService { MPJLambdaWrapper lqw = JoinWrappers.lambda(ErpTimesheetInfo.class) .selectAll(ErpTimesheetInfo.class) .eq(ErpTimesheetInfo::getDelFlag, "0") + // 按指定ID列表过滤（用于导出选中数据） + .in(StringUtils.isNotBlank(bo.getTimesheetIds()), ErpTimesheetInfo::getTimesheetId, + StringUtils.isNotBlank(bo.getTimesheetIds()) ? List.of(bo.getTimesheetIds().split(",")) : null) .eq(StringUtils.isNotBlank(bo.getTimesheetCode()), ErpTimesheetInfo::getTimesheetCode, bo.getTimesheetCode()) .eq(bo.getUserId() != null, ErpTimesheetInfo::getUserId, bo.getUserId()) .eq(bo.getDeptId() != null, ErpTimesheetInfo::getDeptId, bo.getDeptId()) - .eq(bo.getStartTime() != null, ErpTimesheetInfo::getStartTime, bo.getStartTime()) - .eq(bo.getEndTime() != null, ErpTimesheetInfo::getEndTime, bo.getEndTime()) + // 日期范围查询：起始时间之后 + .ge(bo.getStartTime() != null, ErpTimesheetInfo::getStartTime, bo.getStartTime()) + // 日期范围查询：结束时间之前 + .le(bo.getEndTime() != null, ErpTimesheetInfo::getEndTime, bo.getEndTime()) .eq(bo.getTotalHours() != null, ErpTimesheetInfo::getTotalHours, bo.getTotalHours()) .eq(bo.getDeptHours() != null, ErpTimesheetInfo::getDeptHours, bo.getDeptHours()) .eq(bo.getProjectHours() != null, ErpTimesheetInfo::getProjectHours, bo.getProjectHours()) From ee160fccf891b2909bd8fde0f81295e1dba7f2c9 Mon Sep 17 00:00:00 2001 From: Yangk Date: Tue, 13 Jan 2026 17:44:55 +0800 Subject: [PATCH 5/5] =?UTF-8?q?feat(oa):=20=E6=9B=B4=E6=96=B0=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6=E5=92=8C=E6=8E=92=E5=BA=8F=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修改出差申请查询条件，开始时间改为大于等于匹配，结束时间改为小于等于匹配 - 为出差申请、项目售后管理和服务时间表查询添加按创建时间降序排序 --- .../crm/service/impl/CrmBusinessTripApplyServiceImpl.java | 7 ++++--- .../oa/erp/service/impl/ErpAfterSalesServiceImpl.java | 3 ++- .../oa/erp/service/impl/ErpTimesheetInfoServiceImpl.java | 3 ++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmBusinessTripApplyServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmBusinessTripApplyServiceImpl.java index ca86424d..aa0d64b9 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmBusinessTripApplyServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/crm/service/impl/CrmBusinessTripApplyServiceImpl.java @@ -119,8 +119,8 @@ public class CrmBusinessTripApplyServiceImpl implements ICrmBusinessTripApplySer .like(StringUtils.isNotBlank(bo.getDeptName()), CrmBusinessTripApply::getDeptName, bo.getDeptName()) .eq(StringUtils.isNotBlank(bo.getTripLocation()), CrmBusinessTripApply::getTripLocation, bo.getTripLocation()) - .eq(bo.getStartTime() != null, CrmBusinessTripApply::getStartTime, bo.getStartTime()) - .eq(bo.getEndTime() != null, CrmBusinessTripApply::getEndTime, bo.getEndTime()) + .ge(bo.getStartTime() != null, CrmBusinessTripApply::getStartTime, bo.getStartTime()) + .le(bo.getEndTime() != null, CrmBusinessTripApply::getEndTime, bo.getEndTime()) .eq(bo.getDurationDays() != null, CrmBusinessTripApply::getDurationDays, bo.getDurationDays()) .eq(StringUtils.isNotBlank(bo.getTripReason()), CrmBusinessTripApply::getTripReason, bo.getTripReason()) .eq(bo.getProjectId() != null, CrmBusinessTripApply::getProjectId, bo.getProjectId()) @@ -138,7 +138,8 @@ public class CrmBusinessTripApplyServiceImpl implements ICrmBusinessTripApplySer .eq(StringUtils.isNotBlank(bo.getFeedback()), CrmBusinessTripApply::getFeedback, bo.getFeedback()) .eq(StringUtils.isNotBlank(bo.getTripStatus()), CrmBusinessTripApply::getTripStatus, bo.getTripStatus()) .eq(StringUtils.isNotBlank(bo.getFlowStatus()), CrmBusinessTripApply::getFlowStatus, bo.getFlowStatus()) - .eq(StringUtils.isNotBlank(bo.getOssId()), CrmBusinessTripApply::getOssId, bo.getOssId()); + .eq(StringUtils.isNotBlank(bo.getOssId()), CrmBusinessTripApply::getOssId, bo.getOssId()) + .orderByDesc(CrmBusinessTripApply::getCreateTime); return lqw; } diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpAfterSalesServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpAfterSalesServiceImpl.java index a1b9d4ef..8d2983e5 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpAfterSalesServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpAfterSalesServiceImpl.java @@ -174,7 +174,8 @@ public class ErpAfterSalesServiceImpl implements IErpAfterSalesService { .eq(StringUtils.isNotBlank(bo.getAfterSalesStatus()), ErpAfterSales::getAfterSalesStatus, bo.getAfterSalesStatus()) .eq(StringUtils.isNotBlank(bo.getFlowStatus()), ErpAfterSales::getFlowStatus, bo.getFlowStatus()) - .eq(StringUtils.isNotBlank(bo.getActiveFlag()), ErpAfterSales::getActiveFlag, bo.getActiveFlag()); + .eq(StringUtils.isNotBlank(bo.getActiveFlag()), ErpAfterSales::getActiveFlag, bo.getActiveFlag()) + .orderByDesc(ErpAfterSales::getCreateTime); return lqw; } diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpTimesheetInfoServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpTimesheetInfoServiceImpl.java index db6211a4..7a9fe3c3 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpTimesheetInfoServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpTimesheetInfoServiceImpl.java @@ -143,7 +143,8 @@ public class ErpTimesheetInfoServiceImpl implements IErpTimesheetInfoService { .eq(bo.getProjectHours() != null, ErpTimesheetInfo::getProjectHours, bo.getProjectHours()) .eq(StringUtils.isNotBlank(bo.getTimesheetStatus()), ErpTimesheetInfo::getTimesheetStatus, bo.getTimesheetStatus()) - .eq(StringUtils.isNotBlank(bo.getFlowStatus()), ErpTimesheetInfo::getFlowStatus, bo.getFlowStatus()); + .eq(StringUtils.isNotBlank(bo.getFlowStatus()), ErpTimesheetInfo::getFlowStatus, bo.getFlowStatus()) + .orderByDesc(ErpTimesheetInfo::getCreateTime); return lqw; }