|
@@ -212,22 +212,24 @@ public class ReportServiceImpl implements ReportService {
|
|
|
Map<String,LocalDateTime> map=new HashMap<String,LocalDateTime>();
|
|
|
//判断是否有参数值
|
|
|
if(null!= reportReq.getValue()){
|
|
|
+ //获取开始/结束时间
|
|
|
map= FillParam(reportReq,map);
|
|
|
}
|
|
|
PackageCodeTypeRes res = new PackageCodeTypeRes();
|
|
|
- //查询同期生成码
|
|
|
+
|
|
|
+ //查询同期生成码(参数:开始时间,结束时间,1-生成码类型/2-下载码类型,1-同期/2-往期)
|
|
|
getGenerateCodeNum(reportReq.getBeginTime(),reportReq.getEndTime(),1,res,"1");
|
|
|
//查询同期下载码
|
|
|
getGenerateCodeNum(reportReq.getBeginTime(),reportReq.getEndTime(),2,res,"1");
|
|
|
- //查询同期激活码
|
|
|
+ //查询同期激活码 (参数:开始时间,结束时间,1-同期/2-往期)
|
|
|
getActivateCodeNum(reportReq.getBeginTime(),reportReq.getEndTime(),res,"1");
|
|
|
//查询往期
|
|
|
if(!map.isEmpty()){
|
|
|
//查询往期生成码
|
|
|
getGenerateCodeNum(map.get("beginDate"),map.get("endDate"),1,res,"2");
|
|
|
- //查询往期下载码
|
|
|
+ //查询往期下载码(参数:开始时间,结束时间,1-生成码类型/2-下载码类型,1-同期/2-往期)
|
|
|
getGenerateCodeNum(map.get("beginDate"),map.get("endDate"),2,res,"2");
|
|
|
- //查询往期激活码
|
|
|
+ //查询往期激活码(参数:开始时间,结束时间,1-同期/2-往期)
|
|
|
getActivateCodeNum(map.get("beginDate"),map.get("endDate"),res,"2");
|
|
|
}
|
|
|
//返回参数
|
|
@@ -241,7 +243,7 @@ public class ReportServiceImpl implements ReportService {
|
|
|
*/
|
|
|
private Map FillParam(ReportReq reportReq,Map<String,LocalDateTime> map) {
|
|
|
setQueryTime(reportReq);
|
|
|
- map=getBeforeWeekTime(reportReq.getValue().toString());//1周 2月
|
|
|
+ map=getBeforeWeekTime(reportReq.getValue().toString());
|
|
|
return map;
|
|
|
}
|
|
|
|