From d59f95f920e2edfbcbed6df512a099e6d8d548f1 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Wed, 6 Sep 2023 17:01:24 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=9C=AA=E7=AC=A6?= =?UTF-8?q?=E5=90=88=E9=A1=B9-=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/controller/ProjectLawsInventoryEOController.java | 4 +++- .../service/impl/ProjectLawsInventoryEOServiceImpl.java | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java index d3a21eb4f..19c45539b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java @@ -10,6 +10,7 @@ import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.constant.enums.CutEnum; import com.jero.common.system.base.controller.JeroController; 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.service.IBussDocumentLibraryEOService; import com.jero.modules.dummy.entity.DummyInventoryBaseEO; @@ -550,7 +551,8 @@ public class ProjectLawsInventoryEOController extends JeroController queryNotComplianList(@RequestParam Map params) { List> 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); } /** diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index 518232535..77394f233 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -30,6 +30,7 @@ import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.vo.DictModel; import com.jero.common.system.vo.LoginUser; import com.jero.common.util.DateUtils; +import com.jero.common.util.PageUtil; import com.jero.common.util.oss.CosBootUtil; import com.jero.modules.document.entity.BussDocumentLibraryEO; import com.jero.modules.document.service.IBussDocumentLibraryEOService; @@ -10545,6 +10546,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl e.getConnectId().equals(problemManagementEO.getFile())).collect(Collectors.toList()); problemManagementEO.setFileList(collect); map.put("fileList",collect); + map.put("file",problemManagementEO.getFile()); } //审批证据 if(StringUtils.isNotBlank(problemManagementEO.getApprovalEvidence())){ @@ -10552,6 +10554,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl e.getConnectId().equals(problemManagementEO.getApprovalEvidence())).collect(Collectors.toList()); problemManagementEO.setApprovalEvidenceFileList(collect); map.put("approvalEvidenceFileList",collect); + map.put("approvalEvidence",problemManagementEO.getApprovalEvidence()); } map.put("uuid",problemManagementEO.getId()); @@ -10566,7 +10569,6 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl Date: Wed, 6 Sep 2023 17:08:16 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=97=B6=E9=97=B4=E8=BD=AC=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ProjectLawsInventoryEOServiceImpl.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index 77394f233..6c00a1e74 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -10451,6 +10451,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl ncrTrackVOList = new ArrayList<>(); List> mapList = new ArrayList<>(); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); for (ProblemManagementEO problemManagementEO : managementEOList) { Map map = new HashMap<>(); map.put("title",problemManagementEO.getTitle()); @@ -10461,8 +10462,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl