DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(is): 将委托单位 ID 字段类型从 Long 改为 String

Browse Source 
- 修改了 IsInspectionCommission 及其相关类中的 clientId 字段类型
- 更新了对应的 Mapper 和 XML 文件
-调整了查询条件和结果映射
This commit is contained in:
Joshi
2025-08-15 13:23:15 +08:00
parent 03ddbf949d
commit 6deb6cb113
11 changed files with 56 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
klp-mes/src/main/resources/mapper/is/IsInspectionCommissionMapper.xml
View File

@@ -7,7 +7,7 @@
<resultMap type="com.klp.mes.is.domain.IsInspectionCommission" id="IsInspectionCommissionResult">
<result property="commissionId" column="commission_id"/>
<result property="commissionNo" column="commission_no"/>
<result property="clientId" column="client_id"/>
<result property="client" column="client_id"/>
<result property="sampleName" column="sample_name"/>
<result property="sampleType" column="sample_type"/>
<result property="quantity" column="quantity"/>

36
klp-mes/src/main/resources/mapper/is/IsInspectionTaskMapper.xml
View File

@@ -45,32 +45,32 @@
LEFT JOIN is_inspection_commission c ON t.commission_id = c.commission_id AND c.del_flag = 0
<where>
t.del_flag = 0
<if test="taskNo != null and taskNo != ''">
AND t.task_no = #{taskNo}
<if test="bo.taskNo != null and bo.taskNo != ''">
AND t.task_no = #{bo.taskNo}
</if>
<if test="commissionId != null">
AND t.commission_id = #{commissionId}
<if test="bo.commissionId != null">
AND t.commission_id = #{bo.commissionId}
</if>
<if test="assignedTo != null">
AND t.assigned_to = #{assignedTo}
<if test="bo.assignedTo != null">
AND t.assigned_to = #{bo.assignedTo}
</if>
<if test="startTime != null">
AND t.start_time = #{startTime}
<if test="bo.startTime != null">
AND t.start_time = #{bo.startTime}
</if>
<if test="endTime != null">
AND t.end_time = #{endTime}
<if test="bo.endTime != null">
AND t.end_time = #{bo.endTime}
</if>
<if test="result != null and result != ''">
AND t.result = #{result}
<if test="bo.result != null and bo.result != ''">
AND t.result = #{bo.result}
</if>
<if test="conclusion != null and conclusion != ''">
AND t.conclusion = #{conclusion}
<if test="bo.conclusion != null and bo.conclusion != ''">
AND t.conclusion = #{bo.conclusion}
</if>
<if test="status != null and status != ''">
AND t.status = #{status}
<if test="bo.status != null and bo.status != ''">
AND t.status = #{bo.status}
</if>
<if test="priority != null">
AND t.priority = #{priority}
<if test="bo.priority != null">
AND t.priority = #{bo.priority}
</if>
</where>
</select>

35
klp-mes/src/main/resources/mapper/is/IsSampleInventoryMapper.xml
View File

@@ -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>