feat: 封装报告记录,redis4

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/ReportExportService.java

@@ -21,19 +21,19 @@ import java.util.Map;
  */
 public interface ReportExportService {
 
-	public R getExportPackageZbTotalList(Page page, WmScorePackage wmScorePackage);
+	R getExportPackageZbTotalList(Page page, WmScorePackage wmScorePackage);
 
-	public R getExportPackageZbTaskList(Page page, WmTask wmTask);
+	R getExportPackageZbTaskList(Page page, WmTask wmTask);
 
-	public R exportNb(WmTask wmTask, WmReport wmReport) throws IOException;
+	R exportNb(WmTask wmTask, WmReport wmReport) throws IOException;
 
-	public R exportNba(WmTask wmTask,WmScorePackage wmScorePackage) throws IOException;
+	R exportNba(WmTask wmTask, WmScorePackage wmScorePackage) throws IOException;
 
-	public List<Map<String, Object>> exportNbInfo(WmTask wmTask) throws IOException;
+	List<Map<String, Object>> exportNbInfo(WmTask wmTask) throws IOException;
 
-	public R exportZb(WmTask wmTask) throws IOException;
+	R exportZb(WmTask wmTask) throws IOException;
 
-	public List<Map<String, Object>> exportZbInfo(WmTask wmTask) throws IOException;
+	List<Map<String, Object>> exportZbInfo(WmTask wmTask) throws IOException;
 
 	R exportZbJs(WmTask wmTask) throws IOException;
 

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/WmScorePackageService.java

@@ -72,7 +72,7 @@ public interface WmScorePackageService extends IService<WmScorePackage> {
 
 	public IPage<WmScorePackage> getExportPackageTotalList(Page page, WmScorePackage wmScorePackage);
 
-	public IPage<WmScorePackage> getExportPackageTotalList1(Page page, WmScorePackage wmScorePackage);
+	IPage<WmScorePackage> getExportPackageTotalList1(Page page, WmScorePackage wmScorePackage);
 
 	public IPage<Map<String, Object>> getPlatTotalData(Page page, WmScorePackage wmScorePackage);
 

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/ReportExportServiceImpl.java

@@ -105,7 +105,6 @@ public class ReportExportServiceImpl implements ReportExportService {
 	 * @return
 	 */
 	public R getExportPackageZbTotalList(Page page, WmScorePackage wmScorePackage) {
-		//SysDept sysDept = sysDeptService.getById(SecurityUtils.getUser().getDeptId());
 
 		wmScorePackage.setSendPackageDeptId(SecurityUtils.getUser().getDeptId()+"");
 		wmScorePackage.setTypeid("4");

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmScorePackageServiceImpl.java

@@ -269,7 +269,16 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 		orderItem.setColumn("create_time");
 		orderItem.setAsc(false);
 		page.addOrder(orderItem);
-		return wmScorePackageMapper.getExportPackageTotalList1(page, wmScorePackage);
+		IPage<WmScorePackage> list1 = wmScorePackageMapper.getExportPackageTotalList1(page, wmScorePackage);
+		List<WmScorePackage> records = list1.getRecords();
+
+		for (WmScorePackage scorePackage : records){
+
+			this.getReportOpt(scorePackage);
+		}
+
+
+		return list1;
 	}
 
 	public IPage<WmScorePackage> getExportPackageTotalList(Page page, WmScorePackage wmScorePackage) {