|
@@ -12,6 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<result property="equipmentName" column="equipment_name" />
|
|
|
<result property="workDes" column="work_des" />
|
|
|
<result property="pidNo" column="pid_no" />
|
|
|
+ <result property="devType" column="dev_type" />
|
|
|
<result property="completionDate" column="completion_date" />
|
|
|
<result property="confirmedPerson" column="confirmed_person" />
|
|
|
<result property="confirmedName" column="confirmed_name" />
|
|
@@ -27,7 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
</resultMap>
|
|
|
|
|
|
<sql id="selectTPssrOverhaulExchangerVo">
|
|
|
- select d.id, d.sub_id, d.approve_id, d.tag_no, d.equipment_name, d.work_des, d.pid_no, d.completion_date, d.confirmed_person,u.NICK_NAME confirmed_name, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.approve_status ,s.dept_name from t_pssr_overhaul_exchanger d
|
|
|
+ select d.dev_type,d.id, d.sub_id, d.approve_id, d.tag_no, d.equipment_name, d.work_des, d.pid_no, d.completion_date, d.confirmed_person,u.NICK_NAME confirmed_name, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.approve_status ,s.dept_name from t_pssr_overhaul_exchanger d
|
|
|
left join sys_dept s on s.dept_id = d.dept_id
|
|
|
left join sys_user u on u.user_id = d.CONFIRMED_PERSON
|
|
|
</sql>
|
|
@@ -37,6 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<where>
|
|
|
<if test="subId != null "> and sub_id = #{subId}</if>
|
|
|
<if test="approveId != null "> and approve_id = #{approveId}</if>
|
|
|
+ <if test="devType != null "> and dev_type = #{devType}</if>
|
|
|
<if test="tagNo != null and tagNo != ''"> and tag_no = #{tagNo}</if>
|
|
|
<if test="equipmentName != null and equipmentName != ''"> and equipment_name like concat(concat('%', #{equipmentName}), '%')</if>
|
|
|
<if test="workDes != null and workDes != ''"> and work_des = #{workDes}</if>
|
|
@@ -100,6 +102,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<if test="tagNo != null">tag_no,</if>
|
|
|
<if test="equipmentName != null">equipment_name,</if>
|
|
|
<if test="workDes != null">work_des,</if>
|
|
|
+ <if test="devType != null">dev_type,</if>
|
|
|
<if test="pidNo != null">pid_no,</if>
|
|
|
<if test="completionDate != null">completion_date,</if>
|
|
|
<if test="confirmedPerson != null">confirmed_person,</if>
|
|
@@ -119,6 +122,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<if test="tagNo != null">#{tagNo},</if>
|
|
|
<if test="equipmentName != null">#{equipmentName},</if>
|
|
|
<if test="workDes != null">#{workDes},</if>
|
|
|
+ <if test="devType != null">#{dev_type},</if>
|
|
|
<if test="pidNo != null">#{pidNo},</if>
|
|
|
<if test="completionDate != null">#{completionDate},</if>
|
|
|
<if test="confirmedPerson != null">#{confirmedPerson},</if>
|
|
@@ -141,6 +145,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<if test="tagNo != null">tag_no = #{tagNo},</if>
|
|
|
<if test="equipmentName != null">equipment_name = #{equipmentName},</if>
|
|
|
<if test="workDes != null">work_des = #{workDes},</if>
|
|
|
+ <if test="devType != null">dev_type = #{devType},</if>
|
|
|
<if test="pidNo != null">pid_no = #{pidNo},</if>
|
|
|
<if test="completionDate != null">completion_date = #{completionDate},</if>
|
|
|
<if test="confirmedPerson != null">confirmed_person = #{confirmedPerson},</if>
|