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

Merge remote-tracking branch 'origin/dev_20230831_problem' into dev_20230831_problem

Browse Source
This commit is contained in:
zyx.net
2023-09-06 17:51:37 +08:00
parent 40bf4be689 ba96bab3d3
commit 8ae9d6d89d
2 changed files with 9 additions and 4 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
+6 -3
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;
@@ -10450,6 +10451,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
} }
List<NcrTrackVO> ncrTrackVOList = new ArrayList<>(); List<NcrTrackVO> ncrTrackVOList = new ArrayList<>();
List<Map<String,Object>> mapList = new ArrayList<>(); List<Map<String,Object>> mapList = new ArrayList<>();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
for (ProblemManagementEO problemManagementEO : managementEOList) { for (ProblemManagementEO problemManagementEO : managementEOList) {
Map<String,Object> map = new HashMap<>(); Map<String,Object> map = new HashMap<>();
map.put("title",problemManagementEO.getTitle()); map.put("title",problemManagementEO.getTitle());
@@ -10460,8 +10462,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
map.put("description",problemManagementEO.getDescription()); map.put("description",problemManagementEO.getDescription());
map.put("conclusion",problemManagementEO.getConclusion()); map.put("conclusion",problemManagementEO.getConclusion());
map.put("createBy",problemManagementEO.getCreateBy()); map.put("createBy",problemManagementEO.getCreateBy());
map.put("createTime",problemManagementEO.getCreateTime()); map.put("createTime",sdf.format(problemManagementEO.getCreateTime()));
map.put("updateTime",problemManagementEO.getUpdateTime()); map.put("updateTime",sdf.format(problemManagementEO.getUpdateTime()));
map.put("flag",DataEnum.OLD.getValue()); map.put("flag",DataEnum.OLD.getValue());
//相关法规 //相关法规
if(StringUtils.isNotBlank(problemManagementEO.getLawsId())){ if(StringUtils.isNotBlank(problemManagementEO.getLawsId())){
@@ -10545,6 +10547,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 +10555,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 +10570,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;
} }