Browse Source

咨询师列表修改

anderx 1 year ago
parent
commit
255d259d3e

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

@@ -1352,6 +1352,18 @@
     left join user f on e.buyer_id=f.id left join department h on e.order_dep=h.id
     left join (select task_id , sum(already_number) as alreadyNumber from task_progress group by task_id) i on a.id=i.task_id
     left join t_task_member ttm on a.id=ttm.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 e.order_no=toa.order_no
+    <if test="type !=null">
+      inner join
+      (select distinct order_no
+      from t_order_approval
+      where `type` in
+      <foreach collection="type" item="item" separator="," open="(" close=")">
+        #{item}
+      </foreach>
+      group by order_no) toa2 on e.order_no=toa2.order_no
+    </if>
     where e.delete_sign in(0,2,3)
     <if test="orderNo != null">
       and a.order_no= #{orderNo,jdbcType=VARCHAR}
@@ -1394,6 +1406,16 @@
     left join user f on e.buyer_id=f.id
     left join department h on e.order_dep=h.id
     left join (select task_id , sum(already_number) as alreadyNumber from task_progress group by task_id) i on a.id=i.task_id
+    <if test="type !=null">
+      inner join
+      (select distinct order_no
+      from t_order_approval
+      where `type` in
+      <foreach collection="type" item="item" separator="," open="(" close=")">
+        #{item}
+      </foreach>
+      group by order_no) toa2 on e.order_no=toa.order_no
+    </if>
     where e.delete_sign in(0,2,3)
     <if test="orderNo != null">
       and a.order_no= #{orderNo,jdbcType=VARCHAR}

+ 2 - 2
src/main/java/com/goafanti/order/controller/OrderProjectApiController.java

@@ -91,9 +91,9 @@ public class OrderProjectApiController extends CertifyApiController {
 	 */
 	@RequestMapping(value="/selectTaskList" ,method = RequestMethod.GET)
 	public Result selectTaskList(String name,String orderNo,String taskId,Integer taskStatus,String adminName,Integer specially  ,String depId,String thchId
-			,Integer pageNo,Integer pageSize){
+			,String type,Integer pageNo,Integer pageSize){
 		Result res=new Result();
-		res.setData(orderProjectService.selectTaskList( name, orderNo, taskId, taskStatus, adminName,specially ,  depId,thchId  ,pageNo, pageSize));
+		res.setData(orderProjectService.selectTaskList( name, orderNo, taskId, taskStatus, adminName,specially ,  depId,thchId ,type ,pageNo, pageSize));
 		return res;
 	}
 

+ 1 - 1
src/main/java/com/goafanti/order/service/OrderProjectService.java

@@ -35,7 +35,7 @@ public interface OrderProjectService {
 
 
 	Pagination<TOrderTaskListBo>  selectTaskList(String name, String orderNo, String taskId, Integer taskStatus, String adminName,
-			Integer specially,String depId  ,String thchId, Integer pageNo, Integer pageSize);
+			Integer specially,String depId  ,String thchId,String typpe, Integer pageNo, Integer pageSize);
 
 	List<TaskLogBo> TaskLogList(Integer id);
 

+ 4 - 1
src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java

@@ -1029,7 +1029,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 	@SuppressWarnings("unchecked")
 	@Override
 	public Pagination<TOrderTaskListBo> selectTaskList(String name, String orderNo, String taskId, Integer taskStatus,
-			String adminName, Integer specially,String depId,String thchId  , Integer pageNo, Integer pageSize) {
+			String adminName, Integer specially,String depId,String thchId  ,String type  , Integer pageNo, Integer pageSize) {
 		Map<String, Object> params = new HashMap<String, Object>();
 		if(pageSize==null||pageSize<0)pageSize=10;
 		if(pageNo==null||pageNo<0)pageNo=1;
@@ -1041,6 +1041,9 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		if (StringUtils.isNotBlank(thchId)) params.put("thchId", thchId);
 		if (StringUtils.isNotBlank(adminName)) params.put("adminName", adminName);
 		if (null != taskStatus) params.put("taskStatus", taskStatus);
+		if (StringUtils.isNotBlank(type)){
+			params.put("type", type.split(","));
+		}
 		Pagination<TOrderTaskListBo> p = (Pagination<TOrderTaskListBo>)findPage("selectTaskListByPage", "selectTaskListCount", params, pageNo, pageSize);
 		return p;
 	}