skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/manageProtect/mapper/ManageProtectRecordMapper.xml
@@ -11,6 +11,7 @@ <result property="reportTime" column="report_time"/> <result property="images" column="images" typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/> <result property="videos" column="videos" typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/> <result property="reportUser" column="real_name"/> <result property="createDept" column="create_dept"/> <result property="createUser" column="create_user"/> @@ -23,8 +24,9 @@ </resultMap> <select id="selectRecordPage" resultMap="vo"> SELECT R.*,arb."name" reservoirName FROM SM_MANAGE_PROTECT_RECORD R SELECT R.*,arb."name" reservoirName,U.REAL_NAME FROM SM_MANAGE_PROTECT_RECORD R LEFT JOIN SJZT_MD."att_res_base" arb on arb."guid" = R.reservoir_id LEFT JOIN BLADE_USER U ON U.ID = R.CREATE_USER WHERE R.IS_DELETED = 0 <if test="record.reservoirName != null and record.reservoirName !=''"> AND arb."name" LIKE CONCAT('%',#{record.reservoirName},'%') skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/manageProtect/vo/ManageProtectRecordVO.java
@@ -8,4 +8,5 @@ private String reservoirName; private String reportUser; } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/schedulingModules/mapper/SchedulingRecordMapper.xml
@@ -8,6 +8,7 @@ <result property="gateStatus" column="gate_status"/> <result property="content" column="content"/> <result property="images" column="images" typeHandler="com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler"/> <result property="reportUser" column="real_name"/> <result property="createDept" column="create_dept"/> <result property="createUser" column="create_user"/> @@ -20,8 +21,9 @@ <select id="selectRecordPage" resultMap="vo"> SELECT R.*,arb."name" reservoirName FROM SM_SCHEDULING_RECORD R SELECT R.*,arb."name" reservoirName,U.REAL_NAME FROM SM_SCHEDULING_RECORD R LEFT JOIN SJZT_MD."att_res_base" arb on arb."guid" = R.reservoir_id LEFT JOIN BLADE_USER U ON U.ID = R.CREATE_USER WHERE R.IS_DELETED = 0 <if test="record.reservoirName != null and record.reservoirName !=''"> AND arb."name" LIKE CONCAT('%',#{record.reservoirName},'%') skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/schedulingModules/vo/SchedulingRecordVO.java
@@ -6,4 +6,9 @@ @Data public class SchedulingRecordVO extends SchedulingRecord { private String reservoirName; /** * 上报人 */ private String reportUser; }
