|
@@ -4,12 +4,15 @@ import java.util.LinkedHashMap;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
|
|
|
+import org.apache.poi.util.StringUtil;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
+import org.springframework.util.StringUtils;
|
|
|
|
|
|
import com.fuzamei.dao.CapitalTransferDao;
|
|
|
import com.fuzamei.entity.CapitalTransfer;
|
|
|
import com.fuzamei.entity.CapitalTransferCheck;
|
|
|
+import com.fuzamei.entity.User;
|
|
|
import com.fuzamei.utils.PageDTO;
|
|
|
|
|
|
@Service
|
|
@@ -29,7 +32,9 @@ public class CapitalTransferService {
|
|
|
String status_name="";
|
|
|
long startTime = 0;
|
|
|
long endTime = Long.MAX_VALUE;
|
|
|
-
|
|
|
+
|
|
|
+ StringUtils.isEmpty(map);
|
|
|
+
|
|
|
if (!"".equals(map.get("page")) && map.get("page") != null) {
|
|
|
try {
|
|
|
page = Integer.parseInt((String) map.get("page"));
|
|
@@ -73,6 +78,7 @@ public class CapitalTransferService {
|
|
|
mapToDao.put("startTime", startTime);
|
|
|
mapToDao.put("endTime", Long.MAX_VALUE);
|
|
|
}
|
|
|
+
|
|
|
mapToDao.put("rowNum", ROW_NUM);
|
|
|
int countPage=capitalTransferDao.selectCapitalTransferPage();
|
|
|
List<CapitalTransfer> CapitalTransferList=capitalTransferDao.selectCapitalTransferTable(mapToDao);
|
|
@@ -84,19 +90,25 @@ public class CapitalTransferService {
|
|
|
|
|
|
public Map<String, Object> selectChaKanZiJinHuaZhuan(Map<String, Object> map){
|
|
|
int fund_id=0;
|
|
|
+
|
|
|
if (!"".equals(map.get("fund_id")) && map.get("fund_id") != null) {
|
|
|
fund_id = Integer.parseInt((String)map.get("fund_id"));
|
|
|
}
|
|
|
+
|
|
|
+ user_id = Integer.parseInt((String)map.get("user_id"));
|
|
|
+ }*/
|
|
|
|
|
|
|
|
|
Map<String, Object> mapToDao = new LinkedHashMap<String, Object>();
|
|
|
mapToDao.put("fund_id", fund_id);
|
|
|
-
|
|
|
+
|
|
|
List<CapitalTransfer> list=capitalTransferDao.selectChaKanZiJinHuaZhuan(mapToDao);
|
|
|
List<CapitalTransferCheck> lis= capitalTransferDao.selectCapitalTransferRecord(mapToDao);
|
|
|
+
|
|
|
Map<String, Object> map1=new LinkedHashMap<String, Object>();
|
|
|
- map1.put("CapitalTransfer", list);
|
|
|
+ map1.put("CapitalTransfer", list);
|
|
|
map1.put("CapitalTransferCheck", lis);
|
|
|
+
|
|
|
return map1;
|
|
|
}
|
|
|
|