修正

heheng

2025-05-16 8485affcb0d4de05059d80cb1e844d6b18291654

 src/main/java/com/gkhy/labRiskManage/api/controller/riskReport/RiskAssessPlanController.java

@@ -6,6 +6,8 @@
import com.gkhy.labRiskManage.api.controller.riskReport.dto.respDto.RiskAssessPlanListRespDTO;
import com.gkhy.labRiskManage.api.controller.riskReport.dto.respDto.RiskAssessPlanQueryRespDTO;
import com.gkhy.labRiskManage.api.controller.riskReport.dto.respDto.RiskAssessQueryRespDTO;
import com.gkhy.labRiskManage.application.riskReport.dto.bo.RiskAssessAppQueryBO;
import com.gkhy.labRiskManage.application.riskReport.dto.dto.RiskAssessAppQueryDTO;
import com.gkhy.labRiskManage.application.riskReport.dto.dto.RiskAssessPlanAppQueryDTO;
import com.gkhy.labRiskManage.application.riskReport.service.RiskAccessAppService;
import com.gkhy.labRiskManage.commons.domain.Result;
@@ -14,6 +16,7 @@
import com.gkhy.labRiskManage.commons.utils.BeanCopyUtils;
import com.gkhy.labRiskManage.domain.riskReport.model.dto.AssessPlanUpdateDTO;
import com.gkhy.labRiskManage.domain.riskReport.model.dto.FactorQueryDTO;
import com.gkhy.labRiskManage.domain.riskReport.service.RiskAssessPlanService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*;
@@ -30,6 +33,9 @@

    @Autowired
    private RiskAccessAppService riskAccessAppService;

    @Autowired
    private RiskAssessPlanService riskAssessPlanService;;

    /**
     * 风险评估计划 - 插入
@@ -68,6 +74,37 @@
        result.setTotal(queryResult.getTotal());
        result.setCount(queryResult.getTotal().intValue());

        return result;
    }



    @PostMapping("/select/selectAssessExport")
    public Result selectAssessExport(@RequestBody RiskAssessQueryReqBO queryReqBO){
        Result result = new Result();
        result.setCode(ResultCode.OK);
        result.setMsg("查询成功");
        RiskAssessAppQueryBO queryBO = BeanCopyUtils.copyBean(queryReqBO, RiskAssessAppQueryBO.class);
        return riskAssessPlanService.selectAssessExport(getCurrentUserId(), queryBO);
    }





    @PostMapping("/update/appoint")
    public Result appoint(@RequestBody AppointUserReBO appointUserReBO){

        Result result = new Result();
        result.setCode(ResultCode.OK);
        result.setMsg("已经重新指定专家");

        AssessPlanUpdateDTO assessPlanUpdateDTO = riskAccessAppService.appoint(getCurrentUserId(), appointUserReBO);
        if (ObjectUtils.isEmpty(assessPlanUpdateDTO)){
            result.setCode(ResultCode.NOT_OK);
            result.setMsg("重新指定专家失败");
            return result;
        }
        return result;
    }

@@ -354,15 +391,15 @@
    /**
     * 风险评估计划 - 重新指定专家
     */
    @PostMapping("/update/appoint")
    public Result appoint(@RequestBody AppointUserReBO appointUserReBO){
    @PostMapping("/update/appointNew")
    public Result appointNew(@RequestBody AppointUserTypeReBO appointUserReBO){

        Result result = new Result();
        result.setCode(ResultCode.OK);
        result.setMsg("已经重新指定专家");

        AssessPlanUpdateDTO assessPlanUpdateDTO = riskAccessAppService.appoint(getCurrentUserId(), appointUserReBO);
        if (ObjectUtils.isEmpty(assessPlanUpdateDTO)){
        int i = riskAssessPlanService.appointNew(getCurrentUserId(), appointUserReBO);
        if (i < 1){
            result.setCode(ResultCode.NOT_OK);
            result.setMsg("重新指定专家失败");
            return result;
@@ -370,6 +407,9 @@
        return result;
    }




    /**
     * 风险辨识与评价 - 查询
     */