Merge remote-tracking branch 'origin/master'

xyc

2024-09-13 dea248c9da9f82e4032b6ab4a8ce0a6422a5c2cc

 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/controller/ReliabilityAssessController.java

@@ -43,15 +43,11 @@
    @Autowired
    AssessItemDao assessItemDao;

    @GetMapping("page")
    @PostMapping("page")
    @ApiOperation("分页")
    @ApiImplicitParams({
            @ApiImplicitParam(name = Constant.Q.ORDER_FIELD, value = Constant.QV.ORDER_FIELD, dataType = Constant.QT.STRING),
            @ApiImplicitParam(name = Constant.Q.ORDER, value = Constant.QV.ORDER, dataType = Constant.QT.STRING),
    })
    public Result<List<ReliabilityAssess>> page(@ApiIgnore @QueryParam QueryFilter queryFilter) {

        return Result.ok(null);
    public Result<List<ReliabilityAssess>> page(@RequestBody AssessResult assessResult) {
        List<ReliabilityAssess> list = reliabilityAssessService.page(assessResult);
        return Result.ok(list);
    }

    @PostMapping("importProductExcel")
@@ -62,7 +58,6 @@
            StringBuilder str = new StringBuilder();
            ImportUtil.importResult(result, importResults, str);
            ImportUtil.ImportErrResult(result, importResults, str);

        } catch (Exception e) {
            e.printStackTrace();
        }
@@ -83,10 +78,10 @@
    @PostMapping("assess")
    @ApiOperation("评定")
    @LogOperation("评定")
    public Result assess(@RequestBody AssessResult assessResult){
        Result result = reliabilityAssessService.assess(assessResult);
    public Result<List<ReliabilityAssess>> assess(@RequestBody AssessResult assessResult){
        List<ReliabilityAssess> list = reliabilityAssessService.assess(assessResult);

        return result;
        return Result.ok(list);
    }

    @GetMapping("getAssessDataList")