diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/seriousillegal/controller/EOtIlldisdetailController.java b/src/main/java/com/chinaweal/aiccs/aiccs/seriousillegal/controller/EOtIlldisdetailController.java index 3efa429..e1fad83 100644 --- a/src/main/java/com/chinaweal/aiccs/aiccs/seriousillegal/controller/EOtIlldisdetailController.java +++ b/src/main/java/com/chinaweal/aiccs/aiccs/seriousillegal/controller/EOtIlldisdetailController.java @@ -4,8 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.chinaweal.aiccs.aiccs.abnormal.entity.EPriPerson; -import com.chinaweal.aiccs.aiccs.abnormal.service.EPriPersonService; import com.chinaweal.aiccs.aiccs.abnormal.entity.TSWrit; +import com.chinaweal.aiccs.aiccs.abnormal.service.EPriPersonService; import com.chinaweal.aiccs.aiccs.abnormal.service.TSWritService; import com.chinaweal.aiccs.aiccs.auditing.entity.TSOpinion; import com.chinaweal.aiccs.aiccs.auditing.service.TSOpinionService; @@ -20,15 +20,16 @@ import com.chinaweal.aiccs.aiccs.seriousillegal.entity.EOtIlldisdetail; import com.chinaweal.aiccs.aiccs.seriousillegal.entity.EOtIlldisdetailTemp; import com.chinaweal.aiccs.aiccs.seriousillegal.entity.dto.*; import com.chinaweal.aiccs.aiccs.seriousillegal.entity.vo.ApprovalPageVo; +import com.chinaweal.aiccs.aiccs.seriousillegal.entity.vo.PrintTSWritVo; import com.chinaweal.aiccs.aiccs.seriousillegal.entity.vo.TaskDetailVo; import com.chinaweal.aiccs.aiccs.seriousillegal.entity.vo.TaskSubmitResultVo; -import com.chinaweal.aiccs.aiccs.seriousillegal.entity.vo.PrintTSWritVo; import com.chinaweal.aiccs.aiccs.seriousillegal.service.IEOtIlldisdetailService; import com.chinaweal.aiccs.aiccs.seriousillegal.service.IEOtIlldisdetailTempService; import com.chinaweal.aiccs.aiccs.system.entity.TRBaseCode; import com.chinaweal.aiccs.aiccs.system.service.TRBaseCodeService; import com.chinaweal.aiccs.common.base.controller.BaseController; import com.chinaweal.aiccs.common.constant.BaseDataConstant; +import com.chinaweal.aiccs.common.constant.CommonConstants; import com.chinaweal.aiccs.common.util.FlowUtil; import com.chinaweal.aiccs.common.util.StringUtils; import com.chinaweal.aiccs.common.util.WorkFlowUtil; @@ -49,7 +50,6 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import java.time.LocalDate; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.UUID; @@ -413,18 +413,17 @@ public class EOtIlldisdetailController extends BaseController { @ApiOperation("查询外单位严重违法列入待办列表") @PostMapping("/enterTaskList") public RestResult> enterTaskList(HttpServletRequest request, - @RequestBody BaseQuery baseQuery) { + @RequestBody BaseQuery baseQuery) { AICUser user = getLoginUser(request); if (user == null) { return RestResult.error(ResultCode.USER_NOT_LOGGED_IN); } - TSTaskList taskListModel = new TSTaskList(); - taskListModel.setBustype(BaseDataConstant.SERILLEGAL_TYPE_OT_ENTER); - taskListModel.setSignuserid(user.getPrimaryKey()); + TaskListTodoParam param = baseQuery.getEntity(TaskListTodoParam.class); + param.setBustype(BaseDataConstant.SERILLEGAL_TYPE_OT_ENTER); + param.setCurrentUserId(user.getPrimaryKey()); - IPage result = taskListService.searchTstaskByPage(new Page<>(baseQuery.getCurrent(), baseQuery.getSize()), - taskListModel, "0", user.getRegionID()); + IPage result = eOtIlldisdetailTempService.getTaskListTodoPage(new Page<>(baseQuery.getCurrent(), baseQuery.getSize()), param); return RestResult.ok(result); } @@ -434,22 +433,18 @@ public class EOtIlldisdetailController extends BaseController { */ @ApiOperation("查询外单位严重违法列入已办记录") @PostMapping("/enterFinishedList") - public RestResult> enterFinishedList(HttpServletRequest request, - @RequestBody BaseQuery baseQuery) { + public RestResult> enterFinishedList(HttpServletRequest request, + @RequestBody BaseQuery baseQuery) { AICUser user = getLoginUser(request); if (user == null) { return RestResult.error(ResultCode.USER_NOT_LOGGED_IN); } - TSTaskList taskListModel = new TSTaskList(); - taskListModel.setBustype(BaseDataConstant.SERILLEGAL_TYPE_OT_ENTER); - taskListModel.setSignuserid(user.getPrimaryKey()); + TaskListTodoParam param = baseQuery.getEntity(TaskListTodoParam.class); + param.setBustype(BaseDataConstant.SERILLEGAL_TYPE_OT_ENTER); + param.setCurrentUserId(user.getPrimaryKey()); - - IPage result = taskListService.searchTstaskByPage(new Page<>(baseQuery.getCurrent(), baseQuery.getSize()), - taskListModel, "1", user.getRegionID()); - - return RestResult.ok(result); + return RestResult.ok(eOtIlldisdetailTempService.getTodoHistoryPage(new Page<>(baseQuery.getCurrent(), baseQuery.getSize()), param)); } /** @@ -458,18 +453,17 @@ public class EOtIlldisdetailController extends BaseController { @ApiOperation("查询外单位严重违法移出待办列表") @PostMapping("/removeTaskList") public RestResult> removeTaskList(HttpServletRequest request, - @RequestBody BaseQuery baseQuery) { + @RequestBody BaseQuery baseQuery) { AICUser user = getLoginUser(request); if (user == null) { return RestResult.error(ResultCode.USER_NOT_LOGGED_IN); } - TSTaskList taskListModel = new TSTaskList(); - taskListModel.setBustype(BaseDataConstant.SERILLEGAL_TYPE_OT_REMOVE); - taskListModel.setSignuserid(user.getPrimaryKey()); + TaskListTodoParam param = baseQuery.getEntity(TaskListTodoParam.class); + param.setBustype(BaseDataConstant.SERILLEGAL_TYPE_OT_REMOVE); + param.setCurrentUserId(user.getPrimaryKey()); - IPage result = taskListService.searchTstaskByPage(new Page<>(baseQuery.getCurrent(), baseQuery.getSize()), - taskListModel, "0", user.getRegionID()); + IPage result = eOtIlldisdetailTempService.getTaskListTodoPage(new Page<>(baseQuery.getCurrent(), baseQuery.getSize()), param); return RestResult.ok(result); } @@ -479,22 +473,18 @@ public class EOtIlldisdetailController extends BaseController { */ @ApiOperation("查询外单位严重违法移出已办记录") @PostMapping("/removeFinishedList") - public RestResult> removeFinishedList(HttpServletRequest request, - @RequestBody BaseQuery baseQuery) { + public RestResult> removeFinishedList(HttpServletRequest request, + @RequestBody BaseQuery baseQuery) { AICUser user = getLoginUser(request); if (user == null) { return RestResult.error(ResultCode.USER_NOT_LOGGED_IN); } - TSTaskList taskListModel = new TSTaskList(); - taskListModel.setBustype(BaseDataConstant.SERILLEGAL_TYPE_OT_REMOVE); - taskListModel.setSignuserid(user.getPrimaryKey()); + TaskListTodoParam param = baseQuery.getEntity(TaskListTodoParam.class); + param.setBustype(BaseDataConstant.SERILLEGAL_TYPE_OT_REMOVE); + param.setCurrentUserId(user.getPrimaryKey()); - - IPage result = taskListService.searchTstaskByPage(new Page<>(baseQuery.getCurrent(), baseQuery.getSize()), - taskListModel, "1", user.getRegionID()); - - return RestResult.ok(result); + return RestResult.ok(eOtIlldisdetailTempService.getTodoHistoryPage(new Page<>(baseQuery.getCurrent(), baseQuery.getSize()), param)); } /** @@ -573,12 +563,12 @@ public class EOtIlldisdetailController extends BaseController { throw new BusinessException("待办记录不存在"); } - // 查询业务数据 - List bizList = eOtIlldisdetailTempService.listByBizSeq(taskListModel.getBizseqid()); - TaskDetailVo result = new TaskDetailVo(); result.setTaskList(taskListModel); - result.setBizList(bizList); + result.setBizInfo(eOtIlldisdetailTempService.lambdaQuery() + .eq(StringUtils.equals(taskListModel.getBustype(), BaseDataConstant.SERILLEGAL_TYPE_OT_ENTER), EOtIlldisdetailTemp::getInBizseq, taskListModel.getBizseqid()) + .eq(StringUtils.equals(taskListModel.getBustype(), BaseDataConstant.SERILLEGAL_TYPE_OT_REMOVE), EOtIlldisdetailTemp::getOutBizseq, taskListModel.getBizseqid()) + .ne(EOtIlldisdetailTemp::getDstate, CommonConstants.DELETED_2).one()); return RestResult.ok(result); } diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/seriousillegal/entity/dto/TaskListTodoParam.java b/src/main/java/com/chinaweal/aiccs/aiccs/seriousillegal/entity/dto/TaskListTodoParam.java new file mode 100644 index 0000000..ed5e802 --- /dev/null +++ b/src/main/java/com/chinaweal/aiccs/aiccs/seriousillegal/entity/dto/TaskListTodoParam.java @@ -0,0 +1,32 @@ +package com.chinaweal.aiccs.aiccs.seriousillegal.entity.dto; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * 待办查询参数 + * @author lroyia + * @since 2026/3/10 16:44 + **/ +@Data +public class TaskListTodoParam implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 业务类型 + */ + private String bustype; + + /** + * 业务类型（多个） + */ + private List bustypeIn; + + /** + * 当前用户id + */ + private String currentUserId; +} diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/seriousillegal/entity/vo/TaskDetailVo.java b/src/main/java/com/chinaweal/aiccs/aiccs/seriousillegal/entity/vo/TaskDetailVo.java index a3a0efb..11ebbed 100644 --- a/src/main/java/com/chinaweal/aiccs/aiccs/seriousillegal/entity/vo/TaskDetailVo.java +++ b/src/main/java/com/chinaweal/aiccs/aiccs/seriousillegal/entity/vo/TaskDetailVo.java @@ -21,6 +21,6 @@ public class TaskDetailVo { @ApiModelProperty("待办信息") private TSTaskList taskList; - @ApiModelProperty("业务数据列表") - private List bizList; + @ApiModelProperty("业务数据信息") + private EOtIlldisdetailTemp bizInfo; } \ No newline at end of file diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/seriousillegal/mapper/EOtIlldisdetailTempMapper.java b/src/main/java/com/chinaweal/aiccs/aiccs/seriousillegal/mapper/EOtIlldisdetailTempMapper.java index f7ad5b3..48b69d0 100644 --- a/src/main/java/com/chinaweal/aiccs/aiccs/seriousillegal/mapper/EOtIlldisdetailTempMapper.java +++ b/src/main/java/com/chinaweal/aiccs/aiccs/seriousillegal/mapper/EOtIlldisdetailTempMapper.java @@ -1,7 +1,11 @@ package com.chinaweal.aiccs.aiccs.seriousillegal.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.chinaweal.aiccs.aiccs.business.entity.TSTaskList; import com.chinaweal.aiccs.aiccs.seriousillegal.entity.EOtIlldisdetailTemp; +import com.chinaweal.aiccs.aiccs.seriousillegal.entity.dto.TaskListTodoParam; +import org.apache.ibatis.annotations.Param; /** *

@@ -13,4 +17,21 @@ import com.chinaweal.aiccs.aiccs.seriousillegal.entity.EOtIlldisdetailTemp; */ public interface EOtIlldisdetailTempMapper extends BaseMapper { + /** + * 查询待办分页 + * + * @param page 分页参数 + * @param param 查询参数 + * @return 分页结果 + */ + IPage selectTaskListTodoPage(IPage page, @Param("param") TaskListTodoParam param); + + /** + * 查询待办历史记录 + * + * @param page 分页大小 + * @param param 查询参数 + * @return 分页结果 + */ + IPage selectTodoHistoryPage(IPage page, @Param("param") TaskListTodoParam param); } \ No newline at end of file diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/seriousillegal/service/IEOtIlldisdetailTempService.java b/src/main/java/com/chinaweal/aiccs/aiccs/seriousillegal/service/IEOtIlldisdetailTempService.java index cddc4e8..2114376 100644 --- a/src/main/java/com/chinaweal/aiccs/aiccs/seriousillegal/service/IEOtIlldisdetailTempService.java +++ b/src/main/java/com/chinaweal/aiccs/aiccs/seriousillegal/service/IEOtIlldisdetailTempService.java @@ -1,9 +1,11 @@ package com.chinaweal.aiccs.aiccs.seriousillegal.service; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.chinaweal.aiccs.aiccs.auditing.entity.TSOpinion; import com.chinaweal.aiccs.aiccs.business.entity.TSTaskList; import com.chinaweal.aiccs.aiccs.seriousillegal.entity.EOtIlldisdetailTemp; +import com.chinaweal.aiccs.aiccs.seriousillegal.entity.dto.TaskListTodoParam; import com.chinaweal.aicorg.model.AICUser; import java.util.List; @@ -20,6 +22,7 @@ public interface IEOtIlldisdetailTempService extends IService listByWorkflowId(String workflowId, boolean isEnter); /** * 处理列入业务审批流程 - * @param user 当前用户 - * @param taskListModel 待办信息 - * @param tempRecords 业务记录列表 - * @param opinionModel 审批意见 - * @param nextNodeID 下一节点ID - * @param nextPerformerids 下一处理人ID数组 + * + * @param user 当前用户 + * @param taskListModel 待办信息 + * @param tempRecords 业务记录列表 + * @param opinionModel 审批意见 + * @param nextNodeID 下一节点ID + * @param nextPerformerids 下一处理人ID数组 * @param nextPerformerNames 下一处理人姓名数组 * @return 待办信息 */ @@ -50,12 +55,13 @@ public interface IEOtIlldisdetailTempService extends IService tempRecords, TSOpinion opinionModel, String nextNodeID, String[] nextPerformerids, String[] nextPerformerNames); + /** + * 待办查询 + * + * @param page 分页 + * @param param 查询参数 + * @return 查询结果 + */ + IPage getTaskListTodoPage(IPage page, TaskListTodoParam param); + + /** + * 查询待办历史记录 + * + * @param page 分页大小 + * @param param 查询参数 + * @return 分页结果 + */ + IPage getTodoHistoryPage(IPage page, TaskListTodoParam param); } \ No newline at end of file diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/seriousillegal/service/impl/EOtIlldisdetailServiceImpl.java b/src/main/java/com/chinaweal/aiccs/aiccs/seriousillegal/service/impl/EOtIlldisdetailServiceImpl.java index 2aec1ee..1c0e7ee 100644 --- a/src/main/java/com/chinaweal/aiccs/aiccs/seriousillegal/service/impl/EOtIlldisdetailServiceImpl.java +++ b/src/main/java/com/chinaweal/aiccs/aiccs/seriousillegal/service/impl/EOtIlldisdetailServiceImpl.java @@ -1,6 +1,5 @@ package com.chinaweal.aiccs.aiccs.seriousillegal.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.chinaweal.aiccs.aiccs.business.entity.TSTaskList; import com.chinaweal.aiccs.aiccs.business.service.TSTaskListService; @@ -10,7 +9,6 @@ import com.chinaweal.aiccs.aiccs.seriousillegal.entity.dto.RemoveAcceptDto; import com.chinaweal.aiccs.aiccs.seriousillegal.mapper.EOtIlldisdetailMapper; import com.chinaweal.aiccs.aiccs.seriousillegal.service.IEOtIlldisdetailService; import com.chinaweal.aiccs.aiccs.seriousillegal.service.IEOtIlldisdetailTempService; -import com.chinaweal.aiccs.common.constant.BaseDataConstant; import com.chinaweal.aiccs.common.util.FlowUtil; import com.chinaweal.aiccs.common.util.HandleWorkFlowUtil; import com.chinaweal.aicorg.model.AICUser; @@ -93,16 +91,6 @@ public class EOtIlldisdetailServiceImpl extends ServiceImpl getTaskListTodoPage(IPage page, TaskListTodoParam param) { + return baseMapper.selectTaskListTodoPage(page, param); + } + + @Override + public IPage getTodoHistoryPage(IPage page, TaskListTodoParam param) { + return baseMapper.selectTodoHistoryPage(page, param); + } } \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/aiccs/business/TSTaskListMapper.xml b/src/main/resources/mybatis/mapper/aiccs/business/TSTaskListMapper.xml index 3edc39b..13267c3 100644 --- a/src/main/resources/mybatis/mapper/aiccs/business/TSTaskListMapper.xml +++ b/src/main/resources/mybatis/mapper/aiccs/business/TSTaskListMapper.xml @@ -207,6 +207,9 @@ and v.bustype = #{tsTaskListModel.bustype} and exists(select 1 from TSAfterAuction where bizseqid = v.BizSeqID) + + and v.bustype = #{tsTaskListModel.bustype} + diff --git a/src/main/resources/mybatis/mapper/aiccs/seriousillegal/EOtIlldisdetailTempMapper.xml b/src/main/resources/mybatis/mapper/aiccs/seriousillegal/EOtIlldisdetailTempMapper.xml index 0859e13..8994cc4 100644 --- a/src/main/resources/mybatis/mapper/aiccs/seriousillegal/EOtIlldisdetailTempMapper.xml +++ b/src/main/resources/mybatis/mapper/aiccs/seriousillegal/EOtIlldisdetailTempMapper.xml @@ -2,4 +2,43 @@ + + \ No newline at end of file