|
@@ -1,13 +1,10 @@
|
|
package org.jeecg.modules.baogao.service.impl;
|
|
package org.jeecg.modules.baogao.service.impl;
|
|
|
|
|
|
import cn.hutool.core.io.FileUtil;
|
|
import cn.hutool.core.io.FileUtil;
|
|
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
-import org.apache.commons.lang3.time.DateUtils;
|
|
|
|
-import org.checkerframework.checker.units.qual.A;
|
|
|
|
-import org.jcp.xml.dsig.internal.DigesterOutputStream;
|
|
|
|
|
|
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
import org.jeecg.config.JeecgBaseConfig;
|
|
import org.jeecg.config.JeecgBaseConfig;
|
|
import org.jeecg.modules.baogao.convert.BaogaoConvert;
|
|
import org.jeecg.modules.baogao.convert.BaogaoConvert;
|
|
import org.jeecg.modules.baogao.dto.ItdmBaogaoCreateDTO;
|
|
import org.jeecg.modules.baogao.dto.ItdmBaogaoCreateDTO;
|
|
@@ -20,9 +17,7 @@ import org.jeecg.modules.chuanganqi.entity.ItdmChuanganqi;
|
|
import org.jeecg.modules.chuanganqi.mapper.ItdmChuanganqiMapper;
|
|
import org.jeecg.modules.chuanganqi.mapper.ItdmChuanganqiMapper;
|
|
import org.jeecg.modules.itdmDevice.entity.ItdmDevice;
|
|
import org.jeecg.modules.itdmDevice.entity.ItdmDevice;
|
|
import org.jeecg.modules.itdmDevice.mapper.ItdmDeviceMapper;
|
|
import org.jeecg.modules.itdmDevice.mapper.ItdmDeviceMapper;
|
|
-import org.jeecg.modules.itdmGongdanMaster.entity.ItdmGongdanMaster;
|
|
|
|
import org.jeecg.modules.itdmGongdanMaster.mapper.ItdmGongdanMasterMapper;
|
|
import org.jeecg.modules.itdmGongdanMaster.mapper.ItdmGongdanMasterMapper;
|
|
-import org.jeecg.modules.itdmTestPlan.entity.ItdmTestPlan;
|
|
|
|
import org.jeecg.modules.itdmTestPlan.mapper.ItdmTestPlanMapper;
|
|
import org.jeecg.modules.itdmTestPlan.mapper.ItdmTestPlanMapper;
|
|
import org.jeecg.modules.moban.entity.ItdmMoban;
|
|
import org.jeecg.modules.moban.entity.ItdmMoban;
|
|
import org.jeecg.modules.moban.mapper.ItdmMobanMapper;
|
|
import org.jeecg.modules.moban.mapper.ItdmMobanMapper;
|
|
@@ -35,15 +30,15 @@ import org.jeecg.modules.weituo.mapper.ItdmWeituoYangpinMapper;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
|
-import org.springframework.util.CollectionUtils;
|
|
|
|
-
|
|
|
|
import javax.annotation.Resource;
|
|
import javax.annotation.Resource;
|
|
import java.io.File;
|
|
import java.io.File;
|
|
import java.io.FileOutputStream;
|
|
import java.io.FileOutputStream;
|
|
import java.io.IOException;
|
|
import java.io.IOException;
|
|
import java.text.ParseException;
|
|
import java.text.ParseException;
|
|
-import java.util.*;
|
|
|
|
|
|
+import java.util.ArrayList;
|
|
|
|
+import java.util.HashMap;
|
|
|
|
+import java.util.List;
|
|
|
|
+import java.util.Map;
|
|
import java.util.stream.Collectors;
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
/**
|