电力汇总-代码修改

ruoyi-wages/src/main/java/com/ruoyi/system/mapper/PowerWagesDeMapper.java

@@ -21,4 +21,6 @@ public interface PowerWagesDeMapper {
     List<PowerWagesDetails> selectByMineIdAndDate(@Param("mineId") String mineId, @Param("date") String date);
 
     List<PowerWagesDetails> selectByCId(int comparisonId);
+
+    void deleteByDateAndMineId(@Param("mineId") String mineId, @Param("date") String date);
 }

ruoyi-wages/src/main/java/com/ruoyi/system/service/impl/PowerWagesServiceImpl.java

@@ -49,7 +49,7 @@ public class PowerWagesServiceImpl implements PowerWagesService {
             //定义需要解析的sheet名
             List<String> sheetList = Arrays.asList("电量数据专业化公司", "外界电量数据");
             // 定义需要过滤的关键词列表
-            List<String> filterList = Arrays.asList("合计", "小计", "总表小计", "劳服总表", "校验", "null");
+            List<String> filterList = Arrays.asList("null");
             // 获取上传文件的输入流
             for (int i = 0; i < sheetList.size(); i++) {
                 type = type + i;

ruoyi-wages/src/main/resources/mapper/system/PowerWagesComMapper.xml

@@ -377,8 +377,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                a56, a57, a58, a59, a60, a61, a62, a63, a64,
                a65, a66, a67, a68, a69, a70, a71, a72, a73,
                a74, a75, a76, a77, a78, a79, a80, a81, a82,
-               a83, a84, a85, a86, a87, a88, a89, a90,
-               mine_id, import_time, type
+               a83, a84, a85, a86, a87, a88, a89, a90
         from power_wages_comparation
         where mine_id = #{mineId} and import_time = #{date}
     </select>

ruoyi-wages/src/main/resources/mapper/system/PowerWagesDeMapper.xml

@@ -475,6 +475,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
            #{mineId},#{importTime},#{comparisonId})
         </foreach>
     </insert>
+    <delete id="deleteByDateAndMineId">
+        delete from power_wages_details
+        where mine_id = #{mineId} and import_time = #{date}
+    </delete>
     <select id="selectByMineIdAndDate" resultMap="PowerWagesDetailsResult">
         select id, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,
                a11, a12, a13, a14, a15, a16, a17, a18, a19,
@@ -491,7 +495,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where mine_id = #{mineId} and import_time = #{date}
     </select>
     <select id="selectByCId" resultMap="PowerWagesDetailsResult">
-        select id, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,
+        select  a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,
                a11, a12, a13, a14, a15, a16, a17, a18, a19,
                a20, a21, a22, a23, a24, a25, a26, a27, a28,
                a29, a30, a31, a32, a33, a34, a35, a36, a37,
@@ -501,7 +505,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                a65, a66, a67, a68, a69, a70, a71, a72, a73,
                a74, a75, a76, a77, a78, a79, a80, a81, a82,
                a83, a84, a85, a86, a87, a88, a89, a90,
-               mine_id, import_time, comparison_id
+               comparison_id
         from power_wages_details
         where comparison_id = #{comparsionId}
     </select>