项目总积分

无关风月

3 天以前 a97fcabfaf4ce1af23f51553f73590805919a7fe

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

@@ -16,7 +16,6 @@
import com.ruoyi.system.model.*;
import com.ruoyi.system.query.ResultEvaluateChemistTesterQuery;
import com.ruoyi.system.query.TProjectApprovalReportQuery;
import com.ruoyi.system.query.TQaTestItemReportQuery;
import com.ruoyi.system.query.TResultWorkEvaluateQuery;
import com.ruoyi.system.service.*;
import com.ruoyi.system.vo.*;
@@ -200,7 +199,7 @@
    }


    @ApiOperation(value = "项目组总积分分页列表", tags = "项目组总积分", response = TQaTestItemReportQuery.class)
    @ApiOperation(value = "项目组总积分分页列表", tags = "项目组总积分", response = TResultWorkEvaluateQuery.class)
    @PostMapping(value = "/api/t-result-work-evaluate/pageList")
    public R<PageInfo<TResultWorkEvaluateVO>> pageList(@RequestBody String param) {
        LoginUser loginUser = tokenService.getLoginUser();
@@ -208,11 +207,12 @@
        TResultWorkEvaluateQuery query = JSON.parseObject(param, TResultWorkEvaluateQuery.class);
        SysUser sysUser = sysUserService.selectUserById(loginUser.getUser().getUserId());
        if (sysUser.getRoleType() != 1) {
            List<String> collect = projectTeamStaffService.lambdaQuery().eq(TProjectTeamStaff::getUserId, loginUser.getUser().getUserId()).list()
            List<String> teamIds = projectTeamStaffService.lambdaQuery().eq(TProjectTeamStaff::getUserId, loginUser.getUser().getUserId()).list()
                    .stream().map(TProjectTeamStaff::getTeamId).collect(Collectors.toList());
            if (collect.isEmpty()) {
            if (teamIds.isEmpty()) {
                return R.ok(new PageInfo<>());
            }
            query.setTeamIds(teamIds);
        }
        return R.ok(tResultWorkEvaluateService.pageList(query));
    }
@@ -221,7 +221,7 @@
     * 查看取样记录详情
     */
    //@PreAuthorize("@ss.hasPermi('system:samplingRecord:detail')")
    @ApiOperation(value = "查看详情-顶部数据")
    @ApiOperation(value = "查看详情-顶部数据",response = TResultWorkEvaluateVO.class)
    @GetMapping(value = "/open/t-result-work-evaluate/getDetailById")
    public R<TResultWorkEvaluateDetailVO> getDetailById(@RequestParam String id) {
        TResultWorkEvaluateDetailVO tResultWorkEvaluateDetailVO = new TResultWorkEvaluateDetailVO();
@@ -1311,6 +1311,7 @@
                Integer evaluateSix = tResultWorkEvaluate.getEvaluateSix();
                switch (evaluateSix) {
                    case 1:

                        tempDetail2 -= 3;
                        break;
                }