LY sems

master/src/main/java/com/ruoyi/project/sems/controller/TSpecdevCcController.java

@@ -188,56 +188,58 @@ public class TSpecdevCcController extends BaseController
                     }else if (j == 3) {
                         entity.setUseDept(cellValue);//使用部门
                     } else if (j == 4) {
+                        entity.setPlantMaint(cellValue);//装置维护组
+                    }else if (j == 5) {
                         entity.setEngineer(cellValue);//装置维护人员
-                    } else if (j == 5) {
-                        entity.setCarNo(cellValue);//车牌号
                     } else if (j == 6) {
-                        entity.setDocno(cellValue);//档案号
+                        entity.setCarNo(cellValue);//车牌号
                     } else if (j == 7) {
-                        entity.setEngineNo(cellValue);//发动机号
+                        entity.setDocno(cellValue);//档案号
                     } else if (j == 8) {
-                        entity.setRegno(cellValue);//注册代码
+                        entity.setEngineNo(cellValue);//发动机号
                     } else if (j == 9) {
-                        entity.setColor(cellValue);//颜色
+                        entity.setRegno(cellValue);//注册代码
                     } else if (j == 10) {
-                        entity.setCapacity(cellValue);//工作能力
+                        entity.setColor(cellValue);//颜色
                     } else if (j == 11) {
-                        entity.setDevname(cellValue);//设备名称
+                        entity.setCapacity(cellValue);//工作能力
                     } else if (j == 12) {
-                        entity.setEngineType(cellValue);//动力形式
+                        entity.setDevname(cellValue);//设备名称
                     } else if (j == 13) {
+                        entity.setEngineType(cellValue);//动力形式
+                    } else if (j == 14) {
                         entity.setModel(cellValue);//型号
-                    }  else if (j == 14) {
-                        entity.setFrameNo(cellValue);//车架号
                     }  else if (j == 15) {
+                        entity.setFrameNo(cellValue);//车架号
+                    }  else if (j == 16) {
                         entity.setProductNo(cellValue);//产品编号
-                    } else if (j == 16) {
-                        entity.setCreateUnit(cellValue);//生产厂家
                     } else if (j == 17) {
-                        entity.setExUnit(cellValue);//防爆改造厂家
+                        entity.setCreateUnit(cellValue);//生产厂家
                     } else if (j == 18) {
-                        entity.setExGrade(cellValue);//最高防爆级别
+                        entity.setExUnit(cellValue);//防爆改造厂家
                     } else if (j == 19) {
+                        entity.setExGrade(cellValue);//最高防爆级别
+                    } else if (j == 20) {
                         if (cellValue.length() > 3) {//初检日期
                             entity.setFirstWarnDate(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));
                         }
-                    } else if (j == 20) {
-                        entity.setCheckStrategy(cellValue);//检验策略
                     } else if (j == 21) {
+                        entity.setCheckStrategy(cellValue);//检验策略
+                    } else if (j == 22) {
                         if (cellValue.length() > 3) {//检验日期
                             entity.setWarnDate(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));
                         }
-                    } else if (j == 22) {
+                    } else if (j == 23) {
                         if (cellValue.length() > 3) {//下次年检日期
                             entity.setNextWarnDate(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));
                         }
-                    } else if (j == 23) {
+                    } else if (j == 24) {
                         entity.setReportNo(cellValue);//报告编号
-                    }else if (j == 24) {
+                    }else if (j == 25) {
                         entity.setAssetOwner(cellValue);//资产形式
-                    } else if (j == 25) {
+                    } else if (j == 26) {
                         entity.setPerTestConclusion(cellValue);
-                    }else if (j == 26) {
+                    }else if (j == 27) {
                         entity.setRemarks(cellValue);//备注
                     }/*else if (j == 25) {
                         for (SysDept d : dept) {

master/src/main/java/com/ruoyi/project/sems/controller/TSpecdevDtController.java

@@ -185,40 +185,42 @@ public class TSpecdevDtController extends BaseController
                     }else if (j == 3) {
                         entity.setDocno(cellValue);//档案号
                     } else if (j == 4) {
+                        entity.setUseDept(cellValue);// 使用部门
+                    }else if (j == 5) {
+                        entity.setPlantMaint(cellValue);// 装置维修组
+                    }else if (j == 6) {
                         entity.setDevname(cellValue);//名称
-                    } else if (j == 5) {
-                        entity.setRegno(cellValue);//设备注册编号
-                    } else if (j == 6) {
-                        entity.setModel(cellValue);//型号
                     } else if (j == 7) {
-                        entity.setCapacity(cellValue);//额定载重
+                        entity.setRegno(cellValue);//设备注册编号
                     } else if (j == 8) {
-                        entity.setFloor(cellValue);//层站数
+                        entity.setModel(cellValue);//型号
                     } else if (j == 9) {
-                        entity.setCreateUnit(cellValue);//制造单位
+                        entity.setCapacity(cellValue);//额定载重
                     } else if (j == 10) {
-                        entity.setLocation(cellValue);//使用地点
+                        entity.setFloor(cellValue);//层站数
                     } else if (j == 11) {
-                        entity.setMaintContractor(cellValue);//维保承包商
+                        entity.setCreateUnit(cellValue);//制造单位
                     } else if (j == 12) {
+                        entity.setLocation(cellValue);//使用地点
+                    } else if (j == 13) {
                         if (cellValue.length() > 3) {//初检日期
                             entity.setFirstWarnDate(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));
                         }
-                    } else if (j == 13) {
+                    } else if (j == 14) {
                         if (cellValue.length() > 3) {//检验日期
                             entity.setWarnDate(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));
                         }
-                    } else if (j == 14) {
-                        entity.setCheckUnit(cellValue);//检验单位
                     } else if (j == 15) {
-                        entity.setReportNo(cellValue);//报告编号
+                        entity.setCheckUnit(cellValue);//检验单位
                     } else if (j == 16) {
+                        entity.setReportNo(cellValue);//报告编号
+                    } else if (j == 17) {
                         if (cellValue.length() > 3) {//下次年检日期
                             entity.setNextWarnDate(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));
                         }
-                    }  else if (j == 17) {
+                    }  else if (j == 18) {
                         entity.setPerTestConclusion(cellValue);//备注
-                    } else if (j == 18) {
+                    } else if (j == 19) {
                         entity.setRemarks(cellValue);//备注
                     }/*else if (j == 17) {
                         for (SysDept d : dept) {

master/src/main/java/com/ruoyi/project/sems/domain/TSpecdevDt.java

@@ -36,6 +36,14 @@ public class TSpecdevDt extends BaseEntity
     @Excel(name = "档案号")
     private String docno;
 
+    /** 使用部门 */
+    @Excel(name = "使用部门")
+    private String useDept;
+
+    /** 装置维修组 */
+    @Excel(name = "装置维修组")
+    private String plantMaint;
+
     /** 设备名称 */
     @Excel(name = "名称")
     private String devname;
@@ -577,6 +585,22 @@ public class TSpecdevDt extends BaseEntity
         return reportNo;
     }
 
+    public String getUseDept() {
+        return useDept;
+    }
+
+    public void setUseDept(String useDept) {
+        this.useDept = useDept;
+    }
+
+    public String getPlantMaint() {
+        return plantMaint;
+    }
+
+    public void setPlantMaint(String plantMaint) {
+        this.plantMaint = plantMaint;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

master/src/main/java/com/ruoyi/project/sems/his/domain/TSpechiDt.java

@@ -38,6 +38,14 @@ public class TSpechiDt extends BaseEntity
     @Excel(name = "设备位号")
     private String devno;
 
+    /** 使用部门 */
+    @Excel(name = "使用部门")
+    private String useDept;
+
+    /** 装置维修组 */
+    @Excel(name = "装置维修组")
+    private String plantMaint;
+
     /** 创建日期 */
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
     @Excel(name = "创建日期", width = 30, dateFormat = "yyyy-MM-dd")
@@ -530,6 +538,22 @@ public class TSpechiDt extends BaseEntity
         return hiType;
     }
 
+    public String getUseDept() {
+        return useDept;
+    }
+
+    public void setUseDept(String useDept) {
+        this.useDept = useDept;
+    }
+
+    public String getPlantMaint() {
+        return plantMaint;
+    }
+
+    public void setPlantMaint(String plantMaint) {
+        this.plantMaint = plantMaint;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

master/src/main/resources/mybatis/sems/TSpecdevCcMapper.xml

@@ -51,6 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="hiFlag" column="hiFlag" />
         <result property="perTestConclusion" column="per_test_conclusion" />
         <result property="isRepeat" column="is_repeat"/>
+        <result property="plantMaint"    column="plant_maint"    />
     </resultMap>
 
     <sql id="selectTSpecdevCcVo">
@@ -65,6 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                d.del_flag,
                d.creater_code,
                d.createdate,
+               d.plant_maint,
                d.updater_code, d.updatedate, d.dept_id, d.remarks, d.approve_status, d.regno, d.useno, d.warn_date, d.warn_cycle, d.next_warn_date, d.warn_flag, d.create_unit, d.check_strategy, d.first_warn_date, d.check_unit, d.docno, d.approve_time, d.change_time, d.engine_no, d.color, d.capacity, d.model, d.engine_type, d.dev_class, d.ex_unit, d.use_dept, d.engineer, d.ex_grade, d.report_no, d.frame_no, d.product_no, d.asset_owner ,s.dept_name,
         (SELECT COUNT(1) from T_SPECHI_CC h  where h.DEV_ID = d.id and HI_TYPE = 0 ) as hiFlag, per_test_conclusion
                 ,d.is_repeat
@@ -172,7 +174,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="productNo != null">product_no,</if>
             <if test="assetOwner != null">asset_owner,</if>
             <if test="perTestConclusion != null">per_test_conclusion,</if>
-         </trim>
+            <if test="plantMaint != null">plant_maint,</if>
+
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
             <if test="plantCode != null and plantCode != ''">#{plantCode},</if>
@@ -218,7 +222,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="productNo != null">#{productNo},</if>
             <if test="assetOwner != null">#{assetOwner},</if>
             <if test="perTestConclusion != null">#{perTestConclusion},</if>
-         </trim>
+            <if test="plantMaint != null">#{plantMaint},</if>
+
+        </trim>
     </insert>
 
     <update id="updateTSpecdevCc" parameterType="TSpecdevCc">
@@ -268,6 +274,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="assetOwner != null">asset_owner = #{assetOwner},</if>
             <if test="perTestConclusion != null">per_test_conclusion = #{perTestConclusion},</if>
             <if test="isRepeat != null">is_repeat = #{isRepeat},</if>
+            <if test="plantMaint != null">plant_maint = #{plantMaint},</if>
+
         </trim>
         where id = #{id}
     </update>
@@ -318,6 +326,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="productNo != null">product_no = #{productNo},</if>
             <if test="assetOwner != null">asset_owner = #{assetOwner},</if>
             <if test="perTestConclusion != null">per_test_conclusion = #{perTestConclusion},</if>
+            <if test="plantMaint != null">plant_maint = #{plantMaint},</if>
+
         </trim>
         where id = #{devId}
     </update>

master/src/main/resources/mybatis/sems/TSpecdevDtMapper.xml

@@ -43,10 +43,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="hiFlag" column="hiFlag" />
         <result property="perTestConclusion" column="per_test_conclusion" />
         <result property="isRepeat" column="is_repeat"/>
+        <result property="useDept"    column="use_dept"    />
+        <result property="plantMaint"    column="plant_maint"    />
+
     </resultMap>
 
     <sql id="selectTSpecdevDtVo">
-        select d.id, d.plant_code, d.unit, d.devname, d.devno, d.createdate, d.submitdate, d.status, d.del_flag, d.creater_code, d.creater_date, d.updater_code, d.updater_date, d.dept_id, d.remarks, d.approve_status, d.regno, d.useno, d.warn_date, d.warn_cycle, d.next_warn_date, d.warn_flag, d.model, d.capacity, d.floor, d.create_unit, d.maint_contractor, d.location, d.check_strategy, d.first_warn_date, d.check_unit, d.docno, d.approve_time, d.change_time, d.report_no ,s.dept_name,
+        select d.id, d.plant_code,d.plant_maint,d.use_dept, d.unit, d.devname, d.devno, d.createdate, d.submitdate, d.status, d.del_flag, d.creater_code, d.creater_date, d.updater_code, d.updater_date, d.dept_id, d.remarks, d.approve_status, d.regno, d.useno, d.warn_date, d.warn_cycle, d.next_warn_date, d.warn_flag, d.model, d.capacity, d.floor, d.create_unit, d.maint_contractor, d.location, d.check_strategy, d.first_warn_date, d.check_unit, d.docno, d.approve_time, d.change_time, d.report_no ,s.dept_name,
         (SELECT COUNT(1) from T_SPECHI_DT h  where h.DEV_ID = d.id and HI_TYPE = 0 ) as hiFlag, per_test_conclusion
         ,d.is_repeat
         from t_specdev_dt d
@@ -153,7 +156,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="changeTime != null">change_time,</if>
             <if test="reportNo != null">report_no,</if>
             <if test="perTestConclusion != null">per_test_conclusion,</if>
-         </trim>
+            <if test="plantMaint != null">plant_maint,</if>
+            <if test="useDept != null">use_dept,</if>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
             <if test="plantCode != null and plantCode != ''">#{plantCode},</if>
@@ -191,6 +196,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="changeTime != null">#{changeTime},</if>
             <if test="reportNo != null">#{reportNo},</if>
             <if test="perTestConclusion != null">#{perTestConclusion},</if>
+            <if test="plantMaint != null">#{plantMaint},</if>
+            <if test="useDept != null">#{useDept},</if>
          </trim>
     </insert>
 
@@ -233,6 +240,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="reportNo != null">report_no = #{reportNo},</if>
             <if test="perTestConclusion != null">per_test_conclusion = #{perTestConclusion},</if>
             <if test="isRepeat != null">is_repeat = #{isRepeat},</if>
+            <if test="plantMaint != null">plant_maint = #{plantMaint},</if>
+            <if test="useDept != null">use_dept = #{useDept},</if>
         </trim>
         where id = #{id}
     </update>
@@ -275,6 +284,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="changeTime != null">change_time = #{changeTime},</if>
             <if test="reportNo != null">report_no = #{reportNo},</if>
             <if test="perTestConclusion != null">per_test_conclusion = #{perTestConclusion},</if>
+            <if test="plantMaint != null">plant_maint = #{plantMaint},</if>
+            <if test="useDept != null">use_dept = #{useDept},</if>
         </trim>
         where id = #{devId}
     </update>

master/src/main/resources/mybatis/sems/his/TSpechiCcMapper.xml

@@ -51,10 +51,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="devId"    column="dev_id"    />
         <result property="hiType"    column="hi_type"    />
         <result property="deptName" column="dept_name" />
+        <result property="plantMaint"    column="plant_maint"    />
+
     </resultMap>
 
     <sql id="selectTSpechiCcVo">
-        select d.id, d.plant_code, d.unit, d.car_no, d.devname, d.devno, d.submitdate, d.status, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.approve_status, d.regno, d.useno, d.warn_date, d.warn_cycle, d.next_warn_date, d.warn_flag, d.create_unit, d.check_strategy, d.first_warn_date, d.check_unit, d.docno, d.approve_time, d.change_time, d.engine_no, d.color, d.capacity, d.model, d.engine_type, d.dev_class, d.ex_unit, d.use_dept, d.engineer, d.ex_grade, d.report_no, d.frame_no, d.product_no, d.asset_owner, d.dev_id, d.hi_type ,s.dept_name from t_spechi_cc d
+        select d.id, d.plant_code, d.unit, d.plant_maint,d.car_no, d.devname, d.devno, d.submitdate, d.status, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.approve_status, d.regno, d.useno, d.warn_date, d.warn_cycle, d.next_warn_date, d.warn_flag, d.create_unit, d.check_strategy, d.first_warn_date, d.check_unit, d.docno, d.approve_time, d.change_time, d.engine_no, d.color, d.capacity, d.model, d.engine_type, d.dev_class, d.ex_unit, d.use_dept, d.engineer, d.ex_grade, d.report_no, d.frame_no, d.product_no, d.asset_owner, d.dev_id, d.hi_type ,s.dept_name from t_spechi_cc d
       left join sys_dept s on s.dept_id = d.dept_id
     </sql>
 
@@ -175,6 +177,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="assetOwner != null">asset_owner,</if>
             <if test="devId != null">dev_id,</if>
             <if test="hiType != null">hi_type,</if>
+            <if test="plantMaint != null">plant_maint,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -222,6 +225,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="assetOwner != null">#{assetOwner},</if>
             <if test="devId != null">#{devId},</if>
             <if test="hiType != null">#{hiType},</if>
+            <if test="plantMaint != null">#{plantMaint},</if>
          </trim>
     </insert>
 
@@ -276,6 +280,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="assetOwner != null">asset_owner,</if>
             <if test="devId != null">dev_id,</if>
             <if test="hiType != null">hi_type,</if>
+            <if test="plantMaint != null">plant_maint,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -323,6 +328,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="assetOwner != null">#{assetOwner},</if>
             <if test="devId != null">#{devId},</if>
             <if test="hiType != null">#{hiType},</if>
+            <if test="plantMaint != null">#{plantMaint},</if>
         </trim>
     </insert>
 
@@ -373,6 +379,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="assetOwner != null">asset_owner = #{assetOwner},</if>
             <if test="devId != null">dev_id = #{devId},</if>
             <if test="hiType != null">hi_type = #{hiType},</if>
+            <if test="plantMaint != null">plant_maint = #{plantMaint},</if>
         </trim>
         where id = #{id}
     </update>

master/src/main/resources/mybatis/sems/his/TSpechiDtMapper.xml

@@ -43,10 +43,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="devId"    column="dev_id"    />
         <result property="hiType"    column="hi_type"    />
         <result property="deptName" column="dept_name" />
+        <result property="useDept"    column="use_dept"    />
+        <result property="plantMaint"    column="plant_maint"    />
     </resultMap>
 
     <sql id="selectTSpechiDtVo">
-        select d.id, d.plant_code, d.unit, d.devname, d.devno, d.createdate, d.submitdate, d.status, d.del_flag, d.creater_code, d.creater_date, d.updater_code, d.updater_date, d.dept_id, d.remarks, d.approve_status, d.regno, d.useno, d.warn_date, d.warn_cycle, d.next_warn_date, d.warn_flag, d.model, d.capacity, d.floor, d.create_unit, d.maint_contractor, d.location, d.check_strategy, d.first_warn_date, d.check_unit, d.docno, d.approve_time, d.change_time, d.report_no, d.dev_id, d.hi_type ,s.dept_name from t_spechi_dt d
+        select d.id, d.plant_code, d.plant_maint,d.use_dept,d.unit, d.devname, d.devno, d.createdate, d.submitdate, d.status, d.del_flag, d.creater_code, d.creater_date, d.updater_code, d.updater_date, d.dept_id, d.remarks, d.approve_status, d.regno, d.useno, d.warn_date, d.warn_cycle, d.next_warn_date, d.warn_flag, d.model, d.capacity, d.floor, d.create_unit, d.maint_contractor, d.location, d.check_strategy, d.first_warn_date, d.check_unit, d.docno, d.approve_time, d.change_time, d.report_no, d.dev_id, d.hi_type ,s.dept_name from t_spechi_dt d
       left join sys_dept s on s.dept_id = d.dept_id
     </sql>
 
@@ -152,6 +154,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="reportNo != null">report_no,</if>
             <if test="devId != null">dev_id,</if>
             <if test="hiType != null">hi_type,</if>
+            <if test="plantMaint != null">plant_maint,</if>
+            <if test="useDept != null">use_dept,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -191,6 +195,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="reportNo != null">#{reportNo},</if>
             <if test="devId != null">#{devId},</if>
             <if test="hiType != null">#{hiType},</if>
+            <if test="plantMaint != null">#{plantMaint},</if>
+            <if test="useDept != null">#{useDept},</if>
          </trim>
     </insert>
 
@@ -237,6 +243,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="reportNo != null">report_no,</if>
             <if test="devId != null">dev_id,</if>
             <if test="hiType != null">hi_type,</if>
+            <if test="plantMaint != null">plant_maint,</if>
+            <if test="useDept != null">use_dept,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -276,6 +284,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="reportNo != null">#{reportNo},</if>
             <if test="devId != null">#{devId},</if>
             <if test="hiType != null">#{hiType},</if>
+            <if test="plantMaint != null">#{plantMaint},</if>
+            <if test="useDept != null">#{useDept},</if>
         </trim>
     </insert>
 
@@ -318,6 +328,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="reportNo != null">report_no = #{reportNo},</if>
             <if test="devId != null">dev_id = #{devId},</if>
             <if test="hiType != null">hi_type = #{hiType},</if>
+            <if test="plantMaint != null">plant_maint = #{plantMaint},</if>
+            <if test="useDept != null">use_dept = #{useDept},</if>
         </trim>
         where id = #{id}
     </update>

ui/src/views/sems/specCc/bf.vue

@@ -62,6 +62,8 @@
       <el-table-column :label="$t('装置')" align="center"  fixed="left" prop="plantCode" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('单元')" align="center"  fixed="left" prop="unit" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('使用部门')" align="center" fixed="left" prop="useDept" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('装置维修组')" align="center"  fixed="left" prop="plantMaint" :show-overflow-tooltip="true"/>
+
       <el-table-column :label="$t('装置维护人员')" align="center"  fixed="left" prop="engineer" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('车牌号')" align="center"  fixed="left" prop="carNo" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('档案号')" align="center"  fixed="left" prop="docno" :show-overflow-tooltip="true"/>
@@ -155,7 +157,19 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="12">
+          <el-col :span="6">
+            <el-form-item :label="$t('装置维修组')" prop="plantMaint">
+              <el-select v-model="form.plantMaint" :placeholder="$t('请选择')+ $t('装置维修组')" filterable clearable size="small">
+                <el-option
+                  v-for="dict in plantMaintOptions"
+                  :key="dict.dictValue"
+                  :label="dict.dictValue"
+                  :value="dict.dictValue"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
         <el-form-item :label="$t('装置维护人员')" prop="engineer">
           <el-input v-model="form.engineer" :placeholder="$t('请输入')+ $t('装置维护人员')" />
         </el-form-item>

ui/src/views/sems/specCc/index.vue

@@ -35,12 +35,12 @@
       :key="item.value"
       :label="item.text"
       :value="item.value">
-      <div>  
-        <span v-if="item.value==1" style="width:45px;height:30px; float: left;background-color:#ffff00"> </span> 
+      <div>
+        <span v-if="item.value==1" style="width:45px;height:30px; float: left;background-color:#ffff00"> </span>
  <span v-if="item.value==1" style=" float: right; color: #121010 ; font-size: 18px">{{item.text }}</span>
-        <span v-if="item.value==2" style="width:45px;height:30px; float: left;background-color:#ff9900 "></span> 
+        <span v-if="item.value==2" style="width:45px;height:30px; float: left;background-color:#ff9900 "></span>
  <span v-if="item.value==2" style=" float: right; color: #121010 ; font-size: 18px">{{item.text}}</span>
-        <span v-if="item.value==3" style="width:45px;height:30px; float: left;background-color:#FF4500;"> </span> 
+        <span v-if="item.value==3" style="width:45px;height:30px; float: left;background-color:#FF4500;"> </span>
  <span v-if="item.value==3" style=" float: right; color: #121010 ; font-size: 18px">{{item.text }}</span>
         </div>
     </el-option>
@@ -145,6 +145,8 @@
       <el-table-column :label="$t('装置')" align="center"  fixed="left" prop="plantCode" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('单元')" align="center"  fixed="left" prop="unit" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('使用部门')" align="center" fixed="left" prop="useDept" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('装置维修组')" align="center"  fixed="left" prop="plantMaint" :show-overflow-tooltip="true"/>
+
       <el-table-column :label="$t('装置维护人员')" align="center"  fixed="left" prop="engineer" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('车牌号')" align="center"  fixed="left" prop="carNo" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('档案号')" align="center"  fixed="left" prop="docno" :show-overflow-tooltip="true"/>
@@ -245,7 +247,19 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="12">
+          <el-col :span="6">
+            <el-form-item :label="$t('装置维修组')" prop="plantMaint">
+              <el-select v-model="form.plantMaint" :placeholder="$t('请选择')+ $t('装置维修组')" filterable clearable size="small">
+                <el-option
+                  v-for="dict in plantMaintOptions"
+                  :key="dict.dictValue"
+                  :label="dict.dictValue"
+                  :value="dict.dictValue"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
         <el-form-item :label="$t('装置维护人员')" prop="engineer">
           <el-input v-model="form.engineer" :placeholder="$t('请输入')+ $t('装置维护人员')" />
         </el-form-item>
@@ -652,7 +666,9 @@
     this.getDicts("spec_cc_owner").then(response => {
       this.specCcOwnerOptions = response.data;
     });
-
+    this.getDicts("SPEC_PLANT_MAINT").then(response => {
+      this.plantMaintOptions = response.data;
+    });
     let plantParams = {
       pType: 1
     }

ui/src/views/sems/specCc/specCc-hisReform.vue

@@ -4,6 +4,8 @@
       <el-table-column :label="$t('装置')" align="center"  fixed="left" prop="plantCode" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('单元')" align="center"  fixed="left" prop="unit" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('使用部门')" align="center" fixed="left" prop="useDept" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('装置维修组')" align="center"  fixed="left" prop="plantMaint" :show-overflow-tooltip="true"/>
+
       <el-table-column :label="$t('装置维护人员')" align="center"  fixed="left" prop="engineer" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('车牌号')" align="center"  fixed="left" prop="carNo" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('档案号')" align="center"  fixed="left" prop="docno" :show-overflow-tooltip="true"/>

ui/src/views/sems/specCc/ty.vue

@@ -107,6 +107,8 @@
       <el-table-column :label="$t('装置')" align="center"  fixed="left" prop="plantCode" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('单元')" align="center"  fixed="left" prop="unit" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('使用部门')" align="center" fixed="left" prop="useDept" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('装置维修组')" align="center"  fixed="left" prop="plantMaint" :show-overflow-tooltip="true"/>
+
       <el-table-column :label="$t('装置维护人员')" align="center"  fixed="left" prop="engineer" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('车牌号')" align="center"  fixed="left" prop="carNo" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('档案号')" align="center"  fixed="left" prop="docno" :show-overflow-tooltip="true"/>
@@ -207,7 +209,19 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="12">
+          <el-col :span="6">
+            <el-form-item :label="$t('装置维修组')" prop="plantMaint">
+              <el-select v-model="form.plantMaint" :placeholder="$t('请选择')+ $t('装置维修组')" filterable clearable size="small">
+                <el-option
+                  v-for="dict in plantMaintOptions"
+                  :key="dict.dictValue"
+                  :label="dict.dictValue"
+                  :value="dict.dictValue"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
         <el-form-item :label="$t('装置维护人员')" prop="engineer">
           <el-input v-model="form.engineer" :placeholder="$t('请输入')+ $t('装置维护人员')" />
         </el-form-item>
@@ -596,7 +610,9 @@ export default {
     this.getDicts("spec_cc_owner").then(response => {
       this.specCcOwnerOptions = response.data;
     });
-
+    this.getDicts("SPEC_PLANT_MAINT").then(response => {
+      this.plantMaintOptions = response.data;
+    });
     let plantParams = {
       pType: 1
     }

ui/src/views/sems/specCc/zx.vue

@@ -62,6 +62,8 @@
       <el-table-column :label="$t('装置')" align="center"  fixed="left" prop="plantCode" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('单元')" align="center"  fixed="left" prop="unit" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('使用部门')" align="center" fixed="left" prop="useDept" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('装置维修组')" align="center"  fixed="left" prop="plantMaint" :show-overflow-tooltip="true"/>
+
       <el-table-column :label="$t('装置维护人员')" align="center"  fixed="left" prop="engineer" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('车牌号')" align="center"  fixed="left" prop="carNo" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('档案号')" align="center"  fixed="left" prop="docno" :show-overflow-tooltip="true"/>

ui/src/views/sems/specDt/bf.vue

@@ -71,6 +71,9 @@
       <el-table-column :label="$t('装置')" align="center"  fixed="left" prop="plantCode" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('单元')" align="center"  fixed="left" prop="unit" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('档案号')" align="center"  fixed="left" prop="docno" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('使用部门')" align="center" fixed="left" prop="useDept" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('装置维修组')" align="center"  fixed="left" prop="plantMaint" :show-overflow-tooltip="true"/>
+
       <el-table-column :label="$t('名称')" align="center"  fixed="left" prop="devname" width="130" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('注册编号')" align="center" fixed="left"  prop="regno" width="100" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('型号')" align="center" fixed="left"  prop="model" :show-overflow-tooltip="true"/>
@@ -80,7 +83,6 @@
       <el-table-column :label="$t('层站数')" align="center" prop="floor" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('制造单位')" align="center" prop="createUnit" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('使用地点')" align="center" prop="location" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('维保承包商')" align="center" prop="maintContractor" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('初检日期')" align="center" prop="firstWarnDate" width="100">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.firstWarnDate, '{y}-{m}-{d}') }}</span>
@@ -151,6 +153,25 @@
         </el-form-item>
         </el-col>
       </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('使用部门')" prop="useDept">
+              <el-input v-model="form.useDept" :placeholder="$t('请输入')+ $t('使用部门')" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('装置维修组')" prop="plantMaint">
+              <el-select v-model="form.plantMaint" :placeholder="$t('请选择')+ $t('装置维修组')" filterable clearable size="small">
+                <el-option
+                  v-for="dict in plantMaintOptions"
+                  :key="dict.dictValue"
+                  :label="dict.dictValue"
+                  :value="dict.dictValue"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
       <el-row>
         <el-col :span="12">
         <el-form-item :label="$t('设备名称')" prop="devname" >
@@ -463,6 +484,9 @@ export default {
     this.getDicts("spec_dev_status").then(response => {
       this.statusOptions = response.data;
     });
+    this.getDicts("SPEC_PLANT_MAINT").then(response => {
+      this.plantMaintOptions = response.data;
+    });
     this.getDicts("spec_approve_status").then(response => {
       for (let i = 0; i < response.data.length; i++) {
         if ( !["5","6","7","8" ,"16" , "17"].includes(response.data[i].dictValue)){

ui/src/views/sems/specDt/index.vue

@@ -155,6 +155,9 @@
       <el-table-column :label="$t('装置')" align="center"  fixed="left" prop="plantCode" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('单元')" align="center"  fixed="left" prop="unit" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('档案号')" align="center"  fixed="left" prop="docno" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('使用部门')" align="center" fixed="left" prop="useDept" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('装置维修组')" align="center"  fixed="left" prop="plantMaint" :show-overflow-tooltip="true"/>
+
       <el-table-column :label="$t('名称')" align="center"  fixed="left" prop="devname" width="130" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('注册编号')" align="center" fixed="left"  prop="regno" width="100" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('型号')" align="center" fixed="left"  prop="model" :show-overflow-tooltip="true"/>
@@ -164,7 +167,6 @@
       <el-table-column :label="$t('层站数')" align="center" prop="floor" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('制造单位')" align="center" prop="createUnit" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('使用地点')" align="center" prop="location" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('维保承包商')" align="center" prop="maintContractor" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('初检日期')" align="center" prop="firstWarnDate" width="100">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.firstWarnDate, '{y}-{m}-{d}') }}</span>
@@ -248,6 +250,25 @@
         </el-form-item>
         </el-col>
       </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('使用部门')" prop="useDept">
+              <el-input v-model="form.useDept" :placeholder="$t('请输入')+ $t('使用部门')" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('装置维修组')" prop="plantMaint">
+              <el-select v-model="form.plantMaint" :placeholder="$t('请选择')+ $t('装置维修组')" filterable clearable size="small">
+                <el-option
+                  v-for="dict in plantMaintOptions"
+                  :key="dict.dictValue"
+                  :label="dict.dictValue"
+                  :value="dict.dictValue"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
       <el-row>
         <el-col :span="12">
         <el-form-item :label="$t('设备名称')" prop="devname" >
@@ -599,6 +620,9 @@
     mylistPlant(plantParams).then(response => {
       this.plantOptions = response.data;
     });
+    this.getDicts("SPEC_PLANT_MAINT").then(response => {
+      this.plantMaintOptions = response.data;
+    });
   },
   methods: {
     /** 查询特种设备电梯台账列表 */
@@ -627,6 +651,7 @@
     approveStatusFormat(row, column) {
       return this.selectDictLabel(this.approveStatusOptions, row.approveStatus);
     },
+
     // 取消按钮
     cancel() {
       this.open = false;

ui/src/views/sems/specDt/specDt-hisReform.vue

@@ -4,6 +4,8 @@
       <el-table-column :label="$t('装置')" align="center"  fixed="left" prop="plantCode" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('单元')" align="center"  fixed="left" prop="unit" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('档案号')" align="center"  fixed="left" prop="docno" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('使用部门')" align="center" fixed="left" prop="useDept" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('装置维修组')" align="center"  fixed="left" prop="plantMaint" :show-overflow-tooltip="true"/>
 
       <el-table-column :label="$t('名称')" align="center"  fixed="left" prop="devname" width="130" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('注册编号')" align="center" fixed="left"  prop="regno" width="100" :show-overflow-tooltip="true"/>
@@ -14,7 +16,6 @@
       <el-table-column :label="$t('层站数')" align="center" prop="floor" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('制造单位')" align="center" prop="createUnit" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('使用地点')" align="center" prop="location" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('维保承包商')" align="center" prop="maintContractor" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('初检日期')" align="center" prop="firstWarnDate" width="100">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.firstWarnDate, '{y}-{m}-{d}') }}</span>

ui/src/views/sems/specDt/ty.vue

@@ -116,6 +116,8 @@
       <el-table-column :label="$t('装置')" align="center"  fixed="left" prop="plantCode" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('单元')" align="center"  fixed="left" prop="unit" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('档案号')" align="center"  fixed="left" prop="docno" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('使用部门')" align="center" fixed="left" prop="useDept" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('装置维修组')" align="center"  fixed="left" prop="plantMaint" :show-overflow-tooltip="true"/>
 
       <el-table-column :label="$t('名称')" align="center"  fixed="left" prop="devname" width="130" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('注册编号')" align="center" fixed="left"  prop="regno" width="100" :show-overflow-tooltip="true"/>
@@ -126,7 +128,6 @@
       <el-table-column :label="$t('层站数')" align="center" prop="floor" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('制造单位')" align="center" prop="createUnit" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('使用地点')" align="center" prop="location" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('维保承包商')" align="center" prop="maintContractor" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('初检日期')" align="center" prop="firstWarnDate" width="100">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.firstWarnDate, '{y}-{m}-{d}') }}</span>
@@ -202,6 +203,25 @@
         </el-form-item>
         </el-col>
       </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('使用部门')" prop="useDept">
+              <el-input v-model="form.useDept" :placeholder="$t('请输入')+ $t('使用部门')" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('装置维修组')" prop="plantMaint">
+              <el-select v-model="form.plantMaint" :placeholder="$t('请选择')+ $t('装置维修组')" filterable clearable size="small">
+                <el-option
+                  v-for="dict in plantMaintOptions"
+                  :key="dict.dictValue"
+                  :label="dict.dictValue"
+                  :value="dict.dictValue"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
       <el-row>
         <el-col :span="12">
         <el-form-item :label="$t('设备名称')" prop="devname" >
@@ -523,6 +543,9 @@ export default {
     this.getDicts("spec_dev_status").then(response => {
       this.statusOptions = response.data;
     });
+    this.getDicts("SPEC_PLANT_MAINT").then(response => {
+      this.plantMaintOptions = response.data;
+    });
     this.getDicts("spec_approve_status").then(response => {
       for (let i = 0; i < response.data.length; i++) {
         if ( !["5","6","7","8" ,"16" , "17"].includes(response.data[i].dictValue)){

ui/src/views/sems/specDt/zx.vue

@@ -71,6 +71,8 @@
       <el-table-column :label="$t('装置')" align="center"  fixed="left" prop="plantCode" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('单元')" align="center"  fixed="left" prop="unit" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('档案号')" align="center"  fixed="left" prop="docno" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('使用部门')" align="center" fixed="left" prop="useDept" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('装置维修组')" align="center"  fixed="left" prop="plantMaint" :show-overflow-tooltip="true"/>
 
       <el-table-column :label="$t('名称')" align="center"  fixed="left" prop="devname" width="130" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('注册编号')" align="center" fixed="left"  prop="regno" width="100" :show-overflow-tooltip="true"/>
@@ -81,7 +83,6 @@
       <el-table-column :label="$t('层站数')" align="center" prop="floor" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('制造单位')" align="center" prop="createUnit" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('使用地点')" align="center" prop="location" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('维保承包商')" align="center" prop="maintContractor" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('初检日期')" align="center" prop="firstWarnDate" width="100">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.firstWarnDate, '{y}-{m}-{d}') }}</span>
@@ -152,6 +153,25 @@
         </el-form-item>
         </el-col>
       </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('使用部门')" prop="useDept">
+              <el-input v-model="form.useDept" :placeholder="$t('请输入')+ $t('使用部门')" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('装置维修组')" prop="plantMaint">
+              <el-select v-model="form.plantMaint" :placeholder="$t('请选择')+ $t('装置维修组')" filterable clearable size="small">
+                <el-option
+                  v-for="dict in plantMaintOptions"
+                  :key="dict.dictValue"
+                  :label="dict.dictValue"
+                  :value="dict.dictValue"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
       <el-row>
         <el-col :span="12">
         <el-form-item :label="$t('设备名称')" prop="devname" >
@@ -464,6 +484,9 @@ export default {
     this.getDicts("spec_dev_status").then(response => {
       this.statusOptions = response.data;
     });
+    this.getDicts("SPEC_PLANT_MAINT").then(response => {
+      this.plantMaintOptions = response.data;
+    });
     this.getDicts("spec_approve_status").then(response => {
       for (let i = 0; i < response.data.length; i++) {
         if ( !["5","6","7","8" ,"16" , "17"].includes(response.data[i].dictValue)){