From 225ffcbd93d5d96111def3a74d05f8a56d59de00 Mon Sep 17 00:00:00 2001 From: "ys.git" <18439391935@163.com> Date: Wed, 17 Dec 2025 15:09:39 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8E=89=E6=9F=B4=E6=8E=A5=E5=8F=A3=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E9=80=9A=E8=BF=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/TodoTaskServiceImpl.java | 73 ++++++++++++------- src/main/resources/application-s.properties | 2 + 2 files changed, 49 insertions(+), 26 deletions(-) diff --git a/src/main/java/com/xdap/self_development/service/impl/TodoTaskServiceImpl.java b/src/main/java/com/xdap/self_development/service/impl/TodoTaskServiceImpl.java index 8e01208..a1d4c3e 100644 --- a/src/main/java/com/xdap/self_development/service/impl/TodoTaskServiceImpl.java +++ b/src/main/java/com/xdap/self_development/service/impl/TodoTaskServiceImpl.java @@ -22,6 +22,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.text.DateFormat; +import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; @@ -57,7 +58,7 @@ public class TodoTaskServiceImpl implements TodoTaskService { "currentMenu=788768456722874368&url=apaas-custom-mySend"; - private static final String dateFormat = "YYYY-MM-DD hh:mm:ss"; + private static final String dateFormat = "yyyy-MM-dd HH:mm:ss"; @Override public void batchInsert(List taskPojos) { @@ -300,20 +301,33 @@ public class TodoTaskServiceImpl implements TodoTaskService { if (o.equals("发起")) { str = "created_by_id"; } - if (ObjectUtils.isEmpty(ycGetTodoTaskRequest.getPage()) - || ObjectUtils.isEmpty(ycGetTodoTaskRequest.getPageSize()) - ) { - todoTaskPojos = sw.buildFromDatasource("xdap_app_223770822127386625") - .eq(str, userid) - .lt("creation_date", ycGetTodoTaskRequest.getCreateDateStart()) - .gt("last_update_date", ycGetTodoTaskRequest.getCreateDateEnd()) - .eq("process_title", ycGetTodoTaskRequest.getTitle()) - .doQuery(TodoTaskPojo.class); - if (!o.equals("发起")) { - todoTaskPojos = todoTaskPojos.stream().filter(x -> x.getIsDelete() == 1).collect(Collectors.toList()); + SimpleDateFormat format = new SimpleDateFormat(dateFormat); + Date parseStart = null; + Date parseEnd = null; + try { + if (ObjectUtils.isNotEmpty(ycGetTodoTaskRequest.getCreateDateStart())) { + parseStart = format.parse(ycGetTodoTaskRequest.getCreateDateStart()); } - ycCompletedResultDTOPageResultDTO.setTotalCount(todoTaskPojos.size()); - } else { + if (ObjectUtils.isNotEmpty(ycGetTodoTaskRequest.getCreateDateEnd())) { + parseEnd = format.parse(ycGetTodoTaskRequest.getCreateDateEnd()); + } + + } catch (ParseException e) { + throw new RuntimeException("检查日期格式是否正确为“yyyy-MM-dd HH:mm:ss”"); + } + todoTaskPojos = sw.buildFromDatasource("xdap_app_223770822127386625") + .eq(str, userid) + .gt("creation_date", parseStart) + .lt("creation_date", parseEnd) + .eq("process_title", ycGetTodoTaskRequest.getTitle()) + .doQuery(TodoTaskPojo.class); + if (!o.equals("发起")) { + todoTaskPojos = todoTaskPojos.stream().filter(x -> x.getIsDelete() == 1).collect(Collectors.toList()); + } + ycCompletedResultDTOPageResultDTO.setTotalCount(todoTaskPojos.size()); + if (ObjectUtils.isNotEmpty(ycGetTodoTaskRequest.getPage()) + && ObjectUtils.isNotEmpty(ycGetTodoTaskRequest.getPageSize()) + ) { String page = ycGetTodoTaskRequest.getPage(); String pageSize = ycGetTodoTaskRequest.getPageSize(); int pageint = 0; @@ -322,26 +336,33 @@ public class TodoTaskServiceImpl implements TodoTaskService { pageint = Integer.parseInt(page); pageSizeint = Integer.parseInt(pageSize); } catch (NumberFormatException e) { - throw new RuntimeException("您的页码和页数非数字类型"); + throw new RuntimeException("您的页码或页数非数字"); } - PageQueryResult queryResult = sw.buildFromDatasource("xdap_app_223770822127386625") - .eq(str, userid) - .eq("is_delete", 1) - .lt("creation_date", ycGetTodoTaskRequest.getCreateDateStart()) - .gt("last_update_date", ycGetTodoTaskRequest.getCreateDateEnd()) - .eq("process_title", ycGetTodoTaskRequest.getTitle()) - .doPageQuery(pageint, pageSizeint, TodoTaskPojo.class); - todoTaskPojos = queryResult.getResult(); + PageQueryResult queryResult; if (!o.equals("发起")) { - todoTaskPojos = todoTaskPojos.stream().filter(x -> x.getIsDelete() == 1).collect(Collectors.toList()); + queryResult = sw.buildFromDatasource("xdap_app_223770822127386625") + .eq(str, userid) + .eq("is_delete", 1) + .gt("creation_date", parseStart) + .lt("creation_date", parseEnd) + .eq("process_title", ycGetTodoTaskRequest.getTitle()) + .doPageQuery(pageint, pageSizeint, TodoTaskPojo.class); + }else { + queryResult = sw.buildFromDatasource("xdap_app_223770822127386625") + .eq(str, userid) + .gt("creation_date", parseStart) + .lt("creation_date", parseEnd) + .eq("process_title", ycGetTodoTaskRequest.getTitle()) + .doPageQuery(pageint, pageSizeint, TodoTaskPojo.class); } + ycCompletedResultDTOPageResultDTO.setTotalCount(todoTaskPojos.size()); + todoTaskPojos = queryResult.getResult(); } for (TodoTaskPojo todoTaskPojo : todoTaskPojos) { XdapUsers xdapUsers = xdapDeptUsersService.selectUserByID(todoTaskPojo.getOwnerId()); - SimpleDateFormat format = new SimpleDateFormat(dateFormat); +// SimpleDateFormat format = new SimpleDateFormat(dateFormat); YcTodoTaskCommonResultDTO ycCompletedResultDTO = new YcTodoTaskCommonResultDTO(); - //TODO 已办页面还未提供 if (!o.equals("发起")) { ycCompletedResultDTO.setUrl(COMPLETEDURL); } else { diff --git a/src/main/resources/application-s.properties b/src/main/resources/application-s.properties index f455533..fe86cfc 100644 --- a/src/main/resources/application-s.properties +++ b/src/main/resources/application-s.properties @@ -1,4 +1,6 @@ #xdap.singleAdminAppUrl=http://10.20.52.58:30607/xdap-app +mpaas.logging.level=DEBUG +mpaas.mode=DEV aliyun.oss.accessKeyId=LTAI4GEC6ssfFDuVDUL3TbLp aliyun.oss.accessKeySecret=ZpbgWTt2qfK68lQILqj0H3EdIun1Qf aliyun.oss.endpoint=http://oss-cn-shanghai.aliyuncs.com