项目总积分

无关风月

2 天以前 edddb1a2e87a8d5626ecb9fefc302d36cf3baadc

项目总积分

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TResultWorkEvaluateController.java

@@ -57,9 +57,13 @@
    private TExperimentDispatchService experimentDispatchService;
    @Resource
    private TClinicalTrialPointsService clinicalTrialPointsService;
    @Resource
    private TTesterOtherTaskService tTesterOtherTaskService;

    @Resource
    private TProjectProposalService projectProposalService;
    @Resource
    private TQaProduceReportService qaProduceReportService;
    private final TProjectTeamService projectTeamService;
    private final TProjectTeamStaffService projectTeamStaffService;
    private final ISysUserService sysUserService;
@@ -85,7 +89,6 @@
    }



    @ApiOperation(value = "项目组总积分分页列表",tags = "项目组总积分",response = TQaTestItemReportQuery.class)
    @PostMapping(value = "/api/t-result-work-evaluate/pageList")
    public R<PageInfo<TResultWorkEvaluateVO>> pageList(@RequestBody String param) {
@@ -102,6 +105,7 @@
        }
        return R.ok(tResultWorkEvaluateService.pageList(query));
    }

    /**
     * 查看取样记录详情
     */
@@ -706,6 +710,7 @@
        tResultWorkEvaluateDetailVO.setEngineerList(tResultWorkEvaluateDetailEngineerVOS);
        return R.ok(tResultWorkEvaluateDetailVO);
    }

    @ApiOperation(value = "查看详情-左侧数据-化验师工作内容评定")
    @GetMapping(value = "/open/t-result-work-evaluate/getDetailByIdLeftTwo")
    public R<TResultWorkEvaluateDetailVO> getDetailByIdLeftTwo(@RequestParam String id) {
@@ -1013,8 +1018,65 @@
            tResultWorkEvaluateDetailEngineerVO4.setCount(list4.size());
            tResultWorkEvaluateDetailEngineerVO4.setIntegral(tempDetail4);
            tResultWorkEvaluateDetailEngineerVOS.add(tResultWorkEvaluateDetailEngineerVO4);
            // 工艺开发工具
            // todo 项目检测项评定


            // 中试、生产验证试验检验分析报告评定
            List<TQaProduceReport> list = qaProduceReportService.lambdaQuery()
                    .eq(TQaProduceReport::getStatus,3).eq(TQaProduceReport::getCommitPersonId, sysUser.getUserId()).list();
            TResultWorkEvaluateDetailEngineerVO tResultWorkEvaluateDetailEngineerVO5 = new TResultWorkEvaluateDetailEngineerVO();
            List<TQaProduceReport> collect3 = list.stream().filter(e -> e.getReportType() == 1).collect(Collectors.toList());
            if (!collect3.isEmpty()) {
                tResultWorkEvaluateDetailEngineerVO5.setStartTime(collect3.get(0).getCreateTime());
                tResultWorkEvaluateDetailEngineerVO5.setEndTime(collect3.get(collect3.size() - 1).getCreateTime());
            }
            int tempDetail5 = 0;
            for (TQaProduceReport tQaProduceReport : collect3) {
                if (StringUtils.hasLength(tQaProduceReport.getEvaluateScore())){
                    for (String s : tQaProduceReport.getEvaluateScore().split(",")) {
                        tempDetail5+=Integer.parseInt(s);
                    }
                }
            }
            tResultWorkEvaluateDetailEngineerVO5.setCount(collect3.size());
            tResultWorkEvaluateDetailEngineerVO5.setIntegral(tempDetail5);
            tResultWorkEvaluateDetailEngineerVOS.add(tResultWorkEvaluateDetailEngineerVO5);
            // 辅料
            TResultWorkEvaluateDetailEngineerVO tResultWorkEvaluateDetailEngineerVO6 = new TResultWorkEvaluateDetailEngineerVO();
            List<TQaProduceReport> collect4 = list.stream().filter(e -> e.getReportType() == 2).collect(Collectors.toList());
            if (!collect4.isEmpty()) {
                tResultWorkEvaluateDetailEngineerVO6.setStartTime(collect4.get(0).getCreateTime());
                tResultWorkEvaluateDetailEngineerVO6.setEndTime(collect4.get(collect4.size() - 1).getCreateTime());
            }
            int tempDetail6 = 0;
            for (TQaProduceReport tQaProduceReport : collect4) {
                if (StringUtils.hasLength(tQaProduceReport.getEvaluateScore())){
                    for (String s : tQaProduceReport.getEvaluateScore().split(",")) {
                        tempDetail6+=Integer.parseInt(s);
                    }
                }
            }
            tResultWorkEvaluateDetailEngineerVO6.setCount(collect4.size());
            tResultWorkEvaluateDetailEngineerVO6.setIntegral(tempDetail6);
            tResultWorkEvaluateDetailEngineerVOS.add(tResultWorkEvaluateDetailEngineerVO6);
            // 产品
            TResultWorkEvaluateDetailEngineerVO tResultWorkEvaluateDetailEngineerVO7 = new TResultWorkEvaluateDetailEngineerVO();
            List<TQaProduceReport> collect9 = list.stream().filter(e -> e.getReportType() == 1).collect(Collectors.toList());
            if (!collect9.isEmpty()) {
                tResultWorkEvaluateDetailEngineerVO7.setStartTime(collect9.get(0).getCreateTime());
                tResultWorkEvaluateDetailEngineerVO7.setEndTime(collect9.get(collect9.size() - 1).getCreateTime());
            }
            int tempDetail7 = 0;
            for (TQaProduceReport tQaProduceReport : collect9) {
                if (StringUtils.hasLength(tQaProduceReport.getEvaluateScore())){
                    for (String s : tQaProduceReport.getEvaluateScore().split(",")) {
                        tempDetail7+=Integer.parseInt(s);
                    }
                }
            }
            tResultWorkEvaluateDetailEngineerVO7.setCount(collect9.size());
            tResultWorkEvaluateDetailEngineerVO7.setIntegral(tempDetail7);
            tResultWorkEvaluateDetailEngineerVOS.add(tResultWorkEvaluateDetailEngineerVO7);

            tResultWorkEvaluateDetailUserVO.setList(tResultWorkEvaluateDetailEngineerVOS);
            tResultWorkEvaluateDetailUserVOS.add(tResultWorkEvaluateDetailUserVO);
@@ -1022,6 +1084,7 @@
        tResultWorkEvaluateDetailVO.setChemistList(tResultWorkEvaluateDetailUserVOS);
        return R.ok(tResultWorkEvaluateDetailVO);
    }

    @ApiOperation(value = "查看详情-左侧数据-实验员工作内容评定")
    @GetMapping(value = "/open/t-result-work-evaluate/getDetailByIdLeftThree")
    public R<TResultWorkEvaluateDetailVO> getDetailByIdLeftThree(@RequestParam String id) {
@@ -1325,13 +1388,24 @@
            tResultWorkEvaluateDetailEngineerVO4.setCount(list4.size());
            tResultWorkEvaluateDetailEngineerVO4.setIntegral(tempDetail4);
            tResultWorkEvaluateDetailEngineerVOS.add(tResultWorkEvaluateDetailEngineerVO4);
            // 工艺开发工具
            // 其他任务
            List<TTesterOtherTask> list = tTesterOtherTaskService.lambdaQuery().eq(TTesterOtherTask::getTesterId, sysUser.getUserId()).list();
            TResultWorkEvaluateDetailEngineerVO tResultWorkEvaluateDetailEngineerVO5 = new TResultWorkEvaluateDetailEngineerVO();
            tResultWorkEvaluateDetailEngineerVO5.setCount(list.size());
            if (!list.isEmpty()) {
                tResultWorkEvaluateDetailEngineerVO5.setStartTime(list.get(0).getEvaluateTime());
                tResultWorkEvaluateDetailEngineerVO5.setEndTime(list.get(list.size() - 1).getEvaluateTime());


            }
            int temp = 0;
            for (TTesterOtherTask tTesterOtherTask : list) {
                temp += tTesterOtherTask.getEvaluateScore();
            }
            tResultWorkEvaluateDetailEngineerVO5.setIntegral(temp);
            tResultWorkEvaluateDetailEngineerVOS.add(tResultWorkEvaluateDetailEngineerVO4);
            tResultWorkEvaluateDetailUserVO.setList(tResultWorkEvaluateDetailEngineerVOS);
            tResultWorkEvaluateDetailUserVOS.add(tResultWorkEvaluateDetailUserVO);
        }
        tResultWorkEvaluateDetailVO.setChemistList(tResultWorkEvaluateDetailUserVOS);
        return R.ok(tResultWorkEvaluateDetailVO);
    }
}

 ruoyi-system/src/main/java/com/ruoyi/system/model/TTesterOtherTask.java

@@ -51,7 +51,7 @@

    @ApiModelProperty(value = "评定积分")
    @TableField("evaluate_score")
    private Double evaluateScore;
    private Integer evaluateScore;

    @ApiModelProperty(value = "评定时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")