修改装备异常显示

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipmentDetailController.java

@@ -35,6 +35,7 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -197,9 +198,9 @@ public class EquipmentDetailController extends AbstractBaseController {
         if(!equipmentParams.isEmpty()){
             EquipmentParams equipmentParam = equipmentParams.get(0);
             equipmentDetail.setStatus(equipmentParam.getStatus());
+        }else{
+            equipmentDetail.setStatus("正常");
         }
-        equipmentDetail.setStatus("正常");
-
         StockDetail stockDetail = null;
         if(stockDetailId != null){
             //解决灭火药剂，有多个货位状态问题
@@ -607,18 +608,20 @@ public class EquipmentDetailController extends AbstractBaseController {
      */
 
     @ApiOperation(value = "导出装备清单", notes = "导出装备清单")
-    @PostMapping(value = "/export")
+    @PostMapping(value = "/export",produces = "application/json;charset=UTF-8")
     @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
     public void exportDangerList(@RequestBody List<DetailssAmountVO> detailssAmountVO,@RequestParam Integer prop, HttpServletResponse response) {
-        String fileName = "装备清单" + new Date().getTime();
+        String fileName =new Date().toString();
+        SimpleDateFormat formatter= new SimpleDateFormat("yyyyMMdd");
+        String format = formatter.format(new Date());
         if(prop==1){//全部导出
             List<DetailssAmountVO> getall = iEquipmentDetailService.getall();
             List<DetailssAmountVO> detailssAmountVOS = this.selectReasonMeasure(getall);
-            FileHelper.exportExcel(detailssAmountVOS, "装备清单", "装备清单", DetailssAmountVO.class, fileName + ".xls", response);
+            FileHelper.exportExcel(detailssAmountVOS, "装备清单", "装备清单", DetailssAmountVO.class, format + ".xls", response);
         }
         else {//仅仅导出筛选结果的数据
             List<DetailssAmountVO> detailssAmountVOS = this.selectReasonMeasure(detailssAmountVO);
-            FileHelper.exportExcel(detailssAmountVOS, "装备清单", "装备清单", DetailssAmountVO.class, fileName + ".xls", response);
+            FileHelper.exportExcel(detailssAmountVOS, "装备清单", "装备清单", DetailssAmountVO.class, format + ".xls", response);
         }
     }