场所评价，风险四色图信息提供

16639036659

2024-05-30 aecdefe2d7f9d116327d295c43e1d4ad1f4a813b

场所评价，风险四色图信息提供

 src/main/java/com/ruoyi/project/system/user/mapper/UserMapper.java

@@ -146,4 +146,8 @@
    User getUserByName(String createBy);

    List<User> getAllUser();

    List<User> selectForUpdatePwd();

    int updateUserForUpdatePwd(User user);
}

 src/main/java/com/ruoyi/project/system/user/service/IUserService.java

@@ -234,4 +234,8 @@
    User getUserByName(String createBy);

    List<User> getAllUser();

    List<User> selectForUpdatePwd();

    int updateUserForUpdatePwd(User user);
}

 src/main/java/com/ruoyi/project/system/user/service/UserServiceImpl.java

@@ -581,4 +581,14 @@
    public List<User> getAllUser() {
        return userMapper.getAllUser();
    }

    @Override
    public List<User> selectForUpdatePwd() {
        return userMapper.selectForUpdatePwd();
    }

    @Override
    public int updateUserForUpdatePwd(User user) {
        return userMapper.updateUserForUpdatePwd(user);
    }
}

 src/main/java/com/ruoyi/project/tr/riskList/controller/RiskListController.java

@@ -22,10 +22,7 @@
import com.ruoyi.project.tr.riskCheckPoint.service.IRiskCheckPointService;
import com.ruoyi.project.tr.riskEvaluationPlan.domain.RiskEvaluationPlan;
import com.ruoyi.project.tr.riskEvaluationPlan.service.IRiskEvaluationPlanService;
import com.ruoyi.project.tr.riskList.domain.RiskList;
import com.ruoyi.project.tr.riskList.domain.RiskListByCrafts;
import com.ruoyi.project.tr.riskList.domain.RiskListByDevice;
import com.ruoyi.project.tr.riskList.domain.RiskListByWork;
import com.ruoyi.project.tr.riskList.domain.*;
import com.ruoyi.project.tr.riskList.service.IRiskListService;
import com.ruoyi.project.tr.riskType.domain.RiskType;
import com.ruoyi.project.tr.riskType.service.IRiskTypeService;
@@ -49,7 +46,6 @@
@RequestMapping("/tr/riskList")
public class RiskListController extends BaseController {
    private String prefix = "tr/riskList";



    @Autowired
@@ -103,7 +99,7 @@
    }

    /**
     * 查询风险清单列表
     * 查询风险清单列表 todo-20240522-风险四色图
     */
    @PostMapping("/list/{id}")
    @ResponseBody
@@ -114,6 +110,20 @@
        riskList.setCompanyId(sysUser.getCompanyId());

        List<RiskList> list = riskListService.selectRiskListList(riskList);

        if (riskList.getRiskType() == 5){
            //获取所有风险评价计划
            List<RiskList> allPlan = riskListService.getAllPlan();
            for (RiskList risk : list) {
                for (RiskList riskListOfPlan : allPlan) {
                    if (risk.getRiskListId().equals(riskListOfPlan.getRiskListId())){
                        risk.setEvaluationNowFengxianJibie(riskListOfPlan.getEvaluationNowFengxianJibie());
                        risk.setEvaluationNowFengxianse(riskListOfPlan.getEvaluationNowFengxianse());
                        risk.setEvaluationNowJibie(riskListOfPlan.getEvaluationNowJibie());
                    }
                }
            }
        }
        //判断是否是作业活动，如果是，则再次查询工作频率类型
        if (id == 2) {
            RiskType riskType = new RiskType();

 src/main/java/com/ruoyi/project/tr/riskList/domain/RiskList.java

@@ -1,5 +1,6 @@
package com.ruoyi.project.tr.riskList.domain;

import com.baomidou.mybatisplus.annotation.TableField;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.framework.web.domain.BaseEntity;
import lombok.Data;
@@ -84,4 +85,13 @@
    /**已评价计划数  如作为查询条件 0 代表未评价, 1 代表已评价 */
    private Integer isEvaluation;

    @TableField(exist = false)
    private String evaluationNowFengxianJibie;

    @TableField(exist = false)
    private String evaluationNowFengxianse;

    @TableField(exist = false)
    private String evaluationNowJibie;

}

 src/main/java/com/ruoyi/project/tr/riskList/domain/RiskListVo.java

对比新文件
@@ -0,0 +1,89 @@
package com.ruoyi.project.tr.riskList.domain;

import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.framework.web.domain.BaseEntity;
import lombok.Data;

/**
 * 风险清单对象 tr_risk_list
 * 
 * @author wm
 * @date 2020-05-07
 */
@Data
public class RiskListVo
{

    /** id */
    private Long riskListId;

    /** 风险单元编号 */
    private String riskListNum;

    /** 风险单元名称 */
    private String riskListName;

    /** 是否特种(1否,2是) */
    @Excel(name = "是否特种",readConverterExp = "1=否,2=是")
    private Long riskListIsSpecial;

    /** 图片 */
    private String riskListImgUrl;

    /** 设备设施类型 */
    private Long riskListDeviceType;

    /** 规格/型号 */
    private String riskListDeviceModel;

    /** 作业活动类型 */
    private Long riskListWorkType;

    /** 作业频率 */
    private Long riskListWorkFrequency;

    private String riskListWorkFrequencyName;

    /** 工艺作业类型 */
    private Long riskListCraftsType;

    /**
     * 风险单元类型名称,(包含设备设施类型名称,作业活动类型名称,工艺节点类型名称)
     */
    private String riskTypeName;

    /** 节点描述 */
    private String riskListCraftsDescription;

    /** 区域/位置 */
    private Long regionId;

    /** 区域/位置名称 */
    private String regionName;

    /** 管辖单位/部门 */
    private Long deptId;

    /** 管辖部门名称 */
    private String deptName;

    /** 负责人 */
    private Long userId;

    /** 负责人名称 */
    private String userName;


    private Integer riskType;

    /** 所属公司 */
    private Long companyId;

    /**已评价计划数  如作为查询条件 0 代表未评价, 1 代表已评价 */
    private Integer isEvaluation;


    private String evaluationNowFengxianJibie;

    private String evaluationNowFengxianse;
}

 src/main/java/com/ruoyi/project/tr/riskList/mapper/RiskListMapper.java

@@ -1,10 +1,8 @@
package com.ruoyi.project.tr.riskList.mapper;

import java.util.List;
import com.ruoyi.project.tr.riskList.domain.RiskList;
import com.ruoyi.project.tr.riskList.domain.RiskListByCrafts;
import com.ruoyi.project.tr.riskList.domain.RiskListByDevice;
import com.ruoyi.project.tr.riskList.domain.RiskListByWork;

import com.ruoyi.project.tr.riskList.domain.*;

/**
 * 风险清单Mapper接口
@@ -85,4 +83,6 @@
    List<RiskList> getRiskUnitLists();

    RiskList getInfoByRiskListName(String riskListName);

    List<RiskList> getAllPlan(int riskType);
}

 src/main/java/com/ruoyi/project/tr/riskList/service/IRiskListService.java

@@ -1,10 +1,8 @@
package com.ruoyi.project.tr.riskList.service;

import java.util.List;
import com.ruoyi.project.tr.riskList.domain.RiskList;
import com.ruoyi.project.tr.riskList.domain.RiskListByCrafts;
import com.ruoyi.project.tr.riskList.domain.RiskListByDevice;
import com.ruoyi.project.tr.riskList.domain.RiskListByWork;

import com.ruoyi.project.tr.riskList.domain.*;

/**
 * 风险清单Service接口
@@ -85,4 +83,6 @@
    List<RiskList> getRiskUnitLists();

    RiskList getInfoByRiskListName(String riskListName);

    List<RiskList> getAllPlan();
}

 src/main/java/com/ruoyi/project/tr/riskList/service/impl/RiskListServiceImpl.java

@@ -4,10 +4,7 @@
import com.ruoyi.common.utils.text.Convert;
import com.ruoyi.project.tr.riskCheckPoint.mapper.RiskCheckPointMapper;
import com.ruoyi.project.tr.riskEvaluationPlan.mapper.RiskEvaluationPlanMapper;
import com.ruoyi.project.tr.riskList.domain.RiskList;
import com.ruoyi.project.tr.riskList.domain.RiskListByCrafts;
import com.ruoyi.project.tr.riskList.domain.RiskListByDevice;
import com.ruoyi.project.tr.riskList.domain.RiskListByWork;
import com.ruoyi.project.tr.riskList.domain.*;
import com.ruoyi.project.tr.riskList.mapper.RiskListMapper;
import com.ruoyi.project.tr.riskList.service.IRiskListService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -167,4 +164,10 @@
    public RiskList getInfoByRiskListName(String riskListName) {
        return riskListMapper.getInfoByRiskListName(riskListName);
    }

    @Override
    public List<RiskList> getAllPlan() {
        int riskType =5;
        return riskListMapper.getAllPlan(riskType);
    }
}

 src/main/resources/mybatis/system/UserMapper.xml

@@ -295,4 +295,15 @@
        select * from sys_user
        where del_flag = 0 and status = 0
    </select>

    <select id="selectForUpdatePwd" resultMap="UserResult">
        select * from sys_user
        where del_flag = 0 and status = 0 and ('2024-05-07 14:13:30' > update_time or update_time is null)
        limit 500
    </select>
<!--    int updateUserForUpdatePwd(User user);-->
    <update id="updateUserForUpdatePwd" parameterType="User">
        update sys_user set password = #{password}, update_time = #{updateTime}
        where user_id = #{userId}
    </update>
</mapper>

 src/main/resources/mybatis/tr/RiskListMapper.xml

@@ -337,4 +337,51 @@
        select * from tr_risk_list
        where risk_list_name = #{riskListName}
    </select>


    <resultMap type="com.ruoyi.project.tr.riskList.domain.RiskList" id="RiskListResultOfPlan">
        <result property="riskListId"    column="risk_list_id"    />
        <result property="createBy"    column="create_by"    />
        <result property="createTime"    column="create_time"    />
        <result property="updateBy"    column="update_by"    />
        <result property="updateTime"    column="update_time"    />
        <result property="remark"    column="remark"    />
        <result property="riskListNum"    column="risk_list_num"    />
        <result property="riskListName"    column="risk_list_name"    />
        <result property="riskListIsSpecial"    column="risk_list_is_special"    />
        <result property="riskListImgUrl"    column="risk_list_img_url"    />
        <result property="riskListDeviceType"    column="risk_list_device_type"    />
        <result property="riskListDeviceModel"    column="risk_list_device_model"    />
        <result property="riskListWorkType"    column="risk_list_work_type"    />
        <result property="riskListWorkFrequency"    column="risk_list_work_frequency"    />
        <result property="riskListCraftsType"    column="risk_list_crafts_type"    />
        <result property="riskListCraftsDescription"    column="risk_list_crafts_description"    />
        <result property="regionId"    column="region_id"    />
        <result property="regionName"    column="region_name"    />
        <result property="deptId"    column="dept_id"    />
        <result property="deptName"    column="dept_name"    />
        <result property="riskTypeName"    column="risk_type_name"    />
        <result property="userId"    column="user_id"    />
        <result property="userName"    column="user_name"    />
        <result property="riskType"    column="risk_type"    />
        <result property="companyId"    column="company_id"    />
        <result property="isEvaluation"    column="is_evaluation"    />

        <result property="evaluationNowFengxianJibie"    column="evaluation_now_fengxian_jibie"    />
        <result property="evaluationNowFengxianse"    column="evaluation_now_fengxianse"    />
        <result property="evaluationNowJibie"    column="evaluation_now_jibie"    />
    </resultMap>
<!--    List<RiskList> getAllPlan(int riskType);-->
    <select id="getAllPlan"  resultMap="RiskListResultOfPlan">
        SELECT
            a.*,
            c.evaluation_now_fengxian_jibie,
            c.evaluation_now_fengxianse,
            c.evaluation_now_jibie
        FROM tr_risk_list a
        LEFT JOIN tr_risk_evaluation_plan b ON b.evaluation_risk_id = a.risk_list_id
        left join tr_risk_check_point c on c.plan_id = b.plan_id
        where a.risk_type = 5
    </select>
</mapper>