refactor(is): 将委托单位 ID 字段类型从 Long 改为 String
- 修改了 IsInspectionCommission 及其相关类中的 clientId 字段类型 - 更新了对应的 Mapper 和 XML 文件 -调整了查询条件和结果映射
This commit is contained in:
@@ -21,6 +21,7 @@
|
||||
<result property="updateBy" column="update_by"/>
|
||||
<result property="remark" column="remark"/>
|
||||
</resultMap>
|
||||
|
||||
<select id="selectVoPagePlus" resultType="com.klp.mes.is.domain.vo.IsSampleInventoryVo">
|
||||
SELECT
|
||||
s.sample_id,
|
||||
@@ -43,33 +44,31 @@
|
||||
LEFT JOIN is_inspection_commission c ON s.commission_id = c.commission_id AND c.del_flag = 0
|
||||
<where>
|
||||
s.del_flag = 0
|
||||
<if test="commissionId != null">
|
||||
AND s.commission_id = #{commissionId}
|
||||
<if test="bo.commissionId != null">
|
||||
AND s.commission_id = #{bo.commissionId}
|
||||
</if>
|
||||
<if test="location != null and location != ''">
|
||||
AND s.location = #{location}
|
||||
<if test="bo.location != null and bo.location != ''">
|
||||
AND s.location = #{bo.location}
|
||||
</if>
|
||||
<if test="currentQuantity != null">
|
||||
AND s.current_quantity = #{currentQuantity}
|
||||
<if test="bo.currentQuantity != null">
|
||||
AND s.current_quantity = #{bo.currentQuantity}
|
||||
</if>
|
||||
<if test="storageTime != null">
|
||||
AND s.storage_time = #{storageTime}
|
||||
<if test="bo.storageTime != null">
|
||||
AND s.storage_time = #{bo.storageTime}
|
||||
</if>
|
||||
<if test="expirationDate != null">
|
||||
AND s.expiration_date = #{expirationDate}
|
||||
<if test="bo.expirationDate != null">
|
||||
AND s.expiration_date = #{bo.expirationDate}
|
||||
</if>
|
||||
<if test="status != null and status != ''">
|
||||
AND s.status = #{status}
|
||||
<if test="bo.status != null and bo.status != ''">
|
||||
AND s.status = #{bo.status}
|
||||
</if>
|
||||
<if test="operatorId != null">
|
||||
AND s.operator_id = #{operatorId}
|
||||
<if test="bo.operatorId != null">
|
||||
AND s.operator_id = #{bo.operatorId}
|
||||
</if>
|
||||
<if test="lastUpdate != null">
|
||||
AND s.last_update = #{lastUpdate}
|
||||
<if test="bo.lastUpdate != null">
|
||||
AND s.last_update = #{bo.lastUpdate}
|
||||
</if>
|
||||
</where>
|
||||
</select>
|
||||
|
||||
|
||||
|
||||
</mapper>
|
||||
|
||||
Reference in New Issue
Block a user