CaiXiang/SPC
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

commit for pull

Browse Source
This commit is contained in:
caixiang
2022-12-09 15:31:32 +08:00
parent de3fe9b95c
commit 652812d3ba
2 changed files with 45 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ym-process-inspection/src/main/java/com/cnbm/processInspection/controller/InspectionSheetController.java
View File

@@ -14,6 +14,7 @@ import com.cnbm.common.validator.group.UpdateGroup;
import com.cnbm.influx.param.QueryDataParam;
import com.cnbm.processInspection.dto.InspectionSampleDTO;
import com.cnbm.processInspection.dto.InspectionSheetDTO;
import com.cnbm.processInspection.entity.InspectionSheet;
import com.cnbm.processInspection.excel.InspectionSheetExcel;
import com.cnbm.processInspection.service.IInspectionSheetService;
import com.influxdb.query.FluxTable;
@@ -21,6 +22,7 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -86,9 +88,12 @@ public class InspectionSheetController {
//效验数据
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
inspectionSheetService.save(dto);
//inspectionSheetService.save(dto);
InspectionSheet inspectionSheet = new InspectionSheet();
BeanUtils.copyProperties(dto, inspectionSheet);
inspectionSheetService.insert(inspectionSheet);
return new Result<Long>().ok(dto.getId());
return new Result<Long>().ok(inspectionSheet.getId());
}
@PutMapping