Merge branch 'master' of http://101.36.160.140:21044/delivery-warehouse-java/delivery-depot-admin

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/service/task/TaskServiceImpl.java

@@ -44,6 +44,7 @@ import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Objects;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 import static com.unis.framework.common.exception.util.ServiceExceptionUtil.exception;
 
@@ -127,6 +128,10 @@ public class TaskServiceImpl implements TaskService {
         // 省级核验人员
         if(roleCodes.contains(RoleCodeEnum.PROVINCIAL_VERIFICATION_PERSONNEL.getCode())) {
             reqVO.getKqIds().forEach(kqId -> {
+
+                //获取可选库房 id 列表
+                getCaIds(reqVO, kqId);
+
                 ProvinceDO provinceDO = new ProvinceDO()
                         .setHyState(reqVO.getHyState())
                         .setHyryId(SecurityFrameworkUtils.getLoginUserId())
@@ -146,6 +151,10 @@ public class TaskServiceImpl implements TaskService {
         // 银行核验人员
         if(roleCodes.contains(RoleCodeEnum.BANK_VERIFICATION_PERSONNEL.getCode())) {
             reqVO.getKqIds().forEach(kqId -> {
+
+                //获取可选库房 id 列表
+                getCaIds(reqVO, kqId);
+
                 BankDO bankDO = new BankDO()
                         .setHyState(reqVO.getHyState())
                         .setHyryId(SecurityFrameworkUtils.getLoginUserId())
@@ -166,6 +175,17 @@ public class TaskServiceImpl implements TaskService {
         return true;
     }
 
+    private void getCaIds(TaskPageReqVO reqVO, Long kqId) {
+        if(reqVO.getCaIds() == null ){
+            TaskPageReqVO tpr = new TaskPageReqVO();
+            tpr.setListType(TaskPageReqVO.LIST_TYPE_TASK1);
+            tpr.setKqId(kqId);
+            List<TaskCaxxRespVO> caxxByKqId = getCaxxByKqId(tpr);
+            List<Long> caIds = caxxByKqId.stream().map(TaskCaxxRespVO::getCaId).collect(Collectors.toList());
+            reqVO.setCaIds(caIds);
+        }
+    }
+
     private void extractedBxzt(TaskPageReqVO reqVO,Integer bxzt) {
         reqVO.getCaIds().forEach(caId -> {
             CaxxDO caxxDO = new CaxxDO();