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