TroubleAndRisk.git

马宇豪

2024-06-13 bce5ddaccb8cb6107c1fe039dfa42c3a62ea2a66

添加

已重命名2个文件

已修改6个文件

已添加2个文件

已删除2个文件

	src/main/java/com/ruoyi/doublePrevention/entity/PreventRiskDangerInfo.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/ruoyi/doublePrevention/scheduls/ExecCJReportDateSchedule.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/ruoyi/project/tool/gen/util/VelocityUtils.java	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/ruoyi/project/tr/hiddenDangerCheckPoint/domain/HiddenDangerCheckPoint.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckTaskLogController.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/resources/templates/tr/specialCheckTaskLog/add.html	72 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/resources/templates/tr/specialCheckTaskLog/detail.html	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/resources/templates/tr/specialCheckTaskLog/edit.html	82 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/resources/templates/tr/specialCheckTaskLog/specialCheckTaskLog.html	67 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/resources/templates/tr/tbBaseCheckTask/selectTbBaseCheckTaskPage.html	22 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/resources/templates/tr/tbBaseCheckTask/taskAdd.html	407 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/resources/templates/tr/tbBaseCheckTask/taskEdit.html	321 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 src/main/java/com/ruoyi/doublePrevention/entity/PreventRiskDangerInfo.java

@@ -28,7 +28,7 @@
    /**

     *  隐患来源

     * 1-日常排查；2-综合性排查；3-专业性排查;4-季节性排查；5-重点时段及节假日前排查

     * 6-事故类比排查；7-复产复工前排查;8-外聘专家诊断式排查；9-管控措施实效;10-其他；11-政府执法检查

     * 6-事故类比排查；7-复产复工前排查;8-外聘专家诊断式排查；9-管控措施实效;10-其他

     * */

    private Byte dangerSrc;

    /**


 src/main/java/com/ruoyi/doublePrevention/scheduls/ExecCJReportDateSchedule.java

@@ -96,7 +96,7 @@
//    @Scheduled(cron = "0 0 23 * * ?")    //每天晚上23点执行一次0 0 22,23 * * ?

//    @Scheduled(cron = "0 0 22,23 * * ?")    //每天晚上22、23点执行一次

//    @Scheduled(cron = "0 0/1 * * * ? ")    // 分钟

    @Scheduled(cron = "0 0/20 * * * ? ")    // 分钟

//    @Scheduled(cron = "0 0/20 * * * ? ")    // 分钟

//    @Scheduled(cron = "0/30 * * * * ?")

    public void execReportDateSchedule() throws UnsupportedEncodingException {

        logger.info("【####】上报数据开始...");


 src/main/java/com/ruoyi/project/tool/gen/util/VelocityUtils.java

@@ -166,13 +166,13 @@
        {
            fileName = StringUtils.format("{}/tree.html", htmlPath);
        }
        else if (template.contains("taskAdd.html.vm"))
        else if (template.contains("add.html.vm"))
        {
            fileName = StringUtils.format("{}/taskAdd.html", htmlPath);
            fileName = StringUtils.format("{}/add.html", htmlPath);
        }
        else if (template.contains("taskEdit.html.vm"))
        else if (template.contains("edit.html.vm"))
        {
            fileName = StringUtils.format("{}/taskEdit.html", htmlPath);
            fileName = StringUtils.format("{}/edit.html", htmlPath);
        }
        else if (template.contains("sql.vm"))
        {

 src/main/java/com/ruoyi/project/tr/hiddenDangerCheckPoint/domain/HiddenDangerCheckPoint.java

@@ -455,7 +455,7 @@
    /**
     *  隐患来源
     * 1-日常排查；2-综合性排查；3-专业性排查;4-季节性排查；5-重点时段及节假日前排查
     * 6-事故类比排查；7-复产复工前排查;8-外聘专家诊断式排查；9-管控措施实效;10-其他；11-政府执法检查
     * 6-事故类比排查；7-复产复工前排查;8-外聘专家诊断式排查；9-管控措施实效;10-其他
     * */
    @Transient
    private Byte dangerSrc;

 src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckTaskLogController.java

@@ -101,7 +101,7 @@
        }
    }

    @GetMapping("/edit/{id}")
    @GetMapping("/edit/{indexId}")
    public String edit(@PathVariable("indexId") Long indexId, ModelMap mmap)
    {
        TbSpecialCheckTaskLog specialCheckTaskLogByIndexId = specialCheckTaskService.getSpecialCheckTaskLogByIndexId(indexId);

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

对比新文件
@@ -0,0 +1,72 @@
<!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-job-add">
        <div class="form-group">
            <label class="col-sm-3 control-label">风险分析对象：</label>
            <div class="col-sm-8">
                <select id="hazardSource" name="hazardSource" class="form-control">
                    <option th:each="hazard : ${hazardList}" th:text="${hazard.hazardSource}" th:value="${hazard.hazardCode}"></option>
                </select>
            </div>
        </div>
        <div class="form-group">
            <label class="col-sm-3 control-label is-required">检查类型：</label>
            <div class="col-sm-8">
                <select name="checkType" class="form-control m-b" required id="checkType">
                    <option value="">请选择</option>
                    <option value="1">企业自查</option>
                    <option value="2">市级及以下检查</option>
                    <option value="3">省级检查</option>
                    <option value="4">部级检查</option>
                </select>
            </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="checkDate" class="form-control" placeholder="yyyy-MM-dd" type="text">
                </div>
            </div>
        </div>
        <div class="form-group">
            <label class="col-sm-3 control-label is-required">是否停产整顿：</label>
            <div class="col-sm-8">
                <select name="resultStatus" class="form-control m-b" required id="resultStatus">
                    <option value="">请选择</option>
                    <option value="0">否</option>
                    <option value="1">是</option>
                </select>
            </div>
        </div>
    </form>
</div>
<th:block th:include="include :: footer"/>
<th:block th:include="include :: datetimepicker-js"/>
<script type="text/javascript">
    $("input[name='checkDate']").datetimepicker({
        format: "yyyy-mm-dd",
        minView: "month",
        autoclose: true
    });

    $("#form-job-add").validate({
        onkeyup: false,
        focusCleanup: true
    });

    function submitHandler() {
        if ($.validate.form()){
            $.operate.save(prefix + "/add", $('#form-job-add').serialize());
        }
    }
</script>
</body>
</html>

 src/main/resources/templates/tr/specialCheckTaskLog/detail.html


 src/main/resources/templates/tr/specialCheckTaskLog/edit.html

对比新文件
@@ -0,0 +1,82 @@
<!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-job-edit" th:object="${specialCheckTask}">

        <input id="indexId" name="indexId" type="hidden" th:field="*{indexId}"/>


<!--        <input id="createUserId" name="createUserId" type="hidden" th:field="*{createUserId}"/>-->
        <input id="createBy" name="createBy" type="hidden" th:field="*{createBy}"/>
        <div class="form-group">
            <label class="col-sm-3 control-label">风险分析对象：</label>
            <div class="col-sm-8">
                <select id="hazardSource" name="hazardSource" class="form-control">
                    <option th:each="hazard : ${hazardList}" th:text="${hazard.hazardSource}" th:value="${hazard.hazardCode}" th:field="*{hazardSource}"></option>
                </select>
            </div>
        </div>
        <div class="form-group">
            <label class="col-sm-3 control-label is-required">检查类型：</label>
            <div class="col-sm-8">
                <select name="checkType" th:field="*{checkType}" class="form-control m-b" required id="checkType">
                    <option value="">请选择</option>
                    <option value="1">企业自查</option>
                    <option value="2">市级及以下检查</option>
                    <option value="3">省级检查</option>
                    <option value="4">部级检查</option>
                </select>
            </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="checkDate" th:value="${#dates.format(specialCheckTask.checkDate, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
                </div>
            </div>
        </div>
        <div class="form-group">
            <label class="col-sm-3 control-label is-required">是否停产整顿：</label>
            <div class="col-sm-8">
                <select name="resultStatus" th:field="*{resultStatus}" class="form-control m-b" required id="resultStatus">
                    <option value="">请选择</option>
                    <option value="0">否</option>
                    <option value="1">是</option>
                </select>
            </div>
        </div>

<!--        <input id="jobGroup" name="jobGroup" type="hidden" value="specialCheckTaskLog"/>-->

    </form>
</div>
<th:block th:include="include :: footer"/>
<th:block th:include="include :: datetimepicker-js"/>
<script th:inline="javascript">
    var prefix = ctx + "tr/specialCheckTaskLog";
    $("input[name='checkDate']").datetimepicker({
        format: "yyyy-mm-dd",
        minView: "month",
        autoclose: true
    });

    $("#form-job-edit").validate({
        onkeyup: false,
        focusCleanup: true
    });

    function submitHandler() {
        if ($.validate.form()){
            $.operate.save(prefix + "/edit", $('#form-job-edit').serialize());
        }
    }
</script>
</body>
</html>

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

文件名从 src/main/resources/templates/tr/tbBaseCheckTask/specialCheckTaskLog.html 修改
@@ -32,14 +32,10 @@
            <form id="formId">
                <div class="select-list">
                    <ul>
<!--                        <li>-->
<!--                            <label>检查类别：</label>-->
<!--                            <input type="text" name="checkType"/>-->
<!--                        </li>-->

                        <input type="hidden" id="riskId" name="id" th:value="${id}"/>

                        <li>
                        <li style="display: none">
                            <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>
@@ -59,8 +55,6 @@
</div>
<th:block th:include="include :: footer"/>
<script th:inline="javascript">
    var statusDatas = [[${@dict.getType('sys_common_status')}]];
    var groupDatas = [[${@dict.getType('sys_job_group')}]];
    var prefix = ctx + "tr/specialCheckTaskLog";

    $(function () {
@@ -68,20 +62,23 @@
            url: prefix + "/list",
            queryParams: queryParams,
            cleanUrl: prefix + "/clean",
            createUrl: prefix + "/taskAdd",
            detailUrl: prefix + "/taskDetail/{id}",
            updateUrl: prefix + "/taskEdit/{id}",
            createUrl: prefix + "/add",
            detailUrl: prefix + "/detail/{id}",
            updateUrl: prefix + "/edit/{id}",
            removeUrl: prefix + "/remove",
            exportUrl: prefix + "/export",
            sortName: "createTime",
            sortOrder: "desc",
            modalName: "任务上报",
            columns: [{
                checkbox: true
            columns: [
                {
                    field: 'indexId',
                    title: 'indexId',
                    visible: false
            },
                {
                    field: 'riskName',
                    title: '风险分析对象'
                    field: 'hazardSource',
                    title: '风险分析对象编码'
                },
                {
                    field: 'checkType',
@@ -99,49 +96,45 @@
                    }
                },
                {
                    field: 'riskName',
                    field: 'checkDate',
                    title: '检查日期'
                },
                {
                    field: 'riskName',
                    field: 'resultStatus',
                    title: '是否停产整顿',
                    formatter: function (value, row, index) {
                        if (value == "1") {
                            return "企业自查";
                        } else if (value == "2") {
                            return "市级及以下检查";
                        } else if (value == "3") {
                            return "省级检查";
                        } else{
                            return "部级检查";
                        if (value == "0") {
                            return "正常";
                        } else if (value == "1") {
                            return "停产整顿";
                        }
                    }
                },
                {
                    field: 'riskName',
                    field: 'createBy',
                    title: '创建人'
                },
                {
                    field: 'riskName',
                    field: 'createDate',
                    title: '创建时间'
                },
                {
                    field: 'riskName',
                    field: 'updateBy',
                    title: '最后修改人'
                },
                {
                    field: 'riskName',
                    field: 'updateDate',
                    title: '最后修改时间'
                },
                {
                    field: 'scheduleCheckStatus',
                    field: 'reportStatus',
                    title: '上报状态',
                    align: 'center',
                    formatter: function (value, row, index) {
                        if (value == "0") {
                            return "未排查";
                        } else if (value == "1") {
                            return "已排查";
                        if (value == "1") {
                            return "未上报";
                        } else if (value == "2") {
                            return "已上报";
                        }
                    }
                },
@@ -150,8 +143,9 @@
                    align: 'center',
                    formatter: function (value, row, index) {
                        var actions = [];
                        actions.push('<a class="btn btn-success btn-xs" href="#" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
                        actions.push("<a class='btn btn-warning btn-xs' href='#' onclick='$.operate.detail(" + row.id + ")'><i class='fa fa-search'></i>查看</a> ");
                        actions.push("<a class='btn btn-default btn-xs' href='#' onclick='jobLog(" + row.indexId + ")'><i class='fa fa-list'></i>获取indexId</a>");
                        actions.push('<a class="btn btn-success btn-xs" href="#" onclick="$.operate.edit(\'' + row.indexId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
                        actions.push("<a class='btn btn-warning btn-xs' href='#' onclick='$.operate.detail(" + row.indexId + ")'><i class='fa fa-search'></i>查看</a> ");
                        return actions.join('');
                    }
                }
@@ -165,6 +159,9 @@
        search.id = $("#riskId").val();
        return search;
    }
    function jobLog(indexId) {
        console.log(indexId,'indexId')
    }
</script>
</body>
</html>

 src/main/resources/templates/tr/tbBaseCheckTask/selectTbBaseCheckTaskPage.html

@@ -24,11 +24,11 @@
            </form>
        </div>

        <div class="btn-group-sm" id="toolbar" role="group">
            <a class="btn btn-success" onclick="$.operate.add()">
                <i class="fa fa-plus"></i> 新增
            </a>
        </div>
<!--        <div class="btn-group-sm" id="toolbar" role="group">-->
<!--            <a class="btn btn-success" onclick="$.operate.add()">-->
<!--                <i class="fa fa-plus"></i> 新增-->
<!--            </a>-->
<!--        </div>-->

        <div class="col-sm-12 select-table table-striped">
            <table id="bootstrap-table"></table>
@@ -105,23 +105,13 @@
                    align: 'center',
                    formatter: function (value, row, index) {
                        var actions = [];
                        // actions.push("<a class='btn btn-default btn-xs' href='#' onclick='taskLog(" + row.id + ")'><i class='fa fa-list'></i>检查任务上报</a>");
                        actions.push('<a class="btn btn-info btn-xs " href="javascript:void(0)" onclick="$.operate.detail(\'' + row.id + '\')"><i class="fa fa-edit"></i>检查任务上报</a> ');
                        actions.push('<a class="btn btn-info btn-xs " href="javascript:void(0)" onclick="$.operate.detail(\'' + row.id + '\',1600)"><i class="fa fa-edit"></i>检查任务上报</a> ');
                        return actions.join('');
                    }
                }]
        };
        $.table.init(options);
    });

    /* 执行情况查询 */
    function taskLog(id) {
        var url = ctx + 'tr/specialCheckTaskLog';
        if ($.common.isNotEmpty(id)) {
            url += '?id=' + id;
        }
        $.operate.openDetailInfo("检查任务上报", url);
    }


</script>

 src/main/resources/templates/tr/tbBaseCheckTask/taskAdd.html

文件已删除

 src/main/resources/templates/tr/tbBaseCheckTask/taskEdit.html

文件已删除

			@@ -28,7 +28,7 @@
			/**
			* 隐患来源
			* 1-日常排查；2-综合性排查；3-专业性排查;4-季节性排查；5-重点时段及节假日前排查
			* 6-事故类比排查；7-复产复工前排查;8-外聘专家诊断式排查；9-管控措施实效;10-其他；11-政府执法检查
			* 6-事故类比排查；7-复产复工前排查;8-外聘专家诊断式排查；9-管控措施实效;10-其他
			* */
			private Byte dangerSrc;
			/**

			@@ -96,7 +96,7 @@
			// @Scheduled(cron = "0 0 23 * * ?") //每天晚上23点执行一次0 0 22,23 * * ?
			// @Scheduled(cron = "0 0 22,23 * * ?") //每天晚上22、23点执行一次
			// @Scheduled(cron = "0 0/1 * * * ? ") // 分钟
			@Scheduled(cron = "0 0/20 * * * ? ") // 分钟
			// @Scheduled(cron = "0 0/20 * * * ? ") // 分钟
			// @Scheduled(cron = "0/30 * * * * ?")
			public void execReportDateSchedule() throws UnsupportedEncodingException {
			logger.info("【####】上报数据开始...");

			@@ -166,13 +166,13 @@
			{
			fileName = StringUtils.format("{}/tree.html", htmlPath);
			}
			else if (template.contains("taskAdd.html.vm"))
			else if (template.contains("add.html.vm"))
			{
			fileName = StringUtils.format("{}/taskAdd.html", htmlPath);
			fileName = StringUtils.format("{}/add.html", htmlPath);
			}
			else if (template.contains("taskEdit.html.vm"))
			else if (template.contains("edit.html.vm"))
			{
			fileName = StringUtils.format("{}/taskEdit.html", htmlPath);
			fileName = StringUtils.format("{}/edit.html", htmlPath);
			}
			else if (template.contains("sql.vm"))
			{

			@@ -455,7 +455,7 @@
			/**
			* 隐患来源
			* 1-日常排查；2-综合性排查；3-专业性排查;4-季节性排查；5-重点时段及节假日前排查
			* 6-事故类比排查；7-复产复工前排查;8-外聘专家诊断式排查；9-管控措施实效;10-其他；11-政府执法检查
			* 6-事故类比排查；7-复产复工前排查;8-外聘专家诊断式排查；9-管控措施实效;10-其他
			* */
			@Transient
			private Byte dangerSrc;

			@@ -101,7 +101,7 @@
			}
			}

			@GetMapping("/edit/{id}")
			@GetMapping("/edit/{indexId}")
			public String edit(@PathVariable("indexId") Long indexId, ModelMap mmap)
			{
			TbSpecialCheckTaskLog specialCheckTaskLogByIndexId = specialCheckTaskService.getSpecialCheckTaskLogByIndexId(indexId);

对比新文件
			@@ -0,0 +1,72 @@
			<!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-job-add">
			<div class="form-group">
			<label class="col-sm-3 control-label">风险分析对象：</label>
			<div class="col-sm-8">
			<select id="hazardSource" name="hazardSource" class="form-control">
			<option th:each="hazard : ${hazardList}" th:text="${hazard.hazardSource}" th:value="${hazard.hazardCode}"></option>
			</select>
			</div>
			</div>
			<div class="form-group">
			<label class="col-sm-3 control-label is-required">检查类型：</label>
			<div class="col-sm-8">
			<select name="checkType" class="form-control m-b" required id="checkType">
			<option value="">请选择</option>
			<option value="1">企业自查</option>
			<option value="2">市级及以下检查</option>
			<option value="3">省级检查</option>
			<option value="4">部级检查</option>
			</select>
			</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="checkDate" class="form-control" placeholder="yyyy-MM-dd" type="text">
			</div>
			</div>
			</div>
			<div class="form-group">
			<label class="col-sm-3 control-label is-required">是否停产整顿：</label>
			<div class="col-sm-8">
			<select name="resultStatus" class="form-control m-b" required id="resultStatus">
			<option value="">请选择</option>
			<option value="0">否</option>
			<option value="1">是</option>
			</select>
			</div>
			</div>
			</form>
			</div>
			<th:block th:include="include :: footer"/>
			<th:block th:include="include :: datetimepicker-js"/>
			<script type="text/javascript">
			$("input[name='checkDate']").datetimepicker({
			format: "yyyy-mm-dd",
			minView: "month",
			autoclose: true
			});

			$("#form-job-add").validate({
			onkeyup: false,
			focusCleanup: true
			});

			function submitHandler() {
			if ($.validate.form()){
			$.operate.save(prefix + "/add", $('#form-job-add').serialize());
			}
			}
			</script>
			</body>
			</html>

对比新文件
			@@ -0,0 +1,82 @@
			<!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-job-edit" th:object="${specialCheckTask}">

			<input id="indexId" name="indexId" type="hidden" th:field="*{indexId}"/>


			<!-- <input id="createUserId" name="createUserId" type="hidden" th:field="*{createUserId}"/>-->
			<input id="createBy" name="createBy" type="hidden" th:field="*{createBy}"/>
			<div class="form-group">
			<label class="col-sm-3 control-label">风险分析对象：</label>
			<div class="col-sm-8">
			<select id="hazardSource" name="hazardSource" class="form-control">
			<option th:each="hazard : ${hazardList}" th:text="${hazard.hazardSource}" th:value="${hazard.hazardCode}" th:field="*{hazardSource}"></option>
			</select>
			</div>
			</div>
			<div class="form-group">
			<label class="col-sm-3 control-label is-required">检查类型：</label>
			<div class="col-sm-8">
			<select name="checkType" th:field="*{checkType}" class="form-control m-b" required id="checkType">
			<option value="">请选择</option>
			<option value="1">企业自查</option>
			<option value="2">市级及以下检查</option>
			<option value="3">省级检查</option>
			<option value="4">部级检查</option>
			</select>
			</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="checkDate" th:value="${#dates.format(specialCheckTask.checkDate, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
			</div>
			</div>
			</div>
			<div class="form-group">
			<label class="col-sm-3 control-label is-required">是否停产整顿：</label>
			<div class="col-sm-8">
			<select name="resultStatus" th:field="*{resultStatus}" class="form-control m-b" required id="resultStatus">
			<option value="">请选择</option>
			<option value="0">否</option>
			<option value="1">是</option>
			</select>
			</div>
			</div>

			<!-- <input id="jobGroup" name="jobGroup" type="hidden" value="specialCheckTaskLog"/>-->

			</form>
			</div>
			<th:block th:include="include :: footer"/>
			<th:block th:include="include :: datetimepicker-js"/>
			<script th:inline="javascript">
			var prefix = ctx + "tr/specialCheckTaskLog";
			$("input[name='checkDate']").datetimepicker({
			format: "yyyy-mm-dd",
			minView: "month",
			autoclose: true
			});

			$("#form-job-edit").validate({
			onkeyup: false,
			focusCleanup: true
			});

			function submitHandler() {
			if ($.validate.form()){
			$.operate.save(prefix + "/edit", $('#form-job-edit').serialize());
			}
			}
			</script>
			</body>
			</html>

文件名从 src/main/resources/templates/tr/tbBaseCheckTask/specialCheckTaskLog.html 修改
			@@ -32,14 +32,10 @@
			<form id="formId">
			<div class="select-list">
			<ul>
			<!-- <li>-->
			<!-- <label>检查类别：</label>-->
			<!-- <input type="text" name="checkType"/>-->
			<!-- </li>-->

			<input type="hidden" id="riskId" name="id" th:value="${id}"/>

			<li>
			<li style="display: none">
			<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>
			@@ -59,8 +55,6 @@
			</div>
			<th:block th:include="include :: footer"/>
			<script th:inline="javascript">
			var statusDatas = [[${@dict.getType('sys_common_status')}]];
			var groupDatas = [[${@dict.getType('sys_job_group')}]];
			var prefix = ctx + "tr/specialCheckTaskLog";

			$(function () {
			@@ -68,20 +62,23 @@
			url: prefix + "/list",
			queryParams: queryParams,
			cleanUrl: prefix + "/clean",
			createUrl: prefix + "/taskAdd",
			detailUrl: prefix + "/taskDetail/{id}",
			updateUrl: prefix + "/taskEdit/{id}",
			createUrl: prefix + "/add",
			detailUrl: prefix + "/detail/{id}",
			updateUrl: prefix + "/edit/{id}",
			removeUrl: prefix + "/remove",
			exportUrl: prefix + "/export",
			sortName: "createTime",
			sortOrder: "desc",
			modalName: "任务上报",
			columns: [{
			checkbox: true
			columns: [
			{
			field: 'indexId',
			title: 'indexId',
			visible: false
			},
			{
			field: 'riskName',
			title: '风险分析对象'
			field: 'hazardSource',
			title: '风险分析对象编码'
			},
			{
			field: 'checkType',
			@@ -99,49 +96,45 @@
			}
			},
			{
			field: 'riskName',
			field: 'checkDate',
			title: '检查日期'
			},
			{
			field: 'riskName',
			field: 'resultStatus',
			title: '是否停产整顿',
			formatter: function (value, row, index) {
			if (value == "1") {
			return "企业自查";
			} else if (value == "2") {
			return "市级及以下检查";
			} else if (value == "3") {
			return "省级检查";
			} else{
			return "部级检查";
			if (value == "0") {
			return "正常";
			} else if (value == "1") {
			return "停产整顿";
			}
			}
			},
			{
			field: 'riskName',
			field: 'createBy',
			title: '创建人'
			},
			{
			field: 'riskName',
			field: 'createDate',
			title: '创建时间'
			},
			{
			field: 'riskName',
			field: 'updateBy',
			title: '最后修改人'
			},
			{
			field: 'riskName',
			field: 'updateDate',
			title: '最后修改时间'
			},
			{
			field: 'scheduleCheckStatus',
			field: 'reportStatus',
			title: '上报状态',
			align: 'center',
			formatter: function (value, row, index) {
			if (value == "0") {
			return "未排查";
			} else if (value == "1") {
			return "已排查";
			if (value == "1") {
			return "未上报";
			} else if (value == "2") {
			return "已上报";
			}
			}
			},
			@@ -150,8 +143,9 @@
			align: 'center',
			formatter: function (value, row, index) {
			var actions = [];
			actions.push('<a class="btn btn-success btn-xs" href="#" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
			actions.push("<a class='btn btn-warning btn-xs' href='#' onclick='$.operate.detail(" + row.id + ")'><i class='fa fa-search'></i>查看</a> ");
			actions.push("<a class='btn btn-default btn-xs' href='#' onclick='jobLog(" + row.indexId + ")'><i class='fa fa-list'></i>获取indexId</a>");
			actions.push('<a class="btn btn-success btn-xs" href="#" onclick="$.operate.edit(\'' + row.indexId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
			actions.push("<a class='btn btn-warning btn-xs' href='#' onclick='$.operate.detail(" + row.indexId + ")'><i class='fa fa-search'></i>查看</a> ");
			return actions.join('');
			}
			}
			@@ -165,6 +159,9 @@
			search.id = $("#riskId").val();
			return search;
			}
			function jobLog(indexId) {
			console.log(indexId,'indexId')
			}
			</script>
			</body>
			</html>

			@@ -24,11 +24,11 @@
			</form>
			</div>

			<div class="btn-group-sm" id="toolbar" role="group">
			<a class="btn btn-success" onclick="$.operate.add()">
			<i class="fa fa-plus"></i> 新增
			</a>
			</div>
			<!-- <div class="btn-group-sm" id="toolbar" role="group">-->
			<!-- <a class="btn btn-success" onclick="$.operate.add()">-->
			<!-- <i class="fa fa-plus"></i> 新增-->
			<!-- </a>-->
			<!-- </div>-->

			<div class="col-sm-12 select-table table-striped">
			<table id="bootstrap-table"></table>
			@@ -105,23 +105,13 @@
			align: 'center',
			formatter: function (value, row, index) {
			var actions = [];
			// actions.push("<a class='btn btn-default btn-xs' href='#' onclick='taskLog(" + row.id + ")'><i class='fa fa-list'></i>检查任务上报</a>");
			actions.push('<a class="btn btn-info btn-xs " href="javascript:void(0)" onclick="$.operate.detail(\'' + row.id + '\')"><i class="fa fa-edit"></i>检查任务上报</a> ');
			actions.push('<a class="btn btn-info btn-xs " href="javascript:void(0)" onclick="$.operate.detail(\'' + row.id + '\',1600)"><i class="fa fa-edit"></i>检查任务上报</a> ');
			return actions.join('');
			}
			}]
			};
			$.table.init(options);
			});

			/* 执行情况查询 */
			function taskLog(id) {
			var url = ctx + 'tr/specialCheckTaskLog';
			if ($.common.isNotEmpty(id)) {
			url += '?id=' + id;
			}
			$.operate.openDetailInfo("检查任务上报", url);
			}


			</script>