删除非导入数据

als-modules/agile-assurance/src/main/java/org/eco/als/listener/FaultStatisticsImportListener.java

@@ -4,18 +4,17 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.excel.context.AnalysisContext;
 import com.alibaba.excel.event.AnalysisEventListener;
-import org.eco.common.core.exception.BusinessException;
+import lombok.extern.slf4j.Slf4j;
+import org.eco.als.domain.bo.FaultStatisticsBo;
+import org.eco.als.domain.vo.FaultStatisticsImportVo;
+import org.eco.als.domain.vo.FaultStatisticsVo;
+import org.eco.als.service.IFaultStatisticsService;
+import org.eco.common.core.core.domain.model.LoginUser;
 import org.eco.common.core.utils.SpringUtils;
 import org.eco.common.core.utils.ValidatorUtils;
 import org.eco.common.excel.core.ExcelListener;
 import org.eco.common.excel.core.ExcelResult;
 import org.eco.common.excel.entity.ExcelResultRes;
-import org.eco.common.core.core.domain.model.LoginUser;
-import org.eco.als.domain.bo.FaultStatisticsBo;
-import org.eco.als.domain.vo.FaultStatisticsImportVo;
-import org.eco.als.domain.vo.FaultStatisticsVo;
-import org.eco.als.service.IFaultStatisticsService;
-import lombok.extern.slf4j.Slf4j;
 
 import java.util.List;
 
@@ -54,6 +53,7 @@ public class FaultStatisticsImportListener extends AnalysisEventListener<FaultSt
             if (ObjectUtil.isNull(faultStatisticsVo1)) {
                 //不存在就新增
                 setBo(faultStatisticsBo);
+                faultStatisticsBo.setRemarks("import");
                 ValidatorUtils.validate(faultStatisticsBo);
                 boolean inserted = faultStatisticsService.insert(faultStatisticsBo);
 

als-modules/agile-assurance/src/main/java/org/eco/als/service/impl/FaultStatisticsServiceImpl.java

@@ -72,14 +72,10 @@ public class FaultStatisticsServiceImpl extends BaseServiceImpl<FaultStatisticsM
                 // 指定去重字段
                 case "groups" -> queryWrapper.select("DISTINCT groups").where("groups is not null");
                 case "major" -> queryWrapper.select("DISTINCT major").where("major is not null");
-                case "aircraft_model" -> {
-                    queryWrapper.select("DISTINCT aircraft_model").where("aircraft_model is not null");
-                }
+                case "aircraft_model" -> queryWrapper.select("DISTINCT aircraft_model").where("aircraft_model is not null");
                 case "aircraft_num" -> {
                 }
-                case "faulty_parts_name" -> {
-                    queryWrapper.select("DISTINCT faulty_parts_name").where("faulty_parts_name is not null");
-                }
+                case "faulty_parts_name" -> queryWrapper.select("DISTINCT faulty_parts_name").where("faulty_parts_name is not null");
             }
         }
 
@@ -144,7 +140,7 @@ public class FaultStatisticsServiceImpl extends BaseServiceImpl<FaultStatisticsM
     @Transactional
     @Override
     public void getExtraStatistics() {
-        int count = faultStatisticsMapper.deleteByCondition(FAULT_STATISTICS.CREATE_TIME.lt(DateUtil.date()));
+        int count = faultStatisticsMapper.deleteByCondition(FAULT_STATISTICS.CREATE_TIME.lt(DateUtil.date()).and(FAULT_STATISTICS.REMARKS.notIn("import")));
         log.info("删除数据条数：{}", count);
         String pageNo = "1";
         JSONArray rows = getStatisticsData(pageNo);