Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgUseRegistrationServiceImpl.java

@@ -2680,10 +2680,17 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             records.add(record);
         });
         LambdaQueryWrapper<IdxBizJgOtherInfo> wrapper = new LambdaQueryWrapper<>();
-        wrapper.select(IdxBizJgOtherInfo::getRecord,IdxBizJgOtherInfo::getInformationSituation);
+        wrapper.select(IdxBizJgOtherInfo::getRecord, IdxBizJgOtherInfo::getInformationSituation, IdxBizJgOtherInfo::getInformationSituationRemark);
         wrapper.in(IdxBizJgOtherInfo::getRecord, records);
         List<IdxBizJgOtherInfo> jgOtherInfos = otherInfoMapper.selectList(wrapper);
-        return jgOtherInfos.stream().collect(Collectors.toMap(IdxBizJgOtherInfo::getRecord,  d-> InformationManageTypeEnum.getName(d.getInformationSituation()),(k1, k2) ->k2));
+        return jgOtherInfos.stream()
+                .collect(Collectors.toMap(
+                        IdxBizJgOtherInfo::getRecord,
+                        other -> "3".equals(other.getInformationSituation())
+                                ? other.getInformationSituationRemark()
+                                : InformationManageTypeEnum.getName(other.getInformationSituation()),
+                        (oldVal, newVal) -> newVal
+                ));
     }
 
     /**

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/enums/InformationManageTypeEnum.java

@@ -14,6 +14,7 @@ public enum InformationManageTypeEnum {
      */
     TYPE_QR_CODE("1", "二维码"),
     TYPE_STAMP("2", "电子标签"),
+    TYPE_OTHER("3", "其他"),
     TYPE_NO("99", "无");
 
     private String code;