ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 标准征求意见流程-查询条款列表

Browse Source
This commit is contained in:
lijiarao
2023-12-13 11:32:28 +08:00
parent 410f987cfa
commit 7f1767faab
7 changed files with 77 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/laws/documenttool/controller/DocumentSplitController.java
+1 -26
View File
@@ -391,32 +391,7 @@ public class DocumentSplitController {
return Result.OK(MessageUtils.getMessage(ResultCommon.OK));
}
/**
* 标准征求意见流程-查询条款列表
* @param ids
* @return
*/
@ApiOperation(value = "标准征求意见流程-查询条款列表")
@GetMapping("/processProjectAssessGetList")
@ApiOperationSupport(order = 21)
public Result<IPage<ProcessProjectAssessTerm>> processProjectAssessGetList(String ids,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
List<ProcessProjectAssessTerm> processProjectAssessTermList = documentSplitService.processProjectAssessGetList(ids);
IPage<ProcessProjectAssessTerm> 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);
}
/**
* 标准拆分详情-模板下载
laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java
+2
View File
@@ -986,6 +986,7 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
DocumentSplitInfo documentSplitInfo1 = documentSplitMapper.queryDocumentSplitInfoById(id);
processProjectAssessTerm.setTermNumber(documentSplitInfo1.getSerialNumber());
processProjectAssessTerm.setTermName(documentSplitInfo1.getTitle());
processProjectAssessTerm.setCanAssignFlag(false);
processProjectAssessTermList.add(processProjectAssessTerm);
// 文档拆分详情
Map<String, Object> parameter = new HashMap<>();
@@ -996,6 +997,7 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
processProjectAssessTerm1.setTermNumber(String.valueOf(map.get("item_num")));
processProjectAssessTerm1.setTermName(String.valueOf(map.get("item_title")));
processProjectAssessTerm1.setTermText(String.valueOf(map.get("item_content")));
processProjectAssessTerm1.setCanAssignFlag(true);
processProjectAssessTermList.add(processProjectAssessTerm1);
}
}