From 2f23be03f43ef8c7188fa42ea0e88fbc32e4ffbd Mon Sep 17 00:00:00 2001
From: guo <guo@guo>
Date: Mon, 11 Dec 2023 09:33:12 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/smartbeamfield/entity/SmartBeamFieldBeam.java     | 3 +++
 .../smartbeamfield/mapper/xml/SmartBeamFieldBeamMapper.xml    | 3 ++-
 .../mapper/xml/SmartBeamFieldBeamToProcessMapper.xml          | 4 ++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/smartbeamfield/entity/SmartBeamFieldBeam.java b/src/main/java/com/zhgd/xmgl/modules/smartbeamfield/entity/SmartBeamFieldBeam.java
index c56e81b6b..29f7a6f7f 100644
--- a/src/main/java/com/zhgd/xmgl/modules/smartbeamfield/entity/SmartBeamFieldBeam.java
+++ b/src/main/java/com/zhgd/xmgl/modules/smartbeamfield/entity/SmartBeamFieldBeam.java
@@ -207,4 +207,7 @@ public class SmartBeamFieldBeam implements Serializable {
     @ApiModelProperty(value = "梁和制梁进度的二维码页面url")
     @NotBlank
     private java.lang.String makeBeamProcessQrCodeUrl;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "生产线名称")
+    private java.lang.String productionLineName;
 }
diff --git a/src/main/java/com/zhgd/xmgl/modules/smartbeamfield/mapper/xml/SmartBeamFieldBeamMapper.xml b/src/main/java/com/zhgd/xmgl/modules/smartbeamfield/mapper/xml/SmartBeamFieldBeamMapper.xml
index bd0628b3b..c1d9d1599 100644
--- a/src/main/java/com/zhgd/xmgl/modules/smartbeamfield/mapper/xml/SmartBeamFieldBeamMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/smartbeamfield/mapper/xml/SmartBeamFieldBeamMapper.xml
@@ -2,12 +2,13 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zhgd.xmgl.modules.smartbeamfield.mapper.SmartBeamFieldBeamMapper">
     <select id="queryById" resultType="com.zhgd.xmgl.modules.smartbeamfield.entity.SmartBeamFieldBeam">
-        select sbfb.*, bp.save_beam_pedestal_sn, sbfbs.bridge_section_name
+        select sbfb.*, bp.save_beam_pedestal_sn, sbfbs.bridge_section_name,sbfpl.production_line_name
         from smart_beam_field_beam sbfb
         join smart_beam_field_bridge_section sbfbs on sbfbs.id = sbfb.smart_beam_field_bridge_section_id
         left join smart_beam_field_beam_to_save_beam_pedestal pb on pb.smart_beam_field_beam_id = sbfb.id and
         pb.is_save_beam = 1
         left join smart_beam_field_save_beam_pedestal bp on bp.id = pb.smart_beam_field_save_beam_pedestal_id
+        left join smart_beam_field_production_line sbfpl on sbfpl.id = sbfb.smart_beam_field_production_line_id
         where sbfb.id = #{id}
     </select>
 
diff --git a/src/main/java/com/zhgd/xmgl/modules/smartbeamfield/mapper/xml/SmartBeamFieldBeamToProcessMapper.xml b/src/main/java/com/zhgd/xmgl/modules/smartbeamfield/mapper/xml/SmartBeamFieldBeamToProcessMapper.xml
index 0c6d76e2b..6bc10b6bd 100644
--- a/src/main/java/com/zhgd/xmgl/modules/smartbeamfield/mapper/xml/SmartBeamFieldBeamToProcessMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/smartbeamfield/mapper/xml/SmartBeamFieldBeamToProcessMapper.xml
@@ -16,8 +16,8 @@
         order by sbfpltmbp.process_sort, sbfbtp.id
     </select>
     <select id="countDuration" resultType="com.zhgd.xmgl.modules.smartbeamfield.entity.vo.CountDurationVo">
-        select ifnull(TIMESTAMPDIFF(SECOND, planned_start_time, planned_end_time),0) planDuration,
-        ifnull(TIMESTAMPDIFF(SECOND, actual_start_time, actual_end_time),0) actualDuration
+        select ifnull(sum(TIMESTAMPDIFF(SECOND, planned_start_time, planned_end_time)),0) planDuration,
+        ifnull(sum(TIMESTAMPDIFF(SECOND, actual_start_time, actual_end_time)),0) actualDuration
         from smart_beam_field_beam_to_process
         where smart_beam_field_beam_id = #{id}
     </select>