样本送检、基因定制支持多状态查询

jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/sample/service/impl/SampleCheckOrderServiceImpl.java

@@ -43,7 +43,13 @@ public class SampleCheckOrderServiceImpl extends ServiceImpl<SampleCheckOrderMap
             JSONArray array = extJson.getJSONArray("lisIds");
             return array.getLong(0);
         } else if (extJson.containsKey("lisId")) {
-            return extJson.getLong("lisId");
+            Object o = extJson.get("lisId");
+            if (o instanceof Long) {
+                return (Long) o;
+            }
+            if (o instanceof JSONArray) {
+                return ((JSONArray) o).getLong(0);
+            }
         }
 
         return null;

jfcloud-gene-biz/src/main/java/com/github/jfcloud/gene/sample/service/impl/SampleInfoServiceImpl.java

@@ -251,9 +251,11 @@ public class SampleInfoServiceImpl extends ServiceImpl<SampleInfoMapper, SampleI
         //选择了审核状态，则只能看到自己审核的
         for (String sta : statusList) {
             if (GeneStatusEnum.DEPART_LEADER.getStatus().equals(sta)) {
-                lqw2.or(x -> x.eq(SampleInfo::getDepartLeaderId, UserUtil.getUserId()));
+                lqw2.or(x ->
+                        x.eq(SampleInfo::getDepartLeaderId, UserUtil.getUserId()).eq(SampleInfo::getStatus, sta));
             } else if (GeneStatusEnum.PROJECT_MANAGEMENT.getStatus().equals(sta)) {
-                lqw2.or(x -> x.eq(SampleInfo::getProjectManageId, UserUtil.getUserId()));
+                lqw2.or(x ->
+                        x.eq(SampleInfo::getProjectManageId, UserUtil.getUserId()).eq(SampleInfo::getStatus, sta));
             }
         }
     }