-添加密封点详情功能

修改logo

master/src/main/java/com/ruoyi/project/base/domain/TBasePlant.java

@@ -67,6 +67,9 @@ public class TBasePlant extends BaseEntity
     @Excel(name = "维护人")
     private String updater;
 
+    @Excel(name = "公司")
+    private String company;
+
     private Long updaterCode;
 
     /** 修改时间 */
@@ -77,6 +80,14 @@ public class TBasePlant extends BaseEntity
     @TableField(exist = false)
     private Long[] plantIds;
 
+    public String getCompany() {
+        return company;
+    }
+
+    public void setCompany(String company) {
+        this.company = company;
+    }
+
     public Long[] getPlantIds() {
         return plantIds;
     }

master/src/main/java/com/ruoyi/project/task/controller/TTaskInspectionController.java

@@ -62,8 +62,6 @@ public class TTaskInspectionController extends BaseController {
             if (item.getEndTime() != null) {
                 if (item.getEndTime().before(new Date()) && StringUtils.isNotEmpty(item.getTaskNum()) && !item.getTaskNum().equals(item.getTaskDoneNum())) {
                     item.setTimeOut("是");
-                } else if (item.getEndTime().before(new Date())) {
-                    item.setTimeOut("是");
                 } else {
                     item.setTimeOut("否");
                 }

master/src/main/java/com/ruoyi/project/task/controller/TTaskRepairController.java

@@ -66,8 +66,6 @@ public class TTaskRepairController extends BaseController
             if (item.getEndTime() != null) {
                 if (item.getEndTime().before(new Date()) && StringUtils.isNotEmpty(item.getTaskNum()) && !item.getTaskNum().equals(item.getTaskDoneNum())) {
                     item.setTimeOut("是");
-                }else if (item.getEndTime().before(new Date())) {
-                    item.setTimeOut("是");
                 } else {
                     item.setTimeOut("否");
                 }

master/src/main/resources/mybatis/base/TBasePlantMapper.xml

@@ -6,6 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <resultMap type="TBasePlant" id="TBasePlantResult">
         <id property="plantId"    column="plant_id"    />
+        <result property="company"    column="company"    />
         <result property="plantCode"    column="plant_code"    />
         <result property="plantName"    column="plant_name"    />
         <result property="proAbility"    column="pro_ability"    />
@@ -23,19 +24,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTBasePlantVo">
-        select plant_id, plant_code, plant_name, pro_ability, plant_type, remarks, approve_status, approve_time, dept_id, del_flag, creater_code, createdate, updater_code, updatedate from t_base_plant
+        select company,plant_id, plant_code, plant_name, pro_ability, plant_type, remarks, approve_status, approve_time, dept_id, del_flag, creater_code, createdate, updater_code, updatedate from t_base_plant
     </sql>
 
     <select id="selectAllPlantName" resultMap="TBasePlantResult">
-        select d.plant_id,d.plant_name,d.plant_type from t_base_plant d where del_flag=0 and approve_status=2
+        select d.company,d.plant_id,d.plant_name,d.plant_type from t_base_plant d where del_flag=0 and approve_status=2
     </select>
 
     <select id="selectTBasePlantList" parameterType="TBasePlant" resultMap="TBasePlantResult">
-        select d.plant_id, d.plant_code, d.plant_name, d.pro_ability, d.plant_type, d.remarks, d.approve_status, d.approve_time, d.dept_id, d.del_flag, d.creater_code, d.createdate, su.user_name updater, d.updatedate from t_base_plant d
+        select d.company,d.plant_id, d.plant_code, d.plant_name, d.pro_ability, d.plant_type, d.remarks, d.approve_status, d.approve_time, d.dept_id, d.del_flag, d.creater_code, d.createdate, su.user_name updater, d.updatedate from t_base_plant d
         left join sys_user su on su.user_id = d.updater_code
         <where>
+            <if test="plantCode != null  and plantCode != ''"> and plant_code = #{plantCode}</if>
             <if test="plantCode != null  and plantCode != ''"> and plant_code = #{plantCode}</if>
             <if test="plantName != null  and plantName != ''"> and plant_name like concat('%', #{plantName}, '%')</if>
+            <if test="company != null  and company != ''"> and company like concat('%', #{company}, '%')</if>
             <if test="proAbility != null  and proAbility != ''"> and pro_ability = #{proAbility}</if>
             <if test="plantType != null  and plantType != ''"> and plant_type = #{plantType}</if>
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
@@ -63,6 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertTBasePlant" parameterType="TBasePlant" useGeneratedKeys="true" keyProperty="plantId">
         insert into t_base_plant
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="company != null">company,</if>
             <if test="plantCode != null">plant_code,</if>
             <if test="plantName != null">plant_name,</if>
             <if test="proAbility != null">pro_ability,</if>
@@ -78,6 +82,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">updatedate,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="company != null">#{company},</if>
             <if test="plantCode != null">#{plantCode},</if>
             <if test="plantName != null">#{plantName},</if>
             <if test="proAbility != null">#{proAbility},</if>
@@ -97,6 +102,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateTBasePlant" parameterType="TBasePlant">
         update t_base_plant
         <trim prefix="SET" suffixOverrides=",">
+            <if test="company != null">company = #{company},</if>
             <if test="plantCode != null">plant_code = #{plantCode},</if>
             <if test="plantName != null">plant_name = #{plantName},</if>
             <if test="proAbility != null">pro_ability = #{proAbility},</if>

master/src/main/resources/mybatis/check/TCheckCheckpointsMapper.xml

@@ -1,85 +1,121 @@
 <?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">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.project.check.mapper.TCheckCheckpointsMapper">
 
     <resultMap type="TCheckCheckpoints" id="TCheckCheckpointsResult">
-        <result property="checkId"    column="check_id"    />
-        <result property="pointId"    column="point_id"    />
-        <result property="inspectionId"    column="inspection_id"    />
-        <result property="instrumentId"    column="instrument_id"    />
-        <result property="testValue"    column="test_value"    />
-        <result property="netTestValue"    column="net_test_value"    />
-        <result property="plantId"    column="plant_id"    />
-        <result property="plantName"    column="plant_name"    />
-        <result property="regionId"    column="region_id"    />
-        <result property="regionName"    column="region_name"    />
-        <result property="layer"    column="layer"    />
-        <result property="devId"    column="dev_id"    />
-        <result property="devName"    column="dev_name"    />
-        <result property="devCode"    column="dev_code"    />
-        <result property="groupCode"    column="group_code"    />
-        <result property="extendCode"    column="extend_code"    />
-        <result property="pointType"    column="point_type"    />
-        <result property="instrumentCode"    column="instrument_code"    />
-        <result property="leakagePosition"    column="leakage_position"    />
-        <result property="checker"    column="checker"    />
-        <result property="checkDate"    column="check_date"    />
-        <result property="leakageDegree"    column="leakage_degree"    />
-        <result property="remarks"    column="remarks"    />
-        <result property="approveStatus"    column="approve_status"    />
-        <result property="approveTime"    column="approve_time"    />
-        <result property="deptId"    column="dept_id"    />
-        <result property="delFlag"    column="del_flag"    />
-        <result property="createrCode"    column="creater_code"    />
-        <result property="createdate"    column="createdate"    />
-        <result property="updaterCode"    column="updater_code"    />
-        <result property="updatedate"    column="updatedate"    />
-        <result property="repairId"    column="repair_id"    />
+        <result property="checkId" column="check_id"/>
+        <result property="pointId" column="point_id"/>
+        <result property="inspectionId" column="inspection_id"/>
+        <result property="instrumentId" column="instrument_id"/>
+        <result property="testValue" column="test_value"/>
+        <result property="netTestValue" column="net_test_value"/>
+        <result property="plantId" column="plant_id"/>
+        <result property="plantName" column="plant_name"/>
+        <result property="regionId" column="region_id"/>
+        <result property="regionName" column="region_name"/>
+        <result property="layer" column="layer"/>
+        <result property="devId" column="dev_id"/>
+        <result property="devName" column="dev_name"/>
+        <result property="devCode" column="dev_code"/>
+        <result property="groupCode" column="group_code"/>
+        <result property="extendCode" column="extend_code"/>
+        <result property="pointType" column="point_type"/>
+        <result property="instrumentCode" column="instrument_code"/>
+        <result property="leakagePosition" column="leakage_position"/>
+        <result property="checker" column="checker"/>
+        <result property="checkDate" column="check_date"/>
+        <result property="leakageDegree" column="leakage_degree"/>
+        <result property="remarks" column="remarks"/>
+        <result property="approveStatus" column="approve_status"/>
+        <result property="approveTime" column="approve_time"/>
+        <result property="deptId" column="dept_id"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="createrCode" column="creater_code"/>
+        <result property="createdate" column="createdate"/>
+        <result property="updaterCode" column="updater_code"/>
+        <result property="updatedate" column="updatedate"/>
+        <result property="repairId" column="repair_id"/>
     </resultMap>
 
     <sql id="selectTCheckCheckpointsVo">
-        select check_id, point_id, instrument_id, inspection_id, test_value, net_test_value, plant_id,plant_name, region_id,region_name, layer, dev_id,dev_name, dev_code, group_code, extend_code, point_type, instrument_code, leakage_position, checker, check_date, leakage_degree, remarks, approve_status, approve_time, dept_id, del_flag, creater_code, createdate, updater_code, updatedate from t_check_checkpoints
+        select check_id,
+               point_id,
+               instrument_id,
+               inspection_id,
+               test_value,
+               net_test_value,
+               plant_id,
+               plant_name,
+               region_id,
+               region_name,
+               layer,
+               dev_id,
+               dev_name,
+               dev_code,
+               group_code,
+               extend_code,
+               point_type,
+               instrument_code,
+               leakage_position,
+               checker,
+               check_date,
+               leakage_degree,
+               remarks,
+               approve_status,
+               approve_time,
+               dept_id,
+               del_flag,
+               creater_code,
+               createdate,
+               updater_code,
+               updatedate
+        from t_check_checkpoints
     </sql>
 
     <select id="selectTCheckCheckpointsList" parameterType="TCheckCheckpoints" resultMap="TCheckCheckpointsResult">
-        select d.medium_type,d.plant_type,d.check_id,d.point_id, d.instrument_id, d.inspection_id, d.test_value, d.net_test_value, d.plant_id,d.plant_name,
+        select d.medium_type,d.plant_type,d.check_id,d.point_id, d.instrument_id, d.inspection_id, d.test_value,
+        d.net_test_value, d.plant_id,d.plant_name,
         d.region_id, d.layer, d.dev_id, d.group_code, d.extend_code, d.point_type, d.instrument_code,
-        leakage_position, d.checker, d.check_date, d.leakage_degree, d.remarks, d.approve_status, d.approve_time, d.dept_id, d.del_flag,
-        d.creater_code, d.createdate, d.updater_code, d.updatedate,br.region_name,bd.dev_code,bd.dev_describe as dev_name from t_check_checkpoints d
+        leakage_position, d.checker, d.check_date, d.leakage_degree, d.remarks, d.approve_status, d.approve_time,
+        d.dept_id, d.del_flag,
+        d.creater_code, d.createdate, d.updater_code, d.updatedate,br.region_name,bd.dev_code,bd.dev_describe as
+        dev_name from t_check_checkpoints d
         left join t_base_region br on d.region_id = br.region_id
         left join t_base_device bd on d.dev_id = bd.dev_id
         <where>
-            <if test="pointId != null "> and d.point_id = #{pointId}</if>
-            <if test="instrumentId != null "> and d.instrument_id = #{instrumentId}</if>
-            <if test="inspectionId != null "> and d.inspection_id = #{inspectionId}</if>
-            <if test="testValue != null  and testValue != ''"> and d.test_value = #{testValue}</if>
-            <if test="netTestValue != null  and netTestValue != ''"> and d.net_test_value = #{netTestValue}</if>
-            <if test="plantId != null  and plantId != ''"> and d.plant_id = #{plantId}</if>
-            <if test="plantName != null  and plantName != ''"> and d.plant_name like concat('%', #{plantName}, '%')</if>
-            <if test="regionId != null  and regionId != ''"> and d.region_id= #{regionId}</if>
-            <if test="regionName != null  and regionName != ''"> and d.region_name like concat('%', #{regionName}, '%')</if>
-            <if test="layer != null  and layer != ''"> and d.layer = #{layer}</if>
-            <if test="devId != null  and devId != ''"> and d.dev_id =  #{devId}</if>
-            <if test="devName != null  and devName != ''"> and d.dev_name like concat('%', #{devName}, '%')</if>
-            <if test="devCode != null  and devCode != ''"> and d.dev_code = #{devCode}</if>
-            <if test="groupCode != null  and groupCode != ''"> and d.group_code = #{groupCode}</if>
-            <if test="extendCode != null  and extendCode != ''"> and d.extend_code = #{extendCode}</if>
-            <if test="pointType != null  and pointType != ''"> and d.point_type = #{pointType}</if>
-            <if test="instrumentCode != null  and instrumentCode != ''"> and d.instrument_code = #{instrumentCode}</if>
-            <if test="leakagePosition != null  and leakagePosition != ''"> and d.leakage_position = #{leakagePosition}</if>
-            <if test="checker != null  and checker != ''"> and d.checker = #{checker}</if>
-            <if test="checkDate != null "> and d.check_date = #{checkDate}</if>
-            <if test="leakageDegree != null  and leakageDegree != ''"> and d.leakage_degree = #{leakageDegree}</if>
-            <if test="remarks != null  and remarks != ''"> and d.remarks = #{remarks}</if>
-            <if test="approveStatus != null "> and d.approve_status = #{approveStatus}</if>
-            <if test="approveTime != null "> and d.approve_time = #{approveTime}</if>
-            <if test="deptId != null "> and d.dept_id = #{deptId}</if>
-            <if test="choose != null "> and d.inspection_id is null</if>
-            <if test="repairId == null "> and d.repair_id is null</if>
-            <if test="repairId != null "> and d.repair_id is not null</if>
-        and d.del_flag = 0
+            <if test="pointId != null ">and d.point_id = #{pointId}</if>
+            <if test="instrumentId != null ">and d.instrument_id = #{instrumentId}</if>
+            <if test="inspectionId != null ">and d.inspection_id = #{inspectionId}</if>
+            <if test="testValue != null  and testValue != ''">and d.test_value = #{testValue}</if>
+            <if test="netTestValue != null  and netTestValue != ''">and d.net_test_value = #{netTestValue}</if>
+            <if test="plantId != null  and plantId != ''">and d.plant_id = #{plantId}</if>
+            <if test="plantName != null  and plantName != ''">and d.plant_name like concat('%', #{plantName}, '%')</if>
+            <if test="regionId != null  and regionId != ''">and d.region_id= #{regionId}</if>
+            <if test="regionName != null  and regionName != ''">and d.region_name like concat('%', #{regionName}, '%')
+            </if>
+            <if test="layer != null  and layer != ''">and d.layer = #{layer}</if>
+            <if test="devId != null  and devId != ''">and d.dev_id = #{devId}</if>
+            <if test="devName != null  and devName != ''">and d.dev_name like concat('%', #{devName}, '%')</if>
+            <if test="devCode != null  and devCode != ''">and d.dev_code = #{devCode}</if>
+            <if test="groupCode != null  and groupCode != ''">and d.group_code = #{groupCode}</if>
+            <if test="extendCode != null  and extendCode != ''">and d.extend_code = #{extendCode}</if>
+            <if test="pointType != null  and pointType != ''">and d.point_type = #{pointType}</if>
+            <if test="instrumentCode != null  and instrumentCode != ''">and d.instrument_code = #{instrumentCode}</if>
+            <if test="leakagePosition != null  and leakagePosition != ''">and d.leakage_position = #{leakagePosition}
+            </if>
+            <if test="checker != null  and checker != ''">and d.checker = #{checker}</if>
+            <if test="checkDate != null ">and d.check_date = #{checkDate}</if>
+            <if test="leakageDegree != null  and leakageDegree != ''">and d.leakage_degree = #{leakageDegree}</if>
+            <if test="remarks != null  and remarks != ''">and d.remarks = #{remarks}</if>
+            <if test="approveStatus != null ">and d.approve_status = #{approveStatus}</if>
+            <if test="approveTime != null ">and d.approve_time = #{approveTime}</if>
+            <if test="deptId != null ">and d.dept_id = #{deptId}</if>
+            <if test="choose != null ">and d.inspection_id is null</if>
+            <if test="repairId == null and repairId !=1">and d.repair_id is null</if>
+            <if test="repairId != null and repairId !=1">and d.repair_id is not null</if>
+            and d.del_flag = 0
         </where>
     </select>
 
@@ -87,81 +123,90 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectTCheckCheckpointByEntity" parameterType="TCheckCheckpoints" resultMap="TCheckCheckpointsResult">
         select d.* from t_check_checkpoints d
         <where>
-            <if test="pointId != null "> and d.point_id = #{pointId}</if>
-            <if test="instrumentId != null "> and d.instrument_id = #{instrumentId}</if>
-            <if test="inspectionId != null "> and d.inspection_id = #{inspectionId}</if>
-            <if test="testValue != null  and testValue != ''"> and d.test_value = #{testValue}</if>
-            <if test="netTestValue != null  and netTestValue != ''"> and d.net_test_value = #{netTestValue}</if>
-            <if test="plantId != null  and plantId != ''"> and d.plant_id = #{plantId}</if>
-            <if test="plantName != null  and plantName != ''"> and d.plant_name like concat('%', #{plantName}, '%')</if>
-            <if test="regionId != null  and regionId != ''"> and d.region_id= #{regionId}</if>
-            <if test="regionName != null  and regionName != ''"> and d.region_name like concat('%', #{regionName}, '%')</if>
-            <if test="layer != null  and layer != ''"> and d.layer = #{layer}</if>
-            <if test="devId != null  and devId != ''"> and d.dev_id =  #{devId}</if>
-            <if test="devName != null  and devName != ''"> and d.dev_name like concat('%', #{devName}, '%')</if>
-            <if test="devCode != null  and devCode != ''"> and d.dev_code = #{devCode}</if>
-            <if test="groupCode != null  and groupCode != ''"> and d.group_code = #{groupCode}</if>
-            <if test="extendCode != null  and extendCode != ''"> and d.extend_code = #{extendCode}</if>
-            <if test="pointType != null  and pointType != ''"> and d.point_type = #{pointType}</if>
-            <if test="instrumentCode != null  and instrumentCode != ''"> and d.instrument_code = #{instrumentCode}</if>
-            <if test="leakagePosition != null  and leakagePosition != ''"> and d.leakage_position = #{leakagePosition}</if>
-            <if test="checker != null  and checker != ''"> and d.checker = #{checker}</if>
-            <if test="checkDate != null "> and d.check_date = #{checkDate}</if>
-            <if test="leakageDegree != null  and leakageDegree != ''"> and d.leakage_degree = #{leakageDegree}</if>
-            <if test="remarks != null  and remarks != ''"> and d.remarks = #{remarks}</if>
-            <if test="approveStatus != null "> and d.approve_status = #{approveStatus}</if>
-            <if test="approveTime != null "> and d.approve_time = #{approveTime}</if>
-            <if test="deptId != null "> and d.dept_id = #{deptId}</if>
-            <if test="choose != null "> and d.inspection_id is null</if>
-        and d.del_flag = 0
+            <if test="pointId != null ">and d.point_id = #{pointId}</if>
+            <if test="instrumentId != null ">and d.instrument_id = #{instrumentId}</if>
+            <if test="inspectionId != null ">and d.inspection_id = #{inspectionId}</if>
+            <if test="testValue != null  and testValue != ''">and d.test_value = #{testValue}</if>
+            <if test="netTestValue != null  and netTestValue != ''">and d.net_test_value = #{netTestValue}</if>
+            <if test="plantId != null  and plantId != ''">and d.plant_id = #{plantId}</if>
+            <if test="plantName != null  and plantName != ''">and d.plant_name like concat('%', #{plantName}, '%')</if>
+            <if test="regionId != null  and regionId != ''">and d.region_id= #{regionId}</if>
+            <if test="regionName != null  and regionName != ''">and d.region_name like concat('%', #{regionName}, '%')
+            </if>
+            <if test="layer != null  and layer != ''">and d.layer = #{layer}</if>
+            <if test="devId != null  and devId != ''">and d.dev_id = #{devId}</if>
+            <if test="devName != null  and devName != ''">and d.dev_name like concat('%', #{devName}, '%')</if>
+            <if test="devCode != null  and devCode != ''">and d.dev_code = #{devCode}</if>
+            <if test="groupCode != null  and groupCode != ''">and d.group_code = #{groupCode}</if>
+            <if test="extendCode != null  and extendCode != ''">and d.extend_code = #{extendCode}</if>
+            <if test="pointType != null  and pointType != ''">and d.point_type = #{pointType}</if>
+            <if test="instrumentCode != null  and instrumentCode != ''">and d.instrument_code = #{instrumentCode}</if>
+            <if test="leakagePosition != null  and leakagePosition != ''">and d.leakage_position = #{leakagePosition}
+            </if>
+            <if test="checker != null  and checker != ''">and d.checker = #{checker}</if>
+            <if test="checkDate != null ">and d.check_date = #{checkDate}</if>
+            <if test="leakageDegree != null  and leakageDegree != ''">and d.leakage_degree = #{leakageDegree}</if>
+            <if test="remarks != null  and remarks != ''">and d.remarks = #{remarks}</if>
+            <if test="approveStatus != null ">and d.approve_status = #{approveStatus}</if>
+            <if test="approveTime != null ">and d.approve_time = #{approveTime}</if>
+            <if test="deptId != null ">and d.dept_id = #{deptId}</if>
+            <if test="choose != null ">and d.inspection_id is null</if>
+            and d.del_flag = 0
         </where>
     </select>
 
     <select id="selectPointsByIds" parameterType="String" resultMap="TCheckCheckpointsResult">
-        select d.medium_type,d.plant_type,d.check_id,d.point_id, d.instrument_id, d.inspection_id, d.test_value, d.net_test_value, d.plant_id,d.plant_name,
+        select d.medium_type,d.plant_type,d.check_id,d.point_id, d.instrument_id, d.inspection_id, d.test_value,
+        d.net_test_value, d.plant_id,d.plant_name,
         d.region_id, d.layer, d.dev_id, d.group_code, d.extend_code, d.point_type, d.instrument_code,
-        leakage_position, d.checker, d.check_date, d.leakage_degree, d.remarks, d.approve_status, d.approve_time, d.dept_id, d.del_flag,
-        d.creater_code, d.createdate, d.updater_code, d.updatedate,br.region_name,bd.dev_code,bd.dev_describe as dev_name from t_check_checkpoints d
+        leakage_position, d.checker, d.check_date, d.leakage_degree, d.remarks, d.approve_status, d.approve_time,
+        d.dept_id, d.del_flag,
+        d.creater_code, d.createdate, d.updater_code, d.updatedate,br.region_name,bd.dev_code,bd.dev_describe as
+        dev_name from t_check_checkpoints d
         left join t_base_region br on d.region_id = br.region_id
         left join t_base_device bd on d.dev_id = bd.dev_id where d.check_id in
         <foreach item="checkId" collection="array" open="(" separator="," close=")">
             #{checkId}
         </foreach>
+        and d.approve_status=2
     </select>
 
-    <select id="selectPointsByPlantNameGroupCodeAndExtendCode" parameterType="TCheckCheckpoints" resultMap="TCheckCheckpointsResult">
+    <select id="selectPointsByPlantNameGroupCodeAndExtendCode" parameterType="TCheckCheckpoints"
+            resultMap="TCheckCheckpointsResult">
         select *from t_check_checkpoints d
         <where>
-            <if test="instrumentId != null "> and d.instrument_id = #{instrumentId}</if>
-            <if test="inspectionId != null "> and d.inspection_id = #{inspectionId}</if>
-            <if test="testValue != null  and testValue != ''"> and d.test_value = #{testValue}</if>
-            <if test="netTestValue != null  and netTestValue != ''"> and d.net_test_value = #{netTestValue}</if>
-            <if test="plantId != null  and plantId != ''"> and d.plant_id = #{plantId}</if>
-            <if test="plantName != null  and plantName != ''"> and d.plant_name like concat('%', #{plantName}, '%')</if>
-            <if test="regionId != null  and regionId != ''"> and d.region_id= #{regionId}</if>
-            <if test="regionName != null  and regionName != ''"> and d.region_name like concat('%', #{regionName}, '%')</if>
-            <if test="layer != null  and layer != ''"> and d.layer = #{layer}</if>
-            <if test="devId != null  and devId != ''"> and d.dev_id =  #{devId}</if>
-            <if test="devName != null  and devName != ''"> and d.dev_name like concat('%', #{devName}, '%')</if>
-            <if test="devCode != null  and devCode != ''"> and d.dev_code = #{devCode}</if>
-            <if test="groupCode != null  and groupCode != ''"> and d.group_code = #{groupCode}</if>
-            <if test="extendCode != null  and extendCode != ''"> and d.extend_code = #{extendCode}</if>
-            <if test="pointType != null  and pointType != ''"> and d.point_type = #{pointType}</if>
-            <if test="instrumentCode != null  and instrumentCode != ''"> and d.instrument_code = #{instrumentCode}</if>
-            <if test="leakagePosition != null  and leakagePosition != ''"> and d.leakage_position = #{leakagePosition}</if>
-            <if test="checker != null  and checker != ''"> and d.checker = #{checker}</if>
-            <if test="checkDate != null  and checkDate != ''"> and d.check_date = #{checkDate}</if>
-            <if test="leakageDegree != null  and leakageDegree != ''"> and d.leakage_degree = #{leakageDegree}</if>
-            <if test="remarks != null  and remarks != ''"> and d.remarks = #{remarks}</if>
-            <if test="approveStatus != null "> and d.approve_status = #{approveStatus}</if>
-            <if test="approveTime != null "> and d.approve_time = #{approveTime}</if>
-            <if test="deptId != null "> and d.dept_id = #{deptId}</if>
-            <if test="createrCode != null "> and d.creater_code = #{createrCode}</if>
-            <if test="createdate != null "> and d.createdate = #{createdate}</if>
-            <if test="updaterCode != null "> and d.updater_code = #{updaterCode}</if>
-            <if test="updatedate != null "> and d.updatedate = #{updatedate}</if>
-            <if test="choose != null "> and d.inspection_id is null</if>
-        and d.del_flag = 0
+            <if test="instrumentId != null ">and d.instrument_id = #{instrumentId}</if>
+            <if test="inspectionId != null ">and d.inspection_id = #{inspectionId}</if>
+            <if test="testValue != null  and testValue != ''">and d.test_value = #{testValue}</if>
+            <if test="netTestValue != null  and netTestValue != ''">and d.net_test_value = #{netTestValue}</if>
+            <if test="plantId != null  and plantId != ''">and d.plant_id = #{plantId}</if>
+            <if test="plantName != null  and plantName != ''">and d.plant_name like concat('%', #{plantName}, '%')</if>
+            <if test="regionId != null  and regionId != ''">and d.region_id= #{regionId}</if>
+            <if test="regionName != null  and regionName != ''">and d.region_name like concat('%', #{regionName}, '%')
+            </if>
+            <if test="layer != null  and layer != ''">and d.layer = #{layer}</if>
+            <if test="devId != null  and devId != ''">and d.dev_id = #{devId}</if>
+            <if test="devName != null  and devName != ''">and d.dev_name like concat('%', #{devName}, '%')</if>
+            <if test="devCode != null  and devCode != ''">and d.dev_code = #{devCode}</if>
+            <if test="groupCode != null  and groupCode != ''">and d.group_code = #{groupCode}</if>
+            <if test="extendCode != null  and extendCode != ''">and d.extend_code = #{extendCode}</if>
+            <if test="pointType != null  and pointType != ''">and d.point_type = #{pointType}</if>
+            <if test="instrumentCode != null  and instrumentCode != ''">and d.instrument_code = #{instrumentCode}</if>
+            <if test="leakagePosition != null  and leakagePosition != ''">and d.leakage_position = #{leakagePosition}
+            </if>
+            <if test="checker != null  and checker != ''">and d.checker = #{checker}</if>
+            <if test="checkDate != null  and checkDate != ''">and d.check_date = #{checkDate}</if>
+            <if test="leakageDegree != null  and leakageDegree != ''">and d.leakage_degree = #{leakageDegree}</if>
+            <if test="remarks != null  and remarks != ''">and d.remarks = #{remarks}</if>
+            <if test="approveStatus != null ">and d.approve_status = #{approveStatus}</if>
+            <if test="approveTime != null ">and d.approve_time = #{approveTime}</if>
+            <if test="deptId != null ">and d.dept_id = #{deptId}</if>
+            <if test="createrCode != null ">and d.creater_code = #{createrCode}</if>
+            <if test="createdate != null ">and d.createdate = #{createdate}</if>
+            <if test="updaterCode != null ">and d.updater_code = #{updaterCode}</if>
+            <if test="updatedate != null ">and d.updatedate = #{updatedate}</if>
+            <if test="choose != null ">and d.inspection_id is null</if>
+            and d.del_flag = 0
         </where>
     </select>
 
@@ -170,7 +215,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where check_id = #{checkId}
     </select>
 
-    <insert id="insertTCheckCheckpoints" parameterType="TCheckCheckpoints" useGeneratedKeys="true" keyProperty="checkId">
+    <insert id="insertTCheckCheckpoints" parameterType="TCheckCheckpoints" useGeneratedKeys="true"
+            keyProperty="checkId">
         insert into t_check_checkpoints
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="pointId != null">point_id,</if>
@@ -204,7 +250,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null">updater_code,</if>
             <if test="updatedate != null">updatedate,</if>
             <if test="plantType != null">plant_type,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="pointId != null">#{pointId},</if>
             <if test="instrumentId != null">#{instrumentId},</if>
@@ -237,10 +283,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterCode != null">#{updaterCode},</if>
             <if test="updatedate != null">#{updatedate},</if>
             <if test="plantType != null">#{plantType},</if>
-         </trim>
+        </trim>
     </insert>
 
-    <insert id="insertTCheckCheckpointsByList" parameterType="TCheckCheckpoints" useGeneratedKeys="true" keyProperty="checkId">
+    <insert id="insertTCheckCheckpointsByList" parameterType="TCheckCheckpoints" useGeneratedKeys="true"
+            keyProperty="checkId">
         insert into t_check_checkpoints
         <trim prefix="(" suffix=")" suffixOverrides=",">
             point_id,
@@ -334,7 +381,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
         </trim>
-        where plant_name=#{plantName} and group_code=#{groupCode} and extend_code=#{extendCode} and inspection_id=#{inspectionId} and (approve_status is null or approve_status=0)
+        where plant_name=#{plantName} and group_code=#{groupCode} and extend_code=#{extendCode} and
+        inspection_id=#{inspectionId} and (approve_status is null or approve_status=0)
     </update>
 
     <update id="updateApproveStatusByIds" parameterType="TCheckCheckpoints">
@@ -358,9 +406,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
 
-
     <delete id="deleteTCheckCheckpointsByCheckId" parameterType="Long">
-        update t_check_checkpoints set del_flag=1 where check_id = #{checkId}
+        update t_check_checkpoints
+        set del_flag=1
+        where check_id = #{checkId}
     </delete>
 
     <delete id="deleteTCheckCheckpointsByCheckIds" parameterType="String">
@@ -390,7 +439,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 <if test="plantId != null  and plantId != ''">and d.plant_id = #{plantId}</if>
                 <if test="regionId != null  and regionId != ''">and d.region_id= #{regionId}</if>
                 <if test="devId != null  and devId != ''">and d.dev_id = #{devId}</if>
-               and d.inspection_id is null
+                and d.inspection_id is null
+                <if test="repairId == null">and repair_id is null</if>
+                <if test="repairId != null">and repair_id is not null</if>
             </where>
             ) t)
         </if>

master/src/main/resources/mybatis/check/TCheckRepairpointsMapper.xml

@@ -102,6 +102,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <foreach item="checkId" collection="array" open="(" separator="," close=")">
             #{checkId}
         </foreach>
+        and approve_status=2
     </select>
 
     <insert id="insertTCheckRepairpoints" parameterType="TCheckRepairpoints" useGeneratedKeys="true" keyProperty="checkId">

ui/src/layout/components/Sidebar/Logo.vue

@@ -14,7 +14,7 @@
 </template>
 
 <script>
-import logoImg from '@/assets/logo/logo1.png'
+import logoImg from '@/assets/logo/logo2.png'
 import variables from '@/assets/styles/variables.scss'
 
 export default {
@@ -36,7 +36,7 @@ export default {
   data() {
     return {
       title: 'LDAR综合管理系统',
-      //logo: logoImg
+      logo: logoImg
     }
   }
 }

ui/src/views/base/plant/index.vue

@@ -119,6 +119,7 @@
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="审核状态"  align="center" prop="approveStatus"
                        :formatter="approveStatusFormat"/>
+      <el-table-column label="归属机构" align="center" prop="company"/>
       <el-table-column label="编号" align="center" prop="plantCode"/>
       <el-table-column label="名称" align="center" prop="plantName"/>
       <el-table-column label="加工/生产能力(t/a)" align="center" prop="proAbility"/>
@@ -163,6 +164,9 @@
     <!-- 添加或修改装置对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-form-item label="归属机构" prop="company">
+          <el-input v-model="form.company" placeholder="请输入归属机构"/>
+        </el-form-item>
         <el-form-item label="编号" prop="plantCode">
           <el-input v-model="form.plantCode" placeholder="请输入编号"/>
         </el-form-item>
@@ -245,6 +249,9 @@ export default {
       form: {},
       // 表单校验
       rules: {
+        company: [
+          {required: true, message: this.$t('装置名称') + this.$t('不能为空'), trigger: "blur"}
+        ],
         plantName: [
           {required: true, message: this.$t('装置名称') + this.$t('不能为空'), trigger: "blur"}
         ],
@@ -321,6 +328,7 @@ export default {
     reset() {
       this.form = {
         plantId: null,
+        company: null,
         plantCode: null,
         plantName: null,
         proAbility: null,

ui/src/views/base/point/index.vue

@@ -257,7 +257,7 @@
         </template>
       </el-table-column>
       <el-table-column label="描述" align="center" prop="remarks" width="180" :show-overflow-tooltip="true"/>
-      <el-table-column label="操作" align="center" width="140px" fixed="right" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" width="160px" fixed="right" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -275,6 +275,13 @@
             v-hasPermi="['base:point:remove']"
           >删除
           </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-tickets"
+            @click="openDetail(scope.row)"
+          >详情
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -544,6 +551,7 @@
         <el-button @click="upload.open = false">{{ $t('取 消') }}</el-button>
       </div>
     </el-dialog>
+    <point-detail v-if="detailVisible" ref="pointDetail"></point-detail>
   </div>
 </template>
 
@@ -554,11 +562,14 @@ import {getAllRegion} from "@/api/base/region";
 import {getAllDeviceByRegionId} from "@/api/base/device";
 import {MessageBox} from "element-ui";
 import {getToken} from "@/utils/auth";
+import PointDetail from "@/views/base/point/pointDetail";
 
 export default {
   name: "Point",
+  components: {PointDetail},
   data() {
     return {
+      detailVisible:false,
       fullscreenLoading: false,
       // 用户导入参数
       upload: {
@@ -708,6 +719,14 @@ export default {
     })
   },
   methods: {
+    openDetail(row){
+      this.detailVisible=true;
+      row.mediumTypeOptions=this.mediumTypeOptions;
+      row.plantOperation=this.plantOperation;
+      this.$nextTick(() => {
+        this.$refs.pointDetail.init(row);
+      })
+    },
     // 提交上传文件
     submitFileForm() {
       this.$refs.upload.submit();

ui/src/views/base/point/pointDetail.vue

@@ -0,0 +1,292 @@
+<template>
+  <div>
+    <el-dialog title="密封点详情" :visible.sync="open" width="1600px" append-to-body>
+      <el-descriptions :column="3" border size="medium" style="margin-bottom: 20px">
+        <el-descriptions-item labelStyle="width: 12%" contentStyle="width: 21%">
+          <template slot="label">
+            装置
+          </template>
+          <div v-for="item in plantOperation" :key="item.plantId">
+            <div v-if="item.plantId==form.plantId">
+              {{ item.plantName }}
+            </div>
+          </div>
+        </el-descriptions-item>
+        <el-descriptions-item labelStyle="width: 12%" contentStyle="width: 21%">
+          <template slot="label">
+            区域
+          </template>
+          <div v-for="item in regionOperation" :key="item.regionId">
+            <div v-if="item.regionId==form.regionId">
+              {{ item.regionName }}
+            </div>
+          </div>
+        </el-descriptions-item>
+        <el-descriptions-item labelStyle="width: 12%" contentStyle="width: 21%">
+          <template slot="label">
+            设备
+          </template>
+          <div v-for="item in deviceOperation" :key="item.devId">
+            <div v-if="item.devId==form.devId">
+              {{ item.devDescribe }}
+            </div>
+          </div>
+        </el-descriptions-item>
+        <el-descriptions-item labelStyle="width: 12%" contentStyle="width: 21%">
+          <template slot="label">
+            介质状态
+          </template>
+          <div v-for="item in mediumTypeOptions" :key="item.dictValue">
+            <div v-if="item.dictValue==form.mediumType">
+              {{ item.dictLabel }}
+            </div>
+          </div>
+        </el-descriptions-item>
+        <el-descriptions-item labelStyle="width: 12%" contentStyle="width: 21%">
+          <template slot="label">
+            密封点类型
+          </template>
+          {{ this.form.pointType }}
+        </el-descriptions-item>
+        <el-descriptions-item labelStyle="width: 12%" contentStyle="width: 21%">
+          <template slot="label">
+            介质
+          </template>
+          {{ this.form.medium }}
+        </el-descriptions-item>
+        <el-descriptions-item labelStyle="width: 12%" contentStyle="width: 21%">
+          <template slot="label">
+            群组位置
+          </template>
+          {{ this.form.groupPosition }}
+        </el-descriptions-item>
+        <el-descriptions-item labelStyle="width: 12%" contentStyle="width: 21%">
+          <template slot="label">
+            群组编码
+          </template>
+          {{ this.form.groupCode }}
+        </el-descriptions-item>
+        <el-descriptions-item labelStyle="width: 12%" contentStyle="width: 21%">
+          <template slot="label">
+            扩展编码
+          </template>
+          {{ this.form.extendCode }}
+        </el-descriptions-item>
+      </el-descriptions>
+      <div>
+        <el-table :data="pointList" border :cell-style="tableCellStyle" height="450">
+          <el-table-column label="密封点检测记录" align="center">
+            <el-table-column label="检测值(ppm)" align="center" prop="testValue" :show-overflow-tooltip="true"/>
+            <el-table-column label="净检测值(ppm)" align="center" prop="netTestValue" :show-overflow-tooltip="true"/>
+            <el-table-column label="泄漏程度" align="center" prop="leakageDegree" :formatter="leakageFormat"
+                             :show-overflow-tooltip="true"/>
+            <el-table-column label="检测人员" align="center" prop="checker"
+                             :show-overflow-tooltip="true"/>
+            <el-table-column label="检测日期" align="center" prop="checkDate">
+              <template slot-scope="scope">
+                <span>{{ parseTime(scope.row.checkDate, '{y}-{m}-{d}') }}</span>
+              </template>
+            </el-table-column>
+          </el-table-column>
+        </el-table>
+        <pagination
+          v-show="total>0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="cancel">返 回</el-button>
+      </div>
+
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {getPoint} from "@/api/base/point";
+import {getAllRegion} from "@/api/base/region";
+import {getAllDeviceByRegionId} from "@/api/base/device";
+import {listCheckpoints} from "@/api/check/checkpoints";
+
+export default {
+  name: "pointDetail",
+  data() {
+    return {
+      total: 0,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        pointId: null,
+        inspectionId: null,
+        testValue: null,
+        netTestValue: null,
+        plantId: null,
+        plantName: null,
+        regionId: null,
+        regionName: null,
+        layer: null,
+        devId: null,
+        devName: null,
+        devCode: null,
+        groupCode: null,
+        extendCode: null,
+        pointType: null,
+        inspectionCode: null,
+        leakagePosition: null,
+        checker: null,
+        checkId: null,
+        checkDate: null,
+        leakageDegree: null,
+        remarks: null,
+        approveStatus: null,
+        approveTime: null,
+        deptId: null,
+        createrCode: null,
+        createdate: null,
+        updaterCode: null,
+        updatedate: null,
+        choose: null,
+      },
+      // 是否显示弹出层
+      open: false,
+      pointList: [],
+      plantOperation: [],
+      regionOperation: [],
+      deviceOperation: [],
+      yesOrNoOperation: [],
+      pointOptions: [],
+      mediumTypeOptions: [],
+      // 表单参数
+      form: {},
+      row: {},
+      // 表单校验
+      rules: {
+        plantId: [
+          {required: true, message: this.$t('请选择') + this.$t('装置'), trigger: "blur"}
+        ],
+        regionId: [
+          {required: true, message: this.$t('请选择') + this.$t('区域'), trigger: "blur"}
+        ],
+        devId: [
+          {required: true, message: this.$t('请选择') + this.$t('设备'), trigger: "blur"}
+        ],
+        groupCode: [
+          {required: true, message: this.$t('群组编码') + this.$t('不能为空'), trigger: "blur"}
+        ],
+        extendCode: [
+          {required: true, message: this.$t('密封点扩展号编码') + this.$t('不能为空'), trigger: "blur"}
+        ],
+        pointType: [
+          {required: true, message: this.$t('请选择') + this.$t('密封点类型'), trigger: "blur"}
+        ],
+        unarrive: [
+          {required: true, message: this.$t('请选择') + this.$t('是否不可达点'), trigger: "blur"}
+        ],
+        mediumType: [
+          {required: true, message: this.$t('请选择') + this.$t('介质状态'), trigger: "blur"}
+        ],
+      }
+    }
+  },
+  methods: {
+    tableCellStyle({row, column, rowIndex, columnIndex}) {
+      if (columnIndex === 2 && row.leakageDegree == 1) {
+        return "color:#00ff00;font-size:200%";
+      }
+      if (columnIndex === 2 && row.leakageDegree == 2) {
+        return "color:#FFDF00;font-size:200%";
+      }
+      if (columnIndex === 2 && row.leakageDegree == 3) {
+        return "color:#ff0000;font-size:200%";
+      }
+    },
+    leakageFormat(row, column) {
+      return row.leakageDegree ? "●" : null;
+    },
+    init(row) {
+      this.row = row;
+      this.mediumTypeOptions = row.mediumTypeOptions;
+      this.plantOperation = row.plantOperation;
+      this.reset();
+      getPoint(row.pointId).then(response => {
+        this.form = response.data;
+        getAllRegion(this.form.plantId).then(response => {
+            this.regionOperation = response.data;
+          }
+        );
+        getAllDeviceByRegionId(this.form.regionId).then(response => {
+            this.deviceOperation = response.data;
+          }
+        )
+        this.open = true;
+      });
+      this.getList();
+    },
+    getList() {
+      this.queryParams.pointId = this.row.pointId;
+      this.queryParams.approveStatus = 2;
+      this.queryParams.repairId = 1;
+      listCheckpoints(this.queryParams).then(response => {
+        this.pointList = response.rows
+        this.total=response.total
+      })
+    },
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    reset() {
+      this.form = {
+        pointId: null,
+        netTestValue: null,
+        leakageDegree: null,
+        plantId: null,
+        regionId: null,
+        devId: null,
+        medium: null,
+        mediumType: null,
+        pointType: null,
+        layer: null,
+        groupPosition: null,
+        pointPosition: null,
+        groupCode: null,
+        extendCode: null,
+        subPointType: null,
+        dia: null,
+        unarrive: null,
+        unarriveReason: null,
+        keepWarm: null,
+        temperature: null,
+        pressure: null,
+        runTime: null,
+        pidNo: null,
+        pidUrl: null,
+        picNo: null,
+        picUrl: null,
+        tocMark: null,
+        methaneMark: null,
+        vocsMark: null,
+        remarks: null,
+        approveStatus: 0,
+        approveTime: null,
+        deptId: null,
+        delFlag: null,
+        createrCode: null,
+        createdate: null,
+        updaterCode: null,
+        updatedate: null
+      };
+      this.resetForm("form");
+      this.pointList = [];
+    },
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

ui/src/views/base/region/index.vue

@@ -184,7 +184,7 @@ export default {
   name: "Region",
   data() {
     return {
-      clientHeight:[],
+      clientHeight:300,
       plantOperation:[],
       approveStatusOperation:[],
       // 遮罩层

ui/src/views/task/inspection/dividePoint.vue

@@ -353,7 +353,11 @@ export default {
         let data = this.queryParams;
         data.inspectionId = this.rightQueryParams.inspectionId;
         data.choose = 3;
-        console.log(data)
+        if (this.row.taskType==2){
+          this.queryParams.repairId=0;
+        }else {
+          this.queryParams.repairId = null;
+        }
         updateCheckpoints(data).then(response => {
           this.getList();
           this.getRightList();

ui/src/views/tool/build/index.vue

@@ -147,7 +147,7 @@ import { makeUpHtml, vueTemplate, vueScript, cssStyle } from '@/utils/generator/
 import { makeUpJs } from '@/utils/generator/js'
 import { makeUpCss } from '@/utils/generator/css'
 import drawingDefault from '@/utils/generator/drawingDefault'
-import logo from '@/assets/logo/logo1.png'
+import logo from '@/assets/logo/logo2.png'
 import CodeTypeDialog from './CodeTypeDialog'
 import DraggableItem from './DraggableItem'