修改调岗bug，单据查看bug

jyzb-biz/src/main/java/com/junmp/jyzb/listener/CounterSignListener.java

@@ -253,7 +253,7 @@ public class CounterSignListener implements ExecutionListener {
                  }
 
                 }
-                else if (orderType.equals("reassigment"))//调岗相关
+                else if (orderType.equals("reassignment"))//调岗相关
                 {
                     Reassignment re=  reassignmentService.getOne(new LambdaQueryWrapper<Reassignment>()
                             .eq(Reassignment::getProcessId, execution.getProcessInstanceId()));

jyzb-biz/src/main/java/com/junmp/jyzb/listener/GlobalEndListener.java

@@ -168,7 +168,7 @@ import static com.junmp.junmpProcess.common.CommonConstants.*;
                         }
                         busFormService.updateById(busForm);
                     } else
-                    if (Type.equals("reassigment")){//调岗申请单
+                    if (Type.equals("reassignment")){//调岗申请单
                         Reassignment one = reassignmentService.getOne(new LambdaQueryWrapper<Reassignment>()
                                 .eq(Reassignment::getProcessId, processInstanceId));
                         UpdateReassignmentReq updateReassignmentReq = new UpdateReassignmentReq();

jyzb-biz/src/main/resources/mapper/OrderMainMapper.xml

@@ -84,12 +84,25 @@
         <if test="req.endOrgId != null and req.endOrgId != ''">
             and end_org_id = #{req.endOrgId}
         </if>
-        and (start_org_user_id = #{userId} or end_org_user_id = #{userId} or history_assign like CONCAT('%', #{userId}, '%') or current_assign like CONCAT('%', #{userId}, '%'))
+        <if test="req.orderType=='in'">
+            and ( end_org_user_id = #{userId}
+            or history_assign like CONCAT('%', #{userId}, '%') or current_assign like CONCAT('%', #{userId}, '%'))
+        </if>
+        <if test="req.orderType=='out'">
+            and (start_org_user_id = #{userId}
+            or history_assign like CONCAT('%', #{userId}, '%') or current_assign like CONCAT('%', #{userId}, '%'))
+        </if>
+
         <if test="req.orderState !=null and req.orderState != ''">
         and order_state = #{req.orderState}
         </if>
-        <if test="req.name!=null and req.name!=''">
-        and (start_org_name LIKE CONCAT('%', #{req.name}, '%') or end_org_name LIKE CONCAT('%', #{req.name}, '%') or supplier_name LIKE CONCAT('%', #{req.name}, '%') )
+        <if test="req.name!=null and req.name!='' and req.orderType=='in'">
+        and (end_org_name LIKE CONCAT('%', #{req.name}, '%')
+                 or supplier_name LIKE CONCAT('%', #{req.name}, '%') or return_user LIKE CONCAT('%', #{req.name}, '%')  )
+        </if>
+        <if test="req.name!=null and req.name!='' and req.orderType=='out'">
+            and (start_org_name LIKE CONCAT('%', #{req.name}, '%')
+            or supplier_name LIKE CONCAT('%', #{req.name}, '%') or return_user LIKE CONCAT('%', #{req.name}, '%')  )
         </if>
         <if test=" req.examineState=='unaudited'">
             and examine_state in('none','working')

jyzb-process/src/main/resources/mapper/QuickSuggestionsMapper.xml

@@ -29,7 +29,7 @@
         set om.examine_state ="refuse" where om.process_id =#{processId}
     </update>
     <update id="updateReassignment" parameterType="java.lang.String">
-        update bussiness_breassignment om
+        update bussiness_reassignment om
         set om.examine_state ="refuse" where om.process_id =#{processId}
     </update>
     <update id="updateInventorySum">