Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safeP...

songhuangfeng123

2022-09-02 fabd08d87d00bfdf1aacf473fd905fdd3c903ed3

 equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/controller/EquipmentInfoController.java

@@ -1,11 +1,13 @@
package com.gkhy.safePlatform.equipment.controller;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.gkhy.safePlatform.commons.utils.BeanCopyUtils;
import com.gkhy.safePlatform.equipment.entity.*;
import com.gkhy.safePlatform.equipment.model.dto.req.EquipmentInfoImportExcel;
import com.gkhy.safePlatform.equipment.model.dto.req.EquipmentInfoSaveOrUpdate;
import com.gkhy.safePlatform.equipment.model.dto.resp.EquipmentInfoExcel;
import com.gkhy.safePlatform.equipment.utils.DateUtils;
import com.gkhy.safePlatform.equipment.utils.QueryHelpPlus;
import com.gkhy.safePlatform.equipment.utils.poihelper.ExcelLogs;
import com.gkhy.safePlatform.equipment.utils.poihelper.ExcelUtil;
import com.google.common.collect.Lists;
@@ -114,7 +116,15 @@
            return new ResultVO<>(ResultCodes.CLIENT_PARAM_ILLEGAL);
        }
        List<Long> idList = Arrays.asList(ids);
        this.equipmentInfoService.removeByIds(idList);

        List<EquipmentInfo> delList = new ArrayList<>();
        idList.forEach(f->{
            EquipmentInfo info = new EquipmentInfo();
            info.setDelFlag(1);
            info.setId(f);
            delList.add(info);
        });
        this.equipmentInfoService.updateBatchById(delList);
        return new ResultVO<>(ResultCodes.OK);
    }

@@ -186,6 +196,7 @@
        map.put("45", "报废理由");
        map.put("46", "报废填报日期(yyyy-MM-dd HH:mm:ss)");
        map.put("47", "实际报废日期(yyyy-MM-dd HH:mm:ss)");
        map.put("48", "保养周期");
        String fileName = URLEncoder.encode("设备设施管理数据导入模板.xls", "UTF-8");
        response.setContentType("application/vnd.ms-excel");
        response.setHeader("Content-Disposition", "attachment;filename=" + fileName + ".xlsx");
@@ -278,6 +289,7 @@
        map.put("45", "报废理由");
        map.put("46", "报废填报日期(yyyy-MM-dd HH:mm:ss)");
        map.put("47", "实际报废日期(yyyy-MM-dd HH:mm:ss)");
        map.put("48", "保养周期");

        String key = DateUtils.date2String(new Date(), DateUtils.PATTERN_ALLTIME_NOSIGN) ;
        String fileName = URLEncoder.encode("设备设施管理"+key+".xls", "UTF-8");
@@ -285,7 +297,7 @@
        response.setHeader("Content-Disposition", "attachment;filename=" + fileName + ".xlsx");
        response.setHeader("Access-Control-Expose-Headers", "Content-Disposition");


        queryCriteria.setDelFlag(0);
        List<EquipmentInfoExcel> respList = BeanCopyUtils.copyBeanList(equipmentInfoService.queryAll(queryCriteria), EquipmentInfoExcel.class);

        ExcelUtil.exportExcel(map,respList , response.getOutputStream(),DateUtils.PATTERN_STANDARD);