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

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

@@ -74,32 +74,32 @@ public class KeySiteExcleDto implements Serializable {
 	@ApiModelProperty(value = "责任人身份证")
 	private String chargePersonId;
 
-	@ExcelProperty(value = "确定重点防火部位的原因", index = 9)
+	@ExcelProperty(value = "确定重点防火部位的原因", index = 7)
 	@ApiModelProperty(value = "确定重点防火部位的原因")
 	private String keyPreventionReason;
    
-	@ExcelProperty(value = "消防设施情况", index = 10)
+	@ExcelProperty(value = "消防设施情况", index = 8)
 	@ExplicitConstraint(indexNum=11,source = {"有","无"})
 	@ApiModelProperty(value = "消防设施情况")
 	private String fireFacilitiesInfo;
  
-	@ExcelProperty(value = "防火标志设立情况", index = 11)
+	@ExcelProperty(value = "防火标志设立情况", index = 9)
 	@ApiModelProperty(value = "防火标志设立情况")
 	private String firePreventionFlagName;
 
-	@ExcelProperty(value = "危险源", index = 12)
+	@ExcelProperty(value = "危险源", index = 10)
 	@ApiModelProperty(value = "危险源")
 	private String hazard;
 
-	@ExcelProperty(value = "消防安全管理措施", index = 13)
+	@ExcelProperty(value = "消防安全管理措施", index = 11)
 	@ApiModelProperty(value = "消防安全管理措施")
 	private String safetyManagementMeasures;
  
-	@ExcelProperty(value = "防范手段措施", index = 14)
+	@ExcelProperty(value = "防范手段措施", index = 12)
 	@ApiModelProperty(value = "防范手段措施")
 	private String preventiveMeasures;
 
-	@ExcelProperty(value = "备注", index = 15)
+	@ExcelProperty(value = "备注", index = 13)
 	@ApiModelProperty(value = "备注")
 	private String remark;
 

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

@@ -347,9 +347,9 @@ public class ExcelServiceImpl {
 						par.containsKey("useNature")?par.get("useNature").toString():null,
 						par.containsKey("fireFacilitiesInfo")?par.get("fireFacilitiesInfo").toString():null,
 						par.containsKey("bizOrgCode")? par.get("bizOrgCode").toString():null);
-			}else{
+			}/*else{
 				keySiteDtoList = keySiteService.exportToExcel(null,null,null,null,null,null);
-			}
+			}*/
 			ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(), keySiteDtoList,
 					KeySiteExcleDto.class, null, false);
 			break;