Merge branch 'dev' of...

Merge branch 'dev' of ssh://gitlab.91isoft.com:10022/wangfei/vehicle-quality-review into gaixiankang

quality-review/src/main/java/com/ruoyi/common/DataStatisticsUtils.java

@@ -7,6 +7,7 @@ import com.ruoyi.mapper.TaskMapper;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 public class DataStatisticsUtils {
 
@@ -31,7 +32,7 @@ public class DataStatisticsUtils {
                     isPass = false;
                 }
 
-                if(passed == ReviewStandard.NO_PASSED) {
+                if(Objects.equals(passed, ReviewStandard.NO_PASSED)) {
                     isPass = false;
                 }
 
@@ -62,7 +63,7 @@ public class DataStatisticsUtils {
                     isPass = false;
                 }
 
-                if(passed == ReviewStandard.NO_PASSED) {
+                if(Objects.equals(passed, ReviewStandard.NO_PASSED)) {
                     isPass = true;
                 }
 
@@ -106,7 +107,7 @@ public class DataStatisticsUtils {
                     continue;
                 }
 
-                if(detailsIsPass(reviewDetails, resultMap) == ReviewStandard.PASSED) {
+                if(Objects.equals(detailsIsPass(reviewDetails, resultMap), ReviewStandard.PASSED)) {
                     detailsPass = detailsPass + 1;
                 }
             }
@@ -124,7 +125,7 @@ public class DataStatisticsUtils {
             List<ReviewDetails> details = getDetailsByStandard(standard);
             for(ReviewDetails reviewDetails : details) {
 
-                if(detailsIsPass(reviewDetails, resultMap) == ReviewStandard.NO_PASSED) {
+                if(Objects.equals(detailsIsPass(reviewDetails, resultMap), ReviewStandard.NO_PASSED)) {
                     detailsNoPass = detailsNoPass + 1;
                 }
             }

quality-review/src/main/java/com/ruoyi/service/impl/ReviewEnterpriseArchiveServiceImpl.java

@@ -24,6 +24,7 @@ import org.springframework.stereotype.Service;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 
 /**
 * @author wangfei
@@ -83,6 +84,18 @@ public class ReviewEnterpriseArchiveServiceImpl extends ServiceImpl<ReviewEnterp
             throw new ServiceException("新增文件名称重复，请检查", HttpStatus.ERROR);
         } else {
             reviewEnterpriseArchiveService.save(reviewEnterpriseArchive);
+
+            ReviewEnterpriseArchiveFindByTaskIdRequest request = new ReviewEnterpriseArchiveFindByTaskIdRequest();
+            request.setTaskId(reviewEnterpriseArchive.getTaskId());
+            List<ReviewEnterpriseArchive> list = reviewEnterpriseArchiveMapper.findEnterpriseArchiveByTaskId(request);
+            if (list != null && list.size() != 0) {
+                for (ReviewEnterpriseArchive archive : list) {
+                    if (!Objects.equals(archive.getEnterpriseName(), reviewEnterpriseArchive.getEnterpriseName())) {
+                        archive.setEnterpriseName(reviewEnterpriseArchive.getEnterpriseName());
+                    }
+                }
+                reviewEnterpriseArchiveService.updateBatchById(list);
+            }
         }
 
         return reviewEnterpriseArchive.getId();