From dc4d5cb49cba56d843f72c5244a04e8efd0beb40 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期二, 04 六月 2024 10:55:49 +0800
Subject: [PATCH] update
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcFeedbackMapper.xml | 9 +++++++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcFeedbackService.java | 3 +++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcFeedbackMapper.java | 4 ++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentRunningSectionServiceImpl.java | 2 ++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/IMdcHomeServiceImpl.java | 2 +-
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcFeedbackServiceImpl.java | 6 ++++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEquipmentDto.java | 4 ++++
7 files changed, 29 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEquipmentDto.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEquipmentDto.java
index 8d85fc5..082d020 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEquipmentDto.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEquipmentDto.java
@@ -275,6 +275,10 @@
//PLC鐗堟湰
@JSONField(name = "PLCVersion")
private String PLCVersion;
+ @JSONField(name = "AI1")
+ private String AI1;
+ @JSONField(name = "AI2")
+ private String AI2;
//澶囨敞
private String remark;
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcFeedbackMapper.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcFeedbackMapper.java
index a907ab7..d7560d6 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcFeedbackMapper.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcFeedbackMapper.java
@@ -1,7 +1,10 @@
package org.jeecg.modules.mdc.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.mdc.entity.MdcFeedback;
+
+import java.util.List;
/**
* @Description: 闂鍙嶉
@@ -11,4 +14,5 @@
*/
public interface MdcFeedbackMapper extends BaseMapper<MdcFeedback> {
+ List<MdcFeedback> getFeedbackList(@Param("productionId") String key);
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcFeedbackMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcFeedbackMapper.xml
index 56380f2..fc9962b 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcFeedbackMapper.xml
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcFeedbackMapper.xml
@@ -2,4 +2,13 @@
<!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.MdcFeedbackMapper">
+ <select id="getFeedbackList" resultType="org.jeecg.modules.mdc.entity.MdcFeedback">
+ SELECT
+ t1.*
+ FROM
+ mdc_feedback t1
+ LEFT JOIN mdc_production t2 ON t1.production_id = t2.id
+ WHERE
+ (t2.id = #{ productionId } OR t2.parent_id = #{ productionId })
+ </select>
</mapper>
\ No newline at end of file
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcFeedbackService.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcFeedbackService.java
index 8238b9e..dd462e8 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcFeedbackService.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcFeedbackService.java
@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.mdc.entity.MdcFeedback;
+import java.util.List;
+
/**
* @Description: 闂鍙嶉
* @Author: Lius
@@ -11,4 +13,5 @@
*/
public interface IMdcFeedbackService extends IService<MdcFeedback> {
+ List<MdcFeedback> getFeedbackList(String key);
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/IMdcHomeServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/IMdcHomeServiceImpl.java
index 6968763..cb3f76b 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/IMdcHomeServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/IMdcHomeServiceImpl.java
@@ -503,6 +503,6 @@
@Override
public List<MdcFeedback> getFeedbackList(String key) {
- return mdcFeedbackService.list(new LambdaQueryWrapper<MdcFeedback>().eq(MdcFeedback::getProductionId, key).orderByDesc(MdcFeedback::getCreateTime));
+ return mdcFeedbackService.getFeedbackList(key);
}
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentRunningSectionServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentRunningSectionServiceImpl.java
index f97637b..28ebc28 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentRunningSectionServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentRunningSectionServiceImpl.java
@@ -136,6 +136,8 @@
if (!a.getStatus().equals(b.getStatus()) && a.getEndTime().equals(b.getStartTime())) {
result.add(dtos.get(dtos.size() - 1));
}
+ } else if (dtos.size() == 1){
+ result.addAll(dtos);
}
return result;
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcFeedbackServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcFeedbackServiceImpl.java
index ad6cc65..e2cff06 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcFeedbackServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcFeedbackServiceImpl.java
@@ -7,6 +7,8 @@
import org.jeecg.modules.mdc.service.IMdcFeedbackService;
import org.springframework.stereotype.Service;
+import java.util.List;
+
/**
* @Description: 闂鍙嶉
* @Author: Lius
@@ -16,4 +18,8 @@
@Service
public class MdcFeedbackServiceImpl extends ServiceImpl<MdcFeedbackMapper, MdcFeedback> implements IMdcFeedbackService {
+ @Override
+ public List<MdcFeedback> getFeedbackList(String key) {
+ return this.baseMapper.getFeedbackList(key);
+ }
}
--
Gitblit v1.9.3