Merge branch 'dev' of http://113.204.105.114:10011/TwoKe/zfjg into dev

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

@@ -0,0 +1,30 @@
+package com.zfjg.manage.api.dto.other;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@ApiModel("单位的检查记录列表")
+@Data
+public class EnforceObjRecordDTO {
+
+    @ApiModelProperty(value = "任务id")
+    private String id;
+
+    @ApiModelProperty("任务类型（NORMAL-日常检查,SPECIAL-专项检查，REPORT-举报检查,TOWNS-乡镇检查，OTHER-其他检查,REVIEW-复查,BRIGADE-总队督查）")
+    private String jobType;
+
+    @ApiModelProperty("执行人")
+    private String executorNames;
+
+    @ApiModelProperty("检查结果(PASS-合格,NOT_PASS:不合格,OVERPASS-不检查)")
+    private String enforceResult;
+
+    @ApiModelProperty(value = "检查时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date recordTime;
+
+}

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

@@ -0,0 +1,20 @@
+package com.zfjg.manage.api.search.other;
+
+import com.zfjg.common.core.web.page.PageQuery;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@ApiModel("查询单位检查记录列表查询条件")
+public class EnforceObjRecordQuery{
+
+    @ApiModelProperty(value = "记录ids")
+    private String checkIds;
+
+    @ApiModelProperty(value = "记录id List")
+    private List<String> checkIdList;
+
+}

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

@@ -2,15 +2,16 @@ package com.zfjg.manage.controller.other;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 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.other.ArchitectureDTO;
-import com.zfjg.manage.api.dto.other.EnforceObjArchitectureRelateAdd;
-import com.zfjg.manage.api.dto.other.EnforceObjArchitectureRelateUpdate;
-import com.zfjg.manage.api.dto.other.EnforceObjCheckDTO;
+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;
 import com.zfjg.manage.service.other.IArchitectureService;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,6 +19,8 @@ import org.springframework.web.bind.annotation.*;
 import io.swagger.annotations.ApiOperation;
 import com.zfjg.manage.service.other.IEnforceObjArchitectureRelateService;
 
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 
@@ -90,6 +93,37 @@ public class EnforceObjArchitectureRelateController extends BaseController {
         return new TableInfo<>(page);
     }
 
+    @ApiOperation(value="查询单位的检查记录列表")
+    @GetMapping("/enforceObjArchitectureRelate/checkRecord/list")
+    public R<List<EnforceObjRecordDTO>> selectEnforceJobList(EnforceObjRecordQuery query) {
+        if(StringUtils.isEmpty(query.getCheckIds()))return R.ok(new ArrayList<>());
+        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(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/mapper/other/EnforceObjArchitectureRelateMapper.java

@@ -6,6 +6,7 @@ import com.zfjg.manage.api.domain.other.EnforceObjArchitectureRelate;
 import com.zfjg.manage.api.dto.enforce.job.EnforceJobObjDTO;
 import com.zfjg.manage.api.dto.other.EnforceObjChangeArchitectureDTO;
 import com.zfjg.manage.api.dto.other.EnforceObjCheckDTO;
+import com.zfjg.manage.api.dto.other.EnforceObjRecordDTO;
 import com.zfjg.manage.api.search.other.EnforceObjArchitectureRelateQuery;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -28,4 +29,8 @@ public interface EnforceObjArchitectureRelateMapper extends BaseMapper<EnforceOb
     List<EnforceJobObjDTO> getEnforceJobList(@Param("enforceObjIds")List<String> enforceObjIds);
 
     List<EnforceObjChangeArchitectureDTO> getEnforceObjChangeArchitectureDTOList(@Param("enforceObjIds")List<String> enforceObjIds,@Param("uuid")String uuid);
+
+    List<EnforceObjRecordDTO> selectEnforceObjCheckRecordList(@Param("checkIdList")List<String> checkIdList);
+
+
 }

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

@@ -1,20 +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.EnforceObjArchitectureRelateAdd;
-import com.zfjg.manage.api.dto.other.EnforceObjArchitectureRelateUpdate;
-import com.zfjg.manage.api.dto.other.EnforceObjChangeArchitectureDTO;
-import com.zfjg.manage.api.dto.other.EnforceObjCheckDTO;
+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;
@@ -48,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) {
@@ -200,5 +209,42 @@ public class EnforceObjArchitectureRelateServiceImpl extends ServiceImpl<Enforce
         return true;
     }
 
+    @Override
+    public List<EnforceObjRecordDTO> selectEnforceObjCheckRecordList(List<String> checkIdList) {
+        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.getId());
+                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,9 +2,11 @@ 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;
+import com.zfjg.manage.api.dto.other.EnforceObjRecordDTO;
 import com.zfjg.manage.api.search.other.EnforceObjArchitectureRelateQuery;
 
 import java.util.List;
@@ -23,4 +25,9 @@ public interface IEnforceObjArchitectureRelateService extends IService<EnforceOb
     List<EnforceObjCheckDTO> getEnforceObjList(EnforceObjArchitectureRelateQuery query);
     Boolean checkRecordAuth(String regionId);
 
+    List<EnforceObjRecordDTO> selectEnforceObjCheckRecordList(List<String> checkIdList);
+
+
+    List<EnforceJobNodeItemDTO> getItemDetailList(List<String> checkIdList);
+
 }

zfjg-modules/zfjg-manage/src/main/resources/mapper/other/EnforceObjArchitectureRelateMapper.xml

@@ -44,6 +44,7 @@
             enforce_job
         WHERE
          job_type in ('NORMAL','SPECIAL','REPORT','REVIEW','BRIGADE','OTHER')
+          and job_status='ARCHIVED'
          and enforce_obj_id in
         <foreach collection="enforceObjIds" item="enforceObjId" open="(" separator="," close=")">
             #{enforceObjId}
@@ -69,4 +70,21 @@
         </foreach>
         order by create_time asc
     </select>
+
+<!--    通过已归档的id查检查记录列表-->
+    <select id="selectEnforceObjCheckRecordList" resultType="com.zfjg.manage.api.dto.other.EnforceObjRecordDTO">
+        SELECT
+            id,
+            job_type,
+            executor_names,
+            enforce_result,
+            record_time
+        FROM
+            enforce_job
+            where id in
+        <foreach collection="checkIdList" index="index" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+
+    </select>
 </mapper>