Merge remote-tracking branch 'origin/develop_master' into develop_master

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/controller/EarlyWarningEOController.java

@@ -131,9 +131,11 @@ public class EarlyWarningEOController extends BaseController<EarlyWarningEO> {
 
 
 
-    @GetMapping("/exprotWarning")
+    @GetMapping("/exportWarning")
     @ApiOperation("导出预警")
     public void exportStandardsInfoExcel(WarningExcelVO excelVO, HttpServletResponse response) throws Exception {
+
+
         // 这里注意 有同学反应使用swagger 会导致各种问题，请直接用浏览器或者用postman
         try {
             response.setContentType("application/vnd.ms-excel");
@@ -145,11 +147,12 @@ public class EarlyWarningEOController extends BaseController<EarlyWarningEO> {
             String fileName = URLEncoder.encode(excelVO.getExportName(), "UTF-8").replaceAll("\\+", "%20");
             response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
 
+//            List<StandWarningEO> exportExcel = earlyWarningEOService.getExportExcel(excelVO);
             List<StandWarningEO> exportExcel = earlyWarningEOService.getExportExcel(excelVO);
 
 
             // 这里需要设置不关闭流
-            EasyExcel.write(response.getOutputStream(), SarStandIssueControlProduct.class).autoCloseStream(Boolean.FALSE).sheet("sheet1")
+            EasyExcel.write(response.getOutputStream(), StandWarningEO.class).autoCloseStream(Boolean.FALSE).sheet("sheet1")
                     .doWrite(exportExcel);
         } catch (Exception e) {
             System.out.println(e);

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/dao/EarlyWarningEODao.java

@@ -11,6 +11,9 @@ import java.util.List;
 
 public interface EarlyWarningEODao extends BaseMapper<EarlyWarningEO> {
 
-    IPage<StandWarningEO> selectWarningPage(IPage<StandWarningEO> page, @Param("waringEO") StandWarningEO warningEO,@Param("idList") List<String> ids);
+    IPage<StandWarningEO> selectWarningPage(IPage<StandWarningEO> page, @Param("waringEO") StandWarningEO warningEO);
+
+
+    List<StandWarningEO> exportWarning(@Param("idList") List<String> ids);
 
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/EarlyWarningEO.java

@@ -37,6 +37,11 @@ public class EarlyWarningEO extends BaseEntity {
     @TableField("STAND_ID")
     private String standId;
 
+    @ExcelIgnore
+    @ApiModelProperty("分解单条款id")
+    @TableField("ITEM_ID")
+    private String itemId;
+
     @ExcelIgnore
     @ApiModelProperty("标准类别")
     @TableField(exist = false)

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/entity/WarningDate.java

@@ -14,6 +14,9 @@ public class WarningDate {
     @TableField("law_id")
     private String lawId;
 
+    @TableField("itemId")
+    private String itemId;
+
     @TableField("SSRQ")
     private String SSRQ;
 

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandWarning/service/Impl/EarlyWarningEOServiceImpl.java

@@ -112,7 +112,7 @@ public class EarlyWarningEOServiceImpl extends ServiceImpl<EarlyWarningEODao, Ea
     @Override
     public IPage<StandWarningEO> getStandWarning(StandWarningEO queryPage) {
         IPage<StandWarningEO> iPage = new Page<>(queryPage.getPage(),queryPage.getPageSize());
-        return earlyWarningEODao.selectWarningPage(iPage,queryPage,null);
+        return earlyWarningEODao.selectWarningPage(iPage,queryPage);
     }
 
     /**
@@ -121,8 +121,10 @@ public class EarlyWarningEOServiceImpl extends ServiceImpl<EarlyWarningEODao, Ea
      */
     @Override
     public List<StandWarningEO> getExportExcel(WarningExcelVO excelVO){
-        IPage<StandWarningEO> standWarningEOIPage = earlyWarningEODao.selectWarningPage(null, null, excelVO.getIds());
-        return  standWarningEOIPage.getRecords();
+        List<StandWarningEO> standWarningEOList = earlyWarningEODao.exportWarning( excelVO.getIds());
+//        IPage<StandWarningEO> standWarningEOIPage = earlyWarningEODao.selectWarningPage(null, null, null);
+
+        return  standWarningEOList;
     }