1.1.0 修改地块字段，修改导入报表接口

air/src/main/java/com/air/applets/dto/LandDto.java

@@ -80,9 +80,9 @@ public class LandDto {
     private BigDecimal civilAirDefence;
     @ApiModelProperty(value = "特殊条件")
     private String specialPlan;
-    @ApiModelProperty(value = "装配建筑(%)")
-    private BigDecimal assemblyBuilding;
-    @ApiModelProperty(value = "绿色建筑(一星,二星,三星)")
+    @ApiModelProperty(value = "装配要求")
+    private String assemblyBuilding;
+    @ApiModelProperty(value = "绿色要求")
     private String greenBuilding;
     @ApiModelProperty(value = "其他条件")
     private String otherConditions;

air/src/main/java/com/air/land/dto/ExportLandListedDto.java

@@ -100,10 +100,10 @@ public class ExportLandListedDto extends Model<ExportLandListedDto> {
     @ApiModelProperty(value = "特殊规划")
     private String specialPlan;
 
-    @ApiModelProperty(value = "装配建筑")
+    @ApiModelProperty(value = "装配要求")
     private String assemblyBuilding;
 
-    @ApiModelProperty(value = "绿色建筑")
+    @ApiModelProperty(value = "绿色要求")
     private String greenBuilding;
 
     @ApiModelProperty(value = "其他条件")

air/src/main/java/com/air/land/entity/LandListed.java

@@ -88,9 +88,9 @@ public class LandListed extends Model<LandListed> {
     private BigDecimal civilAirDefence;
     @ApiModelProperty(value = "特殊条件")
     private String specialPlan;
-    @ApiModelProperty(value = "装配建筑(%)")
-    private BigDecimal assemblyBuilding;
-    @ApiModelProperty(value = "绿色建筑(一星,二星,三星)")
+    @ApiModelProperty(value = "装配要求")
+    private String assemblyBuilding;
+    @ApiModelProperty(value = "绿色要求")
     private String greenBuilding;
     @ApiModelProperty(value = "其他条件")
     private String otherConditions;

air/src/main/java/com/air/land/entity/LandToList.java

@@ -92,9 +92,9 @@ public class LandToList extends Model<LandToList> {
     private BigDecimal civilAirDefence;
     @ApiModelProperty(value = "特殊条件")
     private String specialPlan;
-    @ApiModelProperty(value = "装配建筑(%)")
-    private BigDecimal assemblyBuilding;
-    @ApiModelProperty(value = "绿色建筑(一星,二星,三星)")
+    @ApiModelProperty(value = "装配要求")
+    private String assemblyBuilding;
+    @ApiModelProperty(value = "绿色要求")
     private String greenBuilding;
     @ApiModelProperty(value = "其他条件")
     private String otherConditions;

air/src/main/java/com/air/land/service/impl/LandListedServiceImpl.java

@@ -187,7 +187,7 @@ public class LandListedServiceImpl extends ServiceImpl<LandListedMapper, LandLis
             LandListed landListed = new LandListed();
             landListed.setLandListedId(DateUtil.landListedIdfromDate(LocalDateTime.now(), "yyyyMMdd",this.selectId()));
             //公告信息
-            landListed.setAnnoId(getCellValue(sheetRow.getCell(0)));
+            landListed.setAnnoId(getAnnoId(sheetRow.getCell(0)));
             log.info("公告序号为： {}",landListed.getAnnoId());
             landListed.setLandCode(getCellStrValue(sheetRow.getCell(1)));
             landListed.setLandPosition(getCellStrValue(sheetRow.getCell(2)));
@@ -230,7 +230,7 @@ public class LandListedServiceImpl extends ServiceImpl<LandListedMapper, LandLis
             landListed.setGeologicHazard(getCellStrValue(sheetRow.getCell(25)));
             landListed.setCivilAirDefence(numberFormat(getCellStrValue(sheetRow.getCell(26)),0));
             landListed.setSpecialPlan(getCellStrValue(sheetRow.getCell(27)));
-            landListed.setAssemblyBuilding(numberFormat(getCellStrValue(sheetRow.getCell(28)),100,0));
+            landListed.setAssemblyBuilding(getCellStrValue(sheetRow.getCell(28)));
             landListed.setGreenBuilding(getCellStrValue(sheetRow.getCell(29)));
             landListed.setOtherConditions(getCellStrValue(sheetRow.getCell(30)));
             landListed.setPercentFinishedHousing(numberFormat(getCellStrValue(sheetRow.getCell(31)),0));
@@ -333,7 +333,7 @@ public class LandListedServiceImpl extends ServiceImpl<LandListedMapper, LandLis
         list.add(data.getGeologicHazard());
         list.add(stringFormat(data.getCivilAirDefence(),0));
         list.add(data.getSpecialPlan());
-        list.add(strRateFormat(data.getAssemblyBuilding(),0));
+        list.add(data.getAssemblyBuilding());
         list.add(data.getGreenBuilding());
         list.add(data.getOtherConditions());
         list.add(stringFormat(data.getPercentFinishedHousing(),0));
@@ -416,6 +416,19 @@ public class LandListedServiceImpl extends ServiceImpl<LandListedMapper, LandLis
         return valueFormat(value);
     }
 
+    public String getAnnoId(XSSFCell cell){
+        try {
+            Double str = Double.valueOf(cell.toString());
+            Double value = Double.valueOf(cell.getRawValue());
+            if (str.doubleValue() == value.doubleValue()){
+                return getCellValue(cell);
+            }
+        } catch (NumberFormatException e) {
+            return getCellStrValue(cell);
+        }
+        return getCellStrValue(cell);
+    }
+
     /**
      * 格式化列的值
      *

air/src/main/java/com/air/land/service/impl/LandToListServiceImpl.java

@@ -194,7 +194,7 @@ public class LandToListServiceImpl extends ServiceImpl<LandToListMapper, LandToL
             landToList.setGeologicHazard(getCellStrValue(sheetRow.getCell(27)));
             landToList.setCivilAirDefence(numberFormat(getCellStrValue(sheetRow.getCell(28)),0));
             landToList.setSpecialPlan(getCellStrValue(sheetRow.getCell(29)));
-            landToList.setAssemblyBuilding(numberFormat(getCellStrValue(sheetRow.getCell(30)),100,0));
+            landToList.setAssemblyBuilding(getCellStrValue(sheetRow.getCell(30)));
             landToList.setGreenBuilding(getCellStrValue(sheetRow.getCell(31)));
             landToList.setOtherConditions(getCellStrValue(sheetRow.getCell(32)));
             landToList.setPercentFinishedHousing(numberFormat(getCellStrValue(sheetRow.getCell(33)),0));
@@ -262,7 +262,7 @@ public class LandToListServiceImpl extends ServiceImpl<LandToListMapper, LandToL
         list.add(data.getGeologicHazard());
         list.add(stringFormat(data.getCivilAirDefence(),0));
         list.add(data.getSpecialPlan());
-        list.add(strRateFormat(data.getAssemblyBuilding(),0));
+        list.add(data.getAssemblyBuilding());
         list.add(data.getGreenBuilding());
         list.add(data.getOtherConditions());
         list.add(stringFormat(data.getPercentFinishedHousing(),0));

air/src/main/java/com/air/land/vo/LandListedVo.java

@@ -82,9 +82,9 @@ public class LandListedVo {
     private BigDecimal civilAirDefence;
     @ApiModelProperty(value = "特殊条件")
     private String specialPlan;
-    @ApiModelProperty(value = "装配建筑(%)")
-    private BigDecimal assemblyBuilding;
-    @ApiModelProperty(value = "绿色建筑(一星,二星,三星)")
+    @ApiModelProperty(value = "装配要求")
+    private String assemblyBuilding;
+    @ApiModelProperty(value = "绿色要求")
     private String greenBuilding;
     @ApiModelProperty(value = "其他条件")
     private String otherConditions;

air/src/main/java/com/air/land/vo/LandToListVo.java

@@ -83,9 +83,9 @@ public class LandToListVo {
     private BigDecimal civilAirDefence;
     @ApiModelProperty(value = "特殊条件")
     private String specialPlan;
-    @ApiModelProperty(value = "装配建筑(%)")
-    private BigDecimal assemblyBuilding;
-    @ApiModelProperty(value = "绿色建筑(一星,二星,三星)")
+    @ApiModelProperty(value = "装配要求")
+    private String assemblyBuilding;
+    @ApiModelProperty(value = "绿色要求")
     private String greenBuilding;
     @ApiModelProperty(value = "其他条件")
     private String otherConditions;