Commit a4dee111 authored by 竹天卫's avatar 竹天卫

1111

parent f5fd1953
...@@ -468,6 +468,63 @@ public class EntrustController { ...@@ -468,6 +468,63 @@ public class EntrustController {
return BaseResponse.errorMsg("失败!"); return BaseResponse.errorMsg("失败!");
} }
@ApiOperation(value = "样品检测退回")
@PostMapping("/returnDistribution")
public BaseResponse returnDistribution(@RequestBody ReturnDistributionQuery query) {
try {
return entrustService.returnDistribution(query);
} catch (Exception e) {
log.debug("样品检测退回{}", e);
}
return BaseResponse.errorMsg("失败!");
}
@ApiOperation(value = "样品检测退回任务分页")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "entrustCode", value = "委托单号", paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "userId", value = "接受人id", 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")
})
@GetMapping("/getSampleReturnDistributioPage")
public BaseResponse getSampleReturnDistributioPage(PageQuery pageQuery, String entrustCode, Integer userId,
String clientName, String projectName, String projectCode, Integer isUrgent) {
try {
return entrustService.getSampleReturnDistributioPage(pageQuery, entrustCode, userId, clientName, projectName, projectCode, isUrgent);
} catch (Exception e) {
log.debug("样品检测退回任务分页{}", e);
}
return BaseResponse.errorMsg("失败!");
}
@ApiOperation(value = "重新派发样品检测任务")
@PostMapping("/distributioAgain")
public BaseResponse distributioAgain(@RequestBody HandleAgainQuery query) {
try {
return entrustService.distributioAgain(query);
} catch (Exception e) {
log.debug("重新派发样品检测任务{}", e);
}
return BaseResponse.errorMsg("失败!");
}
@ApiOperation(value = "数据校核分页") @ApiOperation(value = "数据校核分页")
@ApiImplicitParams(value = { @ApiImplicitParams(value = {
...@@ -502,6 +559,17 @@ public class EntrustController { ...@@ -502,6 +559,17 @@ public class EntrustController {
} }
@ApiOperation(value = "校核计算 立马返回数据")
@PostMapping("/checkCountFast")
public BaseResponse checkCountFast(@RequestBody CheckCountFastQuery query) {
try {
return entrustService.checkCountFast(query);
} catch (Exception e) {
log.debug("校核计算 立马返回数据{}", e);
}
return BaseResponse.errorMsg("失败!");
}
@ApiOperation(value = "数据校核结果查看") @ApiOperation(value = "数据校核结果查看")
@GetMapping("/getCheckResult") @GetMapping("/getCheckResult")
public BaseResponse getCheckResult(Integer entrustId, Integer userId) { public BaseResponse getCheckResult(Integer entrustId, Integer userId) {
...@@ -513,6 +581,9 @@ public class EntrustController { ...@@ -513,6 +581,9 @@ public class EntrustController {
return BaseResponse.errorMsg("失败!"); return BaseResponse.errorMsg("失败!");
} }
@ApiOperation(value = "校核计算") @ApiOperation(value = "校核计算")
@PostMapping("/checkCount") @PostMapping("/checkCount")
public BaseResponse checkCount(@RequestBody CheckCountNewQuery query) { public BaseResponse checkCount(@RequestBody CheckCountNewQuery query) {
......
...@@ -64,7 +64,7 @@ public class SampleDistributionCheckinput implements Serializable { ...@@ -64,7 +64,7 @@ public class SampleDistributionCheckinput implements Serializable {
private String inputResult; private String inputResult;
/** /**
* 状态(1通过,0退回) * 状态((0未接受,1接受,2待校核,3退回,4校核通过,5校核退回)
*/ */
private Integer status; private Integer status;
......
...@@ -2,10 +2,7 @@ package cn.wise.sc.cement.business.mapper; ...@@ -2,10 +2,7 @@ package cn.wise.sc.cement.business.mapper;
import cn.wise.sc.cement.business.entity.EntrustSample; import cn.wise.sc.cement.business.entity.EntrustSample;
import cn.wise.sc.cement.business.entity.SampleDistribution; import cn.wise.sc.cement.business.entity.SampleDistribution;
import cn.wise.sc.cement.business.model.vo.SampleCheckGroupVo; import cn.wise.sc.cement.business.model.vo.*;
import cn.wise.sc.cement.business.model.vo.SampleDistributionTeamVo;
import cn.wise.sc.cement.business.model.vo.SampleDistributionVo;
import cn.wise.sc.cement.business.model.vo.SampleHandleVo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
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;
...@@ -31,8 +28,8 @@ public interface SampleDistributionMapper extends BaseMapper<SampleDistribution> ...@@ -31,8 +28,8 @@ public interface SampleDistributionMapper extends BaseMapper<SampleDistribution>
List<SampleDistributionTeamVo> getDistributionTeamList(@Param("sampleId") Integer sampleId, List<SampleDistributionTeamVo> getDistributionTeamList(@Param("sampleId") Integer sampleId,
@Param("userId") Integer userId); @Param("userId") Integer userId);
List<SampleDistributionTeamVo> getDistributionTeamGroupList(@Param("sampleId") Integer sampleId, List<SampleTeamGroupUserVo> getDistributionTeamGroupList(@Param("sampleId") Integer sampleId,
@Param("userId") Integer userId); @Param("userId") Integer userId);
List<SampleCheckGroupVo> getSampleCheckGroupList(@Param("sampleId") Integer sampleId); List<SampleCheckGroupVo> getSampleCheckGroupList(@Param("sampleId") Integer sampleId);
......
...@@ -306,7 +306,7 @@ ...@@ -306,7 +306,7 @@
<sql id="checkWhere"> <sql id="checkWhere">
<where> <where>
and e.is_delete = 1 and e.status >= 6 and e.is_delete = 1 and e.status >= 0
<if test="params.startDate != null and params.startDate != ''"> <if test="params.startDate != null and params.startDate != ''">
and DATE(e.entrust_date) &gt;= #{params.startDate} and DATE(e.entrust_date) &gt;= #{params.startDate}
</if> </if>
......
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
order by t.id asc order by t.id asc
</select> </select>
<select id="getDistributionTeamGroupList" resultType="cn.wise.sc.cement.business.model.vo.SampleDistributionTeamVo"> <select id="getDistributionTeamGroupList" resultType="cn.wise.sc.cement.business.model.vo.SampleTeamGroupUserVo">
select su.id as userId, select su.id as userId,
t.team_group_id as teamGroupId t.team_group_id as teamGroupId
from sample_distribution t from sample_distribution t
......
package cn.wise.sc.cement.business.model.query;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
import java.util.Map;
/**
* @description:
* @author: ztw
* @create: 2020-02-07
**/
@Data
@ApiModel("数据校核-快速计算接口")
public class CheckCountFastQuery {
@ApiModelProperty("检测组表id")
private Integer teamGroupId;
@ApiModelProperty("输入信息集合")
private Map<String, String> intputResult;
}
...@@ -2,6 +2,7 @@ package cn.wise.sc.cement.business.model.vo; ...@@ -2,6 +2,7 @@ package cn.wise.sc.cement.business.model.vo;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import io.swagger.models.auth.In;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal; import java.math.BigDecimal;
...@@ -91,6 +92,8 @@ public class CheckSampleResultVo { ...@@ -91,6 +92,8 @@ public class CheckSampleResultVo {
@ApiModelProperty("计算结果 json串") @ApiModelProperty("计算结果 json串")
private String countResult; private String countResult;
@ApiModelProperty("状态(0未接受,1接受,2待校核,3退回,4校核通过,5校核退回)")
private Integer status;
@ApiModelProperty("委托-校核结果-检测项列表") @ApiModelProperty("委托-校核结果-检测项列表")
...@@ -98,5 +101,4 @@ public class CheckSampleResultVo { ...@@ -98,5 +101,4 @@ public class CheckSampleResultVo {
} }
...@@ -27,6 +27,22 @@ public class CheckUserResultVo { ...@@ -27,6 +27,22 @@ public class CheckUserResultVo {
@ApiModelProperty("委托编号") @ApiModelProperty("委托编号")
private String entrustCode; private String entrustCode;
@ApiModelProperty("项目名称")
private String projectName;
@ApiModelProperty("项目编号")
private String projectCode;
@ApiModelProperty("项目类型(常规项目,科研项目,质量控制项目)")
private String projectType;
@ApiModelProperty("委托人姓名")
private String entrustUserName;
@ApiModelProperty("委托单位姓名")
private String clientName;
@ApiModelProperty("委托-校核结果-检测组列表") @ApiModelProperty("委托-校核结果-检测组列表")
private List<CheckTeamGroupResultVo> checkTeamGroupResultVoList; private List<CheckTeamGroupResultVo> checkTeamGroupResultVoList;
......
package cn.wise.sc.cement.business.model.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* @description:
* @author: ztw
* @create: 2021-02-07 14:58
**/
@Data
@ApiModel("委托-检测人-检测组关联Vo")
public class SampleTeamGroupUserVo {
@ApiModelProperty("检测人id")
private Integer userId;
@ApiModelProperty("检测组id")
private Integer teamGroupId;
}
...@@ -112,6 +112,8 @@ public interface IEntrustService extends IService<Entrust> { ...@@ -112,6 +112,8 @@ public interface IEntrustService extends IService<Entrust> {
BaseResponse<List<SampleCheckVo>> getCheckDetail(String cementCode); BaseResponse<List<SampleCheckVo>> getCheckDetail(String cementCode);
BaseResponse<Map<String, String>> checkCountFast(CheckCountFastQuery query);
BaseResponse<String> checkCountNew(CheckCountNewQuery query); BaseResponse<String> checkCountNew(CheckCountNewQuery query);
/*BaseResponse<String> check(CheckQuery query);*/ /*BaseResponse<String> check(CheckQuery query);*/
......
...@@ -216,7 +216,7 @@ ...@@ -216,7 +216,7 @@
LEFT JOIN sample s ON sd.sample_id = s.id LEFT JOIN sample s ON sd.sample_id = s.id
LEFT JOIN team t ON t.id = sd.team_id LEFT JOIN team t ON t.id = sd.team_id
WHERE (sd.finish_time between #{start} and #{end}) WHERE (sd.finish_time between #{start} and #{end})
<if test="origins != null"> <if test="origins != null and origins.size()>0">
AND s.origin in AND s.origin in
<foreach collection="origins" item="item" open="(" separator="," close=")"> <foreach collection="origins" item="item" open="(" separator="," close=")">
#{item} #{item}
......
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