维修

platform-dao/src/main/java/com/platform/dao/vo/query/sb/SbMeasureLogVO.java

@@ -24,6 +24,7 @@ import java.util.List;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class SbMeasureLogVO extends BaseVO implements Serializable{
+    private LocalDate youXiaoQi;
 
     /**
      * 主键

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

@@ -181,6 +181,19 @@ public class SbMeasureLogController {
         log.setSbId(checkStandardDTO.getSbId());
         List<SbUpdateLogVO> updateLogs = sbUpdateLogMapper.selectList(log);
         List<SbMeasureLogVO> measureLogVOS = sbMeasureLogService.selectList(checkStandardDTO);
+        for (SbMeasureLogVO vo:measureLogVOS){
+            if (vo.getLastDate()!=null&&vo.getPeriod()!=null){
+                if (vo.getPeriodType()==1){
+                    vo.setYouXiaoQi(vo.getLastDate().plusDays(vo.getPeriod()));
+                }else if(vo.getPeriodType()==2){
+                    vo.setYouXiaoQi(vo.getLastDate().plusWeeks(vo.getPeriod()));
+                }
+                else if(vo.getPeriodType()==3){
+                    vo.setYouXiaoQi(vo.getLastDate().plusMonths(vo.getPeriod()));
+                }
+
+            }
+        }
         Map<String,Object> map = new HashMap<>();
         map.put("1",updateLogs);
         map.put("2",measureLogVOS);