FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

导入修改

Browse Source
This commit is contained in:
yuezhihang
2022-03-08 16:46:56 +08:00
parent 5f055e2152
commit 26fbf9daf3
3 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/controller/WgdWbtjController.java
+5 -12
View File
@@ -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<WgdWbtj> {
@PostMapping(value = "/importAllAllWbtjs")
public ResponseMessage<List<WgdWbtj>> importSplitItemsZip(@RequestParam(value = "file", required = false) MultipartFile file) throws Exception {
List<WgdWbtj> res= ExcelImportUtilByWk.readExcelpublic(WgdWbtj.class,file);
// res.forEach( Wbtj ->{
// if (Wbtj.getHost().equals("") || StringUtils.isEmpty(Wbtj.getHost())){
// return Result.error();
// }
// });
QueryWrapper<WgdWbtj> queryWrapper = new QueryWrapper<>();
// queryWrapper.select(WgdWbtj.class, info -> !info.getColumn().equals("id"));
queryWrapper.select(WgdWbtj.class,tableFieldInfo -> !tableFieldInfo.getColumn().equals("id"));
List<WgdWbtj> WgdWbtjs=iWgdWbtjService.list(queryWrapper);
List<WgdWbtj> remove=new ArrayList<>();
@@ -120,7 +113,7 @@ public class WgdWbtjController extends BaseController<WgdWbtj> {
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();
adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusLeo/entity/WgdWbtj.java
-1
View File
@@ -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 {
adc-da-slrs/src/main/java/com/adc/da/slrs/wgdCensusZ/controller/WgdAssocInfoController.java
+1 -1
View File
@@ -104,7 +104,7 @@ public class WgdAssocInfoController extends BaseController<WgdAssocInfo> {
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();