diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/utils/ExcelExportUtilByWk.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/utils/ExcelExportUtilByWk.java
index 06ecb551..48404a52 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/utils/ExcelExportUtilByWk.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/utils/ExcelExportUtilByWk.java
@@ -135,16 +135,18 @@ public class ExcelExportUtilByWk {
} catch (NoSuchFieldException e) {
log.warn(e.getMessage());
}
- field.setAccessible(true);
- try {
- Object fieldVal = field.get(o);
- if (null!=map.get(i).exportFormat() && !"".equals(map.get(i).exportFormat())) {
- cell1.setCellValue("null".equals(String.valueOf(fieldVal)) ? "" : TrainFormDate.dealWithTimeZoneyyyy(String.valueOf(fieldVal),map.get(i).exportFormat()));
- }else {
- cell1.setCellValue("null".equals(String.valueOf(fieldVal)) ? "" : String.valueOf(fieldVal));
+ if (null!=field) {
+ field.setAccessible(true);
+ try {
+ Object fieldVal = field.get(o);
+ if (null != map.get(i).exportFormat() && !"".equals(map.get(i).exportFormat())) {
+ cell1.setCellValue("null".equals(String.valueOf(fieldVal)) ? "" : TrainFormDate.dealWithTimeZoneyyyy(String.valueOf(fieldVal), map.get(i).exportFormat()));
+ } else {
+ cell1.setCellValue("null".equals(String.valueOf(fieldVal)) ? "" : String.valueOf(fieldVal));
+ }
+ } catch (IllegalAccessException e) {
+ log.warn(e.getMessage());
}
- } catch (IllegalAccessException e) {
- log.warn(e.getMessage());
}
}
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdCommiInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdCommiInfoController.java
index 019ab366..4baca04b 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdCommiInfoController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdCommiInfoController.java
@@ -1,18 +1,37 @@
package com.adc.da.slrs.wgdCensusZ.controller;
+import com.adc.da.excel.poi.excel.entity.ExportParams;
+import com.adc.da.excel.poi.excel.entity.enums.ExcelType;
import com.adc.da.http.PageInfo;
import com.adc.da.http.ResponseMessage;
import com.adc.da.http.Result;
+import com.adc.da.slrs.msgDynamicInfo.common.ReadExcel;
+import com.adc.da.slrs.processModel.utils.ExcelExportUtilByWk;
+import com.adc.da.slrs.processModel.utils.ExcelImportUtilByWk;
+import com.adc.da.slrs.wgdCensusZ.entity.WgdAssocInfo;
import com.adc.da.slrs.wgdCensusZ.entity.WgdCommiInfo;
import com.adc.da.slrs.wgdCensusZ.service.IWgdCommiInfoService;
+import com.adc.da.util.exception.AdcDaBaseException;
+import com.adc.da.util.utils.StringUtils;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import io.swagger.annotations.ApiOperation;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.util.IOUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import io.swagger.annotations.Api;
import com.adc.da.base.web.BaseController;
+import org.springframework.web.multipart.MultipartFile;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
+import java.util.UUID;
/**
*
@@ -42,6 +61,67 @@ public class WgdCommiInfoController extends BaseController {
return Result.success(pageInfo);
}
+ @GetMapping("/exportAllCommiInfos")
+ public void exportAllAssocInfos(String idList, String exportName, HttpServletResponse response, HttpServletRequest request){//查询所有
+ OutputStream os = null;
+ Workbook workbook = null;
+ try {
+ if(StringUtils.isEmpty(exportName) ||exportName.equals("null")){
+ exportName="协会信息数据统计";
+ }
+ response.setHeader("Content-Disposition",
+ "attachment; filename=" + ReadExcel.encodeFileName(exportName+".xlsx", request));
+ response.setContentType("application/force-download");
+ ExportParams exportParams = new ExportParams();
+ exportParams.setType(ExcelType.XSSF);
+ exportParams.setSheetName(exportName);
+ List datas=new ArrayList<>();
+ if (null!=idList) {
+ List ids = new ArrayList<>(Arrays.asList(idList.split(",")));
+ QueryWrapper wrapper=new QueryWrapper<>();
+ wrapper.in("id",ids);
+ datas = iWgdCommiInfoService.list(wrapper);
+ } else {
+ datas = iWgdCommiInfoService.getAllWgdCommiInfos();
+ }
+ workbook = ExcelExportUtilByWk.exportWithData(exportParams,WgdCommiInfo.class,datas);
+ os = response.getOutputStream();
+ workbook.write(os);
+ os.flush();
+ } catch (IOException e) {
+ throw new AdcDaBaseException("下载文件失败,请重试");
+ } finally {
+ IOUtils.closeQuietly(os);
+ }
+ }
+
+ @ApiOperation(value = "|SarFileSplitItemsEO|导入")
+ @PostMapping(value = "/importAllCommiInfos")
+ public ResponseMessage> importSplitItemsZip(@RequestParam(value = "file", required = false) MultipartFile file) throws Exception {
+ List res= ExcelImportUtilByWk.readExcelpublic(WgdCommiInfo.class,file);
+
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ queryWrapper.select(WgdCommiInfo.class, info -> !info.getColumn().equals("id"));
+ List wgdAssocInfos=iWgdCommiInfoService.list(queryWrapper);
+ List remove=new ArrayList<>();
+ res.forEach(wgdAssocInfo -> {
+ if (wgdAssocInfos.contains(wgdAssocInfo)){
+ remove.add(wgdAssocInfo);
+ }
+ });
+ res.removeAll(remove);
+ res.forEach(wgdAssocInfo -> {
+ wgdAssocInfo.setId(String.valueOf(UUID.randomUUID()));
+ });
+ if (iWgdCommiInfoService.saveOrUpdateBatch(res)) {
+ return Result.success();
+ }else {
+ return Result.error();
+ }
+ }
+
+
+
@GetMapping("getCommiInfoById")
public ResponseMessage