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 4c88ae84..3efec211 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 @@ -130,5 +130,6 @@ public interface SarBussionessStandDao extends BaseMapper { @Select("select * from sar") String setDtqbbhbuss(String dtqbbhbuss); + String selectByStandCode(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 fe5ffcd6..9877e2ef 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 @@ -2834,13 +2834,14 @@ public class SarBussionessStandServiceImpl extends ServiceImplqueryWrapper = new QueryWrapper<>(); queryWrapper.eq(sarBussionessStand.getStandCode() != null,"STAND_CODE",sarBussionessStand.getStandCode()) .eq(standName != null,"STAND_NAME",standName); List list = iSarBussionessStandService.list(queryWrapper); Integer valIdFlag = 0; for (SarBussionessStand stand :list){ - if ((list.size() ==1 && !list.get(0).getId().equals(stand.getId())) || list.size() >1){ + if ((list.size() >=1 && stand.getId().equals(id))){ valIdFlag = stand.getValidFlag(); if (valIdFlag == 0){ logger.info("企标标准号"+ sarBussionessStand.getStandCode() +"或企标名称"+ sarBussionessStand.getStandName() +"已存在"); @@ -4648,6 +4649,45 @@ public class SarBussionessStandServiceImpl extends ServiceImpl sarStandAttrMap = JSONObject.fromObject(sarStandAttrEOStr); + sarStandAttrMap.put("FSRQBUSS",sdf.format(instance.getTime())); + sarBussionessStandEO.setSarStandAttrEOStr(sarStandAttrMap.toString()); + } + } catch (ParseException e) { + e.printStackTrace(); + } + }else { + //技术标准五年复审 + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + try { + Date parse = sdf.parse(sarBussionessStandEO.getIssueTime()); + Calendar instance = Calendar.getInstance(); + instance.setTime(parse); + instance.add(Calendar.YEAR,5); + //sarBussStandAttrInfo.setFsrqBuss(sdf.format(instance.getTime())); + String sarStandAttrEOStr = sarBussionessStandEO.getSarStandAttrEOStr(); + if(StringUtils.isNotBlank(sarStandAttrEOStr)){ + Map sarStandAttrMap = JSONObject.fromObject(sarStandAttrEOStr); + sarStandAttrMap.put("FSRQBUSS",sdf.format(instance.getTime())); + sarBussionessStandEO.setSarStandAttrEOStr(sarStandAttrMap.toString()); + } + } catch (ParseException e) { + e.printStackTrace(); + } + } + } createStandAttrInfo(sarBussionessStandEO,false); } // 增加关联事件 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 250329c1..12622417 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 @@ -1250,6 +1250,10 @@ and smenu.MENU_ID = '44' + + update sar_buss_stand_attr_info ss set ss.FBGBUSS = #{strFile} where id = #{attfId}