校核退回列表不能展示非派发检测项的信息 已经优化

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/SampleDistributionMapper.java

@@ -28,6 +28,9 @@ public interface SampleDistributionMapper extends BaseMapper<SampleDistribution>
 	List<SampleDistributionTeamVo> getDistributionTeamList(@Param("sampleId") Integer sampleId,
 	                                                       @Param("userId") Integer userId);
 
+	List<SampleDistributionTeamVo> getDistributionTeamList2(@Param("sampleId") Integer sampleId,
+	                                                       @Param("userId") Integer userId);
+
 	List<SampleDistributionTeamVo> getDistributionTeamResultList(@Param("sampleId") Integer sampleId,
 	                                                       @Param("userId") Integer userId);
 

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/SampleDistributionMapper.xml

@@ -77,6 +77,33 @@
         order by t.id asc
     </select>
 
+    <select id="getDistributionTeamList2" resultType="cn.wise.sc.cement.business.model.vo.SampleDistributionTeamVo">
+        select t.id as distributionId, su.id as userId, su.name as userName,
+        t.team_group_id as teamGroupId, tg.name as teamGroupName, s.id as teamId, s.name as teamName,
+        t.status as status,
+        (
+        CASE t.status
+        WHEN 0 THEN '未接受'
+        WHEN 1 THEN '接受'
+        WHEN 2 THEN '待校核'
+        WHEN 3 THEN '退回'
+        WHEN 4 THEN '校核通过'
+        WHEN 5 THEN '校核退回'
+        ELSE ''
+        END
+        ) as statusValue
+        from sample_distribution t
+        left join sys_user su on su.id = t.user_id
+        left join team s on s.id = t.team_id
+        left join team_group tg on tg.id = t.team_group_id
+        where t.sample_id = #{sampleId}
+        <if test="userId != null">
+            and t.user_id = #{userId}
+        </if>
+        order by t.id asc
+    </select>
+
+
     <select id="getDistributionTeamResultList" resultType="cn.wise.sc.cement.business.model.vo.SampleDistributionTeamVo">
         select t.id as distributionId, su.id as userId, su.name as userName,
         t.team_group_id as teamGroupId, tg.name as teamGroupName, s.id as teamId, s.name as teamName,

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/EntrustServiceImpl.java

@@ -2668,7 +2668,7 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
 				SampleVo sampleVo = new SampleVo();
 				BeanUtils.copyProperties(sample, sampleVo);
 				List<SampleDistributionTeamVo> sampleDistributionTeamVoList =
-						distributionMapper.getDistributionTeamList(sample.getId(), loginUser.getId());
+						distributionMapper.getDistributionTeamList2(sample.getId(), loginUser.getId());
 				Map<String, String> checkTeamMap = new HashMap<>();
 				if (sampleDistributionTeamVoList != null && sampleDistributionTeamVoList.size() > 0) {
 					//已经派发过的列表