Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

我发起的菜单

Browse Source
This commit is contained in:
hongawen
2024-06-04 13:49:25 +08:00
parent 78d36fadb7
commit 11df7ebba1
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/service/task/impl/BpmProcessInstanceServiceImpl.java
View File

@@ -20,6 +20,7 @@ import com.njcn.bpm.utils.BpmProcessInstanceConvert;
import com.njcn.bpm.utils.CollectionUtils; import com.njcn.bpm.utils.CollectionUtils;
import com.njcn.bpm.utils.DateUtils; import com.njcn.bpm.utils.DateUtils;
import com.njcn.common.pojo.exception.BusinessException; import com.njcn.common.pojo.exception.BusinessException;
import com.njcn.common.utils.PubUtils;
import com.njcn.user.api.UserFeignClient; import com.njcn.user.api.UserFeignClient;
import com.njcn.user.pojo.po.User; import com.njcn.user.pojo.po.User;
import com.njcn.user.pojo.vo.UserVO; import com.njcn.user.pojo.vo.UserVO;
@@ -135,9 +136,9 @@ public class BpmProcessInstanceServiceImpl implements IBpmProcessInstanceService
String beginTimeStr = bpmProcessInstancePageParam.getSearchBeginTime(); String beginTimeStr = bpmProcessInstancePageParam.getSearchBeginTime();
String endTimeStr = bpmProcessInstancePageParam.getSearchEndTime(); String endTimeStr = bpmProcessInstancePageParam.getSearchEndTime();
LocalDateTime beginTime = LocalDateTimeUtil.parse(beginTimeStr, DatePattern.NORM_DATE_PATTERN); LocalDateTime beginTime = LocalDateTimeUtil.parse(beginTimeStr, DatePattern.NORM_DATE_PATTERN);
LocalDateTime endTime = LocalDateTimeUtil.parse(endTimeStr, DatePattern.NORM_DATE_PATTERN); LocalDateTime endTime = PubUtils.endTimeToLocalDateTime(endTimeStr);
processInstanceQuery.startedAfter(DateUtils.of(beginTime));
processInstanceQuery.startedBefore(DateUtils.of(endTime)); processInstanceQuery.startedBefore(DateUtils.of(endTime));
processInstanceQuery.startedAfter(DateUtils.of(beginTime));
// 查询数量 // 查询数量
long processInstanceCount = processInstanceQuery.count(); long processInstanceCount = processInstanceQuery.count();
if (processInstanceCount == 0) { if (processInstanceCount == 0) {

12
pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/service/task/impl/BpmTaskServiceImpl.java
View File

@@ -98,12 +98,12 @@ public class BpmTaskServiceImpl implements IBpmTaskService {
if (StrUtil.isNotBlank(bpmTaskQueryParam.getSearchValue())) { if (StrUtil.isNotBlank(bpmTaskQueryParam.getSearchValue())) {
taskQuery.taskNameLike("%" + bpmTaskQueryParam.getSearchValue() + "%"); taskQuery.taskNameLike("%" + bpmTaskQueryParam.getSearchValue() + "%");
} }
String beginTimeStr = bpmTaskQueryParam.getSearchBeginTime(); // String beginTimeStr = bpmTaskQueryParam.getSearchBeginTime();
String endTimeStr = bpmTaskQueryParam.getSearchEndTime(); // String endTimeStr = bpmTaskQueryParam.getSearchEndTime();
LocalDateTime beginTime = LocalDateTimeUtil.parse(beginTimeStr, DatePattern.NORM_DATE_PATTERN); // LocalDateTime beginTime = LocalDateTimeUtil.parse(beginTimeStr, DatePattern.NORM_DATE_PATTERN);
LocalDateTime endTime = PubUtils.endTimeToLocalDateTime(endTimeStr); // LocalDateTime endTime = PubUtils.endTimeToLocalDateTime(endTimeStr);
taskQuery.taskCreatedBefore(DateUtils.of(endTime)); // taskQuery.taskCreatedBefore(DateUtils.of(endTime));
taskQuery.taskCreatedAfter(DateUtils.of(beginTime)); // taskQuery.taskCreatedAfter(DateUtils.of(beginTime));
long count = taskQuery.count(); long count = taskQuery.count();
if (count == 0) { if (count == 0) {
return PageResult.empty(); return PageResult.empty();