Commit 21188bfa by 邓实川 Committed by chenzg

测试

parent 1e858569
......@@ -7,6 +7,7 @@
*/
package cn.timer.api.controller.crm;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
......@@ -902,7 +903,8 @@ public class CrmController {
Map<String, Object> map = new HashMap<String, Object>();
Integer num = CrmClientData.builder().build()
.selectCount(new QueryWrapper<CrmClientData>().lambda().eq(CrmClientData::getOrgCode, orgCode)
.eq(CrmClientData::getClientStatus, status).eq(CrmClientData::getBelongUser, belonger)
.eq(CrmClientData::getClientStatus, status)
.eq(belonger != null, CrmClientData::getBelongUser, belonger)
.ge(StringUtils.isNotBlank(startCreateTime), CrmClientData::getCreateTime, startCreateTime)
.le(StringUtils.isNotBlank(endCreateTime), CrmClientData::getCreateTime, endCreateTime));
String name = getEmpName(orgCode, belonger);
......@@ -927,7 +929,9 @@ public class CrmController {
List<Integer> members = getAllBusinessGroupMember(orgCode, groupId);
for (Integer memberId : members) {
Map<String, Object> map = selectMap(orgCode, memberId, status, startCreateTime, endCreateTime);
System.err.println(map);
if (memberId.equals(12414)) {
System.err.println("map++"+map);
}
if ((Integer) map.get("num") > 0) {
list.add(map);
}
......@@ -938,7 +942,6 @@ public class CrmController {
list.add(map);
}
}
System.err.println("list:" + list);
return list;
}
......@@ -1047,6 +1050,11 @@ public class CrmController {
String filePath = null;
try {
File savefile = new File(realPath);
// File savefile = new File("excel/");
if (!savefile.exists()) {
savefile.mkdirs();
}
String time = DateUtil.format(new Date(), "yyyyMMddHHmmssSSS");
filePath = FileHelper.downLoadFromUrl(url, time + ".xls", realPath);
} catch (IOException e) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment