隐患

zfjg-api/zfjg-api-manage/src/main/java/com/zfjg/manage/api/search/other/EnforceObjRecordQuery.java

@@ -9,7 +9,7 @@ import java.util.List;
 
 @Data
 @ApiModel("查询单位检查记录列表查询条件")
-public class EnforceObjRecordQuery extends PageQuery {
+public class EnforceObjRecordQuery{
 
     @ApiModelProperty(value = "记录ids")
     private String checkIds;

zfjg-modules/zfjg-manage/src/main/java/com/zfjg/manage/controller/other/EnforceObjArchitectureRelateController.java

@@ -8,6 +8,7 @@ import com.zfjg.common.core.domain.R;
 import com.zfjg.common.core.web.controller.BaseController;
 import com.zfjg.common.core.web.page.TableInfo;
 import com.zfjg.manage.api.domain.other.EnforceObjArchitectureRelate;
+import com.zfjg.manage.api.dto.enforce.job.EnforceJobNodeItemDTO;
 import com.zfjg.manage.api.dto.other.*;
 import com.zfjg.manage.api.search.other.EnforceObjArchitectureRelateQuery;
 import com.zfjg.manage.api.search.other.EnforceObjRecordQuery;
@@ -99,19 +100,32 @@ public class EnforceObjArchitectureRelateController extends BaseController {
         List<EnforceObjRecordDTO> list = enforceObjArchitectureRelateService.selectEnforceObjCheckRecordList(Arrays.asList(query.getCheckIds().split(",")));
         return R.ok(list);
     }
+//
+//    @ApiOperation(value="查询单位的检查记录列表(分页)")
+//    @GetMapping("/enforceObjArchitectureRelate/checkRecord/page")
+//    public TableInfo<EnforceObjRecordDTO>  selectEnforceJobPage(EnforceObjRecordQuery query) {
+//        if(StringUtils.isEmpty(query.getCheckIds()))return new TableInfo<>(new ArrayList<>());
+//        startPage();
+//        List<EnforceObjRecordDTO> page = enforceObjArchitectureRelateService.selectEnforceObjCheckRecordList(Arrays.asList(query.getCheckIds().split(",")));
+//        return new TableInfo<>(page);
+//    }
 
-    @ApiOperation(value="查询单位的检查记录列表(分页)")
-    @GetMapping("/enforceObjArchitectureRelate/checkRecord/page")
-    public TableInfo<EnforceObjRecordDTO>  selectEnforceJobPage(EnforceObjRecordQuery query) {
-        if(StringUtils.isEmpty(query.getCheckIds()))return new TableInfo<>(new ArrayList<>());
-        startPage();
-        List<EnforceObjRecordDTO> page = enforceObjArchitectureRelateService.selectEnforceObjCheckRecordList(Arrays.asList(query.getCheckIds().split(",")));
-        return new TableInfo<>(page);
+
+    /**
+     * 查询详情（隐患详情）
+     */
+    @ApiOperation(value = "查询")
+    @GetMapping(value = "/enforceObjArchitectureRelate/danager/list")
+    public R<List<EnforceJobNodeItemDTO>> getItemDetail(EnforceObjRecordQuery query) {
+        if(StringUtils.isEmpty(query.getCheckIds()))return R.ok(new ArrayList<>());
+        List<EnforceJobNodeItemDTO> list = enforceObjArchitectureRelateService.getItemDetailList(Arrays.asList(query.getCheckIds().split(",")));
+        return R.ok(list);
     }
 
 
 
 
+
 }
 
 

zfjg-modules/zfjg-manage/src/main/java/com/zfjg/manage/service/impl/other/EnforceObjArchitectureRelateServiceImpl.java

@@ -1,17 +1,25 @@
 package com.zfjg.manage.service.impl.other;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zfjg.common.core.enums.DeleteStatusEnum;
 import com.zfjg.common.security.utils.SecurityUtils;
+import com.zfjg.manage.api.domain.enforce.job.EnforceJobNodeItem;
+import com.zfjg.manage.api.domain.enforce.job.EnforceJobNodeItemRecord;
 import com.zfjg.manage.api.domain.other.EnforceObjArchitectureRelate;
 import com.zfjg.manage.api.domain.other.EnforceObjArchitectureRelateHis;
+import com.zfjg.manage.api.dto.enforce.job.EnforceJobNodeItemDTO;
+import com.zfjg.manage.api.dto.enforce.job.EnforceJobNodeItemRecordDTO;
 import com.zfjg.manage.api.dto.enforce.job.EnforceJobObjDTO;
 import com.zfjg.manage.api.dto.other.*;
 import com.zfjg.manage.api.search.other.EnforceObjArchitectureRelateQuery;
 import com.zfjg.manage.mapper.other.EnforceObjArchitectureRelateMapper;
 import com.zfjg.manage.mapper.sys.DeptMapper;
+import com.zfjg.manage.service.enforce.job.IEnforceJobNodeItemRecordService;
+import com.zfjg.manage.service.enforce.job.IEnforceJobNodeItemService;
 import com.zfjg.manage.service.other.IEnforceObjArchitectureRelateHisService;
 import com.zfjg.manage.service.other.IEnforceObjArchitectureRelateService;
 import com.zfjg.system.api.domain.SysDept;
@@ -45,6 +53,10 @@ public class EnforceObjArchitectureRelateServiceImpl extends ServiceImpl<Enforce
     private EnforceObjArchitectureRelateMapper enforceObjArchitectureRelateMapper;
     @Autowired
     private DeptMapper deptMapper;
+    @Autowired
+    private IEnforceJobNodeItemService enforceJobNodeItemService;
+    @Autowired
+    private IEnforceJobNodeItemRecordService enforceJobNodeItemRecordService;
 
     @Override
     public boolean insertEnforceObjArchitectureRelate(EnforceObjArchitectureRelateAdd add) {
@@ -202,4 +214,37 @@ public class EnforceObjArchitectureRelateServiceImpl extends ServiceImpl<Enforce
         return enforceObjArchitectureRelateMapper.selectEnforceObjCheckRecordList(checkIdList);
     }
 
+    @Override
+    public List<EnforceJobNodeItemDTO> getItemDetailList(List<String> checkIdList) {
+        List<EnforceJobNodeItemDTO> list = new ArrayList<>();
+        List<EnforceJobNodeItem> enforceJobNodeItems = enforceJobNodeItemService.list(new LambdaQueryWrapper<EnforceJobNodeItem>()
+                .in(EnforceJobNodeItem::getJobId, checkIdList));
+        if (CollectionUtils.isEmpty(enforceJobNodeItems)) return list;
+        List<Long> itemIds = enforceJobNodeItems.stream().map(EnforceJobNodeItem::getId).collect(Collectors.toList());
+
+        //检查情况信息
+        List<EnforceJobNodeItemRecord> enforceJobNodeItemRecords = enforceJobNodeItemRecordService.getBaseMapper().selectList(new QueryWrapper<EnforceJobNodeItemRecord>().lambda()
+                .in(EnforceJobNodeItemRecord::getItemId, itemIds)
+                .eq(EnforceJobNodeItemRecord::getIsDeleted, DeleteStatusEnum.NOT_DELETED.getStatus()));
+        if (CollectionUtils.isNotEmpty(enforceJobNodeItemRecords)) {
+            Map<Long, List<EnforceJobNodeItemRecord>> map = enforceJobNodeItemRecords.stream().collect(Collectors.groupingBy(EnforceJobNodeItemRecord::getItemId));
+            enforceJobNodeItems.forEach(e -> {
+                EnforceJobNodeItemDTO enforceJobNodeItemDTO = new EnforceJobNodeItemDTO();
+                BeanUtils.copyProperties(e, enforceJobNodeItemDTO);
+
+                List<EnforceJobNodeItemRecord> collectList = map.get(e.getItemId());
+                if (CollectionUtils.isNotEmpty(collectList)) {
+                    List<EnforceJobNodeItemRecordDTO> collect = collectList.stream().map(item -> {
+                        EnforceJobNodeItemRecordDTO enforceJobNodeItemRecordDTO = new EnforceJobNodeItemRecordDTO();
+                        BeanUtils.copyProperties(item, enforceJobNodeItemRecordDTO);
+                        return enforceJobNodeItemRecordDTO;
+                    }).collect(Collectors.toList());
+                    enforceJobNodeItemDTO.setRecords(collect);
+                }
+                list.add(enforceJobNodeItemDTO);
+            });
+        }
+        return list;
+    }
+
 }

zfjg-modules/zfjg-manage/src/main/java/com/zfjg/manage/service/other/IEnforceObjArchitectureRelateService.java

@@ -2,6 +2,7 @@ package com.zfjg.manage.service.other;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.zfjg.manage.api.domain.other.EnforceObjArchitectureRelate;
+import com.zfjg.manage.api.dto.enforce.job.EnforceJobNodeItemDTO;
 import com.zfjg.manage.api.dto.other.EnforceObjArchitectureRelateAdd;
 import com.zfjg.manage.api.dto.other.EnforceObjArchitectureRelateUpdate;
 import com.zfjg.manage.api.dto.other.EnforceObjCheckDTO;
@@ -26,4 +27,7 @@ public interface IEnforceObjArchitectureRelateService extends IService<EnforceOb
 
     List<EnforceObjRecordDTO> selectEnforceObjCheckRecordList(List<String> checkIdList);
 
+
+    List<EnforceJobNodeItemDTO> getItemDetailList(List<String> checkIdList);
+
 }