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/SysProjectMapper.xml |  149 ++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 134 insertions(+), 15 deletions(-)

diff --git a/hd/pipe/engineeringManage/src/main/resources/mapping/SysProjectMapper.xml b/hd/pipe/engineeringManage/src/main/resources/mapping/SysProjectMapper.xml
index 5ee6b82..2a42a6b 100644
--- a/hd/pipe/engineeringManage/src/main/resources/mapping/SysProjectMapper.xml
+++ b/hd/pipe/engineeringManage/src/main/resources/mapping/SysProjectMapper.xml
@@ -7,17 +7,29 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Fri Mar 31 12:43:12 CST 2023.
     -->
-    <id column="pro_id" jdbcType="VARCHAR" property="proId" />
-    <result column="pro_name" jdbcType="VARCHAR" property="proName" />
-    <result column="pro_desc" jdbcType="VARCHAR" property="proDesc" />
-    <result column="start_date" jdbcType="TIMESTAMP" property="startDate" />
-    <result column="pro_time" jdbcType="INTEGER" property="proTime" />
-    <result column="plan_output" jdbcType="INTEGER" property="planOutput" />
-    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="create_user" jdbcType="VARCHAR" property="createUser" />
-    <result column="pro_number" jdbcType="VARCHAR" property="proNumber" />
-    <result column="company_id" jdbcType="VARCHAR" property="companyId" />
-    <result column="company_name" jdbcType="VARCHAR" property="companyName" />
+      <id column="pro_id" jdbcType="VARCHAR" property="proId" />
+      <result column="pro_name" jdbcType="VARCHAR" property="proName" />
+      <result column="pro_desc" jdbcType="VARCHAR" property="proDesc" />
+      <result column="start_date" jdbcType="TIMESTAMP" property="startDate" />
+      <result column="pro_time" jdbcType="INTEGER" property="proTime" />
+      <result column="plan_output" jdbcType="INTEGER" property="planOutput" />
+      <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+      <result column="create_user" jdbcType="VARCHAR" property="createUser" />
+      <result column="pro_number" jdbcType="VARCHAR" property="proNumber" />
+      <result column="company_id" jdbcType="VARCHAR" property="companyId" />
+      <result column="create_unit" jdbcType="VARCHAR" property="createUnit" />
+      <result column="plan_unit" jdbcType="VARCHAR" property="planUnit" />
+      <result column="supervision_unit" jdbcType="VARCHAR" property="supervisionUnit" />
+      <result column="construction_unit" jdbcType="VARCHAR" property="constructionUnit" />
+      <result column="outside_diameter" jdbcType="DOUBLE" property="outsideDiameter" />
+      <result column="inner_diameter" jdbcType="DOUBLE" property="innerDiameter" />
+      <result column="thickness" jdbcType="DOUBLE" property="thickness" />
+      <result column="ring_width" jdbcType="DOUBLE" property="ringWidth" />
+      <result column="concrete_strength_grade" jdbcType="VARCHAR" property="concreteStrengthGrade" />
+      <result column="impermeability_level" jdbcType="VARCHAR" property="impermeabilityLevel" />
+      <result column="waterproof_type" jdbcType="INTEGER" property="waterproofType" />
+      <result column="company_name" jdbcType="VARCHAR" property="companyName" />
+      <result column="completed_quantity" jdbcType="INTEGER" property="completedQuantity" />
   </resultMap>
 
 
@@ -59,6 +71,40 @@
       <if test="companyId != null">
         company_id,
       </if>
+        <if test="createUnit != null">
+            create_unit,
+        </if>
+        <if test="planUnit != null">
+            plan_unit,
+        </if>
+        <if test="supervisionUnit != null">
+            supervision_unit,
+        </if>
+        <if test="constructionUnit != null">
+            construction_unit,
+        </if>
+        <if test="outsideDiameter != null">
+            outside_diameter,
+        </if>
+        <if test="innerDiameter != null">
+            inner_diameter,
+        </if>
+        <if test="thickness != null">
+            thickness,
+        </if>
+        <if test="ringWidth != null">
+            ring_width,
+        </if>
+        <if test="concreteStrengthGrade != null">
+            concrete_strength_grade,
+        </if>
+        <if test="impermeabilityLevel != null">
+            impermeability_level,
+        </if>
+        <if test="waterproofType != null">
+            waterproof_type,
+        </if>
+
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="proId != null">
@@ -91,6 +137,39 @@
       <if test="companyId != null">
         #{companyId,jdbcType=VARCHAR},
       </if>
+        <if test="createUnit != null">
+            #{createUnit,jdbcType=VARCHAR},
+        </if>
+        <if test="planUnit != null">
+            #{planUnit,jdbcType=VARCHAR},
+        </if>
+        <if test="supervisionUnit != null">
+            #{supervisionUnit,jdbcType=VARCHAR},
+        </if>
+        <if test="constructionUnit != null">
+            #{constructionUnit,jdbcType=VARCHAR},
+        </if>
+        <if test="outsideDiameter != null">
+            #{outsideDiameter,jdbcType=DOUBLE},
+        </if>
+        <if test="innerDiameter != null">
+            #{innerDiameter,jdbcType=DOUBLE},
+        </if>
+        <if test="thickness != null">
+            #{thickness,jdbcType=DOUBLE},
+        </if>
+        <if test="ringWidth != null">
+            #{ringWidth,jdbcType=DOUBLE},
+        </if>
+        <if test="concreteStrengthGrade != null">
+            #{concreteStrengthGrade,jdbcType=VARCHAR},
+        </if>
+        <if test="impermeabilityLevel != null">
+            #{impermeabilityLevel,jdbcType=VARCHAR},
+        </if>
+        <if test="waterproofType != null">
+            #{waterproofType,jdbcType=VARCHAR},
+        </if>
     </trim>
   </insert>
   <insert id="proTurnsInsert" >
@@ -221,15 +300,21 @@
     </trim>
   </insert>
   <select id="projectList" resultMap="BaseResultMap">
-    select sp.*,sc.company_name from sys_project sp
-    left join sys_company sc on sp.company_id=sc.company_id
-    where sp.is_use=1
+      select
+          sp.*,
+          sc.company_name,
+          COUNT(tpi.pro_id) completed_quantity
+      from sys_project sp
+      left join sys_company sc on sp.company_id=sc.company_id
+      left join (SELECT pro_id FROM t_pipe_info WHERE check_result in (1,2,3))  tpi on tpi.pro_id = sp.pro_id
+      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>
+    GROUP BY sp.pro_id
     order by sp.create_time desc
   </select>
   <select id="proBlokSelect" parameterType="java.lang.String" resultType="com.thhy.engineering.modules.biz.engineering.entity.ProSunDto.SysProBlok">
@@ -302,6 +387,40 @@
       <if test="createUser != null">
         create_user = #{createUser,jdbcType=VARCHAR},
       </if>
+
+        <if test="createUnit != null">
+            create_unit = #{createUnit,jdbcType=VARCHAR},
+        </if>
+        <if test="planUnit != null">
+            plan_unit = #{planUnit,jdbcType=VARCHAR},
+        </if>
+        <if test="supervisionUnit != null">
+            supervision_unit = #{supervisionUnit,jdbcType=VARCHAR},
+        </if>
+        <if test="constructionUnit != null">
+            construction_unit = #{constructionUnit,jdbcType=VARCHAR},
+        </if>
+        <if test="outsideDiameter != null">
+            outside_diameter = #{outsideDiameter,jdbcType=DOUBLE},
+        </if>
+        <if test="innerDiameter != null">
+            inner_diameter = #{innerDiameter,jdbcType=DOUBLE},
+        </if>
+        <if test="thickness != null">
+            thickness = #{thickness,jdbcType=DOUBLE},
+        </if>
+        <if test="ringWidth != null">
+            ring_width = #{ringWidth,jdbcType=DOUBLE},
+        </if>
+        <if test="concreteStrengthGrade != null">
+            concrete_strength_grade = #{concreteStrengthGrade,jdbcType=VARCHAR},
+        </if>
+        <if test="impermeabilityLevel != null">
+            impermeability_level = #{impermeabilityLevel,jdbcType=VARCHAR},
+        </if>
+        <if test="waterproofType != null">
+            waterproof_type = #{waterproofType,jdbcType=VARCHAR},
+        </if>
     </set>
     where pro_id = #{proId,jdbcType=VARCHAR}
   </update>

--
Gitblit v1.9.3