双重预防项目-国泰新华二开定制版
16639036659
2022-10-31 5334a4a5d54f2d826bbf248fc05c8fc8e612b677
src/main/java/com/ruoyi/project/mobile/service/ApiDangerScheduleService.java
@@ -209,8 +209,15 @@
            queryExist.setWhetherDanger(TrHiddenDangerCheckConstants.WHETHER_DANGER_YES);//是否为隐患(是隐患)
            queryExist.setCheckPointId(hdcp.getCheckPointId());
            queryExist.setCheckId(hdcp.getCheckId());
            /**
             * 本次查询结果 :如果未上报过隐患,必定为空
             *      ?同一个检查任务,同一个排查点,可能多次上报隐患。
             *      本次查询未用到id,导致数据不唯一
             * */
            List<HiddenDangerCheckPoint> queryExistList =  hdcpService.selectHiddenDangerCheckPointList(queryExist);
            int i=0;
            //如果隐患信息已经存在,就新插入一条;如果不存在,就修改隐患信息
            if(queryExistList.size()>0){
                hdcp.setId(null);
                hdcp.setCheckTime(DateUtils.getNowDate());
@@ -219,6 +226,9 @@
                hdcp.setCompanyId(user.getCompanyId());
                i = hdcpService.insertHiddenDangerCheckPoint(hdcp);
                if (i< 1){
                    throw new RuntimeException("添加隐患附属信息失败");
                }
                // todo-2022 此处插入附属表
                //获取Id返回值
@@ -233,10 +243,14 @@
                hdcp.setUpdateTime(DateUtils.getNowDate());
                i = hdcpService.updateHiddenDangerCheckPoint(hdcp);
                // todo-2022 此处修改附属表
                int result = riskService.updateDangerInfo(hdcp);
                if (result < 1){
                    throw new RuntimeException("修改失败");
                // todo-2022 此处修改附属表,注释:
//                int result = riskService.updateDangerInfo(hdcp);
//                if (result < 1){
//                    throw new RuntimeException("修改失败");
//                }
                int result = riskService.insertDangerInfo(hdcp.getId(), hdcp);
                if (result< 1){
                    throw new RuntimeException("添加隐患附属信息失败");
                }
            }
            hdcpService.getTaskCountTotal(Long.valueOf(header.userId));//查询未执行任务总数量并推送