Skip to content

T
tianjin-cement
Commit d8fc0bbe authored by 竹天卫's avatar 竹天卫
Browse files
Options

流程完成

parent e5922508
Show whitespace changes
Inline Side-by-side
Showing with 458 additions and 116 deletions
cement-business/src/main/java/cn/wise/sc/cement/business/controller/EntrustController.java
View file @ d8fc0bbe
......@@ -258,7 +258,7 @@ public class EntrustController {
}
@ApiOperation(value = "样品处理退回任务分页（）")
@ApiOperation(value = "样品处理退回任务分页（评审人员查看）")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "entrustCode", value = "委托单号", paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "userId", value = "接受人id", paramType = "query", dataType = "Integer"),
......@@ -273,18 +273,18 @@ public class EntrustController {
try {
return entrustService.getSampleReturnHandlePage(pageQuery, entrustCode, userId, clientName, projectName, projectCode, isUrgent);
} catch (Exception e) {
log.debug("样品处理退回任务分页{}", e);
log.debug("样品处理退回任务分页（评审人员查看）{}", e);
}
return BaseResponse.errorMsg("失败!");
}
@ApiOperation(value = "重新派发样品处理任务")
@ApiOperation(value = "重新派发样品处理任务（评审人员操作）")
@PostMapping("/handleAgain")
public BaseResponse handleAgain(@RequestBody HandleAgainQuery query) {
try {
return entrustService.handleAgain(query);
} catch (Exception e) {
log.debug("重新派发样品处理任务{}", e);
log.debug("重新派发样品处理任务（评审人员操作）{}", e);
}
return BaseResponse.errorMsg("失败!");
}
......@@ -345,13 +345,13 @@ public class EntrustController {
return BaseResponse.errorMsg("失败!");
}
@ApiOperation(value = "检测通知单详情")
@ApiOperation(value = "检测通知单详情（派发的+校核退回）")
@GetMapping("/getSampleDistributionList/{id}")
public BaseResponse getSampleDistributionList(@PathVariable Integer id) {
try {
return entrustService.getSampleDistributionList(id);
} catch (Exception e) {
log.debug("检测通知单详情{}", e);
log.debug("检测通知单详情（派发的和校核退回）{}", e);
}
return BaseResponse.errorMsg("失败!");
}
......@@ -389,8 +389,6 @@ public class EntrustController {
return BaseResponse.errorMsg("失败!");
}
@ApiOperation(value = "详情-检测任务信息")
@GetMapping("/getSampleCheckDtail/{id}")
public BaseResponse getSampleCheckDtail(@PathVariable Integer id) {
......@@ -468,16 +466,17 @@ public class EntrustController {
return BaseResponse.errorMsg("失败!");
}
//*******************样品校核 ****************************************
@ApiOperation(value = "数据校核分页")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "startDate", value = "开始日期", paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "endDate", value = "结束日期", paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "status",
value = "状态(6样品检测完成，7校核中，8校核完成)", paramType = "query", dataType = "Integer"),
value = "状态(0未评审，1已通过，2未通过，" +
"3样品处理中，4样品处理完成，" +
"5样品检测中，6样品检测完成，" +
"7校核中，8校核完成)", paramType = "query", dataType = "Integer"),
@ApiImplicitParam(name = "clientId", value = "委托单位id", paramType = "query", dataType = "Integer"),
@ApiImplicitParam(name = "projectName", value = "项目名称", paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "projectCode", value = "项目编号", paramType = "query", dataType = "String")
......@@ -504,7 +503,6 @@ public class EntrustController {
return BaseResponse.errorMsg("失败!");
}
@ApiOperation(value = "校核计算 立马返回数据")
@PostMapping("/checkCountFast")
public BaseResponse checkCountFast(@RequestBody CheckCountFastQuery query) {
......@@ -539,8 +537,36 @@ public class EntrustController {
return BaseResponse.errorMsg("失败!");
}
@ApiOperation(value = "数据校核退回任务分页（处理人+检测人员查看）")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "entrustCode", value = "委托单号", paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "status",
value = "状态(0未评审，1已通过，2未通过，" +
"3样品处理中，4样品处理完成，" +
"5样品检测中，6样品检测完成，" +
"7校核中，8校核完成)", paramType = "query", dataType = "Integer"),
@ApiImplicitParam(name = "clientName", value = "委托单位id", paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "projectName", value = "项目名称", paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "projectCode", value = "项目编号", paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "isUrgent", value = "（1加急，0不加急）", paramType = "query", dataType = "Integer"),
@ApiImplicitParam(name = "distributionStatus", value = "样品检测表状态（0未接受，1接受，2待校核，" +
"3退回，4校核通过，5校核退回）", paramType = "query", dataType = "Integer")
})
@GetMapping("/getSampleReturnCheckPage")
public BaseResponse getSampleReturnCheckPage(PageQuery pageQuery, String entrustCode, Integer status,
String clientName, String projectName, String projectCode, Integer isUrgent,
Integer distributionStatus ) {
try {
return entrustService.getSampleReturnCheckPage(pageQuery, entrustCode, status,
clientName, projectName, projectCode, isUrgent, distributionStatus);
} catch (Exception e) {
log.debug("数据校核退回任务分页（处理人+检测人员查看）{}", e);
}
return BaseResponse.errorMsg("失败!");
}
//附件功能**************************************************
//*********************附件功能**************************************************
@ApiOperation(value = "样品处理附件列表")
@GetMapping("/getSampleHandleEnclosureList")
public BaseResponse getSampleHandleEnclosureList(Integer sampleHandleId) {
......@@ -620,26 +646,7 @@ public class EntrustController {
//*********************导出**************************************************
@PostMapping("/export/{entrustId}")
@ApiOperation("导出委托单")
......
cement-business/src/main/java/cn/wise/sc/cement/business/controller/WeiXinController.java
View file @ d8fc0bbe
......@@ -25,7 +25,7 @@ import java.util.Map;
@RestController
@RequestMapping("/tcdri/weixin")
public class WeiXinController {
//
private static final Logger log = LoggerFactory.getLogger("WeiXinController");
@Autowired
......
cement-business/src/main/java/cn/wise/sc/cement/business/mapper/EntrustMapper.java
View file @ d8fc0bbe
......@@ -48,4 +48,6 @@ public interface EntrustMapper extends BaseMapper<Entrust> {
IPage<SampleReturnHandleVo> getSampleReturnHandlePage(@Param("page") Page page, @Param("params") Map<String, Object> params);
IPage<SampleReturnHandleVo> getSampleReturnDistributioPage(@Param("page") Page page, @Param("params") Map<String, Object> params);
IPage<EntrustVo> getSampleReturnCheckPage(@Param("page") Page page, @Param("params") Map<String, Object> params);
}
cement-business/src/main/java/cn/wise/sc/cement/business/mapper/SampleDistributionEquipmentMapper.java
View file @ d8fc0bbe
package cn.wise.sc.cement.business.mapper;
import cn.wise.sc.cement.business.entity.SampleDistributionEquipment;
import cn.wise.sc.cement.business.model.vo.SampleDistributionEquipmentVo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* <p>
......@@ -13,4 +17,14 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
*/
public interface SampleDistributionEquipmentMapper extends BaseMapper<SampleDistributionEquipment> {
List<SampleDistributionEquipmentVo> getEqupmentList(@Param("distributionId") Integer distributionId,
@Param("userId") Integer userId);
}
cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/EntrustMapper.xml
View file @ d8fc0bbe
......@@ -42,7 +42,8 @@
</sql>
<select id="getPage" resultType="cn.wise.sc.cement.business.model.vo.EntrustVo">
select e.*, c.name as clientName, su.name as userName,
select e.*, p.name as projectName,p.code as projectCode,
c.name as clientName, su.name as userName,
(
CASE e.status
WHEN 0 THEN '未评审'
......@@ -79,8 +80,8 @@
ELSE NULL
END
) as 是否加急,
IF(ISNULL(e.project_name),'',e.project_name) as 项目名称,
IF(ISNULL(e.project_code),'',e.project_code) as 项目编号,
IF(ISNULL(p.name),'',p.name) as 项目名称,
IF(ISNULL(p.name),'',p.name) as 项目编号,
IF(ISNULL(su.name),'',su.name) as 委托人,
IF(ISNULL(c.name),'',c.name) as 委托单位,
IF(ISNULL(e.entrust_date),'',e.entrust_date) as 委托日期,
......@@ -127,7 +128,8 @@
ELSE ''
END
) as statusValue,
p.name as projectName, c.name as clientName, su.name as userName,
p.name as projectName,p.code as projectCode,
c.name as clientName, su.name as userName,
su.phone as userPhone, su.fax as userFax
from entrust e
left join project p on p.id = e.project_id
......@@ -257,7 +259,7 @@
<!--数据校核分页列表-->
<select id="getCheckPage" resultType="cn.wise.sc.cement.business.model.vo.EntrustVo">
select e.*, p.name as projectName, c.name as clientName, su.name as userName,
select e.*, p.name as projectName,p.code as projectCode, c.name as clientName, su.name as userName,
(
CASE e.status
WHEN 0 THEN '未评审'
......@@ -435,4 +437,62 @@
</select>
<select id="getSampleReturnCheckPage" resultType="cn.wise.sc.cement.business.model.vo.EntrustVo">
select e.id as id, e.entrust_code as entrustCode, e.sample_num as sampleNum,e.entrust_date as entrustDate,
e.status,
(
CASE e.status
WHEN 0 THEN '未评审'
WHEN 1 THEN '已通过'
WHEN 2 THEN '未通过'
WHEN 3 THEN '样品处理中'
WHEN 4 THEN '样品处理完成'
WHEN 5 THEN '样品检测中'
WHEN 6 THEN '样品检测完成'
WHEN 7 THEN '校核中'
WHEN 8 THEN '校核完成'
WHEN 9 THEN '修改待确认'
ELSE ''
END
) as statusValue,
p.id as projectId, p.name as projectName, p.code as projectCode,
su.name as userName, e.is_urgent as isUrgent, c.name as clientName
from sample_distribution t
left join sys_user su on su.id = t.user_id
left join sample s on s.id = t.sample_id
left join entrust e on e.id = s.entrust_id
left join project p on p.id = e.project_id
left join client c on c.id = e.client_id
where e.is_delete = 1 and t.status = 5
<if test="params.userId != null">
and t.user_id = #{params.userId}
</if>
<if test="params.entrustCode != null and params.entrustCode != ''">
and e.entrust_code like concat('%', #{params.entrustCode}, '%')
</if>
<if test="params.projectName != null and params.projectName != ''">
and p.name like concat('%', #{params.projectName}, '%')
</if>
<if test="params.projectCode != null and params.projectCode != ''">
and p.code like concat('%', #{params.projectCode}, '%')
</if>
<if test="params.projectType != null and params.projectType != ''">
and e.project_type = #{params.projectType}
</if>
<if test="params.clientName != null and params.clientName != ''">
and c.name like concat('%', #{params.clientName}, '%')
</if>
<if test="params.status != null">
and e.status = #{params.status}
</if>
<if test="params.distributionStatus != null">
and t.status = #{params.distributionStatus}
</if>
<if test="params.isUrgent != null">
and e.is_urgent = #{params.isUrgent}
</if>
GROUP BY e.id
order by e.update_time desc
</select>
</mapper>
cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/SampleDistributionEquipmentMapper.xml
View file @ d8fc0bbe
......@@ -2,4 +2,11 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.wise.sc.cement.business.mapper.SampleDistributionEquipmentMapper">
<select id="getEqupmentList" resultType="cn.wise.sc.cement.business.model.vo.SampleDistributionEquipmentVo">
select t.*, e.code as code
from sample_distribution_equipment t
left join equipment e on e.id = t.equipment_id
where t.distribution_id = #{distributionId}
and t.user_id = #{userId}
</select>
</mapper>
cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/CheckTeamResultVo.java
View file @ d8fc0bbe
......@@ -44,7 +44,7 @@ public class CheckTeamResultVo {
private String number;
@ApiModelProperty("检测设备列表")
List<SampleDistributionEquipment> sampleDistributionEquipmentList;
List<SampleDistributionEquipmentVo> sampleDistributionEquipmentList;
@ApiModelProperty("检测结果")
private String distributionResult;
......
cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/SampleDistributionEquipmentVo.java 0 → 100644
View file @ d8fc0bbe
package cn.wise.sc.cement.business.model.vo;
import cn.wise.sc.cement.business.entity.SampleDistributionEquipment;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.time.LocalDateTime;
import java.util.List;
/**
* @description:
* @author: ztw
* @create: 2021-02-18 14:58
**/
@Data
@ApiModel("委托-检测设备列表Vo")
public class SampleDistributionEquipmentVo {
private Integer id;
/**
* 样品表d
*/
private Integer distributionId;
/**
* 检测组id
*/
private Integer equipmentId;
/**
* 检测设备名称
*/
private String equipmentName;
/**
* 处理人id
*/
private Integer userId;
/**
* 创建时间
*/
private LocalDateTime createTime;
/**
* 备注
*/
private String remark;
@ApiModelProperty("设备编号")
private String code;
}
cement-business/src/main/java/cn/wise/sc/cement/business/model/vo/SampleDistributionTeamVo.java
View file @ d8fc0bbe
package cn.wise.sc.cement.business.model.vo;
import cn.wise.sc.cement.business.entity.SampleDistributionEquipment;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* @description:
* @author: ztw
......@@ -34,5 +37,7 @@ public class SampleDistributionTeamVo {
@ApiModelProperty(" 状态值（0未接受，1接受，2待校核，3退回，4校核通过，5校核退回）")
private String statusValue;
@ApiModelProperty("检测设备列表")
List<SampleDistributionEquipmentVo> sampleDistributionEquipmentList;
}
cement-business/src/main/java/cn/wise/sc/cement/business/service/IEntrustService.java
View file @ d8fc0bbe
......@@ -98,6 +98,10 @@ public interface IEntrustService extends IService<Entrust> {
BaseResponse<String> checkCountNew(CheckCountNewQuery query);
BaseResponse<IPage<EntrustVo>> getSampleReturnCheckPage(PageQuery pageQuery, String entrustCode, Integer status,
String clientName, String projectName, String projectCode,
Integer isUrgent, Integer distributionStatus);
//附件的操作
BaseResponse<List<SampleHandleEnclosureVo>> getSampleHandleEnclosureList(Integer sampleHandleId);
......
cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/EntrustServiceImpl.java
View file @ d8fc0bbe
......@@ -65,20 +65,12 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
private EntrustApprovalMapper approvalMapper;
@Autowired
private ISysLogsService logsService;
@Autowired
private ISampleHandleService sampleHandleService;
@Resource
private SampleHandleMapper sampleHandleMapper;
@Autowired
private ISampleDistributionService distributionService;
@Resource
private SampleDistributionMapper distributionMapper;
@Autowired
private ISampleCheckService sampleCheckService;
@Autowired
private ISampleCheckTeamService sampleCheckTeamService;
@Autowired
private IEquipmentUseService equipmentUseService;
@Resource
private ProjectMapper projectMapper;
@Autowired
......@@ -91,8 +83,6 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
private MethodMapper methodMapper;
@Resource
private HandleMapper handleMapper;
@Autowired
private ISampleHandleEnclosureService sampleHandleEnclosureService;
@Resource
private SampleHandleEnclosureMapper sampleHandleEnclosureMapper;
@Resource
......@@ -443,9 +433,10 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
if (approvalIdList == null) {
return BaseResponse.errorMsg("委托评审信息错误");
}
if(!approvalIdList.contains(loginUser.getId()) || entrust.getUserId() != loginUser.getId()){
if(!approvalIdList.contains(loginUser.getId()) && entrust.getUserId() != loginUser.getId()){
return BaseResponse.errorMsg("没有修改权限");
}
BeanUtils.copyProperties(query, entrust);
//生成委托编号
// String entrustCode = commonService.createNo("WT", entrustMapper.counts());
......@@ -668,7 +659,6 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
BeanUtils.copyProperties(sample, sampleVo);
String teamIds = sample.getTeamIds();
String teamName = "";
// List<SampleDistributionTeamVo> sampleNoDistributionTeamVoList = new ArrayList<>();
//没有派发的列表
List<SampleTeamGroupVo> sampleTeamGroupVoList = new ArrayList<>();
if (teamIds != null) {
......@@ -676,7 +666,11 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
List<Integer> teamGroupIdList = new ArrayList<>();
for (String teamId : teamIdS) {
TeamVo teamVo = teamMapper.getDetail(Integer.valueOf(teamId));
if (teamVo != null && teamVo.getIsPf()!=0) {
//如果本所编号不相等 则为副样，副样需要判断检测项是否需要平行样，如果不需要不用进行派发检测
if(!sample.getCementCode().equals(sample.getParallelCode()) && teamVo.getIsParallel() == 0){
continue;
}
if (teamVo != null && teamVo.getIsPf()!=0 ) {
if(!teamGroupIdList.contains(teamVo.getGroupId())){
teamGroupIdList.add(teamVo.getGroupId());
SampleTeamGroupVo sampleTeamGroupVo = new SampleTeamGroupVo();
......@@ -709,6 +703,7 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
teamName = teamName.equals("") ? teamVo.getName() : (teamName + "、" + teamVo.getName());
}
}
}
sampleVo.setTeamName(teamName);
......@@ -819,13 +814,6 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
if (loginUser == null) {
return BaseResponse.errorMsg("请登录账号");
}
/*List<Integer> approvalIdList = sysApprovalMapper.getApprovalId("委托评审");
if (approvalIdList == null) {
return BaseResponse.errorMsg("委托评审信息错误");
}
if (!approvalIdList.contains(loginUser.getId())) {
return BaseResponse.errorMsg("权限不足");
}*/
if (id == null) {
return BaseResponse.errorMsg("参数错误");
}
......@@ -959,7 +947,6 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
QueryWrapper<SampleTmp> sampleTmpQueryWrapper = new QueryWrapper<>();
sampleTmpQueryWrapper.eq("entrust_id", entrustVo.getId());
List<SampleTmp> sampleList = sampleTmpService.list(sampleTmpQueryWrapper);
// List<Sample> sampleList = sampleMapper.getSampleList(entrustVo.getId());
List<SampleTmpVo> sampleVoList = new ArrayList<>();
if (sampleList != null && sampleList.size() > 0) {
for (SampleTmp sample : sampleList) {
......@@ -1010,8 +997,11 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
approvalWrapper.eq("entrust_id", entrustVo.getId());
approvalWrapper.orderByDesc("id");
List<EntrustApproval> approvalList = approvalMapper.selectList(approvalWrapper);
if(approvalList!= null && approvalList.size()>0){
EntrustApproval approval = approvalList.get(0);
entrustVo.setOpinion(approval.getOpinion());
}
return BaseResponse.okData(entrustVo);
}
......@@ -1029,43 +1019,20 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
if (loginUser == null) {
return BaseResponse.errorMsg("请登录账号");
}
/*List<Integer> approvalIdList = sysApprovalMapper.getApprovalId("委托评审");
if (approvalIdList == null) {
return BaseResponse.errorMsg("委托评审信息错误");
}
if (!approvalIdList.contains(loginUser.getId())) {
return BaseResponse.errorMsg("权限不足");
}*/
if (id == null) {
return BaseResponse.errorMsg("参数错误");
}
Map<String, Object> params = new HashMap<>();
params.put("id", id);
List<SampleHandleVo> sampleHandleList = sampleHandleMapper.getSampleHandleList(params);
if (sampleHandleList != null && sampleHandleList.size() > 0) {
for (SampleHandleVo shVo : sampleHandleList) {
Handle handle = handleMapper.selectById(shVo.getHandleId());
if (handle == null) {
return BaseResponse.errorMsg("选择的处理项信息有误");
}
String contentName = handle.getName();
/*String contentName = "";
if (shVo.getContent() != null) {
String[] handIdS = shVo.getContent().split("、");
List<SampleHandleEnclosure> sampleHandleEnclosureList = new ArrayList<>();
for (String handleId : handIdS) {
Handle handle = handleMapper.selectById(Integer.valueOf(handleId));
if (handle == null) {
return BaseResponse.errorMsg("选择的处理项信息有误");
}
contentName = contentName.equals("") ? handle.getName() : contentName + "、" + handle.getName();
}
}*/
shVo.setContentName(contentName);
}
}
......@@ -1085,13 +1052,6 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
if (loginUser == null) {
return BaseResponse.errorMsg("请登录账号");
}
/*List<Integer> approvalIdList = sysApprovalMapper.getApprovalId("委托评审");
if (approvalIdList == null) {
return BaseResponse.errorMsg("委托评审信息错误");
}
if (!approvalIdList.contains(loginUser.getId())) {
return BaseResponse.errorMsg("权限不足");
}*/
if (id == null) {
return BaseResponse.errorMsg("参数错误");
}
......@@ -1140,7 +1100,6 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
}
}
sampleVo.setSampleTeamGroupVoList(sampleTeamGroupVoListed);
// sampleVo.setSampleDistributionTeamVoList(sampleDistributionTeamVoList);
}
sampleVoList.add(sampleVo);
}
......@@ -1486,6 +1445,7 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
} else {
return BaseResponse.errorMsg("请选择正确按钮");
}
entrustMapper.updateById(entrust);
return BaseResponse.okMsg("修改信息已确认");
}
......@@ -2110,6 +2070,78 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
if (query.getSampleDistributionQueryList() != null && query.getSampleDistributionQueryList().size() > 0) {
List<SampleDistributionQuery> sampleDistributionQueryList = query.getSampleDistributionQueryList();
List<SampleDistribution> sampleDistributionList = new ArrayList<>();
//判断改委托单的所有样品检测项对应的处理项对应的处理人，然后按照检测项存入检测项表，以便校核的时候可以校核结果
//只显示主样，因为样品处理只显示主样
List<Sample> sampleHandleList = sampleMapper.getSampleList(entrust.getId());
if (sampleHandleList != null && sampleHandleList.size() > 0) {
for (Sample sample : sampleHandleList) {
String teamIds = sample.getTeamIds();
if (teamIds != null) {
String[] teamIdS = teamIds.split("、");
for (String teamId : teamIdS) {
TeamVo teamVo = teamMapper.getDetail(Integer.valueOf(teamId));
// List<Integer> userIdsList = new ArrayList<>();
if (teamVo != null && teamVo.getIsPf() == 0) {
String handleIds = teamVo.getHandleId();
if (handleIds != null) {
String[] handleIdS = handleIds.split("、");
for (String handleId : handleIdS) {
//样品id 处理人id 关联的处理项表信息进行展示
QueryWrapper<SampleHandle> handleWrapper = new QueryWrapper<>();
handleWrapper.eq("sample_id", sample.getId());
handleWrapper.eq("handle_id", handleId);
List<SampleHandle> handleList = sampleHandleMapper.selectList(handleWrapper);
if(handleList != null && handleList.size()>0){
for (SampleHandle sampleHandle : handleList) {
SampleDistribution sampleDistribution = new SampleDistribution();
sampleDistribution.setEntrustId(entrust.getId())
.setSampleId(sample.getId())
.setTeamGroupId(teamVo.getGroupId())
.setTeamId(teamVo.getId())
.setUserId(sampleHandle.getUserId())
.setCreateTime(sampleHandle.getCreateTime())
.setStatus(2) //直接进入待校核状态
.setAcceptTime(sampleHandle.getAcceptTime())
.setFinishTime(sampleHandle.getFinishTime());
sampleDistributionList.add(sampleDistribution);
//将样品处理的附件复制到样品检测的附件表中 如果校核附件有重复，可以去掉这个逻辑
Map<String, Object> params = new HashMap<>();
params.put("sampleHandleId", sampleHandle.getId());
List<SampleHandleEnclosureVo> list = sampleHandleEnclosureMapper.getList(params);
if(list != null && list.size()>0){
for(SampleHandleEnclosureVo shev : list){
SampleDistributionEnclosure sampleDistributionEnclosure = new SampleDistributionEnclosure();
sampleDistributionEnclosure.setSampleDistributionId(sampleDistribution.getId())
.setTeamId(sampleDistribution.getTeamId())
.setUserId(sampleDistribution.getUserId())
.setCreateTime(shev.getCreateTime())
.setStatus(shev.getStatus())
.setAlias(shev.getAlias())
.setEnclosureUrl(shev.getEnclosureUrl())
.setExtName(shev.getExtName())
.setUpdateTime(LocalDateTime.now())
.setPdfUrl(shev.getPdfUrl())
.setIsPublic(0); //默认不允许公开
if (StringUtils.isEmpty(shev.getEnclosureUrl())) {
sampleDistributionEnclosure.setStatus(2); //上传失败
}
sampleDistributionEnclosureMapper.insert(sampleDistributionEnclosure);
}
}
}
}
}
}
}
}
}
}
}
/*************上面是样品处理的 下面是样品检测的***************/
List<Sample> sampleList = new ArrayList<>();
for (SampleDistributionQuery distributionQuery : sampleDistributionQueryList) {
if (distributionQuery == null || distributionQuery.getSampleId() == null) {
......@@ -2267,7 +2299,7 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
}
/**
* 检测通知单详情
* 检测通知单详情（派发的和校核退回）
*
* @param id 委托表id
* @return
......@@ -2292,6 +2324,7 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
BeanUtils.copyProperties(sample, sampleVo);
List<SampleDistributionTeamVo> sampleDistributionTeamVoList =
distributionMapper.getDistributionTeamList(sample.getId(), loginUser.getId());
if (sampleDistributionTeamVoList != null && sampleDistributionTeamVoList.size() > 0) {
//已经派发过的列表
List<SampleTeamGroupVo> sampleTeamGroupVoListed = new ArrayList<>();
......@@ -2299,6 +2332,14 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
for(SampleDistributionTeamVo sampleDistributionTeamVo : sampleDistributionTeamVoList){
SampleDistribution sampleDistribution = distributionMapper.selectById(sampleDistributionTeamVo.getDistributionId());
TeamGroup teamGroup = teamGroupMapper.selectById(sampleDistribution.getTeamGroupId());
//检测项关联的检测设备信息
List<SampleDistributionEquipmentVo> sampleDistributionEquipmentList =
sampleDistributionEquipmentMapper.getEqupmentList(sampleDistributionTeamVo.getDistributionId(), loginUser.getId());
if(sampleDistributionEquipmentList != null && sampleDistributionEquipmentList.size()>0){
sampleDistributionTeamVo.setSampleDistributionEquipmentList(sampleDistributionEquipmentList);
}
if(!teamGroupIdList.contains(sampleDistribution.getTeamGroupId())){
teamGroupIdList.add(sampleDistribution.getTeamGroupId());
SampleTeamGroupVo sampleTeamGroupVo = new SampleTeamGroupVo();
......@@ -2972,6 +3013,7 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
checkSampleResultVo.setInputResult(inputResult);
checkSampleResultVo.setStatus(status);
List<SampleDistribution> list4 = (List<SampleDistribution>)entrySample.getValue();
if (list4 != null && list4.size() > 0) {
List<CheckTeamResultVo> checkTeamResultVoList = new ArrayList<>(); //===========
......@@ -2997,11 +3039,8 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
checkTeamResultVo.setDistributionResult(sampleDistribution.getDistributionResult());
//检测项关联的检测设备信息
QueryWrapper<SampleDistributionEquipment> sdeWrapper = new QueryWrapper<>();
sdeWrapper.eq("distribution_id", sampleDistribution.getId());
sdeWrapper.eq("user_id", userId);
List<SampleDistributionEquipment> sampleDistributionEquipmentList =
sampleDistributionEquipmentMapper.selectList(sdeWrapper);
List<SampleDistributionEquipmentVo> sampleDistributionEquipmentList =
sampleDistributionEquipmentMapper.getEqupmentList(sampleDistribution.getId(), userId);
if(sampleDistributionEquipmentList != null && sampleDistributionEquipmentList.size()>0){
checkTeamResultVo.setSampleDistributionEquipmentList(sampleDistributionEquipmentList);
}
......@@ -3011,6 +3050,8 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
List<Sample> otherSampleList = sampleMapper.getOtherSampleList(entrust.getId(), sample.getCementCode(),sample.getId());
if(otherSampleList != null && otherSampleList.size() > 0){
for(Sample s : otherSampleList){
QueryWrapper<SampleDistribution> ortherWrapper = new QueryWrapper<>();
ortherWrapper.eq("entrust_id", entrust.getId());
ortherWrapper.eq("sample_id", s.getId());
......@@ -3020,11 +3061,14 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
if(ortherDdistributionList.size() > 1 ){
return BaseResponse.errorMsg("检测派发表检测项信息重复");
}
if(ortherDdistributionList != null && ortherDdistributionList.size()>0){
SampleDistribution other = ortherDdistributionList.get(0);
if(StringUtils.isNotBlank(other.getDistributionResult())){
ortherResultList.add(other.getDistributionResult());
}
}
}
}
checkTeamResultVo.setOrtherUserResult(ortherResultList);
......@@ -3038,6 +3082,62 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
}
checkTeamResultVoList.add(checkTeamResultVo);
}
//********如果检测项不需要派发检测，并且关联当前检测人的 直接显示**********
/* List<Integer> teamIDs = new ArrayList<>(); //检测项
String teamIds = sample.getTeamIds();
if (teamIds != null) {
String[] teamIdS = teamIds.split("、");
for (String teamId : teamIdS) {
TeamVo teamVo = teamMapper.getDetail(Integer.valueOf(teamId));
//必须为同一个检测组下面的检测项，而且为不需要派发的检测项。
if (teamVo != null && teamVo.getIsPf()==0 && teamVo.getGroupId() == checkTeamGroupResultVo.getTeamGroupId()){
String handleIds = teamVo.getHandleId();
if (handleIds != null) {
String[] handleIdS = handleIds.split("、");
for (String handleId : handleIdS) {
//样品id 处理人id 关联的处理项表信息进行展示
QueryWrapper<SampleHandle> handleWrapper = new QueryWrapper<>();
handleWrapper.eq("sample_id", sample.getId());
handleWrapper.eq("user_id", userId);
handleWrapper.eq("handle_id", handleId);
List<SampleHandle> handleList = sampleHandleMapper.selectList(handleWrapper);
if(handleList != null && handleList.size()>0){
if(!teamIDs.contains(teamVo.getId())){
SampleHandle sampleHandle = handleList.get(0);
teamIDs.add(teamVo.getId());
CheckTeamResultVo checkTeamResultVo = new CheckTeamResultVo();
checkTeamResultVo.setDistributionId(sampleHandle.getId());
checkTeamResultVo.setTeamId(teamVo.getId());
Team team = teamMapper.selectById(teamVo.getId());
checkTeamResultVo.setTeamName(team.getName());
checkTeamResultVo.setStatus(sampleHandle.getStatus());
String statusValue = sampleHandle.getStatus()==0?"未接受"
:sampleHandle.getStatus()==1?"接受"
:sampleHandle.getStatus()==2?"待校核"
:sampleHandle.getStatus()==3?"退回"
:sampleHandle.getStatus()==4?"校核通过"
:sampleHandle.getStatus()==5?"校核退回"
:"";
checkTeamResultVo.setStatusValue(statusValue);
checkTeamResultVo.setMethodId(team.getMethodId());
checkTeamResultVo.setMethodName(team.getMethodName());
checkTeamResultVo.setNumber(team.getNumber());
checkTeamResultVoList.add(checkTeamResultVo);
}
}
}
}
}
}
}*/
//********如果检测项不需要派发检测，并且关联当前检测人的 直接显示**********
checkSampleResultVo.setCheckTeamResultVoList(checkTeamResultVoList);
}
checkSampleResultVoList.add(checkSampleResultVo);
......@@ -3220,7 +3320,7 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
}
String userIds = "";
SysUser createUser = userService.getById(entrust.getUserId());
if(createUser != null){
if(createUser != null && createUser.getWxId()!= null){
userIds = createUser.getWxId();
}
for(Integer approvalId : approvalIdList ){
......@@ -3243,7 +3343,6 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
}
}else if (query.getIsAgree() == 2){ //退回
//保存校核结果信息
List<CheckCountDistributionNewQuery> queryList = query.getCheckCountDistributionNewQueryList();
......@@ -3270,6 +3369,7 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
sampleDistributionCheckMapper.insert(disCheck);
dis.setCheckId(disCheck.getId());
}
distributionMapper.updateById(dis);
}
}
......@@ -3284,6 +3384,88 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
}
/**
* 数据校核退回任务分页
*
* @param pageQuery
* @param projectCode
* @return
*/
@Override
public BaseResponse<IPage<EntrustVo>> getSampleReturnCheckPage(PageQuery pageQuery, String entrustCode, Integer status,
String clientName, String projectName, String projectCode,
Integer isUrgent, Integer distributionStatus) {
LoginUser loginUser = userService.getLoginUser();
if (loginUser == null) {
return BaseResponse.errorMsg("请登录账号");
}
Map<String, Object> params = new HashMap<>();
params.put("entrustCode", entrustCode);
params.put("status", status);
params.put("clientName", clientName);
params.put("projectName", projectName);
params.put("projectCode", projectCode);
params.put("isUrgent", isUrgent);
params.put("userId", loginUser.getId());
params.put("distributionStatus", distributionStatus);
Page<EntrustVo> page = new Page<>(pageQuery.getPageNo(), pageQuery.getPageSize());
IPage<EntrustVo> pages = entrustMapper.getSampleReturnCheckPage(page, params);
List<EntrustVo> list = pages.getRecords();
if (list != null && list.size() > 0) {
for (EntrustVo entrustVo : list) {
List<Sample> sampleList = sampleMapper.getSampleList(entrustVo.getId());
//检测项目名称
String sampleNames = "";
if (sampleList != null && sampleList.size() > 0) {
//样品名称 列表中的拼接
for (Sample sample : sampleList) {
sampleNames = sampleNames.equals("") ? sample.getName() : (sampleNames + "、" + sample.getName());
}
//检测项 和检测依据 列表里只显示第一个样品的
Sample sample = sampleList.get(0);
String teamIds = sample.getTeamIds();
String checkTeam = "";
if (teamIds != null) {
String[] teamIdS = teamIds.split("、");
for (String teamId : teamIdS) {
Team team = teamMapper.selectById(Integer.valueOf(teamId));
if (team != null) {
checkTeam = checkTeam.equals("") ? team.getName() : (checkTeam + "、" + team.getName());
}
}
}
entrustVo.setCheckTeam(checkTeam);
entrustVo.setCheckMethodNumber(sample.getMethodNumbers());
}
//列表中的样品数量只展示关联到检测人的样品数量
List<Sample> sampleCheckList = sampleMapper.getSampleCheckList(entrustVo.getId());
List<SampleVo> sampleVoList = new ArrayList<>();
if (sampleCheckList != null && sampleCheckList.size() > 0) {
for (Sample sample : sampleCheckList) {
SampleVo sampleVo = new SampleVo();
BeanUtils.copyProperties(sample, sampleVo);
List<SampleDistributionTeamVo> sampleDistributionTeamVoList =
distributionMapper.getDistributionTeamList(sample.getId(), loginUser.getId());
if (sampleDistributionTeamVoList != null && sampleDistributionTeamVoList.size() > 0) {
sampleVoList.add(sampleVo);
}
}
}
if(sampleVoList != null ){
entrustVo.setSampleNum(sampleVoList.size());
}else{
entrustVo.setSampleNum(0);
}
entrustVo.setSampleNames(sampleNames);
}
}
pages.setRecords(list);
return BaseResponse.okData(pages);
}
/**
......@@ -3428,7 +3610,7 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
return BaseResponse.errorMsg("参数错误");
}
Map<String, Object> params = new HashMap<>();
params.put("sample_handle_id", sampleHandleId);
params.put("sampleHandleId", sampleHandleId);
List<SampleHandleEnclosureVo> list = sampleHandleEnclosureMapper.getList(params);
return BaseResponse.okData(list);
}
......@@ -3487,8 +3669,6 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
return BaseResponse.okData(sampleHandleEnclosure);
}
/**
* 样品检测上传附件
*
......
cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/TeamServiceImpl.java
View file @ d8fc0bbe
......@@ -239,9 +239,12 @@ public class TeamServiceImpl extends ServiceImpl<TeamMapper, Team> implements IT
QueryWrapper<Team> teamQueryWrapper = new QueryWrapper<>();
teamQueryWrapper.eq("group_id", query.getGroupId());
Integer numsForGroup = teamMapper.selectCount(teamQueryWrapper);
if(update.getSortNo() != null ){
if(update.getSortNo()>numsForGroup || update.getSortNo()<1){
return BaseResponse.errorMsg("编辑的本组序号有误或超过最大值");
}
}
//编辑时，下拉框展示，如果将1改为4，则原来的4 变为 邹继远 20210128
QueryWrapper<Team> teamQueryWrapperOld = new QueryWrapper<>();
teamQueryWrapperOld.eq("group_id", query.getGroupId());
......@@ -251,6 +254,8 @@ public class TeamServiceImpl extends ServiceImpl<TeamMapper, Team> implements IT
teamOld.setSortNo(update.getSortNo());
teamMapper.updateById(teamOld);
}
update.setSortNo(query.getSortNo());
}
update.setGroupId(query.getGroupId())
......@@ -376,8 +381,10 @@ public class TeamServiceImpl extends ServiceImpl<TeamMapper, Team> implements IT
queryWrapper.orderByAsc("sort_no");
List<Team> list = teamMapper.selectList(queryWrapper);
for(Team team: list){
if(team.getSortNo() != null){
listResult.add(team.getSortNo());
}
}
return BaseResponse.okData(listResult);
}
......
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