隐患检查

secure-producting-business/src/main/java/com/customs/cq/datacenter/business/domain/bo/GridCheckFormBo.java

@@ -1,30 +1,52 @@
 package com.customs.cq.datacenter.business.domain.bo;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 
+import java.io.Serializable;
+
 @Data
-public class GridCheckFormBo {
+public class GridCheckFormBo implements Serializable {
     /**
-     * 主键
+     * 检查记录id
      */
-    @TableId
-    @TableField(value = "ID")
     private Long id;
+    /**
+     * 隐患检查单号
+     */
+    private String checkFormNo;
     /**
      * 所属网格
      */
-    @TableField(value = "GRID_ID")
     private Long gridId;
+    /**
+     * 隐患分类
+     */
+    private Long dangerCategory;
+    /**
+     * 所属检查表
+     */
+    private Long checkFormId;
+    /**
+     * 检查表名称
+     */
+    private String checkFormName;
     /**
      * 数据创建时间
      */
-    @TableField(value = "CREATE_TIME")
     private Long createTime;
     /**
      * 状态 ECheckFormStatus
      */
-    @TableField(value = "STATUS")
     private Integer status;
+
+    public GridCheckFormBo(Long id, String checkFormNo, Long gridId, Long dangerCategory, Long checkFormId, String checkFormName, Long createTime, Integer status) {
+        this.id = id;
+        this.checkFormNo = checkFormNo;
+        this.gridId = gridId;
+        this.dangerCategory = dangerCategory;
+        this.checkFormId = checkFormId;
+        this.checkFormName = checkFormName;
+        this.createTime = createTime;
+        this.status = status;
+    }
 }

secure-producting-business/src/main/java/com/customs/cq/datacenter/business/entity/response/check/ResListGrid4User.java

@@ -1,20 +1,40 @@
 package com.customs.cq.datacenter.business.entity.response.check;
 
 import com.customs.cq.datacenter.common.enums.ECheckFormStatus;
-import com.customs.cq.datacenter.common.enums.EYesOrNo;
 import lombok.Data;
 
-import java.util.Objects;
-
 @Data
 public class ResListGrid4User {
+    /**
+     * 隐患检查单id
+     */
+    private Long id;
+    /**
+     * 隐患检查单号
+     */
+    private String checkFormNo;
+    /**
+     * 所属网格
+     */
     private Long gridId;
+    /**
+     * 网格名称
+     */
     private String gridName;
+    /**
+     * 所属检查表
+     */
     private Long checkFormId;
+    /**
+     * 检查表名称
+     */
     private String checkFormName;
-    private Integer checkStatus;
+    /**
+     * 检查单状态
+     */
+    private Integer status;
 
-    public String getCheckStatusTxt() {
-        return ECheckFormStatus.getByValue(this.getCheckStatus()).getDesc();
+    public String getStatusTxt() {
+        return ECheckFormStatus.getByValue(this.getStatus()).getDesc();
     }
 }

secure-producting-business/src/main/java/com/customs/cq/datacenter/business/mapper/impl/CheckRecordMapperImpl.java

@@ -1,25 +1,23 @@
 package com.customs.cq.datacenter.business.mapper.impl;
 
-import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.customs.cq.datacenter.business.domain.GridPersonPO;
+import com.customs.cq.datacenter.business.domain.CheckRecordPO;
 import com.customs.cq.datacenter.business.domain.bo.GridCheckFormBo;
+import com.customs.cq.datacenter.business.entity.search.SearchCheckRecord;
+import com.customs.cq.datacenter.business.mapper.CheckRecordMapper;
 import com.customs.cq.datacenter.common.constant.Constants;
+import com.customs.cq.datacenter.common.core.mapper.BasicMapper;
 import com.customs.cq.datacenter.common.enums.EOrderBy;
 import com.customs.cq.datacenter.common.enums.EYesOrNo;
-import com.customs.cq.datacenter.common.utils.*;
-import com.customs.cq.datacenter.common.core.mapper.BasicMapper;
 import com.customs.cq.datacenter.common.model.OrderByDTO;
 import com.customs.cq.datacenter.common.model.SearchBasicDTO;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-import org.springframework.boot.json.GsonJsonParser;
+import com.customs.cq.datacenter.common.utils.ListUtil;
+import com.customs.cq.datacenter.common.utils.LocalDateTimeUtil;
+import com.customs.cq.datacenter.common.utils.NumericUtil;
+import com.customs.cq.datacenter.common.utils.StringUtil;
 import org.springframework.stereotype.Repository;
-import com.customs.cq.datacenter.business.entity.search.SearchCheckRecord;
-import com.customs.cq.datacenter.business.domain.CheckRecordPO;
-import com.customs.cq.datacenter.business.mapper.CheckRecordMapper;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -134,7 +132,11 @@ public class CheckRecordMapperImpl extends BasicMapper<CheckRecordPO> {
     public List<GridCheckFormBo> checkToday4Grid(List<Long> listGridId) {
         List<String> listColumn = new ArrayList<>();
         listColumn.add("ID");
+        listColumn.add("CHECK_FORM_NO");
         listColumn.add("GRID_ID");
+        listColumn.add("DANGER_CATEGORY");
+        listColumn.add("CHECK_FORM_ID");
+        listColumn.add("CHECK_FORM_NAME");
         listColumn.add("CREATE_TIME");
         listColumn.add("STATUS");
 
@@ -144,13 +146,21 @@ public class CheckRecordMapperImpl extends BasicMapper<CheckRecordPO> {
 
         Long today = LocalDateTimeUtil.getTimeStamp(LocalDateTimeUtil.todayFirst()).getTime();
         where.gt(CheckRecordPO::getCreateTime, today);
-        List<Object> list = mapper.selectObjs(where);
-        return BeanUtil.copyToList(list, GridCheckFormBo.class);
+        List<Map<String, Object>> list = mapper.selectMaps(where);
+        return list.stream().map(c -> new GridCheckFormBo(
+                NumericUtil.tryParseLong(c.get("ID")),
+                c.get("CHECK_FORM_NO").toString(),
+                NumericUtil.tryParseLong(c.get("GRID_ID")),
+                NumericUtil.tryParseLong(c.get("DANGER_CATEGORY")),
+                NumericUtil.tryParseLong(c.get("CHECK_FORM_ID")),
+                c.get("CHECK_FORM_NAME").toString(),
+                NumericUtil.tryParseLong(c.get("CREATE_TIME")),
+                NumericUtil.tryParseInt(c.get("STATUS"))
+        )).collect(Collectors.toList());
     }
 
     public Long checkDate4Grid(Long gridId, String dateStr) {
         LambdaQueryWrapper<CheckRecordPO> where = super.getQuery();
-        where.select(CheckRecordPO.class, c -> c.getColumn().equals("GRID_ID"));
         where.eq(CheckRecordPO::getGridId, gridId);
 
         Long date = LocalDateTimeUtil.getTimeStamp(dateStr, Constants.STR_DATE).getTime();

secure-producting-business/src/main/java/com/customs/cq/datacenter/business/service/CheckRecordService.java

@@ -284,27 +284,13 @@ public class CheckRecordService extends BasicService {
         // 网格列表
         List<GridInfoPO> list = gridInfoMapper.selectBatchIds(listGridId);
         // 网格隐患分类列表
-        Map<Long, DangerCheckFormPO> mapForm = checkFormMapper.map4DangerCategory(list.stream().map(GridInfoPO::getDangerCategory).collect(Collectors.toList()));
+        Map<Long, GridInfoPO> mapGrid = list.stream().collect(Collectors.toMap(GridInfoPO::getId, c -> c));
         // 网格今日隐患检查记录
         List<GridCheckFormBo> listTodayFinishGridId = dao.checkToday4Grid(listGridId);
-        Map<Long, GridCheckFormBo> map4Grid = listTodayFinishGridId.stream().collect(Collectors.toMap(GridCheckFormBo::getGridId, c -> c));
-        List<ResListGrid4User> listVo = list.stream().map(c -> {
-            DangerCheckFormPO form = mapForm.get(c.getDangerCategory());
-
-            ResListGrid4User item = new ResListGrid4User();
-            item.setGridId(c.getId());
-            item.setGridName(c.getGridName());
-            item.setCheckFormId(0L);
-            item.setCheckFormName("没有配置检查表！");
-            if (Objects.nonNull(form)) {
-                item.setCheckFormId(form.getId());
-                item.setCheckFormName(form.getName());
-            }
-            item.setCheckStatus(ECheckFormStatus.WAITING.getValue());
-            if (map4Grid.containsKey(c.getId())) {
-                item.setCheckStatus(map4Grid.get(c.getId()).getStatus());
-            }
-
+        List<ResListGrid4User> listVo = listTodayFinishGridId.stream().map(c -> {
+            GridInfoPO grid = mapGrid.get(c.getGridId());
+            ResListGrid4User item = CopierUtil.mapTo(c, ResListGrid4User.class);
+            item.setGridName(grid.getGridName());
             return item;
         }).collect(Collectors.toList());
         return ExecutedResult.success(listVo);

secure-producting-vue/src/views/grid/components/MyGridAndCheck.vue

@@ -7,18 +7,18 @@
             {{ scope.row.gridName + ' - ' + scope.row.checkFormName }}
           </template>
         </el-table-column>
-        <el-table-column prop="checkStatusTxt" label="状态" />
+        <el-table-column prop="statusTxt" label="状态" />
         <el-table-column label="操作">
           <template #default="scope">                                
             <el-button
-              v-if="scope.row.checkStatus === 1"
+              v-if="scope.row.status === 1"
               link
               type="primary"
               icon="View"
               @click="handleDetail(scope.row)"
             >查看</el-button>
             <el-button
-              v-if="scope.row.checkStatus === 0"
+              v-if="scope.row.status === 0"
               link
               type="primary"
               icon="Edit"