徐明浩

master/src/main/java/com/ruoyi/project/ticket/controller/THazardWorkPermitController.java

@@ -1,5 +1,6 @@
 package com.ruoyi.project.ticket.controller;
 
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
 import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
@@ -8,10 +9,14 @@ import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.project.ticket.domain.THazardWorkPermit;
 import com.ruoyi.project.ticket.service.ITHazardWorkPermitService;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -34,6 +39,41 @@ public class THazardWorkPermitController extends BaseController {
     public TableDataInfo list(THazardWorkPermit tHazardWorkPermit) {
         startPage();
         List<THazardWorkPermit> list = tHazardWorkPermitService.selectTHazardWorkPermitList(tHazardWorkPermit);
+        for (THazardWorkPermit t : list) {
+            if (t.gethVNoOne() != null) {
+                List<THazardWorkPermit> l = new ArrayList<>();
+                THazardWorkPermit tt = new THazardWorkPermit();
+                BeanUtils.copyProperties(t, tt);
+                l.add(tt);
+                l.add(tt);
+                l.add(tt);
+                l.add(tt);
+                l.add(tt);
+                int i = 1;
+                List<THazardWorkPermit> l2 = new ArrayList<>();
+                for (THazardWorkPermit th : l) {
+                    THazardWorkPermit tt2 = new THazardWorkPermit();
+                    BeanUtils.copyProperties(th, tt2);
+                    tt2.sethVNoOne(Long.parseLong(String.valueOf(th.gethVNoOne()) + i++));
+                    l2.add(tt2);
+                }
+                t.setChildren(l2);
+            }
+            if (t.gethVNoTwo() != null) {
+                List<THazardWorkPermit> l = new ArrayList<>();
+                THazardWorkPermit tt = new THazardWorkPermit();
+                BeanUtils.copyProperties(t, tt);
+                l.add(tt);
+                t.setChildren(l);
+            }
+            if (t.gethVNoThree() != null) {
+                List<THazardWorkPermit> l = new ArrayList<>();
+                THazardWorkPermit tt = new THazardWorkPermit();
+                BeanUtils.copyProperties(t, tt);
+                l.add(tt);
+                t.setChildren(l);
+            }
+        }
         return getDataTable(list);
     }
 

master/src/main/java/com/ruoyi/project/ticket/controller/TPermitRelationController.java

@@ -0,0 +1,67 @@
+package com.ruoyi.project.ticket.controller;
+
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.project.ticket.domain.PermitRelation;
+import com.ruoyi.project.ticket.domain.THazardWorkPermit;
+import com.ruoyi.project.ticket.service.ITPermitRelationService;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 票据列表Controller
+ *
+ * @author ruoyi
+ * @date 2021-10-25
+ */
+@RestController
+@RequestMapping("/ticket/permitRelations")
+public class TPermitRelationController extends BaseController {
+
+    @Autowired
+    private ITPermitRelationService itPermitRelationService;
+
+    /**
+     * 查询票据列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(PermitRelation permitRelation) {
+        startPage();
+        List<PermitRelation> list = itPermitRelationService.selectPermitRelations(permitRelation);
+        for (PermitRelation relation : list) {
+            if (relation.getCbWorkContent() != null) {
+                relation.setbWorkContent(relation.getCbWorkContent());
+            }
+            if (relation.getChVNoOne() != null) {
+                relation.sethVNoOne(relation.getChVNoOne());
+            }
+            if (relation.gethVNoOne() != null) {
+                List<PermitRelation> l = new ArrayList<>();
+                PermitRelation tt = new PermitRelation();
+                BeanUtils.copyProperties(relation, tt);
+                l.add(tt);
+                l.add(tt);
+                l.add(tt);
+                l.add(tt);
+                l.add(tt);
+                int i = 1;
+                List<PermitRelation> l2 = new ArrayList<>();
+                for (PermitRelation th : l) {
+                    PermitRelation tt2 = new PermitRelation();
+                    BeanUtils.copyProperties(th, tt2);
+                    tt2.sethVNoOne(th.gethVNoOne() + "-" + i++);
+                    l2.add(tt2);
+                }
+                relation.sethVNoOne("是");
+                relation.setChildren(l2);
+            }
+        }
+        return getDataTable(list);
+    }
+}

master/src/main/java/com/ruoyi/project/ticket/domain/PermitRelation.java

@@ -0,0 +1,81 @@
+package com.ruoyi.project.ticket.domain;
+
+import com.ruoyi.framework.web.domain.BaseEntity;
+
+import java.util.List;
+
+public class PermitRelation extends BaseEntity {
+    private Long id;
+    private Long aId;
+    private Long cId;
+    private String bWorkContent;
+    private String cbWorkContent;
+    private String hVNoOne;
+    private String chVNoOne;
+
+    private List<PermitRelation> children;
+
+    public List<PermitRelation> getChildren() {
+        return children;
+    }
+
+    public void setChildren(List<PermitRelation> children) {
+        this.children = children;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getaId() {
+        return aId;
+    }
+
+    public void setaId(Long aId) {
+        this.aId = aId;
+    }
+
+    public Long getcId() {
+        return cId;
+    }
+
+    public void setcId(Long cId) {
+        this.cId = cId;
+    }
+
+    public String getbWorkContent() {
+        return bWorkContent;
+    }
+
+    public void setbWorkContent(String bWorkContent) {
+        this.bWorkContent = bWorkContent;
+    }
+
+    public String getCbWorkContent() {
+        return cbWorkContent;
+    }
+
+    public void setCbWorkContent(String cbWorkContent) {
+        this.cbWorkContent = cbWorkContent;
+    }
+
+    public String gethVNoOne() {
+        return hVNoOne;
+    }
+
+    public void sethVNoOne(String hVNoOne) {
+        this.hVNoOne = hVNoOne;
+    }
+
+    public String getChVNoOne() {
+        return chVNoOne;
+    }
+
+    public void setChVNoOne(String chVNoOne) {
+        this.chVNoOne = chVNoOne;
+    }
+}

master/src/main/java/com/ruoyi/project/ticket/domain/THazardWorkPermit.java

@@ -1,6 +1,7 @@
 package com.ruoyi.project.ticket.domain;
 
 import java.util.Date;
+import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
@@ -17,6 +18,16 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 public class THazardWorkPermit extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
+    private List<THazardWorkPermit> children;
+
+    public List<THazardWorkPermit> getChildren() {
+        return children;
+    }
+
+    public void setChildren(List<THazardWorkPermit> children) {
+        this.children = children;
+    }
+
     /**
      * 危害工作许可证ID
      */

master/src/main/java/com/ruoyi/project/ticket/mapper/TPermitRelationMapper.java

@@ -0,0 +1,21 @@
+package com.ruoyi.project.ticket.mapper;
+
+import com.ruoyi.project.ticket.domain.PermitRelation;
+
+import java.util.List;
+
+/**
+ * 票据列表Mapper接口
+ *
+ * @author ruoyi
+ * @date 2021-10-25
+ */
+public interface TPermitRelationMapper {
+    /**
+     * 票据列表
+     *
+     * @param permitRelation 票据列表
+     * @return 票据列表集合
+     */
+    public List<PermitRelation> selectPermitRelations(PermitRelation permitRelation);
+}

master/src/main/java/com/ruoyi/project/ticket/service/ITPermitRelationService.java

@@ -0,0 +1,21 @@
+package com.ruoyi.project.ticket.service;
+
+import com.ruoyi.project.ticket.domain.PermitRelation;
+
+import java.util.List;
+
+/**
+ * 票据列表Service接口
+ *
+ * @author ruoyi
+ * @date 2021-10-25
+ */
+public interface ITPermitRelationService {
+    /**
+     * 票据列表
+     *
+     * @param permitRelation 票据列表
+     * @return 票据列表集合
+     */
+    public List<PermitRelation> selectPermitRelations(PermitRelation permitRelation);
+}

master/src/main/java/com/ruoyi/project/ticket/service/impl/TPermitRelationServiceImpl.java

@@ -0,0 +1,33 @@
+package com.ruoyi.project.ticket.service.impl;
+
+import com.ruoyi.project.ticket.domain.PermitRelation;
+import com.ruoyi.project.ticket.mapper.TPermitRelationMapper;
+import com.ruoyi.project.ticket.service.ITPermitRelationService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 票据列表Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2021-10-25
+ */
+@Service
+public class TPermitRelationServiceImpl implements ITPermitRelationService {
+
+    @Resource
+    private TPermitRelationMapper tPermitRelationMapper;
+
+    /**
+     * 查询票据列表
+     *
+     * @param permitRelation 票据列表
+     * @return 票据列表
+     */
+    @Override
+    public List<PermitRelation> selectPermitRelations(PermitRelation permitRelation) {
+        return tPermitRelationMapper.selectPermitRelations(permitRelation);
+    }
+}

master/src/main/resources/mybatis/ticket/TPermitRelationMapper.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.project.ticket.mapper.TPermitRelationMapper">
+
+    <resultMap type="PermitRelation" id="PermitRelationResult">
+        <result property="id" column="id"/>
+        <result property="aId" column="aId"/>
+        <result property="cId" column="cId"/>
+        <result property="bWorkContent" column="bWorkContent"/>
+        <result property="cbWorkContent" column="cbWorkContent"/>
+        <result property="hVNoOne" column="hVNoOne"/>
+        <result property="chVNoOne" column="chVNoOne"/>
+    </resultMap>
+
+    <sql id="selectPermitRelationVo">
+        SELECT t.id,
+               a.a_id           AS aId,
+               c.c_id           AS cId,
+               a.B_WORK_CONTENT AS bWorkContent,
+               c.B_WORK_CONTENT AS cbWorkContent,
+               a.H_V_NO_ONE     AS hVNoOne,
+               c.H_V_NO_ONE     AS chVNoOne
+        FROM T_PERMIT_RELATION t
+                 LEFT JOIN T_HAZARD_WORK_PERMIT a ON t.PERMIT_ID = a.A_ID
+            AND t.PERMIT_TYPE = 'A'
+                 LEFT JOIN T_RESTRICTED_SPACE_PERMIT c ON t.PERMIT_ID = c.C_ID
+            AND t.PERMIT_TYPE = 'C'
+    </sql>
+
+    <select id="selectPermitRelations" parameterType="PermitRelation" resultMap="PermitRelationResult">
+        <include refid="selectPermitRelationVo"/>
+    </select>
+
+</mapper>

ui/src/api/invoicing/permitRelation.js

@@ -0,0 +1,10 @@
+import request from '@/utils/request'
+
+// 查询票据列表
+export function listTicket(query) {
+  return request({
+    url: '/ticket/permitRelations/list',
+    method: 'get',
+    params: query
+  })
+}

ui/src/views/invoicing/ticketList/index.vue

@@ -1,19 +1,24 @@
 <template>
   <div class="app-container">
-    <el-table v-loading="loading" :data="ticketList" :height="clientHeight" border>
-      <el-table-column label="编号" align="center" prop="aId" :show-overflow-tooltip="true"/>
-      <el-table-column label="日期" align="center" prop="plantCode" :show-overflow-tooltip="true"/>
-      <el-table-column label="时间" align="center" prop="year" :show-overflow-tooltip="true"/>
-      <el-table-column label="班组" align="center" prop="fileName" :show-overflow-tooltip="true"/>
-      <el-table-column label="签发人" align="center" prop="filePath" :show-overflow-tooltip="true"/>
+    <el-table v-loading="loading" :data="ticketList" border row-key="hVNoOne"
+              :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
+      <!--      <el-table-column label="编号" align="center" prop="aId" :show-overflow-tooltip="true"/>-->
+      <!--      <el-table-column label="日期" align="center" prop="plantCode" :show-overflow-tooltip="true"/>
+            <el-table-column label="时间" align="center" prop="year" :show-overflow-tooltip="true"/>
+            <el-table-column label="班组" align="center" prop="fileName" :show-overflow-tooltip="true"/>
+            <el-table-column label="签发人" align="center" prop="filePath" :show-overflow-tooltip="true"/>-->
+      <el-table-column label="延期票号" align="center" prop="hVNoOne" :show-overflow-tooltip="true">
+        <template slot-scope="{row}">
+          {{ row.hVNoOne || '-' }}
+        </template>
+      </el-table-column>
       <el-table-column label="续票状态" align="center" prop="filePath" :show-overflow-tooltip="true"/>
-      <el-table-column label="延期票号" align="center" prop="filePath" :show-overflow-tooltip="true"/>
       <el-table-column label="危害工作许可证票号" align="center" prop="aId" :show-overflow-tooltip="true"/>
-      <el-table-column label="动火工作许可证票号" align="center" prop="aId" :show-overflow-tooltip="true"/>
-      <el-table-column label="动火作业等级" align="center" prop="aId" :show-overflow-tooltip="true"/>
-      <el-table-column label="限制性空间进入许可证票号" align="center" prop="aId" :show-overflow-tooltip="true"/>
+      <!--      <el-table-column label="动火工作许可证票号" align="center" prop="hId" :show-overflow-tooltip="true"/>
+            <el-table-column label="动火作业等级" align="center" prop="hId" :show-overflow-tooltip="true"/>-->
+      <el-table-column label="限制性空间进入许可证票号" align="center" prop="cId" :show-overflow-tooltip="true"/>
       <el-table-column label="工作内容" align="center" prop="bWorkContent" :show-overflow-tooltip="true"/>
-      <el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" fixed="right" width="160" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -22,25 +27,35 @@
             @click="handleUpdate(scope.row)"
           >修改
           </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+          >延期
+          </el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
-          >删除
+          >废弃
           </el-button>
         </template>
       </el-table-column>
     </el-table>
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
   </div>
 </template>
 
 <script>
 import {
-  addTicket,
   listTicket
-} from "@/api/invoicing/hazardwork"
-import {listAlarmhistory} from "@/api/system/alarmhistory";
-import {getUser} from "@/api/system/user";
+} from "@/api/invoicing/permitRelation"
 
 export default {
   data() {
@@ -71,12 +86,18 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      this.$router.push({
-        path: '/ticket/hazardwork',
-        query: {
-          aId: row.aId
-        }
-      });
+      if (row.aId != null) {
+        this.$router.push({
+          path: '/ticket/hazardwork',
+          query: {
+            aId: row.aId
+          }
+        });
+      }
+      if (row.cId != null) {
+        alert("限制性空间进入许可证暂未开发");
+      }
+
     },
   },
 }