完善

platform-dao/src/main/java/com/platform/dao/enums/SbMeasureStatusEnum.java

@@ -40,7 +40,11 @@ public enum SbMeasureStatusEnum {
     /**
      * 转出
      */
-    ZHUANCHU(7);
+    ZHUANCHU(7),
+    /**
+     * 报废
+     */
+    BAOFEI(7);
 
     private final Integer value;
 

platform-rest/src/main/java/com/platform/rest/controller/sb/SbInfoMeasureController.java

@@ -1,6 +1,7 @@
 package com.platform.rest.controller.sb;
 
 import com.platform.common.bean.AbstractPageResultBean;
+import com.platform.common.exception.BusinessException;
 import com.platform.common.util.BeanConverterUtil;
 import com.platform.common.util.R;
 import com.platform.common.util.StringUtils;
@@ -214,6 +215,18 @@ public class SbInfoMeasureController {
     @PreAuthorize("@pms.hasPermission('sb-infos-export')")
     public void exportForMeasure(HttpServletResponse response, SbInfoMeasureDTO sbInfoDTO) {
         List<SbInfoMeasureVO> list = sbInfoService.selectExportVOList(sbInfoDTO);
+        // 将数据往推
+        for(SbInfoMeasureVO vo: list){
+            vo.setCheckDate(vo.getNextCheckDate());
+            Integer checkPeriod = 12;// 默认12个月
+            if(vo.getCheckPeriod() != null){
+                checkPeriod = vo.getCheckPeriod();
+            }else{
+                throw new BusinessException("检定设备的检定周期未设置，无法计算下次检定日期，请先设置");
+            }
+            vo.setNextCheckDate(vo.getCheckDate().minusMonths(-checkPeriod).minusDays(1));
+        }
+
         List<ExportSbInfoMeasureTwoVO> sbInfoMeasureVOS = BeanConverterUtil.copyListProperties(list, ExportSbInfoMeasureTwoVO.class);
         ExcelUtil.exportResponseDict(response, ExportSbInfoMeasureTwoVO.class, sbInfoMeasureVOS, "计量设备检定信息");
     }