隐患

zfjg-api/zfjg-api-manage/src/main/java/com/zfjg/manage/api/dto/other/EnforceObjRecordDTO.java

@@ -18,7 +18,7 @@ public class EnforceObjRecordDTO {
     private String jobType;
 
     @ApiModelProperty("执行人")
-    private String executorNnames;
+    private String executorNames;
 
     @ApiModelProperty("检查结果(PASS-合格,NOT_PASS:不合格,OVERPASS-不检查)")
     private String enforceResult;

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

@@ -112,15 +112,15 @@ public class EnforceObjArchitectureRelateController extends BaseController {
 
 
     /**
-     * 查询详情（隐患详情）
+     * 查询隐患列表
      */
-    @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);
-    }
+//    @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

@@ -232,7 +232,7 @@ public class EnforceObjArchitectureRelateServiceImpl extends ServiceImpl<Enforce
                 EnforceJobNodeItemDTO enforceJobNodeItemDTO = new EnforceJobNodeItemDTO();
                 BeanUtils.copyProperties(e, enforceJobNodeItemDTO);
 
-                List<EnforceJobNodeItemRecord> collectList = map.get(e.getItemId());
+                List<EnforceJobNodeItemRecord> collectList = map.get(e.getId());
                 if (CollectionUtils.isNotEmpty(collectList)) {
                     List<EnforceJobNodeItemRecordDTO> collect = collectList.stream().map(item -> {
                         EnforceJobNodeItemRecordDTO enforceJobNodeItemRecordDTO = new EnforceJobNodeItemRecordDTO();