From 58af926675e2157b70abbe19152d329ba3f95810 Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期一, 27 三月 2023 17:14:10 +0800
Subject: [PATCH] 修改传参
---
/dev/null | 152 --------------------------------------
src/main/resources/templates/tr/selectOldRiskInfoPage/selectOldRiskInfoPage.html | 16 ++--
src/main/java/com/ruoyi/doublePrevention/controller/PreventRiskEventController.java | 2
src/main/java/com/ruoyi/project/tr/selectOldRiskInfoPage/controller/selectOldRiskInfoPageController.java | 55 +++++++++++++
4 files changed, 63 insertions(+), 162 deletions(-)
diff --git a/src/main/java/com/ruoyi/doublePrevention/controller/PreventRiskEventController.java b/src/main/java/com/ruoyi/doublePrevention/controller/PreventRiskEventController.java
index 9852320..75d6dbc 100644
--- a/src/main/java/com/ruoyi/doublePrevention/controller/PreventRiskEventController.java
+++ b/src/main/java/com/ruoyi/doublePrevention/controller/PreventRiskEventController.java
@@ -1,7 +1,5 @@
package com.ruoyi.doublePrevention.controller;
-
-
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.utils.poi.ExcelUtil;
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
deleted file mode 100644
index fc0247d..0000000
--- a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerRecordController.java
+++ /dev/null
@@ -1,152 +0,0 @@
-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/java/com/ruoyi/project/tr/selectOldRiskInfoPage/controller/selectOldRiskInfoPageController.java b/src/main/java/com/ruoyi/project/tr/selectOldRiskInfoPage/controller/selectOldRiskInfoPageController.java
new file mode 100644
index 0000000..3247621
--- /dev/null
+++ b/src/main/java/com/ruoyi/project/tr/selectOldRiskInfoPage/controller/selectOldRiskInfoPageController.java
@@ -0,0 +1,55 @@
+package com.ruoyi.project.tr.selectOldRiskInfoPage.controller;
+import java.util.List;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.project.system.company.service.ICompanyService;
+import com.ruoyi.project.system.dept.service.IDeptService;
+import com.ruoyi.project.system.role.service.IRoleService;
+import com.ruoyi.project.system.user.service.IUserService;
+import com.ruoyi.project.tr.hiddenDangerCheckPoint.domain.HiddenDangerCheckPoint;
+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.*;
+
+/**
+ * 隐患列表Controller
+ *
+ * @date 2020-05-08
+ */
+@Controller
+@RequestMapping("/tr/selectOldRiskInfoPage")
+public class selectOldRiskInfoPageController extends BaseController {
+ private String prefix = "tr/selectOldRiskInfoPage";
+
+ @Autowired
+ private IHiddenDangerCheckPointService hiddenDangerCheckPointService;
+
+ @GetMapping()
+ public String selectOldRiskInfoPage(ModelMap mmap)
+ {
+ return prefix + "/selectOldRiskInfoPage";
+ }
+
+
+
+ /**
+ * 查询隐患台账列表
+ */
+ @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);
+ }
+
+}
+
+
diff --git a/src/main/resources/templates/tr/hiddenDangerCheck/dangerRecord/dangerRecord.html b/src/main/resources/templates/tr/selectOldRiskInfoPage/selectOldRiskInfoPage.html
similarity index 93%
rename from src/main/resources/templates/tr/hiddenDangerCheck/dangerRecord/dangerRecord.html
rename to src/main/resources/templates/tr/selectOldRiskInfoPage/selectOldRiskInfoPage.html
index dedd92c..5bd4f76 100644
--- a/src/main/resources/templates/tr/hiddenDangerCheck/dangerRecord/dangerRecord.html
+++ b/src/main/resources/templates/tr/selectOldRiskInfoPage/selectOldRiskInfoPage.html
@@ -82,17 +82,17 @@
</div>
<th:block th:include="include :: footer"/>
<script th:inline="javascript">
- var prefix = ctx + "tr/hiddenDangerCheck/dangerRecord";
+ var prefix = ctx + "info";
// var common = [[${common}]];//用户角色 是否在公司管理员
-
+ console.log(ctx,prefix,'prefix')
$(function () {
var options = {
- url: prefix + "/list",
- // createUrl: prefix + "/add",
- // updateUrl: prefix + "/edit/{id}",
- // removeUrl: prefix + "/removeDangerLedger",
- // exportUrl: prefix + "/export",
- // detailUrl: prefix + "/detail/{id}",
+ url: prefix + "/selectOldRiskInfoPage",
+ createUrl: prefix + "/add",
+ updateUrl: prefix + "/edit/{id}",
+ removeUrl: prefix + "/removeDangerLedger",
+ exportUrl: prefix + "/export",
+ detailUrl: prefix + "/detail/{id}",
modalName: "隐患列表",
columns: [
{
--
Gitblit v1.9.2