admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug修复

Browse Source
This commit is contained in:
guo 2023-12-11 09:33:12 +08:00
parent 2b480cb2de
commit 2f23be03f4
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/zhgd/xmgl/modules/smartbeamfield/entity/SmartBeamFieldBeam.java
View File

@ -207,4 +207,7 @@ public class SmartBeamFieldBeam implements Serializable {
@ApiModelProperty(value = "梁和制梁进度的二维码页面url") @ApiModelProperty(value = "梁和制梁进度的二维码页面url")
@NotBlank @NotBlank
private java.lang.String makeBeamProcessQrCodeUrl; private java.lang.String makeBeamProcessQrCodeUrl;
@TableField(exist = false)
@ApiModelProperty(value = "生产线名称")
private java.lang.String productionLineName;
} }

3
src/main/java/com/zhgd/xmgl/modules/smartbeamfield/mapper/xml/SmartBeamFieldBeamMapper.xml
View File

@ -2,12 +2,13 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!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"> <mapper namespace="com.zhgd.xmgl.modules.smartbeamfield.mapper.SmartBeamFieldBeamMapper">
<select id="queryById" resultType="com.zhgd.xmgl.modules.smartbeamfield.entity.SmartBeamFieldBeam"> <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 from smart_beam_field_beam sbfb
join smart_beam_field_bridge_section sbfbs on sbfbs.id = sbfb.smart_beam_field_bridge_section_id 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 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 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_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} where sbfb.id = #{id}
</select> </select>

4
src/main/java/com/zhgd/xmgl/modules/smartbeamfield/mapper/xml/SmartBeamFieldBeamToProcessMapper.xml
View File

@ -16,8 +16,8 @@
order by sbfpltmbp.process_sort, sbfbtp.id order by sbfpltmbp.process_sort, sbfbtp.id
</select> </select>
<select id="countDuration" resultType="com.zhgd.xmgl.modules.smartbeamfield.entity.vo.CountDurationVo"> <select id="countDuration" resultType="com.zhgd.xmgl.modules.smartbeamfield.entity.vo.CountDurationVo">
select ifnull(TIMESTAMPDIFF(SECOND, planned_start_time, planned_end_time),0) planDuration, select ifnull(sum(TIMESTAMPDIFF(SECOND, planned_start_time, planned_end_time)),0) planDuration,
ifnull(TIMESTAMPDIFF(SECOND, actual_start_time, actual_end_time),0) actualDuration ifnull(sum(TIMESTAMPDIFF(SECOND, actual_start_time, actual_end_time)),0) actualDuration
from smart_beam_field_beam_to_process from smart_beam_field_beam_to_process
where smart_beam_field_beam_id = #{id} where smart_beam_field_beam_id = #{id}
</select> </select>