修改冲突

boman-api/boman-domain/src/main/java/com/boman/domain/entity/StatisticReportPersonnel.java

@@ -1,13 +1,9 @@
 package com.boman.domain.entity;
 
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.boman.domain.BaseEntity;
-import lombok.Builder;
-import lombok.Data;
 
-import java.util.Date;
-import java.util.List;
+import java.sql.Timestamp;
+
 
 public class StatisticReportPersonnel  extends BaseEntity {
 
@@ -26,6 +22,52 @@ public class StatisticReportPersonnel  extends BaseEntity {
   private java.sql.Timestamp updateTime;
   private String uploadFile;
 
+  @Override
+  public String getCreateBy() {
+    return createBy;
+  }
+
+  @Override
+  public void setCreateBy(String createBy) {
+    this.createBy = createBy;
+  }
+
+  @Override
+  public Timestamp getCreateTime() {
+    return createTime;
+  }
+
+  public void setCreateTime(Timestamp createTime) {
+    this.createTime = createTime;
+  }
+
+  @Override
+  public String getUpdateBy() {
+    return updateBy;
+  }
+
+  @Override
+  public void setUpdateBy(String updateBy) {
+    this.updateBy = updateBy;
+  }
+
+  @Override
+  public Timestamp getUpdateTime() {
+    return updateTime;
+  }
+
+  public void setUpdateTime(Timestamp updateTime) {
+    this.updateTime = updateTime;
+  }
+
+  public String getUploadFile() {
+    return uploadFile;
+  }
+
+  public void setUploadFile(String uploadFile) {
+    this.uploadFile = uploadFile;
+  }
+
   public Long getId() {
     return id;
   }

boman-report/src/main/java/com/boman/report/service/impl/StatisticReportServiceImpl.java

@@ -1,18 +1,17 @@
 package com.boman.report.service.impl;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
+import com.boman.common.core.utils.CollectUtils;
 import com.boman.domain.SysFile;
 import com.boman.domain.dto.AjaxResult;
+import com.boman.domain.dto.StatisticReportDto;
 import com.boman.domain.entity.StatisticReport;
 import com.boman.domain.entity.StatisticReportPersonnel;
 import com.boman.domain.entity.vo.StatisticReportVo;
 import com.boman.report.mapper.StatisticReportMapper;
 import com.boman.report.mapper.StatisticReportPersonnelMapper;
 import com.boman.report.service.StatisticReportService;
-import com.google.gson.JsonObject;
 import com.boman.common.core.utils.SecurityUtils;
 import com.boman.report.service.StatisticReportPersonnelService;
 import org.slf4j.Logger;
@@ -21,10 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Transactional;
-
-import java.lang.ref.ReferenceQueue;
 import java.util.*;
-
 import java.util.stream.Collectors;
 
 /**