mula
/
unis_sip
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(sip): 调整执行单时间计算逻辑与查询限制 

- 修改执行单时间计算方式，将默认时间从30小时调整为30天
- 在查询待办事项时添加limit 1限制，优化查询性能
- 更新配置文件中的权限角色设置，增加101角色
master
chenhao 2025-10-28 10:07:39 +08:00
parent a7b772e99d
commit 256ef27913
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-admin/src/main/resources/application.yml
View File

@ -153,7 +153,7 @@ process:
beanName: projectOrderInfoServiceImpl beanName: projectOrderInfoServiceImpl
unis: unis:
inventory: inventory:
allAuthRole: 103 allAuthRole: 103,101
order: order:
# 执行单截止时间 # 执行单截止时间
endHour: 96 endHour: 96

2
ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java
View File

@ -1320,7 +1320,7 @@ public class ProjectOrderInfoServiceImpl implements IProjectOrderInfoService, To
// 修改执行单时间 只有直签且有现金折扣的时间才是配置时间 否则默认30天 // 修改执行单时间 只有直签且有现金折扣的时间才是配置时间 否则默认30天
int addHour = ProjectOrderInfo.ProcessTemplateEnum.DIRECT_SIGNING.getCode().equals(dbProjectOrderInfo.getProcessTemplate()) int addHour = ProjectOrderInfo.ProcessTemplateEnum.DIRECT_SIGNING.getCode().equals(dbProjectOrderInfo.getProcessTemplate())
&& dbProjectOrderInfo.getDiscountFold() != null && 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.setOrderEndTime(DateUtils.addHours(DateUtils.getNowDate(), addHour));
projectOrderInfo.setOrderCode(businessKey); projectOrderInfo.setOrderCode(businessKey);

1
ruoyi-sip/src/main/resources/mapper/flow/TodoMapper.xml
View File

@ -136,6 +136,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="processInstanceId != null and processInstanceId != ''"> and process_instance_id = #{processInstanceId}</if> <if test="processInstanceId != null and processInstanceId != ''"> and process_instance_id = #{processInstanceId}</if>
<if test="taskId != null and taskId != ''"> and task_id = #{taskId}</if> <if test="taskId != null and taskId != ''"> and task_id = #{taskId}</if>
</where> </where>
limit 1
</select> </select>
<select id="selectGQOrYQCompletedList" resultType="com.ruoyi.sip.flowable.domain.Todo"> <select id="selectGQOrYQCompletedList" resultType="com.ruoyi.sip.flowable.domain.Todo">
select todo_id, business_key, process_key, process_name, task_name, select todo_id, business_key, process_key, process_name, task_name,