From 88b3abfe8187a562a6a083d880f3fef863b01df2 Mon Sep 17 00:00:00 2001 From: heheng <475597332@qq.com> Date: 星期四, 20 三月 2025 11:02:22 +0800 Subject: [PATCH] 修改旧版台账 --- src/main/resources/mybatis/tr/RiskCheckPointMapper.xml | 139 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 139 insertions(+), 0 deletions(-) diff --git a/src/main/resources/mybatis/tr/RiskCheckPointMapper.xml b/src/main/resources/mybatis/tr/RiskCheckPointMapper.xml index 06ba794..a46ae7e 100644 --- a/src/main/resources/mybatis/tr/RiskCheckPointMapper.xml +++ b/src/main/resources/mybatis/tr/RiskCheckPointMapper.xml @@ -161,6 +161,121 @@ </resultMap> + <resultMap type="com.ruoyi.project.tr.riskCheckPoint.domain.RiskCheckPointBak" id="RiskCheckPointBakResult"> + <result property="checkPointId" column="check_point_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="sclJianchaXiangmu" column="SCL_jiancha_xiangmu" /> + <result property="sclJianchaMubiao" column="SCL_jiancha_mubiao" /> + <result property="sclQingkuang" column="SCL_qingkuang" /> + <result property="sclZhuyaoHouguo" column="SCL_zhuyao_houguo" /> +<!-- <result property="jhaZuoyeBuzhou" column="JHA_zuoye_buzhou" />--> +<!-- <result property="jhaWeixianyuan" column="JHA_weixianyuan" />--> +<!-- <result property="jhaShiguLeixing" column="JHA_shigu_leixing" />--> +<!-- <result property="hazopJiedian" column="HAZOP_jiedian" />--> +<!-- <result property="hazopCanshu" column="HAZOP_canshu" />--> +<!-- <result property="hazopCanshuMiaoshu" column="HAZOP_canshu_miaoshu" />--> +<!-- <result property="hazopYindaoci" column="HAZOP_yindaoci" />--> +<!-- <result property="hazopPiancha" column="HAZOP_piancha" />--> +<!-- <result property="hazopYuanyin" column="HAZOP_yuanyin" />--> +<!-- <result property="hazopHouguo" column="HAZOP_houguo" />--> + <result property="evaluationMethodType" column="evaluation_method_type" /> +<!-- <result property="evaluationUserId" column="evaluation_user_id" />--> + <result property="evaluationNowJishu" column="evaluation_now_jishu" /> + <result property="evaluationNowGuanli" column="evaluation_now_guanli" /> + <result property="evaluationNowJiaoyu" column="evaluation_now_jiaoyu" /> + <result property="evaluationNowFanghu" column="evaluation_now_fanghu" /> + <result property="evaluationNowYingji" column="evaluation_now_yingji" /> + <result property="evaluationNowLsL" column="evaluation_now_LS_L" /> + <result property="evaluationNowLsS" column="evaluation_now_LS_S" /> +<!-- <result property="evaluationNowLecL" column="evaluation_now_LEC_L" />--> +<!-- <result property="evaluationNowLecE" column="evaluation_now_LEC_E" />--> +<!-- <result property="evaluationNowLecC" column="evaluation_now_LEC_C" />--> +<!-- <result property="evaluationNowMesM" column="evaluation_now_MES_M" />--> +<!-- <result property="evaluationNowMesE" column="evaluation_now_MES_E" />--> +<!-- <result property="evaluationNowMesS" column="evaluation_now_MES_S" />--> +<!-- <result property="evaluationNowRsR" column="evaluation_now_RS_R" />--> +<!-- <result property="evaluationNowRsS" column="evaluation_now_RS_S" />--> + + <result property="evaluationNowLsLScore" column="evaluation_now_LS_L_Score" /> + <result property="evaluationNowLsSScore" column="evaluation_now_LS_S_Score" /> +<!-- <result property="evaluationNowLecLScore" column="evaluation_now_LEC_L_Score" />--> +<!-- <result property="evaluationNowLecEScore" column="evaluation_now_LEC_E_Score" />--> +<!-- <result property="evaluationNowLecCScore" column="evaluation_now_LEC_C_Score" />--> +<!-- <result property="evaluationNowMesMScore" column="evaluation_now_MES_M_Score" />--> +<!-- <result property="evaluationNowMesEScore" column="evaluation_now_MES_E_Score" />--> +<!-- <result property="evaluationNowMesSScore" column="evaluation_now_MES_S_Score" />--> +<!-- <result property="evaluationNowRsRScore" column="evaluation_now_RS_R_Score" />--> +<!-- <result property="evaluationNowRsSScore" column="evaluation_now_RS_S_Score" />--> + + <result property="evaluationNowFengxianzhi" column="evaluation_now_fengxianzhi" /> + <result property="evaluationNowJibie" column="evaluation_now_jibie" /> + <result property="evaluationNowFengxianJibie" column="evaluation_now_fengxian_jibie" /> + <result property="evaluationNowFengxianse" column="evaluation_now_fengxianse" /> + <result property="evaluationNowGuankongCengji" column="evaluation_now_guankong_cengji" /> + <result property="evaluationAfterJishu" column="evaluation_after_jishu" /> + <result property="evaluationAfterGuanli" column="evaluation_after_guanli" /> + <result property="evaluationAfterJiaoyu" column="evaluation_after_jiaoyu" /> + <result property="evaluationAfterFanghu" column="evaluation_after_fanghu" /> + <result property="evaluationAfterYingji" column="evaluation_after_yingji" /> + <result property="evaluationAfterLsL" column="evaluation_after_LS_L" /> + <result property="evaluationAfterLsS" column="evaluation_after_LS_S" /> +<!-- <result property="evaluationAfterLecL" column="evaluation_after_LEC_L" />--> +<!-- <result property="evaluationAfterLecE" column="evaluation_after_LEC_E" />--> +<!-- <result property="evaluationAfterLecC" column="evaluation_after_LEC_C" />--> +<!-- <result property="evaluationAfterMesM" column="evaluation_after_MES_M" />--> +<!-- <result property="evaluationAfterMesE" column="evaluation_after_MES_E" />--> +<!-- <result property="evaluationAfterMesS" column="evaluation_after_MES_S" />--> +<!-- <result property="evaluationAfterRsR" column="evaluation_after_RS_R" />--> +<!-- <result property="evaluationAfterRsS" column="evaluation_after_RS_S" />--> + + <result property="evaluationAfterLsLScore" column="evaluation_after_LS_L_Score" /> + <result property="evaluationAfterLsSScore" column="evaluation_after_LS_S_Score" /> +<!-- <result property="evaluationAfterLecLScore" column="evaluation_after_LEC_L_Score" />--> +<!-- <result property="evaluationAfterLecEScore" column="evaluation_after_LEC_E_Score" />--> +<!-- <result property="evaluationAfterLecCScore" column="evaluation_after_LEC_C_Score" />--> +<!-- <result property="evaluationAfterMesMScore" column="evaluation_after_MES_M_Score" />--> +<!-- <result property="evaluationAfterMesEScore" column="evaluation_after_MES_E_Score" />--> +<!-- <result property="evaluationAfterMesSScore" column="evaluation_after_MES_S_Score" />--> +<!-- <result property="evaluationAfterRsRScore" column="evaluation_after_RS_R_Score" />--> +<!-- <result property="evaluationAfterRsSScore" column="evaluation_after_RS_S_Score" />--> + + <result property="evaluationAfterFengxianzhi" column="evaluation_after_fengxianzhi" /> + <result property="evaluationAfterJibie" column="evaluation_after_jibie" /> + <result property="evaluationAfterFengxianJibie" column="evaluation_after_fengxian_jibie" /> + <result property="evaluationAfterFengxianse" column="evaluation_after_fengxianse" /> + <result property="evaluationAfterGuankongCengji" column="evaluation_after_guankong_cengji" /> + <result property="reviewUserId" column="review_user_id" /> + <result property="reviewOpinion" column="review_opinion" /> + <result property="reviewTime" column="review_time" /> + <result property="reviewStatus" column="review_status" /> + <result property="evaluationStatus" column="evaluation_status" /> + + <result property="evaluationUserName" column="evaluation_user_name" /> + <result property="planId" column="plan_id" /> + <result property="reviewUserName" column="review_user_name" /> + <result property="companyId" column="company_id" /> + + + <result property="eUserName" column="e_user_name" /> + <result property="rUserName" column="r_user_name" /> + + <result property="evaluationPlanName" column="evaluation_plan_name" /> + <result property="evaluationPlanUserName" column="evaluation_plan_user_name" /> + <result property="identifyPlanUserName" column="identify_plan_user_name" /> + <result property="evaluationBeginTime" column="evaluation_begin_time" /> + <result property="evaluationEndTime" column="evaluation_end_time" /> + <result property="evaluationType" column="evaluation_type" /> + <result property="stageStatus" column="stage_status" /> + <result property="riskListName" column="risk_list_name" /> + <!-- <association property="evaluationUser" column="evaluation_user_id" javaType="User" resultMap="evaluationUserResult" />--> +<!-- <association property="reviewUser" column="review_user_id" javaType="User" resultMap="reviewUserResult" />--> +<!-- <association property="plan" column="plan_id" javaType="RiskEvaluationPlan" resultMap="planResult" />--> + + </resultMap> <sql id="selectRiskCheckPointVo"> SELECT c.check_point_id, c.create_by, c.create_time, c.update_by, c.update_time, c.remark, @@ -227,6 +342,30 @@ LEFT JOIN tr_risk_list AS r ON p.evaluation_risk_id = r.risk_list_id </sql> + <select id="selectRiskCheckPointBakList" parameterType="RiskCheckPointBak" resultMap="RiskCheckPointBakResult"> + select * from tr_risk_check_point_bak + where 1=1 + <if test="checkPointId != null and checkPointId != ''"> and check_point_id = #{checkPointId}</if> + <if test="riskListName != null and riskListName != ''"> and risk_list_name like concat('%', #{riskListName}, '%') </if> + <if test="evaluationMethodType != null and evaluationMethodType !='' "> and evaluation_method_type = #{evaluationMethodType}</if> + <if test="evaluationType != null and evaluationType != ''"> and evaluation_type = #{evaluationType}</if> + <if test="params.beginReviewTime != null and params.beginReviewTime != ''"><!-- 开始时间检索 --> + AND date_format(review_time,'%y%m%d') >= date_format(#{params.beginReviewTime},'%y%m%d') + </if> + <if test="params.endReviewTime != null and params.endReviewTime != ''"><!-- 结束时间检索 --> + AND date_format(review_time,'%y%m%d') <= date_format(#{params.endReviewTime},'%y%m%d') + </if> + + <if test="reviewStatus != null and reviewStatus != ''"> and review_status = #{reviewStatus}</if> + + <if test="evaluationStatus != null and evaluationStatus != ''"> and evaluation_status = #{evaluationStatus}</if> + <if test="evaluationNowFengxianJibie != null and evaluationNowFengxianJibie != ''"> and evaluation_now_fengxian_jibie = #{evaluationNowFengxianJibie}</if> + <if test="evaluationAfterFengxianJibie != null and evaluationAfterFengxianJibie != ''"> and evaluation_after_fengxian_jibie = #{evaluationAfterFengxianJibie}</if> + + order by create_time desc + </select> + + <select id="selectRiskCheckPointList" parameterType="RiskCheckPoint" resultMap="RiskCheckPointResult"> <include refid="selectRiskCheckPointVo"/> <where> -- Gitblit v1.9.2