场站增加片区code

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/dto/StationBasicDto.java

@@ -71,7 +71,7 @@ public class StationBasicDto extends BaseDto {
 
     @ApiModelProperty(value = "所属片区")
     private String area;
-
+    private String areaCode;
     @ApiModelProperty(value = "所属地区名称")
     private String areaName;
 

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/entity/StationBasic.java

@@ -123,7 +123,8 @@ public class StationBasic extends BaseEntity {
 
     @TableField("area")
     private String area;
-    
+    @TableField("area_code")
+    private String areaCode;
     @TableField("project_org_code")
     private String projectOrgCode;
 

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/ExcelServiceImpl.java

@@ -130,7 +130,7 @@ public class ExcelServiceImpl {
                fireChemical.setAreaName(type[0]);
                fireChemical.setArea(type[1]);
                CompanyModel companyModel=personBasicServiceImpl.getCompanyModel(Long.parseLong(type[1]));
-               fireChemical.setProjectOrgCode(companyModel.getOrgCode());
+               fireChemical.setAreaCode(companyModel.getCompanyCode());
            }
 
            //平台增加场站
@@ -141,6 +141,7 @@ public class ExcelServiceImpl {
            companyModeldata.setParentId(Long.valueOf(fireChemical.getArea()));
            companyModeldata.setCompanyCode(fireChemical.getStationCode());
            companyModeldata= this.addCompanyModel(companyModeldata);
+           fireChemical.setProjectOrgCode(companyModeldata.getOrgCode());
            fireChemical.setPlatformStationId(companyModeldata.getSequenceNbr().toString());
            excelEntityList.add(fireChemical);
        });

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/StationBasicServiceImpl.java

@@ -107,6 +107,7 @@ public class StationBasicServiceImpl extends BaseService<StationBasicDto,Station
         //单位
         companyModel=personBasicServiceImpl.getCompanyModel(Long.parseLong(stationBasic.getArea()));
         stationBasic.setAreaName(companyModel.getCompanyName());
+        stationBasic.setAreaCode(companyModel.getCompanyCode());
         stationBasic.setProjectOrgCode(companyModeldata.getOrgCode());
         stationBasic.setPlatformStationId(companyModeldata.getSequenceNbr().toString());
         //场站基本信息
@@ -196,7 +197,8 @@ public class StationBasicServiceImpl extends BaseService<StationBasicDto,Station
         //单位
         companyModel=personBasicServiceImpl.getCompanyModel(Long.parseLong(stationBasic.getArea()));
         stationBasic.setAreaName(companyModel.getCompanyName());
-        stationBasic.setProjectOrgCode(companyModel.getOrgCode());
+        stationBasic.setAreaCode(companyModel.getCompanyCode());
+        stationBasic.setProjectOrgCode(companyModeldata.getOrgCode());
         stationBasic.setPlatformStationId(companyModeldata.getSequenceNbr().toString());
         //场站基本信息
         stationBasicMapper.updateById(stationBasic);