From 256ef279133108987256d1e579924d0e651b5ad2 Mon Sep 17 00:00:00 2001 From: chenhao Date: Tue, 28 Oct 2025 10:07:39 +0800 Subject: [PATCH] =?UTF-8?q?feat(sip):=20=E8=B0=83=E6=95=B4=E6=89=A7?= =?UTF-8?q?=E8=A1=8C=E5=8D=95=E6=97=B6=E9=97=B4=E8=AE=A1=E7=AE=97=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E4=B8=8E=E6=9F=A5=E8=AF=A2=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修改执行单时间计算方式,将默认时间从30小时调整为30天 - 在查询待办事项时添加limit 1限制,优化查询性能 - 更新配置文件中的权限角色设置,增加101角色 --- ruoyi-admin/src/main/resources/application.yml | 2 +- .../com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java | 2 +- ruoyi-sip/src/main/resources/mapper/flow/TodoMapper.xml | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 18b46811..efc2d1ca 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -153,7 +153,7 @@ process: beanName: projectOrderInfoServiceImpl unis: inventory: - allAuthRole: 103 + allAuthRole: 103,101 order: # 执行单截止时间 endHour: 96 diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java index f02a78c3..0829652e 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java @@ -1320,7 +1320,7 @@ public class ProjectOrderInfoServiceImpl implements IProjectOrderInfoService, To // 修改执行单时间 只有直签且有现金折扣的时间才是配置时间 否则默认30天 int addHour = ProjectOrderInfo.ProcessTemplateEnum.DIRECT_SIGNING.getCode().equals(dbProjectOrderInfo.getProcessTemplate()) && dbProjectOrderInfo.getDiscountFold() != null - && dbProjectOrderInfo.getDiscountFold().compareTo(BigDecimal.ONE) < 0 ? endHour : 30; + && dbProjectOrderInfo.getDiscountFold().compareTo(BigDecimal.ONE) < 0 ? endHour : 30 * 24; projectOrderInfo.setOrderEndTime(DateUtils.addHours(DateUtils.getNowDate(), addHour)); projectOrderInfo.setOrderCode(businessKey); diff --git a/ruoyi-sip/src/main/resources/mapper/flow/TodoMapper.xml b/ruoyi-sip/src/main/resources/mapper/flow/TodoMapper.xml index 2c89ee0c..d4819ec3 100644 --- a/ruoyi-sip/src/main/resources/mapper/flow/TodoMapper.xml +++ b/ruoyi-sip/src/main/resources/mapper/flow/TodoMapper.xml @@ -136,6 +136,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and process_instance_id = #{processInstanceId} and task_id = #{taskId} + limit 1