diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/controller/DocumentSplitController.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/controller/DocumentSplitController.java index 66368a33..67871aec 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/controller/DocumentSplitController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/controller/DocumentSplitController.java @@ -1,12 +1,15 @@ package com.jero.modules.laws.documenttool.controller; +import cn.hutool.core.util.PageUtil; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.github.xiaoymin.knife4j.annotations.ApiSupport; import com.jero.common.api.vo.Result; import com.jero.common.api.vo.ResultCommon; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.util.MessageUtils; +import com.jero.modules.activiti.process.projectassess.entity.ProcessProjectAssessTerm; import com.jero.modules.laws.documenttool.entity.DocumentSplitInfo; import com.jero.modules.laws.documenttool.entity.LawsDocumentSplitView; import com.jero.modules.laws.documenttool.entity.SplitFileInfo; @@ -388,6 +391,33 @@ public class DocumentSplitController { return Result.OK(MessageUtils.getMessage(ResultCommon.OK)); } + /** + * 标准征求意见流程-查询条款列表 + * @param ids + * @return + */ + @ApiOperation(value = "标准征求意见流程-查询条款列表") + @GetMapping("/processProjectAssessGetList") + @ApiOperationSupport(order = 21) + public Result> processProjectAssessGetList(String ids, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) { + List processProjectAssessTermList = documentSplitService.processProjectAssessGetList(ids); + IPage info = new Page<>(); + int total = processProjectAssessTermList.size(); + if(total>0) { + if (total <= pageNo * pageSize) { + info.setRecords(processProjectAssessTermList.subList((pageNo-1) * pageSize, total)); + } else { + info.setRecords(processProjectAssessTermList.subList((pageNo-1) * pageSize, pageNo * pageSize)); + } + } + info.setCurrent(pageNo); + info.setSize(pageSize); + info.setTotal(total); + return Result.OK(info); + } + /** * 标准拆分详情-模板下载 * @param request diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/IDocumentSplitService.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/IDocumentSplitService.java index f76e397e..0f627f61 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/IDocumentSplitService.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/IDocumentSplitService.java @@ -1,6 +1,7 @@ package com.jero.modules.laws.documenttool.service; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jero.modules.activiti.process.projectassess.entity.ProcessProjectAssessTerm; import com.jero.modules.laws.documenttool.entity.DocumentSplitInfo; import com.jero.modules.laws.documenttool.entity.LawsDocumentSplitView; import com.jero.modules.laws.documenttool.entity.SplitFileInfo; @@ -162,6 +163,8 @@ public interface IDocumentSplitService { */ LawsDocumentSplitView queryView(Map parameter); + List processProjectAssessGetList(String ids); + /** * 文档拆分-发布 * @param parameter diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java index 74d8d061..f94b2bf9 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java @@ -16,6 +16,8 @@ import com.jero.common.util.FileUtils; import com.jero.common.util.MessageUtils; import com.jero.common.util.UUIDUtils; import com.jero.common.util.ZipUtil; +import com.jero.modules.activiti.process.projectassess.entity.ProcessProjectAssessLink; +import com.jero.modules.activiti.process.projectassess.entity.ProcessProjectAssessTerm; import com.jero.modules.laws.common.constant.FieldCommon; import com.jero.modules.laws.common.mapper.LawsCommonMapper; import com.jero.modules.laws.documenttool.common.DirectoryComparator; @@ -975,6 +977,30 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService { lawsDocumentSplitView.setDocumentSplitDetail(documentSplitDetailByList); return lawsDocumentSplitView; } + @Override + public List processProjectAssessGetList(String ids) { + List processProjectAssessTermList = new ArrayList<>(); + for (String id : ids.split(",")) { + ProcessProjectAssessTerm processProjectAssessTerm = new ProcessProjectAssessTerm(); + // 文档拆分信息 + DocumentSplitInfo documentSplitInfo1 = documentSplitMapper.queryDocumentSplitInfoById(id); + processProjectAssessTerm.setTermNumber(documentSplitInfo1.getSerialNumber()); + processProjectAssessTerm.setTermName(documentSplitInfo1.getTitle()); + processProjectAssessTermList.add(processProjectAssessTerm); + // 文档拆分详情 + Map parameter = new HashMap<>(); + parameter.put(INFO_ID, id); + List> documentSplitDetailByList = queryDocumentSplitDetailByList(parameter); + for (Map map : documentSplitDetailByList) { + ProcessProjectAssessTerm processProjectAssessTerm1 = new ProcessProjectAssessTerm(); + processProjectAssessTerm1.setTermNumber(String.valueOf(map.get("item_num"))); + processProjectAssessTerm1.setTermName(String.valueOf(map.get("item_title"))); + processProjectAssessTerm1.setTermText(String.valueOf(map.get("item_content"))); + processProjectAssessTermList.add(processProjectAssessTerm1); + } + } + return processProjectAssessTermList; + } @Override public void publish(Map parameter) {