修改controller

马宇豪

2023-04-28 56f09487b7750d479d097713c86008d857f2f168

修改controller

 src/main/java/com/ruoyi/doublePrevention/controller/RiskAndPeopleInfoController.java

@@ -21,7 +21,7 @@
    /**

     * 查看包保责任制信息 及统计信息

     */

    @PostMapping("/select/selectPage")

    @PostMapping("/selectRiskAndPeoplePage")

    public ResultVO<RiskAndPeopleInfoRespDTO> listRiskAndPeoplePage(@RequestBody RiskAndPeopleInfoReqBO reqBO){

        ResultVO resultVO = new ResultVO<>();

        resultVO.setCode("200");


 src/main/java/com/ruoyi/project/system/user/controller/IndexController.java

@@ -285,6 +285,12 @@
        mmap.put("version", ruoYiConfig.getVersion());
        return "main_two";
    }

    @GetMapping("/system/riskAndPeopleInfo")
    public String riskAndPeopleInfo(ModelMap mmap){
        mmap.put("version", ruoYiConfig.getVersion());
        return "riskAndPeopleInfo";
    }
}



 src/main/java/com/ruoyi/project/tr/selectRiskAndPeopleInfo/controller/selectRiskAndPeopleInfoController.java

对比新文件
@@ -0,0 +1,73 @@
package com.ruoyi.project.tr.selectRiskAndPeopleInfo.controller;

import com.ruoyi.doublePrevention.entity.dto.req.RiskAndPeopleInfoReqBO;
import com.ruoyi.doublePrevention.entity.dto.req.RiskOldInfoQueryReqDTO;
import com.ruoyi.doublePrevention.entity.dto.resp.RiskAndPeopleInfoRespDTO;
import com.ruoyi.doublePrevention.entity.dto.resp.RiskOldInfoQueryRespDTO;
import com.ruoyi.doublePrevention.service.baseService.RiskAndPeopleInfoService;
import com.ruoyi.doublePrevention.service.baseService.RiskOldInfoService;
import com.ruoyi.doublePrevention.vo.ResultVO;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.page.TableDataInfo;
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.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;

import java.util.List;

/**
 * 隐患列表Controller
 *
 * @date 2020-05-08
 */
@Controller
@RequestMapping("/tr/selectRiskAndPeoplePage")
public class selectRiskAndPeopleInfoController extends BaseController
{
    private String prefix = "tr/selectRiskAndPeoplePage";

    @Autowired
    private RiskAndPeopleInfoService riskAndPeopleInfoService;

    @Autowired
    private RiskOldInfoService riskOldInfoService;

    @GetMapping()
    public String selectOldRiskInfoPage(ModelMap mmap)
    {
        return prefix + "/selectRiskAndPeoplePage";
    }



    /**
     * 查询隐患台账列表
     */
    @PostMapping("/list")
    @ResponseBody
    public TableDataInfo list(RiskAndPeopleInfoReqBO reqBO)
    {
//        ResultVO resultVO = new ResultVO<>();
//        resultVO.setCode("200");
//        resultVO.setMsg("查询成功");

        ResultVO<RiskAndPeopleInfoRespDTO> result = riskAndPeopleInfoService.listRiskAndPeoplePage(reqBO);
        RiskAndPeopleInfoRespDTO data = (RiskAndPeopleInfoRespDTO) result.getData();
//        resultVO.setPageSize(result.getPageSize());
//        resultVO.setPageNum(result.getPageNum());
//        resultVO.setCount(result.getCount());
//        resultVO.setData(result.getData());

        TableDataInfo dataTable = getDataTable(data.getRiskAndPeopleInfoDTO());
        dataTable.setTotal(result.getCount());
        return dataTable;
    }

}



 src/main/resources/application.yml

@@ -53,9 +53,11 @@
    date-format: yyyy-MM-dd HH:mm:ss
  profiles:
    active: guotai-uat
#    active: druid
#    druid使用的数据库是5.7.28，过高的版本，可能有部分函数不支持
#    active: uat
#    active: uat8
#    active: local
  # 文件上传
  servlet:
    multipart:

 src/main/resources/static/ruoyi/js/ry-ui.js

@@ -1343,6 +1343,7 @@
                        $.operate.successCallback(result);
                    }
                };
                console.log(typeof config.data,'data')
                $.ajax(config)
            },
            // 保存信息 弹出提示框

 src/main/resources/templates/detailRiskAndPeopleInfo.html

对比新文件
@@ -0,0 +1,85 @@
<!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="*{id}" type="hidden">

            <!--现有分值-->
            <div class="panel panel-default">
                <div class="panel-body">
                    <div class="form-group">
                        <label class="col-sm-3 control-label">行政区划：</label>
                        <div class="col-sm-8">
                            <input id="areaCode" name="areaCode" th:field="*{areaCode}" 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="companyName" name="companyName" th:field="*{companyName}" 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="companyNatureName" name="companyNatureName" th:field="*{companyNatureName}" 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="hazardCode" name="hazardCode" th:field="*{hazardCode}" 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="hazardName" name="hazardName" th:field="*{hazardName}" 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="hazardRankName" name="hazardRankName" th:field="*{hazardRankName}" 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="parkName" name="parkName" th:field="*{parkName}" class="form-control" type="text" readonly>
                        </div>
                    </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>

 src/main/resources/templates/index.html

@@ -51,6 +51,7 @@
                    <ul class="nav nav-second-level">
                        <li><a class="menuItem" th:href="@{/system/main}">工作台</a></li>
                        <li><a class="menuItem" th:href="@{/system/main_two}">数据统计</a></li>
                        <li><a class="menuItem" th:href="@{/system/riskAndPeopleInfo}">重大危险源包保责任制</a></li>
                    </ul>
                </li>
                <li th:each="menu : ${menus}">

 src/main/resources/templates/riskAndPeopleInfo.html

对比新文件
@@ -0,0 +1,132 @@
<!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="hazardName" placeholder="请输入重大危险源名称"/>
                        </li>
                        <li>
                            <label>重大危险源级别：</label>
                            <select name="hazardRank">
                                <option value="">所有</option>
                                <option :value="1">1</option>
                                <option :value="2">2</option>
                                <option :value="3">3</option>
                                <option :value="4">4</option>
                            </select>
                        </li>

                        <li>
                            <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
                                    class="fa fa-search"></i>&nbsp;搜索</a>
                            <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i
                                    class="fa fa-refresh"></i>&nbsp;重置</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/selectRiskAndPeoplePage";
    // 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: "隐患列表",
            detailView: true,
            detailFormatter: detailFormatter,
            columns: [
                {
                    field: 'id',
                    title: 'id'
                },
                {
                    field: 'areaCode',
                    title: '行政区划'
                },
                {
                    field: 'companyName',
                    title: '企业名称',
                },
                {
                    field: 'companyNatureName',
                    title: '企业类型'
                },
                {
                    field: 'hazardCode',
                    title: '危险源编码'
                },
                {
                    field: 'hazardName',
                    title: '危险源名称'
                },
                {
                    field: 'hazardRankName',
                    title: '危险级别'
                },
                {
                    field: 'parkName',
                    title: '所在园区'
                },
                {
                    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.id + '\')"><i class="fa fa-search"></i>查看</a> ');
                        return actions.join('');
                    }
                }
            ]
        };
        $.table.init(options);
    });
    function detailFormatter(index, row) {
        var html = [];
        html.push('<p><b>id:</b> ' + row.id + '</p>');
        html.push('<p><b>行政区划:</b> ' + row.areaCode + '</p>');
        html.push('<p><b>企业名称:</b> ' + row.companyName + '</p>');
        html.push('<p><b>企业类型:</b> ' + row.companyNatureName + '</p>');
        html.push('<p><b>危险源编码:</b> ' + row.hazardCode + '</p>');
        html.push('<p><b>危险源名称:</b> ' + row.hazardName + '</p>');
        html.push('<p><b>危险级别：</b> ' + row.hazardRankName + '</p>');
        html.push('<p><b>所在园区:</b> ' + row.parkName + '</p>');
        // $.each(row, function(key, value) {
        //     html.push('<p><b>' + key + ':</b> ' + value + '</p>');
        // });
        return html.join('');
    }
</script>
</body>
</html>

 src/main/resources/templates/tr/hiddenDangerCheckJob/add.html

@@ -40,7 +40,7 @@
            <div class="col-sm-8">
                <select name="checkType" class="form-control m-b" required id="checkType">
                    <option value="1">基础清单排查</option>
                    <option value="2">选择风险单元清单排查</option>
<!--                    <option value="2">选择风险单元清单排查</option>-->
                </select>
            </div>
        </div>

 src/main/resources/templates/tr/riskAndPeopleInfo/riskAndPeopleInfo.html

对比新文件
@@ -0,0 +1,157 @@
<!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>&nbsp;搜索</a>
                            <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i
                                    class="fa fa-refresh"></i>&nbsp;重置</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/riskAndPeopleInfo";
    // 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: "隐患列表",
            detailView: true,
            detailFormatter: detailFormatter,
            columns: [
                {
                    field: 'id',
                    title: 'id'
                },
                {
                    field: 'riskLevel',
                    title: '级别'
                },
                {
                    field: 'riskDep',
                    title: '隐患所在部门',
                },
                {
                    field: 'findPeople',
                    title: '发现人'
                },
                {
                    field: 'reportPeople',
                    title: '上报人'
                },
                {
                    field: 'liabilityPeople',
                    title: '负责人'
                },
                {
                    field: 'acceptPeople',
                    title: '验收人'
                },
                {
                    field: 'riskDesc',
                    title: '隐患内容'
                },
                {
                    field: 'findTime',
                    title: '隐患发现时间'
                }
            ]
        };
        $.table.init(options);
    });
    function detailFormatter(index, row) {
        var html = [];
        html.push('<p><b>id:</b> ' + row.id + '</p>');
        html.push('<p><b>级别:</b> ' + row.riskLevel + '</p>');
        html.push('<p><b>隐患所在部门:</b> ' + row.riskDep + '</p>');
        html.push('<p><b>发现人:</b> ' + row.findPeople + '</p>');
        html.push('<p><b>上报人:</b> ' + row.reportPeople + '</p>');
        html.push('<p><b>负责人:</b> ' + row.liabilityPeople + '</p>');
        html.push('<p><b>验收人：</b> ' + row.acceptPeople + '</p>');
        html.push('<p><b>隐患内容:</b> ' + row.riskDesc + '</p>');
        html.push('<p><b>隐患发现时间:</b> ' + row.findTime + '</p>');
        // $.each(row, function(key, value) {
        //     html.push('<p><b>' + key + ':</b> ' + value + '</p>');
        // });
        return html.join('');
    }
</script>
</body>
</html>

 src/main/resources/templates/tr/riskCheckPoint/detailByLEC.html

@@ -138,24 +138,21 @@
                </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 th:if="(*{evaluationNowGuanli} == null or *{evaluationNowGuanli} == '' )or-->
<!--                            (*{evaluationNowJiaoyu} == null  or *{evaluationNowJiaoyu} == '' ) or-->
<!--                            (*{evaluationNowFanghu} == null  or *{evaluationNowFanghu} == '' ) or-->
<!--                            (*{evaluationNowYingji} == null or *{evaluationNowYingji} == '') " >-->
<!--                        &lt;!&ndash;只输入工程技术措施,显示模式&ndash;&gt;-->
<!--                        <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>-->

                    <span th:if="*{evaluationNowGuanli} != null and
                            *{evaluationNowJiaoyu} != null and
                            *{evaluationNowFanghu} != null and
                            *{evaluationNowYingji} != null ">
                    <span>
                        <!--五条管控措施都输入的模式,显示模式-->
                        <div class="form-group">
                            <label class="col-sm-3 control-label">技术措施：</label>
@@ -277,24 +274,21 @@
                <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 th:if="(*{evaluationAfterGuanli} == null or *{evaluationAfterGuanli} == '' )or-->
<!--                            (*{evaluationAfterJiaoyu} == null  or *{evaluationAfterJiaoyu} == '' ) or-->
<!--                            (*{evaluationAfterFanghu} == null  or *{evaluationAfterFanghu} == '' ) or-->
<!--                            (*{evaluationAfterYingji} == null or *{evaluationAfterYingji} == '') " >-->
<!--                        &lt;!&ndash;只输入工程技术措施,显示模式&ndash;&gt;-->
<!--                        <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>-->

                    <span th:if="*{evaluationAfterGuanli} != null and
                            *{evaluationAfterJiaoyu} != null and
                            *{evaluationAfterFanghu} != null and
                            *{evaluationAfterYingji} != null ">
                    <span>
                        <!--五条管控措施都输入的模式,显示模式-->
                        <div class="form-group">
                            <label class="col-sm-3 control-label">技术措施：</label>

 src/main/resources/templates/tr/riskCheckPoint/detailByLS.html

@@ -202,24 +202,21 @@
                </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 th:if="(*{evaluationNowGuanli} == null or *{evaluationNowGuanli} == '' )or-->
<!--                            (*{evaluationNowJiaoyu} == null  or *{evaluationNowJiaoyu} == '' ) or-->
<!--                            (*{evaluationNowFanghu} == null  or *{evaluationNowFanghu} == '' ) or-->
<!--                            (*{evaluationNowYingji} == null or *{evaluationNowYingji} == '') " >-->
<!--                        &lt;!&ndash;只输入工程技术措施,显示模式&ndash;&gt;-->
<!--                        <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>-->

                    <span th:if="${evaluationNowGuanli} != null and
                            *{evaluationNowJiaoyu} != null and
                            *{evaluationNowFanghu} != null and
                            *{evaluationNowYingji} != null ">
                    <span>
                        <!--五条管控措施都输入的模式,显示模式-->
                        <div class="form-group">
                            <label class="col-sm-3 control-label">技术措施：</label>
@@ -331,24 +328,21 @@
                <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 th:if="(*{evaluationAfterGuanli} == null or *{evaluationAfterGuanli} == '' )or-->
<!--                            (*{evaluationAfterJiaoyu} == null  or *{evaluationAfterJiaoyu} == '' ) or-->
<!--                            (*{evaluationAfterFanghu} == null  or *{evaluationAfterFanghu} == '' ) or-->
<!--                            (*{evaluationAfterYingji} == null or *{evaluationAfterYingji} == '') " >-->
<!--                        &lt;!&ndash;只输入工程技术措施,显示模式&ndash;&gt;-->
<!--                        <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>-->

                    <span th:if="*{evaluationAfterGuanli} != null and
                            *{evaluationAfterJiaoyu} != null and
                            *{evaluationAfterFanghu} != null and
                            *{evaluationAfterYingji} != null ">
                    <span>
                        <!--五条管控措施都输入的模式,显示模式-->
                        <div class="form-group">
                            <label class="col-sm-3 control-label">技术措施：</label>

 src/main/resources/templates/tr/riskCheckPoint/detailByMES.html

@@ -138,24 +138,21 @@
                </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 th:if="(${evaluationNowGuanli} == null or ${evaluationNowGuanli} == '' )or-->
<!--                            (${evaluationNowJiaoyu} == null  or ${evaluationNowJiaoyu} == '' ) or-->
<!--                            (${evaluationNowFanghu} == null  or ${evaluationNowFanghu} == '' ) or-->
<!--                            (${evaluationNowYingji} == null or ${evaluationNowYingji} == '') " >-->
<!--                        &lt;!&ndash;只输入工程技术措施,显示模式&ndash;&gt;-->
<!--                        <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>-->

                    <span th:if="${evaluationNowGuanli} != null and
                            ${evaluationNowJiaoyu} != null and
                            ${evaluationNowFanghu} != null and
                            ${evaluationNowYingji} != null ">
                    <span>
                        <!--五条管控措施都输入的模式,显示模式-->
                        <div class="form-group">
                            <label class="col-sm-3 control-label">技术措施：</label>
@@ -279,24 +276,21 @@
                <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 th:if="(*{evaluationAfterGuanli} == null or *{evaluationAfterGuanli} == '' )or-->
<!--                            (*{evaluationAfterJiaoyu} == null  or *{evaluationAfterJiaoyu} == '' ) or-->
<!--                            (*{evaluationAfterFanghu} == null  or *{evaluationAfterFanghu} == '' ) or-->
<!--                            (*{evaluationAfterYingji} == null or *{evaluationAfterYingji} == '') " >-->
<!--                        &lt;!&ndash;只输入工程技术措施,显示模式&ndash;&gt;-->
<!--                        <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>-->

                    <span th:if="*{evaluationAfterGuanli} != null and
                            *{evaluationAfterJiaoyu} != null and
                            *{evaluationAfterFanghu} != null and
                            *{evaluationAfterYingji} != null ">
                    <span>
                        <!--五条管控措施都输入的模式,显示模式-->
                        <div class="form-group">
                            <label class="col-sm-3 control-label">技术措施：</label>

 src/main/resources/templates/tr/riskCheckPoint/detailByRS.html

@@ -138,24 +138,21 @@
                </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 th:if="(*{evaluationNowGuanli} == null or *{evaluationNowGuanli} == '' )or-->
<!--                            (*{evaluationNowJiaoyu} == null  or *{evaluationNowJiaoyu} == '' ) or-->
<!--                            (*{evaluationNowFanghu} == null  or *{evaluationNowFanghu} == '' ) or-->
<!--                            (*{evaluationNowYingji} == null or *{evaluationNowYingji} == '') " >-->
<!--                        &lt;!&ndash;只输入工程技术措施,显示模式&ndash;&gt;-->
<!--                        <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>-->

                    <span th:if="${evaluationNowGuanli} != null and
                            *{evaluationNowJiaoyu} != null and
                            *{evaluationNowFanghu} != null and
                            *{evaluationNowYingji} != null ">
                    <span>
                        <!--五条管控措施都输入的模式,显示模式-->
                        <div class="form-group">
                            <label class="col-sm-3 control-label">技术措施：</label>
@@ -268,24 +265,21 @@
                <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 th:if="(*{evaluationAfterGuanli} == null or *{evaluationAfterGuanli} == '' )or-->
<!--                            (*{evaluationAfterJiaoyu} == null  or *{evaluationAfterJiaoyu} == '' ) or-->
<!--                            (*{evaluationAfterFanghu} == null  or *{evaluationAfterFanghu} == '' ) or-->
<!--                            (*{evaluationAfterYingji} == null or *{evaluationAfterYingji} == '') " >-->
<!--                        &lt;!&ndash;只输入工程技术措施,显示模式&ndash;&gt;-->
<!--                        <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>-->

                    <span th:if="*{evaluationAfterGuanli} != null and
                            *{evaluationAfterJiaoyu} != null and
                            *{evaluationAfterFanghu} != null and
                            *{evaluationAfterYingji} != null ">
                    <span>
                        <!--五条管控措施都输入的模式,显示模式-->
                        <div class="form-group">
                            <label class="col-sm-3 control-label">技术措施：</label>

 src/main/resources/templates/tr/riskEvaluationPlan/add.html

@@ -114,7 +114,6 @@

        //选择辨识人员
        function selectIdentifyUserId() {

            var url = "/system/user/selectUserByCompanyId";
            $.modal.openNoConfirm("用户选择", url, '700', '500');
        }

 src/main/resources/templates/tr/riskEvent/add.html

@@ -38,6 +38,7 @@
        });

        function submitHandler() {
            console.log($('#form-riskEvent-add').serialize(),'dad')
            if ($.validate.form()) {
                $.operate.save(prefix + "/add", $('#form-riskEvent-add').serialize());
            }