From 36d430922c4a6f4c77db56e74a7ccee9a7af06a5 Mon Sep 17 00:00:00 2001
From: 邱宇豪 <qyh123230312>
Date: 星期三, 22 十一月 2023 11:12:35 +0800
Subject: [PATCH] 20231122_qiuyh_修改钢筋笼打印制作人

---
 hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/rebarprint/entity/TSteelPrint.java    |    2 
 hd/pipe/mobile/src/main/resources/mapping/SteelProduceMapper.xml                                           |    8 +
 hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/rebarprint/entity/dto/ProduceDto.java |    2 
 hd/pipe/materialsManage/src/main/resources/mapping/TSteelPrintMapper.xml                                   |   47 +++++++----
 hd/pipe/materialsManage/src/main/resources/mapping/TSteelProduceMapper.xml                                 |   90 +++++++++++++--------
 hd/pipe/mobile/src/main/resources/mapping/PipeInfoMapper.xml                                               |   55 +++++++------
 6 files changed, 123 insertions(+), 81 deletions(-)

diff --git a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/rebarprint/entity/TSteelPrint.java b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/rebarprint/entity/TSteelPrint.java
index 4b825bf..11c4f8c 100644
--- a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/rebarprint/entity/TSteelPrint.java
+++ b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/rebarprint/entity/TSteelPrint.java
@@ -78,6 +78,8 @@
     //班组
     private String groupName;
 
+    private String platUserId;
+    private String platUserName;
     /**
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table t_steel_print
diff --git a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/rebarprint/entity/dto/ProduceDto.java b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/rebarprint/entity/dto/ProduceDto.java
index 160a796..3317a4e 100644
--- a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/rebarprint/entity/dto/ProduceDto.java
+++ b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/rebarprint/entity/dto/ProduceDto.java
@@ -81,4 +81,6 @@
     //打印时间
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private String printTime;
+
+    private String platUserName;
 }
diff --git a/hd/pipe/materialsManage/src/main/resources/mapping/TSteelPrintMapper.xml b/hd/pipe/materialsManage/src/main/resources/mapping/TSteelPrintMapper.xml
index da73957..53bd359 100644
--- a/hd/pipe/materialsManage/src/main/resources/mapping/TSteelPrintMapper.xml
+++ b/hd/pipe/materialsManage/src/main/resources/mapping/TSteelPrintMapper.xml
@@ -57,6 +57,9 @@
       <if test="isUse != null">
         is_use,
       </if>
+        <if test="platUserId != null">
+            plat_user_id,
+        </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="steelPrintId != null">
@@ -92,28 +95,34 @@
       <if test="isUse != null">
         #{isUse,jdbcType=INTEGER},
       </if>
+        <if test="platUserId != null">
+            #{platUserId,jdbcType=VARCHAR},
+        </if>
     </trim>
   </insert>
   <select id="steelPrintList" resultType="com.thhy.materials.modules.biz.rebarprint.entity.TSteelPrint">
-        select tsp.steel_print_id as steelPrintId,
-        tsp.pro_id as proId,
-        tsp.size_id as sizeId,
-        tsp.reinforcement_id as reinforcementId,
-        tsp.block_num as blockNum,
-        tsp.print_num as printNum,
-        tsp.create_user as createUser,
-        tsp.create_time as createTime,
-        sp.pro_name as proName,sd.dict_name as sizeName,
-        sd1.dict_name as reinforcementName,
-        sd2.dict_name as blockName,
-        su.real_name as  realName
-         from  t_steel_print tsp
-        left join sys_project sp on tsp.pro_id=sp.pro_id
-        left join sys_dict sd on  tsp.size_id=sd.dict_id
-        left join sys_dict sd1 on  tsp.reinforcement_id=sd1.dict_id
-        left join sys_dict sd2 on  tsp.block_num=sd2.dict_id
-        left join sys_users su on tsp.create_user=su.user_id
-        where tsp.is_use=1
+      select
+      tsp.steel_print_id as steelPrintId,
+      tsp.pro_id as proId,
+      tsp.size_id as sizeId,
+      tsp.reinforcement_id as reinforcementId,
+      tsp.block_num as blockNum,
+      tsp.print_num as printNum,
+      tsp.create_user as createUser,
+      tsp.create_time as createTime,
+      sp.pro_name as proName,sd.dict_name as sizeName,
+      sd1.dict_name as reinforcementName,
+      sd2.dict_name as blockName,
+      su.real_name as  realName,
+      spu.real_name as platUserName
+      from  t_steel_print tsp
+      left join sys_plat_user spu on spu.user_id = tsp.plat_user_id
+      left join sys_project sp on tsp.pro_id=sp.pro_id
+      left join sys_dict sd on  tsp.size_id=sd.dict_id
+      left join sys_dict sd1 on  tsp.reinforcement_id=sd1.dict_id
+      left join sys_dict sd2 on  tsp.block_num=sd2.dict_id
+      left join sys_users su on tsp.create_user=su.user_id
+      where tsp.is_use=1
         <if test="proId!=null and proId!='' ">
             and tsp.pro_id=#{proId}
         </if>
diff --git a/hd/pipe/materialsManage/src/main/resources/mapping/TSteelProduceMapper.xml b/hd/pipe/materialsManage/src/main/resources/mapping/TSteelProduceMapper.xml
index 30dcfa3..aeef5b4 100644
--- a/hd/pipe/materialsManage/src/main/resources/mapping/TSteelProduceMapper.xml
+++ b/hd/pipe/materialsManage/src/main/resources/mapping/TSteelProduceMapper.xml
@@ -21,24 +21,37 @@
     <result column="is_user" jdbcType="INTEGER" property="isUser" />
   </resultMap>
   <select id="steelProduceList" resultType="com.thhy.materials.modules.biz.rebarprint.entity.dto.ProduceDto">
-        select tsp.steel_produce_id as steelProduceId,
-        tsp.produce_number as produceNumber,
-        tsp.pro_id as proId,sp.pro_name as proName,
-         sd.dict_name as sizeName,sd1.dict_name as reinforcementName,
-         sd2.dict_name as blockName,su.real_name as realName,
-         sg.group_name as groupName,su1.real_name as qualityUserName,
-         tsp.quality_time as qualityTime,tsp.is_qualified as isQualified,
-         tsp.is_model as isModel,tsp.print_time as printTime
-         from t_steel_produce tsp
-         left join sys_project sp  on tsp.pro_id=sp.pro_id
-         left join sys_dict  sd on tsp.size_id=sd.dict_id
-         left join sys_dict  sd1 on tsp.reinforcement_id=sd1.dict_id
-         left join sys_dict  sd2 on tsp.block_num=sd2.dict_id
-         left join sys_users su  on tsp.create_user=su.user_id
-         left join sys_group_user sgu on su.plat_id=sgu.user_id
-         left join sys_group sg on sgu.group_id=sg.group_id
-         left join sys_users su1 on tsp.quality_user=su1.user_id
-        where tsp.is_use=1
+      select
+      DISTINCT tsp.steel_produce_id as steelProduceId,
+              tsp.size_id as sizeId,
+              tsp.reinforcement_id reinforcementId,
+              tsp.block_num blockNum,
+              tsp.produce_number as produceNumber,
+              tsp.pro_id as proId,
+              sp.pro_name as proName,
+              sd.dict_name as sizeName,
+              sd1.dict_name as reinforcementName,
+              sd2.dict_name as blockName,
+              su.real_name as realName,
+              sg.group_name as groupName,
+              su1.real_name as qualityUserName,
+              tsp.quality_time as qualityTime,
+              tsp.is_qualified as isQualified,
+              tsp.is_model as isModel,
+              tsp.print_time as printTime,
+              spu.real_name as platUserName
+      from t_steel_produce tsp
+      left join sys_project sp  on tsp.pro_id=sp.pro_id
+      left join sys_dict  sd on tsp.size_id=sd.dict_id
+      left join sys_dict  sd1 on tsp.reinforcement_id=sd1.dict_id
+      left join sys_dict  sd2 on tsp.block_num=sd2.dict_id
+      left join sys_users su  on tsp.create_user=su.user_id
+      left join sys_users su1 on tsp.quality_user=su1.user_id
+      left join t_steel_print stp on stp.steel_print_id = tsp.steel_print_id
+      left join sys_plat_user spu on spu.user_id = stp.plat_user_id
+      left join sys_group_user sgu on spu.user_id=sgu.user_id
+      left join sys_group sg on sgu.group_id=sg.group_id
+      where tsp.is_use=1
         <if test="produceNumber!=null and produceNumber!='' ">
            and  tsp.produce_number like concat('%',#{produceNumber},'%')
         </if>
@@ -75,26 +88,33 @@
         <if test="isModel!=null and isModel!='' ">
             and tsp.is_model=#{isModel}
         </if>
+      <if test="isModel!=null and isModel!='' ">
+          and tsp.size_id=#{sizeId}
+      </if>
         order by tsp.produce_number desc
   </select>
     <select id="steelProduceInfo" parameterType="java.lang.String" resultType="com.thhy.materials.modules.biz.rebarprint.entity.dto.ProduceDto">
-        select tsp.steel_produce_id as steelProduceId,
-        tsp.produce_number as produceNumber,
-        tsp.pro_id as proId,sp.pro_name as proName,
-         sd.dict_name as sizeName,sd1.dict_name as reinforcementName,
-         sd2.dict_name as blockName,su.real_name as realName,
-         sg.group_name as groupName,su1.real_name as qualityUserName,
-         tsp.quality_time as qualityTime,tsp.is_qualified as isQualified,
-         tsp.is_model as isModel,tsp.print_time as printTime
-         from t_steel_produce tsp
-         left join sys_project sp  on tsp.pro_id=sp.pro_id
-         left join sys_dict  sd on tsp.size_id=sd.dict_id
-         left join sys_dict  sd1 on tsp.reinforcement_id=sd1.dict_id
-         left join sys_dict  sd2 on tsp.block_num=sd2.dict_id
-         left join sys_users su  on tsp.create_user=su.user_id
-         left join sys_group_user sgu on su.plat_id=sgu.user_id
-         left join sys_group sg on sgu.group_id=sg.group_id
-         left join sys_users su1 on tsp.quality_user=su1.user_id
+        select
+                DISTINCT tsp.steel_produce_id as steelProduceId,
+                         tsp.produce_number as produceNumber,
+                         tsp.pro_id as proId,sp.pro_name as proName,
+                         sd.dict_name as sizeName,sd1.dict_name as reinforcementName,
+                         sd2.dict_name as blockName,su.real_name as realName,
+                         sg.group_name as groupName,su1.real_name as qualityUserName,
+                         tsp.quality_time as qualityTime,tsp.is_qualified as isQualified,
+                         tsp.is_model as isModel,tsp.print_time as printTime,
+                         spu.real_name as platUserName
+        from t_steel_produce tsp
+                     left join sys_project sp  on tsp.pro_id=sp.pro_id
+                     left join sys_dict  sd on tsp.size_id=sd.dict_id
+                     left join sys_dict  sd1 on tsp.reinforcement_id=sd1.dict_id
+                     left join sys_dict  sd2 on tsp.block_num=sd2.dict_id
+                     left join sys_users su  on tsp.create_user=su.user_id
+                     left join sys_users su1 on tsp.quality_user=su1.user_id
+                     left join t_steel_print stp on stp.steel_print_id = tsp.steel_print_id
+                     left join sys_plat_user spu on spu.user_id = stp.plat_user_id
+                     left join sys_group_user sgu on spu.user_id=sgu.user_id
+                     left join sys_group sg on sgu.group_id=sg.group_id
         where tsp.is_use=1 and tsp.steel_produce_id=#{steelProduceId}
     </select>
     <select id="produceInventory" resultType="com.thhy.materials.modules.biz.rebarprint.entity.dto.ProduceInventoryDto">
diff --git a/hd/pipe/mobile/src/main/resources/mapping/PipeInfoMapper.xml b/hd/pipe/mobile/src/main/resources/mapping/PipeInfoMapper.xml
index 927af88..ead721b 100644
--- a/hd/pipe/mobile/src/main/resources/mapping/PipeInfoMapper.xml
+++ b/hd/pipe/mobile/src/main/resources/mapping/PipeInfoMapper.xml
@@ -246,32 +246,39 @@
     </select>
 
     <select id="queryPipeInfoByPipeId" resultType="com.thhy.mobile.modules.biz.pipeinfo.entity.PipeInfoVo">
-        select tsp.produce_number as produceNumber,sp.pro_name as proName,su1.real_name as createUserName,su2.real_name as steelCheckUserName,tsp.quality_time as steelCheckTime,tsp.is_qualified as steelCheckResult,tsp.print_time as printTime,
-
-               sm.mould_num as mouldNum,sm.current_cycle_time as currentCycleTime,sm.max_cycle_time as maxCycleTime,sm.mould_code as mouldCode,
-
-               tpi.ring_num as ringNum,tpi.pipe_num as pipeNum,tpi.into_mod_time as intoModTime,
-               tpi.check_user as checkUser,su.real_name as pipeCheckUserName,tpi.check_time as pipeCheckTime,
-               sd1.dict_name as turnName,
-               sd2.dict_name as reinforcementName,
-               sd3.dict_name as groutingHolesName,
-               sd4.dict_name as blockNumName,
-               sd5.dict_name as sizeName,
-               sd6.dict_name as mouldTypeName
+        select
+            tsp.produce_number as produceNumber,
+            sp.pro_name as proName,
+            spu.real_name as createUserName,
+            su2.real_name as steelCheckUserName,
+            tsp.quality_time as steelCheckTime,
+            tsp.is_qualified as steelCheckResult,
+            tsp.print_time as printTime,
+            sm.mould_num as mouldNum,sm.current_cycle_time as currentCycleTime,sm.max_cycle_time as maxCycleTime,sm.mould_code as mouldCode,
+            tpi.ring_num as ringNum,tpi.pipe_num as pipeNum,tpi.into_mod_time as intoModTime,
+            tpi.check_user as checkUser,su.real_name as pipeCheckUserName,tpi.check_time as pipeCheckTime,
+            sd1.dict_name as turnName,
+            sd2.dict_name as reinforcementName,
+            sd3.dict_name as groutingHolesName,
+            sd4.dict_name as blockNumName,
+            sd5.dict_name as sizeName,
+            sd6.dict_name as mouldTypeName
 
         from t_pipe_info tpi
-                 left join sys_dict sd1 on sd1.dict_id = tpi.turn
-                 left join sys_dict sd2 on sd2.dict_id = tpi.reinforcement
-                 left join sys_dict sd3 on sd3.dict_id = tpi.grouting_holes
-                 left join sys_dict sd4 on sd4.dict_id = tpi.block_num
-                 left join sys_dict sd5 on sd5.dict_id = tpi.size
-                 left join sys_mould sm on sm.mould_id = tpi.mod_id
-                 left join sys_dict sd6 on sd6.dict_id = sm.mould_type
-                 left join t_steel_produce tsp on tsp.produce_number = tpi.produce_number
-                 left join sys_project sp on sp.pro_id = tpi.pro_id
-                 left join sys_users su on su.user_id = tpi.check_user
-                 left join sys_users su1 on su1.user_id = tsp.create_user
-                 left join sys_users su2 on su2.user_id = tsp.quality_user
+        left join sys_dict sd1 on sd1.dict_id = tpi.turn
+        left join sys_dict sd2 on sd2.dict_id = tpi.reinforcement
+        left join sys_dict sd3 on sd3.dict_id = tpi.grouting_holes
+        left join sys_dict sd4 on sd4.dict_id = tpi.block_num
+        left join sys_dict sd5 on sd5.dict_id = tpi.size
+        left join sys_mould sm on sm.mould_id = tpi.mod_id
+        left join sys_dict sd6 on sd6.dict_id = sm.mould_type
+        left join t_steel_produce tsp on tsp.produce_number = tpi.produce_number
+        left join sys_project sp on sp.pro_id = tpi.pro_id
+        left join sys_users su on su.user_id = tpi.check_user
+        left join sys_users su1 on su1.user_id = tsp.create_user
+        left join sys_users su2 on su2.user_id = tsp.quality_user
+        left join t_steel_print stp on stp.steel_print_id = tsp.steel_print_id
+        left join sys_plat_user spu on spu.user_id = stp.plat_user_id
         where 1=1
         <if test="pipeId != null">
            and tpi.pipe_id = #{pipeId}
diff --git a/hd/pipe/mobile/src/main/resources/mapping/SteelProduceMapper.xml b/hd/pipe/mobile/src/main/resources/mapping/SteelProduceMapper.xml
index 14bac43..af3ca54 100644
--- a/hd/pipe/mobile/src/main/resources/mapping/SteelProduceMapper.xml
+++ b/hd/pipe/mobile/src/main/resources/mapping/SteelProduceMapper.xml
@@ -353,13 +353,13 @@
                 sd5.dict_name AS sizeName,
                 sd2.dict_name AS reinforcementName,
                 sd4.dict_name AS blockNumName,
-                su1.real_name AS createUserName,
+                spu.real_name AS createUserName,
                 su2.real_name AS steelCheckUserName,
-
                 tsp.quality_time AS pipeCheckTime,
                 tsp.print_time AS printTime,
                 tpi.into_mod_time AS intoModTime,
-                su.real_name AS pipeCheckUserName
+                su.real_name AS pipeCheckUserName,
+                tsp.steel_print_id steelPrintId
         FROM
                 t_steel_produce tsp
                         LEFT JOIN t_pipe_info tpi ON tsp.produce_number = tpi.produce_number
@@ -370,6 +370,8 @@
                         LEFT JOIN sys_users su ON su.user_id = tpi.check_user
                         LEFT JOIN sys_users su1 ON su1.user_id = tsp.create_user
                         LEFT JOIN sys_users su2 ON su2.user_id = tsp.quality_user
+                        LEFT JOIN t_steel_print stp on stp.steel_print_id = tsp.steel_print_id
+                        LEFT JOIN sys_plat_user spu on spu.user_id = stp.plat_user_id
 
         where tsp.produce_number =#{num}
     </select>

--
Gitblit v1.9.3