合并分支 'dev_foton_CD' 到 'fix_foton'

Dev foton cd

查看合并请求 laws-foton-slrs/foton-slrs-system-rest!4

adc-da-slrs/src/main/java/com/adc/da/scheduledState/server/UpdateStateBussSyncFz.java

@@ -100,8 +100,8 @@ public class UpdateStateBussSyncFz implements Runnable {
 
                 // 需要更新为作废状态的集合
                 List<SarBussionessStand> invalidList = getStateScheduledList.stream().filter(info -> {
-                    if(StringUtils.isNotBlank(info.getDTQBBHBUSS())){
-                        List<String> bdtList = Arrays.stream(info.getDTQBBHBUSS().split(",")).map(String::trim).collect(Collectors.toList());
+                    if(StringUtils.isNotBlank(info.getBDTQBBHBUSS())){
+                        List<String> bdtList = Arrays.stream(info.getBDTQBBHBUSS().split(",")).map(String::trim).collect(Collectors.toList());
                         // 现行有效、作废
                         List<String> bdtStateList = new ArrayList<>();
                         // 现行有效

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java

@@ -26,7 +26,7 @@ import java.util.List;
 @Repository
 public interface SarBussionessStandDao extends BaseMapper<SarBussionessStand> {
 
-    String updateStateScheduledSql = "SELECT A.*,B.DTQBBHBUSS FROM sar_bussioness_stand A LEFT JOIN sar_buss_stand_attr_info B ON B.STAND_ID = A.ID ${ew.customSqlSegment}";
+    String updateStateScheduledSql = "SELECT A.*,B.BDTQBBHBUSS FROM sar_bussioness_stand A LEFT JOIN sar_buss_stand_attr_info B ON B.STAND_ID = A.ID ${ew.customSqlSegment}";
 
     /**
      * 自动更新文本状态通用查询