diff --git a/liswork/src/main/java/com/czlis/liswork/controller/qc/QcGraphController.java b/liswork/src/main/java/com/czlis/liswork/controller/qc/QcGraphController.java new file mode 100644 index 0000000..a4f6b71 --- /dev/null +++ b/liswork/src/main/java/com/czlis/liswork/controller/qc/QcGraphController.java @@ -0,0 +1,19 @@ +package com.czlis.liswork.controller.qc; + +import com.czlis.common.core.controller.BaseController; +import com.czlis.liswork.service.QcBatchnoService; +import com.czlis.liswork.service.QcGraphService; +import io.swagger.annotations.Api; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/qc") +@Slf4j +@Api(tags = "质控批号设置") +public class QcGraphController extends BaseController { + @Autowired + private QcGraphService qcGraphService; +} diff --git a/liswork/src/main/java/com/czlis/liswork/mapper/QcGraphMapper.java b/liswork/src/main/java/com/czlis/liswork/mapper/QcGraphMapper.java new file mode 100644 index 0000000..c253233 --- /dev/null +++ b/liswork/src/main/java/com/czlis/liswork/mapper/QcGraphMapper.java @@ -0,0 +1,18 @@ +package com.czlis.liswork.mapper; + +import com.czlis.common.core.domain.entity.lis.QcSample; +import com.czlis.liswork.pojo.DTO.QcGraphParamDTO; +import com.czlis.liswork.pojo.DTO.QcMonthstDTO; +import com.czlis.liswork.pojo.DTO.QcValDTO; +import org.apache.ibatis.annotations.Param; + +import java.util.Date; +import java.util.List; + +public interface QcGraphMapper { + List querysample(QcGraphParamDTO qcGraphParamDTO); + List queryhead(QcGraphParamDTO qcGraphParamDTO); + List queryhead1(QcGraphParamDTO qcGraphParamDTO); + List query(QcGraphParamDTO qcGraphParamDTO); + +} diff --git a/liswork/src/main/java/com/czlis/liswork/pojo/DTO/QcGraphParamDTO.java b/liswork/src/main/java/com/czlis/liswork/pojo/DTO/QcGraphParamDTO.java new file mode 100644 index 0000000..324a0c3 --- /dev/null +++ b/liswork/src/main/java/com/czlis/liswork/pojo/DTO/QcGraphParamDTO.java @@ -0,0 +1,25 @@ +package com.czlis.liswork.pojo.DTO; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; + +import java.util.Date; + +public class QcGraphParamDTO { + @ApiModelProperty(value = "*质控开始日期") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date zkrq1; + @ApiModelProperty(value = "*质控截止日期") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date zkrq2; + @ApiModelProperty(value = "*质控仪器") + private String yq; + @ApiModelProperty(value = "*质控品号") + private String zkph; + @ApiModelProperty(value = "*项目代号") + private String xmdh; + @ApiModelProperty(value = "*次数") + private Integer cs; + @ApiModelProperty(value = "质控品批号") + private String zkpph; +} diff --git a/liswork/src/main/java/com/czlis/liswork/pojo/DTO/QcValDTO.java b/liswork/src/main/java/com/czlis/liswork/pojo/DTO/QcValDTO.java new file mode 100644 index 0000000..30e58d2 --- /dev/null +++ b/liswork/src/main/java/com/czlis/liswork/pojo/DTO/QcValDTO.java @@ -0,0 +1,53 @@ +package com.czlis.liswork.pojo.DTO; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; + +import java.math.BigDecimal; +import java.util.Date; + +public class QcValDTO { + private Long qc_valid; + @ApiModelProperty(value = "仪器") + private String yq; + @ApiModelProperty(value = "质控日期") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date zkrq; + @ApiModelProperty(value = "项目代码") + private String xmdh; + @ApiModelProperty(value = "质控号") + private String zkph; + @ApiModelProperty(value = "批号") + private String zkpph; + private Integer cs; + private String instrybh; + private BigDecimal zkjg; + private String yhdh; + private String bz; + private String resultid; + private String outreason; + private String outtransman; + private Date inputdt; + private String nouse; + private Date modidt; + private String modiusr; + private String outflag; + private String outtxt; + private String bz1; + private String isconfirm; + private Date confirmdt; + private String confirmuser; + private String nodraw; + private String nocalc; + private String ifuse; + private BigDecimal usrdata; + private String sjcs; + private String sjph; + private String outresult; + private BigDecimal skjg; + private String zkjgS; + private String xmmc; + private BigDecimal cv; + private BigDecimal sd; + private BigDecimal zkbz; +} diff --git a/liswork/src/main/java/com/czlis/liswork/service/QcGraphService.java b/liswork/src/main/java/com/czlis/liswork/service/QcGraphService.java new file mode 100644 index 0000000..6a4cf70 --- /dev/null +++ b/liswork/src/main/java/com/czlis/liswork/service/QcGraphService.java @@ -0,0 +1,4 @@ +package com.czlis.liswork.service; + +public interface QcGraphService { +} diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/qc/QcGraphServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/qc/QcGraphServiceImpl.java new file mode 100644 index 0000000..598542e --- /dev/null +++ b/liswork/src/main/java/com/czlis/liswork/service/impl/qc/QcGraphServiceImpl.java @@ -0,0 +1,22 @@ +package com.czlis.liswork.service.impl.qc; + +import com.czlis.common.core.domain.Result; +import com.czlis.common.core.domain.entity.lis.QcSample; +import com.czlis.common.core.domain.entity.lis.QcVal; +import com.czlis.common.utils.SecurityUtils; +import com.czlis.liswork.mapper.QcSampleMapper; +import com.czlis.liswork.mapper.QcStatMapper; +import com.czlis.liswork.pojo.DTO.QcMonthstDTO; +import com.czlis.liswork.service.QcGraphService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Date; +import java.util.List; +import java.util.Optional; + +@Service +public class QcGraphServiceImpl implements QcGraphService { + +} diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/qc/QcStatServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/qc/QcStatServiceImpl.java index a540905..eff6799 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/impl/qc/QcStatServiceImpl.java +++ b/liswork/src/main/java/com/czlis/liswork/service/impl/qc/QcStatServiceImpl.java @@ -52,12 +52,14 @@ public class QcStatServiceImpl implements QcStatService { public Result queryMonthskzj(QcSample qcSample){ qcSample.setXmdh("_skxj_"); QcSample qcSample0 =qcSampleMapper.queryOne(qcSample); + if(qcSample0==null) return new Result("0","成功"); return new Result("0","成功",qcSample0.getBz1()); } @Override public Result queryMonthpj(QcSample qcSample){ qcSample.setXmdh("_pj_"); QcSample qcSample0 =qcSampleMapper.queryOne(qcSample); + if(qcSample0==null) return new Result("0","成功"); return new Result("0","成功",qcSample0.getBz1()); } @Transactional(rollbackFor = Exception.class) diff --git a/liswork/src/main/resources/mapper/QcGraphMapper.xml b/liswork/src/main/resources/mapper/QcGraphMapper.xml new file mode 100644 index 0000000..6d2b6e5 --- /dev/null +++ b/liswork/src/main/resources/mapper/QcGraphMapper.xml @@ -0,0 +1,92 @@ + + + + + + + + + + +