李扬

master/pom.xml

@@ -6,7 +6,7 @@
 	<groupId>com.cpms</groupId>
 	<artifactId>cpms</artifactId>
 	<version>3.2.0</version>
-	<packaging>jar</packaging>
+	<packaging>war</packaging>
 
 	<name>cpms</name>
 	<description>cpms管理系统</description>

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

@@ -239,6 +239,15 @@ public class SpecHomeController extends BaseController
         return AjaxResult.success(res);
     }
 
+    /**
+     * 压力容器数据
+     */
+    @GetMapping("/devYlrqDataByYear")
+    public TableDataInfo devYlrqDataByYear(TSpecdevYlrq tSpecdevYlrq) {
+        startPage();
+        List<TSpecdevYlrq> list = tSpecdevYlrqService.selectTSpecdevYlrqListByYear(tSpecdevYlrq);
+        return getDataTable(list);
+    }
     /**
      * 锅炉数据
      */
@@ -294,6 +303,16 @@ public class SpecHomeController extends BaseController
         return AjaxResult.success(res);
     }
 
+    /**
+     * guolu
+     */
+    @GetMapping("/devGlDataByYear")
+    public TableDataInfo devGlDataByYear(TSpecdevGl tSpecdevGl) {
+        startPage();
+        List<TSpecdevGl> list = tSpecdevGlService.selectTSpecdevGlListByYear(tSpecdevGl);
+        return getDataTable(list);
+    }
+
     /**
      * 压力管道数据
      */
@@ -311,7 +330,7 @@ public class SpecHomeController extends BaseController
             int num = tSpecdevYlgdService.count(new QueryWrapper<TSpecdevYlgd>()
                     .eq("STATUS" , 1)
                     .eq("del_flag" , 0)
-                    .eq(!StringUtils.isBlank((String)params.get("plantName")) , "plant_code" ,params.get("plantName"))
+//                    .eq(!StringUtils.isBlank((String)params.get("plantName")) , "plant_code" ,params.get("plantName"))
                     .apply(true,applySql,year)
                     .in("plant_code",plantIds)
                     .and(unitIds.size()>0 ,j -> j.in("unit",unitIds).or().in("plant_code",unitIds))
@@ -327,6 +346,46 @@ public class SpecHomeController extends BaseController
         return AjaxResult.success(res);
     }
 
+    /**
+     * 压力容器数据
+     */
+    @GetMapping("/devYlgdDataByYear")
+    public TableDataInfo devYlgdDataByYear(TSpecdevYlgd tSpecdevYlgd) {
+        startPage();
+        List<TSpecdevYlgd> list = tSpecdevYlgdService.selectTSpecdevYlgdListByYear(tSpecdevYlgd);
+        return getDataTable(list);
+    }
+
+    /**
+     * 压力容器数据
+     */
+    @GetMapping("/devDzsbDataByYear")
+    public TableDataInfo devDzsbDataByYear(TSpecdevDzsb tSpecdevDzsb) {
+        startPage();
+        List<TSpecdevDzsb> list = tSpecdevDzsbService.selectTSpecdevDzsbListByYear(tSpecdevDzsb);
+        return getDataTable(list);
+    }
+
+    /**
+     * 压力容器数据
+     */
+    @GetMapping("/devCcDataByYear")
+    public TableDataInfo devCcDataByYear(TSpecdevCc tSpecdevCc) {
+        startPage();
+        List<TSpecdevCc> list = tSpecdevCcService.selectTSpecdevCcListByYear(tSpecdevCc);
+        return getDataTable(list);
+    }
+
+    /**
+     * 压力容器数据
+     */
+    @GetMapping("/devDtDataByYear")
+    public TableDataInfo devDtDataByYear(TSpecdevDt tSpecdevDt) {
+        startPage();
+        List<TSpecdevDt> list = tSpecdevDtService.selectTSpecdevDtListByYear(tSpecdevDt);
+        return getDataTable(list);
+    }
+
     /**
      * 压力管道数据
      */

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

@@ -198,6 +198,14 @@ public class TSpecdevCc extends BaseEntity
 
     @TableField(exist = false)
     private Long hiFlag;
+    @TableField(exist = false)
+    private String plantIds;
+
+    @TableField(exist = false)
+    private String unitIds;
+
+    @TableField(exist = false)
+    private String checkYear;
 
     public Long getHiFlag() {
         return hiFlag;
@@ -359,6 +367,30 @@ public class TSpecdevCc extends BaseEntity
         this.updatedate = updatedate;
     }
 
+    public String getPlantIds() {
+        return plantIds;
+    }
+
+    public void setPlantIds(String plantIds) {
+        this.plantIds = plantIds;
+    }
+
+    public String getUnitIds() {
+        return unitIds;
+    }
+
+    public void setUnitIds(String unitIds) {
+        this.unitIds = unitIds;
+    }
+
+    public String getCheckYear() {
+        return checkYear;
+    }
+
+    public void setCheckYear(String checkYear) {
+        this.checkYear = checkYear;
+    }
+
     public Date getUpdatedate()
     {
         return updatedate;

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

@@ -174,7 +174,14 @@ public class TSpecdevDt extends BaseEntity
 
     @TableField(exist = false)
     private Long hiFlag;
+    @TableField(exist = false)
+    private String plantIds;
+
+    @TableField(exist = false)
+    private String unitIds;
 
+    @TableField(exist = false)
+    private String checkYear;
     public Long getHiFlag() {
         return hiFlag;
     }
@@ -356,6 +363,30 @@ public class TSpecdevDt extends BaseEntity
         this.regno = regno;
     }
 
+    public String getPlantIds() {
+        return plantIds;
+    }
+
+    public void setPlantIds(String plantIds) {
+        this.plantIds = plantIds;
+    }
+
+    public String getUnitIds() {
+        return unitIds;
+    }
+
+    public void setUnitIds(String unitIds) {
+        this.unitIds = unitIds;
+    }
+
+    public String getCheckYear() {
+        return checkYear;
+    }
+
+    public void setCheckYear(String checkYear) {
+        this.checkYear = checkYear;
+    }
+
     public String getRegno()
     {
         return regno;

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

@@ -174,6 +174,15 @@ public class TSpecdevDzsb extends BaseEntity
     @TableField(exist = false)
     private Long hiFlag;
 
+    @TableField(exist = false)
+    private String plantIds;
+
+    @TableField(exist = false)
+    private String unitIds;
+
+    @TableField(exist = false)
+    private String checkYear;
+
     public Long getHiFlag() {
         return hiFlag;
     }
@@ -521,6 +530,30 @@ public class TSpecdevDzsb extends BaseEntity
         return engineer;
     }
 
+    public String getPlantIds() {
+        return plantIds;
+    }
+
+    public void setPlantIds(String plantIds) {
+        this.plantIds = plantIds;
+    }
+
+    public String getUnitIds() {
+        return unitIds;
+    }
+
+    public void setUnitIds(String unitIds) {
+        this.unitIds = unitIds;
+    }
+
+    public String getCheckYear() {
+        return checkYear;
+    }
+
+    public void setCheckYear(String checkYear) {
+        this.checkYear = checkYear;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

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

@@ -202,6 +202,15 @@ public class TSpecdevGl extends BaseEntity
     @TableField(exist = false)
     private Long hiFlag;
 
+    @TableField(exist = false)
+    private String plantIds;
+
+    @TableField(exist = false)
+    private String unitIds;
+
+    @TableField(exist = false)
+    private String checkYear;
+
     public Long getHiFlag() {
         return hiFlag;
     }
@@ -613,6 +622,30 @@ public class TSpecdevGl extends BaseEntity
         return engineer;
     }
 
+    public String getPlantIds() {
+        return plantIds;
+    }
+
+    public void setPlantIds(String plantIds) {
+        this.plantIds = plantIds;
+    }
+
+    public String getUnitIds() {
+        return unitIds;
+    }
+
+    public void setUnitIds(String unitIds) {
+        this.unitIds = unitIds;
+    }
+
+    public String getCheckYear() {
+        return checkYear;
+    }
+
+    public void setCheckYear(String checkYear) {
+        this.checkYear = checkYear;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

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

@@ -248,6 +248,15 @@ public class TSpecdevYlgd extends BaseEntity
     @TableField(exist = false)
     private Long hiFlag;
 
+    @TableField(exist = false)
+    private String plantIds;
+
+    @TableField(exist = false)
+    private String unitIds;
+
+    @TableField(exist = false)
+    private String checkYear;
+
     public Long getHiFlag() {
         return hiFlag;
     }
@@ -763,6 +772,30 @@ public class TSpecdevYlgd extends BaseEntity
         this.isDanger = isDanger;
     }
 
+    public String getPlantIds() {
+        return plantIds;
+    }
+
+    public void setPlantIds(String plantIds) {
+        this.plantIds = plantIds;
+    }
+
+    public String getUnitIds() {
+        return unitIds;
+    }
+
+    public void setUnitIds(String unitIds) {
+        this.unitIds = unitIds;
+    }
+
+    public String getCheckYear() {
+        return checkYear;
+    }
+
+    public void setCheckYear(String checkYear) {
+        this.checkYear = checkYear;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

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

@@ -221,6 +221,15 @@ public class TSpecdevYlrq extends BaseEntity
     @TableField(exist = false)
     private Long hiFlag;
 
+    @TableField(exist = false)
+    private String plantIds;
+
+    @TableField(exist = false)
+    private String unitIds;
+
+    @TableField(exist = false)
+    private String checkYear;
+
     public Long getHiFlag() {
         return hiFlag;
     }
@@ -672,6 +681,30 @@ public class TSpecdevYlrq extends BaseEntity
         return changeTime;
     }
 
+    public String getPlantIds() {
+        return plantIds;
+    }
+
+    public void setPlantIds(String plantIds) {
+        this.plantIds = plantIds;
+    }
+
+    public String getUnitIds() {
+        return unitIds;
+    }
+
+    public void setUnitIds(String unitIds) {
+        this.unitIds = unitIds;
+    }
+
+    public String getCheckYear() {
+        return checkYear;
+    }
+
+    public void setCheckYear(String checkYear) {
+        this.checkYear = checkYear;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

master/src/main/java/com/ruoyi/project/sems/mapper/TSpecdevCcMapper.java

@@ -13,7 +13,7 @@ import com.ruoyi.project.sems.his.domain.TSpechiCc;
 
 /**
  * 特种设备叉车台账Mapper接口
- * 
+ *
  * @author ruoyi
  * @date 2021-07-26
  */
@@ -21,7 +21,7 @@ public interface TSpecdevCcMapper extends BaseMapper<TSpecdevCc>
 {
     /**
      * 查询特种设备叉车台账
-     * 
+     *
      * @param id 特种设备叉车台账ID
      * @return 特种设备叉车台账
      */
@@ -29,16 +29,17 @@ public interface TSpecdevCcMapper extends BaseMapper<TSpecdevCc>
 
     /**
      * 查询特种设备叉车台账列表
-     * 
+     *
      * @param tSpecdevCc 特种设备叉车台账
      * @return 特种设备叉车台账集合
      */
     @DataScopePlant(deptAlias = "d")
     public List<TSpecdevCc> selectTSpecdevCcList(TSpecdevCc tSpecdevCc);
 
+    List<TSpecdevCc> selectTSpecdevCcListByYear(TSpecdevCc tSpecdevCc);
     /**
      * 新增特种设备叉车台账
-     * 
+     *
      * @param tSpecdevCc 特种设备叉车台账
      * @return 结果
      */
@@ -46,7 +47,7 @@ public interface TSpecdevCcMapper extends BaseMapper<TSpecdevCc>
 
     /**
      * 修改特种设备叉车台账
-     * 
+     *
      * @param tSpecdevCc 特种设备叉车台账
      * @return 结果
      */
@@ -54,7 +55,7 @@ public interface TSpecdevCcMapper extends BaseMapper<TSpecdevCc>
 
     /**
      * 删除特种设备叉车台账
-     * 
+     *
      * @param id 特种设备叉车台账ID
      * @return 结果
      */
@@ -62,7 +63,7 @@ public interface TSpecdevCcMapper extends BaseMapper<TSpecdevCc>
 
     /**
      * 批量删除特种设备叉车台账
-     * 
+     *
      * @param ids 需要删除的数据ID
      * @return 结果
      */
@@ -71,4 +72,6 @@ public interface TSpecdevCcMapper extends BaseMapper<TSpecdevCc>
     List<DevData> otherDevCount(Map<String, Object> params);
 
     int updateTSpecdevCcByHi(TSpechiCc hientity);
+
+
 }

master/src/main/java/com/ruoyi/project/sems/mapper/TSpecdevDtMapper.java

@@ -13,7 +13,7 @@ import com.ruoyi.project.sems.his.domain.TSpechiDt;
 
 /**
  * 特种设备电梯台账Mapper接口
- * 
+ *
  * @author ruoyi
  * @date 2021-07-26
  */
@@ -21,7 +21,7 @@ public interface TSpecdevDtMapper extends BaseMapper<TSpecdevDt>
 {
     /**
      * 查询特种设备电梯台账
-     * 
+     *
      * @param id 特种设备电梯台账ID
      * @return 特种设备电梯台账
      */
@@ -29,16 +29,17 @@ public interface TSpecdevDtMapper extends BaseMapper<TSpecdevDt>
 
     /**
      * 查询特种设备电梯台账列表
-     * 
+     *
      * @param tSpecdevDt 特种设备电梯台账
      * @return 特种设备电梯台账集合
      */
     @DataScopePlant(deptAlias = "d")
     public List<TSpecdevDt> selectTSpecdevDtList(TSpecdevDt tSpecdevDt);
 
+    List<TSpecdevDt> selectTSpecdevDtListByYear(TSpecdevDt tSpecdevDt);
     /**
      * 新增特种设备电梯台账
-     * 
+     *
      * @param tSpecdevDt 特种设备电梯台账
      * @return 结果
      */
@@ -46,7 +47,7 @@ public interface TSpecdevDtMapper extends BaseMapper<TSpecdevDt>
 
     /**
      * 修改特种设备电梯台账
-     * 
+     *
      * @param tSpecdevDt 特种设备电梯台账
      * @return 结果
      */
@@ -54,7 +55,7 @@ public interface TSpecdevDtMapper extends BaseMapper<TSpecdevDt>
 
     /**
      * 删除特种设备电梯台账
-     * 
+     *
      * @param id 特种设备电梯台账ID
      * @return 结果
      */
@@ -62,7 +63,7 @@ public interface TSpecdevDtMapper extends BaseMapper<TSpecdevDt>
 
     /**
      * 批量删除特种设备电梯台账
-     * 
+     *
      * @param ids 需要删除的数据ID
      * @return 结果
      */
@@ -71,4 +72,6 @@ public interface TSpecdevDtMapper extends BaseMapper<TSpecdevDt>
     List<DevData> otherDevCount(Map<String, Object> params);
 
     int updateTSpecdevDtByHi(TSpechiDt hientity);
+
+
 }

master/src/main/java/com/ruoyi/project/sems/mapper/TSpecdevDzsbMapper.java

@@ -13,7 +13,7 @@ import com.ruoyi.project.sems.his.domain.TSpechiDzsb;
 
 /**
  * 特种设备吊装设备台账Mapper接口
- * 
+ *
  * @author ruoyi
  * @date 2021-07-26
  */
@@ -21,7 +21,7 @@ public interface TSpecdevDzsbMapper extends BaseMapper<TSpecdevDzsb>
 {
     /**
      * 查询特种设备吊装设备台账
-     * 
+     *
      * @param id 特种设备吊装设备台账ID
      * @return 特种设备吊装设备台账
      */
@@ -29,16 +29,17 @@ public interface TSpecdevDzsbMapper extends BaseMapper<TSpecdevDzsb>
 
     /**
      * 查询特种设备吊装设备台账列表
-     * 
+     *
      * @param tSpecdevDzsb 特种设备吊装设备台账
      * @return 特种设备吊装设备台账集合
      */
     @DataScopePlant(deptAlias = "d")
     public List<TSpecdevDzsb> selectTSpecdevDzsbList(TSpecdevDzsb tSpecdevDzsb);
 
+    List<TSpecdevDzsb> selectTSpecdevDzsbListByYear(TSpecdevDzsb tSpecdevDzsb);
     /**
      * 新增特种设备吊装设备台账
-     * 
+     *
      * @param tSpecdevDzsb 特种设备吊装设备台账
      * @return 结果
      */
@@ -46,7 +47,7 @@ public interface TSpecdevDzsbMapper extends BaseMapper<TSpecdevDzsb>
 
     /**
      * 修改特种设备吊装设备台账
-     * 
+     *
      * @param tSpecdevDzsb 特种设备吊装设备台账
      * @return 结果
      */
@@ -54,7 +55,7 @@ public interface TSpecdevDzsbMapper extends BaseMapper<TSpecdevDzsb>
 
     /**
      * 删除特种设备吊装设备台账
-     * 
+     *
      * @param id 特种设备吊装设备台账ID
      * @return 结果
      */
@@ -62,7 +63,7 @@ public interface TSpecdevDzsbMapper extends BaseMapper<TSpecdevDzsb>
 
     /**
      * 批量删除特种设备吊装设备台账
-     * 
+     *
      * @param ids 需要删除的数据ID
      * @return 结果
      */
@@ -71,4 +72,6 @@ public interface TSpecdevDzsbMapper extends BaseMapper<TSpecdevDzsb>
     List<DevData> otherDevCount(Map<String, Object> params);
 
     int updateTSpecdevDzsbByHi(TSpechiDzsb hientity);
+
+
 }

master/src/main/java/com/ruoyi/project/sems/mapper/TSpecdevGlMapper.java

@@ -11,7 +11,7 @@ import com.ruoyi.project.sems.his.domain.TSpechiGl;
 
 /**
  * 特种设备锅炉台账Mapper接口
- * 
+ *
  * @author ruoyi
  * @date 2021-07-21
  */
@@ -19,7 +19,7 @@ public interface TSpecdevGlMapper extends BaseMapper<TSpecdevGl>
 {
     /**
      * 查询特种设备锅炉台账
-     * 
+     *
      * @param id 特种设备锅炉台账ID
      * @return 特种设备锅炉台账
      */
@@ -27,16 +27,17 @@ public interface TSpecdevGlMapper extends BaseMapper<TSpecdevGl>
 
     /**
      * 查询特种设备锅炉台账列表
-     * 
+     *
      * @param tSpecdevGl 特种设备锅炉台账
      * @return 特种设备锅炉台账集合
      */
     @DataScopePlant(deptAlias = "d")
     public List<TSpecdevGl> selectTSpecdevGlList(TSpecdevGl tSpecdevGl);
 
+    List<TSpecdevGl> selectTSpecdevGlListByYear(TSpecdevGl tSpecdevGl);
     /**
      * 新增特种设备锅炉台账
-     * 
+     *
      * @param tSpecdevGl 特种设备锅炉台账
      * @return 结果
      */
@@ -44,7 +45,7 @@ public interface TSpecdevGlMapper extends BaseMapper<TSpecdevGl>
 
     /**
      * 修改特种设备锅炉台账
-     * 
+     *
      * @param tSpecdevGl 特种设备锅炉台账
      * @return 结果
      */
@@ -52,7 +53,7 @@ public interface TSpecdevGlMapper extends BaseMapper<TSpecdevGl>
 
     /**
      * 删除特种设备锅炉台账
-     * 
+     *
      * @param id 特种设备锅炉台账ID
      * @return 结果
      */
@@ -60,11 +61,13 @@ public interface TSpecdevGlMapper extends BaseMapper<TSpecdevGl>
 
     /**
      * 批量删除特种设备锅炉台账
-     * 
+     *
      * @param ids 需要删除的数据ID
      * @return 结果
      */
     public int deleteTSpecdevGlByIds(Long[] ids);
 
     int updateTSpecdevGlByHi(TSpechiGl hientity);
+
+
 }

master/src/main/java/com/ruoyi/project/sems/mapper/TSpecdevYlgdMapper.java

@@ -41,6 +41,7 @@ public interface TSpecdevYlgdMapper extends BaseMapper<TSpecdevYlgd> {
     @DataScopePlant(deptAlias = "d")
     public List<TSpecdevYlgd> selectTSpecdevYlgdList(TSpecdevYlgd tSpecdevYlgd);
 
+    List<TSpecdevYlgd> selectTSpecdevYlgdListByYear(TSpecdevYlgd tSpecdevYlgd);
     /**
      * 新增特种设备压力管道台账
      *
@@ -74,4 +75,6 @@ public interface TSpecdevYlgdMapper extends BaseMapper<TSpecdevYlgd> {
     public int deleteTSpecdevYlgdByIds(Long[] ids);
 
     int updateTSpecdevYlgdByHi(TSpechiYlgd hientity);
+
+
 }

master/src/main/java/com/ruoyi/project/sems/mapper/TSpecdevYlrqMapper.java

@@ -40,6 +40,7 @@ public interface TSpecdevYlrqMapper extends BaseMapper<TSpecdevYlrq> {
     @DataScopePlant(deptAlias = "d")
     public List<TSpecdevYlrq> selectTSpecdevYlrqList(TSpecdevYlrq tSpecdevYlrq);
 
+    List<TSpecdevYlrq> selectTSpecdevYlrqListByYear(TSpecdevYlrq tSpecdevYlrq);
     /**
      * 新增特种设备压力容器台账
      *
@@ -73,4 +74,6 @@ public interface TSpecdevYlrqMapper extends BaseMapper<TSpecdevYlrq> {
     public int deleteTSpecdevYlrqByIds(Long[] ids);
 
     int updateTSpecdevYlrqByHi(TSpechiYlrq hientity);
+
+
 }

master/src/main/java/com/ruoyi/project/sems/service/ITSpecdevCcService.java

@@ -11,7 +11,7 @@ import com.ruoyi.project.sems.his.domain.TSpechiCc;
 
 /**
  * 特种设备叉车台账Service接口
- * 
+ *
  * @author ruoyi
  * @date 2021-07-26
  */
@@ -19,7 +19,7 @@ public interface ITSpecdevCcService extends IService<TSpecdevCc>
 {
     /**
      * 查询特种设备叉车台账
-     * 
+     *
      * @param id 特种设备叉车台账ID
      * @return 特种设备叉车台账
      */
@@ -27,15 +27,16 @@ public interface ITSpecdevCcService extends IService<TSpecdevCc>
 
     /**
      * 查询特种设备叉车台账列表
-     * 
+     *
      * @param tSpecdevCc 特种设备叉车台账
      * @return 特种设备叉车台账集合
      */
     public List<TSpecdevCc> selectTSpecdevCcList(TSpecdevCc tSpecdevCc);
 
+    List<TSpecdevCc> selectTSpecdevCcListByYear(TSpecdevCc tSpecdevCc);
     /**
      * 新增特种设备叉车台账
-     * 
+     *
      * @param tSpecdevCc 特种设备叉车台账
      * @return 结果
      */
@@ -43,7 +44,7 @@ public interface ITSpecdevCcService extends IService<TSpecdevCc>
 
     /**
      * 修改特种设备叉车台账
-     * 
+     *
      * @param tSpecdevCc 特种设备叉车台账
      * @return 结果
      */
@@ -51,7 +52,7 @@ public interface ITSpecdevCcService extends IService<TSpecdevCc>
 
     /**
      * 批量删除特种设备叉车台账
-     * 
+     *
      * @param ids 需要删除的特种设备叉车台账ID
      * @return 结果
      */
@@ -59,7 +60,7 @@ public interface ITSpecdevCcService extends IService<TSpecdevCc>
 
     /**
      * 删除特种设备叉车台账信息
-     * 
+     *
      * @param id 特种设备叉车台账ID
      * @return 结果
      */
@@ -68,4 +69,6 @@ public interface ITSpecdevCcService extends IService<TSpecdevCc>
     List<DevData> otherDevCount(Map<String, Object> params);
 
     int updateTSpecdevCcByHi(TSpechiCc hientity);
+
+
 }

master/src/main/java/com/ruoyi/project/sems/service/ITSpecdevDtService.java

@@ -11,7 +11,7 @@ import com.ruoyi.project.sems.his.domain.TSpechiDt;
 
 /**
  * 特种设备电梯台账Service接口
- * 
+ *
  * @author ruoyi
  * @date 2021-07-26
  */
@@ -19,7 +19,7 @@ public interface ITSpecdevDtService extends IService<TSpecdevDt>
 {
     /**
      * 查询特种设备电梯台账
-     * 
+     *
      * @param id 特种设备电梯台账ID
      * @return 特种设备电梯台账
      */
@@ -27,15 +27,17 @@ public interface ITSpecdevDtService extends IService<TSpecdevDt>
 
     /**
      * 查询特种设备电梯台账列表
-     * 
+     *
      * @param tSpecdevDt 特种设备电梯台账
      * @return 特种设备电梯台账集合
      */
     public List<TSpecdevDt> selectTSpecdevDtList(TSpecdevDt tSpecdevDt);
 
+    List<TSpecdevDt> selectTSpecdevDtListByYear(TSpecdevDt tSpecdevDt);
+
     /**
      * 新增特种设备电梯台账
-     * 
+     *
      * @param tSpecdevDt 特种设备电梯台账
      * @return 结果
      */
@@ -43,7 +45,7 @@ public interface ITSpecdevDtService extends IService<TSpecdevDt>
 
     /**
      * 修改特种设备电梯台账
-     * 
+     *
      * @param tSpecdevDt 特种设备电梯台账
      * @return 结果
      */
@@ -51,7 +53,7 @@ public interface ITSpecdevDtService extends IService<TSpecdevDt>
 
     /**
      * 批量删除特种设备电梯台账
-     * 
+     *
      * @param ids 需要删除的特种设备电梯台账ID
      * @return 结果
      */
@@ -59,7 +61,7 @@ public interface ITSpecdevDtService extends IService<TSpecdevDt>
 
     /**
      * 删除特种设备电梯台账信息
-     * 
+     *
      * @param id 特种设备电梯台账ID
      * @return 结果
      */
@@ -68,4 +70,6 @@ public interface ITSpecdevDtService extends IService<TSpecdevDt>
     List<DevData> otherDevCount(Map<String, Object> params);
 
     int updateTSpecdevDtByHi(TSpechiDt hientity);
+
+
 }

master/src/main/java/com/ruoyi/project/sems/service/ITSpecdevDzsbService.java

@@ -11,7 +11,7 @@ import com.ruoyi.project.sems.his.domain.TSpechiDzsb;
 
 /**
  * 特种设备吊装设备台账Service接口
- * 
+ *
  * @author ruoyi
  * @date 2021-07-26
  */
@@ -19,7 +19,7 @@ public interface ITSpecdevDzsbService extends IService<TSpecdevDzsb>
 {
     /**
      * 查询特种设备吊装设备台账
-     * 
+     *
      * @param id 特种设备吊装设备台账ID
      * @return 特种设备吊装设备台账
      */
@@ -27,15 +27,16 @@ public interface ITSpecdevDzsbService extends IService<TSpecdevDzsb>
 
     /**
      * 查询特种设备吊装设备台账列表
-     * 
+     *
      * @param tSpecdevDzsb 特种设备吊装设备台账
      * @return 特种设备吊装设备台账集合
      */
     public List<TSpecdevDzsb> selectTSpecdevDzsbList(TSpecdevDzsb tSpecdevDzsb);
 
+    List<TSpecdevDzsb> selectTSpecdevDzsbListByYear(TSpecdevDzsb tSpecdevDzsb);
     /**
      * 新增特种设备吊装设备台账
-     * 
+     *
      * @param tSpecdevDzsb 特种设备吊装设备台账
      * @return 结果
      */
@@ -43,7 +44,7 @@ public interface ITSpecdevDzsbService extends IService<TSpecdevDzsb>
 
     /**
      * 修改特种设备吊装设备台账
-     * 
+     *
      * @param tSpecdevDzsb 特种设备吊装设备台账
      * @return 结果
      */
@@ -51,7 +52,7 @@ public interface ITSpecdevDzsbService extends IService<TSpecdevDzsb>
 
     /**
      * 批量删除特种设备吊装设备台账
-     * 
+     *
      * @param ids 需要删除的特种设备吊装设备台账ID
      * @return 结果
      */
@@ -59,7 +60,7 @@ public interface ITSpecdevDzsbService extends IService<TSpecdevDzsb>
 
     /**
      * 删除特种设备吊装设备台账信息
-     * 
+     *
      * @param id 特种设备吊装设备台账ID
      * @return 结果
      */
@@ -68,4 +69,6 @@ public interface ITSpecdevDzsbService extends IService<TSpecdevDzsb>
     List<DevData> otherDevCount(Map<String, Object> params);
 
     int updateTSpecdevDzsbByHi(TSpechiDzsb hientity);
+
+
 }

master/src/main/java/com/ruoyi/project/sems/service/ITSpecdevGlService.java

@@ -9,7 +9,7 @@ import com.ruoyi.project.sems.his.domain.TSpechiGl;
 
 /**
  * 特种设备锅炉台账Service接口
- * 
+ *
  * @author ruoyi
  * @date 2021-07-21
  */
@@ -17,7 +17,7 @@ public interface ITSpecdevGlService extends IService<TSpecdevGl>
 {
     /**
      * 查询特种设备锅炉台账
-     * 
+     *
      * @param id 特种设备锅炉台账ID
      * @return 特种设备锅炉台账
      */
@@ -25,15 +25,15 @@ public interface ITSpecdevGlService extends IService<TSpecdevGl>
 
     /**
      * 查询特种设备锅炉台账列表
-     * 
+     *
      * @param tSpecdevGl 特种设备锅炉台账
      * @return 特种设备锅炉台账集合
      */
     public List<TSpecdevGl> selectTSpecdevGlList(TSpecdevGl tSpecdevGl);
-
+    List<TSpecdevGl> selectTSpecdevGlListByYear(TSpecdevGl tSpecdevGl);
     /**
      * 新增特种设备锅炉台账
-     * 
+     *
      * @param tSpecdevGl 特种设备锅炉台账
      * @return 结果
      */
@@ -41,7 +41,7 @@ public interface ITSpecdevGlService extends IService<TSpecdevGl>
 
     /**
      * 修改特种设备锅炉台账
-     * 
+     *
      * @param tSpecdevGl 特种设备锅炉台账
      * @return 结果
      */
@@ -49,7 +49,7 @@ public interface ITSpecdevGlService extends IService<TSpecdevGl>
 
     /**
      * 批量删除特种设备锅炉台账
-     * 
+     *
      * @param ids 需要删除的特种设备锅炉台账ID
      * @return 结果
      */
@@ -57,11 +57,13 @@ public interface ITSpecdevGlService extends IService<TSpecdevGl>
 
     /**
      * 删除特种设备锅炉台账信息
-     * 
+     *
      * @param id 特种设备锅炉台账ID
      * @return 结果
      */
     public int deleteTSpecdevGlById(Long id);
 
     int updateTSpecdevGlByHi(TSpechiGl hientity);
+
+
 }

master/src/main/java/com/ruoyi/project/sems/service/ITSpecdevYlgdService.java

@@ -9,7 +9,7 @@ import com.ruoyi.project.sems.his.domain.TSpechiYlgd;
 
 /**
  * 特种设备压力管道台账Service接口
- * 
+ *
  * @author ruoyi
  * @date 2021-07-22
  */
@@ -17,7 +17,7 @@ public interface ITSpecdevYlgdService extends IService<TSpecdevYlgd>
 {
     /**
      * 查询特种设备压力管道台账
-     * 
+     *
      * @param id 特种设备压力管道台账ID
      * @return 特种设备压力管道台账
      */
@@ -25,15 +25,15 @@ public interface ITSpecdevYlgdService extends IService<TSpecdevYlgd>
 
     /**
      * 查询特种设备压力管道台账列表
-     * 
+     *
      * @param tSpecdevYlgd 特种设备压力管道台账
      * @return 特种设备压力管道台账集合
      */
     public List<TSpecdevYlgd> selectTSpecdevYlgdList(TSpecdevYlgd tSpecdevYlgd);
-
+    List<TSpecdevYlgd> selectTSpecdevYlgdListByYear(TSpecdevYlgd tSpecdevYlgd);
     /**
      * 新增特种设备压力管道台账
-     * 
+     *
      * @param tSpecdevYlgd 特种设备压力管道台账
      * @return 结果
      */
@@ -41,7 +41,7 @@ public interface ITSpecdevYlgdService extends IService<TSpecdevYlgd>
 
     /**
      * 修改特种设备压力管道台账
-     * 
+     *
      * @param tSpecdevYlgd 特种设备压力管道台账
      * @return 结果
      */
@@ -49,7 +49,7 @@ public interface ITSpecdevYlgdService extends IService<TSpecdevYlgd>
 
     /**
      * 批量删除特种设备压力管道台账
-     * 
+     *
      * @param ids 需要删除的特种设备压力管道台账ID
      * @return 结果
      */
@@ -57,11 +57,13 @@ public interface ITSpecdevYlgdService extends IService<TSpecdevYlgd>
 
     /**
      * 删除特种设备压力管道台账信息
-     * 
+     *
      * @param id 特种设备压力管道台账ID
      * @return 结果
      */
     public int deleteTSpecdevYlgdById(Long id);
 
     int updateTSpecdevYlgdByHi(TSpechiYlgd hientity);
+
+
 }

master/src/main/java/com/ruoyi/project/sems/service/ITSpecdevYlrqService.java

@@ -9,7 +9,7 @@ import com.ruoyi.project.sems.his.domain.TSpechiYlrq;
 
 /**
  * 特种设备压力容器台账Service接口
- * 
+ *
  * @author ruoyi
  * @date 2021-06-30
  */
@@ -17,7 +17,7 @@ public interface ITSpecdevYlrqService extends IService<TSpecdevYlrq>
 {
     /**
      * 查询特种设备压力容器台账
-     * 
+     *
      * @param id 特种设备压力容器台账ID
      * @return 特种设备压力容器台账
      */
@@ -25,15 +25,16 @@ public interface ITSpecdevYlrqService extends IService<TSpecdevYlrq>
 
     /**
      * 查询特种设备压力容器台账列表
-     * 
+     *
      * @param tSpecdevYlrq 特种设备压力容器台账
      * @return 特种设备压力容器台账集合
      */
     public List<TSpecdevYlrq> selectTSpecdevYlrqList(TSpecdevYlrq tSpecdevYlrq);
 
+    List<TSpecdevYlrq> selectTSpecdevYlrqListByYear(TSpecdevYlrq tSpecdevYlrq);
     /**
      * 新增特种设备压力容器台账
-     * 
+     *
      * @param tSpecdevYlrq 特种设备压力容器台账
      * @return 结果
      */
@@ -41,7 +42,7 @@ public interface ITSpecdevYlrqService extends IService<TSpecdevYlrq>
 
     /**
      * 修改特种设备压力容器台账
-     * 
+     *
      * @param tSpecdevYlrq 特种设备压力容器台账
      * @return 结果
      */
@@ -49,7 +50,7 @@ public interface ITSpecdevYlrqService extends IService<TSpecdevYlrq>
 
     /**
      * 批量删除特种设备压力容器台账
-     * 
+     *
      * @param ids 需要删除的特种设备压力容器台账ID
      * @return 结果
      */
@@ -57,11 +58,13 @@ public interface ITSpecdevYlrqService extends IService<TSpecdevYlrq>
 
     /**
      * 删除特种设备压力容器台账信息
-     * 
+     *
      * @param id 特种设备压力容器台账ID
      * @return 结果
      */
     public int deleteTSpecdevYlrqById(Long id);
 
     int updateTSpecdevYlrqByHi(TSpechiYlrq hientity);
+
+
 }

master/src/main/java/com/ruoyi/project/sems/service/impl/TSpecdevCcServiceImpl.java

@@ -50,6 +50,11 @@ public class TSpecdevCcServiceImpl extends ServiceImpl<TSpecdevCcMapper, TSpecde
         return tSpecdevCcMapper.selectTSpecdevCcList(tSpecdevCc);
     }
 
+    @Override
+    public List<TSpecdevCc> selectTSpecdevCcListByYear(TSpecdevCc tSpecdevCc) {
+        return tSpecdevCcMapper.selectTSpecdevCcListByYear(tSpecdevCc);
+    }
+
     /**
      * 新增特种设备叉车台账
      *

master/src/main/java/com/ruoyi/project/sems/service/impl/TSpecdevDtServiceImpl.java

@@ -50,6 +50,11 @@ public class TSpecdevDtServiceImpl extends ServiceImpl<TSpecdevDtMapper, TSpecde
         return tSpecdevDtMapper.selectTSpecdevDtList(tSpecdevDt);
     }
 
+    @Override
+    public List<TSpecdevDt> selectTSpecdevDtListByYear(TSpecdevDt tSpecdevDt) {
+        return tSpecdevDtMapper.selectTSpecdevDtListByYear(tSpecdevDt);
+    }
+
     /**
      * 新增特种设备电梯台账
      *

master/src/main/java/com/ruoyi/project/sems/service/impl/TSpecdevDzsbServiceImpl.java

@@ -50,6 +50,11 @@ public class TSpecdevDzsbServiceImpl extends ServiceImpl<TSpecdevDzsbMapper, TSp
         return tSpecdevDzsbMapper.selectTSpecdevDzsbList(tSpecdevDzsb);
     }
 
+    @Override
+    public List<TSpecdevDzsb> selectTSpecdevDzsbListByYear(TSpecdevDzsb tSpecdevDzsb) {
+        return tSpecdevDzsbMapper.selectTSpecdevDzsbListByYear(tSpecdevDzsb);
+    }
+
     /**
      * 新增特种设备吊装设备台账
      *

master/src/main/java/com/ruoyi/project/sems/service/impl/TSpecdevGlServiceImpl.java

@@ -48,6 +48,11 @@ public class TSpecdevGlServiceImpl extends ServiceImpl<TSpecdevGlMapper, TSpecde
         return tSpecdevGlMapper.selectTSpecdevGlList(tSpecdevGl);
     }
 
+    @Override
+    public List<TSpecdevGl> selectTSpecdevGlListByYear(TSpecdevGl tSpecdevGl) {
+        return  tSpecdevGlMapper.selectTSpecdevGlListByYear(tSpecdevGl);
+    }
+
     /**
      * 新增特种设备锅炉台账
      *

master/src/main/java/com/ruoyi/project/sems/service/impl/TSpecdevYlgdServiceImpl.java

@@ -48,6 +48,11 @@ public class TSpecdevYlgdServiceImpl extends ServiceImpl<TSpecdevYlgdMapper, TSp
         return tSpecdevYlgdMapper.selectTSpecdevYlgdList(tSpecdevYlgd);
     }
 
+    @Override
+    public List<TSpecdevYlgd> selectTSpecdevYlgdListByYear(TSpecdevYlgd tSpecdevYlgd) {
+         return tSpecdevYlgdMapper.selectTSpecdevYlgdListByYear(tSpecdevYlgd);
+    }
+
     /**
      * 新增特种设备压力管道台账
      *

master/src/main/java/com/ruoyi/project/sems/service/impl/TSpecdevYlrqServiceImpl.java

@@ -48,6 +48,11 @@ public class TSpecdevYlrqServiceImpl extends ServiceImpl<TSpecdevYlrqMapper, TSp
         return tSpecdevYlrqMapper.selectTSpecdevYlrqList(tSpecdevYlrq);
     }
 
+    @Override
+    public List<TSpecdevYlrq> selectTSpecdevYlrqListByYear(TSpecdevYlrq tSpecdevYlrq) {
+        return tSpecdevYlrqMapper.selectTSpecdevYlrqListByYear(tSpecdevYlrq);
+    }
+
     /**
      * 新增特种设备压力容器台账
      *

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

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.project.sems.mapper.TSpecdevCcMapper">
-    
+
     <resultMap type="TSpecdevCc" id="TSpecdevCcResult">
         <result property="id"    column="id"    />
         <result property="plantCode"    column="plant_code"    />
@@ -59,7 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTSpecdevCcList" parameterType="TSpecdevCc" resultMap="TSpecdevCcResult">
         <include refid="selectTSpecdevCcVo"/>
-        <where>  
+        <where>
             <if test="plantCode != null  and plantCode != ''"> and plant_code = #{plantCode}</if>
             <if test="carNo != null  and carNo != ''"> and car_no = #{carNo}</if>
             <if test="devname != null  and devname != ''"> and devname like concat(concat('%', #{devname}), '%')</if>
@@ -70,12 +70,42 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <!-- 数据范围过滤 -->
         ${params.dataScopePlant}
     </select>
-    
+
+    <select id="selectTSpecdevCcListByYear" parameterType="TSpecdevCc" resultMap="TSpecdevCcResult">
+        <include refid="selectTSpecdevCcVo"/>
+        <where>
+            <if test="status != null ">and d.status = #{status}</if>
+            <if test="checkYear != null ">and to_char(NEXT_WARN_DATE,'yyyyMM') = #{checkYear}</if>
+            <if test="plantIds != null  and plantIds != ''">
+                and
+                d.plant_code in
+                <foreach collection="plantIds.split(',')" item="item" index="index"
+                         open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="unitIds != null  and unitIds != ''">
+                and
+                (
+                d.plant_code in
+                <foreach collection="unitIds.split(',')" item="item" index="index"
+                         open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+                )
+            </if>
+            and d.del_flag = 0
+        </where>
+
+    </select>
+
+
+
     <select id="selectTSpecdevCcById" parameterType="Long" resultMap="TSpecdevCcResult">
         <include refid="selectTSpecdevCcVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertTSpecdevCc" parameterType="TSpecdevCc">
         <selectKey keyProperty="id" resultType="long" order="BEFORE">
             SELECT seq_t_specdev_ylrq.NEXTVAL as id FROM DUAL
@@ -297,5 +327,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
         GROUP BY to_char(t.NEXT_WARN_DATE,'yyyyMM')
     </select>
-    
-</mapper>
+
+</mapper>

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

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.project.sems.mapper.TSpecdevDtMapper">
-    
+
     <resultMap type="TSpecdevDt" id="TSpecdevDtResult">
         <result property="id"    column="id"    />
         <result property="plantCode"    column="plant_code"    />
@@ -52,7 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTSpecdevDtList" parameterType="TSpecdevDt" resultMap="TSpecdevDtResult">
         <include refid="selectTSpecdevDtVo"/>
-        <where>  
+        <where>
             <if test="plantCode != null  and plantCode != ''"> and plant_code = #{plantCode}</if>
             <if test="unit != null  and unit != ''"> and unit = #{unit}</if>
             <if test="devname != null  and devname != ''"> and devname like concat(concat('%', #{devname}), '%')</if>
@@ -63,12 +63,48 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <!-- 数据范围过滤 -->
         ${params.dataScopePlant}
     </select>
-    
+
+    <select id="selectTSpecdevDtListByYear" parameterType="TSpecdevDt" resultMap="TSpecdevDtResult">
+        <include refid="selectTSpecdevDtVo"/>
+        <where>
+            <if test="status != null ">and d.status = #{status}</if>
+            <if test="checkYear != null ">and to_char(NEXT_WARN_DATE,'yyyyMM') = #{checkYear}</if>
+            <if test="plantIds != null  and plantIds != ''">
+                and
+                d.plant_code in
+                <foreach collection="plantIds.split(',')" item="item" index="index"
+                         open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="unitIds != null  and unitIds != ''">
+                and
+                (
+                d.unit in
+                <foreach collection="unitIds.split(',')" item="item" index="index"
+                         open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+                or
+                d.plant_code in
+                <foreach collection="unitIds.split(',')" item="item" index="index"
+                         open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+                )
+            </if>
+            and d.del_flag = 0
+        </where>
+
+    </select>
+
+
+
     <select id="selectTSpecdevDtById" parameterType="Long" resultMap="TSpecdevDtResult">
         <include refid="selectTSpecdevDtVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertTSpecdevDt" parameterType="TSpecdevDt">
         <selectKey keyProperty="id" resultType="long" order="BEFORE">
             SELECT seq_t_specdev_ylrq.NEXTVAL as id FROM DUAL
@@ -263,4 +299,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
         GROUP BY to_char(t.NEXT_WARN_DATE,'yyyyMM')
     </select>
-</mapper>
+</mapper>

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

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.project.sems.mapper.TSpecdevDzsbMapper">
-    
+
     <resultMap type="TSpecdevDzsb" id="TSpecdevDzsbResult">
         <result property="id"    column="id"    />
         <result property="plantCode"    column="plant_code"    />
@@ -52,7 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTSpecdevDzsbList" parameterType="TSpecdevDzsb" resultMap="TSpecdevDzsbResult">
         <include refid="selectTSpecdevDzsbVo"/>
-        <where>  
+        <where>
             <if test="plantCode != null  and plantCode != ''"> and plant_code = #{plantCode}</if>
             <if test="unit != null  and unit != ''"> and unit = #{unit}</if>
             <if test="devname != null  and devname != ''"> and devname like concat(concat('%', #{devname}), '%')</if>
@@ -64,12 +64,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <!-- 数据范围过滤 -->
         ${params.dataScopePlant}
     </select>
-    
+    <select id="selectTSpecdevDzsbListByYear" parameterType="TSpecdevDzsb" resultMap="TSpecdevDzsbResult">
+        <include refid="selectTSpecdevDzsbVo"/>
+        <where>
+            <if test="checkYear != null ">and to_char(NEXT_WARN_DATE,'yyyyMM') = #{checkYear}</if>
+            <if test="plantIds != null  and plantIds != ''">
+                and
+                d.plant_code in
+                <foreach collection="plantIds.split(',')" item="item" index="index"
+                         open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            and d.del_flag = 0
+            and d.status = 1
+        </where>
+
+    </select>
+
     <select id="selectTSpecdevDzsbById" parameterType="Long" resultMap="TSpecdevDzsbResult">
         <include refid="selectTSpecdevDzsbVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertTSpecdevDzsb" parameterType="TSpecdevDzsb">
         <selectKey keyProperty="id" resultType="long" order="BEFORE">
             SELECT seq_t_specdev_ylrq.NEXTVAL as id FROM DUAL
@@ -254,14 +271,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                  open="(" close=")" separator=",">
             #{plant}
         </foreach>
-        <if test="unitIds.size() > 0">
-            and t.PLANT_CODE in
-            <foreach collection="unitIds" item="unitId" index="index"
-                     open="(" close=")" separator=",">
-                #{unitId}
-            </foreach>
-        </if>
         GROUP BY to_char(t.NEXT_WARN_DATE,'yyyyMM')
     </select>
-    
-</mapper>
+
+</mapper>

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

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.project.sems.mapper.TSpecdevGlMapper">
-    
+
     <resultMap type="TSpecdevGl" id="TSpecdevGlResult">
         <result property="id"    column="id"    />
         <result property="plantCode"    column="plant_code"    />
@@ -59,7 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTSpecdevGlList" parameterType="TSpecdevGl" resultMap="TSpecdevGlResult">
         <include refid="selectTSpecdevGlVo"/>
-        <where>  
+        <where>
             <if test="plantCode != null  and plantCode != ''"> and plant_code = #{plantCode}</if>
             <if test="unit != null  and unit != ''"> and unit = #{unit}</if>
             <if test="devname != null  and devname != ''"> and devname like concat(concat('%', #{devname}), '%')</if>
@@ -91,12 +91,47 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <!-- 数据范围过滤 -->
         ${params.dataScopePlant}
     </select>
-    
+
+    <select id="selectTSpecdevGlListByYear" parameterType="TSpecdevGl" resultMap="TSpecdevGlResult">
+        <include refid="selectTSpecdevGlVo"/>
+        <where>
+            <if test="status != null ">and d.status = #{status}</if>
+            <if test="hiType == 1 ">and to_char(NEXT_WARN_DATE,'yyyy') = #{checkYear}</if>
+            <if test="hiType == 2 ">and to_char(out_next_warn_date,'yyyy') = #{checkYear}</if>
+            <if test="plantIds != null  and plantIds != ''">
+                and
+                d.plant_code in
+                <foreach collection="plantIds.split(',')" item="item" index="index"
+                         open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="unitIds != null  and unitIds != ''">
+                and
+                (
+                d.unit in
+                <foreach collection="unitIds.split(',')" item="item" index="index"
+                         open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+                or
+                d.plant_code in
+                <foreach collection="unitIds.split(',')" item="item" index="index"
+                         open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+                )
+            </if>
+            and d.del_flag = 0
+        </where>
+    </select>
+
+
     <select id="selectTSpecdevGlById" parameterType="Long" resultMap="TSpecdevGlResult">
         <include refid="selectTSpecdevGlVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertTSpecdevGl" parameterType="TSpecdevGl">
         <selectKey keyProperty="id" resultType="long" order="BEFORE">
             SELECT seq_t_specdev_ylrq.NEXTVAL as id FROM DUAL
@@ -298,5 +333,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </update>
-    
-</mapper>
+
+</mapper>

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

@@ -166,6 +166,40 @@
         ${params.dataScopePlant}
     </select>
 
+
+    <select id="selectTSpecdevYlgdListByYear" parameterType="TSpecdevYlgd" resultMap="TSpecdevYlgdResult">
+        <include refid="selectTSpecdevYlgdVo"/>
+        <where>
+            <if test="status != null ">and d.status = #{status}</if>
+            <if test="checkYear != null ">and to_char(NEXT_WARN_DATE,'yyyy') = #{checkYear}</if>
+            <if test="plantIds != null  and plantIds != ''">
+                and
+                d.plant_code in
+                <foreach collection="plantIds.split(',')" item="item" index="index"
+                         open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="unitIds != null  and unitIds != ''">
+                and
+                (
+                d.unit in
+                <foreach collection="unitIds.split(',')" item="item" index="index"
+                         open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+                or
+                d.plant_code in
+                <foreach collection="unitIds.split(',')" item="item" index="index"
+                         open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+                )
+            </if>
+            and d.del_flag = 0
+        </where>
+    </select>
+
     <select id="selectTSpecdevYlgdById" parameterType="Long" resultMap="TSpecdevYlgdResult">
         <include refid="selectTSpecdevYlgdVo"/>
         where id = #{id}
@@ -435,4 +469,4 @@
         </foreach>
     </update>
 
-</mapper>
+</mapper>

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

@@ -139,6 +139,40 @@
         ${params.dataScopePlant}
     </select>
 
+    <select id="selectTSpecdevYlrqListByYear" parameterType="TSpecdevYlrq" resultMap="TSpecdevYlrqResult">
+        <include refid="selectTSpecdevYlrqVo"/>
+        <where>
+            <if test="status != null ">and d.status = #{status}</if>
+            <if test="checkYear != null ">and to_char(NEXT_WARN_DATE,'yyyy') = #{checkYear}</if>
+            <if test="plantIds != null  and plantIds != ''">
+                and
+                d.plant_code in
+                <foreach collection="plantIds.split(',')" item="item" index="index"
+                         open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="unitIds != null  and unitIds != ''">
+                and
+                (
+                d.unit in
+                <foreach collection="unitIds.split(',')" item="item" index="index"
+                         open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+                or
+                d.plant_code in
+                <foreach collection="unitIds.split(',')" item="item" index="index"
+                         open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+                )
+            </if>
+            and d.del_flag = 0
+        </where>
+    </select>
+
+
     <select id="selectTSpecdevYlrqById" parameterType="Long" resultMap="TSpecdevYlrqResult">
         <include refid="selectTSpecdevYlrqVo"/>
         where id = #{id}
@@ -365,4 +399,4 @@
         </foreach>
     </update>
 
-</mapper>
+</mapper>

ui/src/api/sems/home.js

@@ -35,6 +35,15 @@ export function devYlrqData(data) {
   })
 }
 
+// 查询压力容器
+export function devYlrqDataByYear(data) {
+  return request({
+    url: '/sems/home/devYlrqDataByYear',
+    method: 'get',
+    params: data
+  })
+}
+
 // 查询压力管道
 export function devYlgdData(data) {
   return request({
@@ -43,7 +52,14 @@ export function devYlgdData(data) {
     data: data
   })
 }
-
+// 查询压力管道
+export function devYlgdDataByYear(data) {
+  return request({
+    url: '/sems/home/devYlgdDataByYear',
+    method: 'get',
+    params: data
+  })
+}
 
 // 查询guolu
 export function devGlData(data) {
@@ -53,7 +69,14 @@ export function devGlData(data) {
     data: data
   })
 }
-
+// 查询guolu
+export function devGlDataByYear(data) {
+  return request({
+    url: '/sems/home/devGlDataByYear',
+    method: 'get',
+    params: data
+  })
+}
 // 查询qita
 export function devOtherData(data) {
   return request({
@@ -62,6 +85,30 @@ export function devOtherData(data) {
     data: data
   })
 }
+// 查询guolu
+export function devCcDataByYear(data) {
+  return request({
+    url: '/sems/home/devCcDataByYear',
+    method: 'get',
+    params: data
+  })
+}
+// 查询guolu
+export function devDtDataByYear(data) {
+  return request({
+    url: '/sems/home/devDtDataByYear',
+    method: 'get',
+    params: data
+  })
+}
+// 查询guolu
+export function devDzsbDataByYear(data) {
+  return request({
+    url: '/sems/home/devDzsbDataByYear',
+    method: 'get',
+    params: data
+  })
+}
 
 // 查询历史申请
 export function finishApproveData(data) {

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

@@ -62,6 +62,7 @@
         </el-button>
       </el-col>
       <el-col :span="1.5">
+        <el-button
         <el-button
           type="warning"
           size="mini"

ui/src/views/sems/specanalysis/BoilerChart.vue

@@ -1,11 +1,74 @@
 <template>
   <div class="app-container-Boiler">
     <div id="BoilerChart" :style="{height:height,width:width}"></div>
+    <el-dialog :title="title" :visible.sync="open" width="1600px" >
+      <el-table  ref="deviceTable" :data="specGlList"
+                 border >
+        <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="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="devno" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('设备名称')" align="center" prop="devname" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('型号')" align="center" prop="model" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('使用证号码')" align="center" prop="useno" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('注册编号')" align="center" prop="regno" :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="burnMode" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('水处理方式')" align="center" prop="waterMode" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('燃烧种类')" align="center" prop="burnKind" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('额定出力')" align="center" prop="ratedPower" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('设计温度')+'℃'" align="center" prop="desTemp" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('操作温度')+'℃'" align="center" prop="optTemp" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('设计压力')+'MPa(G)'" align="center" prop="desPressure" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('操作压力')+'MPa(G)'" align="center" prop="optPressure" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('投用日期')" align="center" prop="submitdate" width="100">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.submitdate, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column :label="$t('检测单位')" align="center" prop="checkUnit" :show-overflow-tooltip="true"/>
+
+        <el-table-column :label="$t('本次内部检验日期')" align="center" prop="warnDate" width="100">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.warnDate, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column :label="$t('内部检查结论')" align="center" prop="checkConclusion" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('内部检验报告编号')" align="center" prop="reportNo" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('下次内部检验日期')" align="center" prop="nextWarnDate" width="100" sortable="custom">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.nextWarnDate, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column :label="$t('本次外部检测日期')" align="center" prop="outWarnDate" width="100">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.outWarnDate, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column :label="$t('外部检验结论')" align="center" prop="outCheckConclusion" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('外部检验报告编号')" align="center" prop="outReportNo" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('下次外部检测日期')" align="center" prop="outNextWarnDate" width="100" sortable="custom">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.outNextWarnDate, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column :label="$t('备注')" align="center" prop="remarks" :show-overflow-tooltip="true"/>
+      </el-table>
+
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
+      />
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import {devGlData} from "@/api/sems/home";
+import {devGlData, devGlDataByYear} from "@/api/sems/home";
 
 export default {
   props: {
@@ -24,6 +87,29 @@ export default {
   data() {
     return {
       chart: null,
+      open: false,
+      title: '设备列表',
+      // 总条数
+      total: 0,
+      specGlList: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        orderByColumn:"id",
+        isAsc:"desc",
+        plantCode: null,
+        unit: null,
+        devname: null,
+        approveTime: null,
+        changeTime: null,
+        plantMaint: null,
+        status: 1,
+        plantIds: null,
+        unitIds: null,
+        checkYear: null,
+        hiType: null
+      },
       optionGl: {
         tooltip: {
           trigger: 'axis',
@@ -123,13 +209,40 @@ export default {
         'plantIds': plantIds,
         'unitIds': unitIds
       }
+      this.queryParams.plantIds = plantIds.join()
+      this.queryParams.unitIds = unitIds.join()
       devGlData(params).then(response => {
         this.optionGl.xAxis[0].data = response.data.GlData.yearList
         this.optionGl.series[0].data = response.data.GlData.countList
         this.optionGl.series[1].data = response.data.GlData.countList2
         this.initChart()
+        let _this = this
+        this.chart.on('click', function(params) {
+          // 控制台打印数据的名称
+          console.log(params.seriesName);
+          if (params.seriesName == '内检') {
+            _this.queryParams.hiType = 1
+          }else {
+            _this.queryParams.hiType = 2
+            }
+          _this.open = true
+          _this.queryParams.checkYear = params.name
+          _this.getList()
+        });
       });
-    }
+    },
+    /** 查询特种设备锅炉台账列表 */
+    getList() {
+      this.loading = true;
+      devGlDataByYear(this.queryParams).then(response => {
+        this.specGlList = response.rows;
+        this.total = response.total;
+        this.$nextTick(() => {
+          this.$refs.deviceTable.doLayout(); // 解决表格错位
+        });
+        this.loading = false;
+      });
+    },
   }
 }
 </script>

ui/src/views/sems/specanalysis/LiftChart.vue

@@ -1,11 +1,149 @@
 <template>
   <div class="app-container-Lift">
     <div id="LiftChart" :style="{height:height,width:width}"></div>
+    <el-dialog :title="title" :visible.sync="openDt" width="1600px" >
+      <el-table  ref="deviceTable" :data="specDtList"
+                 border >
+        <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="docno" :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"/>
+        <el-table-column :label="$t('额定载重量')+'(kg)'" align="center" prop="capacity" :show-overflow-tooltip="true"/>
+        <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>
+          </template>
+        </el-table-column>
+        <el-table-column :label="$t('检验日期')" align="center" prop="warnDate" width="100">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.warnDate, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column :label="$t('检验单位')" align="center" prop="checkUnit" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('报告编号')" align="center" prop="reportNo" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('下次检验日期')" align="center" prop="nextWarnDate" width="100"  sortable="custom">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.nextWarnDate, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column :label="$t('备注')" align="center" prop="remarks" :show-overflow-tooltip="true"/>
+      </el-table>
+
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getDtList"
+      />
+    </el-dialog>
+    <el-dialog :title="title" :visible.sync="openCc" width="1600px" >
+      <el-table  ref="deviceTable" :data="specCcList"
+                 border >
+        <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="useDept" :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"/>
+        <el-table-column :label="$t('发动机编号')" align="center" prop="engineNo" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('注册代码')" align="center" prop="regno" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('颜色')" align="center" prop="color" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('工作能力')+'(Ton)'" align="center" prop="capacity" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('设备品种(名称)')" align="center" prop="devname" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('动力形式')" align="center" prop="engineType" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('型号')" align="center" prop="model" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('车架（地盘）编号')" align="center" prop="frameNo" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('产品编号')" align="center" prop="productNo" :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="exUnit" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('防爆级别')" align="center" prop="exGrade" :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>
+          </template>
+        </el-table-column>
+        <el-table-column :label="$t('检验策略')" align="center" prop="checkStrategy" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('检验日期')" align="center" prop="warnDate" width="100">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.warnDate, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column :label="$t('下次检验日期')" align="center" prop="nextWarnDate" width="100" sortable="custom">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.nextWarnDate, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column :label="$t('报告编号')" align="center" prop="reportNo" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('资产归属形式')" align="center" prop="assetOwner" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('备注')" align="center" prop="remarks" :show-overflow-tooltip="true"/>
+      </el-table>
+
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getCcList"
+      />
+    </el-dialog>
+    <el-dialog :title="title" :visible.sync="openDzsb" width="1600px" >
+      <el-table  ref="deviceTable" :data="specDzsbList"
+                 border >
+        <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="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="devname" :show-overflow-tooltip="true"/>
+
+        <el-table-column :label="$t('设备位号')" align="center"  fixed="left" prop="devno" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('档案号')" align="center" prop="docno" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('设备型号')" align="center" prop="model" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('起吊重量')+'(Ton)'" align="center" prop="capacity" :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="regno" :show-overflow-tooltip="true"/>
+
+        <el-table-column :label="$t('投用日期')" align="center" prop="submitdate" width="100">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.submitdate, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column :label="$t('制造单位')" align="center" prop="createUnit" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('是否防爆')" align="center" prop="isEx" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('检验单位')" align="center" prop="checkUnit" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('检验策略')" align="center" prop="checkStrategy" :show-overflow-tooltip="true"/>
+
+        <el-table-column :label="$t('检验日期')" align="center" prop="warnDate" width="100">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.warnDate, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column :label="$t('下次检验日期')" align="center" prop="nextWarnDate" width="100" sortable="custom">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.nextWarnDate, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column :label="$t('检验报告编号')" align="center" prop="reportNo" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('备注')" align="center" prop="remarks" :show-overflow-tooltip="true"/>
+      </el-table>
+
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getDzsbList"
+      />
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import {devOtherData} from "@/api/sems/home";
+import {devOtherData, devDtDataByYear,devDzsbDataByYear,devCcDataByYear} from "@/api/sems/home";
 
 export default {
   props: {
@@ -24,6 +162,24 @@ export default {
   data() {
     return {
       chart: null,
+      openDt: false,
+      openCc: false,
+      openDzsb: false,
+      title: '设备列表',
+      // 总条数
+      total: 0,
+      specCcList: [],
+      specDtList: [],
+      specDzsbList: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        status: 1,
+        plantIds: null,
+        unitIds: null,
+        checkYear: null
+      },
       optionOther: {
         tooltip: {
           trigger: 'axis',
@@ -134,14 +290,66 @@ export default {
         'plants': plantIds,
         'unitIds': unitIds
       }
+      this.queryParams.plantIds = plantIds.join()
+      this.queryParams.unitIds = unitIds.join()
       devOtherData(params).then(response => {
         this.optionOther.xAxis[0].data = response.data.otherDevData.monthList
         this.optionOther.series[0].data = response.data.otherDevData.ccList
         this.optionOther.series[1].data = response.data.otherDevData.dzsbList
         this.optionOther.series[2].data = response.data.otherDevData.dtList
         this.initChart()
+        let _this = this
+        this.chart.on('click', function(params) {
+          // 控制台打印数据的名称
+          console.log(params);
+          _this.queryParams.checkYear = params.name
+           if (params.seriesName == '起重机械') {
+             _this.openDzsb = true
+             _this.getDzsbList()
+           }else if (params.seriesName == '叉车') {
+             _this.openCc = true
+             _this.getCcList()
+           }else if (params.seriesName == '电梯') {
+             _this.openDt = true
+             _this.getDtList()
+           }
+        });
       });
-    }
+    },
+    getDzsbList() {
+      this.loading = true;
+      devDzsbDataByYear(this.queryParams).then(response => {
+        this.specDzsbList = response.rows;
+        this.total = response.total;
+        this.$nextTick(() => {
+          this.$refs.deviceTable.doLayout(); // 解决表格错位
+        });
+        this.loading = false;
+      });
+    },
+    getDtList() {
+      this.loading = true;
+      devDtDataByYear(this.queryParams).then(response => {
+        this.specDtList = response.rows;
+        this.total = response.total;
+        this.$nextTick(() => {
+          this.$refs.deviceTable.doLayout(); // 解决表格错位
+        });
+        this.loading = false;
+      });
+    },
+    /** 查询特种设备压力容器台账列表 */
+    getCcList() {
+      this.loading = true;
+      devCcDataByYear(this.queryParams).then(response => {
+        this.specCcList = response.rows;
+        this.total = response.total;
+        this.$nextTick(() => {
+          this.$refs.deviceTable.doLayout(); // 解决表格错位
+        });
+        this.loading = false;
+      });
+    },
   }
 }
 </script>

ui/src/views/sems/specanalysis/PpChart.vue

@@ -1,11 +1,88 @@
 <template>
   <div class="app-container-Pp">
     <div id="PpChart" :style="{height:height,width:width}"></div>
+    <el-dialog :title="title" :visible.sync="open" width="1600px" >
+      <el-table  ref="deviceTable" :data="specYlgdList"
+                 border >
+        <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="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="devname" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('管道编号')" align="center" fixed="left"  prop="devno" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('注册代码')" align="center" prop="regno" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('使用登记证编号')" align="center" prop="useno" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('管道级别')" align="center" prop="grade" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('设计单位')" align="center" prop="designer" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('安装单位')" align="center" prop="installer" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('安装年月')" align="center" prop="installDate" width="100">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.installDate, '{y}-{m') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column :label="$t('投用年月')" align="center" prop="submitdate" width="100">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.submitdate, '{y}-{m}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column :label="$t('材质')" align="center" prop="material" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('公称直径')" align="center" prop="dia" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('壁厚(mm)')" align="center" prop="scheduleNo" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('长度')+'（m）'" align="center" prop="length" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('焊口数量')" align="center" prop="weldNumber" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('起点')" align="center" prop="starting" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('终点')" align="center" prop="ending" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('敷设方式')" align="center" prop="layingMethod" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('介质')" align="center" prop="medium" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('设计压力')+'(MPa)'" align="center" prop="desPressure" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('工作压力')+'(MPa)'" align="center" prop="optPressure" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('设计温度')+'(℃)'" align="center" prop="desTemp" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('工作温度')+'(℃)'" align="center" prop="optTemp" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('绝热层代码')" align="center" prop="adiabatic" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('防腐层代码')" align="center" prop="antiCorrosion" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('是否涉危化品')" align="center" prop="isDanger" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('检验单位')" align="center" prop="checkUnit" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('定期检验日期')" align="center" prop="warnDate" width="100">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.warnDate, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column :label="$t('安全状况等级')" align="center" prop="safeClass" :show-overflow-tooltip="true"/>
+
+        <el-table-column :label="$t('下次定期检验日期')" align="center" prop="nextWarnDate" width="100" sortable="custom">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.nextWarnDate, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column :label="$t('定期检验报告编号')" align="center" prop="reportNo" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('年度检查日期')" align="center" prop="yearWarnDate" width="100">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.yearWarnDate, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column :label="$t('年度检查结论')" align="center" prop="checkConclusion" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('下次年度检查日期')" align="center" prop="yearNextWarnDate" width="100">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.yearNextWarnDate, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column :label="$t('年度检查报告编号')" align="center" prop="yearReportNo" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('备注')" align="center" prop="remarks" :show-overflow-tooltip="true"/>
+      </el-table>
+
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
+      />
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import {devYlgdData} from "@/api/sems/home";
+import {devYlgdData, devYlgdDataByYear} from "@/api/sems/home";
 
 export default {
   props: {
@@ -24,6 +101,20 @@ export default {
   data() {
     return {
       chart: null,
+      open: false,
+      title: '设备列表',
+      // 总条数
+      total: 0,
+      specYlgdList: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        status: 1,
+        plantIds: null,
+        unitIds: null,
+        checkYear: null
+      },
       optionYlrq: {
         tooltip: {
           trigger: 'axis',
@@ -103,12 +194,34 @@ export default {
         'plantIds': plantIds,
         'unitIds': unitIds
       }
+      this.queryParams.plantIds = plantIds.join()
+      this.queryParams.unitIds = unitIds.join()
       devYlgdData(params).then(response => {
         this.optionYlrq.xAxis[0].data = response.data.ylrqData.yearList
         this.optionYlrq.series[0].data = response.data.ylrqData.countList
         this.initChart()
+        let _this = this
+        this.chart.on('click', function(params) {
+          // 控制台打印数据的名称
+          console.log(params);
+          _this.open = true
+          _this.queryParams.checkYear = params.name
+          _this.getList()
+        });
       });
-    }
+    },
+    /** 查询特种设备压力容器台账列表 */
+    getList() {
+      this.loading = true;
+      devYlgdDataByYear(this.queryParams).then(response => {
+        this.specYlgdList = response.rows;
+        this.total = response.total;
+        this.$nextTick(() => {
+          this.$refs.deviceTable.doLayout(); // 解决表格错位
+        });
+        this.loading = false;
+      });
+    },
   }
 }
 </script>

ui/src/views/sems/specanalysis/PvChart.vue

@@ -1,11 +1,82 @@
 <template>
+  <div>
   <div class="app-container-Pv">
     <div id="PvChart" :style="{height:height,width:width}"></div>
   </div>
+    <el-dialog :title="title" :visible.sync="open" width="1600px" >
+      <el-table  ref="deviceTable" :data="specYlrqList"
+                 border >
+        <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="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="devno" :show-overflow-tooltip="true">
+        </el-table-column>
+        <el-table-column :label="$t('设备名称')" align="center" prop="devname" width="200" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('使用证号码')" align="center" prop="useno" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('注册编号')" align="center" prop="regno" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('容器类别')" align="center" prop="vesselType" :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="nation" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('外形尺寸(直径*长(高)*厚(mm))')" align="center" prop="outSize" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('材料(管/壳)')" align="center" prop="material" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('介质(管/壳)')" align="center" prop="medium" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('设计压力MPa(管/壳)')" align="center" prop="desPressure" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('操作压力MPa(管/壳)')" align="center" prop="optPressure" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('设计温度℃(管/壳)')" align="center" prop="desTemp" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('操作温度℃(管/壳)')" align="center" prop="optTemp" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('投用日期(mm/year)')" align="center" prop="submitdate" width="100">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.submitdate, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column :label="$t('是否涉危化品')" align="center" prop="isDanger" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('设计使用年限')" align="center" prop="desYear" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('是否达到设计使用年限')" align="center" prop="isOverlife" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('检验单位')" align="center" prop="checkUnit" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('定期检验日期')" align="center" prop="warnDate" width="100">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.warnDate, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column :label="$t('安全状况等级')" align="center" prop="safeClass" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('下次定期检验日期')" align="center" prop="nextWarnDate" width="100"  sortable="custom">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.nextWarnDate, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column :label="$t('定期检验报告编号')" align="center" prop="reportNo" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('年度检查日期')" align="center" prop="yearWarnDate" width="100">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.yearWarnDate, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column :label="$t('年度检查结论')" align="center" prop="checkConclusion" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('下次年度检查日期')" align="center" prop="yearNextWarnDate" width="100">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.yearNextWarnDate, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column :label="$t('年度检查报告编号')" align="center" prop="yearReportNo" :show-overflow-tooltip="true"/>
+        <!--      <el-table-column :label="$t('部门编号')" align="center" prop="deptId" :show-overflow-tooltip="true"/>-->
+        <el-table-column :label="$t('备注')" align="center" prop="remarks" :show-overflow-tooltip="true"/>
+      </el-table>
+
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
+      />
+    </el-dialog>
+  </div>
 </template>
 
 <script>
-import {devData , devYlrqData} from "@/api/sems/home";
+import {devData , devYlrqData,devYlrqDataByYear} from "@/api/sems/home";
+import {listSpecYlrq} from "@/api/sems/specYlrq";
 export default {
   props: {
     width: {
@@ -23,6 +94,28 @@ export default {
   data() {
     return {
       chart: null,
+      open: false,
+      title: '设备列表',
+      // 总条数
+      total: 0,
+      specYlrqList: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        orderByColumn:"id",
+        isAsc:"desc",
+        plantCode: null,
+        unit: null,
+        devname: null,
+        devno: null,
+        status: 1,
+        approveStatus: null,
+        hisReformTime: null,
+        plantIds: null,
+        unitIds: null,
+        checkYear: null
+      },
       optionYlrq: {
         tooltip: {
           trigger: 'axis',
@@ -86,8 +179,11 @@ export default {
       },
     }
   },
+  created() {
+  },
   mounted() {
     this.chart = this.echarts.init(document.getElementById('PvChart'))
+
   },
   methods: {
     initChart() {
@@ -99,6 +195,8 @@ export default {
       })
     },
     devYlrqData(plantIds ,unitIds ){
+      this.queryParams.plantIds = plantIds.join()
+      this.queryParams.unitIds = unitIds.join()
       let params = {
         'plantIds': plantIds,
         'unitIds': unitIds
@@ -107,8 +205,28 @@ export default {
         this.optionYlrq.xAxis[0].data = response.data.ylrqData.yearList
         this.optionYlrq.series[0].data = response.data.ylrqData.countList
         this.initChart()
+        let _this = this
+        this.chart.on('click', function(params) {
+          // 控制台打印数据的名称
+          console.log(params);
+          _this.open = true
+          _this.queryParams.checkYear = params.name
+          _this.getList()
+        });
       });
-    }
+    },
+    /** 查询特种设备压力容器台账列表 */
+    getList() {
+      this.loading = true;
+      devYlrqDataByYear(this.queryParams).then(response => {
+        this.specYlrqList = response.rows;
+        this.total = response.total;
+        this.$nextTick(() => {
+          this.$refs.deviceTable.doLayout(); // 解决表格错位
+        });
+        this.loading = false;
+      });
+    },
   }
 }
 </script>

ui/src/views/sems/specanalysis/centerChart.vue

@@ -60,6 +60,7 @@ import {listUnNotice} from "@/api/system/notice";
           'unitIds': unitIds
         }
         listUnNotice().then(response => {
+          this.arr = []
           for (let i = 0; i < response.length; i++) {
             this.arr.push(response[i].noticeTitle)
           }