From 98eaad724980e93fc5fc2bcd818d849638370c70 Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Wed, 10 May 2023 14:57:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BC=81=E4=B8=9A=20?= =?UTF-8?q?=E4=BB=A3=E6=9B=BF=E4=BC=81=E4=B8=9A=E7=BC=96=E5=8F=B7=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=20=E5=92=8C=20=E5=AF=BC=E5=85=A5=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E4=B8=AD=E4=BB=A3=E6=9B=BF=E4=BC=81=E6=A0=87=E7=BC=96=E5=8F=B7?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/ActSarItemsBussEOService.java | 11 +++++----- .../dao/SarBussionessStandDao.java | 2 ++ .../impl/SarBussionessStandServiceImpl.java | 22 ++++++++++++++++++- .../SarBussionessStandMapper.xml | 4 ++++ 4 files changed, 33 insertions(+), 6 deletions(-) diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java index 2e3d8450..18873758 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java @@ -21,6 +21,7 @@ import com.adc.da.slrs.esRevisePlan.service.IEsRevisePlanService; import com.adc.da.slrs.sarBussStandAttrInfo.dao.SarBussStandAttrInfoDao; import com.adc.da.slrs.sarBussStandAttrInfo.entity.SarBussStandAttrInfo; import com.adc.da.slrs.sarBussStandAttrInfo.service.ISarBussStandAttrInfoService; +import com.adc.da.slrs.sarBussionessStand.dao.SarBussionessStandDao; import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand; import com.adc.da.slrs.sarBussionessStand.service.ISarBussionessStandService; import com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandState; @@ -108,6 +109,9 @@ public class ActSarItemsBussEOService { @Autowired private EsRevisePlanLogDao esRevisePlanLogDao; + @Autowired + private SarBussionessStandDao sarBussionessStandEODao; + public void processCreateFsBuss(String standJson) throws Exception { Map standMap = new HashMap(); @@ -339,6 +343,7 @@ public class ActSarItemsBussEOService { String prcName = String.valueOf(standMap.get("prcName")); String prcCreateUser = String.valueOf(standMap.get("prcCreateUser")); String standType = String.valueOf(standMap.get("standType")); + String DTQBBHBUSS = String.valueOf(standMap.get("DTQBBHBUSS")); // String isJudge = String.valueOf(standMap.get("ifIn")); //是否经过技术评估 SarBussionessStand sarBussionessStand = new SarBussionessStand(); // if(standMap.containsKey("standId")) { @@ -407,11 +412,6 @@ public class ActSarItemsBussEOService { } } - //企标实施时间 -// if (StringUtils.isBlank(sarBussionessStand.getPutTime())){ -// logger.info("企标实施日期不能为空"); -// throw new AdcDaBaseException("企标实施日期不能为空"); -// } List lawsList = iSarBussionessStandService.selectStandardsByStandNumber(standCode); // if (StringUtils.isBlank(sarStandardsInfoEO.getMenuId()) && "INLAND".equals(sarStandardsInfoEO.getStandType())) { @@ -486,6 +486,7 @@ public class ActSarItemsBussEOService { } else {//标准号、ID都不存在的情况 // 新增方法 sarBussionessStand.setPrcCreateUser(prcCreateUser); + sarBussionessStand.setReplaceStandNum(DTQBBHBUSS); // 根据标准号判断数据是否已存在 // QueryWrapperqueryWrapper = new QueryWrapper<>(); // queryWrapper.eq(sarBussionessStand.getStandCode() != null,"STAND_CODE",sarBussionessStand.getStandCode()) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java index 3efec211..851d0b52 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java @@ -131,5 +131,7 @@ public interface SarBussionessStandDao extends BaseMapper { String setDtqbbhbuss(String dtqbbhbuss); String selectByStandCode(String standCode); + + SarBussionessStand selectByReplaceStandNum(String standCode); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java index df27dc73..9e0aba7d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java @@ -708,6 +708,15 @@ public class SarBussionessStandServiceImpl extends ServiceImpl= 1) { @@ -2875,6 +2884,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl attInfoMap = new HashMap<>(); @@ -2944,7 +2954,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl= 1) { // 根据代替标准号 ，修改代替标准号标准中的，被代替标准号 diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml index f9038fb6..5f2e9f67 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml @@ -1253,6 +1253,10 @@ + update sar_buss_stand_attr_info ss set ss.FBGBUSS = #{strFile}