diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandSn/dao/SarBussStandSnDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandSn/dao/SarBussStandSnDao.java index aaa86294..717bd587 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandSn/dao/SarBussStandSnDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandSn/dao/SarBussStandSnDao.java @@ -14,4 +14,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; public interface SarBussStandSnDao extends BaseMapper { String selectMaxStandnSn(); + + String selectMaxStandSn(String standSort); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandSn/service/ISarBussStandSnService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandSn/service/ISarBussStandSnService.java index c61e0c37..237e6461 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandSn/service/ISarBussStandSnService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandSn/service/ISarBussStandSnService.java @@ -19,4 +19,5 @@ public interface ISarBussStandSnService extends IService { String selectMaxStandnSn(); + String selectMaxStandSn(String standSort); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandSn/service/impl/SarBussStandSnServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandSn/service/impl/SarBussStandSnServiceImpl.java index f55ac7c4..39f9b3a3 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandSn/service/impl/SarBussStandSnServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandSn/service/impl/SarBussStandSnServiceImpl.java @@ -65,4 +65,9 @@ public class SarBussStandSnServiceImpl extends ServiceImpl { @Select("select * from sar_bussioness_stand where TEXT_STATUS_BUSS is not null") List selectAllStandStatus(); + + String selectMaxStandSn(String standSort); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java index 98dcdb08..cb89c2ab 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java @@ -70,5 +70,7 @@ public interface ISarBussionessStandService extends IService ResponseMessage cleaningDataReview(); ResponseMessage repeal(String id, String type); + + String selectMaxStandSn(String standSort); } 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 8442b060..b33089b6 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 @@ -223,8 +223,10 @@ public class SarBussionessStandServiceImpl extends ServiceImpl 0){ + if(count > 0 && MaxSn.equals(standMaxSn)){ QueryWrapper qw = new QueryWrapper(); qw.eq("REPLACE(STAND_SORT,' ','')",standSort.replace(" ","")); qw.eq("TASK_ID",taskId); @@ -261,7 +263,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl asList,String standId,String attfId) { //重复的集合 List chongfu = new ArrayList<>(); diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussStandSn/SarBussStandSnMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussStandSn/SarBussStandSnMapper.xml index 8018e2e0..fd7c7529 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussStandSn/SarBussStandSnMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussStandSn/SarBussStandSnMapper.xml @@ -5,5 +5,8 @@ + 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 5f2e9f67..80eaffcd 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 @@ -1257,6 +1257,9 @@ resultType="com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand"> select * from sar_bussioness_stand where stand_code = #{standCode} and VALID_FLAG = 0 limit 1 + update sar_buss_stand_attr_info ss set ss.FBGBUSS = #{strFile}