Merge remote-tracking branch 'origin/release-sy-v1.0.0'

shuili-system/src/main/java/com/kms/yxgh/df/controller/DfCheckingController.java

@@ -103,8 +103,8 @@ public class DfCheckingController {
 
     @ApiOperation("检查项树数组")
     @GetMapping("/tree")
-    public Response<List<CommonCheckingTreeDto>> checkingItemTree() {
-        return Response.ok(dfCheckingService.checkingItems());
+    public Response<List<CommonCheckingTreeDto>> checkingItemTree(@RequestParam(value = "key", required = false) String key) {
+        return Response.ok(dfCheckingService.checkingItems(key));
     }
 
 

shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingService.java

@@ -47,9 +47,11 @@ public class DfCheckingService extends BaseService<DfCheckingMapper, DfChecking>
 
     public final static String PART_SEPARATOR = ":";
 
-    public List<CommonCheckingTreeDto> checkingItems() {
-        String DICT_TYPE = "df_xs_c_classfy";
-        return getByDictTypeStream(DICT_TYPE)
+    public List<CommonCheckingTreeDto> 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());
     }
 

shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhV2Service.java

@@ -201,7 +201,7 @@ public class DfYhV2Service extends DefaultApprovalBusinessService<DfYhV2Mapper,
         List<DfYhV2> list = list(new LambdaQueryWrapper<DfYhV2>().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<DfCheckingRecord> wp = Wrappers.<DfCheckingRecord>lambdaUpdate()
                         .eq(DfCheckingRecord::getId, byId.getRecordId())
                         .set(DfCheckingRecord::getStatus, status);

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<SzYhV2Mapper,
         List<SzYhV2> list = list(new LambdaQueryWrapper<SzYhV2>().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<SzCheckingRecord> wp = Wrappers.<SzCheckingRecord>lambdaUpdate()
                         .eq(SzCheckingRecord::getId, byId.getRecordId())
                         .set(SzCheckingRecord::getStatus, status);
@@ -214,6 +215,7 @@ public class SzYhV2Service extends DefaultApprovalBusinessService<SzYhV2Mapper,
             }
         }
     }
+
     @Override
     public String formStatus(String formId) {
         return ApprovalStatusEnum.SUBMITTING.getValue();