diff --git a/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/ComStatsParameter.java b/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/ComStatsParameter.java new file mode 100644 index 0000000..71902f8 --- /dev/null +++ b/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/ComStatsParameter.java @@ -0,0 +1,33 @@ +package com.czlis.common.core.domain.entity.lis; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class ComStatsParameter { + + private Long paramId; + private String statsCode; + private String paramType; + private String paramCode; + private String paramName; + private String paramOptiontype; + private String paramDefvalue; + private String paramSql; + private String paramHide; + private String precondition; + private Long paramSequence; + private Long paramSort; + private String status; + private String createBy; + private Date createTime; + private String updateBy; + private Date updateTime; + private String remark; + + +} diff --git a/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/ComStatsTemplate.java b/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/ComStatsTemplate.java new file mode 100644 index 0000000..9361133 --- /dev/null +++ b/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/ComStatsTemplate.java @@ -0,0 +1,29 @@ +package com.czlis.common.core.domain.entity.lis; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class ComStatsTemplate { + + private Long statsId; + private String statsType; + private String statsCode; + private String statsName; + private String statsTitle; + private String statsSql; + private String statsGraph; + private Long statsSort; + private String status; + private String createBy; + private Date createTime; + private String updateBy; + private Date updateTime; + private String remark; + +} 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 index ff7f025..c109798 100644 --- a/liswork/src/main/java/com/czlis/liswork/controller/qc/QcGraphController.java +++ b/liswork/src/main/java/com/czlis/liswork/controller/qc/QcGraphController.java @@ -29,4 +29,9 @@ public class QcGraphController extends BaseController { public Result query(QcGraphParamDTO qcGraphParamDTO) { return qcGraphService.query(qcGraphParamDTO); } + @ApiOperation("计算靶值") + @GetMapping("/calc") + public Result calc(QcGraphParamDTO qcGraphParamDTO) { + return qcGraphService.calc(qcGraphParamDTO); + } } diff --git a/liswork/src/main/java/com/czlis/liswork/controller/xtwh/ComStatsParameterController.java b/liswork/src/main/java/com/czlis/liswork/controller/xtwh/ComStatsParameterController.java new file mode 100644 index 0000000..fbf29e6 --- /dev/null +++ b/liswork/src/main/java/com/czlis/liswork/controller/xtwh/ComStatsParameterController.java @@ -0,0 +1,109 @@ +package com.czlis.liswork.controller.xtwh; + +import com.czlis.common.annotation.Log; +import com.czlis.common.core.controller.BaseController; +import com.czlis.common.core.domain.AjaxResult; +import com.czlis.common.core.domain.entity.lis.ComStatsParameter; +import com.czlis.common.core.page.TableDataInfo; +import com.czlis.common.enums.BusinessType; +import com.czlis.common.utils.poi.ExcelUtil; +import com.czlis.liswork.service.ComStatsParameterService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +@RestController +@RequestMapping("/statstemp/param") +@Api(tags = "统计模板") +@Slf4j +public class ComStatsParameterController extends BaseController { + @Autowired + private ComStatsParameterService comStatsParameterService; + /** + * 获取统计参数列表 + */ + @ApiOperation("获取统计参数列表") + @GetMapping("/list") + public TableDataInfo list(ComStatsParameter post) { + startPage(); + List list = comStatsParameterService.selectComStatsParameterList(post); + return getDataTable(list); + } + @ApiOperation("统计参数导出") + @Log(title = "统计参数导出", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, ComStatsParameter post) { + List list = comStatsParameterService.selectComStatsParameterList(post); + ExcelUtil util = new ExcelUtil<>(ComStatsParameter.class); + util.exportExcel(response, list, "统计参数数据"); + } + + /** + * 根据统计参数编号获取详细信息 + */ + @ApiOperation("获取参数详细信息") + @GetMapping(value = "/{StatsId}") + public AjaxResult getInfo(@PathVariable Long StatsId) { + return success(comStatsParameterService.selectComStatsParameterById(StatsId)); + } + + /** + * 新增统计参数 + */ + @ApiOperation("新增统计参数") + @Log(title = "统计参数管理", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@Validated @RequestBody ComStatsParameter post) { + log.info("post:{}",post); + + if (!comStatsParameterService.checkParamNameUnique(post)) { + return error("新增统计参数'" + post.getParamCode() + "'失败，统计参数名称已存在"); + } else if (!comStatsParameterService.checkParamCodeUnique(post)) { + return error("新增统计参数'" + post.getParamName()+ "'失败，统计参数编码已存在"); + } + post.setCreateBy(getUsername()); + return toAjax(comStatsParameterService.insertParam(post)); + } + + /** + * 修改统计参数 + */ + @ApiOperation("修改统计参数") + @Log(title = "统计参数管理", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@Validated @RequestBody ComStatsParameter post) { + if (!comStatsParameterService.checkParamNameUnique(post)) { + return error("修改统计参数'" + post.getParamCode() + "'失败，统计参数名称已存在"); + } else if (!comStatsParameterService.checkParamCodeUnique(post)) { + return error("修改统计参数'" + post.getParamCode() + "'失败，统计参数编码已存在"); + } + post.setUpdateBy(getUsername()); + return toAjax(comStatsParameterService.updateParam(post)); + } + + /** + * 删除统计参数 + */ + @ApiOperation("删除统计参数") + @Log(title = "统计参数管理", businessType = BusinessType.DELETE) + @DeleteMapping("/{StatsIds}") + public AjaxResult remove(@PathVariable Long[] StatsIds) { + return toAjax(comStatsParameterService.deleteParamByIds(StatsIds)); + } + + /** + * 获取统计参数选择框列表 + */ + @ApiOperation("获取统计参数选择框列表") + @GetMapping("/optionselect") + public AjaxResult optionselect() { + List posts = comStatsParameterService.selectComStatsParameterAll(); + return success(posts); + } +} diff --git a/liswork/src/main/java/com/czlis/liswork/controller/xtwh/ComStatsTemplateController.java b/liswork/src/main/java/com/czlis/liswork/controller/xtwh/ComStatsTemplateController.java new file mode 100644 index 0000000..681f766 --- /dev/null +++ b/liswork/src/main/java/com/czlis/liswork/controller/xtwh/ComStatsTemplateController.java @@ -0,0 +1,109 @@ +package com.czlis.liswork.controller.xtwh; + +import com.czlis.common.annotation.Log; +import com.czlis.common.core.controller.BaseController; +import com.czlis.common.core.domain.AjaxResult; +import com.czlis.common.core.domain.entity.lis.ComStatsTemplate; +import com.czlis.common.core.page.TableDataInfo; +import com.czlis.common.enums.BusinessType; +import com.czlis.common.utils.poi.ExcelUtil; +import com.czlis.liswork.service.ComStatsTemplateService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +@RestController +@RequestMapping("/statstemp") +@Api(tags = "统计模板") +@Slf4j +public class ComStatsTemplateController extends BaseController { + @Autowired + private ComStatsTemplateService comStatsTemplateService; + /** + * 获取统计模板列表 + */ + @ApiOperation("获取统计模板列表") + @GetMapping("/list") + public TableDataInfo list(ComStatsTemplate post) { + startPage(); + List list = comStatsTemplateService.selectComStatsTemplateList(post); + return getDataTable(list); + } + @ApiOperation("统计模板导出") + @Log(title = "统计模板导出", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, ComStatsTemplate post) { + List list = comStatsTemplateService.selectComStatsTemplateList(post); + ExcelUtil util = new ExcelUtil<>(ComStatsTemplate.class); + util.exportExcel(response, list, "统计模板数据"); + } + + /** + * 根据统计模板编号获取详细信息 + */ + @ApiOperation("获取详细信息") + @GetMapping(value = "/{StatsId}") + public AjaxResult getInfo(@PathVariable Long StatsId) { + return success(comStatsTemplateService.selectComStatsTemplateById(StatsId)); + } + + /** + * 新增统计模板 + */ + @ApiOperation("新增统计模板") + @Log(title = "统计模板管理", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@Validated @RequestBody ComStatsTemplate post) { + log.info("post:{}",post); + + if (!comStatsTemplateService.checkStatsNameUnique(post)) { + return error("新增统计模板'" + post.getStatsName() + "'失败，统计模板名称已存在"); + } else if (!comStatsTemplateService.checkStatsCodeUnique(post)) { + return error("新增统计模板'" + post.getStatsName() + "'失败，统计模板编码已存在"); + } + post.setCreateBy(getUsername()); + return toAjax(comStatsTemplateService.insertStats(post)); + } + + /** + * 修改统计模板 + */ + @ApiOperation("修改统计模板") + @Log(title = "统计模板管理", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@Validated @RequestBody ComStatsTemplate post) { + if (!comStatsTemplateService.checkStatsNameUnique(post)) { + return error("修改统计模板'" + post.getStatsName() + "'失败，统计模板名称已存在"); + } else if (!comStatsTemplateService.checkStatsCodeUnique(post)) { + return error("修改统计模板'" + post.getStatsName() + "'失败，统计模板编码已存在"); + } + post.setUpdateBy(getUsername()); + return toAjax(comStatsTemplateService.updateStats(post)); + } + + /** + * 删除统计模板 + */ + @ApiOperation("删除统计模板") + @Log(title = "统计模板管理", businessType = BusinessType.DELETE) + @DeleteMapping("/{StatsIds}") + public AjaxResult remove(@PathVariable Long[] StatsIds) { + return toAjax(comStatsTemplateService.deleteStatsByIds(StatsIds)); + } + + /** + * 获取统计模板选择框列表 + */ + @ApiOperation("获取统计模板选择框列表") + @GetMapping("/optionselect") + public AjaxResult optionselect() { + List posts = comStatsTemplateService.selectComStatsTemplateAll(); + return success(posts); + } +} diff --git a/liswork/src/main/java/com/czlis/liswork/mapper/QcGraphMapper.java b/liswork/src/main/java/com/czlis/liswork/mapper/QcGraphMapper.java index e1964cf..f4e0ca1 100644 --- a/liswork/src/main/java/com/czlis/liswork/mapper/QcGraphMapper.java +++ b/liswork/src/main/java/com/czlis/liswork/mapper/QcGraphMapper.java @@ -17,5 +17,6 @@ public interface QcGraphMapper { List query8(QcGraphParamDTO qcGraphParamDTO); List query9(QcGraphParamDTO qcGraphParamDTO); List query0(QcGraphParamDTO qcGraphParamDTO); + List calc(QcGraphParamDTO qcGraphParamDTO); } diff --git a/liswork/src/main/java/com/czlis/liswork/mapper/xtwh/ComStatsParameterMapper.java b/liswork/src/main/java/com/czlis/liswork/mapper/xtwh/ComStatsParameterMapper.java new file mode 100644 index 0000000..43057ec --- /dev/null +++ b/liswork/src/main/java/com/czlis/liswork/mapper/xtwh/ComStatsParameterMapper.java @@ -0,0 +1,86 @@ +package com.czlis.liswork.mapper.xtwh; + +import com.czlis.common.core.domain.entity.lis.ComStatsParameter; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface ComStatsParameterMapper { + Long getCountById(Long paramId); + List selectComStatsParameterByType(String paramType); + + /** + * 查询统计参数数据集合 + * + * @param Dict 统计参数信息 + * @return 统计参数数据集合 + */ + List selectComStatsParameterList(ComStatsParameter Dict); + + /** + * 查询所有统计参数 + * + * @return 统计参数列表 + */ + List selectComStatsParameterAll(); + + /** + * 通过统计参数ID查询统计参数信息 + * + * @param paramId 统计参数ID + * @return 角色对象信息 + */ + ComStatsParameter selectComStatsParameterById(Long paramId); + + + /** + * 删除统计参数信息 + * + * @param paramId 统计参数ID + * @return 结果 + */ + int delComStatsParameterById(Long paramId); + + /** + * 批量删除统计参数信息 + * + * @param paramIds 需要删除的统计参数ID + * @return 结果 + */ + int delComStatsParameterByIds(Long[] paramIds); + + /** + * 修改统计参数信息 + * + * @param Dict 统计参数信息 + * @return 结果 + */ + int updateComStatsParameter(ComStatsParameter Dict); + int updateComStatsParameterall(ComStatsParameter Dict); + /** + * 新增统计参数信息 + * + * @param Dict 统计参数信息 + * @return 结果 + */ + int insertComStatsParameter(ComStatsParameter Dict); + + /** + * 校验统计参数名称 + * + * @param paramName 统计参数名称 + * @param paramType 类别 + * @return 结果 + */ + ComStatsParameter checkDictNameUnique(@Param("paramName") String paramName, @Param("paramType") String paramType, @Param("statsCode") String statsCode); + + /** + * 校验统计参数编码 + * + * @param paramCode 统计参数编码 + * @return 结果 + */ + ComStatsParameter checkDictCodeUnique(@Param("paramCode") String paramCode,@Param("paramType") String paramType, @Param("statsCode") String statsCode); + + +} diff --git a/liswork/src/main/java/com/czlis/liswork/mapper/xtwh/ComStatsTemplateMapper.java b/liswork/src/main/java/com/czlis/liswork/mapper/xtwh/ComStatsTemplateMapper.java new file mode 100644 index 0000000..64d9812 --- /dev/null +++ b/liswork/src/main/java/com/czlis/liswork/mapper/xtwh/ComStatsTemplateMapper.java @@ -0,0 +1,86 @@ +package com.czlis.liswork.mapper.xtwh; + +import com.czlis.common.core.domain.entity.lis.ComStatsTemplate; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface ComStatsTemplateMapper { + Long getCountById(Long statsId); + List selectComStatsTemplateByType(String statsType); + + /** + * 查询统计模板数据集合 + * + * @param Dict 统计模板信息 + * @return 统计模板数据集合 + */ + List selectComStatsTemplateList(ComStatsTemplate Dict); + + /** + * 查询所有统计模板 + * + * @return 统计模板列表 + */ + List selectComStatsTemplateAll(); + + /** + * 通过统计模板ID查询统计模板信息 + * + * @param statsId 统计模板ID + * @return 角色对象信息 + */ + ComStatsTemplate selectComStatsTemplateById(Long statsId); + + + /** + * 删除统计模板信息 + * + * @param statsId 统计模板ID + * @return 结果 + */ + int delComStatsTemplateById(Long statsId); + + /** + * 批量删除统计模板信息 + * + * @param statsIds 需要删除的统计模板ID + * @return 结果 + */ + int delComStatsTemplateByIds(Long[] statsIds); + + /** + * 修改统计模板信息 + * + * @param Dict 统计模板信息 + * @return 结果 + */ + int updateComStatsTemplate(ComStatsTemplate Dict); + + /** + * 新增统计模板信息 + * + * @param Dict 统计模板信息 + * @return 结果 + */ + int insertComStatsTemplate(ComStatsTemplate Dict); + + /** + * 校验统计模板名称 + * + * @param statsName 统计模板名称 + * @param statsType 类别 + * @return 结果 + */ + ComStatsTemplate checkDictNameUnique(@Param("statsName") String statsName, @Param("statsType") String statsType); + + /** + * 校验统计模板编码 + * + * @param statsCode 统计模板编码 + * @return 结果 + */ + ComStatsTemplate checkDictCodeUnique(@Param("statsCode") String statsCode,@Param("statsType") String statsType); + + +} 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 728bd9e..92bb8d1 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 @@ -7,6 +7,8 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.util.Date; +import java.util.List; + @Data @AllArgsConstructor @NoArgsConstructor @@ -27,4 +29,6 @@ public class QcGraphParamDTO { private Integer cs; @ApiModelProperty(value = "质控品批号") private String zkpph; + + private List zkphList; } diff --git a/liswork/src/main/java/com/czlis/liswork/service/ComStatsParameterService.java b/liswork/src/main/java/com/czlis/liswork/service/ComStatsParameterService.java new file mode 100644 index 0000000..e2638e9 --- /dev/null +++ b/liswork/src/main/java/com/czlis/liswork/service/ComStatsParameterService.java @@ -0,0 +1,87 @@ +package com.czlis.liswork.service; + +import com.czlis.common.core.domain.entity.lis.ComStatsParameter; + +import java.util.List; + +public interface ComStatsParameterService { + /** + * 查询统计参数信息集合 + * + * @param Param 统计参数信息 + * @return 统计参数信息集合 + */ + List selectComStatsParameterList(ComStatsParameter Param); + + /** + * 查询所有统计参数 + * + * @return 统计参数列表 + */ + List selectComStatsParameterAll(); + + /** + * 通过统计参数ID查询统计参数信息 + * + * @param ParamId 统计参数ID + * @return 角色对象信息 + */ + ComStatsParameter selectComStatsParameterById(Long ParamId); + + + /** + * 校验统计参数名称是否唯一 + * + * @param Param 统计参数信息 + * @return 结果 + */ + boolean checkParamNameUnique(ComStatsParameter Param); + + /** + * 校验统计参数编码是否唯一 + * + * @param Param 统计参数信息 + * @return 结果 + */ + boolean checkParamCodeUnique(ComStatsParameter Param); + + /** + * 通过统计参数ID查询统计参数使用数量 + * + * @param ParamId 统计参数ID + * @return 结果 + */ + int countUserParamById(Long ParamId); + + /** + * 删除统计参数信息 + * + * @param ParamId 统计参数ID + * @return 结果 + */ + int deleteParamById(Long ParamId); + + /** + * 批量删除统计参数信息 + * + * @param ParamIds 需要删除的统计参数ID + * @return 结果 + */ + int deleteParamByIds(Long[] ParamIds); + + /** + * 新增保存统计参数信息 + * + * @param Param 统计参数信息 + * @return 结果 + */ + int insertParam(ComStatsParameter Param); + + /** + * 修改保存统计参数信息 + * + * @param Param 统计参数信息 + * @return 结果 + */ + int updateParam(ComStatsParameter Param); +} diff --git a/liswork/src/main/java/com/czlis/liswork/service/ComStatsTemplateService.java b/liswork/src/main/java/com/czlis/liswork/service/ComStatsTemplateService.java new file mode 100644 index 0000000..80079d3 --- /dev/null +++ b/liswork/src/main/java/com/czlis/liswork/service/ComStatsTemplateService.java @@ -0,0 +1,87 @@ +package com.czlis.liswork.service; + +import com.czlis.common.core.domain.entity.lis.ComStatsTemplate; + +import java.util.List; + +public interface ComStatsTemplateService { + /** + * 查询统计模板信息集合 + * + * @param Stats 统计模板信息 + * @return 统计模板信息集合 + */ + List selectComStatsTemplateList(ComStatsTemplate Stats); + + /** + * 查询所有统计模板 + * + * @return 统计模板列表 + */ + List selectComStatsTemplateAll(); + + /** + * 通过统计模板ID查询统计模板信息 + * + * @param StatsId 统计模板ID + * @return 角色对象信息 + */ + ComStatsTemplate selectComStatsTemplateById(Long StatsId); + + + /** + * 校验统计模板名称是否唯一 + * + * @param Stats 统计模板信息 + * @return 结果 + */ + boolean checkStatsNameUnique(ComStatsTemplate Stats); + + /** + * 校验统计模板编码是否唯一 + * + * @param Stats 统计模板信息 + * @return 结果 + */ + boolean checkStatsCodeUnique(ComStatsTemplate Stats); + + /** + * 通过统计模板ID查询统计模板使用数量 + * + * @param StatsId 统计模板ID + * @return 结果 + */ + int countUserStatsById(Long StatsId); + + /** + * 删除统计模板信息 + * + * @param StatsId 统计模板ID + * @return 结果 + */ + int deleteStatsById(Long StatsId); + + /** + * 批量删除统计模板信息 + * + * @param StatsIds 需要删除的统计模板ID + * @return 结果 + */ + int deleteStatsByIds(Long[] StatsIds); + + /** + * 新增保存统计模板信息 + * + * @param Stats 统计模板信息 + * @return 结果 + */ + int insertStats(ComStatsTemplate Stats); + + /** + * 修改保存统计模板信息 + * + * @param Stats 统计模板信息 + * @return 结果 + */ + int updateStats(ComStatsTemplate Stats); +} diff --git a/liswork/src/main/java/com/czlis/liswork/service/QcGraphService.java b/liswork/src/main/java/com/czlis/liswork/service/QcGraphService.java index d4b5222..b656d19 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/QcGraphService.java +++ b/liswork/src/main/java/com/czlis/liswork/service/QcGraphService.java @@ -6,5 +6,5 @@ import com.czlis.liswork.pojo.DTO.QcGraphParamDTO; public interface QcGraphService { Result querysample(QcGraphParamDTO qcGraphParamDTO); Result query(QcGraphParamDTO qcGraphParamDTO); - Result queryhead(QcGraphParamDTO qcGraphParamDTO); + Result calc(QcGraphParamDTO qcGraphParamDTO); } 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 5254806..f6e02da 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 @@ -25,6 +25,11 @@ public class QcGraphServiceImpl implements QcGraphService { public Result query(QcGraphParamDTO qcGraphParamDTO){ Integer lb=qcGraphParamDTO.getCs(); if(lb==null)return new Result("-1","次数类别不能为空!"); + String zkph=qcGraphParamDTO.getZkph(); + if(zkph!=null||"".equals(zkph)) { + List zkphList = Arrays.asList(zkph.split(",")); + qcGraphParamDTO.setZkphList(zkphList); + } List QcValDTOList; switch (lb){ case 0: @@ -61,18 +66,8 @@ public class QcGraphServiceImpl implements QcGraphService { } @Override - public Result queryhead(QcGraphParamDTO qcGraphParamDTO){ - List QcSamplelist=qcGraphMapper.queryhead(qcGraphParamDTO); - List QcSamplelist3=qcGraphMapper.queryhead3(qcGraphParamDTO); - for(QcMonthstDTO qcMonthstDTO:QcSamplelist){ - String xmdh=qcMonthstDTO.getXmdh(); - Optional monthst0=QcSamplelist3.stream().filter(ss->xmdh.equals(ss.getXmdh())).findAny(); - if(monthst0.isPresent()) { - qcMonthstDTO.setAvg3(monthst0.get().getAvg3()); - qcMonthstDTO.setCv3(monthst0.get().getCv3()); - qcMonthstDTO.setSd3(monthst0.get().getSd3()); - } - } + public Result calc(QcGraphParamDTO qcGraphParamDTO){ + List QcSamplelist=qcGraphMapper.calc(qcGraphParamDTO); return new Result("0","成功",QcSamplelist); } } diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/xtwh/ComStatsParameterServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/xtwh/ComStatsParameterServiceImpl.java new file mode 100644 index 0000000..8e93e2a --- /dev/null +++ b/liswork/src/main/java/com/czlis/liswork/service/impl/xtwh/ComStatsParameterServiceImpl.java @@ -0,0 +1,144 @@ +package com.czlis.liswork.service.impl.xtwh; + +import com.czlis.common.constant.UserConstants; +import com.czlis.common.core.domain.entity.lis.ComStatsParameter; +import com.czlis.common.exception.ServiceException; +import com.czlis.common.utils.StringUtils; +import com.czlis.liswork.mapper.xtwh.ComStatsParameterMapper; +import com.czlis.liswork.service.ComStatsParameterService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; +@Service +@Slf4j +public class ComStatsParameterServiceImpl implements ComStatsParameterService { + @Autowired + ComStatsParameterMapper comStatsParameterMapper; + /** + * 查询统计模板信息集合 + * + * @param Param 统计模板信息 + * @return 统计模板信息集合 + */ + @Override + public List selectComStatsParameterList(ComStatsParameter Param) { + return comStatsParameterMapper.selectComStatsParameterList(Param); + } + + /** + * 查询所有统计模板 + * + * @return 统计模板列表 + */ + @Override + public List selectComStatsParameterAll() { + return comStatsParameterMapper.selectComStatsParameterAll(); + } + + /** + * 通过统计模板ID查询统计模板信息 + * + * @param ParamId 统计模板ID + * @return 角色对象信息 + */ + @Override + public ComStatsParameter selectComStatsParameterById(Long ParamId) { + return comStatsParameterMapper.selectComStatsParameterById(ParamId); + } + + + /** + * 校验统计模板名称是否唯一 + * + * @param Param 统计模板信息 + * @return 结果 + */ + @Override + public boolean checkParamNameUnique(ComStatsParameter Param) { + Long ParamId = StringUtils.isNull(Param.getParamId()) ? -1L : Param.getParamId(); + ComStatsParameter info = comStatsParameterMapper.checkDictNameUnique(Param.getParamName(),Param.getParamType(),Param.getStatsCode()); + if (StringUtils.isNotNull(info) && info.getParamId().longValue() != ParamId.longValue()) { + return UserConstants.NOT_UNIQUE; + } + return UserConstants.UNIQUE; + } + + /** + * 校验统计模板编码是否唯一 + * + * @param Param 统计模板信息 + * @return 结果 + */ + @Override + public boolean checkParamCodeUnique(ComStatsParameter Param) { + Long ParamId = StringUtils.isNull(Param.getParamId()) ? -1L : Param.getParamId(); + ComStatsParameter info = comStatsParameterMapper.checkDictCodeUnique(Param.getParamCode(),Param.getParamType(),Param.getStatsCode()); + if (StringUtils.isNotNull(info) && info.getParamId().longValue() != ParamId.longValue()) { + return UserConstants.NOT_UNIQUE; + } + return UserConstants.UNIQUE; + } + + /** + * 通过统计模板ID查询统计模板使用数量 + * + * @param ParamId 统计模板ID + * @return 结果 + */ + @Override + public int countUserParamById(Long ParamId) { + return 0;//comStatsParameterMapper.countUserParamById(ParamId); + } + + /** + * 删除统计模板信息 + * + * @param ParamId 统计模板ID + * @return 结果 + */ + @Override + public int deleteParamById(Long ParamId) { + return comStatsParameterMapper.delComStatsParameterById(ParamId); + } + + /** + * 批量删除统计模板信息 + * + * @param ParamIds 需要删除的统计模板ID + * @return 结果 + */ + @Override + public int deleteParamByIds(Long[] ParamIds) { + for (Long ParamId : ParamIds) { + ComStatsParameter Param = selectComStatsParameterById(ParamId); + if (countUserParamById(ParamId) > 0) { + throw new ServiceException(String.format("%1$s已分配,不能删除", Param.getParamName())); + } + } + return comStatsParameterMapper.delComStatsParameterByIds(ParamIds); + } + + /** + * 新增保存统计模板信息 + * + * @param Param 统计模板信息 + * @return 结果 + */ + @Override + public int insertParam(ComStatsParameter Param) { + return comStatsParameterMapper.insertComStatsParameter(Param); + } + + /** + * 修改保存统计模板信息 + * + * @param Param 统计模板信息 + * @return 结果 + */ + @Override + public int updateParam(ComStatsParameter Param) { + return comStatsParameterMapper.updateComStatsParameterall(Param); + } +} diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/xtwh/ComStatsTemplateServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/xtwh/ComStatsTemplateServiceImpl.java new file mode 100644 index 0000000..f29ad36 --- /dev/null +++ b/liswork/src/main/java/com/czlis/liswork/service/impl/xtwh/ComStatsTemplateServiceImpl.java @@ -0,0 +1,156 @@ +package com.czlis.liswork.service.impl.xtwh; + +import com.czlis.common.constant.UserConstants; +import com.czlis.common.core.domain.entity.lis.ComStatsParameter; +import com.czlis.common.core.domain.entity.lis.ComStatsTemplate; +import com.czlis.common.exception.ServiceException; +import com.czlis.common.utils.StringUtils; +import com.czlis.liswork.mapper.xtwh.ComStatsParameterMapper; +import com.czlis.liswork.mapper.xtwh.ComStatsTemplateMapper; +import com.czlis.liswork.service.ComStatsTemplateService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +@Slf4j +public class ComStatsTemplateServiceImpl implements ComStatsTemplateService { + @Autowired + ComStatsParameterMapper comStatsParameterMapper; + @Autowired + ComStatsTemplateMapper comStatsTemplateMapper; + /** + * 查询统计模板信息集合 + * + * @param Stats 统计模板信息 + * @return 统计模板信息集合 + */ + @Override + public List selectComStatsTemplateList(ComStatsTemplate Stats) { + return comStatsTemplateMapper.selectComStatsTemplateList(Stats); + } + + /** + * 查询所有统计模板 + * + * @return 统计模板列表 + */ + @Override + public List selectComStatsTemplateAll() { + return comStatsTemplateMapper.selectComStatsTemplateAll(); + } + + /** + * 通过统计模板ID查询统计模板信息 + * + * @param StatsId 统计模板ID + * @return 角色对象信息 + */ + @Override + public ComStatsTemplate selectComStatsTemplateById(Long StatsId) { + return comStatsTemplateMapper.selectComStatsTemplateById(StatsId); + } + + + /** + * 校验统计模板名称是否唯一 + * + * @param Stats 统计模板信息 + * @return 结果 + */ + @Override + public boolean checkStatsNameUnique(ComStatsTemplate Stats) { + Long StatsId = StringUtils.isNull(Stats.getStatsId()) ? -1L : Stats.getStatsId(); + ComStatsTemplate info = comStatsTemplateMapper.checkDictNameUnique(Stats.getStatsName(),Stats.getStatsType()); + if (StringUtils.isNotNull(info) && info.getStatsId().longValue() != StatsId.longValue()) { + return UserConstants.NOT_UNIQUE; + } + return UserConstants.UNIQUE; + } + + /** + * 校验统计模板编码是否唯一 + * + * @param Stats 统计模板信息 + * @return 结果 + */ + @Override + public boolean checkStatsCodeUnique(ComStatsTemplate Stats) { + Long StatsId = StringUtils.isNull(Stats.getStatsId()) ? -1L : Stats.getStatsId(); + ComStatsTemplate info = comStatsTemplateMapper.checkDictCodeUnique(Stats.getStatsCode(),Stats.getStatsType()); + if (StringUtils.isNotNull(info) && info.getStatsId().longValue() != StatsId.longValue()) { + return UserConstants.NOT_UNIQUE; + } + return UserConstants.UNIQUE; + } + + /** + * 通过统计模板ID查询统计模板使用数量 + * + * @param StatsId 统计模板ID + * @return 结果 + */ + @Override + public int countUserStatsById(Long StatsId) { + ComStatsTemplate temp=comStatsTemplateMapper.selectComStatsTemplateById(StatsId); + if(temp==null)return 0; + String statsCode=temp.getStatsCode(); + ComStatsParameter param = new ComStatsParameter(); + temp.setStatsCode(statsCode); + List list=comStatsParameterMapper.selectComStatsParameterList(param); + if(list==null||list.size()==0)return 0; + return list.size(); + } + + /** + * 删除统计模板信息 + * + * @param StatsId 统计模板ID + * @return 结果 + */ + @Override + public int deleteStatsById(Long StatsId) { + return comStatsTemplateMapper.delComStatsTemplateById(StatsId); + } + + /** + * 批量删除统计模板信息 + * + * @param StatsIds 需要删除的统计模板ID + * @return 结果 + */ + @Override + public int deleteStatsByIds(Long[] StatsIds) { + for (Long StatsId : StatsIds) { + ComStatsTemplate Stats = selectComStatsTemplateById(StatsId); + if (countUserStatsById(StatsId) > 0) { + throw new ServiceException(String.format("%1$s已分配,不能删除", Stats.getStatsName())); + } + } + return comStatsTemplateMapper.delComStatsTemplateByIds(StatsIds); + } + + /** + * 新增保存统计模板信息 + * + * @param Stats 统计模板信息 + * @return 结果 + */ + @Override + public int insertStats(ComStatsTemplate Stats) { + return comStatsTemplateMapper.insertComStatsTemplate(Stats); + } + + /** + * 修改保存统计模板信息 + * + * @param Stats 统计模板信息 + * @return 结果 + */ + @Override + public int updateStats(ComStatsTemplate Stats) { + return comStatsTemplateMapper.updateComStatsTemplate(Stats); + } +} diff --git a/liswork/src/main/resources/mapper/ComStatsParameterMapper.xml b/liswork/src/main/resources/mapper/ComStatsParameterMapper.xml new file mode 100644 index 0000000..2c385d8 --- /dev/null +++ b/liswork/src/main/resources/mapper/ComStatsParameterMapper.xml @@ -0,0 +1,167 @@ + + + + + + + + + + + + + + + + + + + + + + + + + select param_id,param_type,param_code,param_name,param_optiontype,param_sql,param_hide,param_sort,stats_code,param_defvalue,param_sequence, + status,create_by,create_time,update_by,update_time,remark,precondition from Com_stats_parameter + + + + + + + + + + + + + + insert into Com_stats_parameter( + param_id, + stats_code, + param_type, + param_code, + param_name, + param_optiontype, + param_defvalue, + precondition, + param_sequence, + param_sql, + param_hide , + param_sort, + status, + remark, + create_by, + create_time + )values( + #{paramId}, + #{statsCode}, + #{paramType}, + #{paramCode}, + #{paramName}, + #{paramOptiontype}, + #{paramDefvalue}, + #{precondition}, + #{paramSequence}, + #{paramSql}, + #{paramHide}, + #{paramSort}, + #{status}, + #{remark}, + #{createBy}, + getdate() + ) + + + + delete from Com_stats_parameter where param_id = #{paramId} + + + + delete from Com_stats_parameter where param_id in + + #{paramId} + + + + + update Com_stats_parameter + set param_type = #{paramType}, stats_code= #{statsCode}, + param_code = #{paramCode},param_name = #{paramName}, + param_optiontype = #{paramOptiontype},param_defvalue= #{paramDefvalue}, + param_sequence= #{paramSequence},precondition=#{precondition}, + param_sql = #{paramSql},param_hide = #{paramHide}, + param_sort = #{paramSort},status = #{status}, + remark = #{remark},update_by = #{updateBy},update_time = getdate() + where param_id = #{paramId} + + + update Com_stats_parameter + + param_type = #{paramType}, + stats_code= #{statsCode}, + param_code = #{paramCode}, + param_name = #{paramName}, + param_optiontype = #{paramOptiontype}, + param_defvalue= #{paramDefvalue}, + param_sequence= #{paramSequence}, + param_sql = #{paramSql}, + param_hide = #{paramHide}, + param_sort = #{paramSort}, + status = #{status}, + remark = #{remark}, + update_by = #{updateBy}, + update_time = getdate() + + where param_id = #{paramId} + + + \ No newline at end of file diff --git a/liswork/src/main/resources/mapper/ComStatsTemplateMapper.xml b/liswork/src/main/resources/mapper/ComStatsTemplateMapper.xml new file mode 100644 index 0000000..41df3e2 --- /dev/null +++ b/liswork/src/main/resources/mapper/ComStatsTemplateMapper.xml @@ -0,0 +1,141 @@ + + + + + + + + + + + + + + + + + + + + + select stats_id,stats_type,stats_code,stats_name,stats_title,stats_sql,stats_graph,stats_sort, + status,create_by,create_time,update_by,update_time,remark from Com_stats_template + + + + + + + + + + + + + + insert into Com_stats_template( + stats_id, + stats_type, + stats_code, + stats_name, + stats_title, + stats_sql, + stats_graph , + stats_sort, + status, + remark, + create_by, + create_time + )values( + #{statsId}, + #{statsType}, + #{statsCode}, + #{statsName}, + #{statsTitle}, + #{statsSql}, + #{statsGraph}, + #{statsSort}, + #{status}, + #{remark}, + #{createBy}, + getdate() + ) + + + + delete from Com_stats_template where stats_id = #{statsId} + + + + delete from Com_stats_template where stats_id in + + #{statsId} + + + + + update Com_stats_template + + stats_type = #{statsType}, + stats_code = #{statsCode}, + stats_name = #{statsName}, + stats_title = #{statsTitle}, + stats_sql = #{statsSql}, + stats_graph = #{statsGraph}, + stats_sort = #{statsSort}, + status = #{status}, + remark = #{remark}, + update_by = #{updateBy}, + update_time = getdate() + + where stats_id = #{statsId} + + + + \ No newline at end of file diff --git a/liswork/src/main/resources/mapper/QcGraphMapper.xml b/liswork/src/main/resources/mapper/QcGraphMapper.xml index d305767..27f5476 100644 --- a/liswork/src/main/resources/mapper/QcGraphMapper.xml +++ b/liswork/src/main/resources/mapper/QcGraphMapper.xml @@ -27,9 +27,14 @@ and qc_val.yq = #{yq} and qc_val.xmdh = #{xmdh} - and qc_val.zkph = #{zkph} + + and qc_val.zkph IN + + #{item} + + and qc_sample.zkpph = #{zkpph} - and qc_val.zkrq>= #{zkrq1} + and qc_val.zkrq>= #{zkrq1} and #{zkrq1}>=qc_sample.ksrq and #{zkrq2}>= qc_val.zkrq and qc_val.cs = #{cs} @@ -46,9 +51,14 @@ and qc_val.yq = #{yq} and qc_val.xmdh = #{xmdh} - and qc_val.zkph = #{zkph} + + and qc_val.zkph IN + + #{item} + + and qc_sample.zkpph = #{zkpph} - and qc_val.zkrq>= #{zkrq1} + and qc_val.zkrq>= #{zkrq1} and #{zkrq1}>=qc_sample.ksrq and #{zkrq2}>= qc_val.zkrq and qc_val.cs =(select max(cs) from qc_val a where a.yq=qc_val.yq and a.xmdh=qc_val.xmdh and a.zkph=qc_val.zkph and a.zkrq=qc_val.zkrq) @@ -65,9 +75,14 @@ and qc_val.yq = #{yq} and qc_val.xmdh = #{xmdh} - and qc_val.zkph = #{zkph} + + and qc_val.zkph IN + + #{item} + + and qc_sample.zkpph = #{zkpph} - and qc_val.zkrq>= #{zkrq1} + and qc_val.zkrq>= #{zkrq1} and #{zkrq1}>=qc_sample.ksrq and #{zkrq2}>= qc_val.zkrq and abs(qc_sample.zkbz - qc_val.zkjg)=(select min(abs(qc_sample.zkbz - a.zkjg)) from qc_val a where a.yq=qc_val.yq and a.xmdh=qc_val.xmdh and a.zkph=qc_val.zkph and a.zkrq=qc_val.zkrq) @@ -87,9 +102,14 @@ and qc_val.yq = #{yq} and qc_val.xmdh = #{xmdh} - and qc_val.zkph = #{zkph} + + and qc_val.zkph IN + + #{item} + + and qc_sample.zkpph = #{zkpph} - and qc_val.zkrq>= #{zkrq1} + and qc_val.zkrq>= #{zkrq1} and #{zkrq1}>=qc_sample.ksrq and #{zkrq2}>= qc_val.zkrq and qc_val.cs =1 @@ -115,14 +135,32 @@ and qc_val.yq = #{yq} and qc_val.xmdh = #{xmdh} - and qc_val.zkph = #{zkph} - and qc_val.zkrq>= #{zkrq1} + + and qc_val.zkph IN + + #{item} + + + and qc_val.zkrq>= #{zkrq1} and #{zkrq1}>=qc_sample.ksrq and #{zkrq2}>= qc_val.zkrq group by qc_val.yq,qc_val.zkph,qc_val.xmdh,xm_info.xmmc,xm_info.dyxh,qc_sample.zkbz,qc_sample.sd,qc_sample.cv order by xm_info.dyxh,qc_val.zkph - +