仪表优化

platform-dao/src/main/java/com/platform/dao/vo/export/sb/ExportSbMeasureLogVO3.java

@@ -27,8 +27,8 @@ public class ExportSbMeasureLogVO3 implements Serializable {
     @Excel(name = "检定时间")
     private LocalDate lastDate;
 
-    @Excel(name = "检定有效期")
-    private LocalDate youXiaoDate;
+//    @Excel(name = "检定有效期")
+//    private LocalDate youXiaoDate;
     /**
      * 编码
      */

platform-service/src/main/java/com/platform/service/sb/impl/SbInfoServiceImpl.java

@@ -478,6 +478,13 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
     @Override
     public SbInfo saveModelByDTO(SbInfoDTO model) {
 
+        if (model.getUseType()==4&&model.getIsMeasure()==1){
+            //仪表如果需要检定则检定周期必填
+            if (model.getCheckPeriod()==null){
+                throw new BusinessException("检定设备的检定周期需要必填！");
+            }
+        }
+
         model.setUseArea(useArea);
         model.setUseCompany(useCompany);
         model.setUseProject(useProject);
@@ -542,7 +549,12 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
      */
     @Override
     public SbInfo saveModelByDTOCopy(SbInfoDTO model) {
-
+        if (model.getUseType()==4&&model.getIsMeasure()==1){
+            //仪表如果需要检定则检定周期必填
+            if (model.getCheckPeriod()==null){
+                throw new BusinessException("检定设备的检定周期需要必填！");
+            }
+        }
         String oldId = model.getId();
         model.setUseArea(useArea);
         model.setUseCompany(useCompany);
@@ -649,6 +661,12 @@ public class SbInfoServiceImpl extends BaseServiceImpl<SbInfoMapper, SbInfo, SbI
 
     @Override
     public void modModelByDTO(SbInfoDTO model) {
+        if (model.getUseType()==4&&model.getIsMeasure()==1){
+            //仪表如果需要检定则检定周期必填
+            if (model.getCheckPeriod()==null){
+                throw new BusinessException("检定设备的检定周期需要必填！");
+            }
+        }
 
         if (model.getCheckDate() != null && model.getCheckPeriod() != null && model.getNextCheckDate() == null) {
             model.setNextCheckDate(model.getCheckDate().minusMonths(-model.getCheckPeriod()));

platform-service/src/main/java/com/platform/service/sb/impl/SbMeasureLogServiceImpl.java

@@ -228,14 +228,14 @@ public class SbMeasureLogServiceImpl extends BaseServiceImpl<SbMeasureLogMapper,
         sbInfo.setParentId(sbInfo.getParentId());
         sbInfo.setPositionId(sbInfo.getPositionId());
         sbInfo.setCheckDate(model.getLastDate());
-        sbInfo.setNextCheckDate(model.getYouXiaoDate());
+//        sbInfo.setNextCheckDate(model.getYouXiaoDate());
         //sbInfo.setPositionNo(model.getSbPositionNo());
-//        Integer checkPeriod = 12;// 默认12个月
-//        if (model.getCheckPeriod() != null) {
-//            checkPeriod = model.getCheckPeriod();
-//        } else {
-//            throw new BusinessException("检定设备的检定周期未设置，无法计算下次检定日期，请先设置");
-//        }
+        Integer checkPeriod = 12;// 默认12个月
+        if (model.getCheckPeriod() != null) {
+            checkPeriod = model.getCheckPeriod();
+        } else {
+            throw new BusinessException("检定设备的检定周期未设置，无法计算下次检定日期，请先设置");
+        }
 //
 //        // 判断位号是否已经存在，且是否是被设备，如果不是则弹出提示
 //        /*if(StringUtils.isNotBlank(model.getSbPositionNo())){
@@ -250,7 +250,7 @@ public class SbMeasureLogServiceImpl extends BaseServiceImpl<SbMeasureLogMapper,
 //            }
 //
 //        }*/
-//        sbInfo.setNextCheckDate(model.getLastDate().minusMonths(-checkPeriod).minusDays(1));
+        sbInfo.setNextCheckDate(model.getLastDate().minusMonths(-checkPeriod).minusDays(1));
         sbInfo.setZaiz(model.getName());// 检定单位
         sbInfo.setSbdh(model.getNo());// 检定编号
         sbInfo.setRemark(model.getRemark());// 备注
@@ -415,11 +415,11 @@ public class SbMeasureLogServiceImpl extends BaseServiceImpl<SbMeasureLogMapper,
         sbInfo.setCheckDate(model.getLastDate()==null?LocalDate.now():model.getLastDate());
         //sbInfo.setPositionNo(model.getSbPositionNo());
         Integer checkPeriod = 12;// 默认12个月
-//        if (model.getCheckPeriod() != null) {
-//            checkPeriod = model.getCheckPeriod();
-//        } else {
-//            throw new BusinessException("检定设备的检定周期未设置，无法计算下次检定日期，请先设置");
-//        }
+        if (model.getCheckPeriod() != null) {
+            checkPeriod = model.getCheckPeriod();
+        } else {
+            throw new BusinessException("检定设备的检定周期未设置，无法计算下次检定日期，请先设置");
+        }
 
         // 判断位号是否已经存在，且是否是被设备，如果不是则弹出提示
         /*if(StringUtils.isNotBlank(model.getSbPositionNo())){
@@ -434,7 +434,8 @@ public class SbMeasureLogServiceImpl extends BaseServiceImpl<SbMeasureLogMapper,
             }
 
         }*/
-        sbInfo.setNextCheckDate(model.getYouXiaoDate());
+//        sbInfo.setNextCheckDate(model.getYouXiaoDate());
+        sbInfo.setNextCheckDate(model.getLastDate().minusMonths(-checkPeriod).minusDays(1));
         sbInfo.setZaiz(model.getName());// 检定单位
         sbInfo.setSbdh(model.getNo());// 检定编号
         sbInfo.setRemark(model.getRemark());// 备注