Commit 59a26a98 authored by 竹天卫's avatar 竹天卫

任务派发显示平行样, 任务接受不显示平行样

parent 5fdeea28
...@@ -25,7 +25,9 @@ public interface SampleDistributionMapper extends BaseMapper<SampleDistribution> ...@@ -25,7 +25,9 @@ public interface SampleDistributionMapper extends BaseMapper<SampleDistribution>
IPage<SampleDistributionVo> getPage(@Param("page") Page page, @Param("params") Map<String, Object> params); IPage<SampleDistributionVo> getPage(@Param("page") Page page, @Param("params") Map<String, Object> params);
List<SampleDistributionTeamVo> getDistributionTeamList(@Param("sampleId") Integer sampleId, @Param("userId") Integer userId); List<SampleDistributionTeamVo> getDistributionTeamList(@Param("sampleId") Integer sampleId,
@Param("sampleId2") Integer sampleId2,
@Param("userId") Integer userId);
List<SampleCheckGroupVo> getSampleCheckGroupList(@Param("sampleId") Integer sampleId); List<SampleCheckGroupVo> getSampleCheckGroupList(@Param("sampleId") Integer sampleId);
} }
...@@ -49,6 +49,7 @@ public interface SampleMapper extends BaseMapper<Sample> { ...@@ -49,6 +49,7 @@ public interface SampleMapper extends BaseMapper<Sample> {
@Select("select * from sample where entrust_id = #{entrustId} and is_check != 1 order by id asc") @Select("select * from sample where entrust_id = #{entrustId} and is_check != 1 order by id asc")
List<Sample> getNoCheckList(Integer entrustId); List<Sample> getNoCheckList(Integer entrustId);
@Select("select * from sample where entrust_id = #{entrustId} and cement_code = #{cementCode}")
List<Sample> getByCementCode(@Param("entrustId") Integer entrustId, @Param("cementCode") String cementCode);
} }
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
left join sys_user su on su.id = t.user_id left join sys_user su on su.id = t.user_id
left join team s on s.id = t.team_id left join team s on s.id = t.team_id
left join team_group tg on tg.id = t.team_group_id left join team_group tg on tg.id = t.team_group_id
where t.sample_id = #{sampleId} where t.sample_id = #{sampleId} or t.sample_id = #{sampleId2}
<if test="userId != null"> <if test="userId != null">
and t.user_id = #{userId} and t.user_id = #{userId}
</if> </if>
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
<mapper namespace="cn.wise.sc.cement.business.mapper.SampleMapper"> <mapper namespace="cn.wise.sc.cement.business.mapper.SampleMapper">
<sql id="where"> <sql id="where">
<where> <where>
and
<if test="params.sampleName != null and params.sampleName != ''"> <if test="params.sampleName != null and params.sampleName != ''">
and s.name like concat('%', #{params.sampleName}, '%') and s.name like concat('%', #{params.sampleName}, '%')
</if> </if>
......
...@@ -10,22 +10,15 @@ import cn.wise.sc.cement.business.model.vo.*; ...@@ -10,22 +10,15 @@ import cn.wise.sc.cement.business.model.vo.*;
import cn.wise.sc.cement.business.service.*; import cn.wise.sc.cement.business.service.*;
import cn.wise.sc.cement.business.util.CheckCountUtil; import cn.wise.sc.cement.business.util.CheckCountUtil;
import cn.wise.sc.cement.business.util.RedisUtil; import cn.wise.sc.cement.business.util.RedisUtil;
import cn.wise.sc.cement.business.wrapper.page.Query;
import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.models.auth.In;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.tomcat.jni.Local;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import sun.print.BackgroundServiceLookup;
import sun.security.provider.SHA;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.math.BigDecimal; import java.math.BigDecimal;
...@@ -303,7 +296,7 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl ...@@ -303,7 +296,7 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
sampleVo.setTeamName(teamName); sampleVo.setTeamName(teamName);
//评审人员可以查看所有的检测项内容 //评审人员可以查看所有的检测项内容
List<SampleDistributionTeamVo> sampleDistributionTeamVoList = List<SampleDistributionTeamVo> sampleDistributionTeamVoList =
distributionMapper.getDistributionTeamList(sample.getId(),null); distributionMapper.getDistributionTeamList(sample.getId(),null,null);
if(sampleDistributionTeamVoList != null && sampleDistributionTeamVoList.size()>0) { if(sampleDistributionTeamVoList != null && sampleDistributionTeamVoList.size()>0) {
sampleVo.setSampleDistributionTeamVoList(sampleDistributionTeamVoList); sampleVo.setSampleDistributionTeamVoList(sampleDistributionTeamVoList);
}else{ }else{
...@@ -963,9 +956,23 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl ...@@ -963,9 +956,23 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
for(Sample sample : sampleList){ for(Sample sample : sampleList){
SampleVo sampleVo = new SampleVo(); SampleVo sampleVo = new SampleVo();
BeanUtils.copyProperties(sample,sampleVo); BeanUtils.copyProperties(sample,sampleVo);
//判断是否为平行样
List<SampleDistributionTeamVo> sampleDistributionTeamVoList = null;
if(sample.getIsParallel() == 0){
//检测人员只能看到自己则的检测内容 //检测人员只能看到自己则的检测内容
List<SampleDistributionTeamVo> sampleDistributionTeamVoList = sampleDistributionTeamVoList =
distributionMapper.getDistributionTeamList(sample.getId(), loginUser.getId()); distributionMapper.getDistributionTeamList(sample.getId(), null, loginUser.getId());
}else if(sample.getIsParallel() == 1){
List<Sample> sampleList1 = sampleMapper.getByCementCode(entrust.getId(), sample.getCementCode());
//检测人员只能看到自己则的检测内容
if(sampleList1.size() == 2){
sampleDistributionTeamVoList =
distributionMapper.getDistributionTeamList(sampleList1.get(0).getId(), sampleList1.get(1).getId(), loginUser.getId());
}else{
sampleDistributionTeamVoList =
distributionMapper.getDistributionTeamList(sample.getId(), null, loginUser.getId());
}
}
if(sampleDistributionTeamVoList != null && sampleDistributionTeamVoList.size()>0) { if(sampleDistributionTeamVoList != null && sampleDistributionTeamVoList.size()>0) {
sampleVo.setSampleDistributionTeamVoList(sampleDistributionTeamVoList); sampleVo.setSampleDistributionTeamVoList(sampleDistributionTeamVoList);
for(SampleDistributionTeamVo sdVo : sampleDistributionTeamVoList){ for(SampleDistributionTeamVo sdVo : sampleDistributionTeamVoList){
...@@ -1200,7 +1207,7 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl ...@@ -1200,7 +1207,7 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
for(Sample sample : sampleList){ for(Sample sample : sampleList){
SampleVo sampleVo = new SampleVo(); SampleVo sampleVo = new SampleVo();
BeanUtils.copyProperties(sample,sampleVo); BeanUtils.copyProperties(sample,sampleVo);
List<SampleDistributionTeamVo> sampleDistributionTeamVoList =distributionMapper.getDistributionTeamList(sample.getId(), null); List<SampleDistributionTeamVo> sampleDistributionTeamVoList =distributionMapper.getDistributionTeamList(sample.getId(), null, null);
if(sampleDistributionTeamVoList != null && sampleDistributionTeamVoList.size()>0) { if(sampleDistributionTeamVoList != null && sampleDistributionTeamVoList.size()>0) {
sampleVo.setSampleDistributionTeamVoList(sampleDistributionTeamVoList); sampleVo.setSampleDistributionTeamVoList(sampleDistributionTeamVoList);
}else{ }else{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment