From 88b3abfe8187a562a6a083d880f3fef863b01df2 Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: 星期四, 20 三月 2025 11:02:22 +0800
Subject: [PATCH] 修改旧版台账
---
src/main/resources/mybatis/tr/RiskCheckPointMapper.xml | 139 ++++
src/main/resources/templates/tr/riskCheckPoint/ledgerBak.html | 371 +++++++++++
src/main/java/com/ruoyi/project/tr/riskCheckPoint/domain/RiskCheckPointBak.java | 465 ++++++++++++++
src/main/resources/templates/tr/riskCheckPoint/detailByLSBak.html | 462 ++++++++++++++
src/main/java/com/ruoyi/project/tr/riskCheckPoint/service/impl/RiskCheckPointServiceImpl.java | 7
src/main/java/com/ruoyi/project/tr/riskCheckPoint/mapper/RiskCheckPointMapper.java | 10
src/main/java/com/ruoyi/project/tr/riskCheckPoint/controller/RiskCheckPointController.java | 65 ++
src/main/resources/templates/tr/riskCheckPoint/ledgerBak01.html | 338 ++++++++++
src/main/java/com/ruoyi/project/tr/riskCheckPoint/service/IRiskCheckPointService.java | 10
9 files changed, 1,867 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/tr/riskCheckPoint/controller/RiskCheckPointController.java b/src/main/java/com/ruoyi/project/tr/riskCheckPoint/controller/RiskCheckPointController.java
index ecc176a..c576177 100644
--- a/src/main/java/com/ruoyi/project/tr/riskCheckPoint/controller/RiskCheckPointController.java
+++ b/src/main/java/com/ruoyi/project/tr/riskCheckPoint/controller/RiskCheckPointController.java
@@ -19,6 +19,7 @@
import com.ruoyi.project.tr.region.domain.Region;
import com.ruoyi.project.tr.region.service.IRegionService;
import com.ruoyi.project.tr.riskCheckPoint.domain.RiskCheckPoint;
+import com.ruoyi.project.tr.riskCheckPoint.domain.RiskCheckPointBak;
import com.ruoyi.project.tr.riskCheckPoint.service.IRiskCheckPointService;
import com.ruoyi.project.tr.riskEvaluationPlan.domain.RiskEvaluationPlan;
import com.ruoyi.project.tr.riskEvaluationPlan.service.IRiskEvaluationPlanService;
@@ -81,6 +82,70 @@
}
/**
+ * 跳转查询检查点及评价列表-旧页面
+ * @return
+ */
+ @GetMapping("/ledgerBak")
+ public String ledgerBak(){
+ return prefix + "/ledgerBak";
+ }
+
+ /**
+ * 查询检查点及评价列表-旧
+ * @param riskCheckPointBak
+ * @return
+ */
+ @PostMapping("/listBak")
+ @ResponseBody
+ public TableDataInfo listBak(RiskCheckPointBak riskCheckPointBak)
+ {
+ startPage();
+ List<RiskCheckPointBak> list = riskCheckPointService.selectRiskCheckPointBakList(riskCheckPointBak);
+ return getDataTable(list);
+ }
+
+ /**
+ * 查询检查点及评价详情
+ * @param checkPointId
+ * @param mmap
+ * @return
+ */
+ @GetMapping("/bakDetail/{checkPointId}")
+ public String bakDetail(@PathVariable("checkPointId") Long checkPointId, ModelMap mmap)
+ {
+ RiskCheckPointBak riskCheckPointBak = new RiskCheckPointBak();
+ riskCheckPointBak.setCheckPointId(checkPointId);
+ List<RiskCheckPointBak> list = riskCheckPointService.selectRiskCheckPointBakList(riskCheckPointBak);
+ mmap.put("riskCheckPoint", list.get(0));
+ return prefix + "/detailByLSBak";
+ //查出该检查点,选用的评价方法
+// Integer evaluationMethodType = riskCheckPoint.getEvaluationMethodType();
+// if(TrEvaluationMethodTypeEnum.LS.getMethodId().equals(evaluationMethodType)){
+// return prefix + "/detail" +TrEvaluationMethodTypeEnum.LS.getUrl();
+// }
+// else if(TrEvaluationMethodTypeEnum.LEC.getMethodId().equals(evaluationMethodType)){
+// return prefix + "/detail" +TrEvaluationMethodTypeEnum.LEC.getUrl();
+// }else if(TrEvaluationMethodTypeEnum.MES.getMethodId().equals(evaluationMethodType)){
+// return prefix + "/detail" +TrEvaluationMethodTypeEnum.MES.getUrl();
+// }else if(TrEvaluationMethodTypeEnum.RS.getMethodId().equals(evaluationMethodType)){
+// return prefix + "/detail" +TrEvaluationMethodTypeEnum.RS.getUrl();
+// }
+// else{
+// return "/error/404";
+// }
+ }
+ @Log(title = "检查点及评价Bak", businessType = BusinessType.EXPORT)
+ @PostMapping("/exportBak")
+ @ResponseBody
+ public AjaxResult exportBak(RiskCheckPointBak riskCheckPoint)
+ {
+ List<RiskCheckPointBak> list = riskCheckPointService.selectRiskCheckPointBakList(riskCheckPoint);
+ ExcelUtil<RiskCheckPointBak> util = new ExcelUtil<RiskCheckPointBak>(RiskCheckPointBak.class);
+ return util.exportExcel(list, "风险评价台账");
+ }
+
+
+ /**
* 导出检查点及评价列表
*/
@Log(title = "检查点及评价", businessType = BusinessType.EXPORT)
diff --git a/src/main/java/com/ruoyi/project/tr/riskCheckPoint/domain/RiskCheckPointBak.java b/src/main/java/com/ruoyi/project/tr/riskCheckPoint/domain/RiskCheckPointBak.java
new file mode 100644
index 0000000..0dbae46
--- /dev/null
+++ b/src/main/java/com/ruoyi/project/tr/riskCheckPoint/domain/RiskCheckPointBak.java
@@ -0,0 +1,465 @@
+package com.ruoyi.project.tr.riskCheckPoint.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import com.ruoyi.framework.web.domain.BaseEntity;
+import com.ruoyi.project.system.user.domain.User;
+import com.ruoyi.project.tr.riskEvaluationPlan.domain.RiskEvaluationPlan;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 检查点及评价对象bak tr_risk_check_point_bak
+ *
+ * @author wm
+ * @date 2020-05-09
+ */
+@Data
+public class RiskCheckPointBak extends BaseEntity
+{
+ private static final long serialVersionUID = 1L;
+
+ /** id */
+ //@Excel(name = "id")
+ private Long checkPointId;
+
+ /** 所属计划ID */
+ //@Excel(name = "所属计划ID")
+ private Long planId;
+
+ @Excel(name = "评价计划名称")
+ private String evaluationPlanName;
+ /** 评价开始时间 */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "评价开始时间", width = 30)
+ private Date evaluationBeginTime;
+
+ /** 评价结束时间 */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "评价结束时间", width = 30)
+ private Date evaluationEndTime;
+
+ @Excel(name = "计划发起人")
+ private String evaluationPlanUserName;
+
+ @Excel(name = "计划辨识人")
+ private String identifyPlanUserName;
+
+ @Excel(name = "计划阶段：计划阶段、辨识阶段、评价阶段、审核阶段",readConverterExp = "1=计划阶段,2=辨识阶段,3=评价阶段,4=审核阶段")
+ private String stageStatus;
+
+
+ @Excel(name = "辨识评价类型：设备设施、作业活动、工艺节点" ,readConverterExp = "1=设备设施,2=作业活动,3=工艺节点")
+ private String evaluationType;
+
+ /** 风险单元名称 */
+ @Excel(name = "风险单元名称")
+ private String riskListName;
+
+ @Excel(name = "计划辨识人")
+ private String evaluationPlanUserNameEl;
+
+ @Excel(name = "评价负责人")
+ private String evaluationUserName;
+
+ /** 评价状态 */
+ @Excel(name = "评价状态:未评价、已评价",readConverterExp = "1=未评价,2=已评价")
+ private String evaluationStatus;
+
+ /** 现有措施评价风险值 */
+ @Excel(name = "固有风险评价风险值")
+ private String evaluationNowFengxianzhi;
+
+ /** 现有措施评价级别 */
+ @Excel(name = "固有风险评价级别")
+ private String evaluationNowJibie;
+
+ /** 现有措施评价风险级别 */
+ @Excel(name = "固有风险评价风险级别")
+ private String evaluationNowFengxianJibie;
+
+ /** 现有措施评价风险色 */
+ @Excel(name = "固有风险评价风险色")
+ private String evaluationNowFengxianse;
+
+ /** 现有措施评价管控层级(1班组级,2车间级,3部门级,4公司级) */
+ @Excel(name = "固有风险评价管控层级(班组级、车间级、部门级、公司级)")
+ private String evaluationNowGuankongCengji;
+
+ /** 剩余风险评价风险值 */
+ @Excel(name = "现有措施评价风险值")
+ private String evaluationAfterFengxianzhi;
+
+ /** 剩余风险评价级别 */
+ @Excel(name = "现有措施评价级别")
+ private String evaluationAfterJibie;
+
+ /** 剩余风险评价风险级别 */
+ @Excel(name = "现有措施评价风险级别")
+ private String evaluationAfterFengxianJibie;
+
+ /** 剩余风险评价风险色 */
+ @Excel(name = "现有措施评价风险色")
+ private String evaluationAfterFengxianse;
+
+ /** 剩余风险评价管控层级(1班组级,2车间级,3部门级,4公司级) */
+ @Excel(name = "现有措施评价管控层级(班组级、车间级、部门级、公司级)")
+ private String evaluationAfterGuankongCengji;
+
+ @Excel(name = "审核负责人")
+ private String reviewUserName;
+
+ /** 审核意见 */
+ @Excel(name = "审核意见")
+ private String reviewOpinion;
+
+ /** 审核时间 */
+ @Excel(name = "审核时间", width = 30)
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date reviewTime;
+
+ /** 审核状态 */
+ @Excel(name = "审核状态：未审核、审核通过、审核驳回",readConverterExp = "1=未审核,2=审核通过,3=审核驳回")
+ private String reviewStatus;
+
+
+ /** SCL_检查项目 */
+ @Excel(name = "检查项目")
+ private String sclJianchaXiangmu;
+
+ /** SCL_检查标准 */
+ @Excel(name = "检查标准")
+ private String sclJianchaMubiao;
+
+ /** SCL_不符合标准情况 */
+ @Excel(name = "不符合标准情况")
+ private String sclQingkuang;
+
+ /** SCL_主要后果 */
+ @Excel(name = "主要后果")
+ private String sclZhuyaoHouguo;
+
+ @Excel(name = "评价方法：LS、LEC、MES",readConverterExp = "1=LS,2=LEC,3=MES")
+ private String evaluationMethodType;
+
+
+ /** LS_L的分值 */
+ @Excel(name = "固有风险评分LS_L的数值")
+ private BigDecimal evaluationNowLsLScore;
+
+ /** LS_S的分值 */
+ @Excel(name = "固有风险评分LS_S的数值")
+ private BigDecimal evaluationNowLsSScore;
+
+ /** 现有技术措施 */
+ @Excel(name = "现有技术措施")
+ private String evaluationNowJishu;
+
+ /** 现有管理措施 */
+ @Excel(name = "现有管理措施")
+ private String evaluationNowGuanli;
+
+ /** 现有教育措施 */
+ @Excel(name = "现有教育措施")
+ private String evaluationNowJiaoyu;
+
+ /** 现有个体防护措施 */
+ @Excel(name = "现有个体防护措施")
+ private String evaluationNowFanghu;
+
+ /** 现有应急措施 */
+ @Excel(name = "现有应急措施")
+ private String evaluationNowYingji;
+
+ /** LS_L的分值 */
+ @Excel(name = "现有风险评分LS_L的数值")
+ private BigDecimal evaluationAfterLsLScore;
+
+ /** LS_S的分值 */
+ @Excel(name = "现有风险评分LS_S的数值")
+ private BigDecimal evaluationAfterLsSScore;
+
+ /** 建议技术措施 */
+ @Excel(name = "建议技术措施")
+ private String evaluationAfterJishu;
+
+ /** 建议管理措施 */
+ @Excel(name = "建议管理措施")
+ private String evaluationAfterGuanli;
+
+ /** 建议培训教育措施 */
+ @Excel(name = "建议培训教育措施")
+ private String evaluationAfterJiaoyu;
+
+ /** 建议个体防护措施 */
+ @Excel(name = "建议个体防护措施")
+ private String evaluationAfterFanghu;
+
+ /** 建议应急处置措施 */
+ @Excel(name = "建议应急处置措施")
+ private String evaluationAfterYingji;
+
+
+ @Excel(name = "审核负责人")
+ private String rUserName;
+
+
+ /** LS_L的数值 */
+ // @Excel(name = "LS_L的数值")
+ private Long evaluationNowLsL;
+
+ /** LS_S的数值 */
+ //@Excel(name = "LS_S的数值")
+ private Long evaluationNowLsS;
+
+ /** LS_L的数值 */
+ //@Excel(name = "LS_L的数值")
+ private Long evaluationAfterLsL;
+
+ /** LS_S的数值 */
+ //@Excel(name = "LS_S的数值")
+ private Long evaluationAfterLsS;
+
+// /** JHA_作业步骤 */
+// @Excel(name = "JHA_作业步骤")
+// private String jhaZuoyeBuzhou;
+//
+// /** JHA_危险源或潜在事件 */
+// @Excel(name = "JHA_危险源或潜在事件")
+// private String jhaWeixianyuan;
+//
+// /** JHA_可能发生的事故类型及后果 */
+// @Excel(name = "JHA_可能发生的事故类型及后果")
+// private String jhaShiguLeixing;
+
+// /** HAZOP_节点 */
+// @Excel(name = "HAZOP_节点")
+// private String hazopJiedian;
+//
+// /** HAZOP_参数 */
+// @Excel(name = "HAZOP_参数")
+// private String hazopCanshu;
+//
+// /** HAZOP_参数描述 */
+// @Excel(name = "HAZOP_参数描述")
+// private String hazopCanshuMiaoshu;
+//
+// /** HAZOP_引导词 */
+// @Excel(name = "HAZOP_引导词")
+// private String hazopYindaoci;
+//
+// /** HAZOP_偏差 */
+// @Excel(name = "HAZOP_偏差")
+// private String hazopPiancha;
+//
+// /** HAZOP_可能原因 */
+// @Excel(name = "HAZOP_可能原因")
+// private String hazopYuanyin;
+//
+// /** HAZOP_主要后果 */
+// @Excel(name = "HAZOP_主要后果")
+// private String hazopHouguo;
+
+ /** 评价方法 */
+
+
+// /** 评价负责人 */
+// @Excel(name = "评价负责人")
+// private String evaluationUserName;
+
+
+
+
+ /** LEC_L的数值 */
+// @Excel(name = "LEC_L的数值")
+// private Long evaluationNowLecL;
+//
+// /** LEC_E的数值 */
+// @Excel(name = "LEC_E的数值")
+// private Long evaluationNowLecE;
+//
+// /** LEC_C的数值 */
+// @Excel(name = "LEC_C的数值")
+// private Long evaluationNowLecC;
+//
+// /** MES_M的数值 */
+// @Excel(name = "MES_M的数值")
+// private Long evaluationNowMesM;
+//
+// /** MES_E的数值 */
+// @Excel(name = "MES_E的数值")
+// private Long evaluationNowMesE;
+//
+// /** MES_S的数值 */
+// @Excel(name = "MES_S的数值")
+// private Long evaluationNowMesS;
+//
+// /** RS_R的数值 */
+// @Excel(name = "现有RS_R的数值")
+// private Long evaluationNowRsR;
+//
+// /** RS_S的数值 */
+// @Excel(name = "现有RS_S的数值")
+// private Long evaluationNowRsS;
+
+
+ //扩展字段 start <**********************************************************
+;
+//
+// /** LEC_L的分值 */
+// @Excel(name = "LEC_L的分值")
+// private BigDecimal evaluationNowLecLScore;
+//
+// /** LEC_E的分值 */
+// @Excel(name = "LEC_E的分值")
+// private BigDecimal evaluationNowLecEScore;
+//
+// /** LEC_C的分值 */
+// @Excel(name = "LEC_C的分值")
+// private BigDecimal evaluationNowLecCScore;
+//
+// /** MES_M的分值 */
+// @Excel(name = "MES_M的分值")
+// private BigDecimal evaluationNowMesMScore;
+//
+// /** MES_E的分值 */
+// @Excel(name = "MES_E的分值")
+// private BigDecimal evaluationNowMesEScore;
+//
+// /** MES_S的分值 */
+// @Excel(name = "MES_S的分值")
+// private BigDecimal evaluationNowMesSScore;
+//
+// /** RS_R的分值 */
+// @Excel(name = "RS_R的分值")
+// private String evaluationNowRsRScore;
+//
+// /** RS_S的分值 */
+// @Excel(name = "RS_S的分值")
+// private String evaluationNowRsSScore;
+ //扩展字段 end **********************************************************>
+
+//
+// /** LEC_L的数值 */
+// @Excel(name = "LEC_L的数值")
+// private Long evaluationAfterLecL;
+//
+// /** LEC_E的数值 */
+// @Excel(name = "LEC_E的数值")
+// private Long evaluationAfterLecE;
+//
+// /** LEC_C的数值 */
+// @Excel(name = "LEC_C的数值")
+// private Long evaluationAfterLecC;
+//
+// /** MES_M的数值 */
+// @Excel(name = "MES_M的数值")
+// private Long evaluationAfterMesM;
+//
+// /** MES_E的数值 */
+// @Excel(name = "MES_E的数值")
+// private Long evaluationAfterMesE;
+//
+// /** MES_S的数值 */
+// @Excel(name = "MES_S的数值")
+// private Long evaluationAfterMesS;
+//
+// /** RS_R的数值 */
+// @Excel(name = "建议RS_R的数值")
+// private Long evaluationAfterRsR;
+//
+// /** RS_S的数值 */
+// @Excel(name = "建议RS_S的数值")
+// private Long evaluationAfterRsS;
+
+ //扩展字段 start <**********************************************************
+
+//
+// /** LEC_L的分值 */
+// @Excel(name = "LEC_L的分值")
+// private BigDecimal evaluationAfterLecLScore;
+//
+// /** LEC_E的分值 */
+// @Excel(name = "LEC_E的分值")
+// private BigDecimal evaluationAfterLecEScore;
+//
+// /** LEC_C的分值 */
+// @Excel(name = "LEC_C的分值")
+// private BigDecimal evaluationAfterLecCScore;
+//
+// /** MES_M的分值 */
+// @Excel(name = "MES_M的分值")
+// private BigDecimal evaluationAfterMesMScore;
+//
+// /** MES_E的分值 */
+// @Excel(name = "MES_E的分值")
+// private BigDecimal evaluationAfterMesEScore;
+//
+// /** MES_S的分值 */
+// @Excel(name = "MES_S的分值")
+// private BigDecimal evaluationAfterMesSScore;
+//
+// /** RS_R的分值 */
+// @Excel(name = "RS_R的分值")
+// private String evaluationAfterRsRScore;
+//
+// /** RS_S的分值 */
+// @Excel(name = "RS_S的分值")
+// private String evaluationAfterRsSScore;
+
+ //扩展字段 end **********************************************************>
+
+
+
+ /** 审核负责人 */
+// @Excel(name = "审核负责人")
+ private Long reviewUserId;
+
+
+
+
+
+
+
+ /**
+ * 评价用户
+ */
+// private User evaluationUser = new User();
+
+
+
+// /**
+// * 审核用户
+// */
+// private User reviewUser = new User();
+
+ /**
+ * 所属计划
+ */
+// private RiskEvaluationPlan plan = new RiskEvaluationPlan();
+
+
+
+
+
+
+
+
+ /**
+ * 所属公司id
+ */
+ private Long companyId;
+
+
+ /**
+ * 所属区域id
+ */
+ private Long regionId;
+
+ //公司列表
+ List<Long> companyIdList;
+
+}
diff --git a/src/main/java/com/ruoyi/project/tr/riskCheckPoint/mapper/RiskCheckPointMapper.java b/src/main/java/com/ruoyi/project/tr/riskCheckPoint/mapper/RiskCheckPointMapper.java
index 6ed15b8..e39c8c4 100644
--- a/src/main/java/com/ruoyi/project/tr/riskCheckPoint/mapper/RiskCheckPointMapper.java
+++ b/src/main/java/com/ruoyi/project/tr/riskCheckPoint/mapper/RiskCheckPointMapper.java
@@ -2,6 +2,7 @@
import java.util.List;
import com.ruoyi.project.tr.riskCheckPoint.domain.RiskCheckPoint;
+import com.ruoyi.project.tr.riskCheckPoint.domain.RiskCheckPointBak;
/**
* 检查点及评价Mapper接口
@@ -28,6 +29,15 @@
List<RiskCheckPoint> selectRiskCheckPointList(RiskCheckPoint riskCheckPoint);
+ /**
+ * 查询检查点及评价列表
+ *
+ * @param riskCheckPointBak 检查点及评价
+ * @return 检查点及评价集合
+ */
+ List<RiskCheckPointBak> selectRiskCheckPointBakList(RiskCheckPointBak riskCheckPointBak);
+
+
List<RiskCheckPoint> selectRiskCheckPointListByNoEvaluation(RiskCheckPoint riskCheckPoint);
/**
diff --git a/src/main/java/com/ruoyi/project/tr/riskCheckPoint/service/IRiskCheckPointService.java b/src/main/java/com/ruoyi/project/tr/riskCheckPoint/service/IRiskCheckPointService.java
index 8c1907d..3c11908 100644
--- a/src/main/java/com/ruoyi/project/tr/riskCheckPoint/service/IRiskCheckPointService.java
+++ b/src/main/java/com/ruoyi/project/tr/riskCheckPoint/service/IRiskCheckPointService.java
@@ -2,6 +2,7 @@
import java.util.List;
import com.ruoyi.project.tr.riskCheckPoint.domain.RiskCheckPoint;
+import com.ruoyi.project.tr.riskCheckPoint.domain.RiskCheckPointBak;
/**
* 检查点及评价Service接口
@@ -27,6 +28,15 @@
*/
List<RiskCheckPoint> selectRiskCheckPointList(RiskCheckPoint riskCheckPoint);
+
+ /**
+ * 查询检查点及评价列表
+ *
+ * @param riskCheckPointBak 检查点及评价
+ * @return 检查点及评价集合
+ */
+ List<RiskCheckPointBak> selectRiskCheckPointBakList(RiskCheckPointBak riskCheckPointBak);
+
/**
* 查询该计划是否还有未评价的检查点
* @param riskCheckPoint
diff --git a/src/main/java/com/ruoyi/project/tr/riskCheckPoint/service/impl/RiskCheckPointServiceImpl.java b/src/main/java/com/ruoyi/project/tr/riskCheckPoint/service/impl/RiskCheckPointServiceImpl.java
index 7b1711d..6d17bfd 100644
--- a/src/main/java/com/ruoyi/project/tr/riskCheckPoint/service/impl/RiskCheckPointServiceImpl.java
+++ b/src/main/java/com/ruoyi/project/tr/riskCheckPoint/service/impl/RiskCheckPointServiceImpl.java
@@ -1,7 +1,9 @@
package com.ruoyi.project.tr.riskCheckPoint.service.impl;
+import java.util.Collections;
import java.util.List;
import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.project.tr.riskCheckPoint.domain.RiskCheckPointBak;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.project.tr.riskCheckPoint.mapper.RiskCheckPointMapper;
@@ -46,6 +48,11 @@
}
@Override
+ public List<RiskCheckPointBak> selectRiskCheckPointBakList(RiskCheckPointBak riskCheckPointBak) {
+ return riskCheckPointMapper.selectRiskCheckPointBakList(riskCheckPointBak);
+ }
+
+ @Override
public List<RiskCheckPoint> selectRiskCheckPointListByNoEvaluation(RiskCheckPoint riskCheckPoint)
{
return riskCheckPointMapper.selectRiskCheckPointListByNoEvaluation(riskCheckPoint);
diff --git a/src/main/resources/mybatis/tr/RiskCheckPointMapper.xml b/src/main/resources/mybatis/tr/RiskCheckPointMapper.xml
index 06ba794..a46ae7e 100644
--- a/src/main/resources/mybatis/tr/RiskCheckPointMapper.xml
+++ b/src/main/resources/mybatis/tr/RiskCheckPointMapper.xml
@@ -161,6 +161,121 @@
</resultMap>
+ <resultMap type="com.ruoyi.project.tr.riskCheckPoint.domain.RiskCheckPointBak" id="RiskCheckPointBakResult">
+ <result property="checkPointId" column="check_point_id" />
+ <result property="createBy" column="create_by" />
+ <result property="createTime" column="create_time" />
+ <result property="updateBy" column="update_by" />
+ <result property="updateTime" column="update_time" />
+ <result property="remark" column="remark" />
+ <result property="sclJianchaXiangmu" column="SCL_jiancha_xiangmu" />
+ <result property="sclJianchaMubiao" column="SCL_jiancha_mubiao" />
+ <result property="sclQingkuang" column="SCL_qingkuang" />
+ <result property="sclZhuyaoHouguo" column="SCL_zhuyao_houguo" />
+<!-- <result property="jhaZuoyeBuzhou" column="JHA_zuoye_buzhou" />-->
+<!-- <result property="jhaWeixianyuan" column="JHA_weixianyuan" />-->
+<!-- <result property="jhaShiguLeixing" column="JHA_shigu_leixing" />-->
+<!-- <result property="hazopJiedian" column="HAZOP_jiedian" />-->
+<!-- <result property="hazopCanshu" column="HAZOP_canshu" />-->
+<!-- <result property="hazopCanshuMiaoshu" column="HAZOP_canshu_miaoshu" />-->
+<!-- <result property="hazopYindaoci" column="HAZOP_yindaoci" />-->
+<!-- <result property="hazopPiancha" column="HAZOP_piancha" />-->
+<!-- <result property="hazopYuanyin" column="HAZOP_yuanyin" />-->
+<!-- <result property="hazopHouguo" column="HAZOP_houguo" />-->
+ <result property="evaluationMethodType" column="evaluation_method_type" />
+<!-- <result property="evaluationUserId" column="evaluation_user_id" />-->
+ <result property="evaluationNowJishu" column="evaluation_now_jishu" />
+ <result property="evaluationNowGuanli" column="evaluation_now_guanli" />
+ <result property="evaluationNowJiaoyu" column="evaluation_now_jiaoyu" />
+ <result property="evaluationNowFanghu" column="evaluation_now_fanghu" />
+ <result property="evaluationNowYingji" column="evaluation_now_yingji" />
+ <result property="evaluationNowLsL" column="evaluation_now_LS_L" />
+ <result property="evaluationNowLsS" column="evaluation_now_LS_S" />
+<!-- <result property="evaluationNowLecL" column="evaluation_now_LEC_L" />-->
+<!-- <result property="evaluationNowLecE" column="evaluation_now_LEC_E" />-->
+<!-- <result property="evaluationNowLecC" column="evaluation_now_LEC_C" />-->
+<!-- <result property="evaluationNowMesM" column="evaluation_now_MES_M" />-->
+<!-- <result property="evaluationNowMesE" column="evaluation_now_MES_E" />-->
+<!-- <result property="evaluationNowMesS" column="evaluation_now_MES_S" />-->
+<!-- <result property="evaluationNowRsR" column="evaluation_now_RS_R" />-->
+<!-- <result property="evaluationNowRsS" column="evaluation_now_RS_S" />-->
+
+ <result property="evaluationNowLsLScore" column="evaluation_now_LS_L_Score" />
+ <result property="evaluationNowLsSScore" column="evaluation_now_LS_S_Score" />
+<!-- <result property="evaluationNowLecLScore" column="evaluation_now_LEC_L_Score" />-->
+<!-- <result property="evaluationNowLecEScore" column="evaluation_now_LEC_E_Score" />-->
+<!-- <result property="evaluationNowLecCScore" column="evaluation_now_LEC_C_Score" />-->
+<!-- <result property="evaluationNowMesMScore" column="evaluation_now_MES_M_Score" />-->
+<!-- <result property="evaluationNowMesEScore" column="evaluation_now_MES_E_Score" />-->
+<!-- <result property="evaluationNowMesSScore" column="evaluation_now_MES_S_Score" />-->
+<!-- <result property="evaluationNowRsRScore" column="evaluation_now_RS_R_Score" />-->
+<!-- <result property="evaluationNowRsSScore" column="evaluation_now_RS_S_Score" />-->
+
+ <result property="evaluationNowFengxianzhi" column="evaluation_now_fengxianzhi" />
+ <result property="evaluationNowJibie" column="evaluation_now_jibie" />
+ <result property="evaluationNowFengxianJibie" column="evaluation_now_fengxian_jibie" />
+ <result property="evaluationNowFengxianse" column="evaluation_now_fengxianse" />
+ <result property="evaluationNowGuankongCengji" column="evaluation_now_guankong_cengji" />
+ <result property="evaluationAfterJishu" column="evaluation_after_jishu" />
+ <result property="evaluationAfterGuanli" column="evaluation_after_guanli" />
+ <result property="evaluationAfterJiaoyu" column="evaluation_after_jiaoyu" />
+ <result property="evaluationAfterFanghu" column="evaluation_after_fanghu" />
+ <result property="evaluationAfterYingji" column="evaluation_after_yingji" />
+ <result property="evaluationAfterLsL" column="evaluation_after_LS_L" />
+ <result property="evaluationAfterLsS" column="evaluation_after_LS_S" />
+<!-- <result property="evaluationAfterLecL" column="evaluation_after_LEC_L" />-->
+<!-- <result property="evaluationAfterLecE" column="evaluation_after_LEC_E" />-->
+<!-- <result property="evaluationAfterLecC" column="evaluation_after_LEC_C" />-->
+<!-- <result property="evaluationAfterMesM" column="evaluation_after_MES_M" />-->
+<!-- <result property="evaluationAfterMesE" column="evaluation_after_MES_E" />-->
+<!-- <result property="evaluationAfterMesS" column="evaluation_after_MES_S" />-->
+<!-- <result property="evaluationAfterRsR" column="evaluation_after_RS_R" />-->
+<!-- <result property="evaluationAfterRsS" column="evaluation_after_RS_S" />-->
+
+ <result property="evaluationAfterLsLScore" column="evaluation_after_LS_L_Score" />
+ <result property="evaluationAfterLsSScore" column="evaluation_after_LS_S_Score" />
+<!-- <result property="evaluationAfterLecLScore" column="evaluation_after_LEC_L_Score" />-->
+<!-- <result property="evaluationAfterLecEScore" column="evaluation_after_LEC_E_Score" />-->
+<!-- <result property="evaluationAfterLecCScore" column="evaluation_after_LEC_C_Score" />-->
+<!-- <result property="evaluationAfterMesMScore" column="evaluation_after_MES_M_Score" />-->
+<!-- <result property="evaluationAfterMesEScore" column="evaluation_after_MES_E_Score" />-->
+<!-- <result property="evaluationAfterMesSScore" column="evaluation_after_MES_S_Score" />-->
+<!-- <result property="evaluationAfterRsRScore" column="evaluation_after_RS_R_Score" />-->
+<!-- <result property="evaluationAfterRsSScore" column="evaluation_after_RS_S_Score" />-->
+
+ <result property="evaluationAfterFengxianzhi" column="evaluation_after_fengxianzhi" />
+ <result property="evaluationAfterJibie" column="evaluation_after_jibie" />
+ <result property="evaluationAfterFengxianJibie" column="evaluation_after_fengxian_jibie" />
+ <result property="evaluationAfterFengxianse" column="evaluation_after_fengxianse" />
+ <result property="evaluationAfterGuankongCengji" column="evaluation_after_guankong_cengji" />
+ <result property="reviewUserId" column="review_user_id" />
+ <result property="reviewOpinion" column="review_opinion" />
+ <result property="reviewTime" column="review_time" />
+ <result property="reviewStatus" column="review_status" />
+ <result property="evaluationStatus" column="evaluation_status" />
+
+ <result property="evaluationUserName" column="evaluation_user_name" />
+ <result property="planId" column="plan_id" />
+ <result property="reviewUserName" column="review_user_name" />
+ <result property="companyId" column="company_id" />
+
+
+ <result property="eUserName" column="e_user_name" />
+ <result property="rUserName" column="r_user_name" />
+
+ <result property="evaluationPlanName" column="evaluation_plan_name" />
+ <result property="evaluationPlanUserName" column="evaluation_plan_user_name" />
+ <result property="identifyPlanUserName" column="identify_plan_user_name" />
+ <result property="evaluationBeginTime" column="evaluation_begin_time" />
+ <result property="evaluationEndTime" column="evaluation_end_time" />
+ <result property="evaluationType" column="evaluation_type" />
+ <result property="stageStatus" column="stage_status" />
+ <result property="riskListName" column="risk_list_name" />
+ <!-- <association property="evaluationUser" column="evaluation_user_id" javaType="User" resultMap="evaluationUserResult" />-->
+<!-- <association property="reviewUser" column="review_user_id" javaType="User" resultMap="reviewUserResult" />-->
+<!-- <association property="plan" column="plan_id" javaType="RiskEvaluationPlan" resultMap="planResult" />-->
+
+ </resultMap>
<sql id="selectRiskCheckPointVo">
SELECT c.check_point_id, c.create_by, c.create_time, c.update_by, c.update_time, c.remark,
@@ -227,6 +342,30 @@
LEFT JOIN tr_risk_list AS r ON p.evaluation_risk_id = r.risk_list_id
</sql>
+ <select id="selectRiskCheckPointBakList" parameterType="RiskCheckPointBak" resultMap="RiskCheckPointBakResult">
+ select * from tr_risk_check_point_bak
+ where 1=1
+ <if test="checkPointId != null and checkPointId != ''"> and check_point_id = #{checkPointId}</if>
+ <if test="riskListName != null and riskListName != ''"> and risk_list_name like concat('%', #{riskListName}, '%') </if>
+ <if test="evaluationMethodType != null and evaluationMethodType !='' "> and evaluation_method_type = #{evaluationMethodType}</if>
+ <if test="evaluationType != null and evaluationType != ''"> and evaluation_type = #{evaluationType}</if>
+ <if test="params.beginReviewTime != null and params.beginReviewTime != ''"><!-- 开始时间检索 -->
+ AND date_format(review_time,'%y%m%d') >= date_format(#{params.beginReviewTime},'%y%m%d')
+ </if>
+ <if test="params.endReviewTime != null and params.endReviewTime != ''"><!-- 结束时间检索 -->
+ AND date_format(review_time,'%y%m%d') <= date_format(#{params.endReviewTime},'%y%m%d')
+ </if>
+
+ <if test="reviewStatus != null and reviewStatus != ''"> and review_status = #{reviewStatus}</if>
+
+ <if test="evaluationStatus != null and evaluationStatus != ''"> and evaluation_status = #{evaluationStatus}</if>
+ <if test="evaluationNowFengxianJibie != null and evaluationNowFengxianJibie != ''"> and evaluation_now_fengxian_jibie = #{evaluationNowFengxianJibie}</if>
+ <if test="evaluationAfterFengxianJibie != null and evaluationAfterFengxianJibie != ''"> and evaluation_after_fengxian_jibie = #{evaluationAfterFengxianJibie}</if>
+
+ order by create_time desc
+ </select>
+
+
<select id="selectRiskCheckPointList" parameterType="RiskCheckPoint" resultMap="RiskCheckPointResult">
<include refid="selectRiskCheckPointVo"/>
<where>
diff --git a/src/main/resources/templates/tr/riskCheckPoint/detailByLSBak.html b/src/main/resources/templates/tr/riskCheckPoint/detailByLSBak.html
new file mode 100644
index 0000000..6daa200
--- /dev/null
+++ b/src/main/resources/templates/tr/riskCheckPoint/detailByLSBak.html
@@ -0,0 +1,462 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+ <th:block th:include="include :: header('修改检查点及评价')" />
+ <th:block th:include="include :: datetimepicker-css" />
+</head>
+<body class="white-bg">
+ <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+ <form class="form-horizontal m" id="form-riskCheckPoint-edit" th:object="${riskCheckPoint}">
+ <input name="checkPointId" th:field="*{checkPointId}" type="hidden">
+
+ <!--辨识点信息-->
+<!-- <div th:if="${riskCheckPoint.plan.riskIdentifyMethod == 1}" class="panel panel-default">-->
+ <div class="panel-heading">
+ SCL辨识法
+ </div>
+ <div class="panel-body">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">检查项目：</label>
+ <div class="col-sm-8">
+ <input name="sclJianchaXiangmu" th:field="*{sclJianchaXiangmu}" readonly class="form-control" type="text">
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">检查标准：</label>
+ <div class="col-sm-8">
+ <input name="sclJianchaMubiao" th:field="*{sclJianchaMubiao}" readonly class="form-control" type="text">
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">不符合标准情况：</label>
+ <div class="col-sm-8">
+ <input name="sclQingkuang" th:field="*{sclQingkuang}" readonly class="form-control" type="text">
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">主要后果：</label>
+ <div class="col-sm-8">
+ <input name="sclZhuyaoHouguo" th:field="*{sclZhuyaoHouguo}" readonly class="form-control" type="text">
+ </div>
+ </div>
+ </div>
+
+<!-- </div>-->
+
+<!-- <div th:if="${riskCheckPoint.plan.riskIdentifyMethod == 2}" class="panel panel-default">-->
+<!-- <div class="panel-heading">-->
+<!-- JHA辨识法-->
+<!-- </div>-->
+<!-- <div class="panel-body">-->
+<!-- <div class="form-group">-->
+<!-- <label class="col-sm-3 control-label">作业步骤：</label>-->
+<!-- <div class="col-sm-8">-->
+<!-- <input name="jhaZuoyeBuzhou" th:field="*{jhaZuoyeBuzhou}" readonly class="form-control" type="text">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="form-group">-->
+<!-- <label class="col-sm-3 control-label">危险源或潜在事件：</label>-->
+<!-- <div class="col-sm-8">-->
+<!-- <input name="jhaWeixianyuan" th:field="*{jhaWeixianyuan}" readonly class="form-control" type="text">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="form-group">-->
+<!-- <label class="col-sm-3 control-label">可能发生的事故类型及后果：</label>-->
+<!-- <div class="col-sm-8">-->
+<!-- <input name="jhaShiguLeixing" th:field="*{jhaShiguLeixing}" readonly class="form-control" type="text">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- </div>-->
+
+<!-- </div>-->
+
+<!-- <div th:if="${riskCheckPoint.plan.riskIdentifyMethod == 3}" class="panel panel-default">-->
+<!-- <div class="panel-heading">-->
+<!-- HAZOP辨识法-->
+<!-- </div>-->
+<!-- <div class="panel-body">-->
+<!-- <div class="form-group">-->
+<!-- <label class="col-sm-3 control-label">节点：</label>-->
+<!-- <div class="col-sm-8">-->
+<!-- <input name="hazopJiedian" th:field="*{hazopJiedian}" readonly class="form-control" type="text">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="form-group">-->
+<!-- <label class="col-sm-3 control-label">参数：</label>-->
+<!-- <div class="col-sm-8">-->
+<!-- <input name="hazopCanshu" th:field="*{hazopCanshu}" readonly class="form-control" type="text">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="form-group">-->
+<!-- <label class="col-sm-3 control-label">参数描述：</label>-->
+<!-- <div class="col-sm-8">-->
+<!-- <input name="hazopCanshuMiaoshu" th:field="*{hazopCanshuMiaoshu}" readonly class="form-control" type="text">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="form-group">-->
+<!-- <label class="col-sm-3 control-label">引导词：</label>-->
+<!-- <div class="col-sm-8">-->
+<!-- <input name="hazopYindaoci" th:field="*{hazopYindaoci}" readonly class="form-control" type="text">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="form-group">-->
+<!-- <label class="col-sm-3 control-label">偏差：</label>-->
+<!-- <div class="col-sm-8">-->
+<!-- <input name="hazopPiancha" th:field="*{hazopPiancha}" readonly class="form-control" type="text">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="form-group">-->
+<!-- <label class="col-sm-3 control-label">可能原因：</label>-->
+<!-- <div class="col-sm-8">-->
+<!-- <input name="hazopYuanyin" th:field="*{hazopYuanyin}" readonly class="form-control" type="text">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="form-group">-->
+<!-- <label class="col-sm-3 control-label">主要后果：</label>-->
+<!-- <div class="col-sm-8">-->
+<!-- <input name="hazopHouguo" th:field="*{hazopHouguo}" readonly class="form-control" type="text">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- </div>-->
+
+<!-- </div>-->
+
+ <div class="form-group">
+ <label class="col-sm-3 control-label">评价方法：</label>
+ <div class="col-sm-8">
+ <input name="evaluationMethodType" th:field="*{evaluationMethodType}" class="form-control" type="text" readonly>
+
+<!-- <select name="evaluationMethodType" class="form-control m-b" disabled th:with="type=${@dict.getType('tr_evaluation_method')}">-->
+<!-- <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{evaluationMethodType}"></option>-->
+<!-- </select>-->
+ </div>
+ </div>
+
+ <!--现有评分-->
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ 固有风险评分
+ </div>
+ <div class="panel-body">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">LS_L的数值：</label>
+ <div class="col-sm-8">
+ <input id="detailScoreByLS_LNow" placeholder="分值" th:field="*{evaluationNowLsLScore}" class="form-control" type="text" maxlength="30" readonly required>
+ <input id="detailIdByLS_LNow" name="evaluationNowLsL" th:field="*{evaluationNowLsL}" type="hidden">
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">LS_S的数值：</label>
+ <div class="col-sm-8">
+ <input id="detailScoreByLS_SNow" placeholder="分值" th:field="*{evaluationNowLsSScore}" class="form-control" type="text" maxlength="30" readonly required>
+ <input id="detailIdByLS_SNow" name="evaluationNowLsS" th:field="*{evaluationNowLsS}" type="hidden">
+ </div>
+ </div>
+
+ </div>
+
+ </div>
+
+ <!--现有分值-->
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ 固有风险分值
+ </div>
+ <div class="panel-body">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">风险值：</label>
+ <div class="col-sm-8">
+ <input id="evaluationNowFengxianzhi" name="evaluationNowFengxianzhi" th:field="*{evaluationNowFengxianzhi}" class="form-control" type="text" readonly>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">级别：</label>
+ <div class="col-sm-8">
+ <input id="evaluationNowJibie" name="evaluationNowJibie" th:field="*{evaluationNowJibie}" class="form-control" type="text" readonly>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">风险级别：</label>
+ <div class="col-sm-8">
+ <input id="evaluationNowFengxianJibie" name="evaluationNowFengxianJibie" th:field="*{evaluationNowFengxianJibie}" class="form-control" type="text" readonly>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">风险色：</label>
+ <div class="col-sm-8">
+ <input id="evaluationNowFengxianse" name="evaluationNowFengxianse" th:field="*{evaluationNowFengxianse}" class="form-control" type="text" readonly>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">管控层级：</label>
+ <div class="col-sm-8">
+ <input id="evaluationNowGuankongCengji" name="evaluationNowGuankongCengji" th:field="*{evaluationNowGuankongCengji}" class="form-control" type="text" readonly>
+ </div>
+ </div>
+ </div>
+
+ </div>
+
+ <!--现有措施-->
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ 现有措施
+ </div>
+ <div class="panel-body">
+ <!--现有管控措施-->
+<!-- <span th:if="(*{evaluationNowGuanli} == null or *{evaluationNowGuanli} == '' )or-->
+<!-- (*{evaluationNowJiaoyu} == null or *{evaluationNowJiaoyu} == '' ) or-->
+<!-- (*{evaluationNowFanghu} == null or *{evaluationNowFanghu} == '' ) or-->
+<!-- (*{evaluationNowYingji} == null or *{evaluationNowYingji} == '') " >-->
+<!-- <!–只输入工程技术措施,显示模式–>-->
+<!-- <div class="form-group">-->
+<!-- <label class="col-sm-3 control-label">管控措施：</label>-->
+<!-- <div class="col-sm-8">-->
+<!-- <input name="evaluationNowJishu" th:field="*{evaluationNowJishu}" class="form-control" type="text" readonly>-->
+<!-- </div>-->
+<!-- </div>-->
+
+<!-- </span>-->
+
+ <span>
+ <!--五条管控措施都输入的模式,显示模式-->
+ <div class="form-group">
+ <label class="col-sm-3 control-label">技术措施：</label>
+ <div class="col-sm-8">
+ <input name="evaluationNowJishu" th:field="*{evaluationNowJishu}" class="form-control" type="text" readonly>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">管理措施：</label>
+ <div class="col-sm-8">
+ <input name="evaluationNowGuanli" th:field="*{evaluationNowGuanli}" class="form-control" type="text" readonly>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">教育措施：</label>
+ <div class="col-sm-8">
+ <input name="evaluationNowJiaoyu" th:field="*{evaluationNowJiaoyu}" class="form-control" type="text"readonly>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">个体防护措施：</label>
+ <div class="col-sm-8">
+ <input name="evaluationNowFanghu" th:field="*{evaluationNowFanghu}" class="form-control" type="text" readonly>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">应急措施：</label>
+ <div class="col-sm-8">
+ <input name="evaluationNowYingji" th:field="*{evaluationNowYingji}" class="form-control" type="text" readonly>
+ </div>
+ </div>
+
+
+ </span>
+ </div>
+ </div>
+
+
+ <!--建议评分-->
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ 现有风险评分
+ </div>
+ <div class="panel-body">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">LS_L的数值：</label>
+ <div class="col-sm-8">
+ <input id="detailScoreByLS_LAfter" placeholder="分值" th:field="*{evaluationAfterLsLScore}" class="form-control" type="text" maxlength="30" readonly required>
+ <input id="detailIdByLS_LAfter" name="evaluationAfterLsL" th:field="*{evaluationAfterLsL}" type="hidden">
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">LS_S的数值：</label>
+ <div class="col-sm-8">
+ <input id="detailScoreByLS_SAfter" placeholder="分值" th:field="*{evaluationAfterLsSScore}" class="form-control" type="text" maxlength="30" readonly required>
+ <input id="detailIdByLS_SAfter" name="evaluationAfterLsS" th:field="*{evaluationAfterLsS}" type="hidden">
+ </div>
+ </div>
+ </div>
+
+ </div>
+
+
+ <!--建议分值-->
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ 现有风险分值
+ </div>
+ <div class="panel-body">
+ <div class="form-group">
+ <label class="col-sm-3 control-label">风险评价风险值：</label>
+ <div class="col-sm-8">
+ <input name="evaluationAfterFengxianzhi" th:field="*{evaluationAfterFengxianzhi}" class="form-control" type="text" readonly>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">风险评价级别：</label>
+ <div class="col-sm-8">
+ <input name="evaluationAfterJibie" th:field="*{evaluationAfterJibie}" class="form-control" type="text" readonly>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">风险评价风险级别：</label>
+ <div class="col-sm-8">
+ <input name="evaluationAfterFengxianJibie" th:field="*{evaluationAfterFengxianJibie}" class="form-control" type="text" readonly>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">风险评价风险色：</label>
+ <div class="col-sm-8">
+ <input name="evaluationAfterFengxianse" th:field="*{evaluationAfterFengxianse}" class="form-control" type="text" readonly>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">风险评价管控层级：</label>
+ <div class="col-sm-8">
+ <input name="evaluationAfterGuankongCengji" th:field="*{evaluationAfterGuankongCengji}" class="form-control" type="text" readonly>
+ </div>
+ </div>
+ </div>
+
+ </div>
+
+ <!--建议措施-->
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ 建议措施
+ </div>
+ <div class="panel-body">
+ <!--建议管控措施-->
+
+<!-- <span th:if="(*{evaluationAfterGuanli} == null or *{evaluationAfterGuanli} == '' )or-->
+<!-- (*{evaluationAfterJiaoyu} == null or *{evaluationAfterJiaoyu} == '' ) or-->
+<!-- (*{evaluationAfterFanghu} == null or *{evaluationAfterFanghu} == '' ) or-->
+<!-- (*{evaluationAfterYingji} == null or *{evaluationAfterYingji} == '') " >-->
+<!-- <!–只输入工程技术措施,显示模式–>-->
+<!-- <div class="form-group">-->
+<!-- <label class="col-sm-3 control-label">管控措施：</label>-->
+<!-- <div class="col-sm-8">-->
+<!-- <input name="evaluationAfterJishu" th:field="*{evaluationAfterJishu}" class="form-control" type="text" readonly>-->
+<!-- </div>-->
+<!-- </div>-->
+
+<!-- </span>-->
+
+ <span>
+ <!--五条管控措施都输入的模式,显示模式-->
+ <div class="form-group">
+ <label class="col-sm-3 control-label">技术措施：</label>
+ <div class="col-sm-8">
+ <input name="evaluationAfterJishu" th:field="*{evaluationAfterJishu}" class="form-control" type="text" readonly>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">管理措施：</label>
+ <div class="col-sm-8">
+ <input name="evaluationAfterGuanli" th:field="*{evaluationAfterGuanli}" class="form-control" type="text" readonly>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">教育措施：</label>
+ <div class="col-sm-8">
+ <input name="evaluationAfterJiaoyu" th:field="*{evaluationAfterJiaoyu}" class="form-control" type="text" readonly>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">个体防护措施：</label>
+ <div class="col-sm-8">
+ <input name="evaluationAfterFanghu" th:field="*{evaluationAfterFanghu}" class="form-control" type="text" readonly>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">应急措施：</label>
+ <div class="col-sm-8">
+ <input name="evaluationAfterYingji" th:field="*{evaluationAfterYingji}" class="form-control" type="text" readonly>
+ </div>
+ </div>
+
+ </span>
+ </div>
+
+ </div>
+
+
+ <div class="form-group">
+ <label class="col-sm-3 control-label">评价状态：</label>
+ <div class="col-sm-8">
+ <input name="evaluationStatus" th:field="*{evaluationStatus}" class="form-control" type="text" readonly>
+
+ <!-- <select name="evaluationStatus" class="form-control m-b" th:with="type=${@dict.getType('tr_evaluation_status')}" disabled>-->
+<!-- <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{evaluationStatus}"></option>-->
+<!-- </select>-->
+ </div>
+ </div>
+
+
+ <!--审核人-->
+ <div class="form-group">
+ <label class="col-sm-3 control-label">审核负责人：</label>
+ <div class="col-sm-8">
+ <input id="userName" placeholder="审核人员" th:field="*{reviewUserName}" class="form-control" type="text" maxlength="30" readonly required>
+<!-- <input id="userId" name="reviewUserId" th:field="*{reviewUserId}" type="hidden">-->
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label class="col-sm-3 control-label">审核状态：</label>
+ <div class="col-sm-8">
+ <input name="reviewStatus" th:field="*{reviewStatus}" class="form-control" type="text" readonly>
+
+<!-- <select name="reviewStatus" class="form-control m-b" th:with="type=${@dict.getType('tr_review_status')}" disabled>-->
+<!-- <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{reviewStatus}"></option>-->
+<!-- </select>-->
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">审核意见：</label>
+ <div class="col-sm-8">
+ <input name="reviewOpinion" th:field="*{reviewOpinion}" class="form-control" type="text" readonly>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">审核时间：</label>
+ <div class="col-sm-8">
+
+ <div class="input-group date">
+ <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+ <input name="reviewTime" th:value="${#dates.format(riskCheckPoint.reviewTime, 'yyyy-MM-dd')}" class="form-control" disabled placeholder="yyyy-MM-dd" type="text">
+ </div>
+ </div>
+ </div>
+
+
+
+
+ </form>
+ </div>
+ <th:block th:include="include :: footer" />
+ <th:block th:include="include :: datetimepicker-js" />
+ <script type="text/javascript">
+ var prefix = ctx + "tr/riskCheckPoint";
+ $("#form-riskCheckPoint-edit").validate({
+ focusCleanup: true
+ });
+
+ function submitHandler() {
+ if ($.validate.form()) {
+ // $.operate.save(prefix + "/edit", $('#form-riskCheckPoint-edit').serialize());
+ }
+ }
+
+ $("input[name='reviewTime']").datetimepicker({
+ format: "yyyy-mm-dd",
+ minView: "month",
+ autoclose: true
+ });
+
+
+ </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/tr/riskCheckPoint/ledgerBak.html b/src/main/resources/templates/tr/riskCheckPoint/ledgerBak.html
new file mode 100644
index 0000000..fe3db14
--- /dev/null
+++ b/src/main/resources/templates/tr/riskCheckPoint/ledgerBak.html
@@ -0,0 +1,371 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+ <th:block th:include="include :: header('检查点及评价列表[旧]')" />
+</head>
+<body class="gray-bg">
+ <div class="container-div">
+ <div class="row">
+ <div class="col-sm-12 search-collapse">
+ <form id="formId">
+ <div class="select-list">
+ <ul>
+ <input type="hidden" th:value="${companyId}" id="companyId" name="companyId">
+
+ <li>
+ <label>风险单元名称：</label>
+ <input type="text" name="riskListName"/>
+ </li>
+
+ <li>
+ <label>评价方法：</label>
+<!-- <select name="evaluationMethodType" th:with="type=${@dict.getType('tr_evaluation_method')}">-->
+<!-- <option value="">所有</option>-->
+<!-- <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>-->
+<!-- </select>-->
+ <select name="evaluationMethodType" >
+ <option value="">所有</option>
+ <option value="LS">LS</option>
+ <option value="LEC">LEC</option>
+ <option value="MES">MES</option>
+ </select>
+ </li>
+
+ <li>
+ <label>辨识类型：</label>
+ <select name="evaluationType">
+ <option value="">所有</option>
+ <option value="设备设施">设备设施</option>
+ <option value="作业活动">作业活动</option>
+ <option value="工艺节点">工艺节点</option>
+ </select>
+<!-- <select name="evaluationType" th:with="type=${@dict.getType('tr_evaluation_type')}">-->
+<!-- <option value="">所有</option>-->
+<!-- <option th:each="dict : ${type}" th:text="${dict.dictLabel}"-->
+<!-- th:value="${dict.dictValue}"></option>-->
+<!-- </select>-->
+ </li>
+<!-- <li>-->
+<!-- <label>评价负责人：</label>-->
+<!-- <input type="text" name="evaluationUserId"/>-->
+<!-- </li>-->
+
+
+<!-- <li>-->
+<!-- <label>审核负责人：</label>-->
+<!-- <input type="text" name="reviewUserId"/>-->
+<!-- </li>-->
+<!-- <li>-->
+<!-- <label>审核意见：</label>-->
+<!-- <input type="text" name="reviewOpinion"/>-->
+<!-- </li>-->
+ <li class="select-time">
+ <label>审核时间：</label>
+ <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginReviewTime]"/>
+ <span>-</span>
+ <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endReviewTime]"/>
+ </li>
+ <li>
+ <label>审核状态：</label>
+ <select name="reviewStatus">
+ <option value="">所有</option>
+ <option value="未审核">未审核</option>
+ <option value="审核通过">审核通过</option>
+ <option value="审核驳回">审核驳回</option>
+ </select>
+<!-- <select name="reviewStatus" th:with="type=${@dict.getType('tr_review_status')}">-->
+<!-- <option value="">所有</option>-->
+<!-- <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>-->
+<!-- </select>-->
+ </li>
+ <li>
+ <label>评价状态：</label>
+ <select name="evaluationStatus" >
+ <option value="">所有</option>
+ <option value="未评价">未评价</option>
+ <option value="已评价">已评价</option>
+ </select>
+
+<!-- <select name="evaluationStatus" th:with="type=${@dict.getType('tr_evaluation_status')}">-->
+<!-- <option value="">所有</option>-->
+<!-- <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>-->
+<!-- </select>-->
+ </li>
+
+<!-- <li>-->
+<!-- <label>区域/位置：</label>-->
+<!-- <select name="regionId">-->
+<!-- <option value="" selected>所有</option>-->
+<!-- <option th:each="region : ${regionList}" th:text="${region.regionName}" th:value="${region.regionId}"></option>-->
+<!-- </select>-->
+<!-- <!– <input type="text" name="regionName"/>–>-->
+<!-- </li>-->
+
+ <li>
+ <label>现有措施评价风险级别：</label>
+ <select name="evaluationNowFengxianJibie" >
+ <option value="">所有</option>
+ <option value="低">低</option>
+ <option value="一般">一般</option>
+ <option value="较大">较大</option>
+ <option value="重大">重大</option>
+
+ </select>
+ </li>
+ <li>
+ <label>固有风险评价风险级别：</label>
+ <select name="evaluationAfterFengxianJibie" >
+ <option value="">所有</option>
+ <option value="低">低</option>
+ <option value="一般">一般</option>
+ <option value="较大">较大</option>
+ <option value="重大">重大</option>
+ </select>
+ </li>
+ <li>
+ <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i> 搜索</a>
+ <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i> 重置</a>
+<!-- <a class="btn btn-warning" onclick="$.table.exportExcel()" >-->
+<!-- <i class="fa fa-download"></i> 导出-->
+<!-- </a>-->
+ </li>
+ </ul>
+ </div>
+ </form>
+ </div>
+
+ <div class="btn-group-sm" id="toolbar" role="group">
+ </div>
+ <div class="col-sm-12 select-table table-striped">
+ <table id="bootstrap-table"></table>
+ </div>
+ </div>
+ </div>
+ <th:block th:include="include :: footer" />
+ <script th:inline="javascript">
+ var evaluationMethodTypeDatas = [[${@dict.getType('tr_evaluation_method')}]];
+ var reviewStatusDatas = [[${@dict.getType('tr_review_status')}]];
+ var evaluationStatusDatas = [[${@dict.getType('tr_evaluation_status')}]];
+ var evaluationTypeDatas = [[${@dict.getType('tr_evaluation_type')}]];
+ var stageStatusDatas = [[${@dict.getType('tr_evaluation_stage_status')}]];
+ var prefix = ctx + "tr/riskCheckPoint";
+ var common = [[${common}]];//用户角色 是否在公司管理员
+ $(function() {
+ var options = {
+ url: prefix + "/listBak",
+ detailUrl: prefix + "/bakDetail/{id}",
+ exportUrl: prefix + "/exportBak",
+ // removeUrl: prefix + "/removeRiskCheckPointLedger",
+ queryParams:queryParams,
+ modalName: "检查点及评价",
+ columns: [{
+ checkbox: true
+ },
+ {
+ field: 'checkPointId',
+ title: 'id',
+ visible: false
+ },
+
+ {
+ field: 'evaluationPlanName',
+ title: '评价计划名称'
+ },
+ {
+ title: '评价时间',
+ formatter: function(value, row, index) {
+ return ' <div style="width:150px;">'+row.evaluationBeginTime +"-"+ row.evaluationEndTime+' </div>';
+ }
+ },
+ {
+ field: 'evaluationPlanUserName',
+ title: '计划发起人'
+ },
+
+ {
+ field: 'stageStatus',
+ title: '计划阶段'
+ // ,
+ // formatter: function(value, row, index) {
+ // return $.table.selectDictLabel(stageStatusDatas, value);
+ // }
+ },
+
+ {
+ field: 'evaluationType',
+ title: '辨识评价类型'
+ // ,
+ // formatter: function(value, row, index) {
+ // return $.table.selectDictLabel(evaluationTypeDatas, value);
+ // }
+ },
+ {
+ field: 'riskListName',
+ title: '风险单元名称'
+ },
+
+ {
+ field: 'identifyPlanUserName',
+ title: '计划辨识人'
+ },
+
+ {
+ field: 'evaluationMethodType',
+ title: '评价方法'
+ // ,
+ // formatter: function(value, row, index) {
+ // return $.table.selectDictLabel(evaluationMethodTypeDatas, value);
+ // }
+ },
+ {
+ field: 'evaluationUserName',
+ title: '评价负责人'
+ },
+ {
+ field: 'evaluationStatus',
+ title: '评价状态'
+ // ,
+ // formatter: function(value, row, index) {
+ // return $.table.selectDictLabel(evaluationStatusDatas, value);
+ // }
+ },
+
+
+ {
+ field: 'evaluationNowFengxianzhi',
+ title: '固有风险评价风险值'
+ },
+ {
+ field: 'evaluationNowJibie',
+ title: '固有风险评价级别'
+ },
+ {
+ field: 'evaluationNowFengxianJibie',
+ title: '固有风险评价风险级别'
+ },
+ {
+ field: 'evaluationNowFengxianse',
+ title: '固有风险评价风险色',
+ formatter: function(value, row, index) {
+ var actions = [];
+ if (row.evaluationNowFengxianse=='红色'){
+ actions.push('<a class="btn btn-warning btn-rounded" style="background-color: #ff0000;border-color: #ff0000;color: #000000;" href="#">红色</a> ');
+ }else if(row.evaluationNowFengxianse=='橙色'){
+ actions.push('<a class="btn btn-warning btn-rounded" style="background-color: #ff6100;border-color: #ff6100;color: #000000;" href="#">橙色</a> ');
+ }else if(row.evaluationNowFengxianse=='黄色'){
+ actions.push('<a class="btn btn-warning btn-rounded" style="background-color: #ffff00;border-color: #ffff00;color: #000000;" href="#">黄色</a> ');
+
+ }else if(row.evaluationNowFengxianse=='蓝色'){
+ actions.push('<a class="btn btn-warning btn-rounded" style="background-color: #0000ff;border-color: #0000ff;color: #ffffff;" href="#">蓝色</a> ');
+ }
+ return actions.join('');
+ }
+ },
+ {
+ field: 'evaluationNowGuankongCengji',
+ title: '固有风险评价管控层级'
+ },
+
+ {
+ field: 'evaluationAfterFengxianzhi',
+ title: '现有措施评价风险值'
+ },
+ {
+ field: 'evaluationAfterJibie',
+ title: '现有措施评价级别'
+ },
+ {
+ field: 'evaluationAfterFengxianJibie',
+ title: '现有措施评价风险级别'
+ },
+ {
+ field: 'evaluationAfterFengxianse',
+ title: '现有措施评价风险色',
+ formatter: function(value, row, index) {
+ var actions = [];
+ if (row.evaluationAfterFengxianse=='红色'){
+ actions.push('<a class="btn btn-warning btn-rounded" style="background-color: #ff0000;border-color: #ff0000;color: #000000;" href="#">红色</a> ');
+ }else if(row.evaluationAfterFengxianse=='橙色'){
+ actions.push('<a class="btn btn-warning btn-rounded" style="background-color: #ff6100;border-color: #ff6100;color: #000000;" href="#">橙色</a> ');
+ }else if(row.evaluationAfterFengxianse=='黄色'){
+ actions.push('<a class="btn btn-warning btn-rounded" style="background-color: #ffff00;border-color: #ffff00;color: #000000;" href="#">黄色</a> ');
+
+ }else if(row.evaluationAfterFengxianse=='蓝色'){
+ actions.push('<a class="btn btn-warning btn-rounded" style="background-color: #0000ff;border-color: #0000ff;color: #ffffff;" href="#">蓝色</a> ');
+ }
+ return actions.join('');
+ }
+ },
+ {
+ field: 'evaluationAfterGuankongCengji',
+ title: '现有措施评价管控层级'
+ },
+
+ // {
+ // field: 'evaluationAfterJishu',
+ // title: '建议技术措施'
+ // },
+ // {
+ // field: 'evaluationAfterGuanli',
+ // title: '建议管理措施'
+ // },
+ // {
+ // field: 'evaluationAfterJiaoyu',
+ // title: '建议培训教育措施'
+ // },
+ // {
+ // field: 'evaluationAfterFanghu',
+ // title: '建议个体防护措施'
+ // },
+ // {
+ // field: 'evaluationAfterYingji',
+ // title: '建议应急处置措施'
+ // },
+
+ {
+ field: 'reviewUserName',
+ title: '审核负责人'
+ },
+ {
+ field: 'reviewOpinion',
+ title: '审核意见'
+ },
+ {
+ field: 'reviewTime',
+ title: '审核时间'
+ },
+ {
+ field: 'reviewStatus',
+ title: '审核状态'
+ // ,
+ // formatter: function(value, row, index) {
+ // return $.table.selectDictLabel(reviewStatusDatas, value);
+ // }
+ },
+
+ {
+ title: '操作',
+ align: 'center',
+ formatter: function(value, row, index) {
+ var actions = [];
+ actions.push('<a class="btn btn-default btn-xs " href="javascript:void(0)" onclick="$.operate.detail(\'' + row.checkPointId + '\')"><i class="fa fa-search"></i>查看</a> ');
+
+ // if(common=="common"){
+ // actions.push('<a class="btn btn-danger btn-xs " href="javascript:void(0)" onclick="$.operate.remove(\'' + row.checkPointId + '\')"><i class="fa fa-remove"></i>删除</a>');
+ // }
+
+ return actions.join('');
+ }
+ }]
+ };
+ $.table.init(options);
+ });
+
+ function queryParams(params) {
+ var search = $.table.queryParams(params);
+ search.companyId = $("#companyId").val();
+ return search;
+ }
+ </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/tr/riskCheckPoint/ledgerBak01.html b/src/main/resources/templates/tr/riskCheckPoint/ledgerBak01.html
new file mode 100644
index 0000000..661aa73
--- /dev/null
+++ b/src/main/resources/templates/tr/riskCheckPoint/ledgerBak01.html
@@ -0,0 +1,338 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+ <th:block th:include="include :: header('检查点及评价列表[旧]')" />
+</head>
+<body class="gray-bg">
+ <div class="container-div">
+ <div class="row">
+ <div class="col-sm-12 search-collapse">
+ <form id="formId">
+ <div class="select-list">
+ <ul>
+ <input type="hidden" th:value="${companyId}" id="companyId" name="companyId">
+
+ <li>
+ <label>风险单元名称：</label>
+ <input type="text" name="riskListName"/>
+ </li>
+
+ <li>
+ <label>评价方法：</label>
+ <select name="evaluationMethodType" th:with="type=${@dict.getType('tr_evaluation_method')}">
+ <option value="">所有</option>
+ <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+ </select>
+ </li>
+
+ <li>
+ <label>辨识类型：</label>
+ <select name="evaluationType" th:with="type=${@dict.getType('tr_evaluation_type')}">
+ <option value="">所有</option>
+ <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
+ th:value="${dict.dictValue}"></option>
+ </select>
+ </li>
+<!-- <li>-->
+<!-- <label>评价负责人：</label>-->
+<!-- <input type="text" name="evaluationUserId"/>-->
+<!-- </li>-->
+
+
+<!-- <li>-->
+<!-- <label>审核负责人：</label>-->
+<!-- <input type="text" name="reviewUserId"/>-->
+<!-- </li>-->
+<!-- <li>-->
+<!-- <label>审核意见：</label>-->
+<!-- <input type="text" name="reviewOpinion"/>-->
+<!-- </li>-->
+ <li class="select-time">
+ <label>审核时间：</label>
+ <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginReviewTime]"/>
+ <span>-</span>
+ <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endReviewTime]"/>
+ </li>
+ <li>
+ <label>审核状态：</label>
+ <select name="reviewStatus" th:with="type=${@dict.getType('tr_review_status')}">
+ <option value="">所有</option>
+ <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+ </select>
+ </li>
+ <li>
+ <label>评价状态：</label>
+ <select name="evaluationStatus" th:with="type=${@dict.getType('tr_evaluation_status')}">
+ <option value="">所有</option>
+ <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+ </select>
+ </li>
+
+<!-- <li>-->
+<!-- <label>区域/位置：</label>-->
+<!-- <select name="regionId">-->
+<!-- <option value="" selected>所有</option>-->
+<!-- <option th:each="region : ${regionList}" th:text="${region.regionName}" th:value="${region.regionId}"></option>-->
+<!-- </select>-->
+<!-- <!– <input type="text" name="regionName"/>–>-->
+<!-- </li>-->
+
+ <li>
+ <label>现有措施评价风险级别：</label>
+ <select name="evaluationNowFengxianJibie" >
+ <option value="">所有</option>
+ <option value="低">低</option>
+ <option value="一般">一般</option>
+ <option value="较大">较大</option>
+ <option value="重大">重大</option>
+
+ </select>
+ </li>
+ <li>
+ <label>固有风险评价风险级别：</label>
+ <select name="evaluationAfterFengxianJibie" >
+ <option value="">所有</option>
+ <option value="低">低</option>
+ <option value="一般">一般</option>
+ <option value="较大">较大</option>
+ <option value="重大">重大</option>
+ </select>
+ </li>
+ <li>
+ <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i> 搜索</a>
+ <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i> 重置</a>
+ </li>
+ </ul>
+ </div>
+ </form>
+ </div>
+
+ <div class="btn-group-sm" id="toolbar" role="group">
+ </div>
+ <div class="col-sm-12 select-table table-striped">
+ <table id="bootstrap-table"></table>
+ </div>
+ </div>
+ </div>
+ <th:block th:include="include :: footer" />
+ <script th:inline="javascript">
+ var evaluationMethodTypeDatas = [[${@dict.getType('tr_evaluation_method')}]];
+ var reviewStatusDatas = [[${@dict.getType('tr_review_status')}]];
+ var evaluationStatusDatas = [[${@dict.getType('tr_evaluation_status')}]];
+ var evaluationTypeDatas = [[${@dict.getType('tr_evaluation_type')}]];
+ var stageStatusDatas = [[${@dict.getType('tr_evaluation_stage_status')}]];
+ var prefix = ctx + "tr/riskCheckPoint";
+ var common = [[${common}]];//用户角色 是否在公司管理员
+ $(function() {
+ var options = {
+ url: prefix + "/listBak",
+ detailUrl: prefix + "/detailBak/{id}",
+ // removeUrl: prefix + "/removeRiskCheckPointLedger",
+ queryParams:queryParams,
+ modalName: "检查点及评价",
+ columns: [{
+ checkbox: true
+ },
+ {
+ field: 'checkPointId',
+ title: 'id',
+ visible: false
+ },
+
+ {
+ field: 'plan.evaluationPlanName',
+ title: '评价计划名称'
+ },
+ {
+ title: '评价时间',
+ formatter: function(value, row, index) {
+ return ' <div style="width:150px;">'+row.plan.evaluationBeginTime +"-"+ row.plan.evaluationEndTime+' </div>';
+ }
+ },
+ {
+ field: 'plan.planUser.userName',
+ title: '计划发起人'
+ },
+
+ {
+ field: 'plan.stageStatus',
+ title: '计划阶段',
+ formatter: function(value, row, index) {
+ return $.table.selectDictLabel(stageStatusDatas, value);
+ }
+ },
+
+ {
+ field: 'plan.evaluationType',
+ title: '辨识评价类型',
+ formatter: function(value, row, index) {
+ return $.table.selectDictLabel(evaluationTypeDatas, value);
+ }
+ },
+ {
+ field: 'plan.risk.riskListName',
+ title: '风险单元名称'
+ },
+
+ {
+ field: 'plan.planUser.userName',
+ title: '计划辨识人'
+ },
+
+ {
+ field: 'evaluationMethodType',
+ title: '评价方法',
+ formatter: function(value, row, index) {
+ return $.table.selectDictLabel(evaluationMethodTypeDatas, value);
+ }
+ },
+ {
+ field: 'evaluationUser.userName',
+ title: '评价负责人'
+ },
+ {
+ field: 'evaluationStatus',
+ title: '评价状态',
+ formatter: function(value, row, index) {
+ return $.table.selectDictLabel(evaluationStatusDatas, value);
+ }
+ },
+
+
+ {
+ field: 'evaluationNowFengxianzhi',
+ title: '固有风险评价风险值'
+ },
+ {
+ field: 'evaluationNowJibie',
+ title: '固有风险评价级别'
+ },
+ {
+ field: 'evaluationNowFengxianJibie',
+ title: '固有风险评价风险级别'
+ },
+ {
+ field: 'evaluationNowFengxianse',
+ title: '固有风险评价风险色',
+ formatter: function(value, row, index) {
+ var actions = [];
+ if (row.evaluationNowFengxianse=='红色'){
+ actions.push('<a class="btn btn-warning btn-rounded" style="background-color: #ff0000;border-color: #ff0000;color: #000000;" href="#">红色</a> ');
+ }else if(row.evaluationNowFengxianse=='橙色'){
+ actions.push('<a class="btn btn-warning btn-rounded" style="background-color: #ff6100;border-color: #ff6100;color: #000000;" href="#">橙色</a> ');
+ }else if(row.evaluationNowFengxianse=='黄色'){
+ actions.push('<a class="btn btn-warning btn-rounded" style="background-color: #ffff00;border-color: #ffff00;color: #000000;" href="#">黄色</a> ');
+
+ }else if(row.evaluationNowFengxianse=='蓝色'){
+ actions.push('<a class="btn btn-warning btn-rounded" style="background-color: #0000ff;border-color: #0000ff;color: #ffffff;" href="#">蓝色</a> ');
+ }
+ return actions.join('');
+ }
+ },
+ {
+ field: 'evaluationNowGuankongCengji',
+ title: '固有风险评价管控层级'
+ },
+
+ {
+ field: 'evaluationAfterFengxianzhi',
+ title: '现有措施评价风险值'
+ },
+ {
+ field: 'evaluationAfterJibie',
+ title: '现有措施评价级别'
+ },
+ {
+ field: 'evaluationAfterFengxianJibie',
+ title: '现有措施评价风险级别'
+ },
+ {
+ field: 'evaluationAfterFengxianse',
+ title: '现有措施评价风险色',
+ formatter: function(value, row, index) {
+ var actions = [];
+ if (row.evaluationAfterFengxianse=='红色'){
+ actions.push('<a class="btn btn-warning btn-rounded" style="background-color: #ff0000;border-color: #ff0000;color: #000000;" href="#">红色</a> ');
+ }else if(row.evaluationAfterFengxianse=='橙色'){
+ actions.push('<a class="btn btn-warning btn-rounded" style="background-color: #ff6100;border-color: #ff6100;color: #000000;" href="#">橙色</a> ');
+ }else if(row.evaluationAfterFengxianse=='黄色'){
+ actions.push('<a class="btn btn-warning btn-rounded" style="background-color: #ffff00;border-color: #ffff00;color: #000000;" href="#">黄色</a> ');
+
+ }else if(row.evaluationAfterFengxianse=='蓝色'){
+ actions.push('<a class="btn btn-warning btn-rounded" style="background-color: #0000ff;border-color: #0000ff;color: #ffffff;" href="#">蓝色</a> ');
+ }
+ return actions.join('');
+ }
+ },
+ {
+ field: 'evaluationAfterGuankongCengji',
+ title: '现有措施评价管控层级'
+ },
+
+ // {
+ // field: 'evaluationAfterJishu',
+ // title: '建议技术措施'
+ // },
+ // {
+ // field: 'evaluationAfterGuanli',
+ // title: '建议管理措施'
+ // },
+ // {
+ // field: 'evaluationAfterJiaoyu',
+ // title: '建议培训教育措施'
+ // },
+ // {
+ // field: 'evaluationAfterFanghu',
+ // title: '建议个体防护措施'
+ // },
+ // {
+ // field: 'evaluationAfterYingji',
+ // title: '建议应急处置措施'
+ // },
+
+ {
+ field: 'reviewUser.userName',
+ title: '审核负责人'
+ },
+ {
+ field: 'reviewOpinion',
+ title: '审核意见'
+ },
+ {
+ field: 'reviewTime',
+ title: '审核时间'
+ },
+ {
+ field: 'reviewStatus',
+ title: '审核状态',
+ formatter: function(value, row, index) {
+ return $.table.selectDictLabel(reviewStatusDatas, value);
+ }
+ },
+
+ {
+ title: '操作',
+ align: 'center',
+ formatter: function(value, row, index) {
+ var actions = [];
+ actions.push('<a class="btn btn-default btn-xs " href="javascript:void(0)" onclick="$.operate.detail(\'' + row.checkPointId + '\')"><i class="fa fa-search"></i>查看</a> ');
+
+ if(common=="common"){
+ actions.push('<a class="btn btn-danger btn-xs " href="javascript:void(0)" onclick="$.operate.remove(\'' + row.checkPointId + '\')"><i class="fa fa-remove"></i>删除</a>');
+ }
+
+ return actions.join('');
+ }
+ }]
+ };
+ $.table.init(options);
+ });
+
+ function queryParams(params) {
+ var search = $.table.queryParams(params);
+ search.companyId = $("#companyId").val();
+ return search;
+ }
+ </script>
+</body>
+</html>
\ No newline at end of file
--
Gitblit v1.9.2