增加status 状态字段查询

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

@@ -117,11 +117,11 @@ public class BidCommitteeController extends BaseController
      * @param sid
      * @return
      */
-    @GetMapping("/findCommitAndExpert/{sid}")
-    public TableDataInfo findCommitAndExpert(@PathVariable("sid") Long sid)
+    @GetMapping("/findCommitAndExpert")
+    public TableDataInfo findCommitAndExpert(@RequestParam("sid") Long sid,@RequestParam Long status)
     {
         startPage();
-        List<BidCommittee> list = bidCommitteeService.findCommitteeAndExpert(sid);
+        List<BidCommittee> list = bidCommitteeService.findCommitteeAndExpert(sid,status);
         return getDataTable(list);
     }
 

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

@@ -62,7 +62,7 @@ public interface BidCommitteeMapper
 
     public int delComBySid(Long sid);
 
-    public List<BidCommittee> findCommitteeAndExpert(Long sid);
+    public List<BidCommittee> findCommitteeAndExpert(Long sid,Long status);
 
     public List<BidTender> getProjectByUserId(Long userId);
 

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

@@ -62,7 +62,7 @@ public interface IBidCommitteeService
 
     public int delComBySid(Long sid);
 
-    public List<BidCommittee> findCommitteeAndExpert(Long sid);
+    public List<BidCommittee> findCommitteeAndExpert(Long sid,Long status);
 
     public List<BidTender> getProjectByUserId(Long userId);
 

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

@@ -99,8 +99,8 @@ public class BidCommitteeServiceImpl implements IBidCommitteeService
     }
 
     @Override
-    public List<BidCommittee> findCommitteeAndExpert(Long sid) {
-        return bidCommitteeMapper.findCommitteeAndExpert(sid);
+    public List<BidCommittee> findCommitteeAndExpert(Long sid,Long status) {
+        return bidCommitteeMapper.findCommitteeAndExpert(sid,status);
     }
 
     @Override

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

@@ -119,7 +119,11 @@
 
     <select id="findCommitteeAndExpert" parameterType="Long" resultMap="twoComAndExp">
         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 where c.sid=#{sid}
+                                                inner join bs_expert e on e.jid = c.jid
+        <where>
+            <if test="sid != null"> and sid = #{sid}</if>
+            <if test="status != null"> and status = #{status}</if>
+        </where>
     </select>
     <resultMap id="twoComAndExp" type="com.hh.bidding.domain.BidCommittee">
         <id column="pb_id" property="pbId"/>