WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

项目未符合项-分页

Browse Source
This commit is contained in:
zhn
2023-09-06 17:01:24 +08:00
parent dcd8f09c4d
commit d59f95f920
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java
+3 -1
View File
@@ -10,6 +10,7 @@ import com.jero.common.aspect.annotation.AutoLog;
import com.jero.common.constant.enums.CutEnum; import com.jero.common.constant.enums.CutEnum;
import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.base.controller.JeroController;
import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.query.QueryGenerator;
import com.jero.common.util.PageUtil;
import com.jero.modules.document.entity.BussDocumentLibraryEO; import com.jero.modules.document.entity.BussDocumentLibraryEO;
import com.jero.modules.document.service.IBussDocumentLibraryEOService; import com.jero.modules.document.service.IBussDocumentLibraryEOService;
import com.jero.modules.dummy.entity.DummyInventoryBaseEO; import com.jero.modules.dummy.entity.DummyInventoryBaseEO;
@@ -550,7 +551,8 @@ public class ProjectLawsInventoryEOController extends JeroController<ProjectLaws
@GetMapping(value = "/queryNotComplianList") @GetMapping(value = "/queryNotComplianList")
public Result<?> queryNotComplianList(@RequestParam Map<String,Object> params) { public Result<?> queryNotComplianList(@RequestParam Map<String,Object> params) {
List<Map<String,Object>> result = this.projectLawsInventoryEOService.queryNotComplianList(params); List<Map<String,Object>> result = this.projectLawsInventoryEOService.queryNotComplianList(params);
return Result.OK(result); Page pages = PageUtil.getPages(Integer.parseInt((String) params.get("pageNo")), Integer.parseInt((String) params.get("pageSize")), result);
return Result.OK(pages);
} }
/** /**
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+3 -1
View File
@@ -30,6 +30,7 @@ import com.jero.common.system.query.QueryGenerator;
import com.jero.common.system.vo.DictModel; import com.jero.common.system.vo.DictModel;
import com.jero.common.system.vo.LoginUser; import com.jero.common.system.vo.LoginUser;
import com.jero.common.util.DateUtils; import com.jero.common.util.DateUtils;
import com.jero.common.util.PageUtil;
import com.jero.common.util.oss.CosBootUtil; import com.jero.common.util.oss.CosBootUtil;
import com.jero.modules.document.entity.BussDocumentLibraryEO; import com.jero.modules.document.entity.BussDocumentLibraryEO;
import com.jero.modules.document.service.IBussDocumentLibraryEOService; import com.jero.modules.document.service.IBussDocumentLibraryEOService;
@@ -10545,6 +10546,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
.filter(e -> e.getConnectId().equals(problemManagementEO.getFile())).collect(Collectors.toList()); .filter(e -> e.getConnectId().equals(problemManagementEO.getFile())).collect(Collectors.toList());
problemManagementEO.setFileList(collect); problemManagementEO.setFileList(collect);
map.put("fileList",collect); map.put("fileList",collect);
map.put("file",problemManagementEO.getFile());
} }
//审批证据 //审批证据
if(StringUtils.isNotBlank(problemManagementEO.getApprovalEvidence())){ if(StringUtils.isNotBlank(problemManagementEO.getApprovalEvidence())){
@@ -10552,6 +10554,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
.filter(e -> e.getConnectId().equals(problemManagementEO.getApprovalEvidence())).collect(Collectors.toList()); .filter(e -> e.getConnectId().equals(problemManagementEO.getApprovalEvidence())).collect(Collectors.toList());
problemManagementEO.setApprovalEvidenceFileList(collect); problemManagementEO.setApprovalEvidenceFileList(collect);
map.put("approvalEvidenceFileList",collect); map.put("approvalEvidenceFileList",collect);
map.put("approvalEvidence",problemManagementEO.getApprovalEvidence());
} }
map.put("uuid",problemManagementEO.getId()); map.put("uuid",problemManagementEO.getId());
@@ -10566,7 +10569,6 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
if(ObjectUtils.isNotEmpty(mapList)){ if(ObjectUtils.isNotEmpty(mapList)){
result.addAll(mapList); result.addAll(mapList);
} }
return result; return result;
} }