删除物资接口fix

songhuangfeng123

2022-08-05 d887d1db33d88948c71c5af670033382079bb250

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

@@ -20,6 +20,8 @@
import com.gkhy.safePlatform.emergency.service.EmergencyPlanService;
import com.gkhy.safePlatform.emergency.service.baseService.*;
import org.apache.dubbo.config.annotation.DubboReference;
import org.checkerframework.checker.guieffect.qual.UI;
import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -50,7 +52,7 @@
    private AccountDepartmentService accountDepartmentService;

    @Override
    public SearchResultVO<List<EmergencyPlanPageRespDTO>> selectEmergencyPlanList(PageQuery<EmergencyPlanQuery> query) {
    public SearchResultVO<List<EmergencyPlanPageRespDTO>> selectEmergencyPlanList(Long uid , PageQuery<EmergencyPlanQuery> query) {
        Long pageIndex = query.getPageIndex();
        Long pageSize = query.getPageSize();
        Page<EmergencyPlanInfoPageDO> page = new Page<>(pageIndex, pageSize);
@@ -61,6 +63,14 @@
        }
        List<EmergencyPlanInfoPageDO> emergencyPlanListDoInfoList = emergencyPlanInfoService.selectEmergencyPlanList(page, emergencyPlanDBQuery);
        List<EmergencyPlanPageRespDTO> respList = BeanCopyUtils.copyBeanList(emergencyPlanListDoInfoList, EmergencyPlanPageRespDTO.class);

        // 判断审批人
        for (EmergencyPlanPageRespDTO emergencyPlanPageRespDTO :respList){
            // 审批中  判断审批人是否人与当前登录人
            if (emergencyPlanPageRespDTO.getApproveStatus()!=null && emergencyPlanPageRespDTO.getApproveStatus()==2){
                emergencyPlanPageRespDTO.setCheckApprove(emergencyPlanPageRespDTO.getApprovePersonId().equals(uid));
            }
        }

        return new SearchResultVO<>(
                true,
@@ -417,6 +427,12 @@
        }
    }

    @Override
    public ResultVO updateAbolish(Long id, Boolean abolishStatus) {
        emergencyPlanInfoService.updateAbolish(id,abolishStatus);
        return new ResultVO(ResultCodes.OK);
    }

    private void deleteEmergencyPlan(Long id) {
        //查询是否存在
        EmergencyPlanInfoDetailDO emergencyPlanInfoDetailDO = emergencyPlanInfoService.selectEmergencyPlanById(id);