|
|
@@ -28,10 +28,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<result property="lightingType" column="lighting_type" />
|
|
|
<result property="confirm1Name" column="confirm1_name" />
|
|
|
<result property="confirm2Name" column="confirm2_name" />
|
|
|
+ <result property="serialNumber" column="serial_number" />
|
|
|
</resultMap>
|
|
|
|
|
|
<sql id="selectTPssrLightingVo">
|
|
|
- select d.id, u1.nick_name confirm1_name, u2.nick_name confirm2_name, d.confirm1, d.confirm2, d.lighting_type, d.sub_id, d.approve_id, d.check_content, d.check_result, d.check_des, d.change_result, d.confirm, d.confirmation_date, 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_lighting d
|
|
|
+ select d.id, d.serial_number, u1.nick_name confirm1_name, u2.nick_name confirm2_name, d.confirm1, d.confirm2, d.lighting_type, d.sub_id, d.approve_id, d.check_content, d.check_result, d.check_des, d.change_result, d.confirm, d.confirmation_date, 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_lighting d
|
|
|
left join sys_dept s on s.dept_id = d.dept_id
|
|
|
left join sys_user u1 on u1.user_id = d.CONFIRM1
|
|
|
left join sys_user u2 on u2.user_id = d.CONFIRM2
|
|
|
@@ -58,6 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<if test="confirm1 != null and confirm1 != ''"> and confirm1 = #{confirm1}</if>
|
|
|
<if test="confirm2 != null and confirm2 != ''"> and confirm2 = #{confirm2}</if>
|
|
|
<if test="lightingType != null and lightingType != ''"> and lighting_type = #{lightingType}</if>
|
|
|
+ <if test="serialNumber != null and serialNumber != ''"> and serial_number = #{serialNumber}</if>
|
|
|
and d.del_flag = 0
|
|
|
</where>
|
|
|
<!-- 数据范围过滤 -->
|
|
|
@@ -95,6 +97,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<if test="confirm1 != null">confirm1,</if>
|
|
|
<if test="confirm2 != null">confirm2,</if>
|
|
|
<if test="lightingType != null">lighting_type,</if>
|
|
|
+ <if test="serialNumber != null">serial_number,</if>
|
|
|
</trim>
|
|
|
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
|
|
<if test="id != null">#{id},</if>
|
|
|
@@ -117,6 +120,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<if test="confirm1 != null">#{confirm1},</if>
|
|
|
<if test="confirm2 != null">#{confirm2},</if>
|
|
|
<if test="lightingType != null">#{lightingType},</if>
|
|
|
+ <if test="serialNumber != null">#{serialNumber},</if>
|
|
|
</trim>
|
|
|
</insert>
|
|
|
|
|
|
@@ -142,6 +146,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<if test="confirm1 != null">confirm1 = #{confirm1},</if>
|
|
|
<if test="confirm2 != null">confirm2 = #{confirm2},</if>
|
|
|
<if test="lightingType != null">lighting_type = #{lightingType},</if>
|
|
|
+ <if test="serialNumber != null">serial_number = #{serialNumber},</if>
|
|
|
</trim>
|
|
|
where id = #{id}
|
|
|
</update>
|
|
|
@@ -157,6 +162,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<if test="updaterCode != null">updater_code = #{updaterCode},</if>
|
|
|
<if test="updatedate != null">updatedate = #{updatedate},</if>
|
|
|
<if test="remarks != null">remarks = #{remarks},</if>
|
|
|
+ <if test="serialNumber != null">serial_number = #{serialNumber},</if>
|
|
|
</trim>
|
|
|
where id in
|
|
|
<foreach item="id" collection="ids" open="(" separator="," close=")">
|
wangggziwen