fix项目费用导入（按年不按任务号）

module_kzks/src/main/java/org/jeecg/modules/projectImportList/service/IProjectImportListService.java

@@ -17,7 +17,8 @@ import java.util.List;
 public interface IProjectImportListService extends IService<ProjectImportList> {
 
 
-    public List<TasknoAndNd> addTNlist(List<TasknoAndNd> tnList, String taskno, String nd);
+    public List<TasknoAndNd> addTNlist(List<TasknoAndNd> tnList, String nd);
+//    public List<TasknoAndNd> addTNlist(List<TasknoAndNd> tnList, String taskno, String nd);
 
     /**
      * 通过excel导入数据

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

@@ -50,14 +50,16 @@ public class ProjectImportListServiceImpl extends ServiceImpl<ProjectImportListM
     @SuppressWarnings("all")
     private IProjectChbZyfService zyfService;
 
-    public List<TasknoAndNd> addTNlist(List<TasknoAndNd> tnList, String taskno, String nd){
+//    public List<TasknoAndNd> addTNlist(List<TasknoAndNd> tnList, String taskno, String nd){
+    public List<TasknoAndNd> addTNlist(List<TasknoAndNd> tnList, String nd){
         for (TasknoAndNd tasknoAndNd : tnList){
-            if(taskno.equals(tasknoAndNd.getTaskno()) && nd.equals(tasknoAndNd.getNd())) return tnList;
+            if(nd.equals(tasknoAndNd.getNd())) return tnList;
+//            if(taskno.equals(tasknoAndNd.getTaskno()) && nd.equals(tasknoAndNd.getNd())) return tnList;
             else continue;
         }
         TasknoAndNd tn = new TasknoAndNd();
         tn.setNd(nd);
-        tn.setTaskno(taskno);
+//        tn.setTaskno(taskno);
         tnList.add(tn);
         return tnList;
     }
@@ -101,13 +103,16 @@ public class ProjectImportListServiceImpl extends ServiceImpl<ProjectImportListM
                     String fylb = kmbhService.getByNdAndKmbh(nd, kmbh);//费用类别
                     if(Objects.equals(fylb,"事务费")){
                         swfList.add(CHBConvert.INSTANCE.toSWF(chb));
-                        tnSWFList = addTNlist(tnSWFList,taskno,nd);
+//                        tnSWFList = addTNlist(tnSWFList,taskno,nd);
+                        tnSWFList = addTNlist(tnSWFList,nd);
                     }else if(Objects.equals(fylb,"专用费")){
                         zyfList.add(CHBConvert.INSTANCE.toZYF(chb));
-                        tnZYFList = addTNlist(tnZYFList,taskno,nd);
+//                        tnZYFList = addTNlist(tnZYFList,taskno,nd);
+                        tnZYFList = addTNlist(tnZYFList,nd);
                     }else if(Objects.equals(fylb,"外协费")){
                         wxfList.add(CHBConvert.INSTANCE.toWXF(chb));
-                        tnWXFList = addTNlist(tnWXFList,taskno,nd);
+//                        tnWXFList = addTNlist(tnWXFList,taskno,nd);
+                        tnWXFList = addTNlist(tnWXFList,nd);
                     }
                 }
             }
@@ -118,21 +123,21 @@ public class ProjectImportListServiceImpl extends ServiceImpl<ProjectImportListM
             for(TasknoAndNd tasknoAndNd : tnSWFList){
                 columnMap = new HashMap<>();
                 columnMap.put("nd",tasknoAndNd.getNd());
-                columnMap.put("taskno",tasknoAndNd.getTaskno());
+//                columnMap.put("taskno",tasknoAndNd.getTaskno());
                 swfService.removeByMap(columnMap);
             }
             swfService.saveBatch(swfList);
             for(TasknoAndNd tasknoAndNd : tnZYFList){
                 columnMap = new HashMap<>();
                 columnMap.put("nd",tasknoAndNd.getNd());
-                columnMap.put("taskno",tasknoAndNd.getTaskno());
+//                columnMap.put("taskno",tasknoAndNd.getTaskno());
                 zyfService.removeByMap(columnMap);
             }
             zyfService.saveBatch(zyfList);
             for(TasknoAndNd tasknoAndNd : tnWXFList){
                 columnMap = new HashMap<>();
                 columnMap.put("nd",tasknoAndNd.getNd());
-                columnMap.put("taskno",tasknoAndNd.getTaskno());
+//                columnMap.put("taskno",tasknoAndNd.getTaskno());
                 wxfService.removeByMap(columnMap);
             }
             wxfService.saveBatch(wxfList);