|
@ -915,6 +915,7 @@ public class PackQcReportService extends BaseJpaService {
|
|
// sqlSb.append(" order by count desc");
|
|
// sqlSb.append(" order by count desc");
|
|
fields.add("count");
|
|
fields.add("count");
|
|
List<Map<String, Object>> resultList = elasticSearchUtil.findBySql(fields, sqlSb.toString());
|
|
List<Map<String, Object>> resultList = elasticSearchUtil.findBySql(fields, sqlSb.toString());
|
|
|
|
System.out.println(resultList.size()+"-----------------------------");
|
|
if (resultList != null && resultList.size() > 0) {
|
|
if (resultList != null && resultList.size() > 0) {
|
|
for (Map<String,Object> map : resultList){
|
|
for (Map<String,Object> map : resultList){
|
|
Map info = new HashMap();
|
|
Map info = new HashMap();
|
|
@ -927,7 +928,7 @@ public class PackQcReportService extends BaseJpaService {
|
|
|
|
|
|
//查找该地区入库量
|
|
//查找该地区入库量
|
|
String sql = "";
|
|
String sql = "";
|
|
if(!StringUtils.isBlank(startDate)){
|
|
|
|
|
|
if(StringUtils.isBlank(startDate)){
|
|
sql = "select count(*) from json_archives where org_area ='"+org_area+"' and archive_staus=3 and pack_type=3 and receive_date<='"+endDate+" 23:59:59' group by profile_id";
|
|
sql = "select count(*) from json_archives where org_area ='"+org_area+"' and archive_staus=3 and pack_type=3 and receive_date<='"+endDate+" 23:59:59' group by profile_id";
|
|
}else{
|
|
}else{
|
|
sql = "select count(*) from json_archives where org_area ='"+org_area+"' and archive_staus=3 and pack_type=3 and receive_date<='"+endDate+" 23:59:59' and receive_date>='"+startDate+"' group by profile_id";
|
|
sql = "select count(*) from json_archives where org_area ='"+org_area+"' and archive_staus=3 and pack_type=3 and receive_date<='"+endDate+" 23:59:59' and receive_date>='"+startDate+"' group by profile_id";
|
|
@ -944,7 +945,7 @@ public class PackQcReportService extends BaseJpaService {
|
|
|
|
|
|
//查找该机构入库量
|
|
//查找该机构入库量
|
|
String sql = "";
|
|
String sql = "";
|
|
if(!StringUtils.isBlank(startDate)){
|
|
|
|
|
|
if(StringUtils.isBlank(startDate)){
|
|
sql = "select count(*) from json_archives where org_code ='"+org_code+"' and archive_staus=3 and pack_type=3 and receive_date<='"+endDate+" 23:59:59' group by profile_id";
|
|
sql = "select count(*) from json_archives where org_code ='"+org_code+"' and archive_staus=3 and pack_type=3 and receive_date<='"+endDate+" 23:59:59' group by profile_id";
|
|
}else{
|
|
}else{
|
|
sql = "select count(*) from json_archives where org_code ='"+org_code+"' and archive_staus=3 and pack_type=3 and receive_date<='"+endDate+" 23:59:59' and receive_date>='"+startDate+" 00:00:00' group by profile_id";
|
|
sql = "select count(*) from json_archives where org_code ='"+org_code+"' and archive_staus=3 and pack_type=3 and receive_date<='"+endDate+" 23:59:59' and receive_date>='"+startDate+" 00:00:00' group by profile_id";
|