From 11193a3c93ecd37540350ebe2d337e8b46f84b3d Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Tue, 25 Apr 2023 17:52:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20=E5=9B=BD=E5=86=85?= =?UTF-8?q?=E5=A4=96=E5=85=A5=E5=BA=93=E3=80=81=E6=96=B0=E5=A2=9E=E3=80=81?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=B6=E5=AF=B9=E4=BB=A3=E6=9B=BF=E6=A0=87?= =?UTF-8?q?=E5=87=86=E5=8F=B7=E6=89=80=E5=AF=B9=E5=BA=94=E8=80=81=E6=A0=87?= =?UTF-8?q?=E5=87=86=E7=9A=84=E6=96=87=E6=9C=AC=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/ActSarItemsEOService.java | 20 ++++++++++++ .../dao/SarStandardsInfoDao.java | 5 +++ .../impl/SarStandardsInfoServiceImpl.java | 17 ++++++++++ .../SarStandardsInfoMapper.xml | 31 +++++++++++++++++++ 4 files changed, 73 insertions(+) diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java index 1f250cad..32f4d761 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java @@ -20,6 +20,7 @@ import com.adc.da.slrs.sarStandAttrInfo.service.ISarStandAttrInfoService; import com.adc.da.slrs.sarStandItems.dao.SarStandItemsDao; import com.adc.da.slrs.sarStandItems.entity.SarStandItems; import com.adc.da.slrs.sarStandVal.entity.SarStandVal; +import com.adc.da.slrs.sarStandardsInfo.dao.SarStandardsInfoDao; import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo; import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfoEOPage; import com.adc.da.slrs.sarStandardsInfo.service.ISarStandardsInfoService; @@ -88,6 +89,9 @@ public class ActSarItemsEOService { @Autowired private SarStandItemValDao sarStandItemValEODao; + @Autowired + private SarStandardsInfoDao sarStandardsInfoDao; + @Value("${elas.flag}") private boolean elasflag; @@ -192,6 +196,22 @@ public class ActSarItemsEOService { // attInfoMap = saveFileMsg(attInfoMap,sarStandardsInfoEO.getFileIds(),sarStandardsInfoEO.getTextStatus()); String resData = JSON.toJSONString(attInfoMap, SerializerFeature.WriteMapNullValue); sarStandardsInfoEO.setSarStandAttrEOStr(resData); + if (org.apache.commons.lang3.StringUtils.isNotBlank(sarStandardsInfoEO.getReplaceStandNum())){ + sarStandardsInfoDao.updateById(sarStandardsInfoEO); + String id = sarStandardsInfoEO.getStandName(); + SarStandardsInfo sarStandardsInfo = sarStandardsInfoDao.selectBy(id); + if (sarStandardsInfo != null){ + String textStatus = "chblaarg77"; + sarStandardsInfo.setTextStatus(textStatus); + sarStandardsInfoDao.updateById(sarStandardsInfo); + } + SarStandardsInfo sarStandardsInfo1 = sarStandardsInfoDao.selectBy1(id); + if (sarStandardsInfo1 != null){ + String textStatus = "chblaarg77"; + sarStandardsInfo1.setTextStatus(textStatus); + sarStandardsInfoDao.updateById(sarStandardsInfo1); + } + } // 根据标准号判断数据是否已存在 //2021年4月9日 此处检查当前是否存在standId diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java index ec02df24..c2488196 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; +import org.apache.ibatis.annotations.Update; import org.springframework.stereotype.Repository; import javax.annotation.Resource; @@ -117,5 +118,9 @@ public interface SarStandardsInfoDao extends BaseMapper { List listQuery2(SarStandardsInfoEOPage page); List selectStandardsByStandnumber2(SarStandardsInfo sarStandardsInfoEO); + + SarStandardsInfo selectBy(String id); + + SarStandardsInfo selectBy1(String id); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java index d1fd828e..d7cdb6ec 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java @@ -88,6 +88,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import net.sf.json.JSONObject; import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.util.PDFTextStripper; @@ -1329,6 +1330,22 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl + + +