批量上传文件中对数据进行去重处理

src/main/java/com/jeeplus/modules/sg/managementcenter/reserveManagement/entity/ReserveManagement.java

@@ -3,6 +3,7 @@ package com.jeeplus.modules.sg.managementcenter.reserveManagement.entity;
 import com.jeeplus.core.persistence.DataEntity;
 
 import java.util.Date;
+import java.util.Objects;
 
 /**
  * 项目储备信息 Entity
@@ -663,4 +664,22 @@ public class ReserveManagement extends DataEntity<ReserveManagement> {
     public void setDisclosureFinishDateStr(String disclosureFinishDateStr) {
         this.disclosureFinishDateStr = disclosureFinishDateStr;
     }
+
+    /**
+     * 重写 equals 方法
+     * @param obj
+     * @return
+     */
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null || getClass() != obj.getClass()) {
+            return false;
+        }
+        //判断  如果 projectReserveId 在集合中存在 则返回 true  否则 返回false
+        ReserveManagement reserveManagement = (ReserveManagement) obj;
+        return Objects.equals(projectReserveId, reserveManagement.projectReserveId);
+    }
 }

src/main/java/com/jeeplus/modules/sg/managementcenter/reserveManagement/utils/ReserveManagementProUtil.java

@@ -112,7 +112,10 @@ public class ReserveManagementProUtil {
 
                     //对该数据进行数据处理
                     disposeData(reserveManagement);
-                    list.add(reserveManagement);
+                    //判断集合中是否含有相同的 projectReserveId 数据 如果存在 则不进行添加数据
+                    if(!list.contains(reserveManagement)){
+                        list.add(reserveManagement);
+                    }
                 }
             }
         }

src/main/webapp/webpage/modules/sg/managementcenter/reserveManagement/reserveManagementInformation.js

@@ -546,7 +546,7 @@ $(document).ready(function () {
     $('#projectTable').on('check.bs.table uncheck.bs.table load-success.bs.table ' +
         'check-all.bs.table uncheck-all.bs.table', function () {
         $('#remove').prop('disabled', !$('#projectTable').bootstrapTable('getSelections').length);
-        $('#view,#edit').prop('disabled', $('#projectTable').bootstrapTable('getSelections').length != 1);
+        $('#view,#edit,#jlEdit').prop('disabled', $('#projectTable').bootstrapTable('getSelections').length != 1);
     });
 
     $("#btnImport").click(function () {