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 index 324a0c3..728bd9e 100644 --- a/liswork/src/main/java/com/czlis/liswork/pojo/DTO/QcGraphParamDTO.java +++ b/liswork/src/main/java/com/czlis/liswork/pojo/DTO/QcGraphParamDTO.java @@ -2,9 +2,14 @@ package com.czlis.liswork.pojo.DTO; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; import java.util.Date; - +@Data +@AllArgsConstructor +@NoArgsConstructor public class QcGraphParamDTO { @ApiModelProperty(value = "*质控开始日期") @JsonFormat(pattern = "yyyy-MM-dd") 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 index 93ff9bf..5254806 100644 --- 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 @@ -10,10 +10,7 @@ import com.czlis.liswork.service.QcGraphService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Optional; +import java.util.*; @Service public class QcGraphServiceImpl implements QcGraphService { @@ -26,7 +23,26 @@ public class QcGraphServiceImpl implements QcGraphService { } @Override public Result query(QcGraphParamDTO qcGraphParamDTO){ - List QcValDTOList=qcGraphMapper.query(qcGraphParamDTO); + Integer lb=qcGraphParamDTO.getCs(); + if(lb==null)return new Result("-1","次数类别不能为空!"); + List QcValDTOList; + switch (lb){ + case 0: + QcValDTOList=qcGraphMapper.query0(qcGraphParamDTO); + break; + case 8: + QcValDTOList=qcGraphMapper.query8(qcGraphParamDTO); + break; + case 9: + QcValDTOList=qcGraphMapper.query9(qcGraphParamDTO); + break; + default: + QcValDTOList=qcGraphMapper.query(qcGraphParamDTO); + + } + if(QcValDTOList.isEmpty()){ + return new Result("-1","没有数据!"); + } List QcSamplelist=qcGraphMapper.queryhead(qcGraphParamDTO); List QcSamplelist3=qcGraphMapper.queryhead3(qcGraphParamDTO); for(QcMonthstDTO qcMonthstDTO:QcSamplelist){