数据清洗功能完善（重新导入删除旧数据）

ruoyi-supplies/src/main/java/com/ruoyi/system/mapper/ActSuppliesHistorydataMapper.java

@@ -61,7 +61,7 @@ public interface ActSuppliesHistorydataMapper
 
     Long[] selectActSuppliesRole(Long templateId);
 
-    Long selectActSuppliesHistorydatauuid(String exportUuid);
+    List<ActSuppliesHistorydata> selectActSuppliesHistorydatauuid(String exportUuid);
 
     void insertActSuppliesHistorydatas(ActSuppliesHistorydata actSuppliesHistorydata1);
 

ruoyi-supplies/src/main/java/com/ruoyi/system/service/impl/ActSuppliesHistorydataServiceImpl.java

@@ -8,6 +8,7 @@ import java.util.List;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.system.mapper.ActSuppliesCleaningRuleMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.system.mapper.ActSuppliesHistorydataMapper;
@@ -26,6 +27,9 @@ public class ActSuppliesHistorydataServiceImpl implements IActSuppliesHistorydat
     @Autowired
     private ActSuppliesHistorydataMapper actSuppliesHistorydataMapper;
 
+    @Autowired
+    private ActSuppliesCleaningRuleMapper actSuppliesCleaningRuleMapper;
+
     /**
      * 查询 历史数据
      *
@@ -112,14 +116,26 @@ public class ActSuppliesHistorydataServiceImpl implements IActSuppliesHistorydat
         SysUser user = SecurityUtils.getLoginUser().getUser();
         ActSuppliesHistorydata actSuppliesHistorydata1 = new ActSuppliesHistorydata();
 
-        Long s = actSuppliesHistorydataMapper.selectActSuppliesHistorydatauuid(actSuppliesHistorydata.get(0).getImportUuid());
+        List<ActSuppliesHistorydata> s = actSuppliesHistorydataMapper.selectActSuppliesHistorydatauuid(actSuppliesHistorydata.get(0).getImportUuid());
 
-        if (s>0){
+        if (s.size()>0){
+            if (s.get(0).getCleanStatus()>0){
+
+                for (int j=0;j<s.size();j++){
+                    if (s.get(j).getIdentifyingCode()==0){
+                        actSuppliesCleaningRuleMapper.deleteActSuppliesImportTable(s.get(j).getId());
+                    }else if (s.get(j).getIdentifyingCode()==1){
+                        actSuppliesCleaningRuleMapper.deleteActSuppliesSixMinesSummaryTable(s.get(j).getId());
+                    }
+                }
+
+            }
             for (int i=0;i<actSuppliesHistorydata.size();i++) {
 
                 actSuppliesHistorydata.get(i).setCreateBy(user.getUserName());
                 actSuppliesHistorydata.get(i).setCreateTime(DateUtils.getNowDate());
                 actSuppliesHistorydataMapper.updateActSuppliesHistorydatas(actSuppliesHistorydata.get(i));
+
             }
         }else {
 

ruoyi-supplies/src/main/resources/mapper/system/ActSuppliesHistorydataMapper.xml

@@ -118,8 +118,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
 
-    <select id="selectActSuppliesHistorydatauuid" parameterType="String" resultType="Long">
-        select count(*) from act_supplies_historydata where import_uuid = #{importUuid}
+    <select id="selectActSuppliesHistorydatauuid" parameterType="String" resultMap="ActSuppliesHistorydataResult">
+        select id, import_uuid, template_id, export_uuid, role_id, history_name, identifying_code,clean_status ,status, create_by, date, create_time, ssk_id from act_supplies_historydata where import_uuid = #{importUuid}
     </select>
 
     <select id="selectActSuppliesRole" parameterType="Long" resultType="Long">