From 8d573e45a06558221f0945f59666114ba8442075 Mon Sep 17 00:00:00 2001
From: 邱宇豪 <qyh123230312>
Date: 星期五, 22 九月 2023 13:27:35 +0800
Subject: [PATCH] 单位工程管理
---
hd/pipe/engineeringManage/src/main/resources/mapping/SysSegmentMapper.xml | 39 ++++++++++++++++++++++++---------------
hd/pipe/mobile/src/main/java/com/thhy/mobile/modules/biz/pipeinfo/entity/PipeDto.java | 2 ++
hd/pipe/engineeringManage/src/main/resources/mapping/SysProjectMapper.xml | 2 +-
hd/pipe/gateway/src/main/resources/application-dev.yml | 2 +-
hd/pipe/mobile/src/main/resources/mapping/PipeInfoMapper.xml | 3 +++
5 files changed, 31 insertions(+), 17 deletions(-)
diff --git a/hd/pipe/engineeringManage/src/main/resources/mapping/SysProjectMapper.xml b/hd/pipe/engineeringManage/src/main/resources/mapping/SysProjectMapper.xml
index 276f25d..2a42a6b 100644
--- a/hd/pipe/engineeringManage/src/main/resources/mapping/SysProjectMapper.xml
+++ b/hd/pipe/engineeringManage/src/main/resources/mapping/SysProjectMapper.xml
@@ -310,7 +310,7 @@
where sp.is_use=1
<if test="proName!=null and proName!='' ">
and sp.pro_name like concat('%',#{proName},'%')
- </if>
+ </if>segment/segmentList
<if test="companyId!=null and companyId!='' ">
and sp.company_id=#{companyId}
</if>
diff --git a/hd/pipe/engineeringManage/src/main/resources/mapping/SysSegmentMapper.xml b/hd/pipe/engineeringManage/src/main/resources/mapping/SysSegmentMapper.xml
index 32aad2c..0a2313a 100644
--- a/hd/pipe/engineeringManage/src/main/resources/mapping/SysSegmentMapper.xml
+++ b/hd/pipe/engineeringManage/src/main/resources/mapping/SysSegmentMapper.xml
@@ -25,6 +25,10 @@
select segment_id from sys_segment where segment_name=#{segmentName}
and is_use=1
</select>
+ <select id="segmentNameByProjectName" parameterType="java.lang.String" resultType="java.lang.String" >
+ select segment_id from sys_segment where unit_project_name=#{unitProjectName}
+ and is_use=1
+ </select>
<insert id="segmentInsert" useGeneratedKeys="true" keyProperty="segment_id">
insert into sys_segment
<trim prefix="(" suffix=")" suffixOverrides=",">
@@ -136,21 +140,25 @@
</trim>
</insert>
<select id="segmentList" resultType="com.thhy.engineering.modules.biz.engineering.entity.SysSegment">
- select ss.segment_id as segmentId,
- ss.segment_name as segmentName,
- ss.pro_id as proId,
- ss.segment_admin as segmentAdmin,
- ss.shield_enp as shieldEnp,
- ss.station as station,
- ss.create_time as createTime,
- ss.mileage as mileage,
- ss.unit_project_name as unitProjectName,
- ss.start_time as startTime,
- ss.end_time as endTime,
- ss.duration as duration,
- sp.pro_name as proName,spu.real_name as realName from sys_segment ss
- left join sys_project sp on ss.pro_id=sp.pro_id
- left join sys_plat_user spu on ss.segment_admin=spu.user_id
+ select ss.segment_id as segmentId,
+ ss.segment_name as segmentName,
+ ss.pro_id as proId,
+ ss.segment_admin as segmentAdmin,
+ ss.shield_enp as shieldEnp,
+ ss.station as station,
+ ss.create_time as createTime,
+ ss.mileage as mileage,
+ ss.unit_project_name as unitProjectName,
+ ss.start_time as startTime,
+ ss.end_time as endTime,
+ ss.duration as duration,
+ COUNT(tpi.segment_id) completedQuantity,
+ sp.pro_name as proName,spu.real_name as realName
+ from sys_segment ss
+ left join sys_project sp on ss.pro_id=sp.pro_id
+ left join sys_plat_user spu on ss.segment_admin=spu.user_id
+ left join (SELECT segment_id FROM t_pipe_info WHERE check_result in (1,2,3)) tpi on ss.segment_id = tpi.segment_id
+
where ss.is_use=1
<if test="unitProjectName!=null and unitProjectName!='' ">
and ss.unit_project_name like concat('%',#{unitProjectName},'%')
@@ -164,6 +172,7 @@
<if test="companyId!=null and companyId!='' ">
and sp.company_id=#{companyId}
</if>
+ GROUP BY ss.segment_id
order by ss.create_time desc
</select>
<select id="segmentInfo" parameterType="java.lang.String" resultType="com.thhy.engineering.modules.biz.engineering.entity.SysSegment">
diff --git a/hd/pipe/gateway/src/main/resources/application-dev.yml b/hd/pipe/gateway/src/main/resources/application-dev.yml
index 0e5e88b..e267699 100644
--- a/hd/pipe/gateway/src/main/resources/application-dev.yml
+++ b/hd/pipe/gateway/src/main/resources/application-dev.yml
@@ -7,7 +7,7 @@
discovery:
heart-beat-interval: 3000
heart-beat-timeout: 15000
- group: pipe
+ group: supipe
config:
file-extension: yml
group: sunacos
diff --git a/hd/pipe/mobile/src/main/java/com/thhy/mobile/modules/biz/pipeinfo/entity/PipeDto.java b/hd/pipe/mobile/src/main/java/com/thhy/mobile/modules/biz/pipeinfo/entity/PipeDto.java
index 9f845c1..53c41d4 100644
--- a/hd/pipe/mobile/src/main/java/com/thhy/mobile/modules/biz/pipeinfo/entity/PipeDto.java
+++ b/hd/pipe/mobile/src/main/java/com/thhy/mobile/modules/biz/pipeinfo/entity/PipeDto.java
@@ -45,4 +45,6 @@
private String proId;
private String num;
+
+ private String segmentId;
}
diff --git a/hd/pipe/mobile/src/main/resources/mapping/PipeInfoMapper.xml b/hd/pipe/mobile/src/main/resources/mapping/PipeInfoMapper.xml
index 19cf46a..e2ad715 100644
--- a/hd/pipe/mobile/src/main/resources/mapping/PipeInfoMapper.xml
+++ b/hd/pipe/mobile/src/main/resources/mapping/PipeInfoMapper.xml
@@ -192,6 +192,9 @@
<if test="num!=null">
tpi.pipe_num = #{num} AND
</if>
+ <if test="segmentId!=null">
+ tpi.segment_id = #{segmentId} AND
+ </if>
</trim>
</where>
order by tpi.check_time desc
--
Gitblit v1.9.3