From 1094fedf0c4627282ccd408bc8a3d40d697176b3 Mon Sep 17 00:00:00 2001 From: jiangs <373297395@qq.com> Date: Fri, 28 Nov 2025 18:02:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E9=A1=B9=E7=9B=AE=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/dict/ReportItemController.java | 8 ++ .../liswork/mapper/dict/ReportItemMapper.java | 10 +- .../czlis/liswork/pojo/DTO/XmInfoNewDTO.java | 2 +- .../liswork/service/ReportItemService.java | 2 + .../service/impl/ReportItemServiceImpl.java | 119 +++++++++++++----- .../resources/mapper/ReportItemMapper.xml | 15 +-- 6 files changed, 110 insertions(+), 46 deletions(-) diff --git a/liswork/src/main/java/com/czlis/liswork/controller/dict/ReportItemController.java b/liswork/src/main/java/com/czlis/liswork/controller/dict/ReportItemController.java index 3695273..159fbe9 100644 --- a/liswork/src/main/java/com/czlis/liswork/controller/dict/ReportItemController.java +++ b/liswork/src/main/java/com/czlis/liswork/controller/dict/ReportItemController.java @@ -70,6 +70,7 @@ public class ReportItemController extends BaseController { @ApiOperation("修改检验项目") @PostMapping("/update") public Result update(@RequestBody XmInfoNewDTO xmInfoNewDTO){ + log.info("入参xmInfoNewDTO：{}",xmInfoNewDTO); return reportItemService.update(xmInfoNewDTO); } @@ -146,4 +147,11 @@ public class ReportItemController extends BaseController { public Result delXmAlarmdetailNew(XmAlarmdetailNew xmAlarmdetailNew){ return reportItemService.delXmAlarmdetailNew(xmAlarmdetailNew); } + + @Log(title = SysLogConstants.REPORTITEM_LOG,businessType = BusinessType.DELETE) + @ApiOperation("删除常用取值") + @GetMapping("/delXmValNew") + public Result delXmValNew(XmValNew xmValNew){ + return reportItemService.delXmValNew(xmValNew); + } } diff --git a/liswork/src/main/java/com/czlis/liswork/mapper/dict/ReportItemMapper.java b/liswork/src/main/java/com/czlis/liswork/mapper/dict/ReportItemMapper.java index fbf7d83..3429d01 100644 --- a/liswork/src/main/java/com/czlis/liswork/mapper/dict/ReportItemMapper.java +++ b/liswork/src/main/java/com/czlis/liswork/mapper/dict/ReportItemMapper.java @@ -16,8 +16,8 @@ public interface ReportItemMapper { void addXmInfoNew(XmInfoNew xmInfoNew); void addXmDoubleRow(XmDouble xmDoubleRow); void addXmInterRow(XmInter xmInterRow); - void addXmRefRow(XmRef xmRefRow); - void addXmValRow(XmVal xmValRow); + void addXmRefNewRow(XmRefNew xmRefRow); + void addXmValNewRow(XmValNew xmValRow); void addXmTextResultRow(XmTextResult xmTextResultRow); void deleteXmInfoNew(Integer xmid); @@ -25,15 +25,15 @@ public interface ReportItemMapper { void deleteXmInter(Integer xmid); void deleteXmTextResult(Integer xmid); void deleteXmRef(Integer xmid); - void deleteXmVal(Integer xmid); + void deleteXmValNew(XmValNew xmValNew); Long getXmInfoVsCount(Integer xmid); void updateXmInfoNew(XmInfoNew xmInfoNewRow); void updateXmDoubleRow(XmDouble xmDoubleRow); void updateXmInterRow(XmInter xmInterRow); - void updateXmRefRow(XmRef xmRefRow); - void updateXmValRow(XmVal xmValRow); + void updateXmRefNewRow(XmRefNew xmRefRow); + void updateXmValNewRow(XmValNew xmValRow); void updateXmTextResultRow(XmTextResult xmTextResultRow); void addXmInfoVs(XmInfoVs xmInfoVs); diff --git a/liswork/src/main/java/com/czlis/liswork/pojo/DTO/XmInfoNewDTO.java b/liswork/src/main/java/com/czlis/liswork/pojo/DTO/XmInfoNewDTO.java index 9e84911..6ce67af 100644 --- a/liswork/src/main/java/com/czlis/liswork/pojo/DTO/XmInfoNewDTO.java +++ b/liswork/src/main/java/com/czlis/liswork/pojo/DTO/XmInfoNewDTO.java @@ -11,7 +11,7 @@ import java.util.List; @AllArgsConstructor @NoArgsConstructor public class XmInfoNewDTO { - private List xmInfoNewRows; + private XmInfoNew xmInfoNew; private List xmDoubleRows; private List xmValRows; private List xmInterRows; diff --git a/liswork/src/main/java/com/czlis/liswork/service/ReportItemService.java b/liswork/src/main/java/com/czlis/liswork/service/ReportItemService.java index 0c71c4c..50848da 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/ReportItemService.java +++ b/liswork/src/main/java/com/czlis/liswork/service/ReportItemService.java @@ -41,4 +41,6 @@ public interface ReportItemService { Result addXmAlarmdetailNew(List xmAlarmdetailNew); Result delXmAlarmdetailNew(XmAlarmdetailNew xmAlarmdetailNew); + + Result delXmValNew(XmValNew xmValNew); } diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/ReportItemServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/ReportItemServiceImpl.java index 5954ddc..16f951e 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/impl/ReportItemServiceImpl.java +++ b/liswork/src/main/java/com/czlis/liswork/service/impl/ReportItemServiceImpl.java @@ -30,9 +30,9 @@ public class ReportItemServiceImpl implements ReportItemService { xmDouble.setYq(yq); xmDouble.setXmdh(xmdh); List xmDoubles = reportItemMapper.queryXmDouble(xmDouble); -// XmValNew xmValNew = new XmValNew(); -// xmValNew.setXmid(Integer.parseInt(xmid)); -// List xmValNews = reportItemMapper.queryXmValNew(xmValNew); + XmValNew xmValNew = new XmValNew(); + xmValNew.setXmid(Integer.parseInt(xmid)); + List xmValNews = reportItemMapper.queryXmValNew(xmValNew); // XmInter xmInter = new XmInter(); // xmInter.setXmid(Integer.parseInt(xmid)); // List xmInters = reportItemMapper.queryXmInter(xmInter); @@ -46,12 +46,13 @@ public class ReportItemServiceImpl implements ReportItemService { xmTextresultNew.setXmid(Integer.parseInt(xmid)); List xmTextresultNews = reportItemMapper.queryXmTextresultNew(xmTextresultNew); XmInfoNewDTO xmInfoNewDTO = new XmInfoNewDTO(); - xmInfoNewDTO.setXmInfoNewRows(xmInfoNews); + xmInfoNewDTO.setXmInfoNew(xmInfoNews.get(0)); xmInfoNewDTO.setXmDoubleRows(xmDoubles); // xmInfoNewDTO.setXmValNewRows(xmValNews); // xmInfoNewDTO.setXmInterRows(xmInters); xmInfoNewDTO.setXmRefNewRows(xmRefNews); xmInfoNewDTO.setXmInfoVsRows(xmInfoVss); + xmInfoNewDTO.setXmValNewRows(xmValNews); xmInfoNewDTO.setXmTextresultNewRows(xmTextresultNews); return xmInfoNewDTO; } @@ -59,16 +60,14 @@ public class ReportItemServiceImpl implements ReportItemService { @Transactional(rollbackFor = Exception.class) @Override public Result add(XmInfoNewDTO xmInfoNewDTO) { - List xmInfoNewRows = xmInfoNewDTO.getXmInfoNewRows(); - for (XmInfoNew xmInfoNewRow : xmInfoNewRows) { - if(xmInfoNewRow.getCkxx().compareTo(xmInfoNewRow.getCksx()) >= 1 ){ - return new Result("-1","新增失败，项目的参考下限："+xmInfoNewRow.getCkxx()+"不能大于参考上限："+xmInfoNewRow.getCksx()); - } - if(xmInfoNewRow.getXjx().compareTo(xmInfoNewRow.getSjx()) >= 1){ - return new Result("-1","审核条件逻辑错误，项目下极限限不可大于项目上极限！"); - } - reportItemMapper.addXmInfoNew(xmInfoNewRow); + XmInfoNew xmInfoNew = xmInfoNewDTO.getXmInfoNew(); + if(xmInfoNew.getCkxx().compareTo(xmInfoNew.getCksx()) >= 1 ){ + return new Result("-1","新增失败，项目的参考下限："+xmInfoNew.getCkxx()+"不能大于参考上限："+xmInfoNew.getCksx()); } + if(xmInfoNew.getXjx().compareTo(xmInfoNew.getSjx()) >= 1){ + return new Result("-1","审核条件逻辑错误，项目下极限限不可大于项目上极限！"); + } + reportItemMapper.addXmInfoNew(xmInfoNew); List xmDoubleRows = xmInfoNewDTO.getXmDoubleRows(); for (XmDouble xmDoubleRow : xmDoubleRows) { @@ -81,14 +80,14 @@ public class ReportItemServiceImpl implements ReportItemService { reportItemMapper.addXmInterRow(xmInterRow); } - List xmRefRows = xmInfoNewDTO.getXmRefRows(); - for (XmRef xmRefRow : xmRefRows) { - reportItemMapper.addXmRefRow(xmRefRow); + List xmRefNewRows = xmInfoNewDTO.getXmRefNewRows(); + for (XmRefNew xmRefRow : xmRefNewRows) { + reportItemMapper.addXmRefNewRow(xmRefRow); } - List xmValRows = xmInfoNewDTO.getXmValRows(); - for (XmVal xmValRow : xmValRows) { - reportItemMapper.addXmValRow(xmValRow); + List xmValNewRows = xmInfoNewDTO.getXmValNewRows(); + for (XmValNew xmValRow : xmValNewRows) { + reportItemMapper.addXmValNewRow(xmValRow); } List xmTextResultRows = xmInfoNewDTO.getXmTextResultRows(); @@ -114,7 +113,9 @@ public class ReportItemServiceImpl implements ReportItemService { reportItemMapper.deleteXmInter(xmid); reportItemMapper.deleteXmTextResult(xmid); reportItemMapper.deleteXmRef(xmid); - reportItemMapper.deleteXmVal(xmid); + XmValNew xmValNew = new XmValNew(); + xmValNew.setXmid(xmid); + reportItemMapper.deleteXmValNew(xmValNew); } return new Result("0","删除成功！"); @@ -123,31 +124,77 @@ public class ReportItemServiceImpl implements ReportItemService { @Transactional(rollbackFor = Exception.class) @Override public Result update(XmInfoNewDTO xmInfoNewDTO) { - List xmInfoNewRows = xmInfoNewDTO.getXmInfoNewRows(); - for (XmInfoNew xmInfoNewRow : xmInfoNewRows) { - reportItemMapper.updateXmInfoNew(xmInfoNewRow); + XmInfoNew xmInfoNew = xmInfoNewDTO.getXmInfoNew(); + XmInfoNew xmInfoNew1 = new XmInfoNew(); + xmInfoNew1.setXmid(xmInfoNew.getXmid()); + List xmInfoNews = reportItemMapper.query(xmInfoNew1); + if(xmInfoNews != null){ + reportItemMapper.updateXmInfoNew(xmInfoNew); + }else{ + reportItemMapper.addXmInfoNew(xmInfoNew); } List xmDoubleRows = xmInfoNewDTO.getXmDoubleRows(); - for (XmDouble xmDoubleRow : xmDoubleRows) { - reportItemMapper.updateXmDoubleRow(xmDoubleRow); + if(xmDoubleRows != null){ + for (XmDouble xmDoubleRow : xmDoubleRows) { + XmDouble newXmDouble = new XmDouble(); + newXmDouble.setXmid(xmDoubleRow.getXmid()); + List xmDoubles = reportItemMapper.queryXmDouble(newXmDouble); + if(xmDoubles.size() > 0){ + reportItemMapper.updateXmDoubleRow(xmDoubleRow); + }else{ + reportItemMapper.addXmDoubleRow(xmDoubleRow); + } + } } + List xmInterRows = xmInfoNewDTO.getXmInterRows(); - for (XmInter xmInterRow : xmInterRows) { - reportItemMapper.updateXmInterRow(xmInterRow); + if(xmInterRows != null){ + for (XmInter xmInterRow : xmInterRows) { + XmInter newXmInter = new XmInter(); + newXmInter.setXmid(xmInterRow.getXmid()); + List xmInters = reportItemMapper.queryXmInter(newXmInter); + if(xmInters.size() > 0){ + reportItemMapper.updateXmInterRow(xmInterRow); + }else{ + reportItemMapper.addXmInterRow(xmInterRow); + } + } } - List xmRefRows = xmInfoNewDTO.getXmRefRows(); - for (XmRef xmRefRow : xmRefRows) { - reportItemMapper.updateXmRefRow(xmRefRow); + + List xmRefNewRows = xmInfoNewDTO.getXmRefNewRows(); + if(xmRefNewRows != null){ + for (XmRefNew xmRefNewRow : xmRefNewRows) { + XmRefNew newXmRef = new XmRefNew(); + newXmRef.setXmid(xmRefNewRow.getXmid()); + List xmRefNews = reportItemMapper.queryXmRefNew(newXmRef); + if(xmRefNews.size() > 0){ + reportItemMapper.updateXmRefNewRow(xmRefNewRow); + }else{ + reportItemMapper.addXmRefNewRow(xmRefNewRow); + } + } } - List xmValRows = xmInfoNewDTO.getXmValRows(); - for (XmVal xmValRow : xmValRows) { - reportItemMapper.updateXmValRow(xmValRow); + + List xmValNewRows = xmInfoNewDTO.getXmValNewRows(); + if(xmValNewRows != null){ + for (XmValNew xmValRow : xmValNewRows) { + XmValNew newXmVal = new XmValNew(); + newXmVal.setXmid(xmValRow.getXmid()); + newXmVal.setXh(xmValRow.getXh()); + List xmValNews = reportItemMapper.queryXmValNew(newXmVal); + if(xmValNews.size() > 0){ + reportItemMapper.updateXmValNewRow(xmValRow); + }else{ + reportItemMapper.addXmValNewRow(xmValRow); + } + } } + List xmTextResultRows = xmInfoNewDTO.getXmTextResultRows(); for (XmTextResult xmTextResultRow : xmTextResultRows) { reportItemMapper.updateXmTextResultRow(xmTextResultRow); @@ -245,5 +292,11 @@ public class ReportItemServiceImpl implements ReportItemService { return new Result("0","删除数据成功！"); } + @Override + public Result delXmValNew(XmValNew xmValNew) { + reportItemMapper.deleteXmValNew(xmValNew); + return new Result("0","删除成功！"); + } + } diff --git a/liswork/src/main/resources/mapper/ReportItemMapper.xml b/liswork/src/main/resources/mapper/ReportItemMapper.xml index f603551..b4e2c2e 100644 --- a/liswork/src/main/resources/mapper/ReportItemMapper.xml +++ b/liswork/src/main/resources/mapper/ReportItemMapper.xml @@ -30,6 +30,7 @@ select * from xm_val_new and xmid = #{xmid} + and xh = #{xh} and xmdh = #{xmdh} and qz = #{qz} @@ -248,7 +249,7 @@ - + insert into xm_ref_new ( xb, nl1, @@ -288,7 +289,7 @@ ) - + insert into xm_val_new( srm, xh, @@ -343,8 +344,9 @@ delete from xm_ref_new where xmid = #{xmid} - + delete from xm_val_new where xmid = #{xmid} + and xh = #{xh}