ly пре 1 година
родитељ
комит
c08dc7eb7b
1 измењених фајлова са 7 додато и 4 уклоњено
  1. 7 4
      src/main/resources/mybatis/business/BizWorkOrderMapper.xml

+ 7 - 4
src/main/resources/mybatis/business/BizWorkOrderMapper.xml

@@ -15,7 +15,7 @@
     </resultMap>
 
     <select id="getRecord" resultMap="RecordResult">
-        select t1.*, t2.nick_name as handlerName, t3.nick_name as recorderName,t4.create_time as entrustTime
+        select t1.*, t2.nick_name as handlerName, t3.nick_name as recorderName, t4.create_time as entrustTime
         from biz_work_order_record t1
                  left join sys_user t2 on t1.handler_id = t2.user_id
                  left join sys_user t3 on t1.recorder_id = t3.user_id
@@ -27,8 +27,10 @@
 
 
     <select id="getList" parameterType="BizWorkOrder" resultMap="BizWorkOrderResult">
-        SELECT  CONCAT(t1.remark, t3.name, t4.name) AS contact_info,if(t7.status is null,0,t7.`status`),t1.*, t2.name as company_name, t2.social_credit_code, t3.name as task_type_name, t4.name as
-        task_type_detail_name, t5.nick_name as
+        SELECT CONCAT(t1.remark, t3.name, t4.name) AS contact_info,if(t7.status is null,0,t7.`status`),t1.*, t2.name as
+        company_name, t2.social_credit_code,
+        t3.name as task_type_name,
+        t4.name as task_type_detail_name, t5.nick_name as
         service_name,t6.alter_type,t6.address_style,t6.fiction_address_id,t6.province as inputProvince,t6.city as
         inputCity,t6.district as inputDistrict
         FROM biz_work_order t1
@@ -50,7 +52,8 @@
                 )
             </if>
             <if test="taskTypeName != null">
-                AND CONCAT( t3.name, t4.name) LIKE concat('%', #{taskTypeName}, '%') OR t1.remark LIKE concat('%', #{taskTypeName}, '%')
+                AND CONCAT( t3.name,"-", t4.name) LIKE concat('%', #{taskTypeName}, '%') OR t1.remark LIKE concat('%',#{taskTypeName}, '%')
+                OR CONCAT(t3.name,"-",t6.alter_type,"-",t4.name) LIKE concat('%', #{taskTypeName}, '%')
             </if>
             <if test="handlerName != null ">
                 AND t8.nick_name like concat('%', #{handlerName}, '%')