From 6e2da2f853a635d03b0c184108e0b8dd86eec646 Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期一, 27 三月 2023 13:56:12 +0800
Subject: [PATCH] 添加页面
---
src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerRecordController.java | 152 +++++++++++++++++++++++++
src/main/resources/templates/tr/hiddenDangerCheck/dangerRecord/dangerRecord.html | 204 ++++++++++++++++++++++++++++++++++
2 files changed, 356 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerRecordController.java b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerRecordController.java
new file mode 100644
index 0000000..fc0247d
--- /dev/null
+++ b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerRecordController.java
@@ -0,0 +1,152 @@
+package com.ruoyi.project.tr.hiddenDangerCheck.controller;
+
+import com.github.pagehelper.util.StringUtil;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.poi.ExcelUtilByDangerLedger;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.project.mobile.service.ApiHiddenDangerCheckService;
+import com.ruoyi.project.system.company.service.ICompanyService;
+import com.ruoyi.project.system.dept.domain.Dept;
+import com.ruoyi.project.system.dept.service.IDeptService;
+import com.ruoyi.project.system.role.service.IRoleService;
+import com.ruoyi.project.system.user.domain.User;
+import com.ruoyi.project.system.user.service.IUserService;
+import com.ruoyi.project.tr.hiddenDangerCheckPoint.domain.HiddenDangerCheckPoint;
+import com.ruoyi.project.tr.hiddenDangerCheckPoint.domain.HiddenDangerCheckPointExport;
+import com.ruoyi.project.tr.hiddenDangerCheckPoint.service.IHiddenDangerCheckPointService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.*;
+
+import java.math.BigDecimal;
+import java.text.NumberFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * 隐患列表Controller
+ *
+ * @date 2020-05-08
+ */
+@Controller
+@RequestMapping("/tr/hiddenDangerCheck/dangerRecord")
+public class DangerRecordController extends BaseController {
+ private String prefix = "tr/hiddenDangerCheck/dangerRecord";
+
+ @Autowired
+ private IHiddenDangerCheckPointService hiddenDangerCheckPointService;
+
+ @Autowired
+ private IUserService userService;
+
+ @Autowired
+ private IDeptService deptService;
+
+ @Autowired
+ private IRoleService roleService;
+
+ @Autowired
+ private ICompanyService companyService;
+
+
+
+ @GetMapping()
+ public String dangerRecord(ModelMap mmap) {
+ List<Dept> deptList = deptService.selectDeptListByCompanyId(getSysUser().getCompanyId());
+ mmap.put("deptList", deptList);
+ getDangerDataStatistics(getSysUser().getCompanyId().toString(), mmap);
+ User user = getSysUser();
+ Set<String> stringSet = roleService.selectRoleKeys(user.getUserId());
+ if (stringSet.contains("common")) {
+ mmap.put("common", "common");
+ } else {
+
+ }
+
+ return prefix + "/dangerRecord";
+ }
+
+
+ /**
+ * 删除隐患台账
+ */
+ @Log(title = "删除隐患台账", businessType = BusinessType.DELETE)
+ @PostMapping("/removeDangerLedger")
+ @ResponseBody
+ public AjaxResult removeDangerLedger(String ids) {
+ if (StringUtils.isEmpty(ids)) {
+ return AjaxResult.error("id不能为空");
+ }
+ HiddenDangerCheckPoint hdcp = hiddenDangerCheckPointService.selectHiddenDangerCheckPointById(Long.valueOf(ids));
+ if (hdcp.getCheckId() != null) {
+ hiddenDangerCheckPointService.deleteHiddenDangerCheckPointById(hdcp.getId());
+ hiddenDangerCheckPointService.getTaskCountTotal(getSysUser().getUserId());//查询未执行任务总数量并推送
+ return AjaxResult.success();
+ }
+ return AjaxResult.error("数据有误");
+ }
+
+
+ /**
+ * 查询隐患台账列表
+ */
+ @PostMapping("/list")
+ @ResponseBody
+ public TableDataInfo list(HiddenDangerCheckPoint hiddenDangerCheckPoint, String dateRangeLedger, String rectifyStatusLedger, String rectifyDeptIdLedger) {
+
+ hiddenDangerCheckPoint.setRectifyUserIdIsNotNull("1");//隐患整改人ID 不为空
+ hiddenDangerCheckPoint.setCompanyId(Long.valueOf(getSysUser().getCompanyId()));
+
+
+ startPage();
+ List<HiddenDangerCheckPoint> list = hiddenDangerCheckPointService.selectHiddenDangerCheckPointList(hiddenDangerCheckPoint);
+
+
+ return getDataTable(list);
+ }
+
+
+ //companyId下总的数据统计
+ public void getDangerDataStatistics(String companyId, ModelMap mmap) {
+ HiddenDangerCheckPoint hdcpQuery = new HiddenDangerCheckPoint();
+ HiddenDangerCheckPoint hdcpQueryAll = new HiddenDangerCheckPoint();
+ HiddenDangerCheckPoint queryByTime = new HiddenDangerCheckPoint();
+ hdcpQuery.setRectifyUserIdIsNotNull("1");//隐患整改人ID 不为空
+ hdcpQueryAll.setRectifyUserIdIsNotNull("1");//隐患整改人ID 不为空
+ queryByTime.setRectifyUserIdIsNotNull("1");//隐患整改人ID 不为空
+ hdcpQuery.setCompanyId(Long.valueOf(companyId));
+ hdcpQueryAll.setCompanyId(Long.valueOf(companyId));
+ queryByTime.setCompanyId(Long.valueOf(companyId));
+ List<HiddenDangerCheckPoint> resultListAll = hiddenDangerCheckPointService.selectHiddenDangerCheckPointList(hdcpQueryAll);//根据companyId 查询出的列表
+ }
+
+
+ /**
+ * 查询隐患台账列表（根据companyId）
+ */
+ @PostMapping("/listByCompanyId")
+ @ResponseBody
+ public TableDataInfo list(String companyId, HiddenDangerCheckPoint hiddenDangerCheckPoint, String
+ dateRangeLedger, String rectifyStatusLedger, String rectifyDeptIdLedger) {
+
+ hiddenDangerCheckPoint.setRectifyUserIdIsNotNull("1");//隐患整改人ID 不为空
+ hiddenDangerCheckPoint.setCompanyId(Long.valueOf(companyId));
+
+ startPage();
+ List<HiddenDangerCheckPoint> list = hiddenDangerCheckPointService.selectHiddenDangerCheckPointList(hiddenDangerCheckPoint);
+ return getDataTable(list);
+ }
+
+}
+
+
diff --git a/src/main/resources/templates/tr/hiddenDangerCheck/dangerRecord/dangerRecord.html b/src/main/resources/templates/tr/hiddenDangerCheck/dangerRecord/dangerRecord.html
new file mode 100644
index 0000000..268ef23
--- /dev/null
+++ b/src/main/resources/templates/tr/hiddenDangerCheck/dangerRecord/dangerRecord.html
@@ -0,0 +1,204 @@
+<!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>
+ <li>
+ <label>搜索：</label>
+ <input type="text" name="riskDep"/>
+ </li>
+ <li>
+ <label>隐患级别：</label>
+ <select name="riskLevel">
+ <option value="">所有</option>
+ <option value="A级">A级</option>
+ <option value="B级">B级</option>
+ <option value="C级">C级</option>
+ </select>
+ </li>
+ <li>
+<!-- <label>搜索：</label>-->
+ <input type="text" name="findPeople" placeholder="请输入隐患发现人"/>
+ </li>
+ <li>
+ <!-- <label>搜索：</label>-->
+ <input type="text" name="reportPeople" placeholder="请输入上报人"/>
+ </li>
+ <li>
+ <!-- <label>搜索：</label>-->
+ <input type="text" name="acceptPeople" placeholder="请输入验收人"/>
+ </li>
+ <li>
+ <label>专业：</label>
+ <select name="major">
+ <option value="">所有</option>
+ <option value="安全基础专业">安全基础专业</option>
+ <option value="工艺专业">工艺专业</option>
+ <option value="设备专业">设备专业</option>
+ <option value="电气专业">电气专业</option>
+ <option value="仪表专业">仪表专业</option>
+ <option value="消防专业">消防专业</option>
+ <option value="其它">其它</option>
+ </select>
+ </li>
+ <li class="select-time">
+ <label>发现时间：</label>
+ <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="startTime"/>
+ <span>-</span>
+ <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="endTime"/>
+ </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">-->
+<!-- <a class="btn btn-warning" onclick="$.table.exportExcel()">-->
+<!-- <i class="fa fa-download"></i> 导出-->
+<!-- </a>-->
+<!-- </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 prefix = ctx + "tr/hiddenDangerCheck/dangerRecord";
+ var common = [[${common}]];//用户角色 是否在公司管理员
+
+ $(function () {
+ var options = {
+ url: prefix + "/list",
+ // createUrl: prefix + "/add",
+ // updateUrl: prefix + "/edit/{id}",
+ // removeUrl: prefix + "/removeDangerLedger",
+ // exportUrl: prefix + "/export",
+ // detailUrl: prefix + "/detail/{id}",
+ modalName: "隐患列表",
+ columns: [{
+ checkbox: true
+ },
+ {
+ field: 'id',
+ title: 'id'
+ },
+ {
+ field: 'riskLevel',
+ title: '级别'
+ },
+ {
+ field: 'riskDep',
+ title: '隐患所在部门',
+ // formatter: function (value, row, index) {
+ // if (row.dangerSources == "2") {
+ // return "隐患上报";
+ // } else {
+ // if (value == "1") {
+ // return "基础清单排查";
+ // } else if (value == "2") {
+ // return "选择风险单元清单排查";
+ // } else {
+ // return "选择风险单元清单排查";
+ // }
+ // }
+ // }
+ },
+ {
+ field: 'findPeople',
+ title: '发现人'
+ },
+ {
+ field: 'reportPeople',
+ title: '上报人'
+ },
+ {
+ field: 'liabilityPeople',
+ title: '负责人'
+ },
+ {
+ field: 'acceptPeople',
+ title: '验收人'
+ },
+ {
+ field: 'riskDesc',
+ title: '隐患内容'
+ },
+ {
+ field: 'findTime',
+ title: '隐患发现时间'
+ }]
+ };
+ $.table.init(options);
+ });
+
+
+ var compareDate = function (date1, date2) {
+ var oDate1 = new Date(date1);
+ var oDate2 = new Date(date2);
+ if (oDate1.getTime() >= oDate2.getTime()) {
+ return true; //第一个大
+ } else {
+ return false; //第二个大
+ }
+ }
+
+
+ /* 隐患核查--核查 */
+ function editDangerExamine(id) {
+ var editDangerExamineUrl = ctx + "tr/hiddenDangerCheck/dangerExamine/editDangerExamine/{id}";
+ $.modal.open("隐患核查", editDangerExamineUrl.replace("{id}", id));
+ }
+
+ /* 隐患核查--查看 */
+ function detailDangerExamine(id) {
+ var detailDangerExamineUrl = ctx + "tr/hiddenDangerCheck/dangerExamine/detailDangerExamine/{id}";
+ $.operate.openDetailInfo("查看隐患核查信息", detailDangerExamineUrl.replace("{id}", id));
+ }
+
+ /* 隐患整改--整改 */
+ function editDangerRectify(id) {
+ var editDangerRectifyUrl = ctx + "tr/hiddenDangerCheck/dangerRectify/editDangerRectify/{id}";
+ $.modal.open("隐患整改", editDangerRectifyUrl.replace("{id}", id));
+ }
+
+ /* 隐患整改--查看 */
+ function detailDangerRectify(id) {
+ var detailDangerRectifyUrl = ctx + "tr/hiddenDangerCheck/dangerRectify/detailDangerRectify/{id}";
+ $.operate.openDetailInfo("查看隐患整改信息", detailDangerRectifyUrl.replace("{id}", id));
+ }
+
+ /* 隐患验收--验收 */
+ function editDangerAccept(id) {
+ var editDangerAcceptUrl = ctx + "tr/hiddenDangerCheck/dangerAccept/editDangerAccept/{id}";
+ $.modal.open("隐患验收", editDangerAcceptUrl.replace("{id}", id));
+ }
+
+ /* 隐患验收--查看 */
+ function detailDangerAccept(id) {
+ var detailDangerAcceptUrl = ctx + "tr/hiddenDangerCheck/dangerAccept/detailDangerAccept/{id}";
+ $.operate.openDetailInfo("查看隐患验收信息", detailDangerAcceptUrl.replace("{id}", id));
+ }
+
+
+</script>
+</body>
+</html>
\ No newline at end of file
--
Gitblit v1.9.2