src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventOverhaulLogServiceImpl.java
@@ -71,9 +71,9 @@ ResultVO resultVO = new ResultVO<>(); resultVO.setCode(ErrorCodes.REQUEST_PARAM_ERROR.getCode()); if (insertReqBO.getHazardCode().isEmpty()){ throw new RuntimeException("风险分析对象编码为空"); } // if (insertReqBO.getHazardCode().isEmpty()){ // throw new RuntimeException("风险分析对象编码为空"); // } if (ObjectUtils.isEmpty(insertReqBO.getRiskUnitId())){ throw new RuntimeException("安全风险分析单元为空"); } src/main/java/com/ruoyi/project/tr/OverhaulLog/controller/OverhaulLogController.java
@@ -6,6 +6,8 @@ import com.ruoyi.doublePrevention.entity.dto.resp.PreventOverhaulLogRespDTO; import com.ruoyi.doublePrevention.entity.dto.resp.PreventRiskControlMeasureRespDTO; import com.ruoyi.doublePrevention.entity.dto.resp.PreventRiskEventListQueryRespDTO; import com.ruoyi.doublePrevention.entity.dto.resp.PreventRiskUnitCodeAndNameListQueryRespDTO; import com.ruoyi.doublePrevention.service.RiskService; import com.ruoyi.doublePrevention.service.baseService.PreventOverhaulLogService; import com.ruoyi.doublePrevention.vo.ResultVO; import com.ruoyi.framework.aspectj.lang.annotation.Log; @@ -32,15 +34,28 @@ @Autowired private PreventOverhaulLogService overhaulLogService; @Autowired private RiskService riskService; // @GetMapping() // public String overhaulLog() // { // return prefix + "/overhaulLog"; // } @GetMapping() public String overhaulLog() public String overhaulLog(ModelMap mmap) { List<PreventRiskUnitCodeAndNameListQueryRespDTO> respDTOS = riskService.listRiskUnitCodeAndName(); mmap.put("riskUnits", respDTOS); return prefix + "/overhaulLog"; } /** * 查询 * */ @PostMapping("/list") @ResponseBody public TableDataInfo selectOverhaulLogPage(PreventOverhaulLogReqBO overhaulLogReqBO, ModelMap mmap){ ResultVO<PreventOverhaulLogRespDTO> result = overhaulLogService.selectOverhaulLogPage(overhaulLogReqBO); @@ -54,12 +69,19 @@ /** * 新增检修记录 */ // @GetMapping("/add") // public String add() // { // return prefix + "/add"; // } @GetMapping("/add") public String add() public String add(ModelMap mmap) { List<PreventRiskUnitCodeAndNameListQueryRespDTO> respDTOS = riskService.listRiskUnitCodeAndName(); mmap.put("riskUnits", respDTOS); return prefix + "/add"; } /** * 新增保存检修记录 @@ -86,6 +108,8 @@ { PreventOverhaulLog overhaulLogById = overhaulLogService.getOverhaulLogById(id); mmap.put("overhaulLogById",overhaulLogById); List<PreventRiskUnitCodeAndNameListQueryRespDTO> respDTOS = riskService.listRiskUnitCodeAndName(); mmap.put("riskUnits", respDTOS); return prefix + "/edit"; }
@@ -2,6 +2,7 @@ <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"> @@ -11,7 +12,7 @@ <div class="col-sm-8"> <select name="riskUnitId" class="form-control m-b"> <option value="">--请选择安全风险分析单元--</option> <!-- <option th:each="u :${riskUnits}" th:value="${u.riskListId}" th:text="${u.riskListName}"></option>--> <option th:each="u :${riskUnits}" th:value="${u.riskListId}" th:text="${u.riskListName}"></option> </select> </div> </div> @@ -20,7 +21,7 @@ <div class="col-sm-8"> <div class="input-group date"> <span class="input-group-addon"><i class="fa fa-calendar"></i></span> <!-- <input id="evaluationBeginTime" name="evaluationBeginTime" class="form-control" placeholder="yyyy-MM-dd" type="text">--> <input name="stopStartTime" class="form-control" placeholder="yyyy-MM-dd" type="text"> </div> </div> </div> @@ -29,19 +30,20 @@ <div class="col-sm-8"> <div class="input-group date"> <span class="input-group-addon"><i class="fa fa-calendar"></i></span> <!-- <input id="evaluationEndTime" name="evaluationEndTime" class="form-control" placeholder="yyyy-MM-dd" type="text">--> <input name="stopEndTime" class="form-control" placeholder="yyyy-MM-dd" type="text"> </div> </div> </div> <div class="form-group"> <label class="col-sm-3 control-label">描述停用原因：</label> <div class="col-sm-8"> <!-- <textarea id="remark" name="remark" class="form-control"></textarea>--> <textarea id="stopReason" name="stopReason" class="form-control"></textarea> </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/overhaulLog"; $("#form-overhaulLog-add").validate({ @@ -54,6 +56,17 @@ $.operate.save(prefix + "/add", $('#form-overhaulLog-add').serialize()); } } $("input[name='stopStartTime']").datetimepicker({ format: "yyyy-mm-dd", minView: "month", autoclose: true }); $("input[name='stopEndTime']").datetimepicker({ format: "yyyy-mm-dd", minView: "month", autoclose: true }); </script> </body> </html> src/main/resources/templates/tr/overhaulLog/edit.html
@@ -2,6 +2,7 @@ <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"> @@ -10,10 +11,10 @@ <div class="form-group"> <label class="col-sm-3 control-label">安全风险分析单元名称：</label> <div class="col-sm-8"> <!-- <select name="riskUnitId" th:field="*{riskUnitId}" class="form-control m-b">--> <!-- <option value="">--请选择安全风险分析单元--</option>--> <!-- <option th:each="u :${riskUnits}" th:value="${u.riskListId}" th:text="${u.riskListName}"></option>--> <!-- </select>--> <select name="riskUnitId" th:field="*{riskUnitId}" class="form-control m-b"> <option value="">--请选择安全风险分析单元--</option> <option th:each="u :${riskUnits}" th:value="${u.riskListId}" th:text="${u.riskListName}"></option> </select> </div> </div> <div class="form-group"> @@ -21,7 +22,7 @@ <div class="col-sm-8"> <div class="input-group date"> <span class="input-group-addon"><i class="fa fa-calendar"></i></span> <!-- <input name="accidentTimeOfOccurrence" th:value="${#dates.format(accidentInformation.accidentTimeOfOccurrence, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text" required>--> <input name="stopStartTime" th:value="${#dates.format(overhaulLog.stopStartTime, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text" > </div> </div> </div> @@ -30,19 +31,20 @@ <div class="col-sm-8"> <div class="input-group date"> <span class="input-group-addon"><i class="fa fa-calendar"></i></span> <!-- <input name="planEndTime" th:value="${#dates.format(drillPlan.planEndTime, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text" required>--> <input name="stopEndTime" th:value="${#dates.format(overhaulLog.stopEndTime, '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">描述停用原因：</label> <div class="col-sm-8"> <!-- <textarea id="remark" name="remark" class="form-control">[[*{remark}]]</textarea>--> <textarea id="stopReason" name="stopReason" class="form-control">[[*{stopReason}]]</textarea> </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/overhaulLog"; $("#form-overhaulLog-edit").validate({ @@ -55,6 +57,17 @@ $.operate.save(prefix + "/add", $('#form-overhaulLog-edit').serialize()); } } $("input[name='stopStartTime']").datetimepicker({ format: "yyyy-mm-dd", minView: "month", autoclose: true }); $("input[name='stopEndTime']").datetimepicker({ format: "yyyy-mm-dd", minView: "month", autoclose: true }); </script> </body> </html> src/main/resources/templates/tr/overhaulLog/overhaulLog.html
@@ -14,7 +14,7 @@ <label>安全风险单元名称：</label> <select name="riskUnitId"> <option value="">--请选择安全风险分析单元--</option> <!-- <option th:each="u :${riskUnits}" th:value="${u.riskListId}" th:text="${u.riskListName}"></option>--> <option th:each="u :${riskUnits}" th:value="${u.riskListId}" th:text="${u.riskListName}"></option> </select> </li> <li>
