From 65b02ae1e35ca3f6bc2bee2e93641599b234bf59 Mon Sep 17 00:00:00 2001 From: jiangs <373297395@qq.com> Date: Fri, 5 Dec 2025 18:01:54 +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 --- .../liswork/mapper/dict/ReportItemMapper.java | 10 ++-- .../service/impl/ReportItemServiceImpl.java | 47 ++++++++++++++----- .../resources/mapper/ReportItemMapper.xml | 22 ++++----- 3 files changed, 48 insertions(+), 31 deletions(-) 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 8fbf62a..93ad848 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 @@ -20,11 +20,11 @@ public interface ReportItemMapper { void addXmValNewRow(XmValNew xmValRow); void addXmTextResultRow(XmTextresultNew xmTextResultRow); - void deleteXmInfoNew(Integer xmid); - void deleteXmDouble(@Param("yq") String yq,@Param("xmdh") String xmdh); - void deleteXmInter(Integer xmid); - void deleteXmTextResult(Integer xmid); - void deleteXmRef(Integer xmid); + void deleteXmInfoNew(XmInfoNew xmInfoNew); + void deleteXmDouble(XmDouble xmDouble); + void deleteXmInter(XmInter xmInter); + void deleteXmTextResult(XmTextresultNew xmTextresultNew); + void deleteXmRef(XmRefNew xmRefNew); void deleteXmValNew(XmValNew xmValNew); Long getXmInfoVsCount(Integer xmid); 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 468ab13..985a517 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 @@ -39,6 +39,9 @@ public class ReportItemServiceImpl implements ReportItemService { XmRefNew xmRefNew = new XmRefNew(); xmRefNew.setXmid(Integer.parseInt(xmid)); List xmRefNews = reportItemMapper.queryXmRefNew(xmRefNew); + for (XmRefNew refNew : xmRefNews) { + refNew.setXb(refNew.getXb().trim()); + } XmInfoVs xmInfoVs = new XmInfoVs(); xmInfoVs.setXmid(Integer.parseInt(xmid)); List xmInfoVss = reportItemMapper.queryXmInfoVs(xmInfoVs); @@ -106,13 +109,17 @@ public class ReportItemServiceImpl implements ReportItemService { xmInfoNew1.setXmid(xmid); List xmInfoNewList = reportItemMapper.query(xmInfoNew1); for (XmInfoNew xmInfoNew : xmInfoNewList) { - String yq = xmInfoNew.getYq(); - String xmdh = xmInfoNew.getXmdh(); - reportItemMapper.deleteXmInfoNew(xmid); - reportItemMapper.deleteXmDouble(yq,xmdh); - reportItemMapper.deleteXmInter(xmid); - reportItemMapper.deleteXmTextResult(xmid); - reportItemMapper.deleteXmRef(xmid); + XmInfoNew xmInfoNew2 = new XmInfoNew(); + xmInfoNew2.setXmid(xmInfoNew.getXmid()); + reportItemMapper.deleteXmInfoNew(xmInfoNew2); + //reportItemMapper.deleteXmDouble(yq,xmdh); + //reportItemMapper.deleteXmInter(xmid); + XmTextresultNew xmTextresultNew = new XmTextresultNew(); + xmTextresultNew.setXmid(xmInfoNew.getXmid()); + reportItemMapper.deleteXmTextResult(xmTextresultNew); + XmRefNew xmRefNew = new XmRefNew(); + xmRefNew.setXmid(xmInfoNew.getXmid()); + reportItemMapper.deleteXmRef(xmRefNew); XmValNew xmValNew = new XmValNew(); xmValNew.setXmid(xmid); reportItemMapper.deleteXmValNew(xmValNew); @@ -125,18 +132,26 @@ public class ReportItemServiceImpl implements ReportItemService { @Override public Result update(XmInfoNewDTO xmInfoNewDTO) { XmInfoNew xmInfoNew = xmInfoNewDTO.getXmInfoNew(); - XmInfoNew xmInfoNew1 = new XmInfoNew(); - xmInfoNew1.setXmid(xmInfoNew.getXmid()); - List xmInfoNews = reportItemMapper.query(xmInfoNew1); - if(xmInfoNews != null){ - reportItemMapper.updateXmInfoNew(xmInfoNew); - }else{ + if(xmInfoNew.getXmid() == null || xmInfoNew.getXmid().equals("")){ reportItemMapper.addXmInfoNew(xmInfoNew); + Integer xmid = xmInfoNew.getXmid(); + xmInfoNewDTO.getXmInfoNew().setXmid(xmid); + }else{ + 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(); if(xmDoubleRows != null){ for (XmDouble xmDoubleRow : xmDoubleRows) { + if(xmDoubleRow.getXmid() == null || xmDoubleRow.getXmid().equals("")) xmDoubleRow.setXmid(xmInfoNew.getXmid()); XmDouble newXmDouble = new XmDouble(); newXmDouble.setXmid(xmDoubleRow.getXmid()); List xmDoubles = reportItemMapper.queryXmDouble(newXmDouble); @@ -152,6 +167,7 @@ public class ReportItemServiceImpl implements ReportItemService { List xmInterRows = xmInfoNewDTO.getXmInterRows(); if(xmInterRows != null){ for (XmInter xmInterRow : xmInterRows) { + if(xmInfoNew.getXmid() == null || xmInfoNew.getXmid().equals("")) xmInterRow.setXmid(xmInfoNew.getXmid()); XmInter newXmInter = new XmInter(); newXmInter.setXmid(xmInterRow.getXmid()); List xmInters = reportItemMapper.queryXmInter(newXmInter); @@ -167,6 +183,7 @@ public class ReportItemServiceImpl implements ReportItemService { List xmRefNewRows = xmInfoNewDTO.getXmRefNewRows(); if(xmRefNewRows != null){ for (XmRefNew xmRefNewRow : xmRefNewRows) { + if(xmRefNewRow.getXmid() == null || xmRefNewRow.getXmid().equals("")) xmRefNewRow.setXmid(xmInfoNew.getXmid()); XmRefNew newXmRef = new XmRefNew(); newXmRef.setXmid(xmRefNewRow.getXmid()); List xmRefNews = reportItemMapper.queryXmRefNew(newXmRef); @@ -182,6 +199,7 @@ public class ReportItemServiceImpl implements ReportItemService { List xmValNewRows = xmInfoNewDTO.getXmValNewRows(); if(xmValNewRows != null){ for (XmValNew xmValRow : xmValNewRows) { + if(xmValRow.getXmid() == null || xmValRow.getXmid().equals("")) xmValRow.setXmid(xmInfoNew.getXmid()); XmValNew newXmVal = new XmValNew(); newXmVal.setXmid(xmValRow.getXmid()); newXmVal.setXh(xmValRow.getXh()); @@ -197,6 +215,7 @@ public class ReportItemServiceImpl implements ReportItemService { List xmInfoVsRows = xmInfoNewDTO.getXmInfoVsRows(); if(xmInfoVsRows != null){ for (XmInfoVs xmInfoVs : xmInfoVsRows) { + if(xmInfoVs.getXmid() == null || xmInfoVs.getXmid().equals("")) xmInfoVs.setXmid(xmInfoNew.getXmid()); XmInfoVs newXmInfoVs = new XmInfoVs(); newXmInfoVs.setYq(xmInfoVs.getYq()); newXmInfoVs.setXmid(xmInfoVs.getXmid()); @@ -213,6 +232,7 @@ public class ReportItemServiceImpl implements ReportItemService { List xmTextresultNewRows = xmInfoNewDTO.getXmTextresultNewRows(); if(xmTextresultNewRows != null){ for (XmTextresultNew xmTextresultNewRow : xmTextresultNewRows) { + if(xmTextresultNewRow.getXmid() == null || xmTextresultNewRow.equals("")) xmTextresultNewRow.setXmid(xmInfoNew.getXmid()); XmTextresultNew newXmTextresult = new XmTextresultNew(); newXmTextresult.setXmid(xmTextresultNewRow.getXmid()); newXmTextresult.setXh(xmTextresultNewRow.getXh()); @@ -227,6 +247,7 @@ public class ReportItemServiceImpl implements ReportItemService { + return new Result("0","添加项目成功！"); } diff --git a/liswork/src/main/resources/mapper/ReportItemMapper.xml b/liswork/src/main/resources/mapper/ReportItemMapper.xml index 862a464..4987b57 100644 --- a/liswork/src/main/resources/mapper/ReportItemMapper.xml +++ b/liswork/src/main/resources/mapper/ReportItemMapper.xml @@ -71,16 +71,14 @@ - + insert into xm_info_new( yq, - xmdh, - xmmc, - zhbdh, - bgdh, + zhbdh, + bgdh, cksx, ckxx, - dyckz, + dyckz, dylx, dyxh, zjf, @@ -130,16 +128,14 @@ val3, val4, val5, - xmid + xmdh,xmmc )values ( #{yq}, - #{xmdh}, - #{xmmc}, - #{zhbdh}, - #{bgdh}, + #{zhbdh}, + #{bgdh}, #{cksx}, #{ckxx}, - #{dyckz}, + #{dyckz}, #{dylx}, #{dyxh}, #{zjf}, @@ -189,7 +185,7 @@ #{val3}, #{val4}, #{val5}, - #{xmid} + #{xmdh},#{xmmc} )