Browse Source

更改数据传递形式

ZC 2 weeks ago
parent
commit
8d8c5f8841

+ 5 - 5
ruoyi-modules/hh-bidding/src/main/java/com/hh/bidding/controller/BidCommitteeController.java

@@ -1,10 +1,7 @@
 package com.hh.bidding.controller;
 package com.hh.bidding.controller;
 
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
+import java.util.*;
 import java.io.IOException;
 import java.io.IOException;
-import java.util.LongSummaryStatistics;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponse;
 
 
 
 
@@ -121,7 +118,10 @@ public class BidCommitteeController extends BaseController
     public TableDataInfo findCommitAndExpert(@RequestParam("sid") Long sid,@RequestParam Long status)
     public TableDataInfo findCommitAndExpert(@RequestParam("sid") Long sid,@RequestParam Long status)
     {
     {
         startPage();
         startPage();
-        List<BidCommittee> list = bidCommitteeService.findCommitteeAndExpert(sid,status);
+        Map map = new HashMap();
+        map.put("sid",sid);
+        map.put("status",status);
+        List<BidCommittee> list = bidCommitteeService.findCommitteeAndExpert(map);
         return getDataTable(list);
         return getDataTable(list);
     }
     }
 
 

+ 3 - 1
ruoyi-modules/hh-bidding/src/main/java/com/hh/bidding/mapper/BidCommitteeMapper.java

@@ -1,6 +1,8 @@
 package com.hh.bidding.mapper;
 package com.hh.bidding.mapper;
 
 
 import java.util.List;
 import java.util.List;
+import java.util.Map;
+
 import com.hh.bidding.domain.BidCommittee;
 import com.hh.bidding.domain.BidCommittee;
 import com.hh.bidding.domain.BidTender;
 import com.hh.bidding.domain.BidTender;
 
 
@@ -62,7 +64,7 @@ public interface BidCommitteeMapper
 
 
     public int delComBySid(Long sid);
     public int delComBySid(Long sid);
 
 
-    public List<BidCommittee> findCommitteeAndExpert(Long sid,Long status);
+    public List<BidCommittee> findCommitteeAndExpert(Map map);
 
 
     public List<BidTender> getProjectByUserId(Long userId);
     public List<BidTender> getProjectByUserId(Long userId);
 
 

+ 3 - 1
ruoyi-modules/hh-bidding/src/main/java/com/hh/bidding/service/IBidCommitteeService.java

@@ -1,6 +1,8 @@
 package com.hh.bidding.service;
 package com.hh.bidding.service;
 
 
 import java.util.List;
 import java.util.List;
+import java.util.Map;
+
 import com.hh.bidding.domain.BidCommittee;
 import com.hh.bidding.domain.BidCommittee;
 import com.hh.bidding.domain.BidTender;
 import com.hh.bidding.domain.BidTender;
 
 
@@ -62,7 +64,7 @@ public interface IBidCommitteeService
 
 
     public int delComBySid(Long sid);
     public int delComBySid(Long sid);
 
 
-    public List<BidCommittee> findCommitteeAndExpert(Long sid,Long status);
+    public List<BidCommittee> findCommitteeAndExpert(Map map);
 
 
     public List<BidTender> getProjectByUserId(Long userId);
     public List<BidTender> getProjectByUserId(Long userId);
 
 

+ 3 - 2
ruoyi-modules/hh-bidding/src/main/java/com/hh/bidding/service/impl/BidCommitteeServiceImpl.java

@@ -1,6 +1,7 @@
 package com.hh.bidding.service.impl;
 package com.hh.bidding.service.impl;
 
 
 import java.util.List;
 import java.util.List;
+import java.util.Map;
 
 
 import com.hh.bidding.domain.BidTender;
 import com.hh.bidding.domain.BidTender;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -99,8 +100,8 @@ public class BidCommitteeServiceImpl implements IBidCommitteeService
     }
     }
 
 
     @Override
     @Override
-    public List<BidCommittee> findCommitteeAndExpert(Long sid,Long status) {
-        return bidCommitteeMapper.findCommitteeAndExpert(sid,status);
+    public List<BidCommittee> findCommitteeAndExpert(Map map) {
+        return bidCommitteeMapper.findCommitteeAndExpert(map);
     }
     }
 
 
     @Override
     @Override

+ 1 - 1
ruoyi-modules/hh-bidding/src/main/resources/mapper/BidCommitteeMapper.xml

@@ -117,7 +117,7 @@
         delete from bid_committee where sid = #{sid}
         delete from bid_committee where sid = #{sid}
     </delete>
     </delete>
 
 
-    <select id="findCommitteeAndExpert" parameterType="Long" resultMap="twoComAndExp">
+    <select id="findCommitteeAndExpert" parameterType="Map" resultMap="twoComAndExp">
         select c.pb_id,c.xid,c.sid,c.status,c.is_leader,e.* from bid_committee c
         select c.pb_id,c.xid,c.sid,c.status,c.is_leader,e.* from bid_committee c
                                                 inner join bs_expert e on e.jid = c.jid
                                                 inner join bs_expert e on e.jid = c.jid
         <where>
         <where>