|
@ -928,9 +928,9 @@ public class PackQcReportService extends BaseJpaService {
|
|
|
//查找该地区入库量
|
|
|
String sql = "";
|
|
|
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+"' 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{
|
|
|
sql = "select count(*) from json_archives where org_area ='"+org_area+"' and archive_staus=3 and pack_type=3 and receive_date<='"+endDate+"' 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";
|
|
|
}
|
|
|
ResultSet resultSet = elasticSearchUtil.findBySql(sql);
|
|
|
resultSet.next();
|
|
@ -942,12 +942,12 @@ public class PackQcReportService extends BaseJpaService {
|
|
|
info.put("orgCodeName",name);
|
|
|
info.put("total",map.get("count"));
|
|
|
|
|
|
//查找该地区入库量
|
|
|
//查找该机构入库量
|
|
|
String sql = "";
|
|
|
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+"' 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{
|
|
|
sql = "select count(*) from json_archives where org_code ='"+org_code+"' and archive_staus=3 and pack_type=3 and receive_date<='"+endDate+"' and receive_date>='"+startDate+"' 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";
|
|
|
}
|
|
|
ResultSet resultSet = elasticSearchUtil.findBySql(sql);
|
|
|
resultSet.next();
|