项目费用导入之后去重

module_kzks/src/main/java/org/jeecg/modules/projectChbSwf/mapper/ProjectChbSwfMapper.java

@@ -19,4 +19,11 @@ public interface ProjectChbSwfMapper extends BaseMapper<ProjectChbSwf> {
     @Select("select * from kzks_project_chb_swf where taskno = #{taskno}")
     public List<ProjectChbSwf> getSWFDetailList(@Param("taskno") String taskno);
 
+    /**
+    *   author: dzc
+    *   version: 1.0
+    *   des: 事务费去重
+    *   date: 2023/11/21
+    */
+    public int deleteSwf();
 }

module_kzks/src/main/java/org/jeecg/modules/projectChbSwf/mapper/xml/ProjectChbSwfMapper.xml

@@ -2,4 +2,18 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.modules.projectChbSwf.mapper.ProjectChbSwfMapper">
 
+
+    <delete id="deleteSwf">
+        DELETE
+        FROM
+            kzks_project_chb_swf
+        WHERE
+            id NOT IN (
+                SELECT
+                    id
+                FROM
+                ( SELECT MIN( id ) AS id FROM kzks_project_chb_swf GROUP BY taskno ) e
+            )
+    </delete>
+
 </mapper>

module_kzks/src/main/java/org/jeecg/modules/projectChbSwf/service/IProjectChbSwfService.java

@@ -35,4 +35,12 @@ public interface IProjectChbSwfService extends IService<ProjectChbSwf> {
      */
     public Result<?> importExcel1(String strUrl, Class<ProjectChbSwf> clazz);
 
+    /**
+    *   author: dzc
+    *   version: 1.0
+    *   des: 删除重复的事务费
+    *   date: 2023/11/21
+    */
+    public int deleteSwf();
+
 }

module_kzks/src/main/java/org/jeecg/modules/projectChbSwf/service/impl/ProjectChbSwfServiceImpl.java

@@ -149,4 +149,14 @@ public class ProjectChbSwfServiceImpl extends ServiceImpl<ProjectChbSwfMapper, P
         }
     }
 
+    /**
+    *   author: dzc
+    *   version: 1.0
+    *   des: 删除重复的事务费
+    *   date: 2023/11/21
+    */
+    @Override
+    public int deleteSwf() {
+        return swfMapper.deleteSwf();
+    }
 }

module_kzks/src/main/java/org/jeecg/modules/projectChbWxf/mapper/ProjectChbWxfMapper.java

@@ -19,4 +19,12 @@ public interface ProjectChbWxfMapper extends BaseMapper<ProjectChbWxf> {
     @Select("select * from kzks_project_chb_wxf where taskno = #{taskno}")
     public List<ProjectChbWxf> getWXFDetailList(String taskno);
 
+
+    /**
+    *   author: dzc
+    *   version: 1.0
+    *   des: 删除重复的外协费
+    *   date: 2023/11/21
+    */
+    public int deleteWxf();
 }

module_kzks/src/main/java/org/jeecg/modules/projectChbWxf/mapper/xml/ProjectChbWxfMapper.xml

@@ -2,4 +2,19 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.modules.projectChbWxf.mapper.ProjectChbWxfMapper">
 
+
+    <delete id="deleteWxf">
+        DELETE
+        FROM
+            kzks_project_chb_wxf
+        WHERE
+                id NOT IN (
+                SELECT
+                    id
+                FROM
+                        ( SELECT MIN( id ) AS id FROM kzks_project_chb_wxf GROUP BY taskno ) e
+            )
+    </delete>
+
+
 </mapper>

module_kzks/src/main/java/org/jeecg/modules/projectChbWxf/service/IProjectChbWxfService.java

@@ -29,4 +29,11 @@ public interface IProjectChbWxfService extends IService<ProjectChbWxf> {
      */
     public Result<?> importExcel1(String strUrl, Class<ProjectChbWxf> clazz);
 
+    /**
+     *   author: dzc
+     *   version: 1.0
+     *   des: 删除重复的外协费
+     *   date: 2023/11/21
+     */
+    public int deleteWxf();
 }

module_kzks/src/main/java/org/jeecg/modules/projectChbWxf/service/impl/ProjectChbWxfServiceImpl.java

@@ -151,4 +151,8 @@ public class ProjectChbWxfServiceImpl extends ServiceImpl<ProjectChbWxfMapper, P
         }
     }
 
+    @Override
+    public int deleteWxf() {
+        return wxfMapper.deleteWxf();
+    }
 }

module_kzks/src/main/java/org/jeecg/modules/projectChbZyf/mapper/ProjectChbZyfMapper.java

@@ -20,4 +20,12 @@ public interface ProjectChbZyfMapper extends BaseMapper<ProjectChbZyf> {
     @Select("select * from kzks_project_chb_zyf where taskno = #{taskno}")
     public List<ProjectChbZyf> getZYFDetailList(String taskno);
 
+    /**
+    *   author: dzc
+    *   version: 1.0
+    *   des: 删除重复的专用费
+    *   date: 2023/11/21
+    */
+    public int deleteZyf();
+
 }

module_kzks/src/main/java/org/jeecg/modules/projectChbZyf/mapper/xml/ProjectChbZyfMapper.xml

@@ -2,4 +2,18 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.modules.projectChbZyf.mapper.ProjectChbZyfMapper">
 
+
+    <delete id="deleteZyf">
+        DELETE
+        FROM
+            kzks_project_chb_zyf
+        WHERE
+                id NOT IN (
+                SELECT
+                    id
+                FROM
+                        ( SELECT MIN( id ) AS id FROM kzks_project_chb_zyf GROUP BY taskno ) e
+            )
+    </delete>
+
 </mapper>

module_kzks/src/main/java/org/jeecg/modules/projectChbZyf/service/IProjectChbZyfService.java

@@ -28,4 +28,13 @@ public interface IProjectChbZyfService extends IService<ProjectChbZyf> {
     public List<ProjectChbZyf> getZYFDetailList(String taskno);
 
     public Result<?> importExcel1(String strUrl, Class<ProjectChbZyf> clazz);
+
+
+    /**
+     *   author: dzc
+     *   version: 1.0
+     *   des: 删除重复的专用费
+     *   date: 2023/11/21
+     */
+    public int deleteZyf();
 }

module_kzks/src/main/java/org/jeecg/modules/projectChbZyf/service/impl/ProjectChbZyfServiceImpl.java

@@ -153,4 +153,9 @@ public class ProjectChbZyfServiceImpl extends ServiceImpl<ProjectChbZyfMapper, P
             }
         }
     }
+
+    @Override
+    public int deleteZyf() {
+        return zyfMapper.deleteZyf();
+    }
 }

module_kzks/src/main/java/org/jeecg/modules/projectImportList/service/impl/ProjectImportListServiceImpl.java

@@ -124,25 +124,28 @@ public class ProjectImportListServiceImpl extends ServiceImpl<ProjectImportListM
                 columnMap = new HashMap<>();
                 columnMap.put("nd",tasknoAndNd.getNd());
 //                columnMap.put("taskno",tasknoAndNd.getTaskno());
-                swfService.removeByMap(columnMap);
+//                swfService.removeByMap(columnMap);
             }
             swfService.saveBatch(swfList);
             for(TasknoAndNd tasknoAndNd : tnZYFList){
                 columnMap = new HashMap<>();
                 columnMap.put("nd",tasknoAndNd.getNd());
 //                columnMap.put("taskno",tasknoAndNd.getTaskno());
-                zyfService.removeByMap(columnMap);
+//                zyfService.removeByMap(columnMap);
             }
             zyfService.saveBatch(zyfList);
             for(TasknoAndNd tasknoAndNd : tnWXFList){
                 columnMap = new HashMap<>();
                 columnMap.put("nd",tasknoAndNd.getNd());
 //                columnMap.put("taskno",tasknoAndNd.getTaskno());
-                wxfService.removeByMap(columnMap);
+//                wxfService.removeByMap(columnMap);
             }
             wxfService.saveBatch(wxfList);
             log.info("消耗时间" + (System.currentTimeMillis() - start) + "毫秒");
             //update-end-author:taoyan date:20190528 for:批量插入数据
+            swfService.deleteSwf();
+            wxfService.deleteWxf();
+            zyfService.deleteZyf();
             return Result.ok("文件导入成功！数据行数：" + list.size());
         } catch (Exception e) {
             //update-begin-author:taoyan date:20211124 for: 导入数据重复增加提示