会议sql修改
diff --git a/src/main/java/com/supwisdom/dlpay/conference/api/controller/ConerenceApiController.java b/src/main/java/com/supwisdom/dlpay/conference/api/controller/ConerenceApiController.java
index 35634c3..480fc9b 100644
--- a/src/main/java/com/supwisdom/dlpay/conference/api/controller/ConerenceApiController.java
+++ b/src/main/java/com/supwisdom/dlpay/conference/api/controller/ConerenceApiController.java
@@ -55,7 +55,7 @@
return resp;
}
- List<ConferenceApiBean> conflist = conferenceService.getConferneceForDevice(confdate,devphyid);
+ List<ConferenceApiBean> conflist = conferenceService.getConferneceForDevice(confdate,device.getDeviceid());
resp.setConflist(conflist);
resp.setCount(conflist.size());
resp.setRetmsg("OK");
diff --git a/src/main/java/com/supwisdom/dlpay/conference/service/ConferenceService.java b/src/main/java/com/supwisdom/dlpay/conference/service/ConferenceService.java
index 7fccdf5..3ebcbc9 100644
--- a/src/main/java/com/supwisdom/dlpay/conference/service/ConferenceService.java
+++ b/src/main/java/com/supwisdom/dlpay/conference/service/ConferenceService.java
@@ -63,7 +63,7 @@
List<TConfDtl> getUnupdateConfDtl();
@Transactional(rollbackFor = Exception.class, readOnly = true)
- List<ConferenceApiBean> getConferneceForDevice(String confdate,String deviceid);
+ List<ConferenceApiBean> getConferneceForDevice(String confdate,Integer deviceid);
@Transactional(rollbackFor = Exception.class)
TNolistConfPeople saveNolistConfPeople(TNolistConfPeople people) ;
diff --git a/src/main/java/com/supwisdom/dlpay/conference/service/impl/ConferenceServiceImpl.java b/src/main/java/com/supwisdom/dlpay/conference/service/impl/ConferenceServiceImpl.java
index e413d2a..1931136 100644
--- a/src/main/java/com/supwisdom/dlpay/conference/service/impl/ConferenceServiceImpl.java
+++ b/src/main/java/com/supwisdom/dlpay/conference/service/impl/ConferenceServiceImpl.java
@@ -457,7 +457,7 @@
}
@Override
- public List<ConferenceApiBean> getConferneceForDevice(String confdate,String deviceid) {
+ public List<ConferenceApiBean> getConferneceForDevice(String confdate,Integer deviceid) {
StringBuffer querySql=new StringBuffer("select a.confid,a.confname,a.conftype," +
"a.confdate,a.status,a.starttime,a.endtime,a.attendtime,c.devname as confarea from tb_conference a " +
"left join tb_conference_devbind b on a.confid=b.confid " +