diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdWbtjController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdWbtjController.java index 5c3b4b6f..59650c77 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdWbtjController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdWbtjController.java @@ -3,21 +3,20 @@ package com.adc.da.slrs.wgdCensusLeo.controller; import com.adc.da.excel.poi.excel.entity.ExportParams; import com.adc.da.excel.poi.excel.entity.enums.ExcelType; +import com.adc.da.common.ReadExcel; +import com.adc.da.exception.AdcDaBaseException; 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.wgdCensusLeo.entity.WgdWbtj; import com.adc.da.slrs.wgdCensusLeo.service.IWgdWbtjService; -import com.adc.da.slrs.wgdCensusZ.entity.WgdCommiInfo; -import com.adc.da.util.exception.AdcDaBaseException; -import com.adc.da.util.utils.StringUtils; +import com.adc.da.util.IOUtils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang.StringUtils; 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; @@ -99,13 +98,7 @@ public class WgdWbtjController extends BaseController { @PostMapping(value = "/importAllAllWbtjs") public ResponseMessage> importSplitItemsZip(@RequestParam(value = "file", required = false) MultipartFile file) throws Exception { List res= ExcelImportUtilByWk.readExcelpublic(WgdWbtj.class,file); -// res.forEach( Wbtj ->{ -// if (Wbtj.getHost().equals("") || StringUtils.isEmpty(Wbtj.getHost())){ -// return Result.error(); -// } -// }); QueryWrapper queryWrapper = new QueryWrapper<>(); -// queryWrapper.select(WgdWbtj.class, info -> !info.getColumn().equals("id")); queryWrapper.select(WgdWbtj.class,tableFieldInfo -> !tableFieldInfo.getColumn().equals("id")); List WgdWbtjs=iWgdWbtjService.list(queryWrapper); List remove=new ArrayList<>(); @@ -120,7 +113,7 @@ public class WgdWbtjController extends BaseController { res.forEach(WgbWbtj -> { WgbWbtj.setId(String.valueOf(UUID.randomUUID())); }); - if (iWgdWbtjService.saveOrUpdateBatch(res)) { + if (res.size()>0 && iWgdWbtjService.saveOrUpdateBatch(res)) { return Result.success(); }else { return Result.error(); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdWbtj.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdWbtj.java index fc9de332..188317a0 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdWbtj.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdWbtj.java @@ -21,7 +21,6 @@ import org.springframework.format.annotation.DateTimeFormat; * @since 2021-11-12 */ @Data -@EqualsAndHashCode(callSuper = true) @Accessors(chain = true) @ApiModel(value="WgdWbtj对象", description="参与外部协会会议统计") public class WgdWbtj extends BasePage { diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdAssocInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdAssocInfoController.java index 45e4238a..edcbf48e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdAssocInfoController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdAssocInfoController.java @@ -104,7 +104,7 @@ public class WgdAssocInfoController extends BaseController { res.forEach(wgdAssocInfo -> { wgdAssocInfo.setId(String.valueOf(UUID.randomUUID())); }); - if (iWgdAssocInfoService.saveOrUpdateBatch(res)) { + if (res.size()>0 && iWgdAssocInfoService.saveOrUpdateBatch(res)) { return Result.success(); }else { return Result.error();