feat(is): 添加检验委托单、检验任务和样品库存相关功能- 新增检验委托单、检验任务和样品库存的实体类、BO、VO
- 实现检验委托单、检验任务和样品库存的增删查改功能 - 添加检验任务与委托单的关联查询
This commit is contained in:
@@ -0,0 +1,27 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.klp.mes.is.mapper.IsInspectionCommissionMapper">
|
||||
|
||||
<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="sampleName" column="sample_name"/>
|
||||
<result property="sampleType" column="sample_type"/>
|
||||
<result property="quantity" column="quantity"/>
|
||||
<result property="inspectionItems" column="inspection_items"/>
|
||||
<result property="commissionDate" column="commission_date"/>
|
||||
<result property="deadline" column="deadline"/>
|
||||
<result property="status" column="status"/>
|
||||
<result property="delFlag" column="del_flag"/>
|
||||
<result property="createTime" column="create_time"/>
|
||||
<result property="createBy" column="create_by"/>
|
||||
<result property="updateTime" column="update_time"/>
|
||||
<result property="updateBy" column="update_by"/>
|
||||
<result property="remark" column="remark"/>
|
||||
</resultMap>
|
||||
|
||||
|
||||
</mapper>
|
||||
@@ -0,0 +1,80 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.klp.mes.is.mapper.IsInspectionTaskMapper">
|
||||
|
||||
<resultMap type="com.klp.mes.is.domain.IsInspectionTask" id="IsInspectionTaskResult">
|
||||
<result property="taskId" column="task_id"/>
|
||||
<result property="taskNo" column="task_no"/>
|
||||
<result property="commissionId" column="commission_id"/>
|
||||
<result property="assignedTo" column="assigned_to"/>
|
||||
<result property="startTime" column="start_time"/>
|
||||
<result property="endTime" column="end_time"/>
|
||||
<result property="result" column="result"/>
|
||||
<result property="conclusion" column="conclusion"/>
|
||||
<result property="status" column="status"/>
|
||||
<result property="priority" column="priority"/>
|
||||
<result property="delFlag" column="del_flag"/>
|
||||
<result property="createTime" column="create_time"/>
|
||||
<result property="createBy" column="create_by"/>
|
||||
<result property="updateTime" column="update_time"/>
|
||||
<result property="updateBy" column="update_by"/>
|
||||
<result property="remark" column="remark"/>
|
||||
</resultMap>
|
||||
<select id="selectVoPagePlus" resultType="com.klp.mes.is.domain.vo.IsInspectionTaskVo">
|
||||
SELECT
|
||||
t.task_id,
|
||||
t.task_no,
|
||||
t.commission_id,
|
||||
c.commission_no,
|
||||
t.assigned_to,
|
||||
t.start_time,
|
||||
t.end_time,
|
||||
t.result,
|
||||
t.conclusion,
|
||||
t.status,
|
||||
t.priority,
|
||||
t.del_flag,
|
||||
t.create_time,
|
||||
t.create_by,
|
||||
t.update_time,
|
||||
t.update_by,
|
||||
t.remark
|
||||
FROM is_inspection_task t
|
||||
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>
|
||||
<if test="commissionId != null">
|
||||
AND t.commission_id = #{commissionId}
|
||||
</if>
|
||||
<if test="assignedTo != null">
|
||||
AND t.assigned_to = #{assignedTo}
|
||||
</if>
|
||||
<if test="startTime != null">
|
||||
AND t.start_time = #{startTime}
|
||||
</if>
|
||||
<if test="endTime != null">
|
||||
AND t.end_time = #{endTime}
|
||||
</if>
|
||||
<if test="result != null and result != ''">
|
||||
AND t.result = #{result}
|
||||
</if>
|
||||
<if test="conclusion != null and conclusion != ''">
|
||||
AND t.conclusion = #{conclusion}
|
||||
</if>
|
||||
<if test="status != null and status != ''">
|
||||
AND t.status = #{status}
|
||||
</if>
|
||||
<if test="priority != null">
|
||||
AND t.priority = #{priority}
|
||||
</if>
|
||||
</where>
|
||||
</select>
|
||||
|
||||
|
||||
|
||||
</mapper>
|
||||
@@ -0,0 +1,75 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.klp.mes.is.mapper.IsSampleInventoryMapper">
|
||||
|
||||
<resultMap type="com.klp.mes.is.domain.IsSampleInventory" id="IsSampleInventoryResult">
|
||||
<result property="sampleId" column="sample_id"/>
|
||||
<result property="commissionId" column="commission_id"/>
|
||||
<result property="location" column="location"/>
|
||||
<result property="currentQuantity" column="current_quantity"/>
|
||||
<result property="storageTime" column="storage_time"/>
|
||||
<result property="expirationDate" column="expiration_date"/>
|
||||
<result property="status" column="status"/>
|
||||
<result property="operatorId" column="operator_id"/>
|
||||
<result property="lastUpdate" column="last_update"/>
|
||||
<result property="delFlag" column="del_flag"/>
|
||||
<result property="createTime" column="create_time"/>
|
||||
<result property="createBy" column="create_by"/>
|
||||
<result property="updateTime" column="update_time"/>
|
||||
<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,
|
||||
s.commission_id,
|
||||
c.commission_no,
|
||||
s.location,
|
||||
s.current_quantity,
|
||||
s.storage_time,
|
||||
s.expiration_date,
|
||||
s.status,
|
||||
s.operator_id,
|
||||
s.last_update,
|
||||
s.del_flag,
|
||||
s.create_time,
|
||||
s.create_by,
|
||||
s.update_time,
|
||||
s.update_by,
|
||||
s.remark
|
||||
FROM is_sample_inventory s
|
||||
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>
|
||||
<if test="location != null and location != ''">
|
||||
AND s.location = #{location}
|
||||
</if>
|
||||
<if test="currentQuantity != null">
|
||||
AND s.current_quantity = #{currentQuantity}
|
||||
</if>
|
||||
<if test="storageTime != null">
|
||||
AND s.storage_time = #{storageTime}
|
||||
</if>
|
||||
<if test="expirationDate != null">
|
||||
AND s.expiration_date = #{expirationDate}
|
||||
</if>
|
||||
<if test="status != null and status != ''">
|
||||
AND s.status = #{status}
|
||||
</if>
|
||||
<if test="operatorId != null">
|
||||
AND s.operator_id = #{operatorId}
|
||||
</if>
|
||||
<if test="lastUpdate != null">
|
||||
AND s.last_update = #{lastUpdate}
|
||||
</if>
|
||||
</where>
|
||||
</select>
|
||||
|
||||
|
||||
|
||||
</mapper>
|
||||
Reference in New Issue
Block a user