双重预防项目-国泰新华二开定制版
16639036659
2024-06-12 272a5cbd098e2890f713dcd4aa5c4cbbad7e8940
专项检查任务
已修改6个文件
48 ■■■■ 文件已修改
src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBBaseCheckItemController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBBaseCheckScoreController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBBaseCheckTaskController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckItemDangerLogController.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckTaskLogController.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/project/tr/specialCheck/service/impl/SpecialCheckItemDangerLogServiceImpl.java 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBBaseCheckItemController.java
@@ -40,7 +40,7 @@
    @PostMapping("/selectTbBaseCheckItemPage")
    @ResponseBody
    public TableDataInfo selectTbBaseCheckItemPage(@RequestBody TbBaseCheckItemBO tbBaseCheckItemBO)
    public TableDataInfo selectTbBaseCheckItemPage(TbBaseCheckItemBO tbBaseCheckItemBO)
    {
        ResultVO<List<TbBaseCheckItem>> resultVO = tbBaseCheckService.selectTbBaseCheckItemPage(tbBaseCheckItemBO);
src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBBaseCheckScoreController.java
@@ -40,7 +40,7 @@
    @PostMapping("/selectTbBaseCheckScorePage")
    @ResponseBody
    public TableDataInfo selectTbBaseCheckScorePage(@RequestBody TbBaseCheckScoreBO tbBaseCheckScoreBO)
    public TableDataInfo selectTbBaseCheckScorePage(TbBaseCheckScoreBO tbBaseCheckScoreBO)
    {
        ResultVO<List<TbBaseCheckScore>> resultVO = tbBaseCheckService.selectTbBaseCheckScorePage(tbBaseCheckScoreBO);
src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBBaseCheckTaskController.java
@@ -40,7 +40,7 @@
    @PostMapping("/selectTbBaseCheckTaskPage")
    @ResponseBody
    public TableDataInfo selectTbBaseCheckTaskPage(@RequestBody TbBaseCheckTaskBO tbBaseCheckTaskBO)
    public TableDataInfo selectTbBaseCheckTaskPage(TbBaseCheckTaskBO tbBaseCheckTaskBO)
    {
        ResultVO<List<TbBaseCheckTask>> resultVO = tbBaseCheckService.selectTbBaseCheckTaskPage(tbBaseCheckTaskBO);
src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckItemDangerLogController.java
@@ -54,7 +54,7 @@
    @PostMapping("/list")
    @ResponseBody
    public TableDataInfo selectSpecialCheckItemDangerLogPage(@RequestBody TbSpecialCheckItemDangerLogBO itemDangerLogBO )
    public TableDataInfo selectSpecialCheckItemDangerLogPage(TbSpecialCheckItemDangerLogBO itemDangerLogBO )
    {
        ResultVO<List<TbSpecialCheckItemDangerLog>> resultVO = itemDangerLogService.selectSpecialCheckItemDangerLogPage(itemDangerLogBO);
@@ -83,7 +83,7 @@
     */
    @PostMapping("/add")
    @ResponseBody
    public AjaxResult addSpecialItemDanger(@RequestBody TbSpecialCheckItemDangerLog itemDangerLog){
    public AjaxResult addSpecialItemDanger(TbSpecialCheckItemDangerLog itemDangerLog){
        ResultVO<TbSpecialCheckItemDangerLog> resultVO = itemDangerLogService.addSpecialItemDanger(itemDangerLog);
        String code = resultVO.getCode();
@@ -112,7 +112,7 @@
     */
    @PostMapping("/edit")
    @ResponseBody
    public AjaxResult editSave(@RequestBody TbSpecialCheckItemDangerLogUpdateBO updateBO)
    public AjaxResult editSave(TbSpecialCheckItemDangerLogUpdateBO updateBO)
    {
        ResultVO<TbSpecialCheckItemDangerLog> resultVO = itemDangerLogService.updateSpecialCheckItemDangerLog(updateBO);
        String code = resultVO.getCode();
@@ -126,7 +126,7 @@
    @PostMapping("/remove")
    @ResponseBody
    public AjaxResult remove(@RequestBody TbSpecialCheckItemDangerLogUpdateBO updateBO){
    public AjaxResult remove(TbSpecialCheckItemDangerLogUpdateBO updateBO){
        ResultVO<TbSpecialCheckItemDangerLog> resultVO = itemDangerLogService.deleteTbSpecialItemDangerTaskLog(updateBO);
        String code = resultVO.getCode();
        if ("200".equals(code)){
src/main/java/com/ruoyi/project/tr/specialCheck/controller/TBSpecialCheckTaskLogController.java
@@ -57,7 +57,7 @@
    @PostMapping("/list")
    @ResponseBody
    public TableDataInfo selectSpecialCheckTaskLogPage(@RequestBody TbSpecialCheckTaskLogBO specialCheckTaskLogBO)
    public TableDataInfo selectSpecialCheckTaskLogPage(TbSpecialCheckTaskLogBO specialCheckTaskLogBO)
    {
        ResultVO<List<TbSpecialCheckTaskLog>> resultVO = specialCheckTaskService.selectSpecialCheckTaskLogPage(specialCheckTaskLogBO);
@@ -86,7 +86,7 @@
     */
    @PostMapping("/add")
    @ResponseBody
    public AjaxResult addSpecialTask(@RequestBody TbSpecialCheckTaskLog tbSpecialCheckTaskLog){
    public AjaxResult addSpecialTask(TbSpecialCheckTaskLog tbSpecialCheckTaskLog){
        ResultVO<TbSpecialCheckTaskLog> resultVO = specialCheckTaskService.addSpecialTask(tbSpecialCheckTaskLog);
        String code = resultVO.getCode();
@@ -115,7 +115,7 @@
     */
    @PostMapping("/edit")
    @ResponseBody
    public AjaxResult editSave(@RequestBody TbSpecialCheckTaskLogUpdateBO updateBO)
    public AjaxResult editSave(TbSpecialCheckTaskLogUpdateBO updateBO)
    {
        ResultVO<TbSpecialCheckTaskLog> resultVO = specialCheckTaskService.updateSpecialCheckTaskLog(updateBO);
        String code = resultVO.getCode();
@@ -129,7 +129,7 @@
    @PostMapping("/remove")
    @ResponseBody
    public AjaxResult remove(@RequestBody TbSpecialCheckTaskLogUpdateBO updateBO){
    public AjaxResult remove(TbSpecialCheckTaskLogUpdateBO updateBO){
        ResultVO<TbSpecialCheckTaskLog> resultVO = specialCheckTaskService.deleteTbSpecialCheckTaskLog(updateBO);
        String code = resultVO.getCode();
        if ("200".equals(code)){
src/main/java/com/ruoyi/project/tr/specialCheck/service/impl/SpecialCheckItemDangerLogServiceImpl.java
@@ -186,32 +186,6 @@
            return resultVO;
        }
        // 四类id,挨个查询,判断是否存在
        if (updateBO.getCheckItemId() == null){
            resultVO.setMsg("检查项不能为空");
            return resultVO;
        }
        if (updateBO.getTaskId() == null){
            resultVO.setMsg("任务不能为空");
            return resultVO;
        }
        if (updateBO.getCheckScoreId() == null){
            resultVO.setMsg("评分不能为空");
            return resultVO;
        }
        if (updateBO.getDangerId() == null){
            resultVO.setMsg("关联隐患不能为空");
            return resultVO;
        }
        if (updateBO.getCheckDate() == null){
            resultVO.setMsg("检查时间不能为空");
            return resultVO;
        }
        if (updateBO.getCheckType() == null){
            resultVO.setMsg("检查类型不能为空");
            return resultVO;
        }
        TbSpecialCheckItemDangerLog tbSpecialCheckItemDangerLog = new TbSpecialCheckItemDangerLog();
        LocalDateTime dateTime = LocalDateTime.now();