fix

songhuangfeng123

2022-07-29 9f1793877da090e9a6d035cf39530e26ff0c4c03

fix

 emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/service/impl/EmergencyDrillEvaluationServiceImpl.java

@@ -20,10 +20,7 @@
import com.gkhy.safePlatform.emergency.query.EmergencyDrillEvaluationQuery;
import com.gkhy.safePlatform.emergency.query.db.EmergencyDrillEvaluationDBQuery;
import com.gkhy.safePlatform.emergency.service.EmergencyDrillEvaluationService;
import com.gkhy.safePlatform.emergency.service.baseService.EmergencyDrillEvaluationFileInfoService;
import com.gkhy.safePlatform.emergency.service.baseService.EmergencyDrillEvaluationInfoService;
import com.gkhy.safePlatform.emergency.service.baseService.EmergencyDrillEvaluationUserInfoService;
import com.gkhy.safePlatform.emergency.service.baseService.EmergencyDrillPlanInfoService;
import com.gkhy.safePlatform.emergency.service.baseService.*;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -47,7 +44,7 @@
    private EmergencyDrillEvaluationUserInfoService emergencyDrillEvaluationUserInfoService;

    @Autowired
    private EmergencyDrillPlanInfoService emergencyDrillPlanInfoService;
    private EmergencyDrillExecuteInfoService emergencyDrillExecuteInfoService;


    @Override
@@ -76,13 +73,13 @@
    @Override
    public ResultVO addEmergencyDrillEvaluation(Long uid, EmergencyDrillEvaluationReqDTO emergencyDrillEvaluationReqDTO) {
        // 判断请求中是否存在演练计划id
        if (emergencyDrillEvaluationReqDTO.getDrillPlanId() == null) {
            throw new EmergencyException(EmergencyResultCodes.DRILL_PLAN_NULL);
        if (emergencyDrillEvaluationReqDTO.getDrillExecuteId() == null) {
            throw new EmergencyException(EmergencyResultCodes.DRILL_EXECUTE_NULL);
        } else {
            EmergencyDrillPlanInfoDetailDO emergencyDrillPlanInfoDetailDO = emergencyDrillPlanInfoService.selectEmergencyDrillPlanById(emergencyDrillEvaluationReqDTO.getDrillPlanId());
            EmergencyDrillExecuteInfoDetailDO emergencyDrillExecuteInfoDetailDO = emergencyDrillExecuteInfoService.selectEmergencyDrillExecuteById(emergencyDrillEvaluationReqDTO.getDrillExecuteId());
            // 判断是否存在该演练计划
            if (emergencyDrillPlanInfoDetailDO == null) {
                throw new EmergencyException(EmergencyResultCodes.DRILL_PLAN_NOT_EXIST);
            if (emergencyDrillExecuteInfoDetailDO == null) {
                throw new EmergencyException(EmergencyResultCodes.DRILL_EXECUTE_NOT_EXIST);
            } else {
                Date nowDate = new Date();
                // 新增应急演练实施评价