diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfCheckingController.java b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfCheckingController.java index 893aab24..b91b0abf 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfCheckingController.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfCheckingController.java @@ -103,8 +103,8 @@ public class DfCheckingController { @ApiOperation("检查项树数组") @GetMapping("/tree") - public Response> checkingItemTree() { - return Response.ok(dfCheckingService.checkingItems()); + public Response> checkingItemTree(@RequestParam(value = "key", required = false) String key) { + return Response.ok(dfCheckingService.checkingItems(key)); } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingService.java index 2d718bc7..4abe0622 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingService.java @@ -47,9 +47,11 @@ public class DfCheckingService extends BaseService public final static String PART_SEPARATOR = ":"; - public List checkingItems() { - String DICT_TYPE = "df_xs_c_classfy"; - return getByDictTypeStream(DICT_TYPE) + public List checkingItems(String key) { + if (StringUtils.isBlank(key)) { + key = "df_xs_c_classfy"; + } + return getByDictTypeStream(key) .map(this::getByDictTypeStream).sorted(Comparator.comparing(CommonCheckingTreeDto::getSort)).collect(Collectors.toList()); } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhV2Service.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhV2Service.java index de3e4293..3d5bdab9 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhV2Service.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhV2Service.java @@ -201,7 +201,7 @@ public class DfYhV2Service extends DefaultApprovalBusinessService list = list(new LambdaQueryWrapper().eq(DfYhV2::getRecordId, byId.getRecordId())); if (CollectionUtils.isNotEmpty(list) && !list.isEmpty()) { long count = list.stream().filter(e -> Objects.equals(DfYhV2StatusEnum.ACCEPTED.getValue(), e.getStatus())).count(); - if (count+1==list.size()) { + if (count+1==list.size() || Objects.equals(1,list.size())) { Wrapper wp = Wrappers.lambdaUpdate() .eq(DfCheckingRecord::getId, byId.getRecordId()) .set(DfCheckingRecord::getStatus, status); diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzYhV2Service.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzYhV2Service.java index 414c26bf..201666e7 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzYhV2Service.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzYhV2Service.java @@ -34,6 +34,7 @@ import com.shuili.common.utils.BeanUtils; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; import java.util.Objects; import java.util.Optional; @@ -206,7 +207,7 @@ public class SzYhV2Service extends DefaultApprovalBusinessService list = list(new LambdaQueryWrapper().eq(SzYhV2::getRecordId, byId.getRecordId())); if (CollectionUtils.isNotEmpty(list) && !list.isEmpty()) { long count = list.stream().filter(e -> Objects.equals(DfYhV2StatusEnum.ACCEPTED.getValue(), e.getStatus())).count(); - if (count+1==list.size()) { + if (count+1==list.size()|| Objects.equals(1,list.size())) { Wrapper wp = Wrappers.lambdaUpdate() .eq(SzCheckingRecord::getId, byId.getRecordId()) .set(SzCheckingRecord::getStatus, status); @@ -214,6 +215,7 @@ public class SzYhV2Service extends DefaultApprovalBusinessService