jiezhoufg/yc_fdjyfluru
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

玉柴接口测试通过

Browse Source
This commit is contained in:
ys.git 2025-12-17 15:09:39 +08:00
parent e70f3ca5f4
commit 225ffcbd93
2 changed files with 49 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
src/main/java/com/xdap/self_development/service/impl/TodoTaskServiceImpl.java
View File

@ -22,6 +22,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.text.DateFormat; import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -57,7 +58,7 @@ public class TodoTaskServiceImpl implements TodoTaskService {
"currentMenu=788768456722874368&url=apaas-custom-mySend"; "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 @Override
public void batchInsert(List<TodoTaskPojo> taskPojos) { public void batchInsert(List<TodoTaskPojo> taskPojos) {
@ -300,20 +301,33 @@ public class TodoTaskServiceImpl implements TodoTaskService {
if (o.equals("发起")) { if (o.equals("发起")) {
str = "created_by_id"; str = "created_by_id";
} }
if (ObjectUtils.isEmpty(ycGetTodoTaskRequest.getPage()) SimpleDateFormat format = new SimpleDateFormat(dateFormat);
|| ObjectUtils.isEmpty(ycGetTodoTaskRequest.getPageSize()) Date parseStart = null;
) { Date parseEnd = null;
todoTaskPojos = sw.buildFromDatasource("xdap_app_223770822127386625") try {
.eq(str, userid) if (ObjectUtils.isNotEmpty(ycGetTodoTaskRequest.getCreateDateStart())) {
.lt("creation_date", ycGetTodoTaskRequest.getCreateDateStart()) parseStart = format.parse(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());
} }
ycCompletedResultDTOPageResultDTO.setTotalCount(todoTaskPojos.size()); if (ObjectUtils.isNotEmpty(ycGetTodoTaskRequest.getCreateDateEnd())) {
} else { 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 page = ycGetTodoTaskRequest.getPage();
String pageSize = ycGetTodoTaskRequest.getPageSize(); String pageSize = ycGetTodoTaskRequest.getPageSize();
int pageint = 0; int pageint = 0;
@ -322,26 +336,33 @@ public class TodoTaskServiceImpl implements TodoTaskService {
pageint = Integer.parseInt(page); pageint = Integer.parseInt(page);
pageSizeint = Integer.parseInt(pageSize); pageSizeint = Integer.parseInt(pageSize);
} catch (NumberFormatException e) { } catch (NumberFormatException e) {
throw new RuntimeException("您的页码和页数非数字类型"); throw new RuntimeException("您的页码或页数非数字");
} }
PageQueryResult<TodoTaskPojo> queryResult = sw.buildFromDatasource("xdap_app_223770822127386625") PageQueryResult<TodoTaskPojo> queryResult;
.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();
if (!o.equals("发起")) { 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) { for (TodoTaskPojo todoTaskPojo : todoTaskPojos) {
XdapUsers xdapUsers = xdapDeptUsersService.selectUserByID(todoTaskPojo.getOwnerId()); XdapUsers xdapUsers = xdapDeptUsersService.selectUserByID(todoTaskPojo.getOwnerId());
SimpleDateFormat format = new SimpleDateFormat(dateFormat); // SimpleDateFormat format = new SimpleDateFormat(dateFormat);
YcTodoTaskCommonResultDTO ycCompletedResultDTO = new YcTodoTaskCommonResultDTO(); YcTodoTaskCommonResultDTO ycCompletedResultDTO = new YcTodoTaskCommonResultDTO();
//TODO 已办页面还未提供
if (!o.equals("发起")) { if (!o.equals("发起")) {
ycCompletedResultDTO.setUrl(COMPLETEDURL); ycCompletedResultDTO.setUrl(COMPLETEDURL);
} else { } else {

2
src/main/resources/application-s.properties
View File

@ -1,4 +1,6 @@
#xdap.singleAdminAppUrl=http://10.20.52.58:30607/xdap-app #xdap.singleAdminAppUrl=http://10.20.52.58:30607/xdap-app
mpaas.logging.level=DEBUG
mpaas.mode=DEV
aliyun.oss.accessKeyId=LTAI4GEC6ssfFDuVDUL3TbLp aliyun.oss.accessKeyId=LTAI4GEC6ssfFDuVDUL3TbLp
aliyun.oss.accessKeySecret=ZpbgWTt2qfK68lQILqj0H3EdIun1Qf aliyun.oss.accessKeySecret=ZpbgWTt2qfK68lQILqj0H3EdIun1Qf
aliyun.oss.endpoint=http://oss-cn-shanghai.aliyuncs.com aliyun.oss.endpoint=http://oss-cn-shanghai.aliyuncs.com