Browse Source

更改数据传递形式

ZC 2 weeks ago
parent
commit
508b841806

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

@@ -19,7 +19,6 @@ import com.ruoyi.system.api.domain.MastProject;
 import com.ruoyi.system.api.domain.SysDept;
 import com.ruoyi.system.api.domain.SysUser;
 import com.ruoyi.system.api.model.LoginUser;
-import jdk.internal.jline.internal.Nullable;
 import org.aspectj.weaver.loadtime.Aj;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -117,13 +116,10 @@ public class BidCommitteeController extends BaseController
      * @return
      */
     @GetMapping("/findCommitAndExpert")
-    public TableDataInfo findCommitAndExpert(@RequestParam("sid") Long sid, @Null @RequestParam("status") Long status)
+    public TableDataInfo findCommitAndExpert(BidCommittee bidCommittee)
     {
         startPage();
-        Map map = new HashMap();
-        map.put("sid",sid);
-        map.put("status",status);
-        List<BidCommittee> list = bidCommitteeService.findCommitteeAndExpert(map);
+        List<BidCommittee> list = bidCommitteeService.findCommitteeAndExpert(bidCommittee);
         return getDataTable(list);
     }
 

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

@@ -64,7 +64,7 @@ public interface BidCommitteeMapper
 
     public int delComBySid(Long sid);
 
-    public List<BidCommittee> findCommitteeAndExpert(Map map);
+    public List<BidCommittee> findCommitteeAndExpert(BidCommittee bidCommittee);
 
     public List<BidTender> getProjectByUserId(Long userId);
 

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

@@ -64,7 +64,7 @@ public interface IBidCommitteeService
 
     public int delComBySid(Long sid);
 
-    public List<BidCommittee> findCommitteeAndExpert(Map map);
+    public List<BidCommittee> findCommitteeAndExpert(BidCommittee bidCommittee);
 
     public List<BidTender> getProjectByUserId(Long userId);
 

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

@@ -100,8 +100,8 @@ public class BidCommitteeServiceImpl implements IBidCommitteeService
     }
 
     @Override
-    public List<BidCommittee> findCommitteeAndExpert(Map map) {
-        return bidCommitteeMapper.findCommitteeAndExpert(map);
+    public List<BidCommittee> findCommitteeAndExpert(BidCommittee bidCommittee) {
+        return bidCommitteeMapper.findCommitteeAndExpert(bidCommittee);
     }
 
     @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>
 
-    <select id="findCommitteeAndExpert" parameterType="Map" resultMap="twoComAndExp">
+    <select id="findCommitteeAndExpert" parameterType="com.hh.bidding.domain.BidCommittee" 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>