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-16 14:49:12 +08:00
parent 512534ff33
commit c30f5ab842
4 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/xdap/self_development/controller/TodoTaskController.java
View File

@ -27,15 +27,15 @@ public class TodoTaskController {
@Autowired @Autowired
private TodoTaskService todoTaskService; private TodoTaskService todoTaskService;
/** /**
* 通过创建人查询待办 * 查询发起的待办
*/ */
@PostMapping("/selectByPage") @PostMapping("/selectByPageByCreate")
public Response selectByPage(@RequestBody TodoTaskRequest todoTaskRequest){ public Response selectByPageByCreate(@RequestBody TodoTaskRequest todoTaskRequest){
List<TodoTaskPojo> todoTaskPojos = todoTaskService.selectByPage(todoTaskRequest); PageResultDTO<TodoTaskPojo> page= todoTaskService.selectByPage(todoTaskRequest);
return Response.ok().data(todoTaskPojos); return Response.ok().data(page);
} }
/** /**
* 通过责任人或填写人查询待办 * 查询用户待办或已办
*/ */
@PostMapping("/selectByresPersonPage") @PostMapping("/selectByresPersonPage")
public Response selectByresPersonPage(@RequestBody TodoTaskRequest todoTaskRequest){ public Response selectByresPersonPage(@RequestBody TodoTaskRequest todoTaskRequest){

5
src/main/java/com/xdap/self_development/controller/request/TodoTaskRequest.java
View File

@ -17,7 +17,6 @@ import java.io.Serializable;
*/ */
@Data @Data
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = false)
@Table("todo_task")
public class TodoTaskRequest implements Serializable { public class TodoTaskRequest implements Serializable {
/** /**
@ -69,6 +68,10 @@ public class TodoTaskRequest implements Serializable {
* 责任人或责任人ID * 责任人或责任人ID
*/ */
private String personId; private String personId;
/**
*查询待办还是已办 0:待办 1：已办
*/
private Integer isFinished;
/** /**
* 第几页 * 第几页

2
src/main/java/com/xdap/self_development/service/TodoTaskService.java
View File

@ -19,7 +19,7 @@ import java.util.List;
public interface TodoTaskService { public interface TodoTaskService {
void batchInsert(List<TodoTaskPojo> taskPojo); void batchInsert(List<TodoTaskPojo> taskPojo);
List<TodoTaskPojo> selectByPage(TodoTaskRequest todoTaskRequest); PageResultDTO<TodoTaskPojo> selectByPage(TodoTaskRequest todoTaskRequest);
PageResultDTO<TodoTaskPojo> selectByresPersonPage(TodoTaskRequest todoTaskRequest); PageResultDTO<TodoTaskPojo> selectByresPersonPage(TodoTaskRequest todoTaskRequest);
void createResPerson(List<EngineParamDetailDTO> paramDetailPojos, String userID); void createResPerson(List<EngineParamDetailDTO> paramDetailPojos, String userID);

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

@ -55,11 +55,17 @@ public class TodoTaskServiceImpl implements TodoTaskService {
} }
@Override @Override
public List<TodoTaskPojo> selectByPage(TodoTaskRequest todoTaskRequest) { public PageResultDTO<TodoTaskPojo> selectByPage(TodoTaskRequest todoTaskRequest) {
List<TodoTaskPojo> todoTaskPojos = sw.buildFromDatasource("xdap_app_223770822127386625") if (ObjectUtils.isEmpty(todoTaskRequest.getCreatedById())) {
throw new RuntimeException("请传入申请人");
}
PageResultDTO<TodoTaskPojo> todoTaskPojoPageResultDTO = new PageResultDTO<>();
PageQueryResult<TodoTaskPojo> queryResult = sw.buildFromDatasource("xdap_app_223770822127386625")
.eq("created_by_id", todoTaskRequest.getCreatedById()) .eq("created_by_id", todoTaskRequest.getCreatedById())
.doPageQuery(todoTaskRequest.getPage(), todoTaskRequest.getSize(), TodoTaskPojo.class).getResult(); .doPageQuery(todoTaskRequest.getPage(), todoTaskRequest.getSize(), TodoTaskPojo.class);
return todoTaskPojos; todoTaskPojoPageResultDTO.setList(queryResult.getResult());
todoTaskPojoPageResultDTO.setTotalCount(queryResult.getCount());
return todoTaskPojoPageResultDTO;
} }
@Override @Override
@ -95,12 +101,16 @@ public class TodoTaskServiceImpl implements TodoTaskService {
// modelIds.add(detailPojo.getEngineModelId()); // modelIds.add(detailPojo.getEngineModelId());
// } // }
// } // }
Integer dOrYTask = todoTaskRequest.getIsFinished();
if (dOrYTask != 0 && dOrYTask != 1) {
throw new RuntimeException("查询异常,联系管理员");
}
PageResultDTO<TodoTaskPojo> pageResultDTO = new PageResultDTO<TodoTaskPojo>(); PageResultDTO<TodoTaskPojo> pageResultDTO = new PageResultDTO<TodoTaskPojo>();
PageQueryResult<TodoTaskPojo> queryResult = sw.buildFromDatasource("xdap_app_223770822127386625") PageQueryResult<TodoTaskPojo> queryResult = sw.buildFromDatasource("xdap_app_223770822127386625")
.eq("owner_id", todoTaskRequest.getPersonId()) .eq("owner_id", todoTaskRequest.getPersonId())
.eq("is_delete", 0) .eq("is_delete", dOrYTask)
.doPageQuery(todoTaskRequest.getPage(), todoTaskRequest.getSize(), TodoTaskPojo.class); .doPageQuery(todoTaskRequest.getPage(), todoTaskRequest.getSize(), TodoTaskPojo.class);
List<TodoTaskPojo> todoTaskPojos = queryResult.getResult() ; List<TodoTaskPojo> todoTaskPojos = queryResult.getResult();
pageResultDTO.setList(todoTaskPojos); pageResultDTO.setList(todoTaskPojos);
pageResultDTO.setTotalCount(queryResult.getCount()); pageResultDTO.setTotalCount(queryResult.getCount());
return pageResultDTO; return pageResultDTO;
@ -165,7 +175,7 @@ public class TodoTaskServiceImpl implements TodoTaskService {
.eq("id", modelId) .eq("id", modelId)
.update("distribute_status", status) .update("distribute_status", status)
.doUpdate(DataEntryEngineModelPojo.class); .doUpdate(DataEntryEngineModelPojo.class);
}else{ } else {
DistributeStatusEnum byDesc = DistributeStatusEnum.getByDesc("部分分发"); DistributeStatusEnum byDesc = DistributeStatusEnum.getByDesc("部分分发");
Integer status = byDesc != null ? byDesc.getCode() : null; Integer status = byDesc != null ? byDesc.getCode() : null;
sw.buildFromDatasource("xdap_app_223770822127386625") sw.buildFromDatasource("xdap_app_223770822127386625")