From 7affd72b1dc05cd40ee5b940e964bd9e0d039b1e Mon Sep 17 00:00:00 2001 From: xuyang <748613696@qq.com> Date: Thu, 30 Jun 2022 20:09:02 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=B5=E8=83=BD=E9=87=8F=E7=89=A9=E6=8E=A5?= =?UTF-8?q?=E5=85=A5-=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/njcn/quality/pojo/po/EleDo.java | 10 +-- .../service/impl/ModelServiceImpl.java | 66 ++++++++++++++++++- 2 files changed, 67 insertions(+), 9 deletions(-) diff --git a/pqs-quality/quality-api/src/main/java/com/njcn/quality/pojo/po/EleDo.java b/pqs-quality/quality-api/src/main/java/com/njcn/quality/pojo/po/EleDo.java index 64108440e..fc7cc0233 100644 --- a/pqs-quality/quality-api/src/main/java/com/njcn/quality/pojo/po/EleDo.java +++ b/pqs-quality/quality-api/src/main/java/com/njcn/quality/pojo/po/EleDo.java @@ -24,16 +24,10 @@ public class EleDo { private Integer idx; - private Integer storeFlag; - private Integer curSts; + private Integer ctlSts; + private String classId; - private String statMethod; - - private String tranRule; - - private Integer tranFlag; - } diff --git a/pqs-quality/quality-boot/src/main/java/com/njcn/quality/service/impl/ModelServiceImpl.java b/pqs-quality/quality-boot/src/main/java/com/njcn/quality/service/impl/ModelServiceImpl.java index 5e0187a41..05bbdb997 100644 --- a/pqs-quality/quality-boot/src/main/java/com/njcn/quality/service/impl/ModelServiceImpl.java +++ b/pqs-quality/quality-boot/src/main/java/com/njcn/quality/service/impl/ModelServiceImpl.java @@ -682,7 +682,6 @@ public class ModelServiceImpl implements IModelService { dataArrayParam.setSort(list.get(i).getIdx()); switch (list.get(i).getType()) { case DataType.EPD: - case DataType.PQD: EleEpdPqd epd = eleEpdPqdService.findByName(item.getEpd().get(list.get(i).getIdx()).getName(),item.getEpd().get(list.get(i).getIdx()).getPhase()); dataArrayParam.setClassName("ele_epd_pqd"); dataArrayParam.setDataId(epd.getId()); @@ -747,6 +746,71 @@ public class ModelServiceImpl implements IModelService { } } break; + case DataType.PQD: + EleEpdPqd pqd = eleEpdPqdService.findByName(item.getPqd().get(list.get(i).getIdx()).getName(),item.getPqd().get(list.get(i).getIdx()).getPhase()); + dataArrayParam.setClassName("ele_epd_pqd"); + dataArrayParam.setDataId(pqd.getId()); + if (StringUtils.isBlank(pqd.getStatMethod())){ + if (!Objects.isNull(pqd.getHarmStart()) && !Objects.isNull(pqd.getHarmEnd())){ + for (int j=pqd.getHarmStart(); j<=pqd.getHarmEnd(); j++){ + BeanUtil.copyProperties(pqd,dataArrayParam); + dataArrayParam.setName(pqd.getName() + j); + dataArrayParam.setAnotherName(j + "次" + pqd.getAnotherName()); + dataGroupParam.setName(j + "次" + pqd.getAnotherName()); + dataArrayParam.setIdx(i); + dataArrayParam.setStatMethod("avg"); + DataArray dataArray = dataArrayService.addDataArray(dataArrayParam); + //入库->分组表 + dataGroupParam.setSort(i); + DataGroup dataGroup = dataGroupService.addDataGroup(dataGroupParam); + //入库->group和dataArray关系 + groupArrayService.groupArrayRelation(dataGroup.getId(),dataArray.getId()); + } + } else { + BeanUtil.copyProperties(pqd,dataArrayParam); + dataGroupParam.setName(pqd.getAnotherName()); + dataArrayParam.setIdx(i); + dataArrayParam.setStatMethod("avg"); + DataArray dataArray = dataArrayService.addDataArray(dataArrayParam); + //入库->分组表 + dataGroupParam.setSort(i); + DataGroup dataGroup = dataGroupService.addDataGroup(dataGroupParam); + //入库->group和dataArray关系 + groupArrayService.groupArrayRelation(dataGroup.getId(),dataArray.getId()); + } + } else { + String[] type = StringUtils.split(pqd.getStatMethod(), ","); + for (String s : type) { + if (!Objects.isNull(pqd.getHarmStart()) && !Objects.isNull(pqd.getHarmEnd())) { + for (int j = pqd.getHarmStart(); j <= pqd.getHarmEnd(); j++) { + BeanUtil.copyProperties(pqd, dataArrayParam); + dataArrayParam.setName(pqd.getName() + j); + dataArrayParam.setAnotherName(j + "次" + pqd.getAnotherName()); + dataGroupParam.setName(j + "次" + pqd.getAnotherName()); + dataArrayParam.setIdx(i); + dataArrayParam.setStatMethod(s); + DataArray dataArray = dataArrayService.addDataArray(dataArrayParam); + //入库->分组表 + dataGroupParam.setSort(i); + DataGroup dataGroup = dataGroupService.addDataGroup(dataGroupParam); + //入库->group和dataArray关系 + groupArrayService.groupArrayRelation(dataGroup.getId(), dataArray.getId()); + } + } else { + BeanUtil.copyProperties(pqd, dataArrayParam); + dataGroupParam.setName(pqd.getAnotherName()); + dataArrayParam.setIdx(i); + dataArrayParam.setStatMethod(s); + DataArray dataArray = dataArrayService.addDataArray(dataArrayParam); + //入库->分组表 + dataGroupParam.setSort(i); + DataGroup dataGroup = dataGroupService.addDataGroup(dataGroupParam); + //入库->group和dataArray关系 + groupArrayService.groupArrayRelation(dataGroup.getId(), dataArray.getId()); + } + } + } + break; case DataType.MD: EleMd md = eleMdService.findByName(item.getMd().get(list.get(i).getIdx()).getName(),item.getMd().get(list.get(i).getIdx()).getPhase()); if (StringUtils.isBlank(md.getStatMethod())){