fix

songhuangfeng123

2022-08-06 811378d28db922f1e2945015ac9b0154db46ea54

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

@@ -1,6 +1,7 @@
package com.gkhy.safePlatform.emergency.service.impl;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.gkhy.safePlatform.commons.enums.E;
import com.gkhy.safePlatform.commons.enums.ResultCodes;
import com.gkhy.safePlatform.commons.query.PageQuery;
import com.gkhy.safePlatform.commons.utils.BeanCopyUtils;
@@ -18,6 +19,7 @@
import com.gkhy.safePlatform.emergency.query.EmergencyDrillExecuteQuery;
import com.gkhy.safePlatform.emergency.query.db.EmergencyDrillExecuteDBQuery;
import com.gkhy.safePlatform.emergency.service.EmergencyDrillExecuteService;
import com.gkhy.safePlatform.emergency.service.baseService.EmergencyDrillEvaluationInfoService;
import com.gkhy.safePlatform.emergency.service.baseService.EmergencyDrillExecuteInfoService;
import com.gkhy.safePlatform.emergency.service.baseService.EmergencyDrillExecuteUserInfoService;
import com.gkhy.safePlatform.emergency.service.baseService.EmergencyDrillPlanInfoService;
@@ -43,6 +45,9 @@
    @Autowired
    private EmergencyDrillPlanInfoService emergencyDrillPlanInfoService;

    @Autowired
    private EmergencyDrillEvaluationInfoService emergencyDrillEvaluationInfoService;


    @Override
    public SearchResultVO<List<EmergencyDrillExecutePageRespDTO>> selectEmergencyDrillExecuteList(PageQuery<EmergencyDrillExecuteQuery> query) {
@@ -60,7 +65,7 @@
        return new SearchResultVO<>(
                true,
                pageIndex,
                pageSize,
                pageSize,page.getPages(),
                page.getTotal(),
                respList,
                ResultCodes.OK
@@ -85,7 +90,7 @@
                emergencyDrillExecuteInfo.setDelFlag(false);
                emergencyDrillExecuteInfo.setCreateUid(uid);
                emergencyDrillExecuteInfo.setGmtCreate(nowDate);
                emergencyDrillExecuteInfo.setStatus(true);
                emergencyDrillExecuteInfo.setStatus(false);
                emergencyDrillExecuteInfoService.addEmergencyDrillExecute(emergencyDrillExecuteInfo);

                // 新增应急演练计划实施实际到场人员表
@@ -93,6 +98,14 @@
                    addEmergencyDrillExecuteUser(uid, emergencyDrillExecuteInfo.getId(), nowDate, emergencyDrillExecuteReqDTO.getUserList());

                }
                // 新增评价表一行数据
                EmergencyDrillEvaluationInfo emergencyDrillEvaluationInfo = new EmergencyDrillEvaluationInfo();
                emergencyDrillEvaluationInfo.setDelFlag(false);
                emergencyDrillEvaluationInfo.setCreateUid(uid);
                emergencyDrillEvaluationInfo.setGmtCreate(nowDate);
                emergencyDrillEvaluationInfo.setDrillExecuteId(emergencyDrillExecuteInfo.getId());
                emergencyDrillEvaluationInfoService.addEmergencyDrillEvaluation(emergencyDrillEvaluationInfo);

                return new ResultVO<>(ResultCodes.OK);
            }
        }
@@ -196,13 +209,12 @@
    }

    @Override
    public ResultVO batchDeleteEmergencyDrillExecute(String ids) {
        if (StringUtils.isBlank(ids)) {
            throw new EmergencyException(EmergencyResultCodes.DRILL_EXECUTE_NOT_EXIST);
        } else {
            String[] idArr = ids.split(",");
            for (String id : idArr) {
                deleteEmergencyDrillExecute(Long.valueOf(id));
    public ResultVO batchDeleteEmergencyDrillExecute(Long[] ids) {
        if (ids == null ||  ids.length==0){
            throw new EmergencyException(EmergencyResultCodes.DRILL_EXECUTE_NULL);
        }else{
            for (Long id : ids){
                deleteEmergencyDrillExecute(id);
            }
            return new ResultVO(ResultCodes.OK);
        }