Browse Source

会员特批列表修改

anderx 1 year ago
parent
commit
97be83b05e

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

@@ -2182,11 +2182,11 @@
     from t_order_task a left join t_order_new b on a.order_no =b.order_no
     left join t_order_mid c on a.order_no =c.order_no
     left join t_task_member e on a.id=e.tid
+    left join (select order_no ,GROUP_CONCAT(`type`)`type` ,GROUP_CONCAT(type_explain)type_explain
+    from t_order_approval group by order_no) toa on b.order_no=toa.order_no
     <if test="shiroType ==2 or  shiroType ==3">
       left join department d on b.order_dep =d.id
     </if>
-    left join (select order_no ,GROUP_CONCAT(`type`)`type` ,GROUP_CONCAT(type_explain)type_explain
-    from t_order_approval group by order_no) toa on b.order_no=toa.order_no
     <if test="type !=null">
       inner join (select order_no ,GROUP_CONCAT(`type`)`type` ,GROUP_CONCAT(type_explain)type_explain
     from t_order_approval

+ 3 - 0
src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java

@@ -1332,6 +1332,9 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		if(in.getApproval()!=null) map.put("approval", in.getApproval());
 		if(in.getStatus()!=null) map.put("status", in.getStatus());
 		if(in.getShiroType()!=null) map.put("shiroType", in.getShiroType());
+		if(in.getType()!=null){
+			map.put("type", in.getType().split(","));
+		}
 		map.put("aid",TokenManager.getAdminId());
 //		if (TokenManager.hasRole(AFTConstants.VICE_CED)){
 //			map.put("approvalType",2);