修改bug

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/FireExpertsDto.java

@@ -84,13 +84,13 @@ public class FireExpertsDto extends BaseDto {
 
   //  @ExcelIgnore
     //@ExplicitConstraint(indexNum =11,sourceClass = CommonExplicitConstraint.class,method ="getCitys")
-    @ExcelProperty(value = "现居住地", index = 10)
+    @ExcelProperty(value = "居住地详情", index = 10)
     @ApiModelProperty(value = "居住地详情")
     private String residenceDetails;
 
     @ExplicitConstraint(indexNum =9,sourceClass = CommonExplicitConstraint.class,method ="getCitys")
     @ExcelProperty(value = "现居住地", index = 9)
-    @ApiModelProperty(value = "现居住地详细地址")
+    @ApiModelProperty(value = "现居住地")
     private String residenceDetailVal;
 
     @ExcelProperty(value = "办公电话", index = 11)

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/FirefightersZhDto.java

@@ -113,7 +113,7 @@ public class FirefightersZhDto extends BaseDto {
     @ApiModelProperty(value = "机构名称")
     private String companyName;
     
-    @ApiModelProperty(value = "专家领域")
+    @ApiModelProperty(value = "station领域")
     private String areasExpertise;
     
     @ApiModelProperty(value = "消防专家领域字典code")

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/ExcelController.java

@@ -96,7 +96,7 @@ public class ExcelController extends BaseController {
             e.printStackTrace();
             throw new BadRequest("文件格式不正确或excel 模板不匹配");  // BUG 2821 by litw 2021年9月16日
         }catch (Exception e){
-            throw new RuntimeException("系统异常！");
+            throw new BadRequest("文件格式不正确或excel 模板不匹配！");
         }
 
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/DataSourcesImpl.java

@@ -358,19 +358,30 @@ public class DataSourcesImpl implements DataSources {
 		FeignClientResult<java.util.Collection<RegionModel>> region =  Systemctl.regionClient.queryForTreeParent(null);
 		java.util.Collection<RegionModel> regions = region.getResult();// 以及地址
 		List<String> address = new ArrayList<>();
-		setAddress(address,regions);
+		setAddress("",address,regions);
 		String[] str = address.toArray(new String[address.size()]);
 		return str;
 	}
 
-	private void setAddress(List<String> address, Collection<RegionModel> regions) {
-		regions.stream().forEach(item -> {
+	private void setAddress(String  name,List<String> address, Collection<RegionModel> regions) {
+
+		for (RegionModel item : regions) {
 			//添加自己的
-			address.add(item.getRegionName() + "@" + item.getSequenceNbr());
+
+			address.add(name+" "+item.getRegionName() + "@" + item.getSequenceNbr());
 			if(item.getChildren() != null && item.getChildren().size() > 0) {
-				setAddress(address,item.getChildren());
+				setAddress(name+" "+item.getRegionName()  ,address,item.getChildren());
 			}
-		});
+		}
+
+//		regions.stream().forEach(item -> {
+//			//添加自己的
+//			name =name+item.getRegionName();
+//			address.add(name + "@" + item.getSequenceNbr());
+//			if(item.getChildren() != null && item.getChildren().size() > 0) {
+//				setAddress(name ,address,item.getChildren());
+//			}
+//		});
 	}
 
 	private String[] getDutyArea() {

amos-boot-system-jcs/src/main/resources/db/changelog/jcs-1.0.0.0.xml

@@ -1624,6 +1624,16 @@
     </changeSet>
 
 
+    <changeSet author="tw" id="2021-10-12-003">
+
+        <preConditions onFail="MARK_RAN">
+            <tableExists tableName="cb_data_dictionary"/>
+        </preConditions>
+        <comment>修改数据</comment>
+        <sql>
+            UPDATE cb_data_dictionary set name ='财务军需类'  where sequence_nbr=147
+        </sql>
+    </changeSet>