From f50b0315234274547f2b1e6e590eeeebe6b3fe2f Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期五, 25 十月 2024 15:49:24 +0800
Subject: [PATCH] update假数据
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcFakeData.java | 80 +++++++++++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcFakeDataSubService.java | 11 +
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcOeeInfoServiceImpl.java | 15 +-
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcFakeDataSubMapper.xml | 5
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcFakeDataMapper.java | 11 +
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcFakeDataSubMapper.java | 11 +
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcFakeDataSubServiceImpl.java | 15 ++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcFakeDataServiceImpl.java | 57 +++++++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcFakeDataController.java | 49 ++++++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcFakeDataService.java | 25 ++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcFakeDataSub.java | 47 +++++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcFakeDataMapper.xml | 5
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcFakeDataDto.java | 23 +++
13 files changed, 345 insertions(+), 9 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcFakeDataController.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcFakeDataController.java
new file mode 100644
index 0000000..e5be855
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcFakeDataController.java
@@ -0,0 +1,49 @@
+package org.jeecg.modules.mdc.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.modules.mdc.dto.MdcFakeDataDto;
+import org.jeecg.modules.mdc.entity.MdcFakeData;
+import org.jeecg.modules.mdc.service.IMdcFakeDataService;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * @author Lius
+ * @date 2024/10/25 14:05
+ */
+@Slf4j
+@Api(tags = "鍋囨暟鎹�(涓昏〃)")
+@RestController
+@RequestMapping("/mdc/mdcFakeData")
+public class MdcFakeDataController extends JeecgController<MdcFakeData, IMdcFakeDataService> {
+
+ @Resource
+ private IMdcFakeDataService mdcFakeDataService;
+
+ /**
+ * 鐝埗琛�(涓昏〃)-鑾峰彇鏁版嵁
+ *
+ * @return
+ */
+ @AutoLog("鍋囨暟鎹�(涓昏〃)-鑾峰彇鏁版嵁")
+ @ApiOperation(value = "鍋囨暟鎹�(涓昏〃)-鑾峰彇鏁版嵁", notes = "鍋囨暟鎹�(涓昏〃)-鑾峰彇鏁版嵁")
+ @GetMapping("/queryFakeData")
+ public Result<MdcFakeDataDto> queryFakeData() {
+ MdcFakeDataDto result = mdcFakeDataService.queryFakeData();
+ return Result.OK(result);
+ }
+
+ @AutoLog(value = "鍋囨暟鎹�(涓昏〃)-缂栬緫")
+ @ApiOperation(value = "鍋囨暟鎹�(涓昏〃)-缂栬緫", notes = "鍋囨暟鎹�(涓昏〃)-缂栬緫")
+ @RequestMapping(value = "/updateFakeData", method = {RequestMethod.PUT, RequestMethod.POST})
+ public Result updateFakeData(@RequestBody MdcFakeDataDto mdcFakeDataDto) {
+ mdcFakeDataService.updateFakeData(mdcFakeDataDto);
+ return Result.OK("淇濆瓨鎴愬姛!");
+ }
+}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcFakeDataDto.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcFakeDataDto.java
new file mode 100644
index 0000000..c67e5d7
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcFakeDataDto.java
@@ -0,0 +1,23 @@
+package org.jeecg.modules.mdc.dto;
+
+import lombok.Data;
+import org.jeecg.modules.mdc.entity.MdcFakeData;
+import org.jeecg.modules.mdc.entity.MdcFakeDataSub;
+
+import java.util.List;
+
+/**
+ * @author Lius
+ * @date 2024/10/25 15:03
+ */
+@Data
+public class MdcFakeDataDto extends MdcFakeData {
+
+ private List<MdcFakeDataSub> todayProductionList;
+ private List<MdcFakeDataSub> todayPassRateList;
+ private List<MdcFakeDataSub> todayShiftCountList;
+ private List<MdcFakeDataSub> todayOpenRateList;
+ private List<MdcFakeDataSub> todayUtilizationRateList;
+ private List<MdcFakeDataSub> monthUtilizationRateList;
+
+}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcFakeData.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcFakeData.java
new file mode 100644
index 0000000..7c2ced5
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcFakeData.java
@@ -0,0 +1,80 @@
+package org.jeecg.modules.mdc.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecg.common.system.base.entity.JeecgEntity;
+
+import java.io.Serializable;
+
+/**
+ * @author Lius
+ * @date 2024/10/25 14:11
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@TableName("mdc_fake_data")
+@ApiModel(value = "mdc_fake_data瀵硅薄", description = "鍋囨暟鎹〃(涓昏〃)")
+public class MdcFakeData extends JeecgEntity implements Serializable {
+
+ private static final long serialVersionUID = -1305059141825141377L;
+
+ /**
+ * 姝ｆ爣棰�
+ */
+ @ApiModelProperty("姝ｆ爣棰�")
+ private String title;
+ /**
+ * 鍓爣棰�
+ */
+ @ApiModelProperty("鍓爣棰�")
+ private String subheading;
+ /**
+ * 璇存槑
+ */
+ @ApiModelProperty("璇存槑")
+ private String description;
+ /**
+ * 鏄ㄦ棩璁″垝瀹屾垚鐜�
+ */
+ @ApiModelProperty("鏄ㄦ棩璁″垝瀹屾垚鐜�")
+ private String planCompleteRate;
+ /**
+ * 鏄ㄦ棩璁惧鍒╃敤鐜�
+ */
+ @ApiModelProperty("鏄ㄦ棩璁惧鍒╃敤鐜�")
+ private String utilizationRate;
+ /**
+ * 鏄ㄦ棩浜у搧鍚堟牸鐜�
+ */
+ @ApiModelProperty("鏄ㄦ棩浜у搧鍚堟牸鐜�")
+ private String passRate;
+ /**
+ * 浠婃棩鐢熶骇杩涘害id
+ */
+ private String todayProductionId;
+ /**
+ *浠婃棩鍚堟牸鐜噄d
+ */
+ private String todayPassRateId;
+ /**
+ * 浠婃棩鐝瀹屾垚閲廼d
+ */
+ private String todayShiftCountId;
+ /**
+ * 浠婃棩璁惧寮�鏈虹巼id
+ */
+ private String todayOpenRateId;
+ /**
+ * 浠婃棩璁惧鍒╃敤鐜噄d
+ */
+ private String todayUtilizationRateId;
+ /**
+ * 鏈堣澶囧埄鐢ㄧ巼id
+ */
+ private String monthUtilizationRateId;
+}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcFakeDataSub.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcFakeDataSub.java
new file mode 100644
index 0000000..ef3e882
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcFakeDataSub.java
@@ -0,0 +1,47 @@
+package org.jeecg.modules.mdc.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecg.common.system.base.entity.JeecgEntity;
+
+import java.io.Serializable;
+
+/**
+ * @author Lius
+ * @date 2024/10/25 14:17
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@TableName("mdc_fake_data_sub")
+@ApiModel(value = "mdc_fake_data_sub瀵硅薄", description = "鍋囨暟鎹〃(鍓〃)")
+public class MdcFakeDataSub extends JeecgEntity implements Serializable {
+
+ private static final long serialVersionUID = -1305059141825141377L;
+
+ /**
+ * 涓昏〃Id
+ */
+ @ApiModelProperty("涓昏〃Id")
+ private String fakeId;
+ /**
+ * label
+ */
+ @ApiModelProperty("label")
+ private String label;
+ /**
+ * value1
+ */
+ @ApiModelProperty("value1")
+ private String value1;
+ /**
+ * value2
+ */
+ @ApiModelProperty("value2")
+ private String value2;
+
+}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcFakeDataMapper.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcFakeDataMapper.java
new file mode 100644
index 0000000..022256f
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcFakeDataMapper.java
@@ -0,0 +1,11 @@
+package org.jeecg.modules.mdc.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.mdc.entity.MdcFakeData;
+
+/**
+ * @author Lius
+ * @date 2024/10/25 14:22
+ */
+public interface MdcFakeDataMapper extends BaseMapper<MdcFakeData> {
+}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcFakeDataSubMapper.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcFakeDataSubMapper.java
new file mode 100644
index 0000000..69f19e7
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcFakeDataSubMapper.java
@@ -0,0 +1,11 @@
+package org.jeecg.modules.mdc.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.mdc.entity.MdcFakeDataSub;
+
+/**
+ * @author Lius
+ * @date 2024/10/25 15:07
+ */
+public interface MdcFakeDataSubMapper extends BaseMapper<MdcFakeDataSub> {
+}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcFakeDataMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcFakeDataMapper.xml
new file mode 100644
index 0000000..22723c8
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcFakeDataMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.mdc.mapper.MdcFakeDataMapper">
+
+</mapper>
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcFakeDataSubMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcFakeDataSubMapper.xml
new file mode 100644
index 0000000..6fea537
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcFakeDataSubMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.mdc.mapper.MdcFakeDataSubMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcFakeDataService.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcFakeDataService.java
new file mode 100644
index 0000000..3f5e19b
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcFakeDataService.java
@@ -0,0 +1,25 @@
+package org.jeecg.modules.mdc.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.mdc.dto.MdcFakeDataDto;
+import org.jeecg.modules.mdc.entity.MdcFakeData;
+
+/**
+ * @author Lius
+ * @date 2024/10/25 14:20
+ */
+public interface IMdcFakeDataService extends IService<MdcFakeData> {
+
+ /**
+ * 鑾峰彇鏁版嵁
+ *
+ * @return
+ */
+ MdcFakeDataDto queryFakeData();
+
+ /**
+ * 淇濆瓨鏁版嵁
+ * @param mdcFakeDataDto
+ */
+ void updateFakeData(MdcFakeDataDto mdcFakeDataDto);
+}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcFakeDataSubService.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcFakeDataSubService.java
new file mode 100644
index 0000000..6b5f2a0
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcFakeDataSubService.java
@@ -0,0 +1,11 @@
+package org.jeecg.modules.mdc.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.mdc.entity.MdcFakeDataSub;
+
+/**
+ * @author Lius
+ * @date 2024/10/25 15:08
+ */
+public interface IMdcFakeDataSubService extends IService<MdcFakeDataSub> {
+}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcFakeDataServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcFakeDataServiceImpl.java
new file mode 100644
index 0000000..f5db610
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcFakeDataServiceImpl.java
@@ -0,0 +1,57 @@
+package org.jeecg.modules.mdc.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.mdc.dto.MdcFakeDataDto;
+import org.jeecg.modules.mdc.entity.MdcFakeData;
+import org.jeecg.modules.mdc.entity.MdcFakeDataSub;
+import org.jeecg.modules.mdc.mapper.MdcFakeDataMapper;
+import org.jeecg.modules.mdc.service.IMdcFakeDataService;
+import org.jeecg.modules.mdc.service.IMdcFakeDataSubService;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author Lius
+ * @date 2024/10/25 14:21
+ */
+@Service
+public class MdcFakeDataServiceImpl extends ServiceImpl<MdcFakeDataMapper, MdcFakeData> implements IMdcFakeDataService {
+
+ @Resource
+ private IMdcFakeDataSubService mdcFakeDataSubService;
+
+ @Override
+ public MdcFakeDataDto queryFakeData() {
+ MdcFakeDataDto mdcFakeDataDto = new MdcFakeDataDto();
+ List<MdcFakeData> list = this.list();
+ MdcFakeData mdcFakeData = list.get(0);
+ BeanUtils.copyProperties(mdcFakeData, mdcFakeDataDto);
+ mdcFakeDataDto.setTodayProductionList(mdcFakeDataSubService.list(new LambdaQueryWrapper<MdcFakeDataSub>().eq(MdcFakeDataSub::getFakeId, mdcFakeDataDto.getTodayProductionId())));
+ mdcFakeDataDto.setTodayPassRateList(mdcFakeDataSubService.list(new LambdaQueryWrapper<MdcFakeDataSub>().eq(MdcFakeDataSub::getFakeId, mdcFakeDataDto.getTodayPassRateId())));
+ mdcFakeDataDto.setTodayShiftCountList(mdcFakeDataSubService.list(new LambdaQueryWrapper<MdcFakeDataSub>().eq(MdcFakeDataSub::getFakeId, mdcFakeDataDto.getTodayShiftCountId())));
+ mdcFakeDataDto.setTodayOpenRateList(mdcFakeDataSubService.list(new LambdaQueryWrapper<MdcFakeDataSub>().eq(MdcFakeDataSub::getFakeId, mdcFakeDataDto.getTodayOpenRateId())));
+ mdcFakeDataDto.setTodayUtilizationRateList(mdcFakeDataSubService.list(new LambdaQueryWrapper<MdcFakeDataSub>().eq(MdcFakeDataSub::getFakeId, mdcFakeDataDto.getTodayUtilizationRateId())));
+ mdcFakeDataDto.setMonthUtilizationRateList(mdcFakeDataSubService.list(new LambdaQueryWrapper<MdcFakeDataSub>().eq(MdcFakeDataSub::getFakeId, mdcFakeDataDto.getMonthUtilizationRateId())));
+ return mdcFakeDataDto;
+ }
+
+ @Override
+ public void updateFakeData(MdcFakeDataDto mdcFakeDataDto) {
+ MdcFakeData mdcFakeData = new MdcFakeData();
+ BeanUtils.copyProperties(mdcFakeDataDto, mdcFakeData);
+ this.updateById(mdcFakeData);
+ List<MdcFakeDataSub> mdcFakeDataSubList = new ArrayList<>();
+ mdcFakeDataSubList.addAll(mdcFakeDataDto.getTodayProductionList());
+ mdcFakeDataSubList.addAll(mdcFakeDataDto.getTodayPassRateList());
+ mdcFakeDataSubList.addAll(mdcFakeDataDto.getTodayShiftCountList());
+ mdcFakeDataSubList.addAll(mdcFakeDataDto.getTodayOpenRateList());
+ mdcFakeDataSubList.addAll(mdcFakeDataDto.getTodayUtilizationRateList());
+ mdcFakeDataSubList.addAll(mdcFakeDataDto.getMonthUtilizationRateList());
+ mdcFakeDataSubService.updateBatchById(mdcFakeDataSubList);
+ }
+}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcFakeDataSubServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcFakeDataSubServiceImpl.java
new file mode 100644
index 0000000..bda5a1c
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcFakeDataSubServiceImpl.java
@@ -0,0 +1,15 @@
+package org.jeecg.modules.mdc.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.mdc.entity.MdcFakeDataSub;
+import org.jeecg.modules.mdc.mapper.MdcFakeDataSubMapper;
+import org.jeecg.modules.mdc.service.IMdcFakeDataSubService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author Lius
+ * @date 2024/10/25 15:08
+ */
+@Service
+public class MdcFakeDataSubServiceImpl extends ServiceImpl<MdcFakeDataSubMapper, MdcFakeDataSub> implements IMdcFakeDataSubService {
+}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcOeeInfoServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcOeeInfoServiceImpl.java
index 31f1291..d9ef6a6 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcOeeInfoServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcOeeInfoServiceImpl.java
@@ -109,18 +109,15 @@
List<MdcOeeInfo> oeeList = this.baseMapper.oeeList(vo);
//鏁版嵁澶勭悊
String shiftSubName = "鍏ㄩ儴";
- if (!StringUtils.isBlank(vo.getShiftId())) {
- List<MdcShiftSub> mdcShiftSubList = new ArrayList<>();
- if (StringUtils.isNotBlank(vo.getShiftSubId())) {
- mdcShiftSubList = mdcShiftSubService.list(new LambdaQueryWrapper<MdcShiftSub>().eq(MdcShiftSub::getId, vo.getShiftSubId()).eq(MdcShiftSub::getShiftSubStatus, "1"));
- oeeList = oeeList.stream().filter(mdcOeeInfo -> mdcOeeInfo.getShiftId().equals(vo.getShiftId()) && mdcOeeInfo.getShiftSubId().equals(vo.getShiftSubId())).collect(Collectors.toList());
- } else {
- mdcShiftSubList = mdcShiftSubService.list(new LambdaQueryWrapper<MdcShiftSub>().eq(MdcShiftSub::getShiftId, vo.getShiftId()).eq(MdcShiftSub::getShiftSubStatus, "1"));
- oeeList = oeeList.stream().filter(mdcOeeInfo -> mdcOeeInfo.getShiftId().equals(vo.getShiftId())).collect(Collectors.toList());
- }
+ List<MdcShiftSub> mdcShiftSubList = new ArrayList<>();
+ if (StringUtils.isNotBlank(vo.getShiftSubId())) {
+ mdcShiftSubList = mdcShiftSubService.list(new LambdaQueryWrapper<MdcShiftSub>().eq(MdcShiftSub::getId, vo.getShiftSubId()).eq(MdcShiftSub::getShiftSubStatus, "1"));
+ //oeeList = oeeList.stream().filter(mdcOeeInfo -> mdcOeeInfo.getShiftId().equals(vo.getShiftId()) && mdcOeeInfo.getShiftSubId().equals(vo.getShiftSubId())).collect(Collectors.toList());
List<String> shiftSubNames = mdcShiftSubList.stream().map(MdcShiftSub::getShiftSubName).collect(Collectors.toList());
shiftSubName = String.join(",", shiftSubNames);
}
+
+
for (MdcEquipment mdcEquipment : equipmentList) {
MdcOeeListDto mdcOeeListDto = new MdcOeeListDto();
mdcOeeListDto.setEquipmentId(mdcEquipment.getEquipmentId());
--
Gitblit v1.9.3