src/main/java/com/ruoyi/doublePrevention/controller/PreventRiskEventController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerRecordController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/java/com/ruoyi/project/tr/selectOldRiskInfoPage/controller/selectOldRiskInfoPageController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/resources/templates/tr/selectOldRiskInfoPage/selectOldRiskInfoPage.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
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; src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerRecordController.java
文件已删除 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); } } src/main/resources/templates/tr/selectOldRiskInfoPage/selectOldRiskInfoPage.html
文件名从 src/main/resources/templates/tr/hiddenDangerCheck/dangerRecord/dangerRecord.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: [ {