Просмотр исходного кода

财务订单特批相关修改

anderx 1 год назад
Родитель
Сommit
66e314cd61
1 измененных файлов с 12 добавлено и 2 удалено
  1. 12 2
      src/main/java/com/goafanti/common/mapper/TOrderTaskMapper.xml

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

@@ -1080,8 +1080,8 @@
     e.approval,l.refund_status outsourceStatus,l.start_type outsourceType,ttm.certificates_count  alreadyNumber,f.nickname as userName,h.name as depName, l.company_name as outsourceName ,
     ifnull(k.hours,0) hours,a.split_status splitStatus,a.split_super splitSuper, a.split_id splitId,b.`type` projectType,ttm.cost_amount costAmount,tm.salesman_name salesmanName ,
     ttm.party_amount  partyAmount,a.commodity_price commodityPrice,a.outsource,date_format(a.task_end_time,'%Y-%m-%d') taskEndTime,date_format(e.sign_time,'%Y-%m-%d') signTime,
-    date_format(e.create_time ,'%Y-%m-%d')creteTime,a.patent_type  patentType,tmer.service_year serviceYear,e.approval_type as approvalType,e.approval_type_explain as approvalTypeExplain
-    from t_order_task a left join business_project b on a.commodity_id=b.id left join business_category c on b.cid=c.id,toa.type,toa.type_explain typeExplain
+    date_format(e.create_time ,'%Y-%m-%d')creteTime,a.patent_type  patentType,tmer.service_year serviceYear,toa.type,toa.type_explain typeExplain
+    from t_order_task a left join business_project b on a.commodity_id=b.id left join business_category c on b.cid=c.id
     left join t_order_new e on a.order_no=e.order_no left join user f on e.buyer_id=f.id left join t_order_mid tm on a.order_no =tm.order_no
     left join department h on e.order_dep=h.id  left join task_hours_count k on a.id=k.tid and a.task_receiver=k.aid left join t_order_outsource l
     on a.id=l.tid  left join t_task_mid ttm  on a.id=ttm.tid left join t_task_member tmer on a.id=tmer.tid
@@ -1213,6 +1213,16 @@
     <if test="outsourceStatus !=null">
       left join t_order_outsource l on a.id=l.tid
     </if>
+    <if test="type !=null">
+      inner join
+      (select order_no ,GROUP_CONCAT(`type`)`type` ,GROUP_CONCAT(type_explain)type_explain
+      from t_order_approval
+      where `type` in
+      <foreach collection="type" item="item" separator="," open="(" close=")">
+        #{item}
+      </foreach>
+      group by order_no) toa on e.order_no=toa.order_no
+    </if>
     where e.delete_sign in (0,2,3)  and e.order_status in (2,4)
     and a.outsource= #{outsource,jdbcType=INTEGER}
     <include refid="selectOrderTaskListSql"/>