admin/zhyc-sheep
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

派工单修改，权限修改

Browse Source
This commit is contained in:
漂泊
2026-01-13 21:46:01 +08:00
parent 2722fb985e
commit 458a440f63
7 changed files with 106 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
zhyc-module/src/main/resources/mapper/work/WorkOrderMapper.xml
View File

@@ -45,21 +45,51 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<where>
<if test="orderNo != null and orderNo != ''"> and order_no like concat('%', #{orderNo}, '%')</if>
<if test="planId != null "> and plan_id = #{planId}</if>
<if test="bizType != null "> and biz_type = #{bizType}</if>
<!-- 业务类型批量查询 -->
<if test="bizTypeArray != null and bizTypesArray.length > 0">
and biz_type in
<foreach collection="bizTypeArray" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<!-- 单个业务类型查询（保留原有逻辑） -->
<if test="bizType != null and bizTypeArray == null">
and biz_type = #{bizType}
</if>
<if test="title != null and title != ''"> and title like concat('%', #{title},'%')</if>
<if test="content != null and content != ''"> and content = #{content}</if>
<if test="department != null and department != ''"> and department = #{department}</if>
<if test="executor != null and executor != ''"> and executor like concat('%',#{executor},'%') </if>
<if test="beginPlanDate != null and endPlanDate != null ">
and execute_date between #{beginPlanDate} and #{endPlanDate}
</if>
and execute_date between #{beginPlanDate} and #{endPlanDate}
</if>
<if test="executeTime != null and executeTime != ''"> and execute_time = #{executeTime}</if>
<if test="sheepScope != null and sheepScope != ''"> and sheep_scope = #{sheepScope}</if>
<if test="location != null and location != ''"> and location = #{location}</if>
<if test="materialList != null and materialList != ''"> and material_list = #{materialList}</if>
<if test="toolList != null and toolList != ''"> and tool_list = #{toolList}</if>
<if test="status != null "> and status = #{status}</if>
<if test="priority != null "> and priority = #{priority}</if>
<!-- 状态批量查询 -->
<if test="statusArray != null and statusArray.length > 0">
and status in
<foreach collection="statusArray" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<!-- 单个状态查询（保留原有逻辑） -->
<if test="status != null and statusArray == null">
and status = #{status}
</if>
<!-- 优先级批量查询 -->
<if test="priorityArray != null and priorityArray.length > 0">
and priority in
<foreach collection="priorityArray" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<!-- 单个优先级查询（保留原有逻辑） -->
<if test="priority != null and priorityArray == null">
and priority = #{priority}
</if>
<if test="issuer != null "> and issuer like concat('%',#{issuer},'%') </if>
<if test="issueTime != null "> and issue_time = #{issueTime}</if>
<if test="receiverId != null "> and receiver_id = #{receiverId}</if>
@@ -67,12 +97,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="beginFinishDate != null and endFinishDate != null ">
and finish_time between #{beginFinishDate} and #{endFinishDate}
</if>
<if test="result != null and result != ''"> and result = #{result}</if>
</where>
order by execute_date desc
</select>
<select id="selectWorkOrderById" parameterType="Long" resultMap="WorkOrderResult">
<include refid="selectWorkOrderVo"/>