bug修改

jwtech-system/src/main/java/com/kms/warn/service/BsSgcJsjdBuiRectificationService.java

@@ -1,6 +1,7 @@
 package com.kms.warn.service;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jianwei.common.core.domain.SearchParam;
@@ -37,26 +38,10 @@ public class BsSgcJsjdBuiRectificationService extends BaseService<BsSgcJsjdBuiRe
         IPage page = bsSgcJsjdBuiRectificationMapper.select(new Page(sp.getPageNum(),sp.getPageSize()),data.getInspectionId());
         List<RectificationDto> list = page.getRecords();
         for (RectificationDto rectificationDto : list) {
-                if(rectificationDto==null){
-                    continue;
-                }
-                String unit = rectificationDto.getUnit();
-                if (unit != null) {
-                    String[] split = unit.split(",");
-                    List<BsSgcJsjdBuiEnteInfo> bsSgcJsjdBuiEnteInfos = bsSgcJsjdBuiEnteInfoService.listByIds(Arrays.asList(split));
-                    List<String> stringList = bsSgcJsjdBuiEnteInfos.stream().map(BsSgcJsjdBuiEnteInfo::getEnterpriseName).collect(Collectors.toList());
-                    rectificationDto.setUnitArray(stringList);
-                }
-                String rectificationSituation = rectificationDto.getRectificationSituation();
-                if (rectificationSituation != null) {
-                    String[] split = rectificationSituation.split(",");
-                    rectificationDto.setIsFinish("1");
-                    for (String s : split) {
-                        if (s.equals("未完成")) {
-                            rectificationDto.setIsFinish("0");
-                        }
-                    }
-                }
+            rectificationDto.setIsFinish("1");
+            if (ObjectUtil.isEmpty(rectificationDto.getFeedback())){
+                rectificationDto.setIsFinish("0");
+            }
             }
         Page<RectificationDto> rectificationDtoPage = new Page<>();
         rectificationDtoPage.setRecords(list);

jwtech-system/src/main/java/com/kms/warn/service/BsSgcJsjdBuiRegulatoryInspectionsService.java

@@ -92,7 +92,7 @@ public class BsSgcJsjdBuiRegulatoryInspectionsService extends BaseService<BsSgcJ
                 czNum=rlist.size();
                 for (RectificationDto rectificationDto : rlist) {
                     rectificationDto.setIsFinish("1");
-                    if (ObjectUtil.isEmpty(rectificationDto.getContext())){
+                    if (ObjectUtil.isEmpty(rectificationDto.getFeedback())){
                         rectificationDto.setIsFinish("0");
                         cNum++;
                         num++;