Bladeren bron

Merge branch 'test' of jishutao/kede-server into prod

anderx 3 jaren geleden
bovenliggende
commit
3a4f70d165

+ 2 - 2
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

@@ -1166,11 +1166,11 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
      <if test="specially == 3">
        and  a.order_status=2
        <if test="approval ==0">
-         and a.process_status in(7)
+         and a.process_status in(4)
          and a.approval = 0
        </if>
        <if test="approval ==1">
-         and a.process_status in(7)
+         and a.process_status in(4)
          and a.approval in
          <if test="manageType ==0">
            (1)

+ 12 - 11
src/main/java/com/goafanti/common/mapper/TOrderTaskMapper.xml

@@ -1188,27 +1188,28 @@
     where order_no = #{orderNo,jdbcType=VARCHAR} and task_status &gt; 0 and super_id is null
   </select>
   <update id="updateDimissionTransfer" parameterType="java.lang.String">
-    update t_order_task a,admin b,t_change_task c
-    set task_allocator= #{aid,jdbcType=VARCHAR},task_receiver= #{transferId,jdbcType=VARCHAR},
-        a.receiver_name=b.name,c.receiver_name=b.name
+    update t_order_task a left join t_change_task b on a.id =b.tid
+    left join (select * from admin where id= #{transferId,jdbcType=VARCHAR})c on 1=1
+    set a.task_allocator= #{aid,jdbcType=VARCHAR},a.task_receiver= c.id
+        a.receiver_name=c.name,b.receiver_name=c.name
     <if test="type==0">
-      ,consultant_id=#{transferId,jdbcType=VARCHAR}
+      ,a.consultant_id=#{transferId,jdbcType=VARCHAR}
     </if>
     <if test="type==1">
-      ,manager_id=#{transferId,jdbcType=VARCHAR}
+      ,a.manager_id=#{transferId,jdbcType=VARCHAR}
     </if>
     <if test="type==3">
-      ,consultant_id= null
-      ,manager_id=#{transferId,jdbcType=VARCHAR}
+      ,a.consultant_id= null
+      ,a.manager_id=#{transferId,jdbcType=VARCHAR}
     </if>
     <if test="type==4">
-      ,consultant_id=#{transferId,jdbcType=VARCHAR}
-      ,manager_id= null
+      ,a.consultant_id=#{transferId,jdbcType=VARCHAR}
+      ,a.manager_id= null
     </if>
     <if test="type==1">
-      ,manager_id= null
+      ,a.manager_id= null
     </if>
-    where task_receiver=#{aid,jdbcType=VARCHAR} and b.id=#{transferId,jdbcType=VARCHAR} and a.id=c.tid
+    where task_receiver=#{aid,jdbcType=VARCHAR}
   </update>
 
   <select id="selectEstimateCost" resultType="java.lang.String">