年月fix

songhuangfeng123

2022-08-08 bb8b200d53171dcc0727c845c435f655b3d2f55a

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

@@ -4,11 +4,9 @@
import com.gkhy.safePlatform.commons.enums.ResultCodes;
import com.gkhy.safePlatform.commons.query.PageQuery;
import com.gkhy.safePlatform.commons.utils.BeanCopyUtils;
import com.gkhy.safePlatform.commons.utils.StringUtils;
import com.gkhy.safePlatform.commons.vo.ResultVO;
import com.gkhy.safePlatform.commons.vo.SearchResultVO;
import com.gkhy.safePlatform.emergency.entity.*;
import com.gkhy.safePlatform.emergency.enums.EmergencyDrillPlanStatus;
import com.gkhy.safePlatform.emergency.enums.EmergencyResultCodes;
import com.gkhy.safePlatform.emergency.excepiton.EmergencyException;
import com.gkhy.safePlatform.emergency.model.dto.req.*;
@@ -84,7 +82,6 @@
                emergencyDrillPlanInfo.setDelFlag(false);
                emergencyDrillPlanInfo.setCreateUid(uid);
                emergencyDrillPlanInfo.setGmtCreate(nowDate);
                emergencyDrillPlanInfo.setStatus(EmergencyDrillPlanStatus.START.getStatus());
                emergencyDrillPlanInfoService.addEmergencyDrillPlan(emergencyDrillPlanInfo);
                // 新增急演练计划附件表
                if (!CollectionUtils.isEmpty(emergencyDrillPlanReqDTO.getFileList())) {
@@ -140,7 +137,12 @@
            List<EmergencyDrillPlanUserInfoDO> emergencyDrillPlanUserInfoDOList = emergencyDrillPlanUserInfoService.selectEmergencyDrillPlanUserByDrillPlanId(id);
            if (!CollectionUtils.isEmpty(emergencyDrillPlanUserInfoDOList)) {
                List<EmergencyDrillPlanUserRespDTO> emergencyUserUserRespDTOList = BeanCopyUtils.copyBeanList(emergencyDrillPlanUserInfoDOList, EmergencyDrillPlanUserRespDTO.class);
                emergencyDrillPlanDetailRespDTO.setUserList(emergencyUserUserRespDTOList);

                List<EmergencyDrillPlanUserRespDTO> userList = emergencyUserUserRespDTOList.stream().filter(user -> user.getType()==1).collect(Collectors.toList());
                List<EmergencyDrillPlanUserRespDTO> chargeUserList = emergencyUserUserRespDTOList.stream().filter(user -> user.getType()==2).collect(Collectors.toList());

                emergencyDrillPlanDetailRespDTO.setUserList(userList);
                emergencyDrillPlanDetailRespDTO.setChargeUserList(chargeUserList);
            }
            // 查找对应的附件
            List<EmergencyDrillPlanFileInfoDO> emergencyDrillPlanFileInfoDOList = emergencyDrillPlanFileInfoService.selectEmergencyDrillPlanFileByDrillPlanId(id);
@@ -262,13 +264,13 @@
    }

    @Override
    public ResultVO batchDeleteEmergencyDrillPlan(String ids) {
        if (StringUtils.isBlank(ids)) {
    public ResultVO batchDeleteEmergencyDrillPlan(Long[] ids) {

        if (ids == null ||  ids.length==0){
            throw new EmergencyException(EmergencyResultCodes.DRILL_PLAN_NULL);
        } else {
            String[] idArr = ids.split(",");
            for (String id : idArr) {
                deleteEmergencyDrillPlan(Long.valueOf(id));
        }else{
            for (Long id : ids){
                deleteEmergencyDrillPlan(id);
            }
            return new ResultVO(ResultCodes.OK);
        }